From 850706fa01d96a4067746756202d705f2f118bb7 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 15 Jun 2026 12:56:31 +0300
Subject: [PATCH 001/134] =?UTF-8?q?feat(openapi-typescript):=20generate-cl?=
 =?UTF-8?q?ient=20=E2=80=94=20typed,=20zero-dependency=20OpenAPI=20client?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add `@redocly/openapi-typescript` and the `redocly generate-client` command:
generate a typed TypeScript client from an OpenAPI description. The emitted
client has zero runtime dependencies (web-standard fetch/AbortController/
URLSearchParams) and is produced via the TypeScript compiler AST, so output is
correct by construction; `typescript` is the only peer dependency.

Input: OpenAPI 3.0/3.1/3.2.0 + Swagger 2.0 (normalized to 3.x); file, URL, or a
redocly.yaml `apis:` alias; operationId synthesized when absent.

Output: single / split / tags / tags-split layouts; `functions` or
`service-class` facade (per-instance config + credentials); flat or grouped
argument styles.

Types: inline types; enums as unions or runtime const objects; discriminated-
union `is<Member>()` guards; `<Op>Result/Error/Params/Body/Headers/Variables`
aliases with collision suppression; JSDoc from validation keywords; optional
`Date` typing; typed multipart bodies (binary → Blob) auto-serialized to FormData.

Runtime: setBaseUrl + typed ClientConfig; composable middleware (onRequest/
onResponse/onError); opt-in abort-aware retries (backoff, jitter, Retry-After,
custom retryOn); per-call parseAs; OpenAPI query-serialization styles;
`--error-mode result` discriminated returns; minification-safe OPERATIONS map;
typed Server-Sent Events (async iterators, auto-reconnect, OAS 3.2 itemSchema).

Auth: Basic / Bearer / apiKey (header, query, cookie) from securitySchemes, async
token providers, and per-instance credentials via ClientConfig.auth.

Generators (--generators): sdk (default), zod, tanstack-query (react/vue/svelte/
solid), swr, transformers, mock (MSW handlers + baked or faker data, seedable),
plus an experimental custom-generator plugin API (@redocly/openapi-typescript/
plugin) with dual loading (inline + import specifier) and a validated
compatibility contract. Each generator declares requires/facades/errorModes/
dateTypes, validated up front.

Configuration via CLI flags, a redocly.yaml `x-openapi-typescript` block, or a
defineConfig file; plus `--watch`. Hardened: document-derived names coerced to
safe unique identifiers, comment text escaped, bounded SSE reader. Architecture,
ADRs (0001-0012), and runnable examples included.
---
 .changeset/openapi-typescript.md              |    6 +
 .gitignore                                    |    3 +
 .oxfmtrc.json                                 |    2 +
 .oxlintrc.json                                |    9 +-
 CONTRIBUTING.md                               |   77 +-
 README.md                                     |   18 +
 docs/@v2/commands/generate-client.md          | 1034 +++++++++
 docs/@v2/commands/index.md                    |    1 +
 package-lock.json                             |  951 +++++++-
 package.json                                  |   11 +-
 packages/cli/package.json                     |    5 +-
 packages/cli/src/commands/generate-client.ts  |  132 ++
 packages/cli/src/index.ts                     |  118 +
 packages/cli/tsconfig.json                    |    6 +-
 packages/openapi-typescript/ARCHITECTURE.md   |  191 ++
 packages/openapi-typescript/CONTEXT.md        |  252 ++
 packages/openapi-typescript/README.md         |  383 +++
 .../docs/adr/0001-ast-codegen.md              |   37 +
 .../docs/adr/0002-typescript-peer-dep.md      |   30 +
 .../docs/adr/0003-spec-agnostic-ir.md         |   27 +
 .../docs/adr/0004-registry-seams.md           |   32 +
 .../docs/adr/0005-error-mode-terminals.md     |   33 +
 .../docs/adr/0006-sse-namespace.md            |   31 +
 .../docs/adr/0007-call-site-auth.md           |   28 +
 .../docs/adr/0008-redocly-yaml-config.md      |   29 +
 .../docs/adr/0009-per-instance-auth.md        |   35 +
 .../docs/adr/0010-mock-data-baked-vs-faker.md |   46 +
 .../docs/adr/0011-wrapper-generators.md       |   45 +
 .../docs/adr/0012-plugin-api.md               |   50 +
 .../docs/adr/0013-experimental-status.md      |   62 +
 .../openapi-typescript/docs/adr/README.md     |   48 +
 .../openapi-typescript/examples/README.md     |   27 +
 .../examples/custom-generator/.gitignore      |    2 +
 .../examples/custom-generator/README.md       |   14 +
 .../examples/custom-generator/index.html      |   11 +
 .../examples/custom-generator/openapi.yaml    | 1163 ++++++++++
 .../examples/custom-generator/package.json    |   16 +
 .../examples/custom-generator/redocly.yaml    |   10 +
 .../custom-generator/route-map-generator.mjs  |   28 +
 .../custom-generator/src/api/client.routes.ts |   15 +
 .../custom-generator/src/api/client.ts        | 1513 ++++++++++++
 .../examples/custom-generator/src/main.ts     |   16 +
 .../examples/custom-generator/tsconfig.json   |    4 +
 .../examples/custom-generator/vite.config.ts  |    3 +
 .../examples/fetch-functions/.gitignore       |    2 +
 .../examples/fetch-functions/README.md        |   15 +
 .../examples/fetch-functions/index.html       |   11 +
 .../examples/fetch-functions/openapi.yaml     | 1163 ++++++++++
 .../examples/fetch-functions/package.json     |   16 +
 .../examples/fetch-functions/redocly.yaml     |    9 +
 .../fetch-functions/src/api/client.ts         | 1513 ++++++++++++
 .../examples/fetch-functions/src/main.ts      |   28 +
 .../examples/fetch-functions/tsconfig.json    |    4 +
 .../examples/fetch-functions/vite.config.ts   |    3 +
 .../examples/mock/.gitignore                  |    2 +
 .../examples/mock/README.md                   |   16 +
 .../examples/mock/index.html                  |   11 +
 .../examples/mock/openapi.yaml                | 1163 ++++++++++
 .../examples/mock/package.json                |   22 +
 .../examples/mock/public/mockServiceWorker.js |  336 +++
 .../examples/mock/redocly.yaml                |   10 +
 .../examples/mock/src/api/client.mocks.ts     |  442 ++++
 .../examples/mock/src/api/client.ts           | 1513 ++++++++++++
 .../examples/mock/src/main.ts                 |   20 +
 .../examples/mock/tsconfig.json               |    4 +
 .../examples/mock/vite.config.ts              |    3 +
 .../examples/programmatic/.gitignore          |    2 +
 .../examples/programmatic/README.md           |   16 +
 .../examples/programmatic/generate.ts         |   20 +
 .../examples/programmatic/openapi.yaml        | 1163 ++++++++++
 .../examples/programmatic/package.json        |   14 +
 .../examples/programmatic/src/api/client.ts   | 1513 ++++++++++++
 .../examples/programmatic/src/main.ts         |    9 +
 .../examples/programmatic/tsconfig.json       |    4 +
 .../examples/service-class/.gitignore         |    2 +
 .../examples/service-class/README.md          |   14 +
 .../examples/service-class/index.html         |   11 +
 .../examples/service-class/openapi.yaml       | 1163 ++++++++++
 .../examples/service-class/package.json       |   16 +
 .../examples/service-class/redocly.yaml       |    9 +
 .../examples/service-class/src/api/client.ts  | 1512 ++++++++++++
 .../examples/service-class/src/main.ts        |   19 +
 .../examples/service-class/tsconfig.json      |    4 +
 .../examples/service-class/vite.config.ts     |    3 +
 .../examples/tanstack-query/.gitignore        |    2 +
 .../examples/tanstack-query/README.md         |   16 +
 .../examples/tanstack-query/index.html        |   11 +
 .../examples/tanstack-query/openapi.yaml      | 1163 ++++++++++
 .../examples/tanstack-query/package.json      |   24 +
 .../examples/tanstack-query/redocly.yaml      |   10 +
 .../examples/tanstack-query/src/App.tsx       |   13 +
 .../tanstack-query/src/api/client.tanstack.ts |   78 +
 .../examples/tanstack-query/src/api/client.ts | 1513 ++++++++++++
 .../examples/tanstack-query/src/main.tsx      |   15 +
 .../examples/tanstack-query/tsconfig.json     |    7 +
 .../examples/tanstack-query/vite.config.ts    |    4 +
 .../examples/tsconfig.base.json               |   12 +
 .../examples/zod/.gitignore                   |    2 +
 .../openapi-typescript/examples/zod/README.md |   15 +
 .../examples/zod/index.html                   |   11 +
 .../examples/zod/openapi.yaml                 | 1163 ++++++++++
 .../examples/zod/package.json                 |   17 +
 .../examples/zod/redocly.yaml                 |   10 +
 .../examples/zod/src/api/client.ts            | 1513 ++++++++++++
 .../examples/zod/src/api/client.zod.ts        |  122 +
 .../examples/zod/src/main.ts                  |   19 +
 .../examples/zod/tsconfig.json                |    4 +
 .../examples/zod/vite.config.ts               |    3 +
 packages/openapi-typescript/package.json      |   61 +
 .../scripts/regenerate-examples.mjs           |   29 +
 .../scripts/typecheck-examples.mjs            |   30 +
 .../src/__tests__/config-file.test.ts         |   72 +
 .../src/__tests__/config.test.ts              |   26 +
 .../src/__tests__/errors.test.ts              |   15 +
 .../src/__tests__/index.test.ts               |  165 ++
 .../src/__tests__/loader.test.ts              |  121 +
 .../src/__tests__/plugin.test.ts              |   27 +
 .../openapi-typescript/src/config-file.ts     |   50 +
 packages/openapi-typescript/src/config.ts     |   64 +
 .../src/emitters/__tests__/auth.test.ts       |  349 +++
 .../src/emitters/__tests__/client.test.ts     |  518 +++++
 .../src/emitters/__tests__/faker.test.ts      |  333 +++
 .../src/emitters/__tests__/fixtures.ts        |   69 +
 .../src/emitters/__tests__/identifier.test.ts |   58 +
 .../src/emitters/__tests__/mock.test.ts       |  696 ++++++
 .../__tests__/operation-signature.test.ts     |   59 +
 .../src/emitters/__tests__/operations.test.ts | 1888 +++++++++++++++
 .../src/emitters/__tests__/runtime.test.ts    |  240 ++
 .../src/emitters/__tests__/sample.test.ts     |  356 +++
 .../emitters/__tests__/sse.deletion.test.ts   |   72 +
 .../src/emitters/__tests__/sse.test.ts        |  125 +
 .../src/emitters/__tests__/swr.test.ts        |  214 ++
 .../emitters/__tests__/tanstack-query.test.ts |  282 +++
 .../emitters/__tests__/transformers.test.ts   |  904 ++++++++
 .../src/emitters/__tests__/ts.test.ts         |  123 +
 .../emitters/__tests__/type-guards.test.ts    |  616 +++++
 .../src/emitters/__tests__/types.test.ts      |  594 +++++
 .../src/emitters/__tests__/zod.test.ts        |  277 +++
 .../openapi-typescript/src/emitters/auth.ts   |  755 ++++++
 .../openapi-typescript/src/emitters/client.ts |  459 ++++
 .../openapi-typescript/src/emitters/faker.ts  |  272 +++
 .../src/emitters/identifier.ts                |   98 +
 .../openapi-typescript/src/emitters/jsdoc.ts  |   80 +
 .../openapi-typescript/src/emitters/mock.ts   |  433 ++++
 .../src/emitters/operation-aliases.ts         |  246 ++
 .../src/emitters/operation-signature.ts       |   57 +
 .../src/emitters/operation-types.ts           |  151 ++
 .../src/emitters/operations.ts                |  998 ++++++++
 .../src/emitters/runtime.ts                   |  716 ++++++
 .../openapi-typescript/src/emitters/sample.ts |  172 ++
 .../openapi-typescript/src/emitters/sse.ts    |   67 +
 .../src/emitters/support.ts                   |   29 +
 .../openapi-typescript/src/emitters/swr.ts    |  215 ++
 .../src/emitters/tanstack-query.ts            |  178 ++
 .../src/emitters/transformers.ts              |  465 ++++
 .../openapi-typescript/src/emitters/ts.ts     |  147 ++
 .../src/emitters/type-guards.ts               |  250 ++
 .../openapi-typescript/src/emitters/types.ts  |  222 ++
 .../src/emitters/wrapper-support.ts           |   91 +
 .../openapi-typescript/src/emitters/zod.ts    |  268 +++
 packages/openapi-typescript/src/errors.ts     |    6 +
 .../__tests__/fixtures/empty-plugin.ts        |    2 +
 .../__tests__/fixtures/route-map-plugin.ts    |   21 +
 .../src/generators/__tests__/index.test.ts    |  117 +
 .../src/generators/__tests__/mock.test.ts     |   28 +
 .../src/generators/__tests__/resolve.test.ts  |   84 +
 .../src/generators/__tests__/sdk.test.ts      |   52 +
 .../src/generators/__tests__/swr.test.ts      |   46 +
 .../__tests__/tanstack-query.test.ts          |   55 +
 .../generators/__tests__/transformers.test.ts |   51 +
 .../src/generators/__tests__/zod.test.ts      |   33 +
 .../src/generators/index.ts                   |  104 +
 .../openapi-typescript/src/generators/mock.ts |   24 +
 .../src/generators/resolve.ts                 |  100 +
 .../openapi-typescript/src/generators/sdk.ts  |   11 +
 .../openapi-typescript/src/generators/swr.ts  |   28 +
 .../src/generators/tanstack-query.ts          |   31 +
 .../src/generators/transformers.ts            |   29 +
 .../src/generators/types.ts                   |   60 +
 .../openapi-typescript/src/generators/zod.ts  |   23 +
 packages/openapi-typescript/src/index.ts      |  124 +
 .../src/ir/__tests__/build.test.ts            | 2047 +++++++++++++++++
 .../ir/__tests__/normalize-swagger2.test.ts   |  331 +++
 .../src/ir/__tests__/refs.test.ts             |  138 ++
 .../ir/__tests__/sanitize-identifiers.test.ts |  212 ++
 packages/openapi-typescript/src/ir/build.ts   |  908 ++++++++
 packages/openapi-typescript/src/ir/model.ts   |  229 ++
 .../src/ir/normalize-swagger2.ts              |  240 ++
 packages/openapi-typescript/src/ir/refs.ts    |   66 +
 .../src/ir/sanitize-identifiers.ts            |  155 ++
 packages/openapi-typescript/src/loader.ts     |   25 +
 packages/openapi-typescript/src/plugin.ts     |   79 +
 packages/openapi-typescript/src/types.ts      |  116 +
 .../writers/__tests__/group-by-tag.test.ts    |   74 +
 .../src/writers/__tests__/index.test.ts       |   65 +
 .../writers/__tests__/split-writer.test.ts    |  268 +++
 .../__tests__/tags-split-writer.test.ts       |  148 ++
 .../src/writers/__tests__/tags-writer.test.ts |  245 ++
 .../src/writers/group-by-tag.ts               |   60 +
 .../openapi-typescript/src/writers/index.ts   |   19 +
 .../src/writers/single-file-writer.ts         |   11 +
 .../src/writers/split-writer.ts               |   40 +
 .../openapi-typescript/src/writers/tagged.ts  |   68 +
 .../src/writers/tags-split-writer.ts          |   10 +
 .../src/writers/tags-writer.ts                |    9 +
 .../openapi-typescript/src/writers/types.ts   |   32 +
 .../openapi-typescript/src/writers/util.ts    |   19 +
 packages/openapi-typescript/tsconfig.json     |   11 +
 tests/e2e/examples.test.ts                    |   80 +
 .../e2e/generate-client/args-grouped.test.ts  |   85 +
 tests/e2e/generate-client/auth.test.ts        |  171 ++
 .../base-consumer/index-cancel.ts             |   22 +
 .../generate-client/base-consumer/index.ts    |   23 +
 .../base-consumer/package.json                |    6 +
 .../base-consumer/redocly-mock-server.d.ts    |   33 +
 .../generate-client/base-consumer/server.ts   |  120 +
 .../base-consumer/tsconfig.json               |   16 +
 tests/e2e/generate-client/base.test.ts        |  184 ++
 .../cafe-consumer/index-setbaseurl.ts         |   57 +
 .../generate-client/cafe-consumer/index.ts    |  187 ++
 .../cafe-consumer/package.json                |    5 +
 .../cafe-consumer/redocly-mock-server.d.ts    |   33 +
 .../generate-client/cafe-consumer/server.ts   |  154 ++
 .../cafe-consumer/tsconfig.json               |   16 +
 tests/e2e/generate-client/cafe.snapshot.ts    | 1513 ++++++++++++
 tests/e2e/generate-client/cafe.test.ts        |  406 ++++
 tests/e2e/generate-client/config-file.test.ts |   56 +
 tests/e2e/generate-client/error-mode.test.ts  |  150 ++
 tests/e2e/generate-client/extension.test.ts   |  170 ++
 tests/e2e/generate-client/fixtures/auth.yaml  |   75 +
 tests/e2e/generate-client/fixtures/base.yaml  |  234 ++
 tests/e2e/generate-client/fixtures/cafe.yaml  | 1163 ++++++++++
 .../generate-client/fixtures/error-mode.yaml  |   36 +
 .../fixtures/no-operationid.yaml              |   20 +
 .../e2e/generate-client/fixtures/oas3.2.yaml  |   27 +
 .../fixtures/query-styles.yaml                |   56 +
 .../fixtures/route-map-plugin.mjs             |   18 +
 tests/e2e/generate-client/fixtures/sse.yaml   |   58 +
 .../generate-client/fixtures/swagger2.yaml    |   37 +
 .../fixtures/transformers.yaml                |   61 +
 .../generator-contract.test.ts                |  143 ++
 .../identifier-injection.test.ts              |   96 +
 tests/e2e/generate-client/middleware.test.ts  |  209 ++
 tests/e2e/generate-client/mock.test.ts        |  212 ++
 tests/e2e/generate-client/multipart.test.ts   |  130 ++
 .../generate-client/name-collision.test.ts    |   88 +
 tests/e2e/generate-client/parse-as.test.ts    |   89 +
 .../generate-client/path-param-idents.test.ts |  151 ++
 .../generate-client/per-instance-auth.test.ts |   78 +
 tests/e2e/generate-client/plugin.test.ts      |   53 +
 .../e2e/generate-client/query-styles.test.ts  |  113 +
 .../generate-client/redocly-config.test.ts    |   83 +
 tests/e2e/generate-client/retry.test.ts       |  149 ++
 .../e2e/generate-client/service-class.test.ts |  296 +++
 .../e2e/generate-client/spec-versions.test.ts |   67 +
 tests/e2e/generate-client/split.test.ts       |   89 +
 .../sse-consumer/index-abort.ts               |   33 +
 .../e2e/generate-client/sse-consumer/index.ts |   37 +
 .../generate-client/sse-consumer/package.json |    6 +
 .../generate-client/sse-consumer/server.ts    |   89 +
 .../sse-consumer/tsconfig.json                |   16 +
 tests/e2e/generate-client/sse.runtime.test.ts |  146 ++
 tests/e2e/generate-client/sse.test.ts         |  160 ++
 tests/e2e/generate-client/swr.test.ts         |   80 +
 tests/e2e/generate-client/tags-split.test.ts  |   84 +
 tests/e2e/generate-client/tags.test.ts        |   88 +
 .../tanstack-consumer/.gitignore              |    3 +
 .../tanstack-query.runtime.test.ts            |  127 +
 .../generate-client/tanstack-query.test.ts    |  131 ++
 .../transformers-consumer/.gitignore          |    3 +
 .../e2e/generate-client/transformers.test.ts  |  128 ++
 tests/e2e/generate-client/zod.test.ts         |   87 +
 tsconfig.build.json                           |    3 +-
 tsconfig.json                                 |   28 +-
 vitest.config.ts                              |    9 +
 275 files changed, 54094 insertions(+), 39 deletions(-)
 create mode 100644 .changeset/openapi-typescript.md
 create mode 100644 docs/@v2/commands/generate-client.md
 create mode 100644 packages/cli/src/commands/generate-client.ts
 create mode 100644 packages/openapi-typescript/ARCHITECTURE.md
 create mode 100644 packages/openapi-typescript/CONTEXT.md
 create mode 100644 packages/openapi-typescript/README.md
 create mode 100644 packages/openapi-typescript/docs/adr/0001-ast-codegen.md
 create mode 100644 packages/openapi-typescript/docs/adr/0002-typescript-peer-dep.md
 create mode 100644 packages/openapi-typescript/docs/adr/0003-spec-agnostic-ir.md
 create mode 100644 packages/openapi-typescript/docs/adr/0004-registry-seams.md
 create mode 100644 packages/openapi-typescript/docs/adr/0005-error-mode-terminals.md
 create mode 100644 packages/openapi-typescript/docs/adr/0006-sse-namespace.md
 create mode 100644 packages/openapi-typescript/docs/adr/0007-call-site-auth.md
 create mode 100644 packages/openapi-typescript/docs/adr/0008-redocly-yaml-config.md
 create mode 100644 packages/openapi-typescript/docs/adr/0009-per-instance-auth.md
 create mode 100644 packages/openapi-typescript/docs/adr/0010-mock-data-baked-vs-faker.md
 create mode 100644 packages/openapi-typescript/docs/adr/0011-wrapper-generators.md
 create mode 100644 packages/openapi-typescript/docs/adr/0012-plugin-api.md
 create mode 100644 packages/openapi-typescript/docs/adr/0013-experimental-status.md
 create mode 100644 packages/openapi-typescript/docs/adr/README.md
 create mode 100644 packages/openapi-typescript/examples/README.md
 create mode 100644 packages/openapi-typescript/examples/custom-generator/.gitignore
 create mode 100644 packages/openapi-typescript/examples/custom-generator/README.md
 create mode 100644 packages/openapi-typescript/examples/custom-generator/index.html
 create mode 100644 packages/openapi-typescript/examples/custom-generator/openapi.yaml
 create mode 100644 packages/openapi-typescript/examples/custom-generator/package.json
 create mode 100644 packages/openapi-typescript/examples/custom-generator/redocly.yaml
 create mode 100644 packages/openapi-typescript/examples/custom-generator/route-map-generator.mjs
 create mode 100644 packages/openapi-typescript/examples/custom-generator/src/api/client.routes.ts
 create mode 100644 packages/openapi-typescript/examples/custom-generator/src/api/client.ts
 create mode 100644 packages/openapi-typescript/examples/custom-generator/src/main.ts
 create mode 100644 packages/openapi-typescript/examples/custom-generator/tsconfig.json
 create mode 100644 packages/openapi-typescript/examples/custom-generator/vite.config.ts
 create mode 100644 packages/openapi-typescript/examples/fetch-functions/.gitignore
 create mode 100644 packages/openapi-typescript/examples/fetch-functions/README.md
 create mode 100644 packages/openapi-typescript/examples/fetch-functions/index.html
 create mode 100644 packages/openapi-typescript/examples/fetch-functions/openapi.yaml
 create mode 100644 packages/openapi-typescript/examples/fetch-functions/package.json
 create mode 100644 packages/openapi-typescript/examples/fetch-functions/redocly.yaml
 create mode 100644 packages/openapi-typescript/examples/fetch-functions/src/api/client.ts
 create mode 100644 packages/openapi-typescript/examples/fetch-functions/src/main.ts
 create mode 100644 packages/openapi-typescript/examples/fetch-functions/tsconfig.json
 create mode 100644 packages/openapi-typescript/examples/fetch-functions/vite.config.ts
 create mode 100644 packages/openapi-typescript/examples/mock/.gitignore
 create mode 100644 packages/openapi-typescript/examples/mock/README.md
 create mode 100644 packages/openapi-typescript/examples/mock/index.html
 create mode 100644 packages/openapi-typescript/examples/mock/openapi.yaml
 create mode 100644 packages/openapi-typescript/examples/mock/package.json
 create mode 100644 packages/openapi-typescript/examples/mock/public/mockServiceWorker.js
 create mode 100644 packages/openapi-typescript/examples/mock/redocly.yaml
 create mode 100644 packages/openapi-typescript/examples/mock/src/api/client.mocks.ts
 create mode 100644 packages/openapi-typescript/examples/mock/src/api/client.ts
 create mode 100644 packages/openapi-typescript/examples/mock/src/main.ts
 create mode 100644 packages/openapi-typescript/examples/mock/tsconfig.json
 create mode 100644 packages/openapi-typescript/examples/mock/vite.config.ts
 create mode 100644 packages/openapi-typescript/examples/programmatic/.gitignore
 create mode 100644 packages/openapi-typescript/examples/programmatic/README.md
 create mode 100644 packages/openapi-typescript/examples/programmatic/generate.ts
 create mode 100644 packages/openapi-typescript/examples/programmatic/openapi.yaml
 create mode 100644 packages/openapi-typescript/examples/programmatic/package.json
 create mode 100644 packages/openapi-typescript/examples/programmatic/src/api/client.ts
 create mode 100644 packages/openapi-typescript/examples/programmatic/src/main.ts
 create mode 100644 packages/openapi-typescript/examples/programmatic/tsconfig.json
 create mode 100644 packages/openapi-typescript/examples/service-class/.gitignore
 create mode 100644 packages/openapi-typescript/examples/service-class/README.md
 create mode 100644 packages/openapi-typescript/examples/service-class/index.html
 create mode 100644 packages/openapi-typescript/examples/service-class/openapi.yaml
 create mode 100644 packages/openapi-typescript/examples/service-class/package.json
 create mode 100644 packages/openapi-typescript/examples/service-class/redocly.yaml
 create mode 100644 packages/openapi-typescript/examples/service-class/src/api/client.ts
 create mode 100644 packages/openapi-typescript/examples/service-class/src/main.ts
 create mode 100644 packages/openapi-typescript/examples/service-class/tsconfig.json
 create mode 100644 packages/openapi-typescript/examples/service-class/vite.config.ts
 create mode 100644 packages/openapi-typescript/examples/tanstack-query/.gitignore
 create mode 100644 packages/openapi-typescript/examples/tanstack-query/README.md
 create mode 100644 packages/openapi-typescript/examples/tanstack-query/index.html
 create mode 100644 packages/openapi-typescript/examples/tanstack-query/openapi.yaml
 create mode 100644 packages/openapi-typescript/examples/tanstack-query/package.json
 create mode 100644 packages/openapi-typescript/examples/tanstack-query/redocly.yaml
 create mode 100644 packages/openapi-typescript/examples/tanstack-query/src/App.tsx
 create mode 100644 packages/openapi-typescript/examples/tanstack-query/src/api/client.tanstack.ts
 create mode 100644 packages/openapi-typescript/examples/tanstack-query/src/api/client.ts
 create mode 100644 packages/openapi-typescript/examples/tanstack-query/src/main.tsx
 create mode 100644 packages/openapi-typescript/examples/tanstack-query/tsconfig.json
 create mode 100644 packages/openapi-typescript/examples/tanstack-query/vite.config.ts
 create mode 100644 packages/openapi-typescript/examples/tsconfig.base.json
 create mode 100644 packages/openapi-typescript/examples/zod/.gitignore
 create mode 100644 packages/openapi-typescript/examples/zod/README.md
 create mode 100644 packages/openapi-typescript/examples/zod/index.html
 create mode 100644 packages/openapi-typescript/examples/zod/openapi.yaml
 create mode 100644 packages/openapi-typescript/examples/zod/package.json
 create mode 100644 packages/openapi-typescript/examples/zod/redocly.yaml
 create mode 100644 packages/openapi-typescript/examples/zod/src/api/client.ts
 create mode 100644 packages/openapi-typescript/examples/zod/src/api/client.zod.ts
 create mode 100644 packages/openapi-typescript/examples/zod/src/main.ts
 create mode 100644 packages/openapi-typescript/examples/zod/tsconfig.json
 create mode 100644 packages/openapi-typescript/examples/zod/vite.config.ts
 create mode 100644 packages/openapi-typescript/package.json
 create mode 100644 packages/openapi-typescript/scripts/regenerate-examples.mjs
 create mode 100644 packages/openapi-typescript/scripts/typecheck-examples.mjs
 create mode 100644 packages/openapi-typescript/src/__tests__/config-file.test.ts
 create mode 100644 packages/openapi-typescript/src/__tests__/config.test.ts
 create mode 100644 packages/openapi-typescript/src/__tests__/errors.test.ts
 create mode 100644 packages/openapi-typescript/src/__tests__/index.test.ts
 create mode 100644 packages/openapi-typescript/src/__tests__/loader.test.ts
 create mode 100644 packages/openapi-typescript/src/__tests__/plugin.test.ts
 create mode 100644 packages/openapi-typescript/src/config-file.ts
 create mode 100644 packages/openapi-typescript/src/config.ts
 create mode 100644 packages/openapi-typescript/src/emitters/__tests__/auth.test.ts
 create mode 100644 packages/openapi-typescript/src/emitters/__tests__/client.test.ts
 create mode 100644 packages/openapi-typescript/src/emitters/__tests__/faker.test.ts
 create mode 100644 packages/openapi-typescript/src/emitters/__tests__/fixtures.ts
 create mode 100644 packages/openapi-typescript/src/emitters/__tests__/identifier.test.ts
 create mode 100644 packages/openapi-typescript/src/emitters/__tests__/mock.test.ts
 create mode 100644 packages/openapi-typescript/src/emitters/__tests__/operation-signature.test.ts
 create mode 100644 packages/openapi-typescript/src/emitters/__tests__/operations.test.ts
 create mode 100644 packages/openapi-typescript/src/emitters/__tests__/runtime.test.ts
 create mode 100644 packages/openapi-typescript/src/emitters/__tests__/sample.test.ts
 create mode 100644 packages/openapi-typescript/src/emitters/__tests__/sse.deletion.test.ts
 create mode 100644 packages/openapi-typescript/src/emitters/__tests__/sse.test.ts
 create mode 100644 packages/openapi-typescript/src/emitters/__tests__/swr.test.ts
 create mode 100644 packages/openapi-typescript/src/emitters/__tests__/tanstack-query.test.ts
 create mode 100644 packages/openapi-typescript/src/emitters/__tests__/transformers.test.ts
 create mode 100644 packages/openapi-typescript/src/emitters/__tests__/ts.test.ts
 create mode 100644 packages/openapi-typescript/src/emitters/__tests__/type-guards.test.ts
 create mode 100644 packages/openapi-typescript/src/emitters/__tests__/types.test.ts
 create mode 100644 packages/openapi-typescript/src/emitters/__tests__/zod.test.ts
 create mode 100644 packages/openapi-typescript/src/emitters/auth.ts
 create mode 100644 packages/openapi-typescript/src/emitters/client.ts
 create mode 100644 packages/openapi-typescript/src/emitters/faker.ts
 create mode 100644 packages/openapi-typescript/src/emitters/identifier.ts
 create mode 100644 packages/openapi-typescript/src/emitters/jsdoc.ts
 create mode 100644 packages/openapi-typescript/src/emitters/mock.ts
 create mode 100644 packages/openapi-typescript/src/emitters/operation-aliases.ts
 create mode 100644 packages/openapi-typescript/src/emitters/operation-signature.ts
 create mode 100644 packages/openapi-typescript/src/emitters/operation-types.ts
 create mode 100644 packages/openapi-typescript/src/emitters/operations.ts
 create mode 100644 packages/openapi-typescript/src/emitters/runtime.ts
 create mode 100644 packages/openapi-typescript/src/emitters/sample.ts
 create mode 100644 packages/openapi-typescript/src/emitters/sse.ts
 create mode 100644 packages/openapi-typescript/src/emitters/support.ts
 create mode 100644 packages/openapi-typescript/src/emitters/swr.ts
 create mode 100644 packages/openapi-typescript/src/emitters/tanstack-query.ts
 create mode 100644 packages/openapi-typescript/src/emitters/transformers.ts
 create mode 100644 packages/openapi-typescript/src/emitters/ts.ts
 create mode 100644 packages/openapi-typescript/src/emitters/type-guards.ts
 create mode 100644 packages/openapi-typescript/src/emitters/types.ts
 create mode 100644 packages/openapi-typescript/src/emitters/wrapper-support.ts
 create mode 100644 packages/openapi-typescript/src/emitters/zod.ts
 create mode 100644 packages/openapi-typescript/src/errors.ts
 create mode 100644 packages/openapi-typescript/src/generators/__tests__/fixtures/empty-plugin.ts
 create mode 100644 packages/openapi-typescript/src/generators/__tests__/fixtures/route-map-plugin.ts
 create mode 100644 packages/openapi-typescript/src/generators/__tests__/index.test.ts
 create mode 100644 packages/openapi-typescript/src/generators/__tests__/mock.test.ts
 create mode 100644 packages/openapi-typescript/src/generators/__tests__/resolve.test.ts
 create mode 100644 packages/openapi-typescript/src/generators/__tests__/sdk.test.ts
 create mode 100644 packages/openapi-typescript/src/generators/__tests__/swr.test.ts
 create mode 100644 packages/openapi-typescript/src/generators/__tests__/tanstack-query.test.ts
 create mode 100644 packages/openapi-typescript/src/generators/__tests__/transformers.test.ts
 create mode 100644 packages/openapi-typescript/src/generators/__tests__/zod.test.ts
 create mode 100644 packages/openapi-typescript/src/generators/index.ts
 create mode 100644 packages/openapi-typescript/src/generators/mock.ts
 create mode 100644 packages/openapi-typescript/src/generators/resolve.ts
 create mode 100644 packages/openapi-typescript/src/generators/sdk.ts
 create mode 100644 packages/openapi-typescript/src/generators/swr.ts
 create mode 100644 packages/openapi-typescript/src/generators/tanstack-query.ts
 create mode 100644 packages/openapi-typescript/src/generators/transformers.ts
 create mode 100644 packages/openapi-typescript/src/generators/types.ts
 create mode 100644 packages/openapi-typescript/src/generators/zod.ts
 create mode 100644 packages/openapi-typescript/src/index.ts
 create mode 100644 packages/openapi-typescript/src/ir/__tests__/build.test.ts
 create mode 100644 packages/openapi-typescript/src/ir/__tests__/normalize-swagger2.test.ts
 create mode 100644 packages/openapi-typescript/src/ir/__tests__/refs.test.ts
 create mode 100644 packages/openapi-typescript/src/ir/__tests__/sanitize-identifiers.test.ts
 create mode 100644 packages/openapi-typescript/src/ir/build.ts
 create mode 100644 packages/openapi-typescript/src/ir/model.ts
 create mode 100644 packages/openapi-typescript/src/ir/normalize-swagger2.ts
 create mode 100644 packages/openapi-typescript/src/ir/refs.ts
 create mode 100644 packages/openapi-typescript/src/ir/sanitize-identifiers.ts
 create mode 100644 packages/openapi-typescript/src/loader.ts
 create mode 100644 packages/openapi-typescript/src/plugin.ts
 create mode 100644 packages/openapi-typescript/src/types.ts
 create mode 100644 packages/openapi-typescript/src/writers/__tests__/group-by-tag.test.ts
 create mode 100644 packages/openapi-typescript/src/writers/__tests__/index.test.ts
 create mode 100644 packages/openapi-typescript/src/writers/__tests__/split-writer.test.ts
 create mode 100644 packages/openapi-typescript/src/writers/__tests__/tags-split-writer.test.ts
 create mode 100644 packages/openapi-typescript/src/writers/__tests__/tags-writer.test.ts
 create mode 100644 packages/openapi-typescript/src/writers/group-by-tag.ts
 create mode 100644 packages/openapi-typescript/src/writers/index.ts
 create mode 100644 packages/openapi-typescript/src/writers/single-file-writer.ts
 create mode 100644 packages/openapi-typescript/src/writers/split-writer.ts
 create mode 100644 packages/openapi-typescript/src/writers/tagged.ts
 create mode 100644 packages/openapi-typescript/src/writers/tags-split-writer.ts
 create mode 100644 packages/openapi-typescript/src/writers/tags-writer.ts
 create mode 100644 packages/openapi-typescript/src/writers/types.ts
 create mode 100644 packages/openapi-typescript/src/writers/util.ts
 create mode 100644 packages/openapi-typescript/tsconfig.json
 create mode 100644 tests/e2e/examples.test.ts
 create mode 100644 tests/e2e/generate-client/args-grouped.test.ts
 create mode 100644 tests/e2e/generate-client/auth.test.ts
 create mode 100644 tests/e2e/generate-client/base-consumer/index-cancel.ts
 create mode 100644 tests/e2e/generate-client/base-consumer/index.ts
 create mode 100644 tests/e2e/generate-client/base-consumer/package.json
 create mode 100644 tests/e2e/generate-client/base-consumer/redocly-mock-server.d.ts
 create mode 100644 tests/e2e/generate-client/base-consumer/server.ts
 create mode 100644 tests/e2e/generate-client/base-consumer/tsconfig.json
 create mode 100644 tests/e2e/generate-client/base.test.ts
 create mode 100644 tests/e2e/generate-client/cafe-consumer/index-setbaseurl.ts
 create mode 100644 tests/e2e/generate-client/cafe-consumer/index.ts
 create mode 100644 tests/e2e/generate-client/cafe-consumer/package.json
 create mode 100644 tests/e2e/generate-client/cafe-consumer/redocly-mock-server.d.ts
 create mode 100644 tests/e2e/generate-client/cafe-consumer/server.ts
 create mode 100644 tests/e2e/generate-client/cafe-consumer/tsconfig.json
 create mode 100644 tests/e2e/generate-client/cafe.snapshot.ts
 create mode 100644 tests/e2e/generate-client/cafe.test.ts
 create mode 100644 tests/e2e/generate-client/config-file.test.ts
 create mode 100644 tests/e2e/generate-client/error-mode.test.ts
 create mode 100644 tests/e2e/generate-client/extension.test.ts
 create mode 100644 tests/e2e/generate-client/fixtures/auth.yaml
 create mode 100644 tests/e2e/generate-client/fixtures/base.yaml
 create mode 100644 tests/e2e/generate-client/fixtures/cafe.yaml
 create mode 100644 tests/e2e/generate-client/fixtures/error-mode.yaml
 create mode 100644 tests/e2e/generate-client/fixtures/no-operationid.yaml
 create mode 100644 tests/e2e/generate-client/fixtures/oas3.2.yaml
 create mode 100644 tests/e2e/generate-client/fixtures/query-styles.yaml
 create mode 100644 tests/e2e/generate-client/fixtures/route-map-plugin.mjs
 create mode 100644 tests/e2e/generate-client/fixtures/sse.yaml
 create mode 100644 tests/e2e/generate-client/fixtures/swagger2.yaml
 create mode 100644 tests/e2e/generate-client/fixtures/transformers.yaml
 create mode 100644 tests/e2e/generate-client/generator-contract.test.ts
 create mode 100644 tests/e2e/generate-client/identifier-injection.test.ts
 create mode 100644 tests/e2e/generate-client/middleware.test.ts
 create mode 100644 tests/e2e/generate-client/mock.test.ts
 create mode 100644 tests/e2e/generate-client/multipart.test.ts
 create mode 100644 tests/e2e/generate-client/name-collision.test.ts
 create mode 100644 tests/e2e/generate-client/parse-as.test.ts
 create mode 100644 tests/e2e/generate-client/path-param-idents.test.ts
 create mode 100644 tests/e2e/generate-client/per-instance-auth.test.ts
 create mode 100644 tests/e2e/generate-client/plugin.test.ts
 create mode 100644 tests/e2e/generate-client/query-styles.test.ts
 create mode 100644 tests/e2e/generate-client/redocly-config.test.ts
 create mode 100644 tests/e2e/generate-client/retry.test.ts
 create mode 100644 tests/e2e/generate-client/service-class.test.ts
 create mode 100644 tests/e2e/generate-client/spec-versions.test.ts
 create mode 100644 tests/e2e/generate-client/split.test.ts
 create mode 100644 tests/e2e/generate-client/sse-consumer/index-abort.ts
 create mode 100644 tests/e2e/generate-client/sse-consumer/index.ts
 create mode 100644 tests/e2e/generate-client/sse-consumer/package.json
 create mode 100644 tests/e2e/generate-client/sse-consumer/server.ts
 create mode 100644 tests/e2e/generate-client/sse-consumer/tsconfig.json
 create mode 100644 tests/e2e/generate-client/sse.runtime.test.ts
 create mode 100644 tests/e2e/generate-client/sse.test.ts
 create mode 100644 tests/e2e/generate-client/swr.test.ts
 create mode 100644 tests/e2e/generate-client/tags-split.test.ts
 create mode 100644 tests/e2e/generate-client/tags.test.ts
 create mode 100644 tests/e2e/generate-client/tanstack-consumer/.gitignore
 create mode 100644 tests/e2e/generate-client/tanstack-query.runtime.test.ts
 create mode 100644 tests/e2e/generate-client/tanstack-query.test.ts
 create mode 100644 tests/e2e/generate-client/transformers-consumer/.gitignore
 create mode 100644 tests/e2e/generate-client/transformers.test.ts
 create mode 100644 tests/e2e/generate-client/zod.test.ts

diff --git a/.changeset/openapi-typescript.md b/.changeset/openapi-typescript.md
new file mode 100644
index 0000000000..e73a325d73
--- /dev/null
+++ b/.changeset/openapi-typescript.md
@@ -0,0 +1,6 @@
+---
+'@redocly/openapi-typescript': minor
+'@redocly/cli': minor
+---
+
+Add the `generate-client` command (**experimental**): generate a typed, zero-dependency TypeScript client from an OpenAPI description.
diff --git a/.gitignore b/.gitignore
index 0163899902..204fd0157d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,6 @@ redoc-static.html
 packages/cli/README.md
 .env
 packages/respect-core/src/modules/runtime-expressions/abnf-parser.js
+tests/e2e/generate-client/base-consumer/api.ts
+tests/e2e/generate-client/cafe-consumer/api.ts
+tests/e2e/generate-client/sse-consumer/api.ts
diff --git a/.oxfmtrc.json b/.oxfmtrc.json
index 6d4a822732..b744bd7103 100644
--- a/.oxfmtrc.json
+++ b/.oxfmtrc.json
@@ -5,6 +5,7 @@
   "experimentalSortPackageJson": false,
   "ignorePatterns": [
     "coverage/",
+    "packages/openapi-typescript/examples/*/src/api/",
     "lib/",
     "output/",
     "packages/core/src/rules/common/__tests__/fixtures/invalid-yaml.yaml",
@@ -12,6 +13,7 @@
     "tests/performance/api-definitions/",
     "LICENSE.md",
     "snapshot*.txt",
+    "*.snapshot.ts",
     ".changeset/pre.json",
     "*.html",
     "tests/e2e/**/*.yaml",
diff --git a/.oxlintrc.json b/.oxlintrc.json
index c4572b9f74..2ebed39660 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -9,7 +9,14 @@
     "builtin": true,
     "es2026": true
   },
-  "ignorePatterns": ["packages/*/lib/**", "*.js", "*.cjs"],
+  "ignorePatterns": [
+    "packages/*/lib/**",
+    "packages/openapi-typescript/examples/*/src/api/**",
+    "packages/openapi-typescript/examples/*/generate.ts",
+    "*.js",
+    "*.cjs",
+    "tests/e2e/generate-client/*.snapshot.ts"
+  ],
   "rules": {
     "eslint/no-array-constructor": "error",
     "eslint/no-case-declarations": "error",
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 88d6d32e37..49f229932a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -226,23 +226,96 @@ When running tests, make sure the code is compiled (`npm run compile`).
 Having `redocly.yaml` in the root of the project affects the unit tests, and console logs affect the e2e tests, so make sure to get rid of both before running tests.
 Run `npm test` to start both unit and e2e tests (and additionally typecheck the code).
 
+### Monorepo test conventions
+
+This is a monorepo with NPM workspaces.
+All tests share a single Vitest installation and a single configuration file at the repository root.
+Do not add a per-package `vitest.config.ts`, a per-package `test` script, or per-package `vitest` / `@vitest/*` dependencies — they will be ignored or conflict with the root setup.
+
+The root configuration is in [`vitest.config.ts`](./vitest.config.ts) and defines:
+
+- The `unit` suite, which discovers tests via the glob `packages/*/src/**/*.test.ts`.
+- The `e2e` suite, which discovers tests under `tests/e2e/**`.
+- Coverage (Istanbul provider) collected for packages enumerated in `coverage.include`.
+- Repo-wide minimum coverage thresholds, plus optional per-glob overrides for packages that want stricter limits.
+
+Vitest globals (`describe`, `it`, `expect`, `vi`, `beforeEach`, `afterEach`, …) are enabled and the TypeScript types for them are provided through [`tsconfig.json`](./tsconfig.json)'s `"types": ["vitest/globals", "node"]`.
+Do **not** add `import { describe, it, expect } from 'vitest'` to test files — those names are already in scope.
+
+### Where tests live
+
+Tests live next to the source they cover, inside a sibling `__tests__/` folder, and use the `.test.ts` suffix:
+
+```text
+packages/<your-package>/
+  src/
+    feature.ts
+    __tests__/
+      feature.test.ts        ← unit tests
+    submodule/
+      thing.ts
+      __tests__/
+        thing.test.ts
+```
+
+The root config automatically picks them up; no additional wiring is needed for **discovery**.
+
+### Adding tests for a new package
+
+When introducing a new package under `packages/`, do the following to plug it into the existing test infrastructure:
+
+1. Author tests under `packages/<your-package>/src/**/__tests__/*.test.ts`. Use the Vitest globals — no imports from `'vitest'`.
+2. Open the root [`vitest.config.ts`](./vitest.config.ts) and append your package's source glob to `coverage.include`, for example:
+
+   ```typescript
+   include: [
+     'packages/cli/src/**/*.ts',
+     'packages/core/src/**/*.ts',
+     'packages/respect-core/src/**/*.ts',
+     'packages/<your-package>/src/**/*.ts',
+   ],
+   ```
+
+3. If your package contains pure type-definition modules (files that compile to empty `.js` like `types.ts` or `model.ts`), add them to `coverage.exclude` so they don't dilute the coverage signal.
+4. Optionally enforce stricter per-file coverage for your package using a per-glob threshold alongside the repo-wide minimums:
+
+   ```typescript
+   thresholds: {
+     lines: 80,
+     functions: 83,
+     statements: 80,
+     branches: 72,
+     'packages/<your-package>/src/**/*.ts': {
+       lines: 100,
+       functions: 100,
+       statements: 100,
+       branches: 100,
+     },
+   },
+   ```
+
+5. Do not declare `vitest` or `@vitest/coverage-istanbul` in the new package's `package.json`. They are workspace-wide dev dependencies, installed once at the root.
+
 ### Unit tests
 
 Run unit tests with this command: `npm run unit`.
+This runs the suite for every package whose tests match the discovery glob — there is no per-package `npm test` script.
 
 Unit tests in the **cli** package are sensitive to top-level configuration file (**redocly.yaml**).
 
-To run tests from a single file, run: `npm run unit -- <path/to/your/file.test.ts>`
+To run tests from a single file, run: `npm run unit -- <path/to/your/file.test.ts>`.
 To run a specific test, use this command: `npm run unit -- -t 'Test name'`.
 To update snapshots, run `npm run unit -- -u`.
 
+Run `npm run unit` with coverage reporting always enabled (the `coverage` block in the root config sets `enabled: true`); the HTML report is written to `coverage/`.
+
 ### E2E tests
 
 Run e2e tests with this command: `npm run e2e`.
 
 E2E tests are sensitive to any additional output (like `console.log`) in the source code.
 
-To update snapshots, run `npm run e2e -- -u`.
+To update snapshots, run `npm run e2e -- -u`. This includes the file-based snapshots used by some tests via `toMatchFileSnapshot` (for example, `tests/e2e/generate-client/cafe.snapshot.ts` — the committed full-file output of the TypeScript client generator). Always review snapshot diffs in the pull request to confirm the change is intentional.
 
 If you made any changes, make sure to compile the code before running the tests.
 
diff --git a/README.md b/README.md
index 7ffb8715b2..8c8ee6e1c9 100644
--- a/README.md
+++ b/README.md
@@ -139,6 +139,24 @@ Respect is Redocly's community-edition product. Looking for something more? We a
 
 Learn more about [Respect](https://redocly.com/respect) and [get started with API contract testing](https://redocly.com/docs/respect/get-started).
 
+### Generate a TypeScript client
+
+> ⚠️ **Experimental** — flags, output, and configuration may change in any minor release until declared stable.
+
+Turn an OpenAPI description (3.0/3.1/3.2 or Swagger 2.0) into a typed TypeScript client with the
+`generate-client` command. The emitted client has **zero runtime dependencies** — it uses only
+web-standard APIs (`fetch`, `AbortController`, …), so it runs in browsers, Node, Bun, Deno, and edge
+runtimes.
+
+```sh
+redocly generate-client openapi.yaml --output src/client.ts
+```
+
+Inline types plus one async function per operation (or `--facade service-class` for class methods),
+with auth, opt-in abort-aware retries, middleware, and typed Server-Sent Events. The same command can
+also emit Zod schemas, TanStack Query / SWR hooks, MSW mocks, and more via `--generators`.
+[Read the `generate-client` docs](./docs/@v2/commands/generate-client.md).
+
 ### Transform an OpenAPI description
 
 If your OpenAPI description isn't everything you hoped it would be, enhance it with the Redocly [decorators](https://redocly.com/docs/cli/decorators) feature.
diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
new file mode 100644
index 0000000000..99ced7fb6d
--- /dev/null
+++ b/docs/@v2/commands/generate-client.md
@@ -0,0 +1,1034 @@
+---
+slug:
+  - /docs/cli/commands/generate-client
+---
+
+# `generate-client`
+
+{% admonition type="warning" name="Experimental" %}
+`generate-client` is **experimental**. Its CLI flags, generated output, configuration schema, and the
+custom-generator plugin API may change in any minor release until the feature is declared stable. Pin
+your `@redocly/cli` version if you depend on the generated output, and plan to regenerate when you
+upgrade. We'd love your feedback while we stabilize it.
+{% /admonition %}
+
+Generate a typed TypeScript client from an OpenAPI description.
+
+Accepts **OpenAPI 3.0, 3.1, and 3.2.0**, plus **Swagger 2.0** (normalized to the 3.x shape
+before generation). `<input>` is a file path, a URL, or an `apis:` alias from `redocly.yaml`.
+
+The generated client has **zero runtime dependencies** — it uses only web-standard APIs
+(`fetch`, `AbortController`, `URLSearchParams`, …), so it runs in browsers, Node, Bun,
+Deno, and edge runtimes. Code is produced through the TypeScript compiler AST (not string
+templates), so output is correct by construction. By default it emits a single file
+containing inline types and one async function per operation.
+
+## Usage
+
+```sh
+npx @redocly/cli@latest generate-client <input> --output <file.ts>
+
+# <input> is an OpenAPI description file path or an `apis:` alias from redocly.yaml
+redocly generate-client openapi.yaml --output src/client.ts
+redocly generate-client cafe -o src/client.ts
+```
+
+## Options
+
+{% table %}
+
+- Option {% width="20%" %}
+- Type {% width="15%" %}
+- Description
+
+---
+
+- `input` {% required=true %}
+- `string`
+- Positional argument: OpenAPI description file path, or an alias from the `apis:` section of `redocly.yaml`.
+
+---
+
+- `--output`, `-o` {% required=true %}
+- `string`
+- Output path for the generated client. Must end in `.ts`. In multi-file modes it is the entry file; sibling files derive from its name and directory.
+
+---
+
+- `--output-mode`
+- `string`
+- File layout: `single` (default, one file), `split` (endpoints, schemas, and runtime in sibling files), `tags` (one endpoints file per OpenAPI tag), or `tags-split` (a folder per tag). All multi-file modes share the schemas and runtime modules.
+
+---
+
+- `--generators`
+- `string`
+- Comma-separated generators to run (default `sdk`). `sdk` is the typed client; `zod` additionally emits a standalone `<output>.zod.ts` module of [Zod](https://zod.dev) schemas; `tanstack-query` additionally emits a `<output>.tanstack.ts` module of [TanStack Query](https://tanstack.com/query) v5 factories wrapping the sdk (framework selected by `--query-framework`); `swr` additionally emits a `<output>.swr.ts` module of [SWR](https://swr.vercel.app) hooks; `mock` additionally emits a `<output>.mocks.ts` module of [MSW](https://mswjs.io) request handlers (data controlled by `--mock-data`); `transformers` additionally emits a `<output>.transformers.ts` module of `transform<Name>` functions that convert wire ISO strings to `Date` (pair with `--date-type Date`). Example: `--generators sdk,zod` or `--generators sdk,tanstack-query,mock`.
+
+---
+
+- `--query-framework`
+- `string`
+- TanStack Query adapter the `tanstack-query` generator imports from: `react` (default), `vue`, `svelte`, or `solid`. Only the import specifier changes — the emitted factory module is byte-identical across frameworks.
+
+---
+
+- `--mock-data`
+- `string`
+- How the `mock` generator produces data: `baked` (default) inlines deterministic literals (zero runtime dependency); `faker` emits `@faker-js/faker` calls for realistic data (install `@faker-js/faker` as a dev dependency).
+
+---
+
+- `--mock-seed`
+- `number`
+- Seed for faker-mode mocks: emits a top-level `faker.seed(<n>)` so generated data is reproducible across runs. Ignored in `baked` mode.
+
+---
+
+- `--date-type`
+- `string`
+- How `date-time`/`date` string fields are typed: `string` (default) keeps the ISO wire shape, byte-identical to before; `Date` emits a `Date` instead. Pair `--date-type Date` with `--generators sdk,transformers` so the runtime value (parsed by `transform<Name>`) matches the type. `int64` → `bigint` is deferred to a follow-up.
+
+---
+
+- `--facade`
+- `string`
+- Developer-facing operation shape: `functions` (default, standalone async functions) or `service-class` (operations grouped as class methods — one `Client` class in `single`/`split`, one service class per tag in `tags`/`tags-split`).
+
+---
+
+- `--name`
+- `string`
+- Class name for the `service-class` facade in `single`/`split` layouts (ignored otherwise). Defaults to `Client`.
+
+---
+
+- `--args-style`
+- `string`
+- How operation inputs are passed: `flat` (default) spreads path params as positional arguments followed by `params`/`body`/`headers`; `grouped` bundles every input into a single `vars` object (typed as the operation's `<Op>Variables`). The per-call request `init` stays a separate trailing argument in both styles.
+
+---
+
+- `--enum-style`
+- `string`
+- How named string enums are emitted: `const-object` (default) emits a runtime `as const` object alongside the union type; `union` emits only the union type.
+
+---
+
+- `--error-mode`
+- `string`
+- Error-handling shape: `throw` (default) throws `ApiError` on a non-2xx response; `result` returns a discriminated `{ data, error, response }` object instead, with `error` typed from the spec's 4xx/5xx response bodies.
+
+---
+
+- `--base-url`
+- `string`
+- Override the `BASE` URL inlined into the generated runtime. Defaults to `servers[0].url` from the description. Must be a valid URL.
+
+---
+
+- `--config`
+- `string`
+- Path to the `redocly.yaml` configuration file (where the `x-openapi-typescript` block lives). Defaults to the `redocly.yaml` discovered in the working directory.
+
+---
+
+- `--config-file`
+- `string`
+- Path to a dedicated `defineConfig` config file (`*.config.ts`/`.mjs`/`.js`), as an alternative to the `redocly.yaml` `x-openapi-typescript` block. Useful when the config lives outside the project or in a nested folder.
+
+{% /table %}
+
+## Configuration
+
+Instead of passing flags every time, you can put the settings in your `redocly.yaml` under
+an `x-openapi-typescript` block. `generate-client` reads it automatically — from a `redocly.yaml`
+in the working directory, or one pointed to by the standard `--config` flag:
+
+```yaml
+# redocly.yaml
+x-openapi-typescript:
+  input: ./openapi.yaml
+  output: ./src/api/client.ts
+  generators:
+    - sdk
+  facade: service-class
+```
+
+Then simply run:
+
+```sh
+redocly generate-client
+```
+
+Relative `input`/`output` are resolved against the `redocly.yaml` directory, so the command
+works the same from any working directory.
+
+A dedicated `defineConfig` file is also supported via `--config-file` (useful when the config
+lives outside the project or in a nested folder):
+
+```sh
+redocly generate-client --config-file ./config/openapi-typescript.config.ts
+```
+
+**Precedence** (lowest to highest): the `redocly.yaml` `x-openapi-typescript` block → an explicit
+`--config-file` → individual CLI flags. Each layer overrides per setting, so you can keep a base
+config and override one value on the command line.
+
+## Examples
+
+Generate a single-file client (the default):
+
+```sh
+redocly generate-client openapi.yaml --output src/client.ts
+```
+
+Split the output across files, one endpoints file per tag:
+
+```sh
+redocly generate-client openapi.yaml --output src/client.ts --output-mode tags
+```
+
+Emit a class-based client and override the base URL for a staging environment:
+
+```sh
+redocly generate-client openapi.yaml \
+  --output src/client.ts \
+  --facade service-class \
+  --name CafeClient \
+  --base-url https://staging.cafe.cloud.redocly.com
+```
+
+Once generated, import and call operations directly:
+
+```ts
+import { configure, listMenuItems, getOrderById, setBearer } from './client.ts';
+
+setBearer(token); // auth helpers are generated from the spec's securitySchemes
+
+const menu = await listMenuItems({ limit: 10 });
+const order = await getOrderById('ord_01khr487f7qm7p44xn427m43vb');
+```
+
+## Authentication
+
+A setter is generated for each `securityScheme` the runtime can apply, and each operation
+automatically sends the credentials its `security` requires:
+
+| Scheme                 | Generated setter                          | Applied as                      |
+| ---------------------- | ----------------------------------------- | ------------------------------- |
+| HTTP `bearer` / OAuth2 | `setBearer(token)`                        | `Authorization: Bearer <token>` |
+| HTTP `basic`           | `setBasicAuth(username, password)`        | `Authorization: Basic <base64>` |
+| `apiKey` in header     | `setApiKey(key)` / `setApiKey<Name>(key)` | the named request header        |
+| `apiKey` in query      | `setApiKey(key)` / `setApiKey<Name>(key)` | the named URL query parameter   |
+| `apiKey` in cookie     | `setApiKey(key)` / `setApiKey<Name>(key)` | folded into the `Cookie` header |
+
+`setApiKey` is unsuffixed when the spec declares a single apiKey scheme; otherwise each gets a
+`setApiKey<SchemeName>` setter. `mutualTLS` is not injectable.
+
+Bearer and apiKey credentials accept a **`TokenProvider`** — a string, or a (possibly async)
+function called per request, which is handy for refresh-token flows:
+
+```ts
+import { setBearer, setBasicAuth, setApiKey } from './client.ts';
+
+setBearer('static-token'); // a literal value
+setBearer(async () => await getFreshAccessToken()); // resolved before each authed call
+setBasicAuth('alice', 's3cr3t'); // encoded as `Authorization: Basic <base64>`
+setApiKey('my-api-key'); // header / query / cookie, per the scheme's `in`
+```
+
+### Per-instance credentials (service-class facade)
+
+The setters above are **module-global** — every call shares them. When you run multiple independent
+clients (the reason to choose `--facade service-class`), give each instance its own credentials via
+`ClientConfig.auth`. It overrides the global setters for that instance and still honors each
+operation's declared `security`; omitted fields fall back to the global slots.
+
+```ts
+import { Client } from './client.ts';
+
+// Two instances of the same client, different credentials — no shared global state.
+const internal = new Client({ auth: { basic: { username: 'svc', password: 's3cr3t' } } });
+const publicApi = new Client(); // no auth
+
+// `auth` mirrors the schemes the spec declares:
+//   { bearer?: TokenProvider; basic?: { username; password }; apiKey?: Record<string, TokenProvider> }
+const withToken = new Client({ auth: { bearer: async () => getAccessToken() } });
+```
+
+The functions facade can set the same field once globally via `configure({ auth: … })`.
+
+## Argument style
+
+By default each operation takes **positional arguments** — path params in URL order,
+then `params` (query), `body`, and `headers` slots, with the per-call request `init`
+last:
+
+```ts
+// --args-style flat (default)
+const order = await updateOrder(
+  'ord_01khr487f7qm7p44xn427m43vb', // orderId path param
+  { ...orderBody } // request body
+);
+```
+
+With `--args-style grouped`, every input is bundled into a single `vars` object typed
+as the operation's exported `<Op>Variables` type. The `init` argument stays separate:
+
+```ts
+// --args-style grouped
+const order = await updateOrder({
+  orderId: 'ord_01khr487f7qm7p44xn427m43vb',
+  body: { ...orderBody },
+});
+```
+
+The grouped style is order-independent and additive — new path or query params show up
+as new keys rather than shifting positions — which makes it a good fit as specs evolve
+and for wiring operations into React Query / SWR `mutationFn`s. Operations with no
+inputs take no `vars` object at all (just the optional `init`).
+
+```sh
+redocly generate-client openapi.yaml --output src/client.ts --args-style grouped
+```
+
+## Query serialization
+
+Query parameters are serialized per their OpenAPI `style` / `explode` / `allowReserved`
+declarations. The default — `style: form` with `explode: true` — repeats array values
+(`tags=a&tags=b`) and is what you get when you declare nothing. The other supported forms:
+
+| `style`          | `explode` | Array `['a', 'b']` on the wire |
+| ---------------- | --------- | ------------------------------ |
+| `form` (default) | `true`    | `key=a&key=b`                  |
+| `form`           | `false`   | `key=a,b`                      |
+| `spaceDelimited` | `false`   | `key=a%20b`                    |
+| `pipeDelimited`  | `false`   | `key=a\|b`                     |
+
+Delimiters are emitted literally (the individual values are still percent-encoded).
+`allowReserved: true` leaves the RFC-3986 reserved set (`:/?#[]@!$&'()*+,;=`) un-encoded
+in a value, so e.g. `filter=a/b` survives instead of `filter=a%2Fb`. Declare these on the
+parameter object in the spec:
+
+```yaml
+- name: tags
+  in: query
+  style: pipeDelimited
+  explode: false
+  schema:
+    type: array
+    items:
+      type: string
+```
+
+Object-valued query params serialize as `deepObject` brackets (`key[sub]=val`).
+
+{% admonition type="info" name="Note" %}
+An object param at the default `form` style is also emitted as `key[sub]=val` brackets rather than
+the spec's `sub=val` spread.
+{% /admonition %}
+
+## Error handling
+
+By default (`--error-mode throw`) an operation throws an `ApiError` on any non-2xx
+response, so a call returns the success body directly:
+
+```ts
+try {
+  const order = await getOrderById('ord_01khr487f7qm7p44xn427m43vb');
+} catch (err) {
+  if (err instanceof ApiError) console.error(err.status, err.body);
+}
+```
+
+With `--error-mode result`, an operation never throws on a non-2xx response. Instead it
+returns a discriminated `Result<TData, TError>` — `{ data, error, response }` — whose
+`error` is typed from the spec's declared 4xx/5xx response bodies (the `<Op>Error`
+union). On success `error` is `undefined`; on a non-2xx response `data` is `undefined`
+and `error` holds the typed body. `response` is always the raw `Response`, so the HTTP
+status is `response.status`:
+
+```ts
+// --error-mode result
+const { data, error, response } = await getThing('thing_123');
+if (error) {
+  // `error` is typed (e.g. ProblemDetails); narrow on the status if needed.
+  console.error(response.status, error.title);
+} else {
+  console.log(data.id); // `data` is the success body
+}
+```
+
+Transport-level and abort failures still throw in both modes; the `onError` hook applies
+to `throw` mode only. The choice is made once at generate time for the whole client.
+
+```sh
+redocly generate-client openapi.yaml --output src/client.ts --error-mode result
+```
+
+## Operation metadata
+
+Alongside the operations, the client exports an `OPERATIONS` map keyed by
+operationId, holding each operation's HTTP method and path template (with
+`{param}` placeholders intact):
+
+```ts
+export const OPERATIONS = {
+  listMenuItems: { method: 'GET', path: '/menu' },
+  getOrderById: { method: 'GET', path: '/orders/{orderId}' },
+  // …
+} as const;
+
+export type OperationId = keyof typeof OPERATIONS;
+export type OperationMetadata = { readonly method: string; readonly path: string };
+```
+
+Because the keys and values are plain string literals — not function or method
+names — they survive bundling and minification. That makes `OPERATIONS` the stable
+handle to reach for when building cache/query keys, tracing span names, or request
+log labels, instead of reflecting over a function (`fn.name` / `fn.toString()`),
+which a minifier can rename:
+
+```ts
+import { OPERATIONS, getOrderById } from './client.ts';
+
+// Stable React Query key, robust under minification.
+const queryKey = [OPERATIONS.getOrderById.path, orderId];
+const order = await getOrderById(orderId);
+```
+
+The map is emitted for both facades (`functions` and `service-class`) and, in the
+multi-file output modes, lives once in the shared schemas module and is re-exported
+from the entry barrel.
+
+## Discriminated unions
+
+A `oneOf` / `anyOf` with a usable discriminator gets an exported `is<Member>` type
+guard per member, narrowing the union to that member's named type. The discriminator
+is taken from the spec's `discriminator` block, or inferred when every member is a
+named schema that pins one shared property to a distinct string `const`.
+
+```ts
+export type MenuItem = Beverage | Dessert;
+
+export function isBeverage(value: MenuItem): value is Beverage { … }
+export function isDessert(value: MenuItem): value is Dessert { … }
+```
+
+Guards are also emitted when the union is **nested** inside another schema — e.g. the
+`items` of an array, or a property value — as long as every member is a named schema.
+The guard's parameter is then the inline member union:
+
+```ts
+// `BulkResult = (BulkSuccessItem | BulkErrorItem)[]` — a discriminated array.
+export function isBulkSuccessItem(
+  value: BulkSuccessItem | BulkErrorItem
+): value is BulkSuccessItem { … }
+
+// Narrow each item without hand-writing the discriminant check:
+const created = result.flatMap((item) => (isBulkSuccessItem(item) ? [item.resource] : []));
+```
+
+{% admonition type="info" name="Note" %}
+Each `is<Member>` is emitted once, even when the same member appears in several unions
+(the first occurrence in document order wins). A union without a usable discriminator
+gets no guard — TypeScript can't soundly narrow it.
+{% /admonition %}
+
+## Middleware
+
+Beyond the single `onRequest` / `onResponse` / `onError` hooks on `ClientConfig`, the client
+takes **composable middleware** — the escape hatch for cross-cutting concerns like auth-token
+refresh, logging, tracing, or request IDs. A middleware is an object with any subset of the three
+hooks:
+
+```ts
+type Middleware = {
+  onRequest?: (ctx: RequestContext) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext
+  ) => Response | void | Promise<Response | void>;
+  onError?: (error: ApiError, ctx: RequestContext) => Error | Promise<Error>; // throw mode
+};
+```
+
+Register with `use()` (functions facade) or `<Client>.use()` (service-class facade); both accept
+several at once and can be called repeatedly:
+
+```ts
+// functions facade
+import { use, configure } from './client.ts';
+use(
+  {
+    onRequest: (ctx) => {
+      ctx.headers['X-Request-Id'] = crypto.randomUUID();
+    },
+  },
+  {
+    onResponse: (res) => {
+      console.debug(res.status);
+    },
+  }
+);
+
+// service-class facade
+const client = new Client({ middleware: [authRefresh] }); // declaratively…
+client.use(logging); // …or imperatively (chainable)
+```
+
+`onRequest` runs in registration order; `onResponse` runs in **reverse** — an onion, so the
+last-registered middleware wraps closest to the network. `onError` (throw mode only) is threaded
+through each middleware in turn, so any can map the failure. `onRequest` may mutate the request
+context (`url` / `method` / `headers`); `onResponse` may return a replacement `Response`.
+
+`onRequest` and `onResponse` run for every request — under both `throw` and `result` error modes,
+and around each Server-Sent-Events connect/reconnect. `onError` only fires when a non-2xx response
+would be **thrown**, so it is a no-op in `result` mode (inspect `result.error` instead) and for SSE
+(which throws its own `ApiError`). Transport/network failures are not routed through `onError`.
+
+{% admonition type="info" name="Relation to the single hooks" %}
+The `onRequest` / `onResponse` / `onError` fields on `ClientConfig` still work — they run as one
+implicit, first middleware. `use()` simply appends to the same chain (`ClientConfig.middleware`),
+so existing code is unaffected.
+{% /admonition %}
+
+## Retries
+
+The generated client can retry transient failures. Retry is **opt-in** and configured
+through `ClientConfig`, with an optional per-call override.
+
+```ts
+// Global policy (functions facade)
+configure({ retry: { retries: 3 } });
+
+// Per instance (service-class facade)
+const client = new Client({ retry: { retries: 3 } });
+
+// Per call — opt in where there is no global policy
+await getOrderById('ord_01khr487f7qm7p44xn427m43vb', {}, { retry: { retries: 5 } });
+
+// Per call — opt out where a global policy is set
+await listMenuItems({ limit: 10 }, { retry: { retries: 0 } });
+```
+
+By default only **idempotent** methods (`GET`, `HEAD`, `PUT`, `DELETE`, `OPTIONS`)
+are retried, on a network error or a transient status (`408`, `429`, `500`, `502`,
+`503`, `504`). `POST`/`PATCH` are **not** retried automatically, because re-sending a
+non-idempotent request can duplicate side effects. Opt in explicitly when your API is
+safe (e.g. it uses idempotency keys):
+
+```ts
+await createOrder(body, { retry: { retries: 3, retryOn: () => true } });
+```
+
+Backoff is exponential with full jitter (`retryStrategy: 'fixed'` for a constant
+delay). A `Retry-After` response header takes precedence over the computed delay.
+Retries stop immediately when the request's `AbortSignal` aborts.
+
+### `RetryConfig` fields
+
+{% table %}
+
+- Field {% width="20%" %}
+- Type {% width="25%" %}
+- Description
+
+---
+
+- `retries`
+- `number`
+- Number of _extra_ attempts after the first. Default `0` (opt-in; `0` disables retry).
+
+---
+
+- `retryDelay`
+- `number`
+- Base delay in milliseconds. Default `1000`.
+
+---
+
+- `retryStrategy`
+- `'fixed' | 'exponential'`
+- Backoff shape. Default `'exponential'`.
+
+---
+
+- `jitter`
+- `boolean`
+- Apply full jitter over the computed delay. Default `true`.
+
+---
+
+- `retryOn`
+- `(ctx: RetryContext) => boolean | Promise<boolean>`
+- Decide whether to retry a failed attempt. Defaults to the idempotent-only predicate described above.
+
+{% /table %}
+
+A per-call override is merged field-by-field over the global policy, so a single field
+(such as `retries: 0`) can disable retry for one call without restating the whole policy.
+
+### Custom `retryOn`
+
+`retryOn` receives a `RetryContext` for the attempt that just failed and returns whether to
+retry. A custom predicate **fully replaces** the idempotent-only default — so it is also how
+you opt a `POST`/`PATCH` into retrying (the method is no longer checked for you).
+
+{% table %}
+
+- Field {% width="20%" %}
+- Type {% width="25%" %}
+- Description
+
+---
+
+- `attempt`
+- `number`
+- 1-based number of the attempt that just failed.
+
+---
+
+- `request`
+- `RequestContext`
+- The attempted request: `{ url, method, headers, body }`.
+
+---
+
+- `response`
+- `Response | undefined`
+- Present when the server returned a (non-ok) response. Absent on a transport error.
+
+---
+
+- `error`
+- `unknown`
+- Present when the transport threw (network error, DNS, connection reset). Absent on an HTTP response.
+
+{% /table %}
+
+Exactly one of `response` / `error` is set: branch on `ctx.error` for transport failures and
+`ctx.response` for HTTP status codes. To inspect the **response body**, clone it first — the body
+is a single-use stream, and reading it directly would leave nothing for the client to parse:
+
+```ts
+await pushRemoteContent(
+  { orgId, projectId, body: formData },
+  {
+    retry: {
+      retries: 5,
+      retryDelay: 1000,
+      retryStrategy: 'exponential',
+      retryOn: async (ctx) => {
+        if (ctx.error) return true; // network / connection error — retry
+        const res = ctx.response;
+        if (!res) return false;
+        if (res.status >= 500) return true;
+        // Body inspection: clone() so the original stream stays readable downstream.
+        const body = await res
+          .clone()
+          .json()
+          .catch(() => undefined);
+        return body?.title === 'Multipart: Unexpected end of form';
+      },
+    },
+  }
+);
+```
+
+{% admonition type="warning" name="Read the body via clone()" %}
+`ctx.response` is the raw `Response` — its body can be read only once. Always inspect it through
+`ctx.response.clone()`; calling `.json()`/`.text()` on `ctx.response` directly consumes the stream
+and the client can no longer decode the result.
+{% /admonition %}
+
+## Multipart uploads
+
+A `multipart/form-data` request body whose schema is an **object** is generated as a typed
+object — you pass a plain object and the client serializes it to `FormData` for you. Binary
+fields (`type: string, format: binary`) are typed as `Blob` (a `File` is assignable):
+
+```ts
+// type UploadBody = { file: Blob; orgId: string; tags?: string[] };
+await upload({ file, orgId: 'org_1', tags: ['a', 'b'] });
+```
+
+Serialization rules: `Blob`/`File` and strings pass through; arrays append one field per item;
+nested objects are JSON-encoded; other scalars are stringified; `undefined`/`null` are skipped.
+A multipart body whose schema **isn't** a concrete object keeps the raw `FormData` type, so you
+can build the form yourself when the shape can't be expressed.
+
+`format: binary` surfaces as `Blob` wherever it appears; `format: byte` (base64) stays a `string`.
+
+## Response decoding
+
+By default the client reads each response body by negotiating from its `Content-Type`
+(JSON, then `text/*`, then `Blob`). The per-call request `init` accepts a `parseAs`
+option to force a specific reader:
+
+```ts
+// Read the raw bytes as a stream instead of decoding JSON.
+const res = await getMenuItemPhoto('prd_01khr487f7qm7p44xn427m43vb', { parseAs: 'stream' });
+for await (const chunk of res as ReadableStream<Uint8Array>) {
+  // …consume the stream…
+}
+```
+
+`parseAs` accepts `'json'`, `'text'`, `'blob'`, `'arrayBuffer'`, `'formData'`,
+`'stream'` (the raw `ReadableStream` from `response.body`), or `'auto'` (the default
+content-type sniff).
+
+{% admonition type="warning" name="Runtime override only" %}
+`parseAs` does not change the operation's static return type. Forcing a reader that disagrees with
+the schema (for example `'blob'` on a JSON endpoint) returns that value at runtime while TypeScript
+still reports the declared type; reconciling the two is the caller's responsibility.
+{% /admonition %}
+
+## Runtime validation with Zod
+
+Pass `--generators sdk,zod` to additionally emit a standalone `<output>.zod.ts` module of
+[Zod](https://zod.dev) schemas — one `export const <Name>Schema` per schema in the
+description:
+
+```sh
+redocly generate-client openapi.yaml --output src/client.ts --generators sdk,zod
+# → src/client.ts (the zero-dependency client) + src/client.zod.ts (the Zod schemas)
+```
+
+The generated **client stays dependency-free** and never imports Zod. The `*.zod.ts`
+module is the only file that imports Zod, so install it in your app as a peer:
+
+```sh
+npm install zod   # any zod ^3.23 || ^4
+```
+
+Validate a payload with `.parse()` (or `.safeParse()`), and derive the static type from
+the same schema with `z.infer` — it matches the client's exported type:
+
+```ts
+import { z } from 'zod';
+import type { Pet } from './client.ts';
+import { PetSchema } from './client.zod.ts';
+
+const pet = PetSchema.parse(await res.json()); // throws on invalid input
+type PetFromSchema = z.infer<typeof PetSchema>; // structurally equal to `Pet`
+const typed: Pet = pet;
+```
+
+Each schema maps the OpenAPI structure plus the validation refinements that are stable
+across Zod 3.23 and 4 — string/array length (`.min`/`.max`), numeric bounds
+(`.min`/`.max`/`.gt`/`.lt`), `.int`, and `.regex`. Refs become `z.lazy(() => …)`, so
+recursive and forward-referencing schemas validate correctly. Format-specific helpers
+(`.email`/`.uuid`/`.url`) are intentionally not emitted, since they diverge between Zod 3
+and 4.
+
+## TanStack Query
+
+Pass `--generators sdk,tanstack-query` to additionally emit a standalone
+`<output>.tanstack.ts` module of [TanStack Query](https://tanstack.com/query) v5 factories
+that wrap the sdk operations:
+
+```sh
+redocly generate-client openapi.yaml --output src/client.ts --generators sdk,tanstack-query
+# → src/client.ts (the zero-dependency client) + src/client.tanstack.ts (the TanStack Query factories)
+
+# Vue / Svelte / Solid: only the import specifier changes
+redocly generate-client openapi.yaml --output src/client.ts \
+  --generators sdk,tanstack-query --query-framework vue
+```
+
+Per **query** operation (`GET`/`HEAD`) the module exports a `<op>QueryKey(vars)` and a
+`<op>Options(vars, init?)` factory that returns `queryOptions({ queryKey, queryFn })`; per
+**mutation** (every other method) it exports a `<op>Mutation()` factory returning
+`{ mutationKey, mutationFn }`. Each factory forwards to the matching sdk function, so the
+generated client itself stays dependency-free. Compose them with `useQuery`/`useMutation`:
+
+```ts
+import { useQuery, useMutation } from '@tanstack/react-query';
+import { getPetOptions, createPetMutation } from './client.tanstack.ts';
+
+function Pet({ id }: { id: string }) {
+  const { data } = useQuery(getPetOptions({ id }));
+  const { mutate } = useMutation(createPetMutation());
+  // …
+}
+```
+
+The `*.tanstack.ts` module is the only file that imports TanStack Query, so install the
+adapter for your framework as a peer — any `@tanstack/<framework>-query` `^5`:
+
+```sh
+npm install @tanstack/react-query   # ^5  (or @tanstack/vue-query, /svelte-query, /solid-query)
+```
+
+Select the framework with `--query-framework` (`react` default, `vue`, `svelte`, `solid`).
+Only the import specifier the module reads from changes — the emitted factory module is
+otherwise **byte-identical** across frameworks, since TanStack Query's `queryOptions`/mutation
+shapes are framework-agnostic.
+
+The factories wrap the **throw-mode** sdk (the default): TanStack's `queryFn` is expected to
+throw on error, so use the default (throw-mode) client — a `--error-mode result` client would
+need an unwrap-and-throw shim, which is out of scope.
+
+{% admonition type="info" name="Compatibility" %}
+`tanstack-query` wraps the sdk's exported throw-mode functions, so it requires `--generators sdk`,
+`--facade functions`, and `--error-mode throw`. An incompatible selection fails fast with an
+explanatory message rather than emitting a client that won't compile. Server-Sent-Events
+operations have no request/response function to wrap (you consume them via the sdk's `sse.*`
+surface), so they are **skipped** with a notice — the rest of the operations are still generated.
+{% /admonition %}
+
+## SWR
+
+Pass `--generators sdk,swr` to additionally emit a standalone `<output>.swr.ts` module of
+[SWR](https://swr.vercel.app) hooks that wrap the sdk operations:
+
+```sh
+redocly generate-client openapi.yaml --output src/client.ts --generators sdk,swr
+# → src/client.ts (the zero-dependency client) + src/client.swr.ts (the SWR hooks)
+```
+
+Each **query** operation (`GET`/`HEAD`) exports a `<op>Key(vars)` tuple factory and a
+`use<Op>(vars, init?)` hook returning `useSWR(key, fetcher)`; each **mutation** exports a
+`use<Op>()` hook returning `useSWRMutation(key, trigger)`. Call them straight from a component:
+
+```ts
+import { useGetPetById, useCreatePet } from './client.swr.ts';
+
+const { data } = useGetPetById({ id });
+const { trigger } = useCreatePet();
+await trigger({ body: { name: 'Rex' } });
+```
+
+The generated client stays dependency-free; only the `*.swr.ts` module imports SWR (`swr` for
+queries, `swr/mutation` for mutations). Install it in your app as a peer — any `swr` `^2`:
+
+```sh
+npm install swr   # ^2
+```
+
+{% admonition type="info" name="Compatibility" %}
+The hooks wrap the **throw-mode** sdk (the default), since SWR's fetcher is expected to throw
+on error. `swr` requires `--generators sdk`, `--facade functions`, and `--error-mode throw`; an
+incompatible selection fails fast. SSE operations are **skipped** with a notice (consume them
+via the sdk's `sse.*` surface).
+{% /admonition %}
+
+## Date transformers
+
+By default, `date-time`/`date` fields are typed as `string` (the ISO wire shape). Pass
+`--date-type Date` to type them as `Date` instead, and pair it with
+`--generators sdk,transformers` to emit a standalone `<output>.transformers.ts` module of
+`transform<Name>(data)` functions that convert those wire ISO strings to `Date` at runtime so
+the value matches the type:
+
+```sh
+redocly generate-client openapi.yaml --output src/client.ts \
+  --generators sdk,transformers --date-type Date
+# → src/client.ts (the zero-dependency client, dates typed `Date`) + src/client.transformers.ts
+```
+
+Per schema that (recursively) carries a date field, the module exports a
+`transform<Name>(data: <Name>): <Name>` that walks the value and rewrites the date positions
+in place — top-level scalars, arrays of dates, records, and `$ref`s (composing
+`transformPet` → `transformOwner`). Pipe responses through it:
+
+```ts
+import { getPet } from './client.ts';
+import { transformPet } from './client.transformers.ts';
+
+const pet = transformPet(await getPet(id));
+// pet.createdAt is now a Date
+```
+
+The transformers module imports only the schema **types** from the client, so the generated
+client itself stays dependency-free (`Date` is a web standard — no library). `int64` → `bigint`
+is deferred to a follow-up; without `--date-type Date` the date fields stay `string` and the
+output is byte-identical to before.
+
+{% admonition type="info" name="Compatibility" %}
+`transformers` requires `--generators sdk` and `--date-type Date`: it assigns `Date` values to the
+sdk's date fields, so it only type-checks when the sdk types them as `Date`. Selecting it without
+`--date-type Date` fails fast with an explanatory message rather than emitting a module that won't
+compile.
+{% /admonition %}
+
+## MSW mocks
+
+Pass `--generators sdk,mock` to additionally emit a standalone `<output>.mocks.ts` module of
+[MSW](https://mswjs.io) v2 request handlers and `create<Schema>(overrides?)` data factories:
+
+```sh
+redocly generate-client openapi.yaml --output src/client.ts --generators sdk,mock
+# → src/client.ts (the zero-dependency client) + src/client.mocks.ts (MSW handlers + factories)
+```
+
+Each handler intercepts its operation's method + path and responds with a fixture baked from
+the spec (prefers `example`/`default`; `format: binary` → `new Blob([])`; recursive schemas
+terminate at the cycle with an empty array/record). Each `create<Schema>` factory builds the
+same default object and merges in any `overrides`, so factories double as test builders:
+
+```ts
+// test setup (Node)
+import { setupServer } from 'msw/node';
+import { handlers } from './client.mocks.ts';
+
+const server = setupServer(...handlers);
+beforeAll(() => server.listen());
+afterEach(() => server.resetHandlers());
+afterAll(() => server.close());
+
+// override a single factory for one case
+import { createMenuItem } from './client.mocks.ts';
+const special = createMenuItem({ name: 'Cold Brew', price: 499 });
+```
+
+By default mock data is **baked** — deterministic literals inlined from the spec, with no extra
+runtime dependency. Pass `--mock-data faker` to emit [`@faker-js/faker`](https://fakerjs.dev)
+calls for realistic data, and `--mock-seed <n>` to pin faker's PRNG so the data is reproducible:
+
+```sh
+redocly generate-client openapi.yaml --output src/client.ts \
+  --generators sdk,mock --mock-data faker --mock-seed 42
+```
+
+{% admonition type="info" name="Compatibility" %}
+`mock` requires `--generators sdk` (the factories reference its types). Install MSW in your app
+as a dev dependency (`msw` `^2`); for `--mock-data faker`, also install `@faker-js/faker`. The
+generated client itself stays dependency-free — only the `*.mocks.ts` module imports them.
+{% /admonition %}
+
+## Custom generators
+
+The built-in generators (`sdk`, `zod`, …) cover the common targets. For anything else derived from
+the same description — validators in another library, a permissions map for your UI, mocks in your
+test runner's format, an SDK in your company's house style — write a **custom generator**. It reads
+the same spec-agnostic model the built-ins consume and runs in the same command, so its output never
+drifts from the spec and you never parse OpenAPI yourself.
+
+A generator is `{ name, run }` (plus optional compatibility metadata). `run` receives the model and
+returns files; author it with `defineGenerator` for type inference:
+
+```ts
+// route-map-generator.ts
+import { defineGenerator } from '@redocly/openapi-typescript/plugin';
+
+export default defineGenerator({
+  name: 'route-map',
+  requires: ['sdk'], // optional contract: only valid alongside these generators
+  run({ model, outputPath }) {
+    const routes = model.services
+      .flatMap((service) => service.operations)
+      .map((op) => `  ${op.name}: '${op.method.toUpperCase()} ${op.path}',`)
+      .join('\n');
+    return [
+      {
+        path: outputPath.replace(/\.ts$/, '.routes.ts'),
+        content: `export const routes = {\n${routes}\n} as const;\n`,
+      },
+    ];
+  },
+});
+```
+
+The `@redocly/openapi-typescript/plugin` entry also exports the **codegen toolkit** the built-in
+generators use — `ts` (the `ts.factory` wrapper), `printStatements`, `parseStatements`,
+`operationSignature`, `schemaToTypeNode`, `pascalCase`, `safeIdent` — and the IR types (`ApiModel`,
+`OperationModel`, `SchemaModel`, …), so a custom generator can emit TypeScript exactly as the
+first-party ones do.
+
+### Selecting a custom generator
+
+A `generators` entry that is not a built-in name is either an **inline** generator (registered via
+`customGenerators` in a `defineConfig` file) or an **import specifier** — a path (resolved against
+the config's directory) or an installed package — that default-exports the generator:
+
+```yaml
+# redocly.yaml — by path or by published package
+x-openapi-typescript:
+  input: ./openapi.yaml
+  output: ./src/api/client.ts
+  generators:
+    - sdk
+    - ./tools/route-map-generator.ts # local path
+    - '@acme/openapi-valibot' # npm package
+```
+
+```ts
+// redocly-openapi-typescript.config.ts — inline (full type-safety, no install)
+import { defineConfig } from '@redocly/openapi-typescript';
+import routeMap from './tools/route-map-generator.ts';
+
+export default defineConfig({
+  input: './openapi.yaml',
+  output: './src/api/client.ts',
+  customGenerators: [routeMap], // register…
+  generators: ['sdk', 'route-map'], // …then select by name
+});
+```
+
+A worked example lives in
+[`examples/custom-generator`](https://github.com/Redocly/redocly-cli/tree/main/packages/openapi-typescript/examples/custom-generator).
+
+{% admonition type="info" name="Compatibility & trust" %}
+A custom generator declares the same `requires` / `facades` / `errorModes` / `dateTypes` contract as
+the built-ins, validated up front — an incompatible selection, a name that collides with another
+generator, or an unloadable specifier fails fast with an actionable message. The generated client
+stays dependency-free: a generator's output is its own file(s), and any libraries it targets are
+peers of _your app_. Import-specifier generators execute at generation time — the same trust level as
+any installed dependency or `defineConfig` file.
+{% /admonition %}
+
+## Server-Sent Events (streaming)
+
+An operation whose `2xx` response declares `text/event-stream` is generated as a typed async
+iterator under an `sse` namespace instead of as a regular call — no flag is required; it is
+detected from the description. Each event's `data` is typed from the OpenAPI 3.2 `itemSchema`
+(falling back to the media `schema`, then `string`); when the payload is a structured type the
+runtime `JSON.parse`s `data` for you, otherwise it passes the raw string.
+
+```ts
+import { sse } from './client.ts';
+
+for await (const ev of sse.streamMessages()) {
+  console.log(ev.id, ev.data.text); // ev.data is the typed event payload
+}
+```
+
+Each yielded `ServerSentEvent<T>` is `{ event?: string; data: T; id?: string; retry?: number }`.
+With the **service-class** facade the same surface lives on the instance:
+`new Client(cfg).sse.streamMessages()`.
+
+The stream **auto-reconnects** on a dropped connection, resuming from the last seen event id via
+the `Last-Event-ID` header (backoff honors the server's `retry:` field, then `reconnectDelay`, then
+1s — exponential with jitter, capped at 30s). Opt out or tune it per call:
+
+```ts
+// Disable reconnection, or set the base delay (ms).
+for await (const ev of sse.streamMessages({ reconnect: false })) {
+  /* … */
+}
+const stream = sse.streamMessages({ reconnectDelay: 500 });
+```
+
+To stop early, `break` out of the loop or pass an `AbortSignal` — both end the iterator **cleanly**
+(no error is thrown):
+
+```ts
+const ac = new AbortController();
+setTimeout(() => ac.abort(), 5000);
+for await (const ev of sse.streamMessages({ signal: ac.signal })) {
+  /* … */
+}
+// loop ends without throwing when the signal aborts
+```
+
+SSE operations are **error-mode-agnostic**: they always throw an `ApiError` if the initial response
+is non-2xx, and never return the `--error-mode result` `Result` shape.
+
+## Resources
+
+- [Lint command](./lint.md) to validate your API description before generating a client.
+- [Bundle command](./bundle.md) to combine a multi-file description into the single input file.
+- [Configuration](../configuration/index.md) reference for `redocly.yaml`, including the `apis:` aliases you can pass as `<input>`.
diff --git a/docs/@v2/commands/index.md b/docs/@v2/commands/index.md
index add90a21f3..ea37895ee0 100644
--- a/docs/@v2/commands/index.md
+++ b/docs/@v2/commands/index.md
@@ -14,6 +14,7 @@ Documentation commands:
 API management commands:
 
 - [`bundle`](bundle.md) Bundle API description.
+- [`generate-client`](generate-client.md) Generate a typed TypeScript client from an OpenAPI description.
 - [`join`](join.md) Join API descriptions [experimental feature].
 - [`score`](score.md) Score an API for integration simplicity and AI agent readiness.
 - [`split`](split.md) Split API description into a multi-file structure.
diff --git a/package-lock.json b/package-lock.json
index f7f9104b02..0e58820358 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,10 @@
       ],
       "devDependencies": {
         "@changesets/cli": "^2.26.2",
+        "@faker-js/faker": "^9.9.0",
+        "@redocly/mock-server": "^0.7.0",
+        "@tanstack/react-query": "^5.0.0",
+        "@testing-library/react": "^16.0.0",
         "@types/node": "^22.15.3",
         "@vitest/coverage-istanbul": "^4.0.18",
         "husky": "^9.1.7",
@@ -20,14 +24,19 @@
         "json-schema-to-ts": "^3.0.0",
         "json-server": "1.0.0-beta.3",
         "lint-staged": "^15.4.3",
+        "msw": "^2.14.6",
         "outdent": "^0.7.1",
         "oxfmt": "^0.33.0",
         "oxlint": "^1.48.0",
         "pegjs": "0.11.0-master.b7b87ea",
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0",
         "slackify-markdown": "^4.3.1",
+        "swr": "^2.4.1",
         "tsx": "^4.19.3",
         "typescript": "6.0.2",
-        "vitest": "^4.0.18"
+        "vitest": "^4.0.18",
+        "zod": "^4.0.0"
       },
       "engines": {
         "node": ">=22.12.0 || >=20.19.0 <21.0.0",
@@ -688,6 +697,30 @@
         "prettier": "^2.7.1"
       }
     },
+    "node_modules/@cspotcode/source-map-support": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/trace-mapping": "0.3.9"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
     "node_modules/@csstools/color-helpers": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz",
@@ -1286,13 +1319,20 @@
       "integrity": "sha512-DNmuVYeOqFmLmJIJvFIX1TKttOZVI9FwDrqDujhyArjqtXUaZuuB+SuDBTQq3Ev368a7ONJiAJ8m9zi0+IBqZQ=="
     },
     "node_modules/@faker-js/faker": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-7.6.0.tgz",
-      "integrity": "sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw==",
+      "version": "9.9.0",
+      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-9.9.0.tgz",
+      "integrity": "sha512-OEl393iCOoo/z8bMezRlJu+GlRGlsKbUAN7jKB6LhnKoqKve5DXRpalbItIIcwnCjs1k/FOPjFzcA6Qn+H+YbA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fakerjs"
+        }
+      ],
       "license": "MIT",
       "engines": {
-        "node": ">=14.0.0",
-        "npm": ">=6.0.0"
+        "node": ">=18.0.0",
+        "npm": ">=9.0.0"
       }
     },
     "node_modules/@humanwhocodes/momoa": {
@@ -1304,6 +1344,65 @@
         "node": ">=10.10.0"
       }
     },
+    "node_modules/@inquirer/ansi": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@inquirer/ansi/-/ansi-2.0.7.tgz",
+      "integrity": "sha512-3eTuUO1vH2cZm2ZKHeQxnOqlTi9EfZDGgIe3BL3I4u+rJHocr9Fz86M4fjYABPvFnQG/gGK551HqDiIcETwU6Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=23.5.0 || ^22.13.0 || ^20.17.0"
+      }
+    },
+    "node_modules/@inquirer/confirm": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-6.1.1.tgz",
+      "integrity": "sha512-eb8DBZcz/2qHWQda4rk2JiQk5h9QV/cVHi1yjt0f69WFZMRFn0sJTye3EAP8icut8UDMjQPsaH5KbcOogefrFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^11.2.1",
+        "@inquirer/type": "^4.0.7"
+      },
+      "engines": {
+        "node": ">=23.5.0 || ^22.13.0 || ^20.17.0"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/core": {
+      "version": "11.2.1",
+      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-11.2.1.tgz",
+      "integrity": "sha512-Qd6GJT1yVyrZZCfN8W2qKF5ApmqryXRhRKCuip8h01x2w/esJQ2XIYc6f9abMIHgKQdBfFTSOdbHRLAhuM09UA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/ansi": "^2.0.7",
+        "@inquirer/figures": "^2.0.7",
+        "@inquirer/type": "^4.0.7",
+        "cli-width": "^4.1.0",
+        "fast-wrap-ansi": "^0.2.0",
+        "mute-stream": "^3.0.0",
+        "signal-exit": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=23.5.0 || ^22.13.0 || ^20.17.0"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@inquirer/external-editor": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@inquirer/external-editor/-/external-editor-1.0.1.tgz",
@@ -1326,6 +1425,34 @@
         }
       }
     },
+    "node_modules/@inquirer/figures": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-2.0.7.tgz",
+      "integrity": "sha512-aJ8TBPOGB6f/2qziPfElISTCEd5XOYTFckA2SGjhNmiKzfK/u4ot3v0DUzGVdUnKjN10EqnnEPck36BkyfLnJw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=23.5.0 || ^22.13.0 || ^20.17.0"
+      }
+    },
+    "node_modules/@inquirer/type": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-4.0.7.tgz",
+      "integrity": "sha512-t28inv14nMQ1PhKpsJPY+kEs/c00qzeCOS2gTNRyTjG5d6qsVA2fItxW4hkvGZ5lvanGLdtCzVIx5dwdRpN1+g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=23.5.0 || ^22.13.0 || ^20.17.0"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@isaacs/cliui": {
       "version": "8.0.2",
       "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
@@ -1622,6 +1749,31 @@
         "node": ">=6 <7 || >=8"
       }
     },
+    "node_modules/@mswjs/interceptors": {
+      "version": "0.41.9",
+      "resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.41.9.tgz",
+      "integrity": "sha512-VVPPgHyQ6ShqnrmDWuxjmUIsO9gWyOZFmuOfLd9LfBGQJwZfy0gvv9pbHSJuoFNIYC7ZDX9aoFwowjcdSC4E8w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@open-draft/deferred-promise": "^2.2.0",
+        "@open-draft/logger": "^0.3.0",
+        "@open-draft/until": "^2.0.0",
+        "is-node-process": "^1.2.0",
+        "outvariant": "^1.4.3",
+        "strict-event-emitter": "^0.5.1"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@mswjs/interceptors/node_modules/@open-draft/deferred-promise": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@open-draft/deferred-promise/-/deferred-promise-2.2.0.tgz",
+      "integrity": "sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@noble/hashes": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz",
@@ -1681,6 +1833,31 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@open-draft/deferred-promise": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@open-draft/deferred-promise/-/deferred-promise-3.0.0.tgz",
+      "integrity": "sha512-XW375UK8/9SqUVNVa6M0yEy8+iTi4QN5VZ7aZuRFQmy76LRwI9wy5F4YIBU6T+eTe2/DNDo8tqu8RHlwLHM6RA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@open-draft/logger": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@open-draft/logger/-/logger-0.3.0.tgz",
+      "integrity": "sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-node-process": "^1.2.0",
+        "outvariant": "^1.4.0"
+      }
+    },
+    "node_modules/@open-draft/until": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@open-draft/until/-/until-2.1.0.tgz",
+      "integrity": "sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@opentelemetry/api": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz",
@@ -2585,10 +2762,208 @@
       "integrity": "sha512-kloPhf1hq3JbCPOTYoOWDKxebWjNb2o/LKnNfkWhxVVisFFmMJPPdJeGoGmM+iRLyoXAR61e08Pb+vUXINg8aA==",
       "license": "MIT"
     },
+    "node_modules/@redocly/mock-server": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@redocly/mock-server/-/mock-server-0.7.0.tgz",
+      "integrity": "sha512-gr9e1aq5iKy+AN3F+NwFC4cbi15XCdL1HTpfZudV9jg2OqTPRMZd1RNvFQvKUF0UZq+TLLpR88KmD+ufiVAX0w==",
+      "dev": true,
+      "license": "SEE LICENSE IN LICENSE",
+      "dependencies": {
+        "@redocly/ajv": "8.18.0",
+        "@redocly/openapi-core": "2.30.5",
+        "ajv": "8.18.0",
+        "ajv-formats": "^3.0.1",
+        "fast-xml-parser": "5.7.3",
+        "js-yaml": "4.1.1",
+        "openapi-sampler": "^1.7.2",
+        "punycode": "2.3.0",
+        "swagger2openapi": "^7.0.8",
+        "ts-node": "10.9.2",
+        "yargs": "^17.5.1"
+      }
+    },
+    "node_modules/@redocly/mock-server/node_modules/@redocly/ajv": {
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.18.0.tgz",
+      "integrity": "sha512-F+LMD2IDIXuHxgpLJh3nkLj9+tSaEzoUWd+7fONGq5pe2169FUDjpEkOfEpoGLz1sbZni/69p07OsecNfAOpqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@redocly/mock-server/node_modules/@redocly/config": {
+      "version": "0.48.2",
+      "resolved": "https://registry.npmjs.org/@redocly/config/-/config-0.48.2.tgz",
+      "integrity": "sha512-DUHthTRdj+caAQWCtJae4yzvxaUDuwQkFsZFVaAEyORd8Bt8K2wYso61jYZuR/kQZaDejfUREtQTVVZ5VYTqgw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "json-schema-to-ts": "2.7.2"
+      }
+    },
+    "node_modules/@redocly/mock-server/node_modules/@redocly/openapi-core": {
+      "version": "2.30.5",
+      "resolved": "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-2.30.5.tgz",
+      "integrity": "sha512-ikljMaow1wX3GoRvLiJvqOq8H3f6XsuMBZqCGmeY0+UPmlnVhrvW8m/gC1vkKcGNvYINUrgi/Z6dBtzQ7854wA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@redocly/ajv": "^8.18.1",
+        "@redocly/config": "^0.48.1",
+        "ajv": "npm:@redocly/ajv@8.18.1",
+        "ajv-formats": "^3.0.1",
+        "colorette": "^1.2.0",
+        "js-levenshtein": "^1.1.6",
+        "js-yaml": "^4.1.0",
+        "picomatch": "^4.0.4",
+        "pluralize": "^8.0.0",
+        "yaml-ast-parser": "0.0.43"
+      },
+      "engines": {
+        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
+        "npm": ">=10"
+      }
+    },
+    "node_modules/@redocly/mock-server/node_modules/@redocly/openapi-core/node_modules/@redocly/ajv": {
+      "version": "8.18.3",
+      "resolved": "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.18.3.tgz",
+      "integrity": "sha512-l42u0of3hY98sN2A+M4qTX1O/KrpgGH32Hu9kP2GtHyD5Dfqq86PKFLe5dwaD8DEnNmlOlll2BAmeEtf0DaySg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@redocly/mock-server/node_modules/@redocly/openapi-core/node_modules/ajv": {
+      "name": "@redocly/ajv",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.18.1.tgz",
+      "integrity": "sha512-Ifm/pP/tul1qmAecpbVxCBluVE32rKfjf8gYXH4xI2gCv9mRWFhJMHzkPDM4TXlxwPQYIFegymlsy8lXz7optA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@redocly/mock-server/node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@redocly/mock-server/node_modules/json-schema-to-ts": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/json-schema-to-ts/-/json-schema-to-ts-2.7.2.tgz",
+      "integrity": "sha512-R1JfqKqbBR4qE8UyBR56Ms30LL62/nlhoz+1UkfI/VE7p54Awu919FZ6ZUPG8zIa3XB65usPJgr1ONVncUGSaQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.18.3",
+        "@types/json-schema": "^7.0.9",
+        "ts-algebra": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/@redocly/mock-server/node_modules/picomatch": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/@redocly/mock-server/node_modules/punycode": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@redocly/mock-server/node_modules/ts-algebra": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/ts-algebra/-/ts-algebra-1.2.2.tgz",
+      "integrity": "sha512-kloPhf1hq3JbCPOTYoOWDKxebWjNb2o/LKnNfkWhxVVisFFmMJPPdJeGoGmM+iRLyoXAR61e08Pb+vUXINg8aA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@redocly/mock-server/node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@redocly/mock-server/node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@redocly/openapi-core": {
       "resolved": "packages/core",
       "link": true
     },
+    "node_modules/@redocly/openapi-typescript": {
+      "resolved": "packages/openapi-typescript",
+      "link": true
+    },
     "node_modules/@redocly/respect-core": {
       "resolved": "packages/respect-core",
       "link": true
@@ -2950,6 +3325,34 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@tanstack/query-core": {
+      "version": "5.101.0",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.101.0.tgz",
+      "integrity": "sha512-cQetA74EB+seWySv1TTKr828TnP0u39m6LykwDXIo84SNortpDkp30TMEjkqtYCNP9c40uT/iwl6MLiufEt0Ow==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      }
+    },
+    "node_modules/@tanstack/react-query": {
+      "version": "5.101.0",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.101.0.tgz",
+      "integrity": "sha512-rLlJXSpkqfizLWgkR5+eLeIk0MvTx/meEIR7LRjxic+qxiQP8zVjq7BqQkiCMNLQBlLfuOLqqr6KO5GtrDlmSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@tanstack/query-core": "5.101.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      },
+      "peerDependencies": {
+        "react": "^18 || ^19"
+      }
+    },
     "node_modules/@testing-library/dom": {
       "version": "10.4.1",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
@@ -2971,6 +3374,34 @@
         "node": ">=18"
       }
     },
+    "node_modules/@testing-library/react": {
+      "version": "16.3.2",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.2.tgz",
+      "integrity": "sha512-XU5/SytQM+ykqMnAnvB2umaJNIOsLF3PVv//1Ew4CTcpz0/BRyy/af40qqrt7SjKpDdT1saBMc42CUok5gaw+g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.12.5"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@testing-library/dom": "^10.0.0",
+        "@types/react": "^18.0.0 || ^19.0.0",
+        "@types/react-dom": "^18.0.0 || ^19.0.0",
+        "react": "^18.0.0 || ^19.0.0",
+        "react-dom": "^18.0.0 || ^19.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@testing-library/user-event": {
       "version": "14.6.1",
       "resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.6.1.tgz",
@@ -3258,6 +3689,34 @@
       "license": "MIT",
       "peer": true
     },
+    "node_modules/@tsconfig/node10": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.12.tgz",
+      "integrity": "sha512-UCYBaeFvM11aU2y3YPZ//O5Rhj+xKyzy7mvcIoAjASbigy8mHMryP5cK7dgjlz2hWxh1g5pLw084E0a/wlUSFQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@tsconfig/node12": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@tsconfig/node14": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@tsconfig/node16": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
+      "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/aria-query": {
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
@@ -3418,6 +3877,13 @@
       "license": "MIT",
       "peer": true
     },
+    "node_modules/@types/statuses": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/statuses/-/statuses-2.0.6.tgz",
+      "integrity": "sha512-xMAgYwceFhRA2zY+XbEA7mxYbA093wdiW8Vu6gZPGWy9cmOyU9XesH1tNcEWsKFd5Vzrqx5T3D38PWx1FIIXkA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/trusted-types": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
@@ -4028,12 +4494,38 @@
       "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
+      "peer": true,
+      "dependencies": {
+        "event-target-shim": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6.5"
+      }
+    },
+    "node_modules/acorn": {
+      "version": "8.16.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz",
+      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "8.3.5",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.5.tgz",
+      "integrity": "sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "event-target-shim": "^5.0.0"
+        "acorn": "^8.11.0"
       },
       "engines": {
-        "node": ">=6.5"
+        "node": ">=0.4.0"
       }
     },
     "node_modules/agent-base": {
@@ -4291,6 +4783,13 @@
         "safe-buffer": "~5.2.0"
       }
     },
+    "node_modules/arg": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -4940,6 +5439,16 @@
         "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
+    "node_modules/cli-width": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
+      "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
     "node_modules/cliui": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
@@ -5156,6 +5665,13 @@
         "safe-buffer": "~5.2.0"
       }
     },
+    "node_modules/create-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -5415,7 +5931,6 @@
       "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -5430,6 +5945,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/diff": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.4.tgz",
+      "integrity": "sha512-X07nttJQkwkfKfvTPG/KSnE2OMdcUCao6+eXF3wmnIQRn2aPAHH3VxDbDOdegkd6JbPsXqShpvEOHfAT+nCNwQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
     "node_modules/dir-glob": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -6014,6 +6539,23 @@
       "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
       "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="
     },
+    "node_modules/fast-string-truncated-width": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/fast-string-truncated-width/-/fast-string-truncated-width-3.0.3.tgz",
+      "integrity": "sha512-0jjjIEL6+0jag3l2XWWizO64/aZVtpiGE3t0Zgqxv0DPuxiMjvB3M24fCyhZUO4KomJQPj3LTSUnDP3GpdwC0g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-string-width": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/fast-string-width/-/fast-string-width-3.0.2.tgz",
+      "integrity": "sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-string-truncated-width": "^3.0.2"
+      }
+    },
     "node_modules/fast-uri": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz",
@@ -6030,6 +6572,16 @@
       ],
       "license": "BSD-3-Clause"
     },
+    "node_modules/fast-wrap-ansi": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/fast-wrap-ansi/-/fast-wrap-ansi-0.2.2.tgz",
+      "integrity": "sha512-7F2Fl+TjRSenLqlU3UjSH0iyqopqoZIu7eZVpEirP2g1GtWa2G/ecEmBdgz31+Mxr+ELclgg6sokpSFIQiZ02Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-string-width": "^3.0.2"
+      }
+    },
     "node_modules/fast-xml-builder": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.2.0.tgz",
@@ -6047,9 +6599,9 @@
       }
     },
     "node_modules/fast-xml-parser": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.7.1.tgz",
-      "integrity": "sha512-8Cc3f8GUGUULg34pBch/KGyPLglS+OFs05deyOlY7fL2MTagYPKrVQNmR1fLF/yJ9PH5ZSTd3YDF6pnmeZU+zA==",
+      "version": "5.7.3",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.7.3.tgz",
+      "integrity": "sha512-C0AaNuC+mscy6vrAQKAc/rMq+zAPHodfHGZu4sGVehvAQt/JLG1O5zEcYcXSY5zSqr4YVgxsB+pHXTq0i7eDlg==",
       "funding": [
         {
           "type": "github",
@@ -6059,7 +6611,7 @@
       "license": "MIT",
       "dependencies": {
         "@nodable/entities": "^2.1.0",
-        "fast-xml-builder": "^1.1.5",
+        "fast-xml-builder": "^1.1.7",
         "path-expression-matcher": "^1.5.0",
         "strnum": "^2.2.3"
       },
@@ -6348,6 +6900,16 @@
       "license": "MIT",
       "peer": true
     },
+    "node_modules/graphql": {
+      "version": "16.14.2",
+      "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.14.2.tgz",
+      "integrity": "sha512-Chq1s4CY7jmh8gO2qvLIJyfCDIN+EHLFW/9iShnp1z8FjBQMoodWP1kDC36VAMXXIvAjj4ARa7ntfAV2BrjsbA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
+      }
+    },
     "node_modules/handlebars": {
       "version": "4.7.9",
       "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.9.tgz",
@@ -6454,6 +7016,24 @@
         "node": ">=12.22.0"
       }
     },
+    "node_modules/headers-polyfill": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/headers-polyfill/-/headers-polyfill-5.0.1.tgz",
+      "integrity": "sha512-1TJ6Fih/b8h5TIcv+1+Hw0PDQWJTKDKzFZzcKOiW1wJza3XoAQlkCuXLbymPYB8+ZQyw8mHvdw560e8zVFIWyA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/set-cookie-parser": "^2.4.10",
+        "set-cookie-parser": "^3.0.1"
+      }
+    },
+    "node_modules/headers-polyfill/node_modules/set-cookie-parser": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-3.1.0.tgz",
+      "integrity": "sha512-kjnC1DXBHcxaOaOXBHBeRtltsDG2nUiUni+jP92M9gYdW12rsmx92UsfpH7o5tDRs7I1ZZPSQJQGv3UaRfCiuw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/html-encoding-sniffer": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz",
@@ -6779,6 +7359,13 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/is-node-process": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/is-node-process/-/is-node-process-1.2.0.tgz",
+      "integrity": "sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -7912,6 +8499,13 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/mark.js": {
       "version": "8.11.1",
       "resolved": "https://registry.npmjs.org/mark.js/-/mark.js-8.11.1.tgz",
@@ -8400,6 +8994,135 @@
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "license": "MIT"
     },
+    "node_modules/msw": {
+      "version": "2.14.6",
+      "resolved": "https://registry.npmjs.org/msw/-/msw-2.14.6.tgz",
+      "integrity": "sha512-ALe+N10S72cyx94cMcy3Zs4HhXCj35sgeAL4c+WTvKi0zWnbd8/h0lcFqv0mb2P+aSgAdD7p9HzvA0DiUPxsyg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/confirm": "^6.0.11",
+        "@mswjs/interceptors": "^0.41.3",
+        "@open-draft/deferred-promise": "^3.0.0",
+        "@types/statuses": "^2.0.6",
+        "cookie": "^1.1.1",
+        "graphql": "^16.13.2",
+        "headers-polyfill": "^5.0.1",
+        "is-node-process": "^1.2.0",
+        "outvariant": "^1.4.3",
+        "path-to-regexp": "^6.3.0",
+        "picocolors": "^1.1.1",
+        "rettime": "^0.11.11",
+        "statuses": "^2.0.2",
+        "strict-event-emitter": "^0.5.1",
+        "tough-cookie": "^6.0.1",
+        "type-fest": "^5.5.0",
+        "until-async": "^3.0.2",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "msw": "cli/index.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mswjs"
+      },
+      "peerDependencies": {
+        "typescript": ">= 4.8.x"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/msw/node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/msw/node_modules/cookie": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.1.1.tgz",
+      "integrity": "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
+    },
+    "node_modules/msw/node_modules/type-fest": {
+      "version": "5.7.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-5.7.0.tgz",
+      "integrity": "sha512-1URUxUqfHFM1c+zfSPsa3gnkO7Aq21qyH75SIduNYz4SzY964rn1X2vCMQaHSHhktiw+0kPa2iyb6PUpXqB6Vg==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "dependencies": {
+        "tagged-tag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/msw/node_modules/yargs": {
+      "version": "17.7.2",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/msw/node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/mute-stream": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-3.0.0.tgz",
+      "integrity": "sha512-dkEJPVvun4FryqBmZ5KhDo0K9iDXAwn08tMLDinNdRBNPcYEDiWYysLcc6k3mjTMlbP9KyylvRpd4wFtwrT9rw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
     "node_modules/nanoid": {
       "version": "3.3.11",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
@@ -8654,13 +9377,13 @@
       }
     },
     "node_modules/openapi-sampler": {
-      "version": "1.7.1",
-      "resolved": "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.7.1.tgz",
-      "integrity": "sha512-pKFRROcYyxRt9GIn0NmS+GkWPS19l0CLQRYAnHk4m1Qp+G43ssVNcfRMs1sLkGrVMuFWO4P4F6YMXeXnfyFGuQ==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.7.4.tgz",
+      "integrity": "sha512-CKS/rd5ucPCuEDbJnjGDXZTsuGWcmv53aCmQx7soZlPEONUGN4af0/dY5+THRFZraSEjeA78nlfzdFswC/N5SA==",
       "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.7",
-        "fast-xml-parser": "^5.3.8",
+        "fast-xml-parser": "^5.5.1",
         "json-pointer": "0.6.2"
       }
     },
@@ -8670,6 +9393,13 @@
       "integrity": "sha512-VjIzdUHunL74DdhcwMDt5FhNDQ8NYmTkuW0B+usIV2afS9aWT/1c9z1TsnFW349TP3nxmYeUl7Z++XpJRByvgg==",
       "dev": true
     },
+    "node_modules/outvariant": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/outvariant/-/outvariant-1.4.3.tgz",
+      "integrity": "sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/oxfmt": {
       "version": "0.33.0",
       "resolved": "https://registry.npmjs.org/oxfmt/-/oxfmt-0.33.0.tgz",
@@ -9007,6 +9737,13 @@
       "license": "ISC",
       "peer": true
     },
+    "node_modules/path-to-regexp": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
+      "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -9808,6 +10545,13 @@
         "node": ">=10"
       }
     },
+    "node_modules/rettime": {
+      "version": "0.11.11",
+      "resolved": "https://registry.npmjs.org/rettime/-/rettime-0.11.11.tgz",
+      "integrity": "sha512-ILJRqVWBCTlg9r42fFgwVZx1gnFAcQF8mRoMkbgQfIrjEDf9nbBFDFx00oloOa+Q869FUtaYDXZvEfnecQSCoQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -10362,6 +11106,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/statuses": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
+      "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/std-env": {
       "version": "3.10.0",
       "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.10.0.tgz",
@@ -10400,6 +11154,13 @@
         "text-decoder": "^1.1.0"
       }
     },
+    "node_modules/strict-event-emitter": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.5.1.tgz",
+      "integrity": "sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/string_decoder": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -10584,6 +11345,20 @@
         "node": ">= 6"
       }
     },
+    "node_modules/swr": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/swr/-/swr-2.4.1.tgz",
+      "integrity": "sha512-2CC6CiKQtEwaEeNiqWTAw9PGykW8SR5zZX8MZk6TeAvEAnVS7Visz8WzphqgtQ8v2xz/4Q5K+j+SeMaKXeeQIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dequal": "^2.0.3",
+        "use-sync-external-store": "^1.6.0"
+      },
+      "peerDependencies": {
+        "react": "^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
     "node_modules/symbol-tree": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
@@ -10591,6 +11366,19 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/tagged-tag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/tagged-tag/-/tagged-tag-1.0.0.tgz",
+      "integrity": "sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/tar-fs": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-3.1.2.tgz",
@@ -10805,9 +11593,9 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.0.tgz",
-      "integrity": "sha512-kXuRi1mtaKMrsLUxz3sQYvVl37B0Ns6MzfrtV5DvJceE9bPyspOqk9xxv7XbZWcfLWbFmm997vl83qUWVJA64w==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.1.tgz",
+      "integrity": "sha512-LktZQb3IeoUWB9lqR5EWTHgW/VTITCXg4D21M+lvybRVdylLrRMnqaIONLVb5mav8vM19m44HIcGq4qASeu2Qw==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -10838,6 +11626,50 @@
       "integrity": "sha512-FPAhNPFMrkwz76P7cdjdmiShwMynZYN6SgOujD1urY4oNm80Ou9oMdmbR45LotcKOXoy7wSmHkRFE6Mxbrhefw==",
       "dev": true
     },
+    "node_modules/ts-node": {
+      "version": "10.9.2",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
+      "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cspotcode/source-map-support": "^0.8.0",
+        "@tsconfig/node10": "^1.0.7",
+        "@tsconfig/node12": "^1.0.7",
+        "@tsconfig/node14": "^1.0.0",
+        "@tsconfig/node16": "^1.0.2",
+        "acorn": "^8.4.1",
+        "acorn-walk": "^8.1.1",
+        "arg": "^4.1.0",
+        "create-require": "^1.1.0",
+        "diff": "^4.0.1",
+        "make-error": "^1.1.1",
+        "v8-compile-cache-lib": "^3.0.1",
+        "yn": "3.1.1"
+      },
+      "bin": {
+        "ts-node": "dist/bin.js",
+        "ts-node-cwd": "dist/bin-cwd.js",
+        "ts-node-esm": "dist/bin-esm.js",
+        "ts-node-script": "dist/bin-script.js",
+        "ts-node-transpile-only": "dist/bin-transpile.js",
+        "ts-script": "dist/bin-script-deprecated.js"
+      },
+      "peerDependencies": {
+        "@swc/core": ">=1.2.50",
+        "@swc/wasm": ">=1.2.50",
+        "@types/node": "*",
+        "typescript": ">=2.7"
+      },
+      "peerDependenciesMeta": {
+        "@swc/core": {
+          "optional": true
+        },
+        "@swc/wasm": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/tslib": {
       "version": "2.8.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
@@ -10883,7 +11715,6 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.2.tgz",
       "integrity": "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==",
-      "dev": true,
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
@@ -11033,6 +11864,16 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/until-async": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/until-async/-/until-async-3.0.2.tgz",
+      "integrity": "sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/kettanaito"
+      }
+    },
     "node_modules/update-browserslist-db": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
@@ -11084,9 +11925,9 @@
       "peer": true
     },
     "node_modules/use-sync-external-store": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.5.0.tgz",
-      "integrity": "sha512-Rb46I4cGGVBmjamjphe8L/UnvJD+uPPtTkNvX5mZgqdbavhI4EbgIWJiIHXJ8bc/i9EQGPRh4DwEURJ552Do0A==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
+      "integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==",
       "license": "MIT",
       "peerDependencies": {
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
@@ -11108,6 +11949,13 @@
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
+    "node_modules/v8-compile-cache-lib": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/vfile": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
@@ -12190,6 +13038,16 @@
         "node": "*"
       }
     },
+    "node_modules/yn": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/zip-stream": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-6.0.1.tgz",
@@ -12257,6 +13115,16 @@
         "safe-buffer": "~5.2.0"
       }
     },
+    "node_modules/zod": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.4.3.tgz",
+      "integrity": "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
     "node_modules/zwitch": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
@@ -12278,6 +13146,7 @@
         "@opentelemetry/semantic-conventions": "1.40.0",
         "@redocly/cli-otel": "0.3.1",
         "@redocly/openapi-core": "2.31.4",
+        "@redocly/openapi-typescript": "0.0.0",
         "@redocly/respect-core": "2.31.4",
         "ajv": "npm:@redocly/ajv@8.18.1",
         "ajv-formats": "^3.0.1",
@@ -12297,6 +13166,7 @@
         "set-cookie-parser": "^2.3.5",
         "simple-websocket": "^9.0.0",
         "styled-components": "6.4.1",
+        "typescript": "6.0.2",
         "ulid": "^3.0.1",
         "undici": "6.24.0",
         "yargs": "17.0.1"
@@ -12313,8 +13183,7 @@
         "@types/react-dom": "^17.0.0 || ^18.2.7 || ^19.2.1",
         "@types/semver": "^7.5.0",
         "@types/set-cookie-parser": "2.4.10",
-        "@types/yargs": "17.0.32",
-        "typescript": "6.0.2"
+        "@types/yargs": "17.0.32"
       },
       "engines": {
         "node": ">=22.12.0 || >=20.19.0 <21.0.0",
@@ -12596,6 +13465,24 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "packages/openapi-typescript": {
+      "name": "@redocly/openapi-typescript",
+      "version": "0.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@redocly/openapi-core": "2.31.4"
+      },
+      "devDependencies": {
+        "typescript": "6.0.2"
+      },
+      "engines": {
+        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
+        "npm": ">=10"
+      },
+      "peerDependencies": {
+        "typescript": ">=5.5.0"
+      }
+    },
     "packages/respect-core": {
       "name": "@redocly/respect-core",
       "version": "2.31.4",
@@ -12624,6 +13511,16 @@
         "npm": ">=10"
       }
     },
+    "packages/respect-core/node_modules/@faker-js/faker": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-7.6.0.tgz",
+      "integrity": "sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0",
+        "npm": ">=6.0.0"
+      }
+    },
     "packages/respect-core/node_modules/ajv": {
       "name": "@redocly/ajv",
       "version": "8.18.1",
diff --git a/package.json b/package.json
index da4bbdd6bc..cf925c991b 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,10 @@
   "license": "MIT",
   "devDependencies": {
     "@changesets/cli": "^2.26.2",
+    "@faker-js/faker": "^9.9.0",
+    "@redocly/mock-server": "^0.7.0",
+    "@tanstack/react-query": "^5.0.0",
+    "@testing-library/react": "^16.0.0",
     "@types/node": "^22.15.3",
     "@vitest/coverage-istanbul": "^4.0.18",
     "husky": "^9.1.7",
@@ -60,14 +64,19 @@
     "json-schema-to-ts": "^3.0.0",
     "json-server": "1.0.0-beta.3",
     "lint-staged": "^15.4.3",
+    "msw": "^2.14.6",
     "outdent": "^0.7.1",
     "oxfmt": "^0.33.0",
     "oxlint": "^1.48.0",
     "pegjs": "0.11.0-master.b7b87ea",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "slackify-markdown": "^4.3.1",
+    "swr": "^2.4.1",
     "tsx": "^4.19.3",
     "typescript": "6.0.2",
-    "vitest": "^4.0.18"
+    "vitest": "^4.0.18",
+    "zod": "^4.0.0"
   },
   "lint-staged": {
     "**/*.{ts,js,yaml,yml,json,md}": [
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 214a3707ee..0a4d26502d 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -43,6 +43,7 @@
     "@opentelemetry/sdk-trace-node": "2.6.1",
     "@opentelemetry/semantic-conventions": "1.40.0",
     "@redocly/cli-otel": "0.3.1",
+    "@redocly/openapi-typescript": "0.0.0",
     "@redocly/openapi-core": "2.31.4",
     "@redocly/respect-core": "2.31.4",
     "ajv": "npm:@redocly/ajv@8.18.1",
@@ -63,6 +64,7 @@
     "set-cookie-parser": "^2.3.5",
     "simple-websocket": "^9.0.0",
     "styled-components": "6.4.1",
+    "typescript": "6.0.2",
     "ulid": "^3.0.1",
     "undici": "6.24.0",
     "yargs": "17.0.1"
@@ -75,7 +77,6 @@
     "@types/react-dom": "^17.0.0 || ^18.2.7 || ^19.2.1",
     "@types/semver": "^7.5.0",
     "@types/set-cookie-parser": "2.4.10",
-    "@types/yargs": "17.0.32",
-    "typescript": "6.0.2"
+    "@types/yargs": "17.0.32"
   }
 }
diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
new file mode 100644
index 0000000000..aad62133a4
--- /dev/null
+++ b/packages/cli/src/commands/generate-client.ts
@@ -0,0 +1,132 @@
+import { type Config, HandledError, isPlainObject, logger } from '@redocly/openapi-core';
+import { blue, gray, yellow } from 'colorette';
+import { dirname, isAbsolute, resolve as resolvePath } from 'node:path';
+
+import { getAliasOrPath } from '../utils/miscellaneous.js';
+import { type CommandArgs } from '../wrapper.js';
+
+/**
+ * Read generate-client settings from a `redocly.yaml`'s `x-openapi-typescript`
+ * extension block (the auto-discovered config, or the one at `--config`). Relative
+ * `input`/`output` are resolved against the config file's directory so they mean the
+ * same thing regardless of the current working directory. Returns `{}` when the block
+ * is absent. (A URL/registry `input` is left untouched.)
+ */
+function readRedoclyExtension(config: Config): Record<string, unknown> {
+  const raw = (config.resolvedConfig as Record<string, unknown>)['x-openapi-typescript'];
+  if (!isPlainObject(raw)) return {};
+  const ext: Record<string, unknown> = { ...raw };
+  const baseDir = config.configPath ? dirname(config.configPath) : undefined;
+  if (baseDir) {
+    if (
+      typeof ext.input === 'string' &&
+      !isAbsolute(ext.input) &&
+      !/^https?:\/\//i.test(ext.input)
+    ) {
+      ext.input = resolvePath(baseDir, ext.input);
+    }
+    if (typeof ext.output === 'string' && !isAbsolute(ext.output)) {
+      ext.output = resolvePath(baseDir, ext.output);
+    }
+  }
+  return ext;
+}
+
+export type GenerateClientCommandArgv = {
+  input?: string;
+  output?: string;
+  'config-file'?: string;
+  config?: string;
+  'base-url'?: string;
+  'enum-style'?: 'union' | 'const-object';
+  'output-mode'?: 'single' | 'split' | 'tags' | 'tags-split';
+  facade?: 'functions' | 'service-class';
+  'args-style'?: 'flat' | 'grouped';
+  'error-mode'?: 'throw' | 'result';
+  'date-type'?: 'string' | 'Date';
+  'query-framework'?: 'react' | 'vue' | 'svelte' | 'solid';
+  'mock-data'?: 'baked' | 'faker';
+  'mock-seed'?: number;
+  name?: string;
+  // Built-in names, inline custom-generator names, or plugin import specifiers (path/package).
+  generators?: string[];
+};
+
+export async function handleGenerateClient({
+  argv,
+  config,
+}: CommandArgs<GenerateClientCommandArgv>) {
+  const { generateClient } = await import('@redocly/openapi-typescript');
+  const { loadConfigFile, mergeConfig } = await import('@redocly/openapi-typescript/config-file');
+
+  // Config sources, lowest → highest precedence: redocly.yaml `x-openapi-typescript`
+  // (the ambient base) → an explicit `--config-file` *.config.ts → CLI flags.
+  const redoclyExtension = readRedoclyExtension(config);
+  const fileConfig = (await loadConfigFile(argv['config-file'])) ?? {};
+  const merged = mergeConfig(mergeConfig(redoclyExtension as typeof fileConfig, fileConfig), {
+    input: argv.input,
+    output: argv.output,
+    baseUrl: argv['base-url'],
+    enumStyle: argv['enum-style'],
+    outputMode: argv['output-mode'],
+    facade: argv.facade,
+    argsStyle: argv['args-style'],
+    errorMode: argv['error-mode'],
+    dateType: argv['date-type'],
+    queryFramework: argv['query-framework'],
+    mockData: argv['mock-data'],
+    mockSeed: argv['mock-seed'],
+    name: argv.name,
+    generators: argv.generators,
+  });
+
+  if (!merged.input)
+    throw new HandledError(`\n❌  No input. Pass <input> or set it in a config file.\n`);
+  if (!merged.output)
+    throw new HandledError(`\n❌  No output. Pass --output or set it in a config file.\n`);
+
+  // Resolve `<input>` as a `redocly.yaml` `apis:` alias when it matches one (to the
+  // alias's `root`, relative to the config dir); a plain path/URL passes through.
+  const input = getAliasOrPath(config, merged.input).path;
+  const outputPath = resolvePath(merged.output);
+
+  // Relative-path generator specifiers (and inline plugins) resolve against the config's location:
+  // the explicit `--config-file`, else the discovered `redocly.yaml`, else the working directory.
+  const configDir = argv['config-file']
+    ? dirname(resolvePath(argv['config-file']))
+    : config.configPath
+      ? dirname(config.configPath)
+      : process.cwd();
+
+  if (!outputPath.endsWith('.ts')) {
+    throw new HandledError(
+      `\n❌  output must point at a TypeScript file (ending in .ts).\n   Got: ${outputPath}\n`
+    );
+  }
+  if (merged.baseUrl !== undefined) {
+    try {
+      new URL(merged.baseUrl);
+    } catch {
+      throw new HandledError(
+        `\n❌  --base-url must be a valid URL (parseable by \`new URL(...)\`).\n   Got: ${merged.baseUrl}\n`
+      );
+    }
+  }
+
+  try {
+    logger.info(gray('\n  Generating TypeScript client... \n'));
+    const result = await generateClient({ ...merged, input, output: outputPath, config, configDir });
+    const summary =
+      result.files.length === 1
+        ? `TypeScript client successfully generated to ${yellow(result.outputPath)} (${result.bytes} bytes).`
+        : `TypeScript client successfully generated: ${result.files.length} files (${result.bytes} bytes), entry at ${yellow(result.outputPath)}.`;
+    logger.info('\n' + blue(summary) + '\n');
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new HandledError(
+      '\n' +
+        `❌  Failed to generate TypeScript client.\n   ${message}\n` +
+        '   Check the input file path and that the OpenAPI document is valid.'
+    );
+  }
+}
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index b7083155f0..82345b1df7 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -16,6 +16,10 @@ import {
   handleGenerateArazzo,
   type GenerateArazzoCommandArgv,
 } from './commands/generate-arazzo.js';
+import {
+  handleGenerateClient,
+  type GenerateClientCommandArgv,
+} from './commands/generate-client.js';
 import { handleJoin } from './commands/join/index.js';
 import { handleLint } from './commands/lint.js';
 import { PRODUCT_PLANS } from './commands/preview-project/constants.js';
@@ -839,6 +843,120 @@ yargs(hideBin(process.argv))
       commandWrapper(handleGenerateArazzo)(argv as Arguments<GenerateArazzoCommandArgv>);
     }
   )
+  .command(
+    'generate-client [input]',
+    'Generate a TypeScript client from an OpenAPI description.',
+    (yargs) => {
+      return yargs
+        .env('REDOCLY_CLI_GENERATE_CLIENT')
+        .positional('input', {
+          describe: 'OpenAPI description file path (or alias from redocly.yaml `apis:`).',
+          type: 'string',
+        })
+        .options({
+          output: {
+            alias: 'o',
+            describe: 'Output file path for the generated client (must end in .ts).',
+            type: 'string',
+            requiresArg: true,
+          },
+          'config-file': {
+            describe: 'Path to a generate-client config file (defineConfig).',
+            type: 'string',
+            requiresArg: true,
+          },
+          'base-url': {
+            describe:
+              'Override the BASE URL inlined into the generated runtime. Defaults to `servers[0].url`.',
+            type: 'string',
+            requiresArg: true,
+          },
+          'enum-style': {
+            describe:
+              'How named string enums are emitted: `const-object` (default) emits a runtime `as const` object alongside the union type; `union` emits only the union.',
+            choices: ['union', 'const-object'] as const,
+            requiresArg: true,
+          },
+          'output-mode': {
+            describe:
+              'How the client is split across files: `single` (default, one file), `split` (endpoints, schemas, and runtime in sibling files), `tags` (one endpoints file per OpenAPI tag), or `tags-split` (a folder per tag), all sharing the schemas and runtime modules.',
+            choices: ['single', 'split', 'tags', 'tags-split'] as const,
+            requiresArg: true,
+          },
+          facade: {
+            describe:
+              'Developer-facing operation shape: `functions` (default) emits standalone async functions; `service-class` groups operations as class methods (one `Client` class in single/split, one service class per tag in tags/tags-split).',
+            choices: ['functions', 'service-class'] as const,
+            requiresArg: true,
+          },
+          'args-style': {
+            describe:
+              'How operation inputs are passed: `flat` (default) spreads path params as positional arguments followed by `params`/`body`/`headers`; `grouped` bundles every input into a single `args` object (the per-call request `init` stays a separate trailing argument).',
+            choices: ['flat', 'grouped'] as const,
+            requiresArg: true,
+          },
+          'error-mode': {
+            describe:
+              "Error handling: 'throw' (default) throws ApiError on non-2xx; 'result' returns { data, error, response }.",
+            choices: ['throw', 'result'] as const,
+            requiresArg: true,
+          },
+          'date-type': {
+            describe:
+              "How `date-time`/`date` string fields are typed: 'string' (default) keeps the ISO wire shape; 'Date' emits a `Date` (pair with --generators transformers so the runtime value matches).",
+            choices: ['string', 'Date'] as const,
+            requiresArg: true,
+          },
+          'query-framework': {
+            describe:
+              'TanStack Query adapter the `tanstack-query` generator imports from: `react` (default), `vue`, `svelte`, or `solid`. Only the import specifier changes — the emitted factory module is byte-identical across frameworks.',
+            choices: ['react', 'vue', 'svelte', 'solid'] as const,
+            requiresArg: true,
+          },
+          'mock-data': {
+            describe:
+              "How the `mock` generator produces data: 'baked' (default) inlines deterministic literals (zero-dep); 'faker' emits @faker-js/faker calls for realistic data (install @faker-js/faker as a dev dependency).",
+            choices: ['baked', 'faker'] as const,
+            requiresArg: true,
+          },
+          'mock-seed': {
+            describe:
+              'Seed for faker-mode mocks: emits a top-level `faker.seed(<n>)` so generated data is reproducible across runs. Ignored in baked mode.',
+            type: 'number',
+            requiresArg: true,
+          },
+          name: {
+            describe:
+              'Class name for the `service-class` facade in single/split layouts (ignored otherwise). Defaults to `Client`.',
+            type: 'string',
+            requiresArg: true,
+          },
+          generators: {
+            describe:
+              'Generators to run, comma-separated (default: sdk). Built-in names (sdk, zod, tanstack-query, swr, transformers, mock) or a custom-generator path/package specifier. Example: --generators sdk,zod or --generators sdk,./my-generator.ts',
+            type: 'string',
+            coerce: (value: string | undefined): string[] | undefined => {
+              // Parse only — built-in names, inline custom names, and plugin specifiers are all
+              // valid here; the generator resolver validates each (and reports unknown/unloadable
+              // entries with an actionable message) once the config is assembled.
+              if (value === undefined) return undefined;
+              return value
+                .split(',')
+                .map((s) => s.trim())
+                .filter(Boolean);
+            },
+          },
+          config: {
+            describe: 'Path to the config file.',
+            type: 'string',
+            requiresArg: true,
+          },
+        });
+    },
+    async (argv) => {
+      commandWrapper(handleGenerateClient)(argv as Arguments<GenerateClientCommandArgv>);
+    }
+  )
   .command(
     'scorecard-classic [api]',
     'Run quality scorecards with multiple rule levels to validate and maintain API description standards.',
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index cb2d2b020e..35e5e3ce14 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -4,7 +4,11 @@
     "rootDir": "src",
     "outDir": "lib"
   },
-  "references": [{ "path": "../core" }, { "path": "../respect-core" }],
+  "references": [
+    { "path": "../core" },
+    { "path": "../respect-core" },
+    { "path": "../openapi-typescript" }
+  ],
   "include": ["src/**/*.ts"],
   "exclude": ["lib", "**/__tests__", "**/*.test.ts"]
 }
diff --git a/packages/openapi-typescript/ARCHITECTURE.md b/packages/openapi-typescript/ARCHITECTURE.md
new file mode 100644
index 0000000000..e877bebb5b
--- /dev/null
+++ b/packages/openapi-typescript/ARCHITECTURE.md
@@ -0,0 +1,191 @@
+# Client Generator — Architecture
+
+How `@redocly/openapi-typescript` is built. This is a **descriptive** map of the current shape — the
+pipeline, the modules, and the seams. It says _what is_; the **why** (the significant decisions and
+their trade-offs) lives in the Architecture Decision Records under [`docs/adr/`](./docs/adr/), linked
+inline below. For the vocabulary used here (IR, emitter, writer, runtime, facade, output mode, …), see
+[CONTEXT.md](./CONTEXT.md). This is not a roadmap; planned refactors live in their own specs.
+
+## Overview
+
+The package turns an OpenAPI description into a typed TypeScript client with **zero runtime
+dependencies** — the generated code uses only web-standard APIs (`fetch`, `AbortController`,
+`URLSearchParams`), so it runs in browsers, Node, Bun, Deno, and edge runtimes (see
+[ADR-0002](./docs/adr/0002-typescript-peer-dep.md)). It backs the `redocly generate-client` CLI command.
+
+## Codegen approach
+
+Generated TypeScript is built as a **TypeScript AST** (`ts.factory` nodes) and emitted by the
+compiler's own printer (`ts.createPrinter`), **not** by string interpolation — rationale and trade-offs
+in [ADR-0001](./docs/adr/0001-ast-codegen.md). The one generation-time dependency is `typescript`
+itself, declared as a **peer** ([ADR-0002](./docs/adr/0002-typescript-peer-dep.md)); it is never
+emitted, so the generated client stays dependency-free.
+
+A foundation module (`emitters/ts.ts`) wraps the ergonomics: re-exports `ts` (the `factory`),
+`printNodes(nodes)` over a shared printer, `parseStatements(source)` to embed hand-authored constant
+code (the **runtime**) as parsed nodes routed through the same printer, and `jsdoc(node, text)`. Each
+emitter produces `ts.Statement[]` / `ts.TypeNode`s; the composition (`client.ts`) assembles the
+per-file statement list and prints **once**. Formatting is the printer's; a pretty-print pass is
+deferred to optional-formatter work (roadmap P7.3).
+
+## Pipeline
+
+```mermaid
+flowchart LR
+  spec[OpenAPI doc] --> load["loadSpec()"]
+  load --> build["buildApiModel()"]
+  build --> ir[("ApiModel / IR")]
+  ir --> gw["getWriter(outputMode)"]
+  gw --> writer["a Writer"]
+  writer --> emit["emitters"]
+  emit --> files[[".ts files"]]
+```
+
+1. **`loadSpec`** (`loader.ts`) — bundles the OpenAPI document via `@redocly/openapi-core`, resolving
+   external `$ref`s while **preserving internal `$ref`s** (the IR builder relies on named references
+   staying intact). Also detects the spec version (`detectSpec`).
+   1.5. **`normalizeSwagger2`** (`ir/normalize-swagger2.ts`) — when the detected version is `oas2`,
+   converts the Swagger 2.0 document to the OpenAPI 3.x shape (definitions → components.schemas,
+   host/basePath/schemes → servers, body/formData params → requestBody, `responses[].schema` →
+   `responses[].content`, securityDefinitions → securitySchemes, `$ref` rewrite). OAS 3.0/3.1/3.2 skip
+   this step.
+2. **`buildApiModel`** (`ir/build.ts`) — walks the OpenAPI document and produces the spec-agnostic
+   **IR** (`ir/model.ts`). Everything downstream reads the IR, never the raw spec
+   ([ADR-0003](./docs/adr/0003-spec-agnostic-ir.md)).
+3. **`getWriter(outputMode)`** (`writers/index.ts`) — selects the **Writer** for the chosen output
+   mode.
+4. The **Writer** decides the file layout and fills each file by calling the **emitters**.
+5. The **emitters** (`emitters/`) build a **TypeScript AST** and print it via `emitters/ts.ts`.
+6. `generateClient` (`index.ts`) writes the files to disk.
+
+## Module map
+
+| Area       | Files                                                                                                                                                                                                                                                                                                                                                                                                                       | Owns                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Depth                                                                                                                                                                         |
+| ---------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Entry      | `index.ts`, `types.ts`, `config.ts`, `config-file.ts`, `plugin.ts`                                                                                                                                                                                                                                                                                                                                                          | `generateClient` orchestration; public option/result types; config loading; the experimental `@redocly/openapi-typescript/plugin` entry (`defineGenerator` + IR types + codegen toolkit)                                                                                                                                                                                                                                                                                     | thin orchestrator                                                                                                                                                             |
+| Load       | `loader.ts`                                                                                                                                                                                                                                                                                                                                                                                                                 | bundle + `$ref` resolution, preserving internal refs                                                                                                                                                                                                                                                                                                                                                                                                                         | deep (hides `openapi-core`)                                                                                                                                                   |
+| IR         | `ir/build.ts`, `ir/model.ts`, `ir/refs.ts`, `ir/normalize-swagger2.ts`, `ir/sanitize-identifiers.ts`                                                                                                                                                                                                                                                                                                                        | OpenAPI → IR; the IR type model; ref collection; Swagger 2.0 → 3.x normalization; coerce document-derived names to safe unique identifiers (security boundary)                                                                                                                                                                                                                                                                                                               | deep (`buildApiModel` + `normalizeSwagger2` each one interface over a whole walk)                                                                                             |
+| Writers    | `writers/index.ts`, `single-file-writer.ts`, `split-writer.ts`, `tagged.ts`, `tags-writer.ts`, `tags-split-writer.ts`, `group-by-tag.ts`, `util.ts`, `types.ts`                                                                                                                                                                                                                                                             | file layout per output mode                                                                                                                                                                                                                                                                                                                                                                                                                                                  | thin adapters at the `getWriter` seam + `group-by-tag` (deep)                                                                                                                 |
+| Generators | `generators/index.ts` (registry + `validateGenerators`), `resolve.ts` (built-in / inline / specifier resolution), `types.ts`, `sdk.ts`, `zod.ts`, `tanstack-query.ts`, `swr.ts`, `transformers.ts`, `mock.ts`                                                                                                                                                                                                               | the generator registry seam: each descriptor declares its requires/facades/errorModes and produces `GeneratedFile[]` by calling an emitter; `resolve.ts` turns a selection (built-in names, inline `customGenerators`, or plugin import specifiers) into a name→descriptor registry                                                                                                                                                                                          | thin adapters at the `getGenerator` seam ([ADR-0004](./docs/adr/0004-registry-seams.md), [ADR-0012](./docs/adr/0012-plugin-api.md))                                           |
+| Emitters   | sdk: `emitters/client.ts` (composition), `types.ts`, `type-guards.ts`, `auth.ts`, `operations.ts` (+ `operation-aliases.ts`, `operation-types.ts`), `sse.ts`, `runtime.ts`; satellite: `zod.ts`, `transformers.ts`, `tanstack-query.ts`, `swr.ts` (+ shared `wrapper-support.ts`), `mock.ts`/`faker.ts`/`sample.ts`; foundation `ts.ts`; shared `operation-signature.ts`; private `support.ts`, `jsdoc.ts`, `identifier.ts` | IR → TypeScript AST (`ts.factory` nodes, printed via `ts.ts`); the emitted runtime; `operations.ts` splits the per-op assembly from its `<Op>*` alias builders (`operation-aliases.ts`) and shared param/body/response type builders (`operation-types.ts`); `sse.ts` is the SSE detection seam; `operation-signature.ts` is the single source of an operation’s calling convention; `wrapper-support.ts` is the shared eligibility/param model for `swr` + `tanstack-query` | each emitter is deep (one entry point builds nodes over hidden bulk); `client.ts` assembles the per-file statements and prints once; the runtime is the client library itself |
+| Errors     | `errors.ts`                                                                                                                                                                                                                                                                                                                                                                                                                 | `NotSupportedError`                                                                                                                                                                                                                                                                                                                                                                                                                                                          | trivial                                                                                                                                                                       |
+
+The IR (`ir/model.ts`) is a **pure type model** — no runtime code. It is the contract between the
+builder and the emitters ([ADR-0003](./docs/adr/0003-spec-agnostic-ir.md)).
+
+## Seams
+
+Places where behavior varies without editing in place:
+
+- **The `getGenerator` seam** — a generator is `(input) => GeneratedFile[]` (`generators/types.ts`).
+  `generateClient` resolves the configured selection (default `['sdk']`) via `resolveGenerators`
+  (`generators/resolve.ts`) into a name→descriptor registry, then runs them through
+  `collectGeneratedFiles` and merges their files (duplicate output paths throw). A selection entry is a
+  built-in name, the `name` of an inline `customGenerators` entry, or a **plugin import specifier**
+  (path or package, dynamically imported and validated). This is the public, **experimental**
+  extension point — authored with `defineGenerator` from `@redocly/openapi-typescript/plugin`, which
+  also re-exports the IR types and the codegen toolkit. Where new capabilities (zod, framework hooks)
+  plug in. See [ADR-0004](./docs/adr/0004-registry-seams.md) and
+  [ADR-0012](./docs/adr/0012-plugin-api.md).
+- **The `getWriter` seam** — `getWriter(outputMode)` maps an output mode to a `Writer`. Four adapters:
+  `single`, `split`, `tags`, `tags-split` (the tag layouts share `buildTaggedClient`). Where a new file
+  layout plugs in. See [ADR-0004](./docs/adr/0004-registry-seams.md).
+- **The emitter ↔ writer seam** — `emitModules(model, options): ClientModules` is the _only_ thing
+  writers consume from the emitter. `ClientModules` exposes each emitted module's content (`http`,
+  `schemas`, `operations`) plus per-file wiring (`renderEndpoints`, `endpointImports`,
+  `publicReexport`). The emitter's internal **fragment** breakdown never crosses this seam. `single`
+  output bypasses this via `emitSingleFile`.
+- **Runtime emission** — the runtime is authored as reference TypeScript source and parsed into
+  `ts.Statement[]` (`runtimeStatements`, `emitters/runtime.ts`) via `parseStatements`, with the base
+  URL inlined and the public declarations optionally `export`ed (multi-file) or kept local
+  (single-file). `renderRuntime` prints those statements for the string-asserting unit tests.
+- **The runtime-terminals seam** — the fetch wrapper is a shared core (`__send` + `__parse`) plus one
+  of two terminals selected by **error mode** (`__request` for throw, `__requestResult` for result).
+  Only the chosen terminal is emitted. See [ADR-0005](./docs/adr/0005-error-mode-terminals.md).
+- **Response decoding is a runtime concern** — `__parse` decodes the body; the inferred kind comes from
+  the operation's `responseKind` (a generate-time hint). The per-call `RequestOptions.parseAs` overrides
+  it (e.g. `'stream'` for the raw `ReadableStream`); the static return type is **not** narrowed by
+  `parseAs`, keeping operation signatures stable.
+- **The SSE seam** — an operation whose 2xx response declares `text/event-stream` is a **derived
+  response kind**, detected by `emitters/sse.ts` and emitted under a separate `sse` namespace backed by
+  a gated `__sse<T>` generator that reuses `__send`. See [ADR-0006](./docs/adr/0006-sse-namespace.md).
+- **The async-auth seam** — credentials are resolved **at the call site** via an async
+  `__auth(schemes, config)`, not in the runtime; non-authed operations emit no auth code. Each scheme
+  resolves from the instance's `config.auth?.<scheme>` (per-instance, `ClientConfig.auth`) falling back
+  to the module-global `set*` slot. See [ADR-0007](./docs/adr/0007-call-site-auth.md) and
+  [ADR-0009](./docs/adr/0009-per-instance-auth.md).
+
+## Configuration
+
+`generate-client` reads its options from an `x-openapi-typescript` block in `redocly.yaml`
+(auto-discovered), with a dedicated `*.config.ts` (`--config-file`) and CLI flags layering over it. The
+extraction lives in the CLI command, not this package's core. See
+[ADR-0008](./docs/adr/0008-redocly-yaml-config.md).
+
+## What varies
+
+Three orthogonal knobs combine freely:
+
+- **Output mode** (`--output-mode`): `single` · `split` · `tags` · `tags-split` — file layout.
+- **Facade** (`--facade`): `functions` · `service-class` — operation shape.
+- **Args style** (`--args-style`): `flat` · `grouped` — how inputs are passed.
+
+Plus **enum style** (`--enum-style`: `union` · `const-object`), **error mode** (`--error-mode`: `throw`
+· `result`), **date type** (`--date-type`: `string` · `Date`), and `--base-url` / `--name` modifiers.
+The **runtime** and **schemas** modules are identical across facade and args-style choices; only the
+**endpoints** differ.
+
+Orthogonally, **`--generators`** selects which generators run (default `sdk`; plus `zod`,
+`tanstack-query`, `swr`, `transformers`, `mock`, and custom plugins), with per-generator knobs:
+`--query-framework` (`react` · `vue` · `svelte` · `solid`, for `tanstack-query`) and `--mock-data`
+(`baked` · `faker`) / `--mock-seed` (for `mock`).
+
+## Testing model
+
+- **Unit tests** (`VITEST_SUITE=unit`) live in `__tests__/` beside source. This package is held to
+  **100% per-file coverage**. The IR builder, ref collection, writers, and each emitter are tested
+  directly through their interfaces, sharing `__tests__/fixtures.ts`; the emitters are largely covered
+  by output-string assertions.
+- **E2E tests** (`VITEST_SUITE=e2e`, under `tests/e2e/generate-client/`) generate a client, type-check
+  it under strict `tsc` (`--noUnusedLocals`), and — for behavioral cases — run it against a local mock
+  server.
+- **The runtime** is emitted as a source string, so its behavior (retry, abort, body serialization,
+  query building, SSE reconnection) is exercised through the e2e path.
+
+Tests run from a single root `vitest.config.ts`; there are no per-package vitest configs. Compile
+(`npm run compile`) before running tests — they run against built output.
+
+## How to add things
+
+- **A new output mode** — add the literal to `OutputMode` (`writers/types.ts`), write a `Writer` (or
+  extend `buildTaggedClient`), and register it in the `WRITERS` map (`writers/index.ts`). Wire the CLI
+  choice in the `generate-client` command.
+- **A new facade** — extend the `Facade` type and `operationsBlockStatements` in
+  `emitters/operations.ts` (build the function/method nodes via `emitters/ts.ts`); both single and
+  multi-file writers route through it.
+- **A new schema kind** — add the variant to `SchemaModel` (`ir/model.ts`), produce it in `ir/build.ts`,
+  and build its `ts.TypeNode` in `schemaToTypeNode` (`emitters/types.ts`).
+- **A new runtime capability** — extend the authored source in `emitters/runtime.ts` (parsed into nodes
+  via `parseStatements`); surface any new public type via `PUBLIC_RUNTIME_TYPES` so multi-file output
+  re-exports it from the barrel.
+- **A new wrapper generator** (a framework adapter that forwards to the sdk functions) — reuse
+  `emitters/wrapper-support.ts` for operation eligibility (SSE / `<Op>Variables`-collision skips) and
+  the `vars`/`init` parameter shape, and derive the forwarding call's argument order and
+  `<Op>Variables` naming from `operationSignature` (`emitters/operation-signature.ts`), the same
+  source the sdk's parameter list uses, so the wrappers cannot drift. Declare its compatibility
+  contract (`requires`/`facades`/`errorModes`/`dateTypes`) in the generator registry
+  (`generators/index.ts`). See [ADR-0011](./docs/adr/0011-wrapper-generators.md).
+- **A new mock data source** — the `mock` generator's data comes from `emitters/sample.ts` (baked literals)
+  or `emitters/faker.ts` (faker calls), selected by `--mock-data`; both walk the IR with the same
+  cycle semantics. See [ADR-0010](./docs/adr/0010-mock-data-baked-vs-faker.md).
+- **A custom generator (plugin, experimental)** — author `{ name, run }` with `defineGenerator` from
+  the `@redocly/openapi-typescript/plugin` entry (it also exports the IR types and the codegen toolkit);
+  select it in `generators` by inline `customGenerators` name or by import specifier. No core change is
+  needed — `resolve.ts` loads and validates it. See [ADR-0012](./docs/adr/0012-plugin-api.md).
+
+## Keeping this current
+
+Update this file when the **pipeline** stages, the **seams**, or the **module map** change — not for
+routine feature work within an existing module. Keep it **descriptive**. When you make a significant,
+hard-to-reverse decision, record it as a new ADR in [`docs/adr/`](./docs/adr/) (don't rewrite an
+existing ADR — supersede it), and link the relevant seam here to it.
diff --git a/packages/openapi-typescript/CONTEXT.md b/packages/openapi-typescript/CONTEXT.md
new file mode 100644
index 0000000000..21340d5d3c
--- /dev/null
+++ b/packages/openapi-typescript/CONTEXT.md
@@ -0,0 +1,252 @@
+# Client Generator — Context
+
+The domain language of `@redocly/openapi-typescript`: the package that turns
+an OpenAPI description into a typed, zero-dependency TypeScript client. Use these terms
+exactly — in code, comments, commits, and reviews — so the vocabulary stays consistent.
+For _how the pieces fit together_, see [ARCHITECTURE.md](./ARCHITECTURE.md).
+
+## Language
+
+### The model
+
+**IR** (Intermediate Representation):
+The spec-agnostic model the generator works against, produced from an OpenAPI document
+by `buildApiModel`. Everything downstream reads the IR, never the raw OpenAPI. The root
+node is the **ApiModel**. Inputs are accepted as OpenAPI 3.0/3.1/3.2 directly; **Swagger
+2.0** is converted to the 3.x shape by `normalizeSwagger2` before `buildApiModel`, so the
+builder stays 3.x-only.
+_Avoid_: AST, schema graph, DOM.
+
+**ApiModel**:
+The root of the IR — title, version, base URL, services, schemas, security schemes. Has
+many **ServiceModel**s; each has many **OperationModel**s.
+_Avoid_: spec, document (those are the raw OpenAPI input).
+
+**SchemaModel**:
+A normalized type node in the IR — one of a fixed set of kinds (scalar, object, array,
+record, ref, literal, enum, union, intersection, null, unknown). The emitter turns it
+into a TypeScript type.
+_Avoid_: type, schema (unqualified "schema" means the raw OpenAPI schema, not this).
+
+**OperationModel**:
+One API operation in the IR — method, path, parameters (split into path/query/header),
+request body, success responses, **error responses** (`errorResponses`: the declared
+4xx/5xx bodies, plus `default` when a 2xx success also exists — consumed only by
+`errorMode: 'result'` to type the result's `error`), security. Its `name` is the spec's `operationId`, or —
+when absent — a synthesized `<method><PascalCasePath>` made unique across the document
+(declared `operationId`s always win). Distinct from an **endpoint**, which is the
+_emitted_ function/file.
+_Avoid_: route, handler.
+
+**ResponseBodyModel** (`itemSchema`):
+A success/error response body in the IR — its `contentType`, the decoded `schema`, and (OpenAPI
+3.2 only) an optional `itemSchema`: the per-item type of a streaming media type. For a
+`text/event-stream` response, `itemSchema` is the type of each event's `data` payload; the
+emitter prefers it over the response `schema` when typing **SSE** events.
+_Avoid_: streamSchema, eventSchema (in code identifiers — `itemSchema` mirrors the OpenAPI key).
+
+### Emission
+
+**Emitter**:
+Builds a TypeScript **AST** (`ts.factory` nodes) from the IR. Lives in `emitters/`. Each
+emitter is deep — one narrow entry point over hidden node-building bulk — and owns a single
+concern: `types.ts` (`typesStatements`/`schemaToTypeNode`), `type-guards.ts`
+(`typeGuardStatements`), `auth.ts` (`authStatements`), `operations.ts`
+(`operationsBlockStatements`/`operationsMetaStatements`), `sse.ts` (the **SSE** detection seam:
+`isSseOp`/`partitionOps`/`sseEventType`/`sseDataKind`/`sseFragmentName`), and the **runtime** emitter
+`runtime.ts`. The foundation module `ts.ts` owns the shared printer and ergonomics:
+`printNodes` (nodes → source), `parseStatements` (embed hand-authored source as nodes), and
+`jsdoc` (attach a block comment). `client.ts` is the _composition_ emitter: it assembles each
+file's `ts.Statement[]` and prints **once** via `printNodes`, exposing `emitSingleFile` /
+`emitModules`. The writer-facing seam (`ClientModules`) stays string-based. Low-level text
+helpers (`pascalCase`, `splitLines`, `joinSections`) stay private in `support.ts`, and the
+JSDoc-body builder in `jsdoc.ts` — consumed only by the deep emitters, never by writers. Each
+emitter also keeps a string-returning wrapper (`renderTypes`/`renderAuth`/… → `printNodes(…)`)
+that the unit tests assert against.
+_Avoid_: renderer, codegen.
+
+**Writer**:
+Chooses the _file layout_ from the IR and emit options, then fills each file by calling
+the emitter. Lives in `writers/`. One **Writer** per **output mode**, selected by
+`getWriter`. A Writer is an implementation detail of the `sdk` **Generator**.
+_Avoid_: formatter, builder.
+
+**Generator**:
+A deep module that turns the IR into a set of files for one concern, selected by name
+through `getGenerator(name)` (mirrors the `getWriter(outputMode)` seam). Lives in
+`generators/`. The `sdk` generator is the typed client (it delegates to the output-mode
+**Writer**); the `zod` generator emits a standalone `<stem>.zod.ts` **schema module** (one
+`export const <Name>Schema` per IR named schema) beside the client; the `tanstack-query`
+generator emits a TanStack Query v5 (React) module (`<stem>.tanstack.ts`) wrapping the sdk —
+per query op a `<op>QueryKey`/`<op>Options` (`queryOptions`) factory + query key, per mutation a
+`<op>Mutation` (`mutationKey`/`mutationFn`) factory (requires the `sdk` generator; the consumer
+installs `@tanstack/react-query`); the `transformers` generator emits a standalone
+`<stem>.transformers.ts` of `transform<Name>(data: <Name>): <Name>` functions — one per IR named
+schema that (recursively) carries a `date-time`/`date` field — that walk the value and rewrite wire
+ISO strings to `new Date(...)` in place, composing across refs (`transformPet` calls
+`transformOwner`); pair it with the **dateType** knob (`--date-type Date`) so the runtime value
+matches the `Date`-typed sdk schema (it imports only the schema TYPES, so the client stays zero-dep).
+`generateClient` runs the configured generators (default
+`['sdk']`, selected via `--generators sdk,zod`) and merges their files. First-party only — no
+public plugin API yet.
+_Avoid_: plugin (reserved for a future public API), middleware.
+
+**Schema module** (`zod` generator):
+The `<stem>.zod.ts` file the `zod` generator emits — `import { z } from 'zod'` plus one
+`export const <Name>Schema = z.object(…)` per IR named schema. Output-mode-agnostic in phase 1
+(one module regardless of how the sdk partitions its files); refs become `z.lazy(() => …)`. Only
+the metadata refinements stable across zod `3.23 || 4` are emitted (`.min`/`.max`/`.int`/`.gt`/`.lt`/
+`.regex`); format methods (`.email`/`.uuid`/`.url`) are skipped. The generated **sdk** client never
+imports zod — `zod` is the _consumer's_ peer (`^3.23 || ^4`), installed only when validating
+(`PetSchema.parse(data)`) or deriving types (`z.infer<typeof PetSchema>`).
+_Avoid_: validation runtime, zod runtime (the sdk has no zod dependency).
+
+**Runtime**:
+The zero-dependency code emitted into every generated client — the `fetch` wrapper, URL/query
+builder (`__buildUrl`), retry machinery, auth state, and the public setters (`configure`,
+`setBaseUrl`, `setBearer`, `setBasicAuth`, `setApiKey…`). Uses only web-standard APIs. The wrapper is split into a
+shared core and one of two **terminals** (selected by **error mode**): `__send` runs the
+payload/header build + retry/fetch loop and returns the raw `Response`; `__parse` decodes a success
+body into the requested kind — `json` / `text` / `blob` / `arrayBuffer` / `formData` / `stream`
+(raw `ReadableStream` via `response.body`) / `auto` (content-type sniff, the generated default);
+`__request` (throw mode) delegates to both and throws `ApiError` on non-2xx, while
+`__requestResult` (result mode) returns the discriminated `Result<TData, TError>` instead. The
+per-call `RequestOptions` (the trailing `init` arg) carries `parseAs?: ParseAs` — a runtime escape
+hatch that overrides the inferred decode kind (static return type unchanged) — alongside the
+`retry` override. For **SSE** operations the runtime also emits `__sse<T>` — an
+`async function*` that wraps `__send`, parses `text/event-stream` frames into
+`ServerSentEvent<T>` (`{ event?, data, id?, retry? }`), and auto-reconnects (resuming with
+`Last-Event-ID`; backoff = server `retry:` → `reconnectDelay` → 1000ms, exponential + jitter,
+30s cap). `SseOptions` (`RequestInit & { reconnect?; reconnectDelay? }`) is the per-call init;
+aborting via `AbortSignal` or `break`ing the loop completes the iterator cleanly (no throw).
+The whole `__sse`/`ServerSentEvent`/`SseOptions` block is **gated** — emitted only when a model
+declares a streaming op.
+_Avoid_: helpers, lib, sdk-core.
+
+**SSE** / the `sse` namespace:
+An operation whose 2xx response declares `text/event-stream` is an **SSE** operation. It is
+detection-driven — no flag — and is emitted under a separate `sse` surface rather than as a plain
+endpoint: a typed `async function*` returning `AsyncGenerator<ServerSentEvent<T>>`, where `T` comes
+from the response **`itemSchema`** → media `schema` → `string`. The functions facade exposes
+`export const sse = { streamX, … }`; the service-class facade a bound `readonly sse = { … }`; in
+multi-file modes each tag/class contributes a `__sse_<Class>` fragment that the **barrel** merges
+into the public `sse`. SSE ops are error-mode-agnostic (they always throw on an initial non-2xx;
+never return the `Result` shape).
+_Avoid_: stream namespace, events client, subscribe.
+
+**Fragments** → **ClientModules**:
+**Fragments** are the emitter's _internal_ breakdown of a client (header, types, type
+guards, runtime, auth, operations, …) — never exposed to writers. **ClientModules** is
+the writer-facing interface `emitModules` returns: the _content_ of each emitted module
+(`http`, `schemas`, `operations`) plus the per-file wiring. Writers consume
+**ClientModules**, never **Fragments**.
+_Avoid_: sections, parts, chunks.
+
+**Endpoints** / **Barrel**:
+**Endpoints** is the emitted operation code (the standalone functions or class methods).
+The **Barrel** is the entry file that re-exports the public surface from the other
+emitted files.
+_Avoid_: index (for the barrel), routes (for endpoints).
+
+### Knobs
+
+**Output mode**:
+The file layout: `single` (one file), `split` (http + schemas + endpoints siblings),
+`tags` (one endpoints file per OpenAPI tag), `tags-split` (a folder per tag). Selected by
+`--output-mode`.
+_Avoid_: format, layout (in prose), split (as a synonym for the whole concept).
+
+**Facade**:
+The developer-facing operation shape: `functions` (standalone async functions) or
+`service-class` (operations as class methods). Selected by `--facade`. Orthogonal to
+**output mode** and **args style**.
+_Avoid_: style, mode, flavor.
+
+**Args style**:
+How an operation's inputs are passed: `flat` (path params then `params`/`body`/
+`headers` slots) or `grouped` (one **Variables** object). Selected by `--args-style`.
+_Avoid_: param style, calling convention.
+
+**Error mode**:
+The client's error-handling shape: `throw` (default — operations throw `ApiError` on non-2xx) or
+`result` (operations return a discriminated `Result<TData, TError>` = `{ data, error, response }`,
+with `error` typed from the spec's 4xx/5xx response bodies as the `<Op>Error` union). Selected by
+`--error-mode`. Transport/abort failures still throw in both modes; `onError` is a throw-mode hook.
+_Avoid_: throwOnError, errorHandling, result shape (in code identifiers).
+
+**dateType**:
+How `format: date-time`/`date` string fields are typed: `string` (default — byte-identical to the
+ISO wire shape) or `Date`. Selected by `--date-type`. Under `Date` the sdk emits `Date` for those
+scalar `string` schemas; the runtime conversion is opt-in and separate — pair it with the
+**`transformers` generator** (`--generators sdk,transformers`) so the parsed value matches the type.
+`int64` → `bigint` is deferred to a follow-up.
+_Avoid_: dateMode, parseDates (in code identifiers).
+
+**Variables** (`<Op>Variables`):
+The combined-inputs object type for an operation — path params + `params` + `body` +
+`headers`. It is the `vars` argument under `args-style grouped`, and the seam wrappers
+(React Query / SWR) consume it.
+_Avoid_: args, params, inputs (those mean narrower things — see below).
+
+**Params**:
+Query parameters, specifically. In a generated operation, `params` is always the query
+object; it never means "arguments in general".
+_Avoid_: arguments, inputs, query-string (in code identifiers).
+
+**Query serialization style**:
+How a query param's value is rendered onto the wire. The OpenAPI default is `form` +
+`explode: true` (arrays repeat the key; objects become `key[sub]=val`). `ParamModel`
+carries the spec's `style` / `explode` / `allowReserved` **only for query params**, and
+**only when present** — absence means the default, so the IR stays clean. The operation
+emits a per-param `styles` literal as `__buildUrl`'s 4th arg **only for non-default**
+params (style ≠ `form`, or `explode: false`, or `allowReserved`); default params get no
+entry, so `__buildUrl` runs its existing path and the output is byte-identical. `__buildUrl`
+honors `form`+`explode:false` (`key=a,b`), `spaceDelimited` (`key=a%20b`), `pipeDelimited`
+(`key=a|b`) — literal delimiters, values encoded — and `deepObject` (the bracket form);
+`allowReserved` skips percent-encoding of RFC-3986 reserved chars (built via `__encodeReserved`).
+Known deviation: an **object** query param at the default `form` style still serializes as
+`key[sub]=val` (deepObject brackets), not the spec's `sub=val` spread.
+
+**Injectable security scheme**:
+A security scheme the **runtime** can auto-apply via a setter — HTTP `bearer`
+(`setBearer`), HTTP `basic` (`setBasicAuth`), and `apiKey` in header / query / cookie
+(`setApiKey…`). OAuth2 / OpenID Connect normalize to `bearer`. Only `mutualTLS` is skipped.
+Bearer/apiKey credentials are a **`TokenProvider`** — a string or a (possibly async)
+function `() => string | Promise<string>`, resolved per request. `__auth` is **async**,
+returning `{ headers, query }`; query-auth merges into the URL, cookie-auth folds into a
+combined `Cookie` header.
+_Avoid_: auth (unqualified), credential.
+
+## Flagged ambiguities
+
+**"module"** — two senses, keep them straight:
+
+- _Architecture sense_ (interface + implementation) — used when discussing depth/seams.
+- _Emitted-file sense_ — the `http` / `schemas` / `endpoints` / barrel files a client is
+  split into. `ClientModules` is the writer-facing interface describing these.
+
+**`params` vs `Variables` vs `args style`** — easy to conflate:
+
+- `params` = the query object only.
+- `Variables` = the _whole_ combined-inputs object (path + params + body + headers).
+- `args style` = the _choice_ of how inputs reach the function (positional vs object).
+
+**operation vs endpoint** — `operation` is the IR/spec concept (an `OperationModel`);
+`endpoints` is the emitted code that realizes operations.
+
+## Example dialogue
+
+> **Dev:** I want the generated calls to take one object instead of positional args.
+>
+> **Maintainer:** That's the `object` **args style**. It bundles each operation's inputs
+> into its **Variables** type — so a call becomes `getPet({ id, params })` where `params`
+> is still the query object. It's orthogonal to the **facade**, so it works the same
+> whether you emit standalone functions or a service class.
+>
+> **Dev:** Does that change the shared files?
+>
+> **Maintainer:** No. **Args style** only affects the **endpoints**. The **runtime** and
+> **schemas** **modules** are byte-identical across args styles and facades — the
+> **writer** just lays the same emitted content out across files per the **output mode**.
+> Internally the **emitter** builds **fragments**, but the writers only ever see
+> **ClientModules**.
diff --git a/packages/openapi-typescript/README.md b/packages/openapi-typescript/README.md
new file mode 100644
index 0000000000..5278074a4d
--- /dev/null
+++ b/packages/openapi-typescript/README.md
@@ -0,0 +1,383 @@
+# @redocly/openapi-typescript
+
+> ⚠️ **Experimental.** This package and the client generator are released as **experimental**: the
+> generated output, options, and the plugin API may change in any minor release until it is declared
+> stable (see [ADR-0013](./docs/adr/0013-experimental-status.md)). Pin your version if you depend on
+> the output, and expect to regenerate when you upgrade. Feedback is very welcome while we stabilize it.
+
+Generate a typed TypeScript client (inline types + `fetch` runtime) from an OpenAPI description. The
+emitted client has **zero runtime dependencies** — it uses only web-standard APIs (`fetch`,
+`AbortController`, `URLSearchParams`, …), so it runs in browsers, Node ≥ 18, Bun, Deno, and edge
+runtimes. Code is produced through the TypeScript compiler AST (not string templates), so output is
+correct by construction; `typescript` is the only (peer) dependency.
+
+This package is the engine behind the **`redocly generate-client`** command. To run it from the
+command line, install [`@redocly/cli`](https://github.com/Redocly/redocly-cli) and see the
+[`generate-client` command reference](https://redocly.com/docs/cli/commands/generate-client). The rest
+of this README covers using the package **programmatically**.
+
+## Features
+
+- **Broad input** — OpenAPI **3.0, 3.1, and 3.2.0**, plus **Swagger 2.0** (normalized to 3.x before
+  generation). `input` is a file path or URL.
+- **Zero-dependency client** built via the TS AST, with `typescript` as the only peer dep.
+- **Output modes** — `single`, `split`, `tags`, `tags-split` (`outputMode`).
+- **Facades** — standalone `functions` or a `service-class` (`facade`), the latter supporting
+  **per-instance configuration and credentials** (`new Client({ auth, baseUrl, … })`).
+- **Argument styles** — `flat` positional args or a `grouped` `vars` object (`argsStyle`).
+- **Rich types** — inline types for every schema; string enums as unions or runtime `const` objects
+  (`enumStyle`); **discriminated-union `is<Member>()` type guards**; `<Op>Result` / `Error` / `Params`
+  / `Body` / `Headers` / `Variables` aliases (collision-suppressed); validation keywords surfaced as
+  JSDoc; `dateType: 'Date'`; **typed `multipart/form-data` bodies** (object fields, binary → `Blob`)
+  auto-serialized to `FormData`.
+- **Runtime** — `setBaseUrl` + a typed `ClientConfig` (headers, `fetch` swap, hooks); **composable
+  middleware** (`onRequest`/`onResponse`/`onError`); **opt-in, abort-aware retries** with backoff,
+  jitter, `Retry-After`, and a custom `retryOn`; per-call response decoding (`parseAs`); OpenAPI
+  **query-serialization styles**; `errorMode: 'result'` for a discriminated `{ data, error, response }`;
+  and a minification-safe `OPERATIONS` metadata map.
+- **Auth** — Basic / Bearer / apiKey (header, query, cookie) setters from `securitySchemes`, async
+  token providers, and per-instance credentials via `ClientConfig.auth`.
+- **Server-Sent Events** — `text/event-stream` operations as typed async iterators with auto-reconnect;
+  payloads typed from OpenAPI 3.2 `itemSchema`.
+- **Generators** (`generators`) — `sdk` (default), `zod`, `tanstack-query` (React/Vue/Svelte/Solid),
+  `swr`, `transformers`, `mock` (MSW handlers + baked or `faker` data), and a
+  [custom-generator plugin API](#custom-generators).
+- **Hardened** — document-derived names coerced to safe unique identifiers, comment text escaped, and a
+  bounded SSE reader.
+
+Every add-on generator keeps the emitted client dependency-free; its peer library is needed only in
+your app.
+
+## Use programmatically
+
+`generateClient(options)` is the API behind the CLI command — it loads the spec, builds the client,
+and writes the files:
+
+```ts
+import { generateClient } from '@redocly/openapi-typescript';
+
+const result = await generateClient({
+  input: 'openapi.yaml', // file path or URL
+  output: 'src/client.ts', // entry file; siblings derive from it in multi-file modes
+  outputMode: 'single', // 'single' | 'split' | 'tags' | 'tags-split'
+  facade: 'functions', // 'functions' | 'service-class'
+  argsStyle: 'flat', // 'flat' | 'grouped'
+  errorMode: 'throw', // 'throw' | 'result'
+  dateType: 'string', // 'string' | 'Date' (pair 'Date' with the 'transformers' generator)
+  enumStyle: 'const-object', // 'const-object' | 'union'
+  generators: ['sdk'], // see "Generators" below
+  // baseUrl, name, queryFramework, mockData, mockSeed, customGenerators are also accepted
+});
+
+console.log(`Wrote ${result.files.length} file(s), ${result.bytes} bytes.`);
+```
+
+For type-safe option authoring, `defineConfig` returns its argument unchanged:
+
+```ts
+import { defineConfig } from '@redocly/openapi-typescript';
+
+export default defineConfig({
+  input: './openapi.yaml',
+  output: './src/api/client.ts',
+  generators: ['sdk', 'zod'],
+});
+```
+
+To inspect the output without writing to disk, the lower-level `collectGeneratedFiles(model, opts)`
+returns the files in memory (see `src/index.ts`).
+
+## Using the generated client
+
+```ts
+import { configure, use, getOrderById, listMenuItems, setBearer } from './client.ts';
+
+// Optional: global config (base URL, headers, fetch swap, hooks, retry).
+configure({ retry: { retries: 3 } });
+
+// Composable middleware for cross-cutting concerns (logging, tracing, auth refresh).
+use({
+  onRequest: (ctx) => {
+    ctx.headers['X-Request-Id'] = crypto.randomUUID();
+  },
+});
+
+// Auth helpers are generated from the spec's `securitySchemes`.
+setBearer(token);
+
+const menu = await listMenuItems({ limit: 10 });
+const order = await getOrderById('ord_01khr487f7qm7p44xn427m43vb');
+
+// Per-call options (AbortSignal, retry override) go in the trailing `init` arg.
+const live = await listMenuItems({ limit: 10 }, { signal: controller.signal });
+```
+
+Each operation's trailing `init` argument is `RequestOptions` (`RequestInit` plus an optional per-call
+`retry` override and a `parseAs` reader). Retry is opt-in and abort-aware; a custom `retryOn(ctx)`
+predicate can branch on `ctx.error` (transport failure) or `ctx.response` (HTTP status / body) and opt
+a `POST` in.
+
+By default a response body is decoded by negotiating from its `Content-Type`. Pass `parseAs` in `init`
+to force a reader — `'json'`, `'text'`, `'blob'`, `'arrayBuffer'`, `'formData'`, `'stream'` (the raw
+`ReadableStream`), or `'auto'` (the default):
+
+```ts
+const stream = await getMenuItemPhoto('prd_…', { parseAs: 'stream' }); // ReadableStream
+```
+
+`parseAs` is a **runtime override only** — it does not change the operation's static return type, so
+forcing a reader that disagrees with the schema is the caller's responsibility.
+
+Query parameters honor their OpenAPI serialization style. The default (`form` + `explode: true`)
+repeats array values; declare `style` / `explode` / `allowReserved` on a parameter to get
+`form`+`explode:false` (`key=a,b`), `spaceDelimited` (`key=a%20b`), `pipeDelimited` (`key=a|b`),
+`deepObject`, or reserved-char passthrough.
+
+A setter is generated for each injectable scheme — `setBearer` (HTTP `bearer` / OAuth2),
+`setBasicAuth(username, password)` (HTTP `basic`), and `setApiKey…` for `apiKey` schemes in header,
+query, or cookie — and each operation sends the credentials its `security` requires. Bearer/apiKey
+credentials accept a `TokenProvider` (a string or a possibly-async function resolved per request) for
+refresh-token flows:
+
+```ts
+import { setBearer, setBasicAuth, setApiKey } from './client.ts';
+
+setBearer(async () => await getFreshAccessToken()); // resolved before each authed call
+setBasicAuth('alice', 's3cr3t'); // `Authorization: Basic <base64>`
+setApiKey('my-api-key'); // header / query / cookie, per the scheme's `in`
+```
+
+With `argsStyle: 'grouped'`, inputs are bundled into a single `vars` object (typed as the operation's
+`<Op>Variables`) instead of positional arguments, while `init` stays the trailing argument:
+
+```ts
+const order = await getOrderById({ orderId: 'ord_01khr487f7qm7p44xn427m43vb' });
+```
+
+With `errorMode: 'result'`, operations don't throw on non-2xx; each returns a discriminated
+`{ data, error, response }` whose `error` is typed from the spec's 4xx/5xx bodies (the `<Op>Error`
+union). On success `error` is `undefined`; the HTTP status is always on `response.status`:
+
+```ts
+const { data, error, response } = await getOrderById('ord_01khr487f7qm7p44xn427m43vb');
+if (error)
+  console.error(response.status, error); // `error` is the typed body
+else console.log(data.id); // `data` is the success body
+```
+
+Transport/abort failures still throw in both modes.
+
+The client also exports an `OPERATIONS` map (operationId → `{ method, path }`) plus `OperationId` /
+`OperationMetadata` types. The string-literal keys and path templates survive minification, so they're
+the stable handle for cache/query keys, tracing span names, and request logging:
+
+```ts
+import { OPERATIONS, getOrderById } from './client.ts';
+
+const queryKey = [OPERATIONS.getOrderById.path, orderId]; // "/orders/{orderId}"
+```
+
+## Generators
+
+`generators` (default `['sdk']`) selects which files to emit. The `sdk` client is always
+dependency-free; each add-on lands in its own sibling file and needs its peer library only in your app.
+
+### Runtime validation with Zod
+
+`generators: ['sdk', 'zod']` emits a standalone `<output>.zod.ts` module of [Zod](https://zod.dev)
+schemas (one `export const <Name>Schema` per schema). The generated client never imports Zod; only the
+`*.zod.ts` module does. Install Zod in your app as a peer — any `zod` `^3.23 || ^4`:
+
+```ts
+import { z } from 'zod';
+import type { Pet } from './client.ts';
+import { PetSchema } from './client.zod.ts';
+
+const pet: Pet = PetSchema.parse(await res.json()); // z.infer<typeof PetSchema> === Pet
+```
+
+Schemas carry the validation refinements stable across Zod 3.23 and 4 (`.min`/`.max`, `.gt`/`.lt`,
+`.int`, `.regex`); refs become `z.lazy(() => …)` so recursive schemas work. Format helpers
+(`.email`/`.uuid`/`.url`) are not emitted, since they diverge between Zod 3 and 4.
+
+### TanStack Query
+
+`generators: ['sdk', 'tanstack-query']` emits a standalone `<output>.tanstack.ts` module of
+[TanStack Query](https://tanstack.com/query) v5 factories wrapping the sdk operations. Each query op
+(`GET`/`HEAD`) gets a `<op>QueryKey`/`<op>Options` factory (returning `queryOptions`); each mutation
+gets a `<op>Mutation` factory (returning `mutationKey`/`mutationFn`):
+
+```ts
+import { useQuery, useMutation } from '@tanstack/react-query';
+import { getPetOptions, createPetMutation } from './client.tanstack.ts';
+
+const { data } = useQuery(getPetOptions({ id }));
+const { mutate } = useMutation(createPetMutation());
+```
+
+Only the `*.tanstack.ts` module imports TanStack Query; install it as a peer — any
+`@tanstack/react-query` `^5`. The factories wrap the **throw-mode** sdk (the default), since TanStack's
+`queryFn` is expected to throw on error.
+
+**Framework** — TanStack's `queryOptions`/`mutationOptions` API is identical across adapters, so the
+emitted module is byte-identical across frameworks; only the import specifier differs. Set
+`queryFramework` to `react` (default), `vue`, `svelte`, or `solid` and install the matching adapter
+(`@tanstack/<framework>-query`, any `^5`).
+
+### SWR
+
+`generators: ['sdk', 'swr']` emits a standalone `<output>.swr.ts` module of
+[SWR](https://swr.vercel.app) hooks. Each query op (`GET`/`HEAD`) gets a `<op>Key` tuple factory + a
+`use<Op>(vars, init?)` hook over `useSWR`; each mutation gets a `use<Op>()` hook over `useSWRMutation`:
+
+```ts
+import { useGetPetById, useCreatePet } from './client.swr.ts';
+
+const { data } = useGetPetById({ id });
+const { trigger } = useCreatePet();
+await trigger({ body: { name: 'Rex' } });
+```
+
+Only the `*.swr.ts` module imports SWR (`swr` for queries, `swr/mutation` for mutations); install it as
+a peer — any `swr` `^2`. The hooks wrap the **throw-mode** sdk and support only the `functions` facade.
+
+### Date transformers
+
+By default `date-time`/`date` fields are typed `string`. Set `dateType: 'Date'` to type them as `Date`,
+and add `'transformers'` to `generators` to emit a `<output>.transformers.ts` module of
+`transform<Name>` functions that convert wire ISO strings to `Date` at runtime:
+
+```ts
+import { getPet } from './client.ts';
+import { transformPet } from './client.transformers.ts';
+
+const pet = transformPet(await getPet(id)); // pet.createdAt is now a Date
+```
+
+The transformers import only the schema **types**, so the client stays dependency-free (`Date` is a web
+standard). `int64` → `bigint` is deferred; without `dateType: 'Date'` the date fields stay `string`.
+
+### MSW mocks
+
+`generators: ['sdk', 'mock']` emits a standalone `<output>.mocks.ts` module of [MSW](https://mswjs.io)
+v2 request handlers and `create<Schema>(overrides?)` data factories. Each handler intercepts its
+operation's method + path and responds with a fixture baked from the spec (prefers `example`/`default`;
+`format: binary` → `new Blob([])`; recursive schemas terminate at the cycle with an empty array/record).
+Each `create<Schema>` factory builds the same default object and merges `overrides`, so factories double
+as test builders. Install MSW as a dev dependency — `msw` `^2`:
+
+```ts
+// test setup (Node)
+import { setupServer } from 'msw/node';
+import { handlers } from './client.mocks';
+
+const server = setupServer(...handlers);
+beforeAll(() => server.listen());
+afterEach(() => server.resetHandlers());
+afterAll(() => server.close());
+
+// override a single factory for one case
+import { createMenuItem } from './client.mocks';
+const special = createMenuItem({ name: 'Cold Brew', price: 499 });
+```
+
+**Realistic data with faker** — mock data is **baked** by default (deterministic literals, no extra
+dependency). Set `mockData: 'faker'` to emit [`@faker-js/faker`](https://fakerjs.dev) calls for
+realistic data, and `mockSeed: <n>` to pin faker's PRNG so the data is reproducible. Factory signatures
+are identical in both modes; faker mode makes `@faker-js/faker` (`^9`) a dev dependency of your app
+(the client itself stays dependency-free).
+
+## Custom generators
+
+Need an output the built-ins don't ship — validators in another library, a UI permissions map, mocks
+in your test runner's format, an SDK in your house style? Write a **custom generator**: it reads the
+same OpenAPI-derived model the built-ins do, runs in the same pass, and its output never drifts from
+the spec.
+
+```ts
+// route-map-generator.ts
+import { defineGenerator } from '@redocly/openapi-typescript/plugin';
+
+export default defineGenerator({
+  name: 'route-map',
+  requires: ['sdk'],
+  run({ model, outputPath }) {
+    const routes = model.services
+      .flatMap((service) => service.operations)
+      .map((op) => `  ${op.name}: '${op.method.toUpperCase()} ${op.path}',`)
+      .join('\n');
+    return [
+      {
+        path: outputPath.replace(/\.ts$/, '.routes.ts'),
+        content: `export const routes = {\n${routes}\n} as const;\n`,
+      },
+    ];
+  },
+});
+```
+
+Select it in `generators` by import specifier (a path or package), or register it inline and select it
+by `name`:
+
+```ts
+import generateClient from '@redocly/openapi-typescript';
+import routeMap from './tools/route-map-generator.ts';
+
+await generateClient({
+  input: './openapi.yaml',
+  output: './src/api/client.ts',
+  customGenerators: [routeMap], // register…
+  generators: ['sdk', 'route-map'], // …then select by name (or pass './tools/route-map-generator.ts')
+});
+```
+
+`@redocly/openapi-typescript/plugin` also exports the IR types and the codegen toolkit the built-ins
+use (`ts`, `printStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, …). A generator
+declares the same `requires`/`facades`/`errorModes`/`dateTypes` contract, validated up front; the
+generated client stays dependency-free. See `examples/custom-generator` for a runnable example.
+
+## Server-Sent Events (streaming)
+
+An operation whose `2xx` response declares `text/event-stream` is generated — with no option — as a
+typed async iterator under an `sse` namespace. Each event's `data` is typed from the OpenAPI 3.2
+`itemSchema` (falling back to the media `schema`, then `string`):
+
+```ts
+import { sse } from './client.ts';
+
+for await (const ev of sse.streamMessages()) {
+  console.log(ev.id, ev.data.text); // ev: ServerSentEvent<Message>
+}
+```
+
+The stream **auto-reconnects** on a dropped connection, resuming via the `Last-Event-ID` header
+(backoff: server `retry:` → `reconnectDelay` → 1s, exponential with jitter, capped at 30s). Tune or opt
+out per call (`{ reconnect: false }` / `{ reconnectDelay: 500 }`), and `break` or pass an `AbortSignal`
+to stop early — both end the iterator cleanly (no throw). SSE operations always throw `ApiError` on an
+initial non-2xx and never return the `result`-mode shape.
+
+## Examples
+
+Runnable examples live in [`examples/`](./examples): `fetch-functions`, `service-class`, `zod`,
+`tanstack-query`, `mock`, and `custom-generator`. Each is a standalone Vite app with a checked-in,
+drift-checked generated client.
+
+## Documentation
+
+- [`generate-client` command reference](https://redocly.com/docs/cli/commands/generate-client) — CLI
+  usage, every flag, and `redocly.yaml` configuration.
+- [`ARCHITECTURE.md`](./ARCHITECTURE.md) and the [ADRs](./docs/adr/) — how the package is built and why.
+
+## Development
+
+This package is part of the Redocly CLI monorepo. Run all commands from the repo root:
+
+```sh
+npm run compile                 # build this package
+npm run unit                    # unit tests (this package is held at 100% coverage)
+VITEST_SUITE=e2e npx vitest run tests/e2e/generate-client/   # behavioral e2e
+```
+
+The emitted runtime lives in `src/emitters/runtime.ts` (a template string), the structural emitters in
+`src/emitters/`, the IR in `src/ir/`, the generators in `src/generators/`, and the multi-file layout
+strategies in `src/writers/`.
diff --git a/packages/openapi-typescript/docs/adr/0001-ast-codegen.md b/packages/openapi-typescript/docs/adr/0001-ast-codegen.md
new file mode 100644
index 0000000000..e715237737
--- /dev/null
+++ b/packages/openapi-typescript/docs/adr/0001-ast-codegen.md
@@ -0,0 +1,37 @@
+# ADR 0001: Generate TypeScript via the TS AST (`ts.factory`), not strings
+
+- Status: Accepted
+- Date: 2026-06-10
+
+## Context
+
+The generator must emit TypeScript across a growing matrix of options — output modes, facades,
+args-styles, error modes, auth breadth, `parseAs`, and a set of feature generators (zod, TanStack
+Query, transformers, SSE). String-template codegen makes the cross-cutting concerns (escaping,
+import/name coordination, indentation, dedup) brittle: every new axis multiplies the places a
+template can produce malformed or mis-formatted output.
+
+## Decision
+
+We build generated code as a **TypeScript AST** using `ts.factory` and emit it with the compiler's own
+printer (`ts.createPrinter`). A foundation module (`emitters/ts.ts`) wraps the ergonomics: a shared
+printer, `printNodes`, `parseStatements` (to embed hand-authored reference source — notably the
+runtime — as parsed nodes), and `jsdoc`. Each emitter returns `ts.Statement[]` / `ts.TypeNode`s; the
+composition (`client.ts`) assembles a per-file statement list and prints once.
+
+## Consequences
+
+- Structurally malformed output (mismatched braces, wrong nesting) is impossible; passes can
+  compose/transform/dedupe nodes before printing; the option matrix scales without brittle template
+  edits.
+- **The AST is not a sanitizer.** `ts.factory.createIdentifier` prints its text verbatim and
+  synthetic comments are emitted as written — so a spec-supplied name or description still reaches the
+  output unchecked. Those two channels are closed *before* the printer, not by it: names are coerced
+  to safe identifiers in the IR (`ir/sanitize-identifiers.ts`, with an assert backstop) and all
+  comment text is run through `escapeJsDoc` (`emitters/ts.ts`). Treat any new value that flows into an
+  identifier slot or a comment as requiring the same handling.
+- Output formatting is the printer's (valid, but plainer than hand-formatting) — a pretty-print pass
+  is deferred to optional-formatter work.
+- The cost is a dependency on `typescript` at generation time (see [ADR-0002](./0002-typescript-peer-dep.md)),
+  and emitter code is more verbose than templates for trivial snippets — accepted for the correctness
+  and composability gains.
diff --git a/packages/openapi-typescript/docs/adr/0002-typescript-peer-dep.md b/packages/openapi-typescript/docs/adr/0002-typescript-peer-dep.md
new file mode 100644
index 0000000000..36ec6b8e77
--- /dev/null
+++ b/packages/openapi-typescript/docs/adr/0002-typescript-peer-dep.md
@@ -0,0 +1,30 @@
+# ADR 0002: `typescript` as a peer dependency; zero-runtime-dependency output
+
+- Status: Accepted
+- Date: 2026-06-10
+
+## Context
+
+[ADR-0001](./0001-ast-codegen.md) makes `typescript` (for `ts.factory` + `ts.createPrinter`) a
+generation-time requirement. We must decide how the package depends on it without (a) bloating
+installs for consumers who already have `typescript`, or (b) compromising the headline property that
+the **generated client has no runtime dependencies**.
+
+## Decision
+
+We declare `typescript` (`>=5.5.0`) as a **`peerDependency`** of `@redocly/openapi-typescript`. The
+only real runtime `dependency` is `@redocly/openapi-core` (the input/document side). Package-in-code
+consumers (`import { generateClient }`) already have `typescript`; `@redocly/cli` declares it as a real
+`dependency` so the CLI works standalone (and transitively satisfies the peer). The codegen uses only
+stable `factory` / `createPrinter` / `createSourceFile` / `SyntaxKind` APIs, so the wide peer range is
+safe.
+
+## Consequences
+
+- `typescript` is used **only at generation time** and never emitted, so the generated client stays
+  dependency-free (web-standard APIs only: `fetch`, `AbortController`, `URLSearchParams`) and runs in
+  browsers, Node, Bun, Deno, and edge runtimes.
+- `@redocly/openapi-core` must **not** grow a TS code-builder — its `yaml-ast-parser` is the input AST,
+  not an output one.
+- Consumers in unusual setups may need to add `typescript` explicitly; the wide peer range keeps this
+  rare.
diff --git a/packages/openapi-typescript/docs/adr/0003-spec-agnostic-ir.md b/packages/openapi-typescript/docs/adr/0003-spec-agnostic-ir.md
new file mode 100644
index 0000000000..e49e31e457
--- /dev/null
+++ b/packages/openapi-typescript/docs/adr/0003-spec-agnostic-ir.md
@@ -0,0 +1,27 @@
+# ADR 0003: A spec-agnostic IR as the builder↔emitter contract
+
+- Status: Accepted
+- Date: 2026-06-10
+
+## Context
+
+The generator must support multiple input dialects (OpenAPI 3.0/3.1/3.2 and Swagger 2.0) and multiple
+output shapes. If emitters read the raw OpenAPI document directly, every emitter would have to handle
+every spec quirk and version difference, and adding a dialect or an output target would ripple across
+the whole codebase.
+
+## Decision
+
+We interpose a **spec-agnostic intermediate representation** (`ir/model.ts`) between parsing and
+emission. `buildApiModel` (`ir/build.ts`) walks the (bundled, ref-preserved) document once and produces
+the IR; Swagger 2.0 is first normalized to the 3.x shape (`ir/normalize-swagger2.ts`) so the builder
+sees one shape. **Everything downstream reads the IR, never the raw spec.** The IR is a pure type model
+— no runtime code — and is the contract between the builder and the emitters.
+
+## Consequences
+
+- A new input dialect is absorbed in one place (normalize + build); emitters are untouched.
+- A new output target (e.g. another language) can be written against the IR without re-parsing specs —
+  the IR is the seam that makes multi-language plausible.
+- The IR must stay genuinely spec-agnostic; leaking OpenAPI-isms into it would erode the boundary. New
+  schema kinds are added to `SchemaModel` and produced in the builder, then consumed by emitters.
diff --git a/packages/openapi-typescript/docs/adr/0004-registry-seams.md b/packages/openapi-typescript/docs/adr/0004-registry-seams.md
new file mode 100644
index 0000000000..fb97ab3152
--- /dev/null
+++ b/packages/openapi-typescript/docs/adr/0004-registry-seams.md
@@ -0,0 +1,32 @@
+# ADR 0004: First-party `getGenerator` / `getWriter` registry seams
+
+- Status: Accepted
+- Date: 2026-06-10
+
+## Context
+
+The package needs to vary two things independently: **what** is generated (the SDK, plus optional
+feature outputs like zod schemas or framework hooks) and **how** files are laid out (single file, split,
+per-tag, …). We want these to be extensible internally without committing — yet — to a public plugin
+API and its long-term compatibility surface.
+
+## Decision
+
+We expose two internal **registry seams**, each mapping a name to an implementation:
+
+- **`getGenerator(name)`** → `Generator` (`(input) => GeneratedFile[]`). `generateClient` runs the
+  configured generators (default `['sdk']`), merging their files (duplicate output paths throw). New
+  capabilities (zod, tanstack-query, transformers, …) plug in here. The `sdk` generator delegates to
+  the writer seam below.
+- **`getWriter(outputMode)`** → `Writer`. Adapters for `single` / `split` / `tags` / `tags-split`
+  (the two tag layouts share `buildTaggedClient`). New file layouts plug in here.
+
+Both are **first-party only** — no public third-party plugin API yet.
+
+## Consequences
+
+- New generators and layouts are added by registering an implementation, not by editing call sites.
+- Writers consume the emitter only through the `emitModules(...) → ClientModules` seam, so they stay
+  layout-only and the emitter's internal fragment breakdown never leaks.
+- Deferring a public plugin API keeps us free to change `Generator`/`Writer` internals; third-party
+  extensibility is a deliberate later step, revisited once the first-party set stabilizes.
diff --git a/packages/openapi-typescript/docs/adr/0005-error-mode-terminals.md b/packages/openapi-typescript/docs/adr/0005-error-mode-terminals.md
new file mode 100644
index 0000000000..de3fe1a81c
--- /dev/null
+++ b/packages/openapi-typescript/docs/adr/0005-error-mode-terminals.md
@@ -0,0 +1,33 @@
+# ADR 0005: Error handling as a generate-time mode (throw vs result)
+
+- Status: Accepted
+- Date: 2026-06-10
+
+## Context
+
+Consumers want different error-handling ergonomics: some prefer exceptions, others prefer a
+discriminated `{ data, error }` result they must inspect. Encoding this **per call** (à la a
+`throwOnError` flag) forces conditional-return overloads and complicates every operation signature. A
+codebase generally picks one convention anyway.
+
+## Decision
+
+Error handling is a **generate-time mode** (`--error-mode throw | result`, default `throw`). The fetch
+wrapper is factored into a shared core plus one of two terminals:
+
+- `__send` — payload/header build + the retry/fetch loop → a raw `Response`; `__parse` — success-body
+  decode.
+- `__request` (**throw** mode — throws `ApiError` on non-2xx) **or** `__requestResult` (**result** mode
+  — returns `Result<TData, TError>`).
+
+`renderRuntime(..., errorMode)` emits **only** the chosen terminal (so `noUnusedLocals` stays clean);
+`renderOperationsBlock(..., { errorMode })` emits matching call sites and the `<Op>Error` aliases.
+
+## Consequences
+
+- Operation signatures stay simple — no per-call conditional overloads; the mode is uniform across the
+  client.
+- Throw mode is byte-identical to the pre-extraction behavior; result mode reuses the same `__send`
+  core, so retry/abort/auth/decoding logic lives in one place.
+- Switching conventions requires regeneration (acceptable — it's a project-level choice, not a per-call
+  one).
diff --git a/packages/openapi-typescript/docs/adr/0006-sse-namespace.md b/packages/openapi-typescript/docs/adr/0006-sse-namespace.md
new file mode 100644
index 0000000000..8f6febda71
--- /dev/null
+++ b/packages/openapi-typescript/docs/adr/0006-sse-namespace.md
@@ -0,0 +1,31 @@
+# ADR 0006: SSE as a derived response kind under an `sse.*` namespace
+
+- Status: Accepted
+- Date: 2026-06-10
+
+## Context
+
+Some operations stream Server-Sent Events (`text/event-stream`). These don't fit the one-shot
+request/response shape: they return an async iterator of typed events, need reconnection
+(`Last-Event-ID` + backoff), and are errorMode-agnostic. We must surface them without complicating
+ordinary operations or the default output.
+
+## Decision
+
+SSE is a **derived response kind**, detected (not flagged) by `emitters/sse.ts`
+(`isSseOp`/`partitionOps`): an operation whose 2xx response declares `text/event-stream` is emitted
+under a separate **`sse` namespace** instead of as a plain endpoint. The runtime gains a **gated**
+`__sse<T>` generator — an `async function*` that **reuses `__send`** for the initial request +
+retry/auth, then parses event frames and auto-reconnects via `Last-Event-ID`. The event payload type
+`T` comes from the response `itemSchema` → media `schema` → `string`. `client.ts` partitions each
+service's ops and exposes the SSE ones under `sse` (functions: `export const sse = { … }`;
+service-class: a bound `readonly sse = { … }`); in multi-file modes each tag/class contributes a
+`__sse_<Class>` fragment that the barrel merges.
+
+## Consequences
+
+- Streaming ops get an ergonomic, typed async-iterator surface without touching ordinary operations.
+- The whole `__sse`/`ServerSentEvent`/`SseOptions` block is **gated off** when no op streams, so
+  non-SSE clients are byte-identical (no churn).
+- SSE bypasses the error-mode terminals ([ADR-0005](./0005-error-mode-terminals.md)) by design — it has
+  no `Result` form.
diff --git a/packages/openapi-typescript/docs/adr/0007-call-site-auth.md b/packages/openapi-typescript/docs/adr/0007-call-site-auth.md
new file mode 100644
index 0000000000..1f450686f8
--- /dev/null
+++ b/packages/openapi-typescript/docs/adr/0007-call-site-auth.md
@@ -0,0 +1,28 @@
+# ADR 0007: Auth resolved at the call site via async `__auth`
+
+- Status: Accepted (extended by [ADR-0009](./0009-per-instance-auth.md))
+- Date: 2026-06-10
+
+## Context
+
+Security schemes vary (HTTP bearer/basic, apiKey in header/query/cookie) and credentials may be async
+(a token provider returning a `Promise`). We want all of this handled without bloating the shared
+runtime with auth branching, and without emitting auth code into operations that don't need it.
+
+## Decision
+
+Credentials are resolved **at the call site**, not inside the runtime fetch wrapper. `renderAuth`
+(`emitters/auth.ts`) emits module-scoped credential slots, the `set*` setters (accepting a
+`TokenProvider` = value-or-`(() => string | Promise<string>)` for bearer/apiKey; `setBasicAuth` stays
+sync), and an **async** `__auth(schemes): Promise<{ headers, query }>` that awaits each resolvable
+credential. Every authed operation emits `const __a = await __auth([...])`, spreads `...__a.headers`,
+and (for `apiKeyQuery` keys, threaded via `queryAuthKeys`) merges `...__a.query` into the URL builder.
+Non-authed operations emit **no** auth code at all.
+
+## Consequences
+
+- All auth — header/query/cookie, sync/async — lives in one place next to URL building, with zero
+  churn to the runtime fetch wrapper.
+- Operations pay only for the auth they use; unauthenticated ops stay clean.
+- Auth resolution is per-call (awaited each request), which is the correct behavior for rotating/async
+  tokens; the small overhead is acceptable.
diff --git a/packages/openapi-typescript/docs/adr/0008-redocly-yaml-config.md b/packages/openapi-typescript/docs/adr/0008-redocly-yaml-config.md
new file mode 100644
index 0000000000..645e153eeb
--- /dev/null
+++ b/packages/openapi-typescript/docs/adr/0008-redocly-yaml-config.md
@@ -0,0 +1,29 @@
+# ADR 0008: `generate-client` config via `redocly.yaml` `x-openapi-typescript`
+
+- Status: Accepted
+- Date: 2026-06-10
+
+## Context
+
+`generate-client` settings could live in a dedicated `defineConfig` file (`*.config.ts`), but Redocly
+users expect a single project config — `redocly.yaml`. First-class config keys belong in the
+`@redocly/config` package (a separate repo), which doesn't model client-gen settings yet. We want
+redocly.yaml-driven generation **now**, without blocking on that release.
+
+## Decision
+
+`generate-client` reads its options from an **`x-openapi-typescript` extension block** in
+`redocly.yaml`. The `x-` prefix is the tolerated-extension convention, so no `@redocly/config` schema
+change is needed — and `@redocly/openapi-core` already preserves the block verbatim in
+`config.resolvedConfig`. The CLI extracts it, resolving relative `input`/`output` against the
+redocly.yaml directory. Precedence, low → high: **`redocly.yaml` block → `--config-file` (the
+`*.config.ts`, retained) → CLI flags**. Examples ship a `redocly.yaml` and run `redocly generate-client`
+with no flags.
+
+## Consequences
+
+- One project config; `redocly generate-client` works with no flags by auto-discovering `redocly.yaml`.
+- No core/`@redocly/config` change required yet; when first-class keys land, the `x-` block can be
+  swapped for typed fields (a future ADR will supersede this).
+- The dedicated `*.config.ts` path stays available (via `--config-file`) for configs outside the
+  project or in nested folders.
diff --git a/packages/openapi-typescript/docs/adr/0009-per-instance-auth.md b/packages/openapi-typescript/docs/adr/0009-per-instance-auth.md
new file mode 100644
index 0000000000..d181fc7c75
--- /dev/null
+++ b/packages/openapi-typescript/docs/adr/0009-per-instance-auth.md
@@ -0,0 +1,35 @@
+# ADR 0009: Per-instance auth via `ClientConfig.auth`
+
+- Status: Accepted
+- Date: 2026-06-10
+
+## Context
+
+[ADR-0007](./0007-call-site-auth.md) resolves credentials at the call site, but from **module-global**
+slots (`setBearer`/`setBasicAuth`/`setApiKey*`). The `service-class` facade exists to run **multiple
+independent client instances** — yet global auth means every instance of a generated module shares one
+credential. Real adoption hit this: two clients of the _same_ generated module needing different HTTP
+Basic credentials (e.g. an internal vs. a public syncer client), which the globals cannot represent.
+The workaround — injecting `Authorization` via per-instance `config.headers` — bypasses the spec's
+per-operation `security`, sending the header even to endpoints that don't declare it.
+
+## Decision
+
+Add an optional **`auth?: AuthCredentials`** to `ClientConfig`, carrying per-instance credentials, and
+thread the config into the resolver: `__auth(schemes, config)`. Each scheme resolves from
+`config.auth?.<scheme> ?? <global slot>` — the per-instance value wins, the global setters remain the
+fallback. `AuthCredentials` mirrors the schemes the spec declares:
+`{ bearer?: TokenProvider; basic?: { username; password }; apiKey?: Record<string, TokenProvider> }`.
+It is emitted only when the client has injectable schemes (so non-auth clients are byte-identical), and
+works for both facades (the functions facade sets it once via `configure({ auth })`).
+
+## Consequences
+
+- The service-class facade can finally run independent instances with independent credentials — its
+  reason to exist.
+- **Backward compatible:** the global setters are unchanged and remain the fallback; the functions
+  facade is unchanged unless `auth` is set.
+- Unlike the header workaround, it still honors each operation's declared `security` (only declared
+  schemes are sent).
+- **Extends** ADR-0007 rather than superseding it — credentials are still resolved at the call site;
+  the source is now "config-then-global" instead of "global only".
diff --git a/packages/openapi-typescript/docs/adr/0010-mock-data-baked-vs-faker.md b/packages/openapi-typescript/docs/adr/0010-mock-data-baked-vs-faker.md
new file mode 100644
index 0000000000..5515f05733
--- /dev/null
+++ b/packages/openapi-typescript/docs/adr/0010-mock-data-baked-vs-faker.md
@@ -0,0 +1,46 @@
+# ADR 0010: Mock data — baked literals by default, faker opt-in
+
+- Status: Accepted
+- Date: 2026-06-13
+
+## Context
+
+The `mock` generator emits [MSW](https://mswjs.io) request handlers plus `create<Schema>` data
+factories. Those factories need values to return. Two sources are reasonable, and they pull in
+opposite directions:
+
+- **Baked literals** — deterministic values synthesized from the schema (preferring `example` /
+  `default`). Zero runtime dependency, reproducible by construction, but unrealistic ("string",
+  `0`, the same UUID every time).
+- **[`@faker-js/faker`](https://fakerjs.dev) calls** — realistic, varied data (names, emails,
+  dates), at the cost of a dependency and (without a seed) non-determinism.
+
+A mock generator that hard-codes either choice is wrong for half its users: test suites want
+deterministic zero-dep fixtures; demos and Storybook want realistic data. The core constraint is
+that the generated **client stays dependency-free** ([ADR-0002](./0002-typescript-peer-dep.md)) —
+whatever mocks pull in must not leak into it.
+
+## Decision
+
+Make data source a knob — **`--mock-data baked` (default) | `faker`** — with **identical factory
+signatures** in both modes, so a consumer flips it without touching call sites. Baked mode lives in
+`emitters/sample.ts` (`sampleValue` → a JS value, printed as a literal); faker mode lives in
+`emitters/faker.ts` (`fakerExpression` → a `ts.Expression` of `@faker-js/faker` calls). Both walk
+the same IR with the same visited-set cycle guard, so they agree on shape; `--mock-seed <n>` emits
+`faker.seed(n)` for reproducible faker output. The `@faker-js/faker` import appears only in the
+`*.mocks.ts` module — never in the client.
+
+A `$ref` cycle terminates in the **type-correct empty value** for its position (array → `[]`,
+record → `{}`, optional property → omitted; only a required, non-container self-reference degrades
+to `null`), shared by both modes, so mock data always satisfies the generated non-nullable types.
+
+## Consequences
+
+- Default output is zero-dependency and deterministic — safe for CI fixtures with no install.
+- Realistic data is one flag away, and reproducible with `--mock-seed`, without changing how the
+  factories are called.
+- Two walkers (`emitters/sample.ts`, `emitters/faker.ts`) must be kept structurally in lockstep; the
+  shared cycle semantics and a parallel test suite are what hold them together. Both live under
+  `emitters/` (a mock concern, not the IR layer).
+- `mock` requires the `sdk` generator (factories reference its types) and is validated by the
+  generator contract ([ADR-0004](./0004-registry-seams.md)).
diff --git a/packages/openapi-typescript/docs/adr/0011-wrapper-generators.md b/packages/openapi-typescript/docs/adr/0011-wrapper-generators.md
new file mode 100644
index 0000000000..e5f9cdcc4e
--- /dev/null
+++ b/packages/openapi-typescript/docs/adr/0011-wrapper-generators.md
@@ -0,0 +1,45 @@
+# ADR 0011: Data-fetching wrapper generators (`swr`, `tanstack-query`)
+
+- Status: Accepted
+- Date: 2026-06-13
+
+## Context
+
+The sdk emits framework-agnostic `async function`s. Application code that uses
+[TanStack Query](https://tanstack.com/query) or [SWR](https://swr.vercel.app) then hand-writes the
+same glue per operation — query keys, `queryFn`/fetcher wrappers, mutation factories — which drifts
+from the spec and is exactly the boilerplate a generator should own. Two questions had to be
+answered without compromising the dependency-free client ([ADR-0002](./0002-typescript-peer-dep.md)):
+how the wrappers stay in step with the sdk's calling convention, and how to support multiple
+frameworks (TanStack ships `react`/`vue`/`svelte`/`solid` adapters) without four near-copies.
+
+## Decision
+
+Each wrapper is a **registry generator** ([ADR-0004](./0004-registry-seams.md)) emitting a separate
+`*.tanstack.ts` / `*.swr.ts` module that imports the framework peer and **forwards to the sdk's
+exported functions** — the client never imports the framework. Both wrappers derive their argument
+order from the shared `operation-signature.ts`, so a forwarding call lines up with the sdk by
+construction.
+
+Their cross-cutting agreement — which operations are wrappable (skip SSE; skip `<Op>Variables`
+name collisions) and the `vars`/`init` parameter shape — lives in one shared `wrapper-support.ts`,
+so the two emitters (and any third adapter) cannot diverge.
+
+For TanStack's multiple frameworks, the **emitted factory module is byte-identical across
+frameworks** — `queryOptions` and the mutation shape are framework-agnostic — so the only
+difference is the import specifier. `--query-framework` selects it (`@tanstack/<framework>-query`),
+rather than forking the generator per framework.
+
+Wrappers wrap the **throw-mode** sdk (TanStack/SWR expect the fetcher to throw), so they require
+`--error-mode throw` and the `functions` facade; the generator contract fails fast otherwise.
+
+## Consequences
+
+- Adding a third wrapper (e.g. another fetching library) reuses `wrapper-support.ts` and
+  `operation-signature.ts` — only the per-operation factory bodies are new.
+- TanStack framework support costs one import-specifier switch, not a code path per framework.
+- The client stays dependency-free; the framework is a peer of the wrapper module only.
+- SSE operations and `<Op>Variables` schema collisions are skipped with a logged notice rather than
+  emitting a module that won't compile.
+- Vercel/Next.js-specific data fetching is intentionally out of scope (SWR covers the React-Query
+  alternative); revisit only if there is concrete demand.
diff --git a/packages/openapi-typescript/docs/adr/0012-plugin-api.md b/packages/openapi-typescript/docs/adr/0012-plugin-api.md
new file mode 100644
index 0000000000..c6d7db0caf
--- /dev/null
+++ b/packages/openapi-typescript/docs/adr/0012-plugin-api.md
@@ -0,0 +1,50 @@
+# ADR 0012: Experimental custom-generator (plugin) API
+
+- Status: Accepted (experimental)
+- Date: 2026-06-13
+
+## Context
+
+The built-in generators ([ADR-0004](./0004-registry-seams.md)) cover common targets (sdk, zod,
+tanstack-query, swr, transformers, mock). They cannot cover the long tail: outputs that are
+org-specific (a house-style SDK wrapper, a UI permissions map) or niche (validators in a library we
+don't ship, mocks in another test runner's format). Today a user's only options are forking the tool
+or writing a separate program that re-parses the spec. The registry seam is already shaped to admit
+more generators — the question was whether, and how, to open it to third parties without
+compromising the dependency-free client ([ADR-0002](./0002-typescript-peer-dep.md)) or locking the
+IR's shape prematurely.
+
+## Decision
+
+Open the `getGenerator` registry as a **public, experimental** API for **custom generators only**
+(not writers or AST hooks). A custom generator is the internal `GeneratorDescriptor` plus a `name`:
+`{ name, run, requires?, facades?, errorModes?, dateTypes? }`, where `run(input) => GeneratedFile[]`
+receives the same IR the built-ins do.
+
+- **Loading is dual.** A `generators` entry resolves as a built-in name, an inline `customGenerators`
+  entry (from a `defineConfig` file — type-safe, no dynamic import), or an **import specifier** (a
+  path resolved against the config dir, or an installed package) that is dynamically `import()`ed and
+  default-exported (mirroring how config files load). A new `resolveGenerators` performs this before
+  emission, producing a name→descriptor registry that `validateGenerators` and the run loop consume.
+- **Surface + stability.** A dedicated `@redocly/openapi-typescript/plugin` entry exports
+  `defineGenerator`, the IR types, and a curated codegen toolkit (`ts`, `printStatements`,
+  `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, `safeIdent`) — the same
+  internals the built-in generators use, re-surfaced (no new logic). The whole surface is
+  **`@experimental`**: it may change between minor versions until real plugins exercise it and it is
+  stabilized.
+- **Fail fast.** Collisions (a custom name equal to a built-in or another custom), invalid exports,
+  unloadable specifiers, and unmet `requires`/`facades`/`errorModes`/`dateTypes` all throw an
+  actionable error before any file is written.
+
+## Consequences
+
+- The long tail is addressable without forking; a generator is a small module against a stable IR,
+  and is a first-class peer of the built-ins (same model, same toolkit).
+- The generated client stays dependency-free — a generator's output is its own file, and its target
+  libraries are peers of the consumer's app, not the client.
+- **Trust:** import-specifier generators execute arbitrary code at generation time — the same trust
+  level as any installed dependency or `defineConfig` file. Not sandboxed (out of scope); documented.
+- **Commitment is deferred:** marking the surface experimental keeps the IR and toolkit free to
+  evolve while the API is proven; graduating it to stable is future work.
+- **Out of scope (v1):** custom writers / output modes, emitter/AST hooks, per-plugin options
+  passthrough, and a plugin marketplace.
diff --git a/packages/openapi-typescript/docs/adr/0013-experimental-status.md b/packages/openapi-typescript/docs/adr/0013-experimental-status.md
new file mode 100644
index 0000000000..4c23bdd199
--- /dev/null
+++ b/packages/openapi-typescript/docs/adr/0013-experimental-status.md
@@ -0,0 +1,62 @@
+# ADR 0013: Experimental release status & stabilization criteria
+
+- Status: Accepted
+- Date: 2026-06-13
+
+## Context
+
+`generate-client` (and `@redocly/openapi-typescript`) ships a large public surface in one go: CLI
+flags, the **exact generated output**, the configuration schema, six generators, and a
+custom-generator plugin API that exposes the IR ([ADR-0012](./0012-plugin-api.md)). Several of these
+are hard to walk back once committed to:
+
+- **Generated output is the real lock-in** — consumers commit the generated client to their repos and
+  depend on its exact shape; changing it is a breaking change.
+- **The IR is semi-public** through the plugin API (already `@experimental`), so freezing the
+  surrounding feature while the IR moves would be incoherent.
+- There are **known deferrals** (`int64`→`bigint`, oauth2 token-flow helpers, a pretty-print pass, no
+  built-in Angular/Valibot) and **little real-world adoption** yet to validate the design.
+
+Committing all of this to semver-stable on day one is a promise we can't yet keep.
+
+## Decision
+
+Release the **entire feature as experimental**. Its CLI flags, generated output, configuration, and
+the plugin API may change in any minor release until it is declared stable.
+
+- **Versioning:** `@redocly/openapi-typescript` is versioned **independently, starting at `0.x`** —
+  it is **not** in the monorepo's `fixed` lockstep group (which keeps `@redocly/cli` /
+  `@redocly/openapi-core` / `@redocly/respect-core` in step). A `0.x` version is the semver-native
+  signal that the API may change, and it decouples the experimental package's churn from the stable
+  CLI's version (the CLI bundles it and pins the exact version it ships). It graduates to `1.0.0` when
+  declared stable.
+- **Disclosure:** the `0.x` version, the README banner, the command-doc admonition, the changeset
+  entry, and this ADR all state the experimental status and link here.
+
+### Stabilization criteria (what graduates it to stable)
+
+The feature stays experimental until all of the following hold:
+
+1. **Validated against real-world specs** — exercised on a representative set of production OpenAPI
+   descriptions (incl. internal consumers) with no output-shape surprises.
+2. **Generated-output shape frozen** — no pending changes to the emitted client/types that would
+   break a committed, generated client.
+3. **Plugin IR committed to** — the IR and codegen toolkit re-exported from
+   `@redocly/openapi-typescript/plugin` are reviewed and promoted from `@experimental` to stable.
+4. **Deferrals decided** — `int64`→`bigint`, oauth2 token-flow helpers, and the formatting/pretty-print
+   pass are each either implemented or explicitly declared out of scope.
+5. **Soak period** — a defined window of no breaking changes to flags/output/config before the flag is
+   flipped.
+
+Stabilization is tracked in a public issue linked from the docs; flipping to stable is itself a
+changelog-worthy change.
+
+## Consequences
+
+- We can refine flags, output, config, and the IR based on real adoption without breaking-change
+  apologies — the experimental label sets that expectation up front.
+- The cost is the usual one: some teams defer adopting experimental tooling. For a _codegen_ tool the
+  risk is low — the output lives in the consumer's repo and the version can be pinned.
+- "Experimental" must not become permanent: the criteria above are the explicit exit, and graduating
+  to `1.0.0` (with the docs disclaimers dropped) is the signal that they have been met.
+- This ADR is the canonical record of the status; superseded when the feature is declared stable.
diff --git a/packages/openapi-typescript/docs/adr/README.md b/packages/openapi-typescript/docs/adr/README.md
new file mode 100644
index 0000000000..d2112f209b
--- /dev/null
+++ b/packages/openapi-typescript/docs/adr/README.md
@@ -0,0 +1,48 @@
+# Architecture Decision Records
+
+Immutable, point-in-time records of the significant, hard-to-reverse decisions behind
+`@redocly/openapi-typescript`. Each ADR captures the **context**, the **decision**, and its
+**consequences** at the time it was made. ADRs are not edited as the code evolves — when a decision is
+revisited, add a new ADR that supersedes the old one (and mark the old one `Superseded by ADR-NNNN`).
+
+For the **descriptive** map of how the package is built today (pipeline, module map, seams), see
+[`../../ARCHITECTURE.md`](../../ARCHITECTURE.md). ARCHITECTURE.md says _what is_; these ADRs say _why_.
+
+## Index
+
+| #                                          | Decision                                                           | Status                  |
+| ------------------------------------------ | ------------------------------------------------------------------ | ----------------------- |
+| [0001](./0001-ast-codegen.md)              | Generate TypeScript via the TS AST (`ts.factory`), not strings     | Accepted                |
+| [0002](./0002-typescript-peer-dep.md)      | `typescript` as a peer dep; zero-runtime-dependency output         | Accepted                |
+| [0003](./0003-spec-agnostic-ir.md)         | A spec-agnostic IR as the builder↔emitter contract                 | Accepted                |
+| [0004](./0004-registry-seams.md)           | First-party `getGenerator` / `getWriter` registry seams            | Accepted                |
+| [0005](./0005-error-mode-terminals.md)     | Error handling as a generate-time mode (throw vs result)           | Accepted                |
+| [0006](./0006-sse-namespace.md)            | SSE as a derived response kind under an `sse.*` namespace          | Accepted                |
+| [0007](./0007-call-site-auth.md)           | Auth resolved at the call site via async `__auth`                  | Accepted (ext. by 0009) |
+| [0008](./0008-redocly-yaml-config.md)      | `generate-client` config via `redocly.yaml` `x-openapi-typescript` | Accepted                |
+| [0009](./0009-per-instance-auth.md)        | Per-instance auth via `ClientConfig.auth`                          | Accepted                |
+| [0010](./0010-mock-data-baked-vs-faker.md) | Mock data: baked literals by default, faker opt-in                 | Accepted                |
+| [0011](./0011-wrapper-generators.md)       | Data-fetching wrapper generators (`swr`, `tanstack-query`)         | Accepted                |
+| [0012](./0012-plugin-api.md)               | Experimental custom-generator (plugin) API                         | Accepted (experimental) |
+| [0013](./0013-experimental-status.md)      | Experimental release status & stabilization criteria               | Accepted                |
+
+## Template
+
+```md
+# ADR NNNN: <short decision title>
+
+- Status: Proposed | Accepted | Superseded by ADR-XXXX
+- Date: YYYY-MM-DD
+
+## Context
+
+What forces are at play — the problem, constraints, and alternatives considered.
+
+## Decision
+
+The choice made, stated in active voice ("We will …").
+
+## Consequences
+
+What becomes easier and what becomes harder as a result. Include the trade-offs accepted.
+```
diff --git a/packages/openapi-typescript/examples/README.md b/packages/openapi-typescript/examples/README.md
new file mode 100644
index 0000000000..cd1d3f3780
--- /dev/null
+++ b/packages/openapi-typescript/examples/README.md
@@ -0,0 +1,27 @@
+# Examples
+
+Runnable examples of clients generated by `@redocly/openapi-typescript`. Each is standalone with its
+own dependencies; the generated client under `src/api/` is checked in and **drift-checked against the
+generator in CI** (`tests/e2e/examples.test.ts`). The first five are Vite apps that _consume_ a client
+generated via the `redocly generate-client` CLI (a `redocly.yaml`); `programmatic` _generates_ one with
+the `generateClient(...)` API.
+
+| Example                              | How it's generated            | Shows                                           |
+| ------------------------------------ | ----------------------------- | ----------------------------------------------- |
+| [fetch-functions](./fetch-functions) | CLI · `sdk`, functions        | free functions + `ApiError`                     |
+| [service-class](./service-class)     | CLI · `sdk`, service-class    | `new Client({ baseUrl })`, per-instance `auth`  |
+| [zod](./zod)                         | CLI · `sdk`, `zod`            | validating responses with generated zod schemas |
+| [tanstack-query](./tanstack-query)   | CLI · `sdk`, `tanstack-query` | React `useQuery(<op>Options())`                 |
+| [mock](./mock)                       | CLI · `sdk`, `mock`           | MSW handlers from generated `handlers`          |
+| [programmatic](./programmatic)       | `generateClient(...)` API     | generating the client from a Node script        |
+
+## Run one
+
+```bash
+cd packages/openapi-typescript/examples/<name>
+npm install
+npm run dev        # the Vite apps; the `programmatic` example uses `npm run generate`
+```
+
+To regenerate every example's client from the local generator, from the repo root:
+`npm run examples:regen -w @redocly/openapi-typescript`.
diff --git a/packages/openapi-typescript/examples/custom-generator/.gitignore b/packages/openapi-typescript/examples/custom-generator/.gitignore
new file mode 100644
index 0000000000..f06235c460
--- /dev/null
+++ b/packages/openapi-typescript/examples/custom-generator/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+dist
diff --git a/packages/openapi-typescript/examples/custom-generator/README.md b/packages/openapi-typescript/examples/custom-generator/README.md
new file mode 100644
index 0000000000..e310d77804
--- /dev/null
+++ b/packages/openapi-typescript/examples/custom-generator/README.md
@@ -0,0 +1,14 @@
+# Custom generator (plugin) example
+
+Shows the **experimental** custom-generator API: a `generators` entry that is a path to a local
+generator runs alongside the built-in `sdk`, reading the same OpenAPI-derived IR.
+
+- [`route-map-generator.mjs`](./route-map-generator.mjs) — the custom generator. Walks the IR's
+  operations and emits `src/api/client.routes.ts`: `<operationId>: 'METHOD /path'`.
+- [`redocly.yaml`](./redocly.yaml) — `generators: [sdk, ./route-map-generator.mjs]`.
+- [`src/main.ts`](./src/main.ts) — imports both the client and the generated `routes` map.
+
+Regenerate from the repo root with `npm run examples:regen -w @redocly/openapi-typescript`; type-check
+with `npm run typecheck:examples -w @redocly/openapi-typescript`. See the "Custom generators" section
+of the command reference for the
+authoring contract and the `@redocly/openapi-typescript/plugin` toolkit.
diff --git a/packages/openapi-typescript/examples/custom-generator/index.html b/packages/openapi-typescript/examples/custom-generator/index.html
new file mode 100644
index 0000000000..d1621f420e
--- /dev/null
+++ b/packages/openapi-typescript/examples/custom-generator/index.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>Redocly openapi-typescript — zod example</title>
+  </head>
+  <body>
+    <pre id="out">Loading…</pre>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
diff --git a/packages/openapi-typescript/examples/custom-generator/openapi.yaml b/packages/openapi-typescript/examples/custom-generator/openapi.yaml
new file mode 100644
index 0000000000..a6a75dffd0
--- /dev/null
+++ b/packages/openapi-typescript/examples/custom-generator/openapi.yaml
@@ -0,0 +1,1163 @@
+openapi: 3.2.0
+info:
+  title: Redocly Cafe
+  description: |
+    Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+    Create API credentials and try it yourself in a realistic OpenAPI workflow.
+  version: 1.0.0
+  contact:
+    email: team@redocly.com
+    url: https://redocly.com/contact-us/
+  license:
+    name: MIT
+    url: https://opensource.org/licenses/MIT
+  termsOfService: https://redocly.com/subscription-agreement
+servers:
+  - url: https://cafe.cloud.redocly.com
+    description: Live server.
+tags:
+  - name: Authorization
+    description: Create a client to demo the API.
+  - name: Products
+    description: Operations related to products.
+  - name: Orders
+    description: Order management operations.
+  - name: Statistics
+    description: Statistics operations.
+paths:
+  /menu:
+    get:
+      tags:
+        - Products
+      summary: List all menu items
+      description: Retrieve a collection of menu items with optional filtering and pagination.
+      operationId: listMenuItems
+      security: []
+      parameters:
+        - $ref: '#/components/parameters/After'
+        - $ref: '#/components/parameters/Before'
+        - $ref: '#/components/parameters/Sort'
+        - $ref: '#/components/parameters/Filter'
+        - $ref: '#/components/parameters/Search'
+        - $ref: '#/components/parameters/Limit'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItemList'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    post:
+      tags:
+        - Products
+      summary: Create menu item
+      description: Create a new menu item.
+      operationId: createMenuItem
+      security:
+        - OAuth2:
+            - menu:write
+      requestBody:
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              $ref: '#/components/schemas/MenuItem'
+      responses:
+        '201':
+          description: Menu item created successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItem'
+              examples:
+                MenuItemResponse:
+                  value:
+                    id: prd_01khr487f7qm7p44xn427m43vb
+                    object: menuItem
+                    name: coffee
+                    price: 4000
+                    category: beverage
+                    createdAt: '2026-02-18T10:20:38.228Z'
+                    updatedAt: '2026-02-18T10:20:38.228Z'
+                    volume: 600
+                    containsCaffeine: false
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '409':
+          $ref: '#/components/responses/Conflict'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /menu/{menuItemId}:
+    parameters:
+      - $ref: '#/components/parameters/MenuItemId'
+    delete:
+      tags:
+        - Products
+      summary: Delete a menu item
+      description: Delete an existing menu item.
+      operationId: deleteMenuItem
+      security:
+        - OAuth2:
+            - menu:write
+      responses:
+        '204':
+          description: Menu item deleted successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /menu-item-images/{menuItemId}:
+    parameters:
+      - $ref: '#/components/parameters/MenuItemId'
+    get:
+      operationId: getMenuItemPhoto
+      summary: Retrieve a menu item photo
+      description: Retrieve the product photo image for a specific menu item.
+      security: []
+      tags:
+        - Products
+      parameters:
+        - $ref: '#/components/parameters/PhotoSize'
+      responses:
+        '200':
+          description: Menu item photo retrieved successfully.
+          content:
+            image/png:
+              schema:
+                type: string
+                format: binary
+            text/plain:
+              schema:
+                description: Alternative image text.
+                type: string
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /orders:
+    get:
+      tags:
+        - Orders
+      summary: List all orders
+      description: Retrieve a collection of orders with optional filtering and pagination.
+      operationId: listOrders
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/Filter'
+        - $ref: '#/components/parameters/Sort'
+        - $ref: '#/components/parameters/Limit'
+        - $ref: '#/components/parameters/After'
+        - $ref: '#/components/parameters/Before'
+        - $ref: '#/components/parameters/Search'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OrderList'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    post:
+      tags:
+        - Orders
+      summary: Create order
+      description: |
+        Create a new order.
+        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+      operationId: createOrder
+      security:
+        - OAuth2:
+            - orders:write
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Order'
+            examples:
+              OrderRequest:
+                dataValue:
+                  customerName: Mary Ann
+                  orderItems:
+                    - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                      quantity: 2
+                      comment: No sugar!
+                      discount: 0
+      responses:
+        '201':
+          description: Order placed successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: placed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /orders/{orderId}:
+    get:
+      tags:
+        - Orders
+      summary: Retrieve an order
+      description: Retrieve a single order by its ID.
+      operationId: getOrderById
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+        - name: X-Request-Id
+          in: header
+          required: false
+          description: |
+            Optional client-supplied correlation ID, echoed in logs and traces.
+          schema:
+            type: string
+            format: uuid
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: placed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    patch:
+      tags:
+        - Orders
+      summary: Partially update an order
+      description: |
+        Update an existing order status.
+        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+      operationId: updateOrder
+      security:
+        - OAuth2:
+            - orders:write
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              description: |
+                Partial order update using JSON Merge Patch - only include fields to update.
+              properties:
+                status:
+                  $ref: '#/components/schemas/OrderStatus'
+              required:
+                - status
+      responses:
+        '200':
+          description: Order updated successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: completed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    delete:
+      tags:
+        - Orders
+      summary: Delete an order
+      description: |
+        Delete the order.
+        To keep the order history, the order should be canceled instead of deleted.
+      operationId: deleteOrder
+      security:
+        - OAuth2:
+            - orders:write
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+      responses:
+        '204':
+          description: Order deleted successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /order-items:
+    get:
+      tags:
+        - Orders
+      summary: List all order items with menu item details
+      description: |
+        Returns an array of order items for a specific order.
+        Use the `filter` parameter to filter by order ID.
+      operationId: listOrderItems
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/Filter'
+          required: true
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                type: array
+                description: List of menu items that are part of the order.
+                items:
+                  $ref: '#/components/schemas/OrderItem'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /revenue:
+    get:
+      tags:
+        - Statistics
+      summary: Get revenue statistics
+      description: |
+        Retrieve revenue statistics for a configurable date range.
+        Returns revenue, order counts, average order amount, and other useful statistics.
+      operationId: getRevenue
+      security:
+        - ApiKey: []
+      parameters:
+        - name: startDate
+          in: query
+          required: false
+          description: |
+            Start date for the revenue calculation period (ISO 8601 datetime format).
+            Defaults to 30 days ago if not provided.
+          schema:
+            type: string
+            format: date
+          example: '2026-01-01'
+        - name: endDate
+          in: query
+          required: false
+          description: |
+            End date for the revenue calculation period (ISO 8601 datetime format).
+            Defaults to current time if not provided.
+          schema:
+            type: string
+            format: date
+          example: '2026-01-31'
+      responses:
+        '200':
+          description: Revenue statistics retrieved successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RevenueStatistics'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /oauth2/register:
+    post:
+      tags:
+        - Authorization
+      summary: Create OAuth2 client
+      description: |
+        Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+        - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type, 
+          `redirectUris` must be provided (per RFC 7591 Section 2).
+        - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+        Returns the registered client information per RFC 7591, including:
+        - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+      operationId: registerOAuth2Client
+      security: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/RegisterClientObject'
+      responses:
+        '201':
+          description: OAuth2 client registered successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OAuth2Client'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+webhooks:
+  order-notification:
+    post:
+      tags:
+        - Orders
+      operationId: orderNotificationWebhook
+      security: []
+      summary: Order notification webhook
+      description: Webhook triggered when a new order is placed.
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/OrderNotification'
+      responses:
+        '200':
+          description: Webhook received successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+components:
+  securitySchemes:
+    OAuth2:
+      type: oauth2
+      description: OAuth2 authorization for API access.
+      flows:
+        authorizationCode:
+          authorizationUrl: https://cafe.cloud.redocly.com/oauth2/authorize
+          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          scopes:
+            menu:read: Read access to menu items and images
+            menu:write: Write access to menu items (create, delete)
+            orders:read: Read access to orders
+            orders:write: Write access to orders (create, update, delete)
+        clientCredentials:
+          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          scopes:
+            menu:read: Read access to menu items and images
+            menu:write: Write access to menu items (create, delete)
+            orders:read: Read access to orders
+            orders:write: Write access to orders (create, update, delete)
+    ApiKey:
+      type: apiKey
+      name: X-API-Key
+      in: header
+      description: API key for internal operations.
+  parameters:
+    After:
+      name: after
+      in: query
+      required: false
+      description: Use the `endCursor` as a value for the `after` parameter to get the next page.
+      schema:
+        type: string
+      example: a25fgaksjf23la==
+    Before:
+      name: before
+      in: query
+      required: false
+      description: |
+        Use the `startCursor` as a value for the `before` parameter to get the next page.
+      schema:
+        type: string
+      example: bfg23aksjf23zb1==
+    Sort:
+      name: sort
+      description: |-
+        To sort by id in descending order use `-id`.
+        To sort by id in ascending order use `id`.
+      in: query
+      required: false
+      schema:
+        type: string
+      example: '-name'
+    Filter:
+      name: filter
+      description: |-
+        Filters the collection items using space-separated `field:value` pairs.
+
+        **Format:** `field1:value1 field2:value2`
+
+        **Supported operators:**
+        - `field:value` - Exact match
+        - `field:value1,value2` - Match any of the comma-separated values (OR)
+        - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+
+        **Examples:**
+        - `status:placed` - Filter by single status.
+        - `status:placed,completed` - Filter by multiple statuses.
+        - `createdAt:30d` - Filter orders created in the last 30 days.
+        - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+        - `status:placed createdAt:7d` - Combine multiple filters.
+      in: query
+      required: false
+      schema:
+        type: string
+      example: orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7
+    Search:
+      name: search
+      in: query
+      description: |-
+        Performs a case-insensitive text search across relevant fields in the collection.
+
+        **Fields searched depend on the endpoint:**
+        - **Menu items:** `name`, `photoTextDescription`
+        - **Orders:** `customerName`, `id`
+
+        Returns items where any of the searchable fields contain the search term as a substring.
+      required: false
+      schema:
+        type: string
+      example: coffee
+    Limit:
+      name: limit
+      description: |
+        Use to return a number of results per page.
+        If there is more data, use in combination with `after` to page through the data.
+      in: query
+      required: false
+      schema:
+        type: integer
+        minimum: 1
+        maximum: 100
+        default: 10
+      example: 10
+    MenuItemId:
+      name: menuItemId
+      in: path
+      description: ID of the menu item to retrieve.
+      required: true
+      schema:
+        type: string
+        pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+      example: prd_01h1s5z6vf2mm1mz3hevnn9va7
+    PhotoSize:
+      name: photoSize
+      in: query
+      description: Photo size to retrieve.
+      required: false
+      schema:
+        type: string
+        enum:
+          - thumbnail
+          - medium
+          - large
+        default: medium
+    OrderId:
+      name: orderId
+      in: path
+      description: ID of the order to retrieve.
+      required: true
+      schema:
+        type: string
+        pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+      example: ord_01h1s5z6vf2mm1mz3hevnn9va7
+  schemas:
+    Page:
+      type: object
+      properties:
+        endCursor:
+          type:
+            - string
+            - 'null'
+          description: |-
+            Use with the `after` query parameter to load the next page of data.
+            When `null`, there is no data.
+            The cursor is opaque and internal structure is subject to change.
+        startCursor:
+          type:
+            - string
+            - 'null'
+          description: |-
+            Use with the `before` query parameter to load the previous page of data.
+            When `null`, there is no data.
+            The cursor is opaque and internal structure is subject to change.
+        hasNextPage:
+          type: boolean
+          description: Indicates if there is a next page with items.
+        hasPrevPage:
+          type: boolean
+          description: Indicates if there is a previous page with items.
+        limit:
+          type: integer
+          minimum: 1
+          maximum: 100
+          default: 10
+          description: Value showing how many items are in the page limit.
+        total:
+          type: integer
+          description: Count of items across all pages.
+          minimum: 0
+      required:
+        - endCursor
+        - startCursor
+        - hasNextPage
+        - hasPrevPage
+        - limit
+        - total
+    MenuBaseItem:
+      type: object
+      properties:
+        createdAt:
+          description: Created date.
+          type: string
+          format: date-time
+          readOnly: true
+        updatedAt:
+          description: Updated date.
+          type: string
+          format: date-time
+          readOnly: true
+        id:
+          description: Menu item ID. Unique identifier prefixed with `prd_`.
+          type: string
+          readOnly: true
+          pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+          example: prd_01h1s5z6vf2mm1mz3hevnn9va7
+        object:
+          description: Entity name.
+          type: string
+          const: menuItem
+          readOnly: true
+        name:
+          description: Menu item name.
+          type: string
+          minLength: 1
+          maxLength: 50
+        price:
+          description: Price in cents.
+          type: integer
+          minimum: 0
+        photo:
+          writeOnly: true
+          type:
+            - string
+            - 'null'
+          format: binary
+          description: Photo of the menu item. Must be a PNG image and less than 1MB.
+        photoUrl:
+          readOnly: true
+          type: string
+          format: uri
+          description: Photo URL of the menu item.
+        photoTextDescription:
+          type:
+            - string
+            - 'null'
+      required:
+        - id
+        - name
+        - price
+        - createdAt
+        - updatedAt
+        - object
+    Beverage:
+      allOf:
+        - type: object
+          properties:
+            category:
+              description: Menu item category.
+              type: string
+              const: beverage
+            volume:
+              type: number
+              description: Size of the beverage in milliliters.
+              exclusiveMinimum: 0
+            containsCaffeine:
+              type: boolean
+              description: Indicates if the beverage contains caffeine.
+          required:
+            - category
+            - volume
+            - containsCaffeine
+        - $ref: '#/components/schemas/MenuBaseItem'
+    Dessert:
+      allOf:
+        - type: object
+          properties:
+            category:
+              description: Menu item category.
+              type: string
+              const: dessert
+            calories:
+              type: number
+              exclusiveMinimum: 0
+              description: Amount of calories.
+          required:
+            - category
+            - calories
+        - $ref: '#/components/schemas/MenuBaseItem'
+    MenuItem:
+      discriminator:
+        propertyName: category
+        mapping:
+          beverage: '#/components/schemas/Beverage'
+          dessert: '#/components/schemas/Dessert'
+      oneOf:
+        - $ref: '#/components/schemas/Beverage'
+        - $ref: '#/components/schemas/Dessert'
+      required:
+        - category
+    MenuItemList:
+      type: object
+      properties:
+        object:
+          type: string
+          const: list
+          description: Entity name.
+        page:
+          $ref: '#/components/schemas/Page'
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/MenuItem'
+      required:
+        - object
+        - page
+        - items
+    Error:
+      type: object
+      properties:
+        type:
+          type: string
+          format: uri-reference
+          description: URI reference that identifies the problem type.
+          default: about:blank
+        title:
+          type: string
+          description: Short summary of the problem type.
+        status:
+          type: integer
+          format: int32
+          description: |
+            HTTP status code generated by the origin server for this occurrence of the problem.
+          minimum: 100
+          exclusiveMaximum: 600
+        instance:
+          type: string
+          format: uri-reference
+          description: |
+            URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+            May be used to locate the root of this problem in the source code.
+          example: /some/uri-reference#specific-occurrence-context
+        details:
+          description: Additional error details.
+          type: object
+          additionalProperties: true
+      required:
+        - type
+        - title
+        - status
+    OrderStatus:
+      type: string
+      description: Order status.
+      enum:
+        - placed
+        - preparing
+        - completed
+        - canceled
+    Order:
+      type: object
+      title: Order
+      properties:
+        id:
+          description: Order ID. Unique identifier prefixed with `ord_`.
+          type: string
+          format: ulid
+          readOnly: true
+          pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+          example: ord_01h1s5z6vf2mm1mz3hevnn9va7
+        object:
+          description: Entity name.
+          type: string
+          const: order
+          readOnly: true
+        customerName:
+          description: |
+            Name of the customer who placed the order.
+            Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+          type: string
+          pattern: ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+          minLength: 1
+          maxLength: 100
+        status:
+          allOf:
+            - $ref: '#/components/schemas/OrderStatus'
+          readOnly: true
+        totalPrice:
+          description: Total order price in cents.
+          type: integer
+          minimum: 0
+          readOnly: true
+        createdAt:
+          description: Created date.
+          type: string
+          format: date-time
+          readOnly: true
+        updatedAt:
+          description: Updated date.
+          type: string
+          format: date-time
+          readOnly: true
+        orderItems:
+          type: array
+          description: List of items to include in the order.
+          minItems: 1
+          items:
+            type: object
+            properties:
+              menuItemId:
+                type: string
+                format: ulid
+                description: ID of the menu item to add to the order.
+              quantity:
+                type: integer
+                minimum: 1
+                description: Quantity of the menu item.
+              discount:
+                type: integer
+                minimum: 0
+                description: Discount amount in cents (absolute value).
+                default: 0
+              comment:
+                type: string
+                maxLength: 500
+                description: Optional comment for the order item (e.g., "No sugar").
+            required:
+              - menuItemId
+              - quantity
+      required:
+        - customerName
+        - orderItems
+    OrderList:
+      type: object
+      properties:
+        object:
+          type: string
+          const: list
+          description: Entity name.
+        page:
+          $ref: '#/components/schemas/Page'
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/Order'
+      required:
+        - object
+        - page
+        - items
+    OrderItem:
+      type: object
+      properties:
+        menuItemId:
+          type: string
+          description: ID of the menu item to add to the order.
+          writeOnly: true
+        menuItem:
+          allOf:
+            - $ref: '#/components/schemas/MenuItem'
+          description: Menu item that is part of the order.
+          readOnly: true
+        quantity:
+          type: integer
+          minimum: 1
+          description: Quantity of the menu item.
+        discount:
+          type: integer
+          minimum: 0
+          description: Discount amount in cents (absolute value).
+          default: 0
+        comment:
+          type: string
+          maxLength: 500
+          description: Optional comment for the order item (e.g., "No sugar").
+      required:
+        - menuItemId
+        - quantity
+    RevenueStatistics:
+      type: object
+      description: Revenue statistics for a given date range.
+      properties:
+        revenue:
+          type: number
+          format: float
+          description: Total revenue in cents from completed orders.
+          minimum: 0
+        averageOrderAmount:
+          type: number
+          format: float
+          description: Average order amount in cents (calculated from completed orders only).
+          minimum: 0
+        totalOrders:
+          type: integer
+          description: Total number of orders (all statuses) in the date range.
+          minimum: 0
+        placedOrders:
+          type: integer
+          description: Number of placed orders.
+          minimum: 0
+        preparingOrders:
+          type: integer
+          description: Number of preparing orders.
+          minimum: 0
+        completedOrders:
+          type: integer
+          description: Number of completed orders.
+          minimum: 0
+        canceledOrders:
+          type: integer
+          description: Number of canceled orders.
+          minimum: 0
+        startDate:
+          type: string
+          format: date
+          description: Start date of the revenue calculation period.
+        endDate:
+          type: string
+          format: date
+          description: End date of the revenue calculation period.
+      required:
+        - revenue
+        - averageOrderAmount
+        - totalOrders
+        - placedOrders
+        - preparingOrders
+        - completedOrders
+        - canceledOrders
+        - startDate
+        - endDate
+    RegisterClientObject:
+      type: object
+      properties:
+        name:
+          type: string
+          description: Client name.
+        redirectUris:
+          type: array
+          items:
+            type: string
+            format: uri
+          description: List of redirect URIs (optional, defaults to empty array).
+        scopes:
+          type: array
+          items:
+            type: string
+            enum:
+              - menu:read
+              - menu:write
+              - orders:read
+              - orders:write
+          description: List of scopes.
+        grantTypes:
+          type: array
+          items:
+            type: string
+            enum:
+              - authorization_code
+              - client_credentials
+          description: List of grant types.
+      required:
+        - name
+    OAuth2Client:
+      type: object
+      description: OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+      properties:
+        clientId:
+          type: string
+          description: Client identifier issued by the authorization server.
+        clientSecret:
+          type: string
+          description: Client secret issued by the authorization server.
+        clientIdIssuedAt:
+          type: integer
+          format: int64
+          description: Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+        clientSecretExpiresAt:
+          type: integer
+          format: int64
+          description: Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+        name:
+          type: string
+          description: Client name (registered metadata).
+        redirectUris:
+          type: array
+          items:
+            type: string
+            format: uri
+          description: List of redirect URIs (registered metadata).
+        registrationClientUri:
+          type: string
+          format: uri
+          description: URL of the client configuration endpoint for managing this client registration (RFC 7592).
+        registrationAccessToken:
+          type: string
+          description: Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+        scopes:
+          type: array
+          items:
+            type: string
+            enum:
+              - menu:read
+              - menu:write
+              - orders:read
+              - orders:write
+          description: List of scopes (registered metadata).
+        grantTypes:
+          type: array
+          items:
+            type: string
+            enum:
+              - authorization_code
+              - client_credentials
+          description: List of grant types (registered metadata).
+      required:
+        - clientId
+        - clientSecret
+        - clientIdIssuedAt
+        - clientSecretExpiresAt
+        - registrationClientUri
+        - registrationAccessToken
+    OrderNotification:
+      type: object
+      required:
+        - orderId
+        - orderStatus
+        - timestamp
+      properties:
+        orderId:
+          type: string
+          description: Unique order identifier.
+        orderStatus:
+          $ref: '#/components/schemas/OrderStatus'
+        timestamp:
+          type: string
+          format: date-time
+          description: When the event occurred.
+  responses:
+    BadRequest:
+      description: Bad request - invalid input parameters.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    InternalServerError:
+      description: Internal server error.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Unauthorized:
+      description: Unauthorized - authorization required.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Forbidden:
+      description: Forbidden - insufficient permissions.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Conflict:
+      description: Conflict - entity already exists.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    NotFound:
+      description: Resource not found.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
diff --git a/packages/openapi-typescript/examples/custom-generator/package.json b/packages/openapi-typescript/examples/custom-generator/package.json
new file mode 100644
index 0000000000..6bc561044a
--- /dev/null
+++ b/packages/openapi-typescript/examples/custom-generator/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "@redocly-examples/custom-generator",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "generate": "redocly generate-client",
+    "dev": "vite",
+    "build": "vite build"
+  },
+  "devDependencies": {
+    "@redocly/cli": "latest",
+    "typescript": "^5.5.0",
+    "vite": "^5.4.0"
+  }
+}
diff --git a/packages/openapi-typescript/examples/custom-generator/redocly.yaml b/packages/openapi-typescript/examples/custom-generator/redocly.yaml
new file mode 100644
index 0000000000..da045276ea
--- /dev/null
+++ b/packages/openapi-typescript/examples/custom-generator/redocly.yaml
@@ -0,0 +1,10 @@
+# redocly.yaml — drives `redocly generate-client` for this example.
+# The `generators` list mixes a built-in (`sdk`) with a custom generator referenced by path
+# (the experimental plugin API). The path is resolved against this file's directory.
+x-openapi-typescript:
+  input: ./openapi.yaml
+  output: ./src/api/client.ts
+  generators:
+    - sdk
+    - ./route-map-generator.mjs
+  facade: functions
diff --git a/packages/openapi-typescript/examples/custom-generator/route-map-generator.mjs b/packages/openapi-typescript/examples/custom-generator/route-map-generator.mjs
new file mode 100644
index 0000000000..0750f02200
--- /dev/null
+++ b/packages/openapi-typescript/examples/custom-generator/route-map-generator.mjs
@@ -0,0 +1,28 @@
+// A custom generator (the experimental plugin API). Loaded by the `generators:` list in
+// redocly.yaml as a path specifier, it runs alongside the built-in `sdk` and emits a
+// `<output>.routes.ts` map of every operation — `<operationId>: 'METHOD /path'`.
+//
+// Plain ESM so the CLI imports it under bare `node`. Authored in TypeScript you would write:
+//
+//   import { defineGenerator } from '@redocly/openapi-typescript/plugin';
+//   export default defineGenerator({ name: 'route-map', requires: ['sdk'], run({ model, outputPath }) { … } });
+//
+// `defineGenerator` is just an identity helper for types, so a plain object works too:
+export default {
+  name: 'route-map',
+  requires: ['sdk'],
+  run({ model, outputPath }) {
+    const routes = model.services
+      .flatMap((service) => service.operations)
+      .map((op) => `  ${op.name}: '${op.method.toUpperCase()} ${op.path}',`)
+      .join('\n');
+    return [
+      {
+        path: outputPath.replace(/\.ts$/, '.routes.ts'),
+        content:
+          '// Generated by the route-map custom generator. Do not edit by hand.\n' +
+          `export const routes = {\n${routes}\n} as const;\n`,
+      },
+    ];
+  },
+};
diff --git a/packages/openapi-typescript/examples/custom-generator/src/api/client.routes.ts b/packages/openapi-typescript/examples/custom-generator/src/api/client.routes.ts
new file mode 100644
index 0000000000..4b808d2636
--- /dev/null
+++ b/packages/openapi-typescript/examples/custom-generator/src/api/client.routes.ts
@@ -0,0 +1,15 @@
+// Generated by the route-map custom generator. Do not edit by hand.
+export const routes = {
+  listMenuItems: 'GET /menu',
+  createMenuItem: 'POST /menu',
+  deleteMenuItem: 'DELETE /menu/{menuItemId}',
+  getMenuItemPhoto: 'GET /menu-item-images/{menuItemId}',
+  listOrders: 'GET /orders',
+  createOrder: 'POST /orders',
+  getOrderById: 'GET /orders/{orderId}',
+  deleteOrder: 'DELETE /orders/{orderId}',
+  updateOrder: 'PATCH /orders/{orderId}',
+  listOrderItems: 'GET /order-items',
+  getRevenue: 'GET /revenue',
+  registerOAuth2Client: 'POST /oauth2/register',
+} as const;
diff --git a/packages/openapi-typescript/examples/custom-generator/src/api/client.ts b/packages/openapi-typescript/examples/custom-generator/src/api/client.ts
new file mode 100644
index 0000000000..dcb4900f7c
--- /dev/null
+++ b/packages/openapi-typescript/examples/custom-generator/src/api/client.ts
@@ -0,0 +1,1513 @@
+// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Redocly Cafe (v1.0.0)
+ * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+ * Create API credentials and try it yourself in a realistic OpenAPI workflow.
+ * 
+ */
+
+export type Page = {
+    /**
+     * Use with the `after` query parameter to load the next page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    endCursor: string | null;
+    /**
+     * Use with the `before` query parameter to load the previous page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    startCursor: string | null;
+    /**
+     * Indicates if there is a next page with items.
+     */
+    hasNextPage: boolean;
+    /**
+     * Indicates if there is a previous page with items.
+     */
+    hasPrevPage: boolean;
+    /**
+     * Value showing how many items are in the page limit.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit: number;
+    /**
+     * Count of items across all pages.
+     * @minimum 0
+     */
+    total: number;
+};
+
+export type MenuBaseItem = {
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt: string;
+    /**
+     * Menu item ID. Unique identifier prefixed with `prd_`.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    readonly id: string;
+    /**
+     * Entity name.
+     */
+    readonly object: "menuItem";
+    /**
+     * Menu item name.
+     * @minLength 1
+     * @maxLength 50
+     */
+    name: string;
+    /**
+     * Price in cents.
+     * @minimum 0
+     */
+    price: number;
+    /**
+     * Photo of the menu item. Must be a PNG image and less than 1MB.
+     * @format binary
+     */
+    photo?: Blob | null;
+    /**
+     * Photo URL of the menu item.
+     * @format uri
+     */
+    readonly photoUrl?: string;
+    photoTextDescription?: string | null;
+};
+
+export type Beverage = {
+    /**
+     * Menu item category.
+     */
+    category: "beverage";
+    /**
+     * Size of the beverage in milliliters.
+     * @exclusiveMinimum 0
+     */
+    volume: number;
+    /**
+     * Indicates if the beverage contains caffeine.
+     */
+    containsCaffeine: boolean;
+} & MenuBaseItem;
+
+export type Dessert = {
+    /**
+     * Menu item category.
+     */
+    category: "dessert";
+    /**
+     * Amount of calories.
+     * @exclusiveMinimum 0
+     */
+    calories: number;
+} & MenuBaseItem;
+
+export type MenuItem = Beverage | Dessert;
+
+export type MenuItemList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: MenuItem[];
+};
+
+export type Error = {
+    /**
+     * URI reference that identifies the problem type.
+     * @format uri-reference
+     */
+    type: string;
+    /**
+     * Short summary of the problem type.
+     */
+    title: string;
+    /**
+     * HTTP status code generated by the origin server for this occurrence of the problem.
+     * @minimum 100
+     * @exclusiveMaximum 600
+     * @format int32
+     */
+    status: number;
+    /**
+     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+     * May be used to locate the root of this problem in the source code.
+     * @format uri-reference
+     */
+    instance?: string;
+    /**
+     * Additional error details.
+     */
+    details?: Record<string, unknown>;
+};
+
+/**
+ * Order status.
+ */
+export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
+
+export const OrderStatus = {
+    placed: "placed",
+    preparing: "preparing",
+    completed: "completed",
+    canceled: "canceled"
+} as const;
+
+export type Order = {
+    /**
+     * Order ID. Unique identifier prefixed with `ord_`.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     * @format ulid
+     */
+    readonly id?: string;
+    /**
+     * Entity name.
+     */
+    readonly object?: "order";
+    /**
+     * Name of the customer who placed the order.
+     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+     * @minLength 1
+     * @maxLength 100
+     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+     */
+    customerName: string;
+    readonly status?: OrderStatus;
+    /**
+     * Total order price in cents.
+     * @minimum 0
+     */
+    readonly totalPrice?: number;
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt?: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt?: string;
+    /**
+     * List of items to include in the order.
+     * @minItems 1
+     */
+    orderItems: {
+        /**
+         * ID of the menu item to add to the order.
+         * @format ulid
+         */
+        menuItemId: string;
+        /**
+         * Quantity of the menu item.
+         * @minimum 1
+         */
+        quantity: number;
+        /**
+         * Discount amount in cents (absolute value).
+         * @minimum 0
+         */
+        discount?: number;
+        /**
+         * Optional comment for the order item (e.g., "No sugar").
+         * @maxLength 500
+         */
+        comment?: string;
+    }[];
+};
+
+export type OrderList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: Order[];
+};
+
+export type OrderItem = {
+    /**
+     * ID of the menu item to add to the order.
+     */
+    menuItemId: string;
+    /**
+     * Menu item that is part of the order.
+     */
+    readonly menuItem?: MenuItem;
+    /**
+     * Quantity of the menu item.
+     * @minimum 1
+     */
+    quantity: number;
+    /**
+     * Discount amount in cents (absolute value).
+     * @minimum 0
+     */
+    discount?: number;
+    /**
+     * Optional comment for the order item (e.g., "No sugar").
+     * @maxLength 500
+     */
+    comment?: string;
+};
+
+/**
+ * Revenue statistics for a given date range.
+ */
+export type RevenueStatistics = {
+    /**
+     * Total revenue in cents from completed orders.
+     * @minimum 0
+     * @format float
+     */
+    revenue: number;
+    /**
+     * Average order amount in cents (calculated from completed orders only).
+     * @minimum 0
+     * @format float
+     */
+    averageOrderAmount: number;
+    /**
+     * Total number of orders (all statuses) in the date range.
+     * @minimum 0
+     */
+    totalOrders: number;
+    /**
+     * Number of placed orders.
+     * @minimum 0
+     */
+    placedOrders: number;
+    /**
+     * Number of preparing orders.
+     * @minimum 0
+     */
+    preparingOrders: number;
+    /**
+     * Number of completed orders.
+     * @minimum 0
+     */
+    completedOrders: number;
+    /**
+     * Number of canceled orders.
+     * @minimum 0
+     */
+    canceledOrders: number;
+    /**
+     * Start date of the revenue calculation period.
+     * @format date
+     */
+    startDate: string;
+    /**
+     * End date of the revenue calculation period.
+     * @format date
+     */
+    endDate: string;
+};
+
+export type RegisterClientObject = {
+    /**
+     * Client name.
+     */
+    name: string;
+    /**
+     * List of redirect URIs (optional, defaults to empty array).
+     */
+    redirectUris?: string[];
+    /**
+     * List of scopes.
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types.
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+/**
+ * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+ */
+export type OAuth2Client = {
+    /**
+     * Client identifier issued by the authorization server.
+     */
+    clientId: string;
+    /**
+     * Client secret issued by the authorization server.
+     */
+    clientSecret: string;
+    /**
+     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+     * @format int64
+     */
+    clientIdIssuedAt: number;
+    /**
+     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+     * @format int64
+     */
+    clientSecretExpiresAt: number;
+    /**
+     * Client name (registered metadata).
+     */
+    name?: string;
+    /**
+     * List of redirect URIs (registered metadata).
+     */
+    redirectUris?: string[];
+    /**
+     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
+     * @format uri
+     */
+    registrationClientUri: string;
+    /**
+     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+     */
+    registrationAccessToken: string;
+    /**
+     * List of scopes (registered metadata).
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types (registered metadata).
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+export type OrderNotification = {
+    /**
+     * Unique order identifier.
+     */
+    orderId: string;
+    orderStatus: OrderStatus;
+    /**
+     * When the event occurred.
+     * @format date-time
+     */
+    timestamp: string;
+};
+
+/**
+ * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
+ */
+export function isBeverage(value: MenuItem): value is Beverage {
+    return (value as Record<string, unknown>)["category"] === "beverage";
+}
+
+/**
+ * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
+ */
+export function isDessert(value: MenuItem): value is Dessert {
+    return (value as Record<string, unknown>)["category"] === "dessert";
+}
+
+/**
+ * Static metadata for every operation, keyed by operationId: the HTTP `method`
+ * and the `path` template (with `{param}` placeholders intact). Minification-safe
+ * — useful for building cache/query keys, tracing span names, and request logging
+ * without re-deriving them at each call site.
+ */
+export const OPERATIONS = {
+    listMenuItems: { method: "GET", path: "/menu" },
+    createMenuItem: { method: "POST", path: "/menu" },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
+    listOrders: { method: "GET", path: "/orders" },
+    createOrder: { method: "POST", path: "/orders" },
+    getOrderById: { method: "GET", path: "/orders/{orderId}" },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
+    listOrderItems: { method: "GET", path: "/order-items" },
+    getRevenue: { method: "GET", path: "/revenue" },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
+} as const;
+
+/**
+ * The operationId of any operation in this client.
+ */
+export type OperationId = keyof typeof OPERATIONS;
+
+/**
+ * Static metadata describing one operation: its HTTP method and path template.
+ */
+export type OperationMetadata = {
+    readonly method: string;
+    readonly path: string;
+};
+
+let BASE = "https://cafe.cloud.redocly.com";
+
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+export type RequestContext = {
+    url: string;
+    method: string;
+    headers: Record<string, string>;
+    body?: unknown;
+};
+
+/**
+ * Configuration and extension hooks for a client. Supplied per-instance via
+ * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
+ * (functions facade).
+ */
+export type ClientConfig = {
+    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    baseUrl?: string;
+    /** Extra headers merged into every request; a function is invoked per request. */
+    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+    /** Transport used to issue requests. Defaults to the global `fetch`. */
+    fetch?: typeof fetch;
+    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    /** Observe — or replace, by returning a `Response` — the response before parsing. */
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    /**
+     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
+     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
+     */
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
+    /**
+     * Composable interceptors run around every request, alongside the single
+     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
+     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
+     * the last-registered middleware wraps closest to the network. Register more at runtime
+     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
+     */
+    middleware?: Middleware[];
+    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
+    retry?: RetryConfig;
+    /**
+     * Per-instance auth credentials. When set, they override the module-global
+     * `set*` helpers for requests made through this config (each scheme falls back
+     * to its global slot when omitted here). Only the schemes an operation declares
+     * in its `security` are ever sent.
+     */
+    auth?: AuthCredentials;
+};
+
+/**
+ * A request interceptor; every field is optional, so a middleware can hook any subset of
+ * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
+ * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
+ * failure into the error to throw, threaded through each middleware in turn.
+ */
+export type Middleware = {
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/** Context handed to `retryOn` for the attempt that just failed. */
+export type RetryContext = {
+    /** 1-based number of the attempt that just failed. */
+    attempt: number;
+    /** The request that was attempted. */
+    request: RequestContext;
+    /** Present when the server returned a (non-ok) response. */
+    response?: Response;
+    /** Present when the transport threw (network error, DNS, connection reset). */
+    error?: unknown;
+};
+
+/** Retry policy; all fields optional with sensible defaults. */
+export type RetryConfig = {
+    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
+    retries?: number;
+    /** Base delay in milliseconds. Default 1000. */
+    retryDelay?: number;
+    /** Backoff shape. Default 'exponential'. */
+    retryStrategy?: RetryStrategy;
+    /** Apply full jitter over the computed delay. Default true. */
+    jitter?: boolean;
+    /**
+     * Decide whether to retry a failed attempt. Default: retry only idempotent
+     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
+     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
+     */
+    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
+};
+
+/**
+ * How the response body is read. `'auto'` negotiates from the content type (the
+ * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
+ */
+export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
+
+/**
+ * The trailing per-operation argument: standard `RequestInit` plus an optional
+ * per-call retry override and a `parseAs` escape hatch.
+ *
+ * `parseAs` forces how the response body is read; overrides the inferred kind.
+ * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
+ * override — the static return type is unchanged.
+ */
+export type RequestOptions = RequestInit & {
+    retry?: Partial<RetryConfig>;
+    parseAs?: ParseAs;
+};
+
+/**
+ * Override the base URL used by every generated operation. Useful when the
+ * runtime environment differs from the value declared in `servers[0].url`
+ * (e.g. dev / staging / prod toggles in a single-page app).
+ *
+ * Mutates a module-scoped binding shared by the functions facade. For multiple
+ * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ */
+export function setBaseUrl(url: string): void {
+    BASE = url;
+}
+
+/** The global config used by the functions facade (see `configure`). */
+const __config: ClientConfig = {};
+
+/**
+ * Merge `config` into the global configuration used by the functions facade —
+ * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
+ * hooks once for every free function. The service-class facade configures per
+ * instance instead (`new Client(config)`).
+ */
+export function configure(config: ClientConfig): void {
+    Object.assign(__config, config);
+}
+
+/**
+ * Append interceptors to the functions facade's global middleware chain (see
+ * `ClientConfig.middleware`). The service-class facade registers per instance via
+ * `<Client>.use(...)` instead.
+ */
+export function use(...middleware: Middleware[]): void {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    __config.middleware = [...(__config.middleware ?? []), ...middleware];
+}
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function __middleware(config: ClientConfig): Middleware[] {
+    const single = config.onRequest || config.onResponse || config.onError
+        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+        : [];
+    return [...single, ...(config.middleware ?? [])];
+}
+
+export class ApiError extends Error {
+    public readonly url: string;
+    public readonly status: number;
+    public readonly statusText: string;
+    public readonly body: unknown;
+    constructor(url: string, status: number, statusText: string, body: unknown) {
+        super(`Request failed with status ${status}`);
+        this.name = 'ApiError';
+        this.url = url;
+        this.status = status;
+        this.statusText = statusText;
+        this.body = body;
+    }
+}
+
+type QueryPrimitive = string | number | boolean;
+
+type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
+
+/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
+type QueryStyle = {
+    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+    explode: boolean;
+    allowReserved?: boolean;
+};
+
+/**
+ * Percent-encode `value` but leave the RFC-3986 reserved set
+ * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
+ */
+function __encodeReserved(value: string): string {
+    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
+}
+
+function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
+    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    if (!query)
+        return url;
+    const params = new URLSearchParams();
+    const raw: string[] = [];
+    for (const [key, value] of Object.entries(query)) {
+        if (value === undefined || value === null)
+            continue;
+        const spec = styles?.[key];
+        if (!spec) {
+            if (Array.isArray(value)) {
+                for (const v of value) {
+                    if (v !== undefined && v !== null)
+                        params.append(key, String(v));
+                }
+            }
+            else if (typeof value === 'object') {
+                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+                for (const [subKey, subValue] of Object.entries(value)) {
+                    if (subValue !== undefined && subValue !== null) {
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                    }
+                }
+            }
+            else {
+                params.append(key, String(value));
+            }
+            continue;
+        }
+        if (Array.isArray(value)) {
+            const items = value.filter((v) => v !== undefined && v !== null).map(String);
+            if (spec.style === 'form' && spec.explode) {
+                for (const v of items) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}=${__encodeReserved(v)}`);
+                    else
+                        params.append(key, v);
+                }
+            }
+            else {
+                // Delimited styles put the LITERAL delimiter on the wire; only the
+                // values are encoded. `%20` (not `+`) is the literal space delimiter.
+                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
+                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+            }
+        }
+        else if (typeof value === 'object') {
+            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+            for (const [subKey, subValue] of Object.entries(value)) {
+                if (subValue !== undefined && subValue !== null) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
+                    else
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                }
+            }
+        }
+        else if (spec.allowReserved) {
+            raw.push(`${key}=${__encodeReserved(String(value))}`);
+        }
+        else {
+            params.append(key, String(value));
+        }
+    }
+    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+    return qs ? `${url}?${qs}` : url;
+}
+
+async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+    response: Response;
+    context: RequestContext;
+}> {
+    const { retry: callRetry, ...fetchInit } = init;
+    const retry: RetryConfig = { ...config.retry, ...callRetry };
+    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+    const headers: Record<string, string> = {
+        Accept: 'application/json',
+        ...extra,
+        ...(fetchInit.headers as Record<string, string> | undefined),
+    };
+    let payload: BodyInit | undefined;
+    if (body !== undefined) {
+        const isBinary = body instanceof Blob ||
+            body instanceof ArrayBuffer ||
+            ArrayBuffer.isView(body as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
+        const isURLSearchParams = body instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
+            payload = body as BodyInit;
+        }
+        else {
+            payload = JSON.stringify(body);
+            if (!('Content-Type' in headers) && !('content-type' in headers)) {
+                headers['Content-Type'] = 'application/json';
+            }
+        }
+    }
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    const doFetch = config.fetch ?? fetch;
+    const maxAttempts = 1 + (retry.retries ?? 0);
+    const retryOn = retry.retryOn ?? __defaultRetryOn;
+    const signal = fetchInit.signal ?? undefined;
+    let attempt = 0;
+    while (true) {
+        attempt++;
+        if (signal?.aborted)
+            throw __abortError(signal);
+        let response: Response;
+        try {
+            response = await doFetch(context.url, {
+                ...fetchInit,
+                method: context.method,
+                headers: context.headers,
+                body: payload,
+            });
+        }
+        catch (error) {
+            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
+                await __sleep(__retryDelay(retry, attempt, null), signal);
+                continue;
+            }
+            throw error;
+        }
+        // Reverse order: the last-registered middleware wraps closest to the network (onion).
+        for (let i = middleware.length - 1; i >= 0; i--) {
+            const onResponse = middleware[i].onResponse;
+            if (onResponse) {
+                const replaced = await onResponse(response, context);
+                if (replaced)
+                    response = replaced;
+            }
+        }
+        if (!response.ok &&
+            attempt < maxAttempts &&
+            !signal?.aborted &&
+            (await retryOn({ attempt, request: context, response }))) {
+            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            continue;
+        }
+        return { response, context };
+    }
+}
+
+async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+    if (kind === 'void' || response.status === 204)
+        return undefined;
+    if (kind === 'stream')
+        return response.body;
+    if (kind === 'blob')
+        return response.blob();
+    if (kind === 'arrayBuffer')
+        return response.arrayBuffer();
+    if (kind === 'formData')
+        return response.formData();
+    if (kind === 'text')
+        return response.text();
+    if (kind === 'json')
+        return response.json();
+    // 'auto' — negotiate from the response's content type.
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json'))
+        return response.json();
+    if (contentType.startsWith('text/'))
+        return response.text();
+    return response.blob();
+}
+
+async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+    const { parseAs, ...sendInit } = init;
+    const { response, context } = await __send(config, url, sendInit, body);
+    if (!response.ok) {
+        const errorBody = await readError(response);
+        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
+        // Thread the error through each middleware's onError in turn (each may replace it).
+        for (const mw of __middleware(config)) {
+            if (mw.onError)
+                error = await mw.onError(error as ApiError, context);
+        }
+        throw error;
+    }
+    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
+    return (await __parse(response, kind)) as T;
+}
+
+async function readError(response: Response): Promise<unknown> {
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json')) {
+        return response.json().catch(() => undefined);
+    }
+    return response.text().catch(() => undefined);
+}
+
+const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+
+const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+function __defaultRetryOn(ctx: RetryContext): boolean {
+    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
+        return false;
+    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+    if (retryAfter) {
+        const seconds = Number(retryAfter);
+        if (!Number.isNaN(seconds))
+            return seconds * 1000;
+        const when = Date.parse(retryAfter);
+        if (!Number.isNaN(when))
+            return Math.max(0, when - Date.now());
+    }
+    const base = retry.retryDelay ?? 1000;
+    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+    return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
+    return new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject(__abortError(signal));
+            return;
+        }
+        const onAbort = () => {
+            clearTimeout(timer);
+            reject(__abortError(signal as AbortSignal));
+        };
+        const timer = setTimeout(() => {
+            if (signal)
+                signal.removeEventListener('abort', onAbort);
+            resolve();
+        }, ms);
+        if (signal)
+            signal.addEventListener('abort', onAbort, { once: true });
+    });
+}
+
+function __abortError(signal: AbortSignal): globalThis.Error {
+    const reason = (signal as {
+        reason?: unknown;
+    }).reason;
+    if (reason instanceof Error)
+        return reason;
+    return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * Normalize an operation's header-parameter object into a plain string record,
+ * dropping any `undefined` / `null` entries (optional headers the caller omitted)
+ * and stringifying the rest. Mirrors __buildUrl's handling of query values.
+ */
+function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
+    const out: Record<string, string> = {};
+    for (const [key, value] of Object.entries(values)) {
+        if (value !== undefined && value !== null)
+            out[key] = String(value);
+    }
+    return out;
+}
+
+/**
+ * A credential value, or a (possibly async) function that returns one per request.
+ */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/**
+ * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
+ * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
+ * to the global slots.
+ */
+export type AuthCredentials = {
+    bearer?: TokenProvider;
+    apiKey?: Record<string, TokenProvider>;
+};
+
+let __bearerToken: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
+ * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
+ * (possibly async) function resolved per request.
+ */
+export function setBearer(token: TokenProvider | null): void {
+    __bearerToken = token;
+}
+
+let __apiKey_ApiKey: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
+ * string or a (possibly async) function resolved per request.
+ */
+export function setApiKey(key: TokenProvider | null): void {
+    __apiKey_ApiKey = key;
+}
+
+/**
+ * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
+ */
+async function __resolve(slot: TokenProvider | null): Promise<string | null> {
+    if (slot === null)
+        return null;
+    return typeof slot === "function" ? slot() : slot;
+}
+
+/**
+ * Build the auth `headers` and `query` for an operation from the currently-set credentials.
+ * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
+ * can always override by passing their own `init.headers`.
+ */
+async function __auth(schemes: string[], config: ClientConfig): Promise<{
+    headers: Record<string, string>;
+    query: Record<string, string>;
+}> {
+    const headers: Record<string, string> = {};
+    const query: Record<string, string> = {};
+    const cookies: string[] = [];
+    for (const scheme of schemes) {
+        switch (scheme) {
+            case "OAuth2": {
+                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
+                if (v !== null)
+                    headers["Authorization"] = `Bearer ${v}`;
+                break;
+            }
+            case "ApiKey": {
+                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
+                if (v !== null)
+                    headers["X-API-Key"] = v;
+                break;
+            }
+        }
+    }
+    if (cookies.length > 0)
+        headers["Cookie"] = cookies.join("; ");
+    return { headers, query };
+}
+
+export type ListMenuItemsResult = MenuItemList;
+
+export type ListMenuItemsParams = {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+};
+
+export type ListMenuItemsVariables = {
+    params?: ListMenuItemsParams;
+};
+
+/**
+ * List all menu items
+ *
+ * Retrieve a collection of menu items with optional filtering and pagination.
+ */
+export async function listMenuItems(params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
+    return __request<MenuItemList>(__config, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
+}
+
+export type CreateMenuItemResult = MenuItem;
+
+export type CreateMenuItemBody = FormData;
+
+export type CreateMenuItemVariables = {
+    body: CreateMenuItemBody;
+};
+
+/**
+ * Create menu item
+ *
+ * Create a new menu item.
+ */
+export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<MenuItem>(__config, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type DeleteMenuItemResult = void;
+
+export type DeleteMenuItemVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+};
+
+/**
+ * Delete a menu item
+ *
+ * Delete an existing menu item.
+ */
+export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type GetMenuItemPhotoResult = Blob | string;
+
+export type GetMenuItemPhotoParams = {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+};
+
+export type GetMenuItemPhotoVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+    params?: GetMenuItemPhotoParams;
+};
+
+/**
+ * Retrieve a menu item photo
+ *
+ * Retrieve the product photo image for a specific menu item.
+ */
+export async function getMenuItemPhoto(menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}): Promise<Blob | string> {
+    return __request<Blob | string>(__config, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+}
+
+export type ListOrdersResult = OrderList;
+
+export type ListOrdersParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+};
+
+export type ListOrdersVariables = {
+    params?: ListOrdersParams;
+};
+
+/**
+ * List all orders
+ *
+ * Retrieve a collection of orders with optional filtering and pagination.
+ */
+export async function listOrders(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderList> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderList>(__config, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+/**
+ * Create order
+ *
+ * Create a new order.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    headers?: GetOrderByIdHeaders;
+};
+
+/**
+ * Retrieve an order
+ *
+ * Retrieve a single order by its ID.
+ */
+export async function getOrderById(orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+}
+
+export type DeleteOrderResult = void;
+
+export type DeleteOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+};
+
+/**
+ * Delete an order
+ *
+ * Delete the order.
+ * To keep the order history, the order should be canceled instead of deleted.
+ */
+export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type UpdateOrderResult = Order;
+
+export type UpdateOrderBody = {
+    status: OrderStatus;
+};
+
+export type UpdateOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    body?: UpdateOrderBody;
+};
+
+/**
+ * Partially update an order
+ *
+ * Update an existing order status.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function updateOrder(orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type ListOrderItemsResult = OrderItem[];
+
+export type ListOrderItemsParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+};
+
+export type ListOrderItemsVariables = {
+    params?: ListOrderItemsParams;
+};
+
+/**
+ * List all order items with menu item details
+ *
+ * Returns an array of order items for a specific order.
+ * Use the `filter` parameter to filter by order ID.
+ */
+export async function listOrderItems(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderItem[]>(__config, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+/**
+ * Get revenue statistics
+ *
+ * Retrieve revenue statistics for a configurable date range.
+ * Returns revenue, order counts, average order amount, and other useful statistics.
+ */
+export async function getRevenue(params: {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
+    const __a = await __auth(["ApiKey"], __config);
+    return __request<RevenueStatistics>(__config, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Create OAuth2 client
+ *
+ * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+ * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
+ *   `redirectUris` must be provided (per RFC 7591 Section 2).
+ * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+ * Returns the registered client information per RFC 7591, including:
+ * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+ */
+export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
+    return __request<OAuth2Client>(__config, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+}
diff --git a/packages/openapi-typescript/examples/custom-generator/src/main.ts b/packages/openapi-typescript/examples/custom-generator/src/main.ts
new file mode 100644
index 0000000000..37a659680a
--- /dev/null
+++ b/packages/openapi-typescript/examples/custom-generator/src/main.ts
@@ -0,0 +1,16 @@
+// Consumes both the built-in sdk client and the custom generator's output (`routes`),
+// proving the plugin's file is generated alongside the client and type-checks.
+import { configure, listMenuItems } from './api/client';
+import { routes } from './api/client.routes';
+
+configure({ baseUrl: 'https://cafe.cloud.redocly.com' });
+
+const out = document.querySelector<HTMLPreElement>('#out')!;
+
+async function main() {
+  // The route map the custom generator produced from the same OpenAPI description.
+  const menu = await listMenuItems();
+  out.textContent = `${routes.listMenuItems}\n${JSON.stringify(menu, null, 2)}`;
+}
+
+void main();
diff --git a/packages/openapi-typescript/examples/custom-generator/tsconfig.json b/packages/openapi-typescript/examples/custom-generator/tsconfig.json
new file mode 100644
index 0000000000..4bd6962d40
--- /dev/null
+++ b/packages/openapi-typescript/examples/custom-generator/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../tsconfig.base.json",
+  "include": ["src"]
+}
diff --git a/packages/openapi-typescript/examples/custom-generator/vite.config.ts b/packages/openapi-typescript/examples/custom-generator/vite.config.ts
new file mode 100644
index 0000000000..c049f46e10
--- /dev/null
+++ b/packages/openapi-typescript/examples/custom-generator/vite.config.ts
@@ -0,0 +1,3 @@
+import { defineConfig } from 'vite';
+
+export default defineConfig({});
diff --git a/packages/openapi-typescript/examples/fetch-functions/.gitignore b/packages/openapi-typescript/examples/fetch-functions/.gitignore
new file mode 100644
index 0000000000..f06235c460
--- /dev/null
+++ b/packages/openapi-typescript/examples/fetch-functions/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+dist
diff --git a/packages/openapi-typescript/examples/fetch-functions/README.md b/packages/openapi-typescript/examples/fetch-functions/README.md
new file mode 100644
index 0000000000..dc64cbbec8
--- /dev/null
+++ b/packages/openapi-typescript/examples/fetch-functions/README.md
@@ -0,0 +1,15 @@
+# fetch-functions example
+
+Generated TypeScript client using the **functions facade** (`generators: ['sdk']`), consumed as free
+functions (`configure()`, `listMenuItems()`), with `ApiError` handling.
+
+## Run
+
+```bash
+npm install
+npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
+npm run dev        # open the printed local URL
+```
+
+The generated client under `src/api/` is committed and drift-checked against the generator in CI.
+Point `configure({ baseUrl })` at your own server or a mock as needed.
diff --git a/packages/openapi-typescript/examples/fetch-functions/index.html b/packages/openapi-typescript/examples/fetch-functions/index.html
new file mode 100644
index 0000000000..ae59e015b2
--- /dev/null
+++ b/packages/openapi-typescript/examples/fetch-functions/index.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>Redocly openapi-typescript — fetch-functions example</title>
+  </head>
+  <body>
+    <pre id="out">Loading…</pre>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
diff --git a/packages/openapi-typescript/examples/fetch-functions/openapi.yaml b/packages/openapi-typescript/examples/fetch-functions/openapi.yaml
new file mode 100644
index 0000000000..a6a75dffd0
--- /dev/null
+++ b/packages/openapi-typescript/examples/fetch-functions/openapi.yaml
@@ -0,0 +1,1163 @@
+openapi: 3.2.0
+info:
+  title: Redocly Cafe
+  description: |
+    Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+    Create API credentials and try it yourself in a realistic OpenAPI workflow.
+  version: 1.0.0
+  contact:
+    email: team@redocly.com
+    url: https://redocly.com/contact-us/
+  license:
+    name: MIT
+    url: https://opensource.org/licenses/MIT
+  termsOfService: https://redocly.com/subscription-agreement
+servers:
+  - url: https://cafe.cloud.redocly.com
+    description: Live server.
+tags:
+  - name: Authorization
+    description: Create a client to demo the API.
+  - name: Products
+    description: Operations related to products.
+  - name: Orders
+    description: Order management operations.
+  - name: Statistics
+    description: Statistics operations.
+paths:
+  /menu:
+    get:
+      tags:
+        - Products
+      summary: List all menu items
+      description: Retrieve a collection of menu items with optional filtering and pagination.
+      operationId: listMenuItems
+      security: []
+      parameters:
+        - $ref: '#/components/parameters/After'
+        - $ref: '#/components/parameters/Before'
+        - $ref: '#/components/parameters/Sort'
+        - $ref: '#/components/parameters/Filter'
+        - $ref: '#/components/parameters/Search'
+        - $ref: '#/components/parameters/Limit'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItemList'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    post:
+      tags:
+        - Products
+      summary: Create menu item
+      description: Create a new menu item.
+      operationId: createMenuItem
+      security:
+        - OAuth2:
+            - menu:write
+      requestBody:
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              $ref: '#/components/schemas/MenuItem'
+      responses:
+        '201':
+          description: Menu item created successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItem'
+              examples:
+                MenuItemResponse:
+                  value:
+                    id: prd_01khr487f7qm7p44xn427m43vb
+                    object: menuItem
+                    name: coffee
+                    price: 4000
+                    category: beverage
+                    createdAt: '2026-02-18T10:20:38.228Z'
+                    updatedAt: '2026-02-18T10:20:38.228Z'
+                    volume: 600
+                    containsCaffeine: false
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '409':
+          $ref: '#/components/responses/Conflict'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /menu/{menuItemId}:
+    parameters:
+      - $ref: '#/components/parameters/MenuItemId'
+    delete:
+      tags:
+        - Products
+      summary: Delete a menu item
+      description: Delete an existing menu item.
+      operationId: deleteMenuItem
+      security:
+        - OAuth2:
+            - menu:write
+      responses:
+        '204':
+          description: Menu item deleted successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /menu-item-images/{menuItemId}:
+    parameters:
+      - $ref: '#/components/parameters/MenuItemId'
+    get:
+      operationId: getMenuItemPhoto
+      summary: Retrieve a menu item photo
+      description: Retrieve the product photo image for a specific menu item.
+      security: []
+      tags:
+        - Products
+      parameters:
+        - $ref: '#/components/parameters/PhotoSize'
+      responses:
+        '200':
+          description: Menu item photo retrieved successfully.
+          content:
+            image/png:
+              schema:
+                type: string
+                format: binary
+            text/plain:
+              schema:
+                description: Alternative image text.
+                type: string
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /orders:
+    get:
+      tags:
+        - Orders
+      summary: List all orders
+      description: Retrieve a collection of orders with optional filtering and pagination.
+      operationId: listOrders
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/Filter'
+        - $ref: '#/components/parameters/Sort'
+        - $ref: '#/components/parameters/Limit'
+        - $ref: '#/components/parameters/After'
+        - $ref: '#/components/parameters/Before'
+        - $ref: '#/components/parameters/Search'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OrderList'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    post:
+      tags:
+        - Orders
+      summary: Create order
+      description: |
+        Create a new order.
+        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+      operationId: createOrder
+      security:
+        - OAuth2:
+            - orders:write
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Order'
+            examples:
+              OrderRequest:
+                dataValue:
+                  customerName: Mary Ann
+                  orderItems:
+                    - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                      quantity: 2
+                      comment: No sugar!
+                      discount: 0
+      responses:
+        '201':
+          description: Order placed successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: placed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /orders/{orderId}:
+    get:
+      tags:
+        - Orders
+      summary: Retrieve an order
+      description: Retrieve a single order by its ID.
+      operationId: getOrderById
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+        - name: X-Request-Id
+          in: header
+          required: false
+          description: |
+            Optional client-supplied correlation ID, echoed in logs and traces.
+          schema:
+            type: string
+            format: uuid
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: placed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    patch:
+      tags:
+        - Orders
+      summary: Partially update an order
+      description: |
+        Update an existing order status.
+        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+      operationId: updateOrder
+      security:
+        - OAuth2:
+            - orders:write
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              description: |
+                Partial order update using JSON Merge Patch - only include fields to update.
+              properties:
+                status:
+                  $ref: '#/components/schemas/OrderStatus'
+              required:
+                - status
+      responses:
+        '200':
+          description: Order updated successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: completed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    delete:
+      tags:
+        - Orders
+      summary: Delete an order
+      description: |
+        Delete the order.
+        To keep the order history, the order should be canceled instead of deleted.
+      operationId: deleteOrder
+      security:
+        - OAuth2:
+            - orders:write
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+      responses:
+        '204':
+          description: Order deleted successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /order-items:
+    get:
+      tags:
+        - Orders
+      summary: List all order items with menu item details
+      description: |
+        Returns an array of order items for a specific order.
+        Use the `filter` parameter to filter by order ID.
+      operationId: listOrderItems
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/Filter'
+          required: true
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                type: array
+                description: List of menu items that are part of the order.
+                items:
+                  $ref: '#/components/schemas/OrderItem'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /revenue:
+    get:
+      tags:
+        - Statistics
+      summary: Get revenue statistics
+      description: |
+        Retrieve revenue statistics for a configurable date range.
+        Returns revenue, order counts, average order amount, and other useful statistics.
+      operationId: getRevenue
+      security:
+        - ApiKey: []
+      parameters:
+        - name: startDate
+          in: query
+          required: false
+          description: |
+            Start date for the revenue calculation period (ISO 8601 datetime format).
+            Defaults to 30 days ago if not provided.
+          schema:
+            type: string
+            format: date
+          example: '2026-01-01'
+        - name: endDate
+          in: query
+          required: false
+          description: |
+            End date for the revenue calculation period (ISO 8601 datetime format).
+            Defaults to current time if not provided.
+          schema:
+            type: string
+            format: date
+          example: '2026-01-31'
+      responses:
+        '200':
+          description: Revenue statistics retrieved successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RevenueStatistics'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /oauth2/register:
+    post:
+      tags:
+        - Authorization
+      summary: Create OAuth2 client
+      description: |
+        Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+        - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type, 
+          `redirectUris` must be provided (per RFC 7591 Section 2).
+        - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+        Returns the registered client information per RFC 7591, including:
+        - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+      operationId: registerOAuth2Client
+      security: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/RegisterClientObject'
+      responses:
+        '201':
+          description: OAuth2 client registered successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OAuth2Client'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+webhooks:
+  order-notification:
+    post:
+      tags:
+        - Orders
+      operationId: orderNotificationWebhook
+      security: []
+      summary: Order notification webhook
+      description: Webhook triggered when a new order is placed.
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/OrderNotification'
+      responses:
+        '200':
+          description: Webhook received successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+components:
+  securitySchemes:
+    OAuth2:
+      type: oauth2
+      description: OAuth2 authorization for API access.
+      flows:
+        authorizationCode:
+          authorizationUrl: https://cafe.cloud.redocly.com/oauth2/authorize
+          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          scopes:
+            menu:read: Read access to menu items and images
+            menu:write: Write access to menu items (create, delete)
+            orders:read: Read access to orders
+            orders:write: Write access to orders (create, update, delete)
+        clientCredentials:
+          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          scopes:
+            menu:read: Read access to menu items and images
+            menu:write: Write access to menu items (create, delete)
+            orders:read: Read access to orders
+            orders:write: Write access to orders (create, update, delete)
+    ApiKey:
+      type: apiKey
+      name: X-API-Key
+      in: header
+      description: API key for internal operations.
+  parameters:
+    After:
+      name: after
+      in: query
+      required: false
+      description: Use the `endCursor` as a value for the `after` parameter to get the next page.
+      schema:
+        type: string
+      example: a25fgaksjf23la==
+    Before:
+      name: before
+      in: query
+      required: false
+      description: |
+        Use the `startCursor` as a value for the `before` parameter to get the next page.
+      schema:
+        type: string
+      example: bfg23aksjf23zb1==
+    Sort:
+      name: sort
+      description: |-
+        To sort by id in descending order use `-id`.
+        To sort by id in ascending order use `id`.
+      in: query
+      required: false
+      schema:
+        type: string
+      example: '-name'
+    Filter:
+      name: filter
+      description: |-
+        Filters the collection items using space-separated `field:value` pairs.
+
+        **Format:** `field1:value1 field2:value2`
+
+        **Supported operators:**
+        - `field:value` - Exact match
+        - `field:value1,value2` - Match any of the comma-separated values (OR)
+        - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+
+        **Examples:**
+        - `status:placed` - Filter by single status.
+        - `status:placed,completed` - Filter by multiple statuses.
+        - `createdAt:30d` - Filter orders created in the last 30 days.
+        - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+        - `status:placed createdAt:7d` - Combine multiple filters.
+      in: query
+      required: false
+      schema:
+        type: string
+      example: orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7
+    Search:
+      name: search
+      in: query
+      description: |-
+        Performs a case-insensitive text search across relevant fields in the collection.
+
+        **Fields searched depend on the endpoint:**
+        - **Menu items:** `name`, `photoTextDescription`
+        - **Orders:** `customerName`, `id`
+
+        Returns items where any of the searchable fields contain the search term as a substring.
+      required: false
+      schema:
+        type: string
+      example: coffee
+    Limit:
+      name: limit
+      description: |
+        Use to return a number of results per page.
+        If there is more data, use in combination with `after` to page through the data.
+      in: query
+      required: false
+      schema:
+        type: integer
+        minimum: 1
+        maximum: 100
+        default: 10
+      example: 10
+    MenuItemId:
+      name: menuItemId
+      in: path
+      description: ID of the menu item to retrieve.
+      required: true
+      schema:
+        type: string
+        pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+      example: prd_01h1s5z6vf2mm1mz3hevnn9va7
+    PhotoSize:
+      name: photoSize
+      in: query
+      description: Photo size to retrieve.
+      required: false
+      schema:
+        type: string
+        enum:
+          - thumbnail
+          - medium
+          - large
+        default: medium
+    OrderId:
+      name: orderId
+      in: path
+      description: ID of the order to retrieve.
+      required: true
+      schema:
+        type: string
+        pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+      example: ord_01h1s5z6vf2mm1mz3hevnn9va7
+  schemas:
+    Page:
+      type: object
+      properties:
+        endCursor:
+          type:
+            - string
+            - 'null'
+          description: |-
+            Use with the `after` query parameter to load the next page of data.
+            When `null`, there is no data.
+            The cursor is opaque and internal structure is subject to change.
+        startCursor:
+          type:
+            - string
+            - 'null'
+          description: |-
+            Use with the `before` query parameter to load the previous page of data.
+            When `null`, there is no data.
+            The cursor is opaque and internal structure is subject to change.
+        hasNextPage:
+          type: boolean
+          description: Indicates if there is a next page with items.
+        hasPrevPage:
+          type: boolean
+          description: Indicates if there is a previous page with items.
+        limit:
+          type: integer
+          minimum: 1
+          maximum: 100
+          default: 10
+          description: Value showing how many items are in the page limit.
+        total:
+          type: integer
+          description: Count of items across all pages.
+          minimum: 0
+      required:
+        - endCursor
+        - startCursor
+        - hasNextPage
+        - hasPrevPage
+        - limit
+        - total
+    MenuBaseItem:
+      type: object
+      properties:
+        createdAt:
+          description: Created date.
+          type: string
+          format: date-time
+          readOnly: true
+        updatedAt:
+          description: Updated date.
+          type: string
+          format: date-time
+          readOnly: true
+        id:
+          description: Menu item ID. Unique identifier prefixed with `prd_`.
+          type: string
+          readOnly: true
+          pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+          example: prd_01h1s5z6vf2mm1mz3hevnn9va7
+        object:
+          description: Entity name.
+          type: string
+          const: menuItem
+          readOnly: true
+        name:
+          description: Menu item name.
+          type: string
+          minLength: 1
+          maxLength: 50
+        price:
+          description: Price in cents.
+          type: integer
+          minimum: 0
+        photo:
+          writeOnly: true
+          type:
+            - string
+            - 'null'
+          format: binary
+          description: Photo of the menu item. Must be a PNG image and less than 1MB.
+        photoUrl:
+          readOnly: true
+          type: string
+          format: uri
+          description: Photo URL of the menu item.
+        photoTextDescription:
+          type:
+            - string
+            - 'null'
+      required:
+        - id
+        - name
+        - price
+        - createdAt
+        - updatedAt
+        - object
+    Beverage:
+      allOf:
+        - type: object
+          properties:
+            category:
+              description: Menu item category.
+              type: string
+              const: beverage
+            volume:
+              type: number
+              description: Size of the beverage in milliliters.
+              exclusiveMinimum: 0
+            containsCaffeine:
+              type: boolean
+              description: Indicates if the beverage contains caffeine.
+          required:
+            - category
+            - volume
+            - containsCaffeine
+        - $ref: '#/components/schemas/MenuBaseItem'
+    Dessert:
+      allOf:
+        - type: object
+          properties:
+            category:
+              description: Menu item category.
+              type: string
+              const: dessert
+            calories:
+              type: number
+              exclusiveMinimum: 0
+              description: Amount of calories.
+          required:
+            - category
+            - calories
+        - $ref: '#/components/schemas/MenuBaseItem'
+    MenuItem:
+      discriminator:
+        propertyName: category
+        mapping:
+          beverage: '#/components/schemas/Beverage'
+          dessert: '#/components/schemas/Dessert'
+      oneOf:
+        - $ref: '#/components/schemas/Beverage'
+        - $ref: '#/components/schemas/Dessert'
+      required:
+        - category
+    MenuItemList:
+      type: object
+      properties:
+        object:
+          type: string
+          const: list
+          description: Entity name.
+        page:
+          $ref: '#/components/schemas/Page'
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/MenuItem'
+      required:
+        - object
+        - page
+        - items
+    Error:
+      type: object
+      properties:
+        type:
+          type: string
+          format: uri-reference
+          description: URI reference that identifies the problem type.
+          default: about:blank
+        title:
+          type: string
+          description: Short summary of the problem type.
+        status:
+          type: integer
+          format: int32
+          description: |
+            HTTP status code generated by the origin server for this occurrence of the problem.
+          minimum: 100
+          exclusiveMaximum: 600
+        instance:
+          type: string
+          format: uri-reference
+          description: |
+            URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+            May be used to locate the root of this problem in the source code.
+          example: /some/uri-reference#specific-occurrence-context
+        details:
+          description: Additional error details.
+          type: object
+          additionalProperties: true
+      required:
+        - type
+        - title
+        - status
+    OrderStatus:
+      type: string
+      description: Order status.
+      enum:
+        - placed
+        - preparing
+        - completed
+        - canceled
+    Order:
+      type: object
+      title: Order
+      properties:
+        id:
+          description: Order ID. Unique identifier prefixed with `ord_`.
+          type: string
+          format: ulid
+          readOnly: true
+          pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+          example: ord_01h1s5z6vf2mm1mz3hevnn9va7
+        object:
+          description: Entity name.
+          type: string
+          const: order
+          readOnly: true
+        customerName:
+          description: |
+            Name of the customer who placed the order.
+            Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+          type: string
+          pattern: ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+          minLength: 1
+          maxLength: 100
+        status:
+          allOf:
+            - $ref: '#/components/schemas/OrderStatus'
+          readOnly: true
+        totalPrice:
+          description: Total order price in cents.
+          type: integer
+          minimum: 0
+          readOnly: true
+        createdAt:
+          description: Created date.
+          type: string
+          format: date-time
+          readOnly: true
+        updatedAt:
+          description: Updated date.
+          type: string
+          format: date-time
+          readOnly: true
+        orderItems:
+          type: array
+          description: List of items to include in the order.
+          minItems: 1
+          items:
+            type: object
+            properties:
+              menuItemId:
+                type: string
+                format: ulid
+                description: ID of the menu item to add to the order.
+              quantity:
+                type: integer
+                minimum: 1
+                description: Quantity of the menu item.
+              discount:
+                type: integer
+                minimum: 0
+                description: Discount amount in cents (absolute value).
+                default: 0
+              comment:
+                type: string
+                maxLength: 500
+                description: Optional comment for the order item (e.g., "No sugar").
+            required:
+              - menuItemId
+              - quantity
+      required:
+        - customerName
+        - orderItems
+    OrderList:
+      type: object
+      properties:
+        object:
+          type: string
+          const: list
+          description: Entity name.
+        page:
+          $ref: '#/components/schemas/Page'
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/Order'
+      required:
+        - object
+        - page
+        - items
+    OrderItem:
+      type: object
+      properties:
+        menuItemId:
+          type: string
+          description: ID of the menu item to add to the order.
+          writeOnly: true
+        menuItem:
+          allOf:
+            - $ref: '#/components/schemas/MenuItem'
+          description: Menu item that is part of the order.
+          readOnly: true
+        quantity:
+          type: integer
+          minimum: 1
+          description: Quantity of the menu item.
+        discount:
+          type: integer
+          minimum: 0
+          description: Discount amount in cents (absolute value).
+          default: 0
+        comment:
+          type: string
+          maxLength: 500
+          description: Optional comment for the order item (e.g., "No sugar").
+      required:
+        - menuItemId
+        - quantity
+    RevenueStatistics:
+      type: object
+      description: Revenue statistics for a given date range.
+      properties:
+        revenue:
+          type: number
+          format: float
+          description: Total revenue in cents from completed orders.
+          minimum: 0
+        averageOrderAmount:
+          type: number
+          format: float
+          description: Average order amount in cents (calculated from completed orders only).
+          minimum: 0
+        totalOrders:
+          type: integer
+          description: Total number of orders (all statuses) in the date range.
+          minimum: 0
+        placedOrders:
+          type: integer
+          description: Number of placed orders.
+          minimum: 0
+        preparingOrders:
+          type: integer
+          description: Number of preparing orders.
+          minimum: 0
+        completedOrders:
+          type: integer
+          description: Number of completed orders.
+          minimum: 0
+        canceledOrders:
+          type: integer
+          description: Number of canceled orders.
+          minimum: 0
+        startDate:
+          type: string
+          format: date
+          description: Start date of the revenue calculation period.
+        endDate:
+          type: string
+          format: date
+          description: End date of the revenue calculation period.
+      required:
+        - revenue
+        - averageOrderAmount
+        - totalOrders
+        - placedOrders
+        - preparingOrders
+        - completedOrders
+        - canceledOrders
+        - startDate
+        - endDate
+    RegisterClientObject:
+      type: object
+      properties:
+        name:
+          type: string
+          description: Client name.
+        redirectUris:
+          type: array
+          items:
+            type: string
+            format: uri
+          description: List of redirect URIs (optional, defaults to empty array).
+        scopes:
+          type: array
+          items:
+            type: string
+            enum:
+              - menu:read
+              - menu:write
+              - orders:read
+              - orders:write
+          description: List of scopes.
+        grantTypes:
+          type: array
+          items:
+            type: string
+            enum:
+              - authorization_code
+              - client_credentials
+          description: List of grant types.
+      required:
+        - name
+    OAuth2Client:
+      type: object
+      description: OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+      properties:
+        clientId:
+          type: string
+          description: Client identifier issued by the authorization server.
+        clientSecret:
+          type: string
+          description: Client secret issued by the authorization server.
+        clientIdIssuedAt:
+          type: integer
+          format: int64
+          description: Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+        clientSecretExpiresAt:
+          type: integer
+          format: int64
+          description: Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+        name:
+          type: string
+          description: Client name (registered metadata).
+        redirectUris:
+          type: array
+          items:
+            type: string
+            format: uri
+          description: List of redirect URIs (registered metadata).
+        registrationClientUri:
+          type: string
+          format: uri
+          description: URL of the client configuration endpoint for managing this client registration (RFC 7592).
+        registrationAccessToken:
+          type: string
+          description: Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+        scopes:
+          type: array
+          items:
+            type: string
+            enum:
+              - menu:read
+              - menu:write
+              - orders:read
+              - orders:write
+          description: List of scopes (registered metadata).
+        grantTypes:
+          type: array
+          items:
+            type: string
+            enum:
+              - authorization_code
+              - client_credentials
+          description: List of grant types (registered metadata).
+      required:
+        - clientId
+        - clientSecret
+        - clientIdIssuedAt
+        - clientSecretExpiresAt
+        - registrationClientUri
+        - registrationAccessToken
+    OrderNotification:
+      type: object
+      required:
+        - orderId
+        - orderStatus
+        - timestamp
+      properties:
+        orderId:
+          type: string
+          description: Unique order identifier.
+        orderStatus:
+          $ref: '#/components/schemas/OrderStatus'
+        timestamp:
+          type: string
+          format: date-time
+          description: When the event occurred.
+  responses:
+    BadRequest:
+      description: Bad request - invalid input parameters.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    InternalServerError:
+      description: Internal server error.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Unauthorized:
+      description: Unauthorized - authorization required.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Forbidden:
+      description: Forbidden - insufficient permissions.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Conflict:
+      description: Conflict - entity already exists.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    NotFound:
+      description: Resource not found.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
diff --git a/packages/openapi-typescript/examples/fetch-functions/package.json b/packages/openapi-typescript/examples/fetch-functions/package.json
new file mode 100644
index 0000000000..d2088413bb
--- /dev/null
+++ b/packages/openapi-typescript/examples/fetch-functions/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "@redocly-examples/fetch-functions",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "generate": "redocly generate-client",
+    "dev": "vite",
+    "build": "vite build"
+  },
+  "devDependencies": {
+    "@redocly/cli": "latest",
+    "typescript": "^5.5.0",
+    "vite": "^5.4.0"
+  }
+}
diff --git a/packages/openapi-typescript/examples/fetch-functions/redocly.yaml b/packages/openapi-typescript/examples/fetch-functions/redocly.yaml
new file mode 100644
index 0000000000..54c194c994
--- /dev/null
+++ b/packages/openapi-typescript/examples/fetch-functions/redocly.yaml
@@ -0,0 +1,9 @@
+# redocly.yaml — drives `redocly generate-client` for this example.
+# generate-client settings live under the `x-openapi-typescript` extension for now
+# (first-class config support is planned in @redocly/config).
+x-openapi-typescript:
+  input: ./openapi.yaml
+  output: ./src/api/client.ts
+  generators:
+    - sdk
+  facade: functions
diff --git a/packages/openapi-typescript/examples/fetch-functions/src/api/client.ts b/packages/openapi-typescript/examples/fetch-functions/src/api/client.ts
new file mode 100644
index 0000000000..dcb4900f7c
--- /dev/null
+++ b/packages/openapi-typescript/examples/fetch-functions/src/api/client.ts
@@ -0,0 +1,1513 @@
+// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Redocly Cafe (v1.0.0)
+ * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+ * Create API credentials and try it yourself in a realistic OpenAPI workflow.
+ * 
+ */
+
+export type Page = {
+    /**
+     * Use with the `after` query parameter to load the next page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    endCursor: string | null;
+    /**
+     * Use with the `before` query parameter to load the previous page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    startCursor: string | null;
+    /**
+     * Indicates if there is a next page with items.
+     */
+    hasNextPage: boolean;
+    /**
+     * Indicates if there is a previous page with items.
+     */
+    hasPrevPage: boolean;
+    /**
+     * Value showing how many items are in the page limit.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit: number;
+    /**
+     * Count of items across all pages.
+     * @minimum 0
+     */
+    total: number;
+};
+
+export type MenuBaseItem = {
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt: string;
+    /**
+     * Menu item ID. Unique identifier prefixed with `prd_`.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    readonly id: string;
+    /**
+     * Entity name.
+     */
+    readonly object: "menuItem";
+    /**
+     * Menu item name.
+     * @minLength 1
+     * @maxLength 50
+     */
+    name: string;
+    /**
+     * Price in cents.
+     * @minimum 0
+     */
+    price: number;
+    /**
+     * Photo of the menu item. Must be a PNG image and less than 1MB.
+     * @format binary
+     */
+    photo?: Blob | null;
+    /**
+     * Photo URL of the menu item.
+     * @format uri
+     */
+    readonly photoUrl?: string;
+    photoTextDescription?: string | null;
+};
+
+export type Beverage = {
+    /**
+     * Menu item category.
+     */
+    category: "beverage";
+    /**
+     * Size of the beverage in milliliters.
+     * @exclusiveMinimum 0
+     */
+    volume: number;
+    /**
+     * Indicates if the beverage contains caffeine.
+     */
+    containsCaffeine: boolean;
+} & MenuBaseItem;
+
+export type Dessert = {
+    /**
+     * Menu item category.
+     */
+    category: "dessert";
+    /**
+     * Amount of calories.
+     * @exclusiveMinimum 0
+     */
+    calories: number;
+} & MenuBaseItem;
+
+export type MenuItem = Beverage | Dessert;
+
+export type MenuItemList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: MenuItem[];
+};
+
+export type Error = {
+    /**
+     * URI reference that identifies the problem type.
+     * @format uri-reference
+     */
+    type: string;
+    /**
+     * Short summary of the problem type.
+     */
+    title: string;
+    /**
+     * HTTP status code generated by the origin server for this occurrence of the problem.
+     * @minimum 100
+     * @exclusiveMaximum 600
+     * @format int32
+     */
+    status: number;
+    /**
+     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+     * May be used to locate the root of this problem in the source code.
+     * @format uri-reference
+     */
+    instance?: string;
+    /**
+     * Additional error details.
+     */
+    details?: Record<string, unknown>;
+};
+
+/**
+ * Order status.
+ */
+export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
+
+export const OrderStatus = {
+    placed: "placed",
+    preparing: "preparing",
+    completed: "completed",
+    canceled: "canceled"
+} as const;
+
+export type Order = {
+    /**
+     * Order ID. Unique identifier prefixed with `ord_`.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     * @format ulid
+     */
+    readonly id?: string;
+    /**
+     * Entity name.
+     */
+    readonly object?: "order";
+    /**
+     * Name of the customer who placed the order.
+     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+     * @minLength 1
+     * @maxLength 100
+     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+     */
+    customerName: string;
+    readonly status?: OrderStatus;
+    /**
+     * Total order price in cents.
+     * @minimum 0
+     */
+    readonly totalPrice?: number;
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt?: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt?: string;
+    /**
+     * List of items to include in the order.
+     * @minItems 1
+     */
+    orderItems: {
+        /**
+         * ID of the menu item to add to the order.
+         * @format ulid
+         */
+        menuItemId: string;
+        /**
+         * Quantity of the menu item.
+         * @minimum 1
+         */
+        quantity: number;
+        /**
+         * Discount amount in cents (absolute value).
+         * @minimum 0
+         */
+        discount?: number;
+        /**
+         * Optional comment for the order item (e.g., "No sugar").
+         * @maxLength 500
+         */
+        comment?: string;
+    }[];
+};
+
+export type OrderList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: Order[];
+};
+
+export type OrderItem = {
+    /**
+     * ID of the menu item to add to the order.
+     */
+    menuItemId: string;
+    /**
+     * Menu item that is part of the order.
+     */
+    readonly menuItem?: MenuItem;
+    /**
+     * Quantity of the menu item.
+     * @minimum 1
+     */
+    quantity: number;
+    /**
+     * Discount amount in cents (absolute value).
+     * @minimum 0
+     */
+    discount?: number;
+    /**
+     * Optional comment for the order item (e.g., "No sugar").
+     * @maxLength 500
+     */
+    comment?: string;
+};
+
+/**
+ * Revenue statistics for a given date range.
+ */
+export type RevenueStatistics = {
+    /**
+     * Total revenue in cents from completed orders.
+     * @minimum 0
+     * @format float
+     */
+    revenue: number;
+    /**
+     * Average order amount in cents (calculated from completed orders only).
+     * @minimum 0
+     * @format float
+     */
+    averageOrderAmount: number;
+    /**
+     * Total number of orders (all statuses) in the date range.
+     * @minimum 0
+     */
+    totalOrders: number;
+    /**
+     * Number of placed orders.
+     * @minimum 0
+     */
+    placedOrders: number;
+    /**
+     * Number of preparing orders.
+     * @minimum 0
+     */
+    preparingOrders: number;
+    /**
+     * Number of completed orders.
+     * @minimum 0
+     */
+    completedOrders: number;
+    /**
+     * Number of canceled orders.
+     * @minimum 0
+     */
+    canceledOrders: number;
+    /**
+     * Start date of the revenue calculation period.
+     * @format date
+     */
+    startDate: string;
+    /**
+     * End date of the revenue calculation period.
+     * @format date
+     */
+    endDate: string;
+};
+
+export type RegisterClientObject = {
+    /**
+     * Client name.
+     */
+    name: string;
+    /**
+     * List of redirect URIs (optional, defaults to empty array).
+     */
+    redirectUris?: string[];
+    /**
+     * List of scopes.
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types.
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+/**
+ * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+ */
+export type OAuth2Client = {
+    /**
+     * Client identifier issued by the authorization server.
+     */
+    clientId: string;
+    /**
+     * Client secret issued by the authorization server.
+     */
+    clientSecret: string;
+    /**
+     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+     * @format int64
+     */
+    clientIdIssuedAt: number;
+    /**
+     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+     * @format int64
+     */
+    clientSecretExpiresAt: number;
+    /**
+     * Client name (registered metadata).
+     */
+    name?: string;
+    /**
+     * List of redirect URIs (registered metadata).
+     */
+    redirectUris?: string[];
+    /**
+     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
+     * @format uri
+     */
+    registrationClientUri: string;
+    /**
+     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+     */
+    registrationAccessToken: string;
+    /**
+     * List of scopes (registered metadata).
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types (registered metadata).
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+export type OrderNotification = {
+    /**
+     * Unique order identifier.
+     */
+    orderId: string;
+    orderStatus: OrderStatus;
+    /**
+     * When the event occurred.
+     * @format date-time
+     */
+    timestamp: string;
+};
+
+/**
+ * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
+ */
+export function isBeverage(value: MenuItem): value is Beverage {
+    return (value as Record<string, unknown>)["category"] === "beverage";
+}
+
+/**
+ * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
+ */
+export function isDessert(value: MenuItem): value is Dessert {
+    return (value as Record<string, unknown>)["category"] === "dessert";
+}
+
+/**
+ * Static metadata for every operation, keyed by operationId: the HTTP `method`
+ * and the `path` template (with `{param}` placeholders intact). Minification-safe
+ * — useful for building cache/query keys, tracing span names, and request logging
+ * without re-deriving them at each call site.
+ */
+export const OPERATIONS = {
+    listMenuItems: { method: "GET", path: "/menu" },
+    createMenuItem: { method: "POST", path: "/menu" },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
+    listOrders: { method: "GET", path: "/orders" },
+    createOrder: { method: "POST", path: "/orders" },
+    getOrderById: { method: "GET", path: "/orders/{orderId}" },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
+    listOrderItems: { method: "GET", path: "/order-items" },
+    getRevenue: { method: "GET", path: "/revenue" },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
+} as const;
+
+/**
+ * The operationId of any operation in this client.
+ */
+export type OperationId = keyof typeof OPERATIONS;
+
+/**
+ * Static metadata describing one operation: its HTTP method and path template.
+ */
+export type OperationMetadata = {
+    readonly method: string;
+    readonly path: string;
+};
+
+let BASE = "https://cafe.cloud.redocly.com";
+
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+export type RequestContext = {
+    url: string;
+    method: string;
+    headers: Record<string, string>;
+    body?: unknown;
+};
+
+/**
+ * Configuration and extension hooks for a client. Supplied per-instance via
+ * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
+ * (functions facade).
+ */
+export type ClientConfig = {
+    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    baseUrl?: string;
+    /** Extra headers merged into every request; a function is invoked per request. */
+    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+    /** Transport used to issue requests. Defaults to the global `fetch`. */
+    fetch?: typeof fetch;
+    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    /** Observe — or replace, by returning a `Response` — the response before parsing. */
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    /**
+     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
+     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
+     */
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
+    /**
+     * Composable interceptors run around every request, alongside the single
+     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
+     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
+     * the last-registered middleware wraps closest to the network. Register more at runtime
+     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
+     */
+    middleware?: Middleware[];
+    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
+    retry?: RetryConfig;
+    /**
+     * Per-instance auth credentials. When set, they override the module-global
+     * `set*` helpers for requests made through this config (each scheme falls back
+     * to its global slot when omitted here). Only the schemes an operation declares
+     * in its `security` are ever sent.
+     */
+    auth?: AuthCredentials;
+};
+
+/**
+ * A request interceptor; every field is optional, so a middleware can hook any subset of
+ * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
+ * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
+ * failure into the error to throw, threaded through each middleware in turn.
+ */
+export type Middleware = {
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/** Context handed to `retryOn` for the attempt that just failed. */
+export type RetryContext = {
+    /** 1-based number of the attempt that just failed. */
+    attempt: number;
+    /** The request that was attempted. */
+    request: RequestContext;
+    /** Present when the server returned a (non-ok) response. */
+    response?: Response;
+    /** Present when the transport threw (network error, DNS, connection reset). */
+    error?: unknown;
+};
+
+/** Retry policy; all fields optional with sensible defaults. */
+export type RetryConfig = {
+    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
+    retries?: number;
+    /** Base delay in milliseconds. Default 1000. */
+    retryDelay?: number;
+    /** Backoff shape. Default 'exponential'. */
+    retryStrategy?: RetryStrategy;
+    /** Apply full jitter over the computed delay. Default true. */
+    jitter?: boolean;
+    /**
+     * Decide whether to retry a failed attempt. Default: retry only idempotent
+     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
+     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
+     */
+    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
+};
+
+/**
+ * How the response body is read. `'auto'` negotiates from the content type (the
+ * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
+ */
+export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
+
+/**
+ * The trailing per-operation argument: standard `RequestInit` plus an optional
+ * per-call retry override and a `parseAs` escape hatch.
+ *
+ * `parseAs` forces how the response body is read; overrides the inferred kind.
+ * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
+ * override — the static return type is unchanged.
+ */
+export type RequestOptions = RequestInit & {
+    retry?: Partial<RetryConfig>;
+    parseAs?: ParseAs;
+};
+
+/**
+ * Override the base URL used by every generated operation. Useful when the
+ * runtime environment differs from the value declared in `servers[0].url`
+ * (e.g. dev / staging / prod toggles in a single-page app).
+ *
+ * Mutates a module-scoped binding shared by the functions facade. For multiple
+ * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ */
+export function setBaseUrl(url: string): void {
+    BASE = url;
+}
+
+/** The global config used by the functions facade (see `configure`). */
+const __config: ClientConfig = {};
+
+/**
+ * Merge `config` into the global configuration used by the functions facade —
+ * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
+ * hooks once for every free function. The service-class facade configures per
+ * instance instead (`new Client(config)`).
+ */
+export function configure(config: ClientConfig): void {
+    Object.assign(__config, config);
+}
+
+/**
+ * Append interceptors to the functions facade's global middleware chain (see
+ * `ClientConfig.middleware`). The service-class facade registers per instance via
+ * `<Client>.use(...)` instead.
+ */
+export function use(...middleware: Middleware[]): void {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    __config.middleware = [...(__config.middleware ?? []), ...middleware];
+}
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function __middleware(config: ClientConfig): Middleware[] {
+    const single = config.onRequest || config.onResponse || config.onError
+        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+        : [];
+    return [...single, ...(config.middleware ?? [])];
+}
+
+export class ApiError extends Error {
+    public readonly url: string;
+    public readonly status: number;
+    public readonly statusText: string;
+    public readonly body: unknown;
+    constructor(url: string, status: number, statusText: string, body: unknown) {
+        super(`Request failed with status ${status}`);
+        this.name = 'ApiError';
+        this.url = url;
+        this.status = status;
+        this.statusText = statusText;
+        this.body = body;
+    }
+}
+
+type QueryPrimitive = string | number | boolean;
+
+type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
+
+/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
+type QueryStyle = {
+    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+    explode: boolean;
+    allowReserved?: boolean;
+};
+
+/**
+ * Percent-encode `value` but leave the RFC-3986 reserved set
+ * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
+ */
+function __encodeReserved(value: string): string {
+    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
+}
+
+function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
+    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    if (!query)
+        return url;
+    const params = new URLSearchParams();
+    const raw: string[] = [];
+    for (const [key, value] of Object.entries(query)) {
+        if (value === undefined || value === null)
+            continue;
+        const spec = styles?.[key];
+        if (!spec) {
+            if (Array.isArray(value)) {
+                for (const v of value) {
+                    if (v !== undefined && v !== null)
+                        params.append(key, String(v));
+                }
+            }
+            else if (typeof value === 'object') {
+                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+                for (const [subKey, subValue] of Object.entries(value)) {
+                    if (subValue !== undefined && subValue !== null) {
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                    }
+                }
+            }
+            else {
+                params.append(key, String(value));
+            }
+            continue;
+        }
+        if (Array.isArray(value)) {
+            const items = value.filter((v) => v !== undefined && v !== null).map(String);
+            if (spec.style === 'form' && spec.explode) {
+                for (const v of items) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}=${__encodeReserved(v)}`);
+                    else
+                        params.append(key, v);
+                }
+            }
+            else {
+                // Delimited styles put the LITERAL delimiter on the wire; only the
+                // values are encoded. `%20` (not `+`) is the literal space delimiter.
+                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
+                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+            }
+        }
+        else if (typeof value === 'object') {
+            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+            for (const [subKey, subValue] of Object.entries(value)) {
+                if (subValue !== undefined && subValue !== null) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
+                    else
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                }
+            }
+        }
+        else if (spec.allowReserved) {
+            raw.push(`${key}=${__encodeReserved(String(value))}`);
+        }
+        else {
+            params.append(key, String(value));
+        }
+    }
+    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+    return qs ? `${url}?${qs}` : url;
+}
+
+async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+    response: Response;
+    context: RequestContext;
+}> {
+    const { retry: callRetry, ...fetchInit } = init;
+    const retry: RetryConfig = { ...config.retry, ...callRetry };
+    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+    const headers: Record<string, string> = {
+        Accept: 'application/json',
+        ...extra,
+        ...(fetchInit.headers as Record<string, string> | undefined),
+    };
+    let payload: BodyInit | undefined;
+    if (body !== undefined) {
+        const isBinary = body instanceof Blob ||
+            body instanceof ArrayBuffer ||
+            ArrayBuffer.isView(body as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
+        const isURLSearchParams = body instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
+            payload = body as BodyInit;
+        }
+        else {
+            payload = JSON.stringify(body);
+            if (!('Content-Type' in headers) && !('content-type' in headers)) {
+                headers['Content-Type'] = 'application/json';
+            }
+        }
+    }
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    const doFetch = config.fetch ?? fetch;
+    const maxAttempts = 1 + (retry.retries ?? 0);
+    const retryOn = retry.retryOn ?? __defaultRetryOn;
+    const signal = fetchInit.signal ?? undefined;
+    let attempt = 0;
+    while (true) {
+        attempt++;
+        if (signal?.aborted)
+            throw __abortError(signal);
+        let response: Response;
+        try {
+            response = await doFetch(context.url, {
+                ...fetchInit,
+                method: context.method,
+                headers: context.headers,
+                body: payload,
+            });
+        }
+        catch (error) {
+            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
+                await __sleep(__retryDelay(retry, attempt, null), signal);
+                continue;
+            }
+            throw error;
+        }
+        // Reverse order: the last-registered middleware wraps closest to the network (onion).
+        for (let i = middleware.length - 1; i >= 0; i--) {
+            const onResponse = middleware[i].onResponse;
+            if (onResponse) {
+                const replaced = await onResponse(response, context);
+                if (replaced)
+                    response = replaced;
+            }
+        }
+        if (!response.ok &&
+            attempt < maxAttempts &&
+            !signal?.aborted &&
+            (await retryOn({ attempt, request: context, response }))) {
+            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            continue;
+        }
+        return { response, context };
+    }
+}
+
+async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+    if (kind === 'void' || response.status === 204)
+        return undefined;
+    if (kind === 'stream')
+        return response.body;
+    if (kind === 'blob')
+        return response.blob();
+    if (kind === 'arrayBuffer')
+        return response.arrayBuffer();
+    if (kind === 'formData')
+        return response.formData();
+    if (kind === 'text')
+        return response.text();
+    if (kind === 'json')
+        return response.json();
+    // 'auto' — negotiate from the response's content type.
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json'))
+        return response.json();
+    if (contentType.startsWith('text/'))
+        return response.text();
+    return response.blob();
+}
+
+async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+    const { parseAs, ...sendInit } = init;
+    const { response, context } = await __send(config, url, sendInit, body);
+    if (!response.ok) {
+        const errorBody = await readError(response);
+        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
+        // Thread the error through each middleware's onError in turn (each may replace it).
+        for (const mw of __middleware(config)) {
+            if (mw.onError)
+                error = await mw.onError(error as ApiError, context);
+        }
+        throw error;
+    }
+    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
+    return (await __parse(response, kind)) as T;
+}
+
+async function readError(response: Response): Promise<unknown> {
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json')) {
+        return response.json().catch(() => undefined);
+    }
+    return response.text().catch(() => undefined);
+}
+
+const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+
+const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+function __defaultRetryOn(ctx: RetryContext): boolean {
+    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
+        return false;
+    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+    if (retryAfter) {
+        const seconds = Number(retryAfter);
+        if (!Number.isNaN(seconds))
+            return seconds * 1000;
+        const when = Date.parse(retryAfter);
+        if (!Number.isNaN(when))
+            return Math.max(0, when - Date.now());
+    }
+    const base = retry.retryDelay ?? 1000;
+    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+    return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
+    return new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject(__abortError(signal));
+            return;
+        }
+        const onAbort = () => {
+            clearTimeout(timer);
+            reject(__abortError(signal as AbortSignal));
+        };
+        const timer = setTimeout(() => {
+            if (signal)
+                signal.removeEventListener('abort', onAbort);
+            resolve();
+        }, ms);
+        if (signal)
+            signal.addEventListener('abort', onAbort, { once: true });
+    });
+}
+
+function __abortError(signal: AbortSignal): globalThis.Error {
+    const reason = (signal as {
+        reason?: unknown;
+    }).reason;
+    if (reason instanceof Error)
+        return reason;
+    return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * Normalize an operation's header-parameter object into a plain string record,
+ * dropping any `undefined` / `null` entries (optional headers the caller omitted)
+ * and stringifying the rest. Mirrors __buildUrl's handling of query values.
+ */
+function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
+    const out: Record<string, string> = {};
+    for (const [key, value] of Object.entries(values)) {
+        if (value !== undefined && value !== null)
+            out[key] = String(value);
+    }
+    return out;
+}
+
+/**
+ * A credential value, or a (possibly async) function that returns one per request.
+ */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/**
+ * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
+ * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
+ * to the global slots.
+ */
+export type AuthCredentials = {
+    bearer?: TokenProvider;
+    apiKey?: Record<string, TokenProvider>;
+};
+
+let __bearerToken: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
+ * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
+ * (possibly async) function resolved per request.
+ */
+export function setBearer(token: TokenProvider | null): void {
+    __bearerToken = token;
+}
+
+let __apiKey_ApiKey: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
+ * string or a (possibly async) function resolved per request.
+ */
+export function setApiKey(key: TokenProvider | null): void {
+    __apiKey_ApiKey = key;
+}
+
+/**
+ * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
+ */
+async function __resolve(slot: TokenProvider | null): Promise<string | null> {
+    if (slot === null)
+        return null;
+    return typeof slot === "function" ? slot() : slot;
+}
+
+/**
+ * Build the auth `headers` and `query` for an operation from the currently-set credentials.
+ * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
+ * can always override by passing their own `init.headers`.
+ */
+async function __auth(schemes: string[], config: ClientConfig): Promise<{
+    headers: Record<string, string>;
+    query: Record<string, string>;
+}> {
+    const headers: Record<string, string> = {};
+    const query: Record<string, string> = {};
+    const cookies: string[] = [];
+    for (const scheme of schemes) {
+        switch (scheme) {
+            case "OAuth2": {
+                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
+                if (v !== null)
+                    headers["Authorization"] = `Bearer ${v}`;
+                break;
+            }
+            case "ApiKey": {
+                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
+                if (v !== null)
+                    headers["X-API-Key"] = v;
+                break;
+            }
+        }
+    }
+    if (cookies.length > 0)
+        headers["Cookie"] = cookies.join("; ");
+    return { headers, query };
+}
+
+export type ListMenuItemsResult = MenuItemList;
+
+export type ListMenuItemsParams = {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+};
+
+export type ListMenuItemsVariables = {
+    params?: ListMenuItemsParams;
+};
+
+/**
+ * List all menu items
+ *
+ * Retrieve a collection of menu items with optional filtering and pagination.
+ */
+export async function listMenuItems(params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
+    return __request<MenuItemList>(__config, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
+}
+
+export type CreateMenuItemResult = MenuItem;
+
+export type CreateMenuItemBody = FormData;
+
+export type CreateMenuItemVariables = {
+    body: CreateMenuItemBody;
+};
+
+/**
+ * Create menu item
+ *
+ * Create a new menu item.
+ */
+export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<MenuItem>(__config, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type DeleteMenuItemResult = void;
+
+export type DeleteMenuItemVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+};
+
+/**
+ * Delete a menu item
+ *
+ * Delete an existing menu item.
+ */
+export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type GetMenuItemPhotoResult = Blob | string;
+
+export type GetMenuItemPhotoParams = {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+};
+
+export type GetMenuItemPhotoVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+    params?: GetMenuItemPhotoParams;
+};
+
+/**
+ * Retrieve a menu item photo
+ *
+ * Retrieve the product photo image for a specific menu item.
+ */
+export async function getMenuItemPhoto(menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}): Promise<Blob | string> {
+    return __request<Blob | string>(__config, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+}
+
+export type ListOrdersResult = OrderList;
+
+export type ListOrdersParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+};
+
+export type ListOrdersVariables = {
+    params?: ListOrdersParams;
+};
+
+/**
+ * List all orders
+ *
+ * Retrieve a collection of orders with optional filtering and pagination.
+ */
+export async function listOrders(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderList> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderList>(__config, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+/**
+ * Create order
+ *
+ * Create a new order.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    headers?: GetOrderByIdHeaders;
+};
+
+/**
+ * Retrieve an order
+ *
+ * Retrieve a single order by its ID.
+ */
+export async function getOrderById(orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+}
+
+export type DeleteOrderResult = void;
+
+export type DeleteOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+};
+
+/**
+ * Delete an order
+ *
+ * Delete the order.
+ * To keep the order history, the order should be canceled instead of deleted.
+ */
+export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type UpdateOrderResult = Order;
+
+export type UpdateOrderBody = {
+    status: OrderStatus;
+};
+
+export type UpdateOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    body?: UpdateOrderBody;
+};
+
+/**
+ * Partially update an order
+ *
+ * Update an existing order status.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function updateOrder(orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type ListOrderItemsResult = OrderItem[];
+
+export type ListOrderItemsParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+};
+
+export type ListOrderItemsVariables = {
+    params?: ListOrderItemsParams;
+};
+
+/**
+ * List all order items with menu item details
+ *
+ * Returns an array of order items for a specific order.
+ * Use the `filter` parameter to filter by order ID.
+ */
+export async function listOrderItems(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderItem[]>(__config, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+/**
+ * Get revenue statistics
+ *
+ * Retrieve revenue statistics for a configurable date range.
+ * Returns revenue, order counts, average order amount, and other useful statistics.
+ */
+export async function getRevenue(params: {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
+    const __a = await __auth(["ApiKey"], __config);
+    return __request<RevenueStatistics>(__config, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Create OAuth2 client
+ *
+ * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+ * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
+ *   `redirectUris` must be provided (per RFC 7591 Section 2).
+ * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+ * Returns the registered client information per RFC 7591, including:
+ * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+ */
+export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
+    return __request<OAuth2Client>(__config, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+}
diff --git a/packages/openapi-typescript/examples/fetch-functions/src/main.ts b/packages/openapi-typescript/examples/fetch-functions/src/main.ts
new file mode 100644
index 0000000000..20a63e7543
--- /dev/null
+++ b/packages/openapi-typescript/examples/fetch-functions/src/main.ts
@@ -0,0 +1,28 @@
+import { configure, use, listMenuItems, ApiError } from './api/client';
+
+configure({ baseUrl: 'https://cafe.cloud.redocly.com' });
+
+// Middleware composes cross-cutting concerns (tracing, auth refresh, logging, …).
+// `onRequest` runs in registration order, `onResponse` in reverse (onion). Register
+// as many as you like with `use()`; the service-class facade uses `client.use()`.
+use({
+  onRequest: (ctx) => {
+    ctx.headers['X-Request-Id'] = crypto.randomUUID();
+  },
+});
+
+const out = document.querySelector<HTMLPreElement>('#out')!;
+
+async function main() {
+  try {
+    const items = await listMenuItems();
+    out.textContent = JSON.stringify(items, null, 2);
+  } catch (error) {
+    out.textContent =
+      error instanceof ApiError
+        ? `ApiError ${error.status}: ${error.statusText}`
+        : `Unexpected error: ${String(error)}`;
+  }
+}
+
+void main();
diff --git a/packages/openapi-typescript/examples/fetch-functions/tsconfig.json b/packages/openapi-typescript/examples/fetch-functions/tsconfig.json
new file mode 100644
index 0000000000..4bd6962d40
--- /dev/null
+++ b/packages/openapi-typescript/examples/fetch-functions/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../tsconfig.base.json",
+  "include": ["src"]
+}
diff --git a/packages/openapi-typescript/examples/fetch-functions/vite.config.ts b/packages/openapi-typescript/examples/fetch-functions/vite.config.ts
new file mode 100644
index 0000000000..c049f46e10
--- /dev/null
+++ b/packages/openapi-typescript/examples/fetch-functions/vite.config.ts
@@ -0,0 +1,3 @@
+import { defineConfig } from 'vite';
+
+export default defineConfig({});
diff --git a/packages/openapi-typescript/examples/mock/.gitignore b/packages/openapi-typescript/examples/mock/.gitignore
new file mode 100644
index 0000000000..f06235c460
--- /dev/null
+++ b/packages/openapi-typescript/examples/mock/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+dist
diff --git a/packages/openapi-typescript/examples/mock/README.md b/packages/openapi-typescript/examples/mock/README.md
new file mode 100644
index 0000000000..b1156369e7
--- /dev/null
+++ b/packages/openapi-typescript/examples/mock/README.md
@@ -0,0 +1,16 @@
+# mock example
+
+Generated TypeScript client plus **MSW** mocks (`generators: ['sdk', 'mock']`). The app starts an MSW
+browser worker from the generated `handlers`, then calls the sdk — requests are served by the mocks, no
+real backend required.
+
+## Run
+
+```bash
+npm install
+npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
+npm run dev        # open the printed local URL
+```
+
+The generated client + MSW mocks under `src/api/` are committed and drift-checked against the
+generator in CI.
diff --git a/packages/openapi-typescript/examples/mock/index.html b/packages/openapi-typescript/examples/mock/index.html
new file mode 100644
index 0000000000..d1621f420e
--- /dev/null
+++ b/packages/openapi-typescript/examples/mock/index.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>Redocly openapi-typescript — zod example</title>
+  </head>
+  <body>
+    <pre id="out">Loading…</pre>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
diff --git a/packages/openapi-typescript/examples/mock/openapi.yaml b/packages/openapi-typescript/examples/mock/openapi.yaml
new file mode 100644
index 0000000000..a6a75dffd0
--- /dev/null
+++ b/packages/openapi-typescript/examples/mock/openapi.yaml
@@ -0,0 +1,1163 @@
+openapi: 3.2.0
+info:
+  title: Redocly Cafe
+  description: |
+    Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+    Create API credentials and try it yourself in a realistic OpenAPI workflow.
+  version: 1.0.0
+  contact:
+    email: team@redocly.com
+    url: https://redocly.com/contact-us/
+  license:
+    name: MIT
+    url: https://opensource.org/licenses/MIT
+  termsOfService: https://redocly.com/subscription-agreement
+servers:
+  - url: https://cafe.cloud.redocly.com
+    description: Live server.
+tags:
+  - name: Authorization
+    description: Create a client to demo the API.
+  - name: Products
+    description: Operations related to products.
+  - name: Orders
+    description: Order management operations.
+  - name: Statistics
+    description: Statistics operations.
+paths:
+  /menu:
+    get:
+      tags:
+        - Products
+      summary: List all menu items
+      description: Retrieve a collection of menu items with optional filtering and pagination.
+      operationId: listMenuItems
+      security: []
+      parameters:
+        - $ref: '#/components/parameters/After'
+        - $ref: '#/components/parameters/Before'
+        - $ref: '#/components/parameters/Sort'
+        - $ref: '#/components/parameters/Filter'
+        - $ref: '#/components/parameters/Search'
+        - $ref: '#/components/parameters/Limit'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItemList'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    post:
+      tags:
+        - Products
+      summary: Create menu item
+      description: Create a new menu item.
+      operationId: createMenuItem
+      security:
+        - OAuth2:
+            - menu:write
+      requestBody:
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              $ref: '#/components/schemas/MenuItem'
+      responses:
+        '201':
+          description: Menu item created successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItem'
+              examples:
+                MenuItemResponse:
+                  value:
+                    id: prd_01khr487f7qm7p44xn427m43vb
+                    object: menuItem
+                    name: coffee
+                    price: 4000
+                    category: beverage
+                    createdAt: '2026-02-18T10:20:38.228Z'
+                    updatedAt: '2026-02-18T10:20:38.228Z'
+                    volume: 600
+                    containsCaffeine: false
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '409':
+          $ref: '#/components/responses/Conflict'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /menu/{menuItemId}:
+    parameters:
+      - $ref: '#/components/parameters/MenuItemId'
+    delete:
+      tags:
+        - Products
+      summary: Delete a menu item
+      description: Delete an existing menu item.
+      operationId: deleteMenuItem
+      security:
+        - OAuth2:
+            - menu:write
+      responses:
+        '204':
+          description: Menu item deleted successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /menu-item-images/{menuItemId}:
+    parameters:
+      - $ref: '#/components/parameters/MenuItemId'
+    get:
+      operationId: getMenuItemPhoto
+      summary: Retrieve a menu item photo
+      description: Retrieve the product photo image for a specific menu item.
+      security: []
+      tags:
+        - Products
+      parameters:
+        - $ref: '#/components/parameters/PhotoSize'
+      responses:
+        '200':
+          description: Menu item photo retrieved successfully.
+          content:
+            image/png:
+              schema:
+                type: string
+                format: binary
+            text/plain:
+              schema:
+                description: Alternative image text.
+                type: string
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /orders:
+    get:
+      tags:
+        - Orders
+      summary: List all orders
+      description: Retrieve a collection of orders with optional filtering and pagination.
+      operationId: listOrders
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/Filter'
+        - $ref: '#/components/parameters/Sort'
+        - $ref: '#/components/parameters/Limit'
+        - $ref: '#/components/parameters/After'
+        - $ref: '#/components/parameters/Before'
+        - $ref: '#/components/parameters/Search'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OrderList'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    post:
+      tags:
+        - Orders
+      summary: Create order
+      description: |
+        Create a new order.
+        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+      operationId: createOrder
+      security:
+        - OAuth2:
+            - orders:write
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Order'
+            examples:
+              OrderRequest:
+                dataValue:
+                  customerName: Mary Ann
+                  orderItems:
+                    - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                      quantity: 2
+                      comment: No sugar!
+                      discount: 0
+      responses:
+        '201':
+          description: Order placed successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: placed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /orders/{orderId}:
+    get:
+      tags:
+        - Orders
+      summary: Retrieve an order
+      description: Retrieve a single order by its ID.
+      operationId: getOrderById
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+        - name: X-Request-Id
+          in: header
+          required: false
+          description: |
+            Optional client-supplied correlation ID, echoed in logs and traces.
+          schema:
+            type: string
+            format: uuid
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: placed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    patch:
+      tags:
+        - Orders
+      summary: Partially update an order
+      description: |
+        Update an existing order status.
+        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+      operationId: updateOrder
+      security:
+        - OAuth2:
+            - orders:write
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              description: |
+                Partial order update using JSON Merge Patch - only include fields to update.
+              properties:
+                status:
+                  $ref: '#/components/schemas/OrderStatus'
+              required:
+                - status
+      responses:
+        '200':
+          description: Order updated successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: completed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    delete:
+      tags:
+        - Orders
+      summary: Delete an order
+      description: |
+        Delete the order.
+        To keep the order history, the order should be canceled instead of deleted.
+      operationId: deleteOrder
+      security:
+        - OAuth2:
+            - orders:write
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+      responses:
+        '204':
+          description: Order deleted successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /order-items:
+    get:
+      tags:
+        - Orders
+      summary: List all order items with menu item details
+      description: |
+        Returns an array of order items for a specific order.
+        Use the `filter` parameter to filter by order ID.
+      operationId: listOrderItems
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/Filter'
+          required: true
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                type: array
+                description: List of menu items that are part of the order.
+                items:
+                  $ref: '#/components/schemas/OrderItem'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /revenue:
+    get:
+      tags:
+        - Statistics
+      summary: Get revenue statistics
+      description: |
+        Retrieve revenue statistics for a configurable date range.
+        Returns revenue, order counts, average order amount, and other useful statistics.
+      operationId: getRevenue
+      security:
+        - ApiKey: []
+      parameters:
+        - name: startDate
+          in: query
+          required: false
+          description: |
+            Start date for the revenue calculation period (ISO 8601 datetime format).
+            Defaults to 30 days ago if not provided.
+          schema:
+            type: string
+            format: date
+          example: '2026-01-01'
+        - name: endDate
+          in: query
+          required: false
+          description: |
+            End date for the revenue calculation period (ISO 8601 datetime format).
+            Defaults to current time if not provided.
+          schema:
+            type: string
+            format: date
+          example: '2026-01-31'
+      responses:
+        '200':
+          description: Revenue statistics retrieved successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RevenueStatistics'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /oauth2/register:
+    post:
+      tags:
+        - Authorization
+      summary: Create OAuth2 client
+      description: |
+        Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+        - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type, 
+          `redirectUris` must be provided (per RFC 7591 Section 2).
+        - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+        Returns the registered client information per RFC 7591, including:
+        - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+      operationId: registerOAuth2Client
+      security: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/RegisterClientObject'
+      responses:
+        '201':
+          description: OAuth2 client registered successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OAuth2Client'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+webhooks:
+  order-notification:
+    post:
+      tags:
+        - Orders
+      operationId: orderNotificationWebhook
+      security: []
+      summary: Order notification webhook
+      description: Webhook triggered when a new order is placed.
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/OrderNotification'
+      responses:
+        '200':
+          description: Webhook received successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+components:
+  securitySchemes:
+    OAuth2:
+      type: oauth2
+      description: OAuth2 authorization for API access.
+      flows:
+        authorizationCode:
+          authorizationUrl: https://cafe.cloud.redocly.com/oauth2/authorize
+          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          scopes:
+            menu:read: Read access to menu items and images
+            menu:write: Write access to menu items (create, delete)
+            orders:read: Read access to orders
+            orders:write: Write access to orders (create, update, delete)
+        clientCredentials:
+          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          scopes:
+            menu:read: Read access to menu items and images
+            menu:write: Write access to menu items (create, delete)
+            orders:read: Read access to orders
+            orders:write: Write access to orders (create, update, delete)
+    ApiKey:
+      type: apiKey
+      name: X-API-Key
+      in: header
+      description: API key for internal operations.
+  parameters:
+    After:
+      name: after
+      in: query
+      required: false
+      description: Use the `endCursor` as a value for the `after` parameter to get the next page.
+      schema:
+        type: string
+      example: a25fgaksjf23la==
+    Before:
+      name: before
+      in: query
+      required: false
+      description: |
+        Use the `startCursor` as a value for the `before` parameter to get the next page.
+      schema:
+        type: string
+      example: bfg23aksjf23zb1==
+    Sort:
+      name: sort
+      description: |-
+        To sort by id in descending order use `-id`.
+        To sort by id in ascending order use `id`.
+      in: query
+      required: false
+      schema:
+        type: string
+      example: '-name'
+    Filter:
+      name: filter
+      description: |-
+        Filters the collection items using space-separated `field:value` pairs.
+
+        **Format:** `field1:value1 field2:value2`
+
+        **Supported operators:**
+        - `field:value` - Exact match
+        - `field:value1,value2` - Match any of the comma-separated values (OR)
+        - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+
+        **Examples:**
+        - `status:placed` - Filter by single status.
+        - `status:placed,completed` - Filter by multiple statuses.
+        - `createdAt:30d` - Filter orders created in the last 30 days.
+        - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+        - `status:placed createdAt:7d` - Combine multiple filters.
+      in: query
+      required: false
+      schema:
+        type: string
+      example: orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7
+    Search:
+      name: search
+      in: query
+      description: |-
+        Performs a case-insensitive text search across relevant fields in the collection.
+
+        **Fields searched depend on the endpoint:**
+        - **Menu items:** `name`, `photoTextDescription`
+        - **Orders:** `customerName`, `id`
+
+        Returns items where any of the searchable fields contain the search term as a substring.
+      required: false
+      schema:
+        type: string
+      example: coffee
+    Limit:
+      name: limit
+      description: |
+        Use to return a number of results per page.
+        If there is more data, use in combination with `after` to page through the data.
+      in: query
+      required: false
+      schema:
+        type: integer
+        minimum: 1
+        maximum: 100
+        default: 10
+      example: 10
+    MenuItemId:
+      name: menuItemId
+      in: path
+      description: ID of the menu item to retrieve.
+      required: true
+      schema:
+        type: string
+        pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+      example: prd_01h1s5z6vf2mm1mz3hevnn9va7
+    PhotoSize:
+      name: photoSize
+      in: query
+      description: Photo size to retrieve.
+      required: false
+      schema:
+        type: string
+        enum:
+          - thumbnail
+          - medium
+          - large
+        default: medium
+    OrderId:
+      name: orderId
+      in: path
+      description: ID of the order to retrieve.
+      required: true
+      schema:
+        type: string
+        pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+      example: ord_01h1s5z6vf2mm1mz3hevnn9va7
+  schemas:
+    Page:
+      type: object
+      properties:
+        endCursor:
+          type:
+            - string
+            - 'null'
+          description: |-
+            Use with the `after` query parameter to load the next page of data.
+            When `null`, there is no data.
+            The cursor is opaque and internal structure is subject to change.
+        startCursor:
+          type:
+            - string
+            - 'null'
+          description: |-
+            Use with the `before` query parameter to load the previous page of data.
+            When `null`, there is no data.
+            The cursor is opaque and internal structure is subject to change.
+        hasNextPage:
+          type: boolean
+          description: Indicates if there is a next page with items.
+        hasPrevPage:
+          type: boolean
+          description: Indicates if there is a previous page with items.
+        limit:
+          type: integer
+          minimum: 1
+          maximum: 100
+          default: 10
+          description: Value showing how many items are in the page limit.
+        total:
+          type: integer
+          description: Count of items across all pages.
+          minimum: 0
+      required:
+        - endCursor
+        - startCursor
+        - hasNextPage
+        - hasPrevPage
+        - limit
+        - total
+    MenuBaseItem:
+      type: object
+      properties:
+        createdAt:
+          description: Created date.
+          type: string
+          format: date-time
+          readOnly: true
+        updatedAt:
+          description: Updated date.
+          type: string
+          format: date-time
+          readOnly: true
+        id:
+          description: Menu item ID. Unique identifier prefixed with `prd_`.
+          type: string
+          readOnly: true
+          pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+          example: prd_01h1s5z6vf2mm1mz3hevnn9va7
+        object:
+          description: Entity name.
+          type: string
+          const: menuItem
+          readOnly: true
+        name:
+          description: Menu item name.
+          type: string
+          minLength: 1
+          maxLength: 50
+        price:
+          description: Price in cents.
+          type: integer
+          minimum: 0
+        photo:
+          writeOnly: true
+          type:
+            - string
+            - 'null'
+          format: binary
+          description: Photo of the menu item. Must be a PNG image and less than 1MB.
+        photoUrl:
+          readOnly: true
+          type: string
+          format: uri
+          description: Photo URL of the menu item.
+        photoTextDescription:
+          type:
+            - string
+            - 'null'
+      required:
+        - id
+        - name
+        - price
+        - createdAt
+        - updatedAt
+        - object
+    Beverage:
+      allOf:
+        - type: object
+          properties:
+            category:
+              description: Menu item category.
+              type: string
+              const: beverage
+            volume:
+              type: number
+              description: Size of the beverage in milliliters.
+              exclusiveMinimum: 0
+            containsCaffeine:
+              type: boolean
+              description: Indicates if the beverage contains caffeine.
+          required:
+            - category
+            - volume
+            - containsCaffeine
+        - $ref: '#/components/schemas/MenuBaseItem'
+    Dessert:
+      allOf:
+        - type: object
+          properties:
+            category:
+              description: Menu item category.
+              type: string
+              const: dessert
+            calories:
+              type: number
+              exclusiveMinimum: 0
+              description: Amount of calories.
+          required:
+            - category
+            - calories
+        - $ref: '#/components/schemas/MenuBaseItem'
+    MenuItem:
+      discriminator:
+        propertyName: category
+        mapping:
+          beverage: '#/components/schemas/Beverage'
+          dessert: '#/components/schemas/Dessert'
+      oneOf:
+        - $ref: '#/components/schemas/Beverage'
+        - $ref: '#/components/schemas/Dessert'
+      required:
+        - category
+    MenuItemList:
+      type: object
+      properties:
+        object:
+          type: string
+          const: list
+          description: Entity name.
+        page:
+          $ref: '#/components/schemas/Page'
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/MenuItem'
+      required:
+        - object
+        - page
+        - items
+    Error:
+      type: object
+      properties:
+        type:
+          type: string
+          format: uri-reference
+          description: URI reference that identifies the problem type.
+          default: about:blank
+        title:
+          type: string
+          description: Short summary of the problem type.
+        status:
+          type: integer
+          format: int32
+          description: |
+            HTTP status code generated by the origin server for this occurrence of the problem.
+          minimum: 100
+          exclusiveMaximum: 600
+        instance:
+          type: string
+          format: uri-reference
+          description: |
+            URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+            May be used to locate the root of this problem in the source code.
+          example: /some/uri-reference#specific-occurrence-context
+        details:
+          description: Additional error details.
+          type: object
+          additionalProperties: true
+      required:
+        - type
+        - title
+        - status
+    OrderStatus:
+      type: string
+      description: Order status.
+      enum:
+        - placed
+        - preparing
+        - completed
+        - canceled
+    Order:
+      type: object
+      title: Order
+      properties:
+        id:
+          description: Order ID. Unique identifier prefixed with `ord_`.
+          type: string
+          format: ulid
+          readOnly: true
+          pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+          example: ord_01h1s5z6vf2mm1mz3hevnn9va7
+        object:
+          description: Entity name.
+          type: string
+          const: order
+          readOnly: true
+        customerName:
+          description: |
+            Name of the customer who placed the order.
+            Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+          type: string
+          pattern: ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+          minLength: 1
+          maxLength: 100
+        status:
+          allOf:
+            - $ref: '#/components/schemas/OrderStatus'
+          readOnly: true
+        totalPrice:
+          description: Total order price in cents.
+          type: integer
+          minimum: 0
+          readOnly: true
+        createdAt:
+          description: Created date.
+          type: string
+          format: date-time
+          readOnly: true
+        updatedAt:
+          description: Updated date.
+          type: string
+          format: date-time
+          readOnly: true
+        orderItems:
+          type: array
+          description: List of items to include in the order.
+          minItems: 1
+          items:
+            type: object
+            properties:
+              menuItemId:
+                type: string
+                format: ulid
+                description: ID of the menu item to add to the order.
+              quantity:
+                type: integer
+                minimum: 1
+                description: Quantity of the menu item.
+              discount:
+                type: integer
+                minimum: 0
+                description: Discount amount in cents (absolute value).
+                default: 0
+              comment:
+                type: string
+                maxLength: 500
+                description: Optional comment for the order item (e.g., "No sugar").
+            required:
+              - menuItemId
+              - quantity
+      required:
+        - customerName
+        - orderItems
+    OrderList:
+      type: object
+      properties:
+        object:
+          type: string
+          const: list
+          description: Entity name.
+        page:
+          $ref: '#/components/schemas/Page'
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/Order'
+      required:
+        - object
+        - page
+        - items
+    OrderItem:
+      type: object
+      properties:
+        menuItemId:
+          type: string
+          description: ID of the menu item to add to the order.
+          writeOnly: true
+        menuItem:
+          allOf:
+            - $ref: '#/components/schemas/MenuItem'
+          description: Menu item that is part of the order.
+          readOnly: true
+        quantity:
+          type: integer
+          minimum: 1
+          description: Quantity of the menu item.
+        discount:
+          type: integer
+          minimum: 0
+          description: Discount amount in cents (absolute value).
+          default: 0
+        comment:
+          type: string
+          maxLength: 500
+          description: Optional comment for the order item (e.g., "No sugar").
+      required:
+        - menuItemId
+        - quantity
+    RevenueStatistics:
+      type: object
+      description: Revenue statistics for a given date range.
+      properties:
+        revenue:
+          type: number
+          format: float
+          description: Total revenue in cents from completed orders.
+          minimum: 0
+        averageOrderAmount:
+          type: number
+          format: float
+          description: Average order amount in cents (calculated from completed orders only).
+          minimum: 0
+        totalOrders:
+          type: integer
+          description: Total number of orders (all statuses) in the date range.
+          minimum: 0
+        placedOrders:
+          type: integer
+          description: Number of placed orders.
+          minimum: 0
+        preparingOrders:
+          type: integer
+          description: Number of preparing orders.
+          minimum: 0
+        completedOrders:
+          type: integer
+          description: Number of completed orders.
+          minimum: 0
+        canceledOrders:
+          type: integer
+          description: Number of canceled orders.
+          minimum: 0
+        startDate:
+          type: string
+          format: date
+          description: Start date of the revenue calculation period.
+        endDate:
+          type: string
+          format: date
+          description: End date of the revenue calculation period.
+      required:
+        - revenue
+        - averageOrderAmount
+        - totalOrders
+        - placedOrders
+        - preparingOrders
+        - completedOrders
+        - canceledOrders
+        - startDate
+        - endDate
+    RegisterClientObject:
+      type: object
+      properties:
+        name:
+          type: string
+          description: Client name.
+        redirectUris:
+          type: array
+          items:
+            type: string
+            format: uri
+          description: List of redirect URIs (optional, defaults to empty array).
+        scopes:
+          type: array
+          items:
+            type: string
+            enum:
+              - menu:read
+              - menu:write
+              - orders:read
+              - orders:write
+          description: List of scopes.
+        grantTypes:
+          type: array
+          items:
+            type: string
+            enum:
+              - authorization_code
+              - client_credentials
+          description: List of grant types.
+      required:
+        - name
+    OAuth2Client:
+      type: object
+      description: OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+      properties:
+        clientId:
+          type: string
+          description: Client identifier issued by the authorization server.
+        clientSecret:
+          type: string
+          description: Client secret issued by the authorization server.
+        clientIdIssuedAt:
+          type: integer
+          format: int64
+          description: Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+        clientSecretExpiresAt:
+          type: integer
+          format: int64
+          description: Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+        name:
+          type: string
+          description: Client name (registered metadata).
+        redirectUris:
+          type: array
+          items:
+            type: string
+            format: uri
+          description: List of redirect URIs (registered metadata).
+        registrationClientUri:
+          type: string
+          format: uri
+          description: URL of the client configuration endpoint for managing this client registration (RFC 7592).
+        registrationAccessToken:
+          type: string
+          description: Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+        scopes:
+          type: array
+          items:
+            type: string
+            enum:
+              - menu:read
+              - menu:write
+              - orders:read
+              - orders:write
+          description: List of scopes (registered metadata).
+        grantTypes:
+          type: array
+          items:
+            type: string
+            enum:
+              - authorization_code
+              - client_credentials
+          description: List of grant types (registered metadata).
+      required:
+        - clientId
+        - clientSecret
+        - clientIdIssuedAt
+        - clientSecretExpiresAt
+        - registrationClientUri
+        - registrationAccessToken
+    OrderNotification:
+      type: object
+      required:
+        - orderId
+        - orderStatus
+        - timestamp
+      properties:
+        orderId:
+          type: string
+          description: Unique order identifier.
+        orderStatus:
+          $ref: '#/components/schemas/OrderStatus'
+        timestamp:
+          type: string
+          format: date-time
+          description: When the event occurred.
+  responses:
+    BadRequest:
+      description: Bad request - invalid input parameters.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    InternalServerError:
+      description: Internal server error.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Unauthorized:
+      description: Unauthorized - authorization required.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Forbidden:
+      description: Forbidden - insufficient permissions.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Conflict:
+      description: Conflict - entity already exists.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    NotFound:
+      description: Resource not found.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
diff --git a/packages/openapi-typescript/examples/mock/package.json b/packages/openapi-typescript/examples/mock/package.json
new file mode 100644
index 0000000000..2f4d39860e
--- /dev/null
+++ b/packages/openapi-typescript/examples/mock/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "@redocly-examples/mock",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "generate": "redocly generate-client",
+    "dev": "vite",
+    "build": "vite build"
+  },
+  "devDependencies": {
+    "@redocly/cli": "latest",
+    "msw": "^2.0.0",
+    "typescript": "^5.5.0",
+    "vite": "^5.4.0"
+  },
+  "msw": {
+    "workerDirectory": [
+      "public"
+    ]
+  }
+}
diff --git a/packages/openapi-typescript/examples/mock/public/mockServiceWorker.js b/packages/openapi-typescript/examples/mock/public/mockServiceWorker.js
new file mode 100644
index 0000000000..06fe839147
--- /dev/null
+++ b/packages/openapi-typescript/examples/mock/public/mockServiceWorker.js
@@ -0,0 +1,336 @@
+/* eslint-disable */
+/* tslint:disable */
+
+/**
+ * Mock Service Worker.
+ * @see https://github.com/mswjs/msw
+ * - Please do NOT modify this file.
+ */
+
+const PACKAGE_VERSION = '2.14.6';
+const INTEGRITY_CHECKSUM = '4db4a41e972cec1b64cc569c66952d82';
+const IS_MOCKED_RESPONSE = Symbol('isMockedResponse');
+const activeClientIds = new Set();
+
+addEventListener('install', function () {
+  self.skipWaiting();
+});
+
+addEventListener('activate', function (event) {
+  event.waitUntil(self.clients.claim());
+});
+
+addEventListener('message', async function (event) {
+  const clientId = Reflect.get(event.source || {}, 'id');
+
+  if (!clientId || !self.clients) {
+    return;
+  }
+
+  const client = await self.clients.get(clientId);
+
+  if (!client) {
+    return;
+  }
+
+  const allClients = await self.clients.matchAll({
+    type: 'window',
+  });
+
+  switch (event.data) {
+    case 'KEEPALIVE_REQUEST': {
+      sendToClient(client, {
+        type: 'KEEPALIVE_RESPONSE',
+      });
+      break;
+    }
+
+    case 'INTEGRITY_CHECK_REQUEST': {
+      sendToClient(client, {
+        type: 'INTEGRITY_CHECK_RESPONSE',
+        payload: {
+          packageVersion: PACKAGE_VERSION,
+          checksum: INTEGRITY_CHECKSUM,
+        },
+      });
+      break;
+    }
+
+    case 'MOCK_ACTIVATE': {
+      activeClientIds.add(clientId);
+
+      sendToClient(client, {
+        type: 'MOCKING_ENABLED',
+        payload: {
+          client: {
+            id: client.id,
+            frameType: client.frameType,
+          },
+        },
+      });
+      break;
+    }
+
+    case 'CLIENT_CLOSED': {
+      activeClientIds.delete(clientId);
+
+      const remainingClients = allClients.filter((client) => {
+        return client.id !== clientId;
+      });
+
+      // Unregister itself when there are no more clients
+      if (remainingClients.length === 0) {
+        self.registration.unregister();
+      }
+
+      break;
+    }
+  }
+});
+
+addEventListener('fetch', function (event) {
+  const requestInterceptedAt = Date.now();
+
+  // Bypass navigation requests.
+  if (event.request.mode === 'navigate') {
+    return;
+  }
+
+  // Opening the DevTools triggers the "only-if-cached" request
+  // that cannot be handled by the worker. Bypass such requests.
+  if (event.request.cache === 'only-if-cached' && event.request.mode !== 'same-origin') {
+    return;
+  }
+
+  // Bypass all requests when there are no active clients.
+  // Prevents the self-unregistered worked from handling requests
+  // after it's been terminated (still remains active until the next reload).
+  if (activeClientIds.size === 0) {
+    return;
+  }
+
+  const requestId = crypto.randomUUID();
+  event.respondWith(handleRequest(event, requestId, requestInterceptedAt));
+});
+
+/**
+ * @param {FetchEvent} event
+ * @param {string} requestId
+ * @param {number} requestInterceptedAt
+ */
+async function handleRequest(event, requestId, requestInterceptedAt) {
+  const client = await resolveMainClient(event);
+  const requestCloneForEvents = event.request.clone();
+  const response = await getResponse(event, client, requestId, requestInterceptedAt);
+
+  // Send back the response clone for the "response:*" life-cycle events.
+  // Ensure MSW is active and ready to handle the message, otherwise
+  // this message will pend indefinitely.
+  if (client && activeClientIds.has(client.id)) {
+    const serializedRequest = await serializeRequest(requestCloneForEvents);
+
+    // Clone the response so both the client and the library could consume it.
+    const responseClone = response.clone();
+
+    sendToClient(
+      client,
+      {
+        type: 'RESPONSE',
+        payload: {
+          isMockedResponse: IS_MOCKED_RESPONSE in response,
+          request: {
+            id: requestId,
+            ...serializedRequest,
+          },
+          response: {
+            type: responseClone.type,
+            status: responseClone.status,
+            statusText: responseClone.statusText,
+            headers: Object.fromEntries(responseClone.headers.entries()),
+            body: responseClone.body,
+          },
+        },
+      },
+      responseClone.body ? [serializedRequest.body, responseClone.body] : []
+    );
+  }
+
+  return response;
+}
+
+/**
+ * Resolve the main client for the given event.
+ * Client that issues a request doesn't necessarily equal the client
+ * that registered the worker. It's with the latter the worker should
+ * communicate with during the response resolving phase.
+ * @param {FetchEvent} event
+ * @returns {Promise<Client | undefined>}
+ */
+async function resolveMainClient(event) {
+  const client = await self.clients.get(event.clientId);
+
+  if (activeClientIds.has(event.clientId)) {
+    return client;
+  }
+
+  if (client?.frameType === 'top-level') {
+    return client;
+  }
+
+  const allClients = await self.clients.matchAll({
+    type: 'window',
+  });
+
+  return allClients
+    .filter((client) => {
+      // Get only those clients that are currently visible.
+      return client.visibilityState === 'visible';
+    })
+    .find((client) => {
+      // Find the client ID that's recorded in the
+      // set of clients that have registered the worker.
+      return activeClientIds.has(client.id);
+    });
+}
+
+/**
+ * @param {FetchEvent} event
+ * @param {Client | undefined} client
+ * @param {string} requestId
+ * @param {number} requestInterceptedAt
+ * @returns {Promise<Response>}
+ */
+async function getResponse(event, client, requestId, requestInterceptedAt) {
+  // Clone the request because it might've been already used
+  // (i.e. its body has been read and sent to the client).
+  const requestClone = event.request.clone();
+
+  function passthrough() {
+    // Cast the request headers to a new Headers instance
+    // so the headers can be manipulated with.
+    const headers = new Headers(requestClone.headers);
+
+    // Remove the "accept" header value that marked this request as passthrough.
+    // This prevents request alteration and also keeps it compliant with the
+    // user-defined CORS policies.
+    const acceptHeader = headers.get('accept');
+    if (acceptHeader) {
+      const values = acceptHeader.split(',').map((value) => value.trim());
+      const filteredValues = values.filter((value) => value !== 'msw/passthrough');
+
+      if (filteredValues.length > 0) {
+        headers.set('accept', filteredValues.join(', '));
+      } else {
+        headers.delete('accept');
+      }
+    }
+
+    return fetch(requestClone, { headers });
+  }
+
+  // Bypass mocking when the client is not active.
+  if (!client) {
+    return passthrough();
+  }
+
+  // Bypass initial page load requests (i.e. static assets).
+  // The absence of the immediate/parent client in the map of the active clients
+  // means that MSW hasn't dispatched the "MOCK_ACTIVATE" event yet
+  // and is not ready to handle requests.
+  if (!activeClientIds.has(client.id)) {
+    return passthrough();
+  }
+
+  // Notify the client that a request has been intercepted.
+  const serializedRequest = await serializeRequest(event.request);
+  const clientMessage = await sendToClient(
+    client,
+    {
+      type: 'REQUEST',
+      payload: {
+        id: requestId,
+        interceptedAt: requestInterceptedAt,
+        ...serializedRequest,
+      },
+    },
+    [serializedRequest.body]
+  );
+
+  switch (clientMessage.type) {
+    case 'MOCK_RESPONSE': {
+      return respondWithMock(clientMessage.data);
+    }
+
+    case 'PASSTHROUGH': {
+      return passthrough();
+    }
+  }
+
+  return passthrough();
+}
+
+/**
+ * @param {Client} client
+ * @param {any} message
+ * @param {Array<Transferable>} transferrables
+ * @returns {Promise<any>}
+ */
+function sendToClient(client, message, transferrables = []) {
+  return new Promise((resolve, reject) => {
+    const channel = new MessageChannel();
+
+    channel.port1.onmessage = (event) => {
+      if (event.data && event.data.error) {
+        return reject(event.data.error);
+      }
+
+      resolve(event.data);
+    };
+
+    client.postMessage(message, [channel.port2, ...transferrables.filter(Boolean)]);
+  });
+}
+
+/**
+ * @param {Response} response
+ * @returns {Response}
+ */
+function respondWithMock(response) {
+  // Setting response status code to 0 is a no-op.
+  // However, when responding with a "Response.error()", the produced Response
+  // instance will have status code set to 0. Since it's not possible to create
+  // a Response instance with status code 0, handle that use-case separately.
+  if (response.status === 0) {
+    return Response.error();
+  }
+
+  const mockedResponse = new Response(response.body, response);
+
+  Reflect.defineProperty(mockedResponse, IS_MOCKED_RESPONSE, {
+    value: true,
+    enumerable: true,
+  });
+
+  return mockedResponse;
+}
+
+/**
+ * @param {Request} request
+ */
+async function serializeRequest(request) {
+  return {
+    url: request.url,
+    mode: request.mode,
+    method: request.method,
+    headers: Object.fromEntries(request.headers.entries()),
+    cache: request.cache,
+    credentials: request.credentials,
+    destination: request.destination,
+    integrity: request.integrity,
+    redirect: request.redirect,
+    referrer: request.referrer,
+    referrerPolicy: request.referrerPolicy,
+    body: await request.arrayBuffer(),
+    keepalive: request.keepalive,
+  };
+}
diff --git a/packages/openapi-typescript/examples/mock/redocly.yaml b/packages/openapi-typescript/examples/mock/redocly.yaml
new file mode 100644
index 0000000000..18f1fdc25f
--- /dev/null
+++ b/packages/openapi-typescript/examples/mock/redocly.yaml
@@ -0,0 +1,10 @@
+# redocly.yaml — drives `redocly generate-client` for this example.
+# generate-client settings live under the `x-openapi-typescript` extension for now
+# (first-class config support is planned in @redocly/config).
+x-openapi-typescript:
+  input: ./openapi.yaml
+  output: ./src/api/client.ts
+  generators:
+    - sdk
+    - mock
+  facade: functions
diff --git a/packages/openapi-typescript/examples/mock/src/api/client.mocks.ts b/packages/openapi-typescript/examples/mock/src/api/client.mocks.ts
new file mode 100644
index 0000000000..d304ac3db8
--- /dev/null
+++ b/packages/openapi-typescript/examples/mock/src/api/client.mocks.ts
@@ -0,0 +1,442 @@
+// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+import { http, HttpResponse } from 'msw';
+
+import type { Beverage, Dessert, Error, MenuBaseItem, MenuItem, MenuItemList, OAuth2Client, Order, OrderItem, OrderList, OrderNotification, OrderStatus, Page, RegisterClientObject, RevenueStatistics } from "./client.js";
+
+export function createPage(overrides?: Partial<Page>): Page {
+    return {
+        endCursor: "string",
+        startCursor: "string",
+        hasNextPage: true,
+        hasPrevPage: true,
+        limit: 10,
+        total: 0,
+        ...overrides
+    };
+}
+
+export function createMenuBaseItem(overrides?: Partial<MenuBaseItem>): MenuBaseItem {
+    return {
+        createdAt: "2024-01-01T00:00:00Z",
+        updatedAt: "2024-01-01T00:00:00Z",
+        id: "prd_01h1s5z6vf2mm1mz3hevnn9va7",
+        object: "menuItem",
+        name: "string",
+        price: 0,
+        photo: new Blob([]),
+        photoUrl: "https://example.com",
+        photoTextDescription: "string",
+        ...overrides
+    };
+}
+
+export function createBeverage(overrides?: Partial<Beverage>): Beverage {
+    return {
+        category: "beverage",
+        volume: 0,
+        containsCaffeine: true,
+        createdAt: "2024-01-01T00:00:00Z",
+        updatedAt: "2024-01-01T00:00:00Z",
+        id: "prd_01h1s5z6vf2mm1mz3hevnn9va7",
+        object: "menuItem",
+        name: "string",
+        price: 0,
+        photo: new Blob([]),
+        photoUrl: "https://example.com",
+        photoTextDescription: "string",
+        ...overrides
+    };
+}
+
+export function createDessert(overrides?: Partial<Dessert>): Dessert {
+    return {
+        category: "dessert",
+        calories: 0,
+        createdAt: "2024-01-01T00:00:00Z",
+        updatedAt: "2024-01-01T00:00:00Z",
+        id: "prd_01h1s5z6vf2mm1mz3hevnn9va7",
+        object: "menuItem",
+        name: "string",
+        price: 0,
+        photo: new Blob([]),
+        photoUrl: "https://example.com",
+        photoTextDescription: "string",
+        ...overrides
+    };
+}
+
+export function createMenuItem(overrides?: Partial<MenuItem>): MenuItem {
+    return {
+        category: "beverage",
+        volume: 0,
+        containsCaffeine: true,
+        createdAt: "2024-01-01T00:00:00Z",
+        updatedAt: "2024-01-01T00:00:00Z",
+        id: "prd_01h1s5z6vf2mm1mz3hevnn9va7",
+        object: "menuItem",
+        name: "string",
+        price: 0,
+        photo: new Blob([]),
+        photoUrl: "https://example.com",
+        photoTextDescription: "string",
+        ...overrides
+    } as MenuItem;
+}
+
+export function createMenuItemList(overrides?: Partial<MenuItemList>): MenuItemList {
+    return {
+        object: "list",
+        page: {
+            endCursor: "string",
+            startCursor: "string",
+            hasNextPage: true,
+            hasPrevPage: true,
+            limit: 10,
+            total: 0
+        },
+        items: [
+            {
+                category: "beverage",
+                volume: 0,
+                containsCaffeine: true,
+                createdAt: "2024-01-01T00:00:00Z",
+                updatedAt: "2024-01-01T00:00:00Z",
+                id: "prd_01h1s5z6vf2mm1mz3hevnn9va7",
+                object: "menuItem",
+                name: "string",
+                price: 0,
+                photo: new Blob([]),
+                photoUrl: "https://example.com",
+                photoTextDescription: "string"
+            }
+        ],
+        ...overrides
+    };
+}
+
+export function createError(overrides?: Partial<Error>): Error {
+    return {
+        type: "about:blank",
+        title: "string",
+        status: 0,
+        instance: "/some/uri-reference#specific-occurrence-context",
+        details: {
+            key: null
+        },
+        ...overrides
+    };
+}
+
+export function createOrderStatus(overrides?: Partial<OrderStatus>): OrderStatus {
+    return "placed";
+}
+
+export function createOrder(overrides?: Partial<Order>): Order {
+    return {
+        id: "ord_01h1s5z6vf2mm1mz3hevnn9va7",
+        object: "order",
+        customerName: "string",
+        status: "placed",
+        totalPrice: 0,
+        createdAt: "2024-01-01T00:00:00Z",
+        updatedAt: "2024-01-01T00:00:00Z",
+        orderItems: [
+            {
+                menuItemId: "string",
+                quantity: 0,
+                discount: 0,
+                comment: "string"
+            }
+        ],
+        ...overrides
+    };
+}
+
+export function createOrderList(overrides?: Partial<OrderList>): OrderList {
+    return {
+        object: "list",
+        page: {
+            endCursor: "string",
+            startCursor: "string",
+            hasNextPage: true,
+            hasPrevPage: true,
+            limit: 10,
+            total: 0
+        },
+        items: [
+            {
+                id: "ord_01h1s5z6vf2mm1mz3hevnn9va7",
+                object: "order",
+                customerName: "string",
+                status: "placed",
+                totalPrice: 0,
+                createdAt: "2024-01-01T00:00:00Z",
+                updatedAt: "2024-01-01T00:00:00Z",
+                orderItems: [
+                    {
+                        menuItemId: "string",
+                        quantity: 0,
+                        discount: 0,
+                        comment: "string"
+                    }
+                ]
+            }
+        ],
+        ...overrides
+    };
+}
+
+export function createOrderItem(overrides?: Partial<OrderItem>): OrderItem {
+    return {
+        menuItemId: "string",
+        menuItem: {
+            category: "beverage",
+            volume: 0,
+            containsCaffeine: true,
+            createdAt: "2024-01-01T00:00:00Z",
+            updatedAt: "2024-01-01T00:00:00Z",
+            id: "prd_01h1s5z6vf2mm1mz3hevnn9va7",
+            object: "menuItem",
+            name: "string",
+            price: 0,
+            photo: new Blob([]),
+            photoUrl: "https://example.com",
+            photoTextDescription: "string"
+        },
+        quantity: 0,
+        discount: 0,
+        comment: "string",
+        ...overrides
+    };
+}
+
+export function createRevenueStatistics(overrides?: Partial<RevenueStatistics>): RevenueStatistics {
+    return {
+        revenue: 0,
+        averageOrderAmount: 0,
+        totalOrders: 0,
+        placedOrders: 0,
+        preparingOrders: 0,
+        completedOrders: 0,
+        canceledOrders: 0,
+        startDate: "2024-01-01",
+        endDate: "2024-01-01",
+        ...overrides
+    };
+}
+
+export function createRegisterClientObject(overrides?: Partial<RegisterClientObject>): RegisterClientObject {
+    return {
+        name: "string",
+        redirectUris: [
+            "https://example.com"
+        ],
+        scopes: [
+            "menu:read"
+        ],
+        grantTypes: [
+            "authorization_code"
+        ],
+        ...overrides
+    };
+}
+
+export function createOAuth2Client(overrides?: Partial<OAuth2Client>): OAuth2Client {
+    return {
+        clientId: "string",
+        clientSecret: "string",
+        clientIdIssuedAt: 0,
+        clientSecretExpiresAt: 0,
+        name: "string",
+        redirectUris: [
+            "https://example.com"
+        ],
+        registrationClientUri: "https://example.com",
+        registrationAccessToken: "string",
+        scopes: [
+            "menu:read"
+        ],
+        grantTypes: [
+            "authorization_code"
+        ],
+        ...overrides
+    };
+}
+
+export function createOrderNotification(overrides?: Partial<OrderNotification>): OrderNotification {
+    return {
+        orderId: "string",
+        orderStatus: "placed",
+        timestamp: "2024-01-01T00:00:00Z",
+        ...overrides
+    };
+}
+
+export const listMenuItemsHandler = (override?: Partial<MenuItemList>) => http.get("*/menu", () => HttpResponse.json(createMenuItemList(override)));
+
+export const listMenuItemsErrorHandler = (status: 400 | 500, body?: Error) => http.get("*/menu", () => HttpResponse.json(body ?? {
+    type: "about:blank",
+    title: "string",
+    status: 0,
+    instance: "/some/uri-reference#specific-occurrence-context",
+    details: {
+        key: null
+    }
+}, { status }));
+
+export const createMenuItemHandler = (override?: Partial<MenuItem>) => http.post("*/menu", () => HttpResponse.json(createMenuItem(override), { status: 201 }));
+
+export const createMenuItemErrorHandler = (status: 400 | 401 | 403 | 409 | 500, body?: Error) => http.post("*/menu", () => HttpResponse.json(body ?? {
+    type: "about:blank",
+    title: "string",
+    status: 0,
+    instance: "/some/uri-reference#specific-occurrence-context",
+    details: {
+        key: null
+    }
+}, { status }));
+
+export const deleteMenuItemHandler = (override?: Record<string, unknown>) => http.delete("*/menu/:menuItemId", () => new HttpResponse(null, { status: 200 }));
+
+export const deleteMenuItemErrorHandler = (status: 400 | 401 | 403 | 404 | 500, body?: Error) => http.delete("*/menu/:menuItemId", () => HttpResponse.json(body ?? {
+    type: "about:blank",
+    title: "string",
+    status: 0,
+    instance: "/some/uri-reference#specific-occurrence-context",
+    details: {
+        key: null
+    }
+}, { status }));
+
+export const getMenuItemPhotoHandler = (override?: Record<string, unknown>) => http.get("*/menu-item-images/:menuItemId", () => HttpResponse.json(new Blob([])));
+
+export const getMenuItemPhotoErrorHandler = (status: 404 | 500, body?: Error) => http.get("*/menu-item-images/:menuItemId", () => HttpResponse.json(body ?? {
+    type: "about:blank",
+    title: "string",
+    status: 0,
+    instance: "/some/uri-reference#specific-occurrence-context",
+    details: {
+        key: null
+    }
+}, { status }));
+
+export const listOrdersHandler = (override?: Partial<OrderList>) => http.get("*/orders", () => HttpResponse.json(createOrderList(override)));
+
+export const listOrdersErrorHandler = (status: 400 | 401 | 403 | 500, body?: Error) => http.get("*/orders", () => HttpResponse.json(body ?? {
+    type: "about:blank",
+    title: "string",
+    status: 0,
+    instance: "/some/uri-reference#specific-occurrence-context",
+    details: {
+        key: null
+    }
+}, { status }));
+
+export const createOrderHandler = (override?: Partial<Order>) => http.post("*/orders", () => HttpResponse.json(createOrder(override), { status: 201 }));
+
+export const createOrderErrorHandler = (status: 400 | 401 | 403 | 500, body?: Error) => http.post("*/orders", () => HttpResponse.json(body ?? {
+    type: "about:blank",
+    title: "string",
+    status: 0,
+    instance: "/some/uri-reference#specific-occurrence-context",
+    details: {
+        key: null
+    }
+}, { status }));
+
+export const getOrderByIdHandler = (override?: Partial<Order>) => http.get("*/orders/:orderId", () => HttpResponse.json(createOrder(override)));
+
+export const getOrderByIdErrorHandler = (status: 400 | 401 | 403 | 404 | 500, body?: Error) => http.get("*/orders/:orderId", () => HttpResponse.json(body ?? {
+    type: "about:blank",
+    title: "string",
+    status: 0,
+    instance: "/some/uri-reference#specific-occurrence-context",
+    details: {
+        key: null
+    }
+}, { status }));
+
+export const deleteOrderHandler = (override?: Record<string, unknown>) => http.delete("*/orders/:orderId", () => new HttpResponse(null, { status: 200 }));
+
+export const deleteOrderErrorHandler = (status: 400 | 401 | 403 | 404 | 500, body?: Error) => http.delete("*/orders/:orderId", () => HttpResponse.json(body ?? {
+    type: "about:blank",
+    title: "string",
+    status: 0,
+    instance: "/some/uri-reference#specific-occurrence-context",
+    details: {
+        key: null
+    }
+}, { status }));
+
+export const updateOrderHandler = (override?: Partial<Order>) => http.patch("*/orders/:orderId", () => HttpResponse.json(createOrder(override)));
+
+export const updateOrderErrorHandler = (status: 400 | 401 | 403 | 404 | 500, body?: Error) => http.patch("*/orders/:orderId", () => HttpResponse.json(body ?? {
+    type: "about:blank",
+    title: "string",
+    status: 0,
+    instance: "/some/uri-reference#specific-occurrence-context",
+    details: {
+        key: null
+    }
+}, { status }));
+
+export const listOrderItemsHandler = (override?: Record<string, unknown>) => http.get("*/order-items", () => HttpResponse.json([
+    {
+        menuItemId: "string",
+        menuItem: {
+            category: "beverage",
+            volume: 0,
+            containsCaffeine: true,
+            createdAt: "2024-01-01T00:00:00Z",
+            updatedAt: "2024-01-01T00:00:00Z",
+            id: "prd_01h1s5z6vf2mm1mz3hevnn9va7",
+            object: "menuItem",
+            name: "string",
+            price: 0,
+            photo: new Blob([]),
+            photoUrl: "https://example.com",
+            photoTextDescription: "string"
+        },
+        quantity: 0,
+        discount: 0,
+        comment: "string"
+    }
+]));
+
+export const listOrderItemsErrorHandler = (status: 400 | 401 | 403 | 404 | 500, body?: Error) => http.get("*/order-items", () => HttpResponse.json(body ?? {
+    type: "about:blank",
+    title: "string",
+    status: 0,
+    instance: "/some/uri-reference#specific-occurrence-context",
+    details: {
+        key: null
+    }
+}, { status }));
+
+export const getRevenueHandler = (override?: Partial<RevenueStatistics>) => http.get("*/revenue", () => HttpResponse.json(createRevenueStatistics(override)));
+
+export const getRevenueErrorHandler = (status: 400 | 401 | 403 | 500, body?: Error) => http.get("*/revenue", () => HttpResponse.json(body ?? {
+    type: "about:blank",
+    title: "string",
+    status: 0,
+    instance: "/some/uri-reference#specific-occurrence-context",
+    details: {
+        key: null
+    }
+}, { status }));
+
+export const registerOAuth2ClientHandler = (override?: Partial<OAuth2Client>) => http.post("*/oauth2/register", () => HttpResponse.json(createOAuth2Client(override), { status: 201 }));
+
+export const registerOAuth2ClientErrorHandler = (status: 400 | 401 | 500, body?: Error) => http.post("*/oauth2/register", () => HttpResponse.json(body ?? {
+    type: "about:blank",
+    title: "string",
+    status: 0,
+    instance: "/some/uri-reference#specific-occurrence-context",
+    details: {
+        key: null
+    }
+}, { status }));
+
+export const handlers = [listMenuItemsHandler(), createMenuItemHandler(), deleteMenuItemHandler(), getMenuItemPhotoHandler(), listOrdersHandler(), createOrderHandler(), getOrderByIdHandler(), deleteOrderHandler(), updateOrderHandler(), listOrderItemsHandler(), getRevenueHandler(), registerOAuth2ClientHandler()];
\ No newline at end of file
diff --git a/packages/openapi-typescript/examples/mock/src/api/client.ts b/packages/openapi-typescript/examples/mock/src/api/client.ts
new file mode 100644
index 0000000000..dcb4900f7c
--- /dev/null
+++ b/packages/openapi-typescript/examples/mock/src/api/client.ts
@@ -0,0 +1,1513 @@
+// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Redocly Cafe (v1.0.0)
+ * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+ * Create API credentials and try it yourself in a realistic OpenAPI workflow.
+ * 
+ */
+
+export type Page = {
+    /**
+     * Use with the `after` query parameter to load the next page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    endCursor: string | null;
+    /**
+     * Use with the `before` query parameter to load the previous page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    startCursor: string | null;
+    /**
+     * Indicates if there is a next page with items.
+     */
+    hasNextPage: boolean;
+    /**
+     * Indicates if there is a previous page with items.
+     */
+    hasPrevPage: boolean;
+    /**
+     * Value showing how many items are in the page limit.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit: number;
+    /**
+     * Count of items across all pages.
+     * @minimum 0
+     */
+    total: number;
+};
+
+export type MenuBaseItem = {
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt: string;
+    /**
+     * Menu item ID. Unique identifier prefixed with `prd_`.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    readonly id: string;
+    /**
+     * Entity name.
+     */
+    readonly object: "menuItem";
+    /**
+     * Menu item name.
+     * @minLength 1
+     * @maxLength 50
+     */
+    name: string;
+    /**
+     * Price in cents.
+     * @minimum 0
+     */
+    price: number;
+    /**
+     * Photo of the menu item. Must be a PNG image and less than 1MB.
+     * @format binary
+     */
+    photo?: Blob | null;
+    /**
+     * Photo URL of the menu item.
+     * @format uri
+     */
+    readonly photoUrl?: string;
+    photoTextDescription?: string | null;
+};
+
+export type Beverage = {
+    /**
+     * Menu item category.
+     */
+    category: "beverage";
+    /**
+     * Size of the beverage in milliliters.
+     * @exclusiveMinimum 0
+     */
+    volume: number;
+    /**
+     * Indicates if the beverage contains caffeine.
+     */
+    containsCaffeine: boolean;
+} & MenuBaseItem;
+
+export type Dessert = {
+    /**
+     * Menu item category.
+     */
+    category: "dessert";
+    /**
+     * Amount of calories.
+     * @exclusiveMinimum 0
+     */
+    calories: number;
+} & MenuBaseItem;
+
+export type MenuItem = Beverage | Dessert;
+
+export type MenuItemList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: MenuItem[];
+};
+
+export type Error = {
+    /**
+     * URI reference that identifies the problem type.
+     * @format uri-reference
+     */
+    type: string;
+    /**
+     * Short summary of the problem type.
+     */
+    title: string;
+    /**
+     * HTTP status code generated by the origin server for this occurrence of the problem.
+     * @minimum 100
+     * @exclusiveMaximum 600
+     * @format int32
+     */
+    status: number;
+    /**
+     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+     * May be used to locate the root of this problem in the source code.
+     * @format uri-reference
+     */
+    instance?: string;
+    /**
+     * Additional error details.
+     */
+    details?: Record<string, unknown>;
+};
+
+/**
+ * Order status.
+ */
+export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
+
+export const OrderStatus = {
+    placed: "placed",
+    preparing: "preparing",
+    completed: "completed",
+    canceled: "canceled"
+} as const;
+
+export type Order = {
+    /**
+     * Order ID. Unique identifier prefixed with `ord_`.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     * @format ulid
+     */
+    readonly id?: string;
+    /**
+     * Entity name.
+     */
+    readonly object?: "order";
+    /**
+     * Name of the customer who placed the order.
+     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+     * @minLength 1
+     * @maxLength 100
+     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+     */
+    customerName: string;
+    readonly status?: OrderStatus;
+    /**
+     * Total order price in cents.
+     * @minimum 0
+     */
+    readonly totalPrice?: number;
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt?: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt?: string;
+    /**
+     * List of items to include in the order.
+     * @minItems 1
+     */
+    orderItems: {
+        /**
+         * ID of the menu item to add to the order.
+         * @format ulid
+         */
+        menuItemId: string;
+        /**
+         * Quantity of the menu item.
+         * @minimum 1
+         */
+        quantity: number;
+        /**
+         * Discount amount in cents (absolute value).
+         * @minimum 0
+         */
+        discount?: number;
+        /**
+         * Optional comment for the order item (e.g., "No sugar").
+         * @maxLength 500
+         */
+        comment?: string;
+    }[];
+};
+
+export type OrderList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: Order[];
+};
+
+export type OrderItem = {
+    /**
+     * ID of the menu item to add to the order.
+     */
+    menuItemId: string;
+    /**
+     * Menu item that is part of the order.
+     */
+    readonly menuItem?: MenuItem;
+    /**
+     * Quantity of the menu item.
+     * @minimum 1
+     */
+    quantity: number;
+    /**
+     * Discount amount in cents (absolute value).
+     * @minimum 0
+     */
+    discount?: number;
+    /**
+     * Optional comment for the order item (e.g., "No sugar").
+     * @maxLength 500
+     */
+    comment?: string;
+};
+
+/**
+ * Revenue statistics for a given date range.
+ */
+export type RevenueStatistics = {
+    /**
+     * Total revenue in cents from completed orders.
+     * @minimum 0
+     * @format float
+     */
+    revenue: number;
+    /**
+     * Average order amount in cents (calculated from completed orders only).
+     * @minimum 0
+     * @format float
+     */
+    averageOrderAmount: number;
+    /**
+     * Total number of orders (all statuses) in the date range.
+     * @minimum 0
+     */
+    totalOrders: number;
+    /**
+     * Number of placed orders.
+     * @minimum 0
+     */
+    placedOrders: number;
+    /**
+     * Number of preparing orders.
+     * @minimum 0
+     */
+    preparingOrders: number;
+    /**
+     * Number of completed orders.
+     * @minimum 0
+     */
+    completedOrders: number;
+    /**
+     * Number of canceled orders.
+     * @minimum 0
+     */
+    canceledOrders: number;
+    /**
+     * Start date of the revenue calculation period.
+     * @format date
+     */
+    startDate: string;
+    /**
+     * End date of the revenue calculation period.
+     * @format date
+     */
+    endDate: string;
+};
+
+export type RegisterClientObject = {
+    /**
+     * Client name.
+     */
+    name: string;
+    /**
+     * List of redirect URIs (optional, defaults to empty array).
+     */
+    redirectUris?: string[];
+    /**
+     * List of scopes.
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types.
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+/**
+ * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+ */
+export type OAuth2Client = {
+    /**
+     * Client identifier issued by the authorization server.
+     */
+    clientId: string;
+    /**
+     * Client secret issued by the authorization server.
+     */
+    clientSecret: string;
+    /**
+     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+     * @format int64
+     */
+    clientIdIssuedAt: number;
+    /**
+     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+     * @format int64
+     */
+    clientSecretExpiresAt: number;
+    /**
+     * Client name (registered metadata).
+     */
+    name?: string;
+    /**
+     * List of redirect URIs (registered metadata).
+     */
+    redirectUris?: string[];
+    /**
+     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
+     * @format uri
+     */
+    registrationClientUri: string;
+    /**
+     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+     */
+    registrationAccessToken: string;
+    /**
+     * List of scopes (registered metadata).
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types (registered metadata).
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+export type OrderNotification = {
+    /**
+     * Unique order identifier.
+     */
+    orderId: string;
+    orderStatus: OrderStatus;
+    /**
+     * When the event occurred.
+     * @format date-time
+     */
+    timestamp: string;
+};
+
+/**
+ * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
+ */
+export function isBeverage(value: MenuItem): value is Beverage {
+    return (value as Record<string, unknown>)["category"] === "beverage";
+}
+
+/**
+ * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
+ */
+export function isDessert(value: MenuItem): value is Dessert {
+    return (value as Record<string, unknown>)["category"] === "dessert";
+}
+
+/**
+ * Static metadata for every operation, keyed by operationId: the HTTP `method`
+ * and the `path` template (with `{param}` placeholders intact). Minification-safe
+ * — useful for building cache/query keys, tracing span names, and request logging
+ * without re-deriving them at each call site.
+ */
+export const OPERATIONS = {
+    listMenuItems: { method: "GET", path: "/menu" },
+    createMenuItem: { method: "POST", path: "/menu" },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
+    listOrders: { method: "GET", path: "/orders" },
+    createOrder: { method: "POST", path: "/orders" },
+    getOrderById: { method: "GET", path: "/orders/{orderId}" },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
+    listOrderItems: { method: "GET", path: "/order-items" },
+    getRevenue: { method: "GET", path: "/revenue" },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
+} as const;
+
+/**
+ * The operationId of any operation in this client.
+ */
+export type OperationId = keyof typeof OPERATIONS;
+
+/**
+ * Static metadata describing one operation: its HTTP method and path template.
+ */
+export type OperationMetadata = {
+    readonly method: string;
+    readonly path: string;
+};
+
+let BASE = "https://cafe.cloud.redocly.com";
+
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+export type RequestContext = {
+    url: string;
+    method: string;
+    headers: Record<string, string>;
+    body?: unknown;
+};
+
+/**
+ * Configuration and extension hooks for a client. Supplied per-instance via
+ * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
+ * (functions facade).
+ */
+export type ClientConfig = {
+    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    baseUrl?: string;
+    /** Extra headers merged into every request; a function is invoked per request. */
+    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+    /** Transport used to issue requests. Defaults to the global `fetch`. */
+    fetch?: typeof fetch;
+    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    /** Observe — or replace, by returning a `Response` — the response before parsing. */
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    /**
+     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
+     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
+     */
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
+    /**
+     * Composable interceptors run around every request, alongside the single
+     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
+     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
+     * the last-registered middleware wraps closest to the network. Register more at runtime
+     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
+     */
+    middleware?: Middleware[];
+    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
+    retry?: RetryConfig;
+    /**
+     * Per-instance auth credentials. When set, they override the module-global
+     * `set*` helpers for requests made through this config (each scheme falls back
+     * to its global slot when omitted here). Only the schemes an operation declares
+     * in its `security` are ever sent.
+     */
+    auth?: AuthCredentials;
+};
+
+/**
+ * A request interceptor; every field is optional, so a middleware can hook any subset of
+ * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
+ * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
+ * failure into the error to throw, threaded through each middleware in turn.
+ */
+export type Middleware = {
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/** Context handed to `retryOn` for the attempt that just failed. */
+export type RetryContext = {
+    /** 1-based number of the attempt that just failed. */
+    attempt: number;
+    /** The request that was attempted. */
+    request: RequestContext;
+    /** Present when the server returned a (non-ok) response. */
+    response?: Response;
+    /** Present when the transport threw (network error, DNS, connection reset). */
+    error?: unknown;
+};
+
+/** Retry policy; all fields optional with sensible defaults. */
+export type RetryConfig = {
+    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
+    retries?: number;
+    /** Base delay in milliseconds. Default 1000. */
+    retryDelay?: number;
+    /** Backoff shape. Default 'exponential'. */
+    retryStrategy?: RetryStrategy;
+    /** Apply full jitter over the computed delay. Default true. */
+    jitter?: boolean;
+    /**
+     * Decide whether to retry a failed attempt. Default: retry only idempotent
+     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
+     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
+     */
+    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
+};
+
+/**
+ * How the response body is read. `'auto'` negotiates from the content type (the
+ * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
+ */
+export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
+
+/**
+ * The trailing per-operation argument: standard `RequestInit` plus an optional
+ * per-call retry override and a `parseAs` escape hatch.
+ *
+ * `parseAs` forces how the response body is read; overrides the inferred kind.
+ * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
+ * override — the static return type is unchanged.
+ */
+export type RequestOptions = RequestInit & {
+    retry?: Partial<RetryConfig>;
+    parseAs?: ParseAs;
+};
+
+/**
+ * Override the base URL used by every generated operation. Useful when the
+ * runtime environment differs from the value declared in `servers[0].url`
+ * (e.g. dev / staging / prod toggles in a single-page app).
+ *
+ * Mutates a module-scoped binding shared by the functions facade. For multiple
+ * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ */
+export function setBaseUrl(url: string): void {
+    BASE = url;
+}
+
+/** The global config used by the functions facade (see `configure`). */
+const __config: ClientConfig = {};
+
+/**
+ * Merge `config` into the global configuration used by the functions facade —
+ * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
+ * hooks once for every free function. The service-class facade configures per
+ * instance instead (`new Client(config)`).
+ */
+export function configure(config: ClientConfig): void {
+    Object.assign(__config, config);
+}
+
+/**
+ * Append interceptors to the functions facade's global middleware chain (see
+ * `ClientConfig.middleware`). The service-class facade registers per instance via
+ * `<Client>.use(...)` instead.
+ */
+export function use(...middleware: Middleware[]): void {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    __config.middleware = [...(__config.middleware ?? []), ...middleware];
+}
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function __middleware(config: ClientConfig): Middleware[] {
+    const single = config.onRequest || config.onResponse || config.onError
+        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+        : [];
+    return [...single, ...(config.middleware ?? [])];
+}
+
+export class ApiError extends Error {
+    public readonly url: string;
+    public readonly status: number;
+    public readonly statusText: string;
+    public readonly body: unknown;
+    constructor(url: string, status: number, statusText: string, body: unknown) {
+        super(`Request failed with status ${status}`);
+        this.name = 'ApiError';
+        this.url = url;
+        this.status = status;
+        this.statusText = statusText;
+        this.body = body;
+    }
+}
+
+type QueryPrimitive = string | number | boolean;
+
+type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
+
+/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
+type QueryStyle = {
+    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+    explode: boolean;
+    allowReserved?: boolean;
+};
+
+/**
+ * Percent-encode `value` but leave the RFC-3986 reserved set
+ * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
+ */
+function __encodeReserved(value: string): string {
+    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
+}
+
+function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
+    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    if (!query)
+        return url;
+    const params = new URLSearchParams();
+    const raw: string[] = [];
+    for (const [key, value] of Object.entries(query)) {
+        if (value === undefined || value === null)
+            continue;
+        const spec = styles?.[key];
+        if (!spec) {
+            if (Array.isArray(value)) {
+                for (const v of value) {
+                    if (v !== undefined && v !== null)
+                        params.append(key, String(v));
+                }
+            }
+            else if (typeof value === 'object') {
+                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+                for (const [subKey, subValue] of Object.entries(value)) {
+                    if (subValue !== undefined && subValue !== null) {
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                    }
+                }
+            }
+            else {
+                params.append(key, String(value));
+            }
+            continue;
+        }
+        if (Array.isArray(value)) {
+            const items = value.filter((v) => v !== undefined && v !== null).map(String);
+            if (spec.style === 'form' && spec.explode) {
+                for (const v of items) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}=${__encodeReserved(v)}`);
+                    else
+                        params.append(key, v);
+                }
+            }
+            else {
+                // Delimited styles put the LITERAL delimiter on the wire; only the
+                // values are encoded. `%20` (not `+`) is the literal space delimiter.
+                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
+                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+            }
+        }
+        else if (typeof value === 'object') {
+            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+            for (const [subKey, subValue] of Object.entries(value)) {
+                if (subValue !== undefined && subValue !== null) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
+                    else
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                }
+            }
+        }
+        else if (spec.allowReserved) {
+            raw.push(`${key}=${__encodeReserved(String(value))}`);
+        }
+        else {
+            params.append(key, String(value));
+        }
+    }
+    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+    return qs ? `${url}?${qs}` : url;
+}
+
+async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+    response: Response;
+    context: RequestContext;
+}> {
+    const { retry: callRetry, ...fetchInit } = init;
+    const retry: RetryConfig = { ...config.retry, ...callRetry };
+    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+    const headers: Record<string, string> = {
+        Accept: 'application/json',
+        ...extra,
+        ...(fetchInit.headers as Record<string, string> | undefined),
+    };
+    let payload: BodyInit | undefined;
+    if (body !== undefined) {
+        const isBinary = body instanceof Blob ||
+            body instanceof ArrayBuffer ||
+            ArrayBuffer.isView(body as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
+        const isURLSearchParams = body instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
+            payload = body as BodyInit;
+        }
+        else {
+            payload = JSON.stringify(body);
+            if (!('Content-Type' in headers) && !('content-type' in headers)) {
+                headers['Content-Type'] = 'application/json';
+            }
+        }
+    }
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    const doFetch = config.fetch ?? fetch;
+    const maxAttempts = 1 + (retry.retries ?? 0);
+    const retryOn = retry.retryOn ?? __defaultRetryOn;
+    const signal = fetchInit.signal ?? undefined;
+    let attempt = 0;
+    while (true) {
+        attempt++;
+        if (signal?.aborted)
+            throw __abortError(signal);
+        let response: Response;
+        try {
+            response = await doFetch(context.url, {
+                ...fetchInit,
+                method: context.method,
+                headers: context.headers,
+                body: payload,
+            });
+        }
+        catch (error) {
+            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
+                await __sleep(__retryDelay(retry, attempt, null), signal);
+                continue;
+            }
+            throw error;
+        }
+        // Reverse order: the last-registered middleware wraps closest to the network (onion).
+        for (let i = middleware.length - 1; i >= 0; i--) {
+            const onResponse = middleware[i].onResponse;
+            if (onResponse) {
+                const replaced = await onResponse(response, context);
+                if (replaced)
+                    response = replaced;
+            }
+        }
+        if (!response.ok &&
+            attempt < maxAttempts &&
+            !signal?.aborted &&
+            (await retryOn({ attempt, request: context, response }))) {
+            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            continue;
+        }
+        return { response, context };
+    }
+}
+
+async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+    if (kind === 'void' || response.status === 204)
+        return undefined;
+    if (kind === 'stream')
+        return response.body;
+    if (kind === 'blob')
+        return response.blob();
+    if (kind === 'arrayBuffer')
+        return response.arrayBuffer();
+    if (kind === 'formData')
+        return response.formData();
+    if (kind === 'text')
+        return response.text();
+    if (kind === 'json')
+        return response.json();
+    // 'auto' — negotiate from the response's content type.
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json'))
+        return response.json();
+    if (contentType.startsWith('text/'))
+        return response.text();
+    return response.blob();
+}
+
+async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+    const { parseAs, ...sendInit } = init;
+    const { response, context } = await __send(config, url, sendInit, body);
+    if (!response.ok) {
+        const errorBody = await readError(response);
+        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
+        // Thread the error through each middleware's onError in turn (each may replace it).
+        for (const mw of __middleware(config)) {
+            if (mw.onError)
+                error = await mw.onError(error as ApiError, context);
+        }
+        throw error;
+    }
+    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
+    return (await __parse(response, kind)) as T;
+}
+
+async function readError(response: Response): Promise<unknown> {
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json')) {
+        return response.json().catch(() => undefined);
+    }
+    return response.text().catch(() => undefined);
+}
+
+const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+
+const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+function __defaultRetryOn(ctx: RetryContext): boolean {
+    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
+        return false;
+    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+    if (retryAfter) {
+        const seconds = Number(retryAfter);
+        if (!Number.isNaN(seconds))
+            return seconds * 1000;
+        const when = Date.parse(retryAfter);
+        if (!Number.isNaN(when))
+            return Math.max(0, when - Date.now());
+    }
+    const base = retry.retryDelay ?? 1000;
+    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+    return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
+    return new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject(__abortError(signal));
+            return;
+        }
+        const onAbort = () => {
+            clearTimeout(timer);
+            reject(__abortError(signal as AbortSignal));
+        };
+        const timer = setTimeout(() => {
+            if (signal)
+                signal.removeEventListener('abort', onAbort);
+            resolve();
+        }, ms);
+        if (signal)
+            signal.addEventListener('abort', onAbort, { once: true });
+    });
+}
+
+function __abortError(signal: AbortSignal): globalThis.Error {
+    const reason = (signal as {
+        reason?: unknown;
+    }).reason;
+    if (reason instanceof Error)
+        return reason;
+    return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * Normalize an operation's header-parameter object into a plain string record,
+ * dropping any `undefined` / `null` entries (optional headers the caller omitted)
+ * and stringifying the rest. Mirrors __buildUrl's handling of query values.
+ */
+function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
+    const out: Record<string, string> = {};
+    for (const [key, value] of Object.entries(values)) {
+        if (value !== undefined && value !== null)
+            out[key] = String(value);
+    }
+    return out;
+}
+
+/**
+ * A credential value, or a (possibly async) function that returns one per request.
+ */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/**
+ * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
+ * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
+ * to the global slots.
+ */
+export type AuthCredentials = {
+    bearer?: TokenProvider;
+    apiKey?: Record<string, TokenProvider>;
+};
+
+let __bearerToken: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
+ * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
+ * (possibly async) function resolved per request.
+ */
+export function setBearer(token: TokenProvider | null): void {
+    __bearerToken = token;
+}
+
+let __apiKey_ApiKey: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
+ * string or a (possibly async) function resolved per request.
+ */
+export function setApiKey(key: TokenProvider | null): void {
+    __apiKey_ApiKey = key;
+}
+
+/**
+ * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
+ */
+async function __resolve(slot: TokenProvider | null): Promise<string | null> {
+    if (slot === null)
+        return null;
+    return typeof slot === "function" ? slot() : slot;
+}
+
+/**
+ * Build the auth `headers` and `query` for an operation from the currently-set credentials.
+ * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
+ * can always override by passing their own `init.headers`.
+ */
+async function __auth(schemes: string[], config: ClientConfig): Promise<{
+    headers: Record<string, string>;
+    query: Record<string, string>;
+}> {
+    const headers: Record<string, string> = {};
+    const query: Record<string, string> = {};
+    const cookies: string[] = [];
+    for (const scheme of schemes) {
+        switch (scheme) {
+            case "OAuth2": {
+                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
+                if (v !== null)
+                    headers["Authorization"] = `Bearer ${v}`;
+                break;
+            }
+            case "ApiKey": {
+                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
+                if (v !== null)
+                    headers["X-API-Key"] = v;
+                break;
+            }
+        }
+    }
+    if (cookies.length > 0)
+        headers["Cookie"] = cookies.join("; ");
+    return { headers, query };
+}
+
+export type ListMenuItemsResult = MenuItemList;
+
+export type ListMenuItemsParams = {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+};
+
+export type ListMenuItemsVariables = {
+    params?: ListMenuItemsParams;
+};
+
+/**
+ * List all menu items
+ *
+ * Retrieve a collection of menu items with optional filtering and pagination.
+ */
+export async function listMenuItems(params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
+    return __request<MenuItemList>(__config, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
+}
+
+export type CreateMenuItemResult = MenuItem;
+
+export type CreateMenuItemBody = FormData;
+
+export type CreateMenuItemVariables = {
+    body: CreateMenuItemBody;
+};
+
+/**
+ * Create menu item
+ *
+ * Create a new menu item.
+ */
+export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<MenuItem>(__config, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type DeleteMenuItemResult = void;
+
+export type DeleteMenuItemVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+};
+
+/**
+ * Delete a menu item
+ *
+ * Delete an existing menu item.
+ */
+export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type GetMenuItemPhotoResult = Blob | string;
+
+export type GetMenuItemPhotoParams = {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+};
+
+export type GetMenuItemPhotoVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+    params?: GetMenuItemPhotoParams;
+};
+
+/**
+ * Retrieve a menu item photo
+ *
+ * Retrieve the product photo image for a specific menu item.
+ */
+export async function getMenuItemPhoto(menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}): Promise<Blob | string> {
+    return __request<Blob | string>(__config, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+}
+
+export type ListOrdersResult = OrderList;
+
+export type ListOrdersParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+};
+
+export type ListOrdersVariables = {
+    params?: ListOrdersParams;
+};
+
+/**
+ * List all orders
+ *
+ * Retrieve a collection of orders with optional filtering and pagination.
+ */
+export async function listOrders(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderList> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderList>(__config, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+/**
+ * Create order
+ *
+ * Create a new order.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    headers?: GetOrderByIdHeaders;
+};
+
+/**
+ * Retrieve an order
+ *
+ * Retrieve a single order by its ID.
+ */
+export async function getOrderById(orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+}
+
+export type DeleteOrderResult = void;
+
+export type DeleteOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+};
+
+/**
+ * Delete an order
+ *
+ * Delete the order.
+ * To keep the order history, the order should be canceled instead of deleted.
+ */
+export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type UpdateOrderResult = Order;
+
+export type UpdateOrderBody = {
+    status: OrderStatus;
+};
+
+export type UpdateOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    body?: UpdateOrderBody;
+};
+
+/**
+ * Partially update an order
+ *
+ * Update an existing order status.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function updateOrder(orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type ListOrderItemsResult = OrderItem[];
+
+export type ListOrderItemsParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+};
+
+export type ListOrderItemsVariables = {
+    params?: ListOrderItemsParams;
+};
+
+/**
+ * List all order items with menu item details
+ *
+ * Returns an array of order items for a specific order.
+ * Use the `filter` parameter to filter by order ID.
+ */
+export async function listOrderItems(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderItem[]>(__config, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+/**
+ * Get revenue statistics
+ *
+ * Retrieve revenue statistics for a configurable date range.
+ * Returns revenue, order counts, average order amount, and other useful statistics.
+ */
+export async function getRevenue(params: {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
+    const __a = await __auth(["ApiKey"], __config);
+    return __request<RevenueStatistics>(__config, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Create OAuth2 client
+ *
+ * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+ * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
+ *   `redirectUris` must be provided (per RFC 7591 Section 2).
+ * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+ * Returns the registered client information per RFC 7591, including:
+ * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+ */
+export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
+    return __request<OAuth2Client>(__config, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+}
diff --git a/packages/openapi-typescript/examples/mock/src/main.ts b/packages/openapi-typescript/examples/mock/src/main.ts
new file mode 100644
index 0000000000..ee3ca10e8d
--- /dev/null
+++ b/packages/openapi-typescript/examples/mock/src/main.ts
@@ -0,0 +1,20 @@
+import { setupWorker } from 'msw/browser';
+
+import { configure, listMenuItems, ApiError } from './api/client';
+import { handlers } from './api/client.mocks';
+
+const out = document.querySelector<HTMLPreElement>('#out')!;
+
+async function main() {
+  try {
+    await setupWorker(...handlers).start();
+    configure({ baseUrl: 'https://cafe.cloud.redocly.com' });
+    const response = await listMenuItems();
+    out.textContent = `Mocked ${response.items.length} items:\n${JSON.stringify(response, null, 2)}`;
+  } catch (error) {
+    out.textContent =
+      error instanceof ApiError ? `ApiError ${error.status}` : `Error: ${String(error)}`;
+  }
+}
+
+void main();
diff --git a/packages/openapi-typescript/examples/mock/tsconfig.json b/packages/openapi-typescript/examples/mock/tsconfig.json
new file mode 100644
index 0000000000..4bd6962d40
--- /dev/null
+++ b/packages/openapi-typescript/examples/mock/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../tsconfig.base.json",
+  "include": ["src"]
+}
diff --git a/packages/openapi-typescript/examples/mock/vite.config.ts b/packages/openapi-typescript/examples/mock/vite.config.ts
new file mode 100644
index 0000000000..c049f46e10
--- /dev/null
+++ b/packages/openapi-typescript/examples/mock/vite.config.ts
@@ -0,0 +1,3 @@
+import { defineConfig } from 'vite';
+
+export default defineConfig({});
diff --git a/packages/openapi-typescript/examples/programmatic/.gitignore b/packages/openapi-typescript/examples/programmatic/.gitignore
new file mode 100644
index 0000000000..f06235c460
--- /dev/null
+++ b/packages/openapi-typescript/examples/programmatic/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+dist
diff --git a/packages/openapi-typescript/examples/programmatic/README.md b/packages/openapi-typescript/examples/programmatic/README.md
new file mode 100644
index 0000000000..3a99e6a4c9
--- /dev/null
+++ b/packages/openapi-typescript/examples/programmatic/README.md
@@ -0,0 +1,16 @@
+# programmatic example
+
+Generates the client **programmatically** with `generateClient(...)` from
+`@redocly/openapi-typescript` — the same API the `redocly generate-client` CLI uses — instead of a
+`redocly.yaml`. See [`generate.ts`](./generate.ts). Useful when generation is part of a build script,
+codegen pipeline, or test setup.
+
+## Run
+
+```bash
+npm install
+npm run generate   # runs generate.ts → writes src/api/client.ts
+```
+
+The generated client under `src/api/` is committed and drift-checked against the generator in CI.
+`generateClient(...)` returns `{ outputPath, bytes, files }`.
diff --git a/packages/openapi-typescript/examples/programmatic/generate.ts b/packages/openapi-typescript/examples/programmatic/generate.ts
new file mode 100644
index 0000000000..a4ddc6ae7f
--- /dev/null
+++ b/packages/openapi-typescript/examples/programmatic/generate.ts
@@ -0,0 +1,20 @@
+// Generate the client *programmatically* with `generateClient(...)` — the API behind the
+// `redocly generate-client` CLI — instead of a `redocly.yaml`. Run: `npm run generate`.
+// (The CI drift-check sets `OUT` to redirect the output to a temp dir.)
+import { generateClient } from '@redocly/openapi-typescript';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const here = dirname(fileURLToPath(import.meta.url));
+
+const result = await generateClient({
+  input: join(here, 'openapi.yaml'),
+  output: process.env.OUT ?? join(here, 'src/api/client.ts'),
+  outputMode: 'single', // 'single' | 'split' | 'tags' | 'tags-split'
+  facade: 'functions', // 'functions' | 'service-class'
+  argsStyle: 'flat', // 'flat' | 'grouped'
+  errorMode: 'throw', // 'throw' | 'result'
+  generators: ['sdk'], // add 'zod' | 'tanstack-query' | 'transformers'
+});
+
+console.log(`Wrote ${result.files.length} file(s), ${result.bytes} bytes to ${result.outputPath}`);
diff --git a/packages/openapi-typescript/examples/programmatic/openapi.yaml b/packages/openapi-typescript/examples/programmatic/openapi.yaml
new file mode 100644
index 0000000000..a6a75dffd0
--- /dev/null
+++ b/packages/openapi-typescript/examples/programmatic/openapi.yaml
@@ -0,0 +1,1163 @@
+openapi: 3.2.0
+info:
+  title: Redocly Cafe
+  description: |
+    Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+    Create API credentials and try it yourself in a realistic OpenAPI workflow.
+  version: 1.0.0
+  contact:
+    email: team@redocly.com
+    url: https://redocly.com/contact-us/
+  license:
+    name: MIT
+    url: https://opensource.org/licenses/MIT
+  termsOfService: https://redocly.com/subscription-agreement
+servers:
+  - url: https://cafe.cloud.redocly.com
+    description: Live server.
+tags:
+  - name: Authorization
+    description: Create a client to demo the API.
+  - name: Products
+    description: Operations related to products.
+  - name: Orders
+    description: Order management operations.
+  - name: Statistics
+    description: Statistics operations.
+paths:
+  /menu:
+    get:
+      tags:
+        - Products
+      summary: List all menu items
+      description: Retrieve a collection of menu items with optional filtering and pagination.
+      operationId: listMenuItems
+      security: []
+      parameters:
+        - $ref: '#/components/parameters/After'
+        - $ref: '#/components/parameters/Before'
+        - $ref: '#/components/parameters/Sort'
+        - $ref: '#/components/parameters/Filter'
+        - $ref: '#/components/parameters/Search'
+        - $ref: '#/components/parameters/Limit'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItemList'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    post:
+      tags:
+        - Products
+      summary: Create menu item
+      description: Create a new menu item.
+      operationId: createMenuItem
+      security:
+        - OAuth2:
+            - menu:write
+      requestBody:
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              $ref: '#/components/schemas/MenuItem'
+      responses:
+        '201':
+          description: Menu item created successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItem'
+              examples:
+                MenuItemResponse:
+                  value:
+                    id: prd_01khr487f7qm7p44xn427m43vb
+                    object: menuItem
+                    name: coffee
+                    price: 4000
+                    category: beverage
+                    createdAt: '2026-02-18T10:20:38.228Z'
+                    updatedAt: '2026-02-18T10:20:38.228Z'
+                    volume: 600
+                    containsCaffeine: false
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '409':
+          $ref: '#/components/responses/Conflict'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /menu/{menuItemId}:
+    parameters:
+      - $ref: '#/components/parameters/MenuItemId'
+    delete:
+      tags:
+        - Products
+      summary: Delete a menu item
+      description: Delete an existing menu item.
+      operationId: deleteMenuItem
+      security:
+        - OAuth2:
+            - menu:write
+      responses:
+        '204':
+          description: Menu item deleted successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /menu-item-images/{menuItemId}:
+    parameters:
+      - $ref: '#/components/parameters/MenuItemId'
+    get:
+      operationId: getMenuItemPhoto
+      summary: Retrieve a menu item photo
+      description: Retrieve the product photo image for a specific menu item.
+      security: []
+      tags:
+        - Products
+      parameters:
+        - $ref: '#/components/parameters/PhotoSize'
+      responses:
+        '200':
+          description: Menu item photo retrieved successfully.
+          content:
+            image/png:
+              schema:
+                type: string
+                format: binary
+            text/plain:
+              schema:
+                description: Alternative image text.
+                type: string
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /orders:
+    get:
+      tags:
+        - Orders
+      summary: List all orders
+      description: Retrieve a collection of orders with optional filtering and pagination.
+      operationId: listOrders
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/Filter'
+        - $ref: '#/components/parameters/Sort'
+        - $ref: '#/components/parameters/Limit'
+        - $ref: '#/components/parameters/After'
+        - $ref: '#/components/parameters/Before'
+        - $ref: '#/components/parameters/Search'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OrderList'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    post:
+      tags:
+        - Orders
+      summary: Create order
+      description: |
+        Create a new order.
+        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+      operationId: createOrder
+      security:
+        - OAuth2:
+            - orders:write
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Order'
+            examples:
+              OrderRequest:
+                dataValue:
+                  customerName: Mary Ann
+                  orderItems:
+                    - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                      quantity: 2
+                      comment: No sugar!
+                      discount: 0
+      responses:
+        '201':
+          description: Order placed successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: placed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /orders/{orderId}:
+    get:
+      tags:
+        - Orders
+      summary: Retrieve an order
+      description: Retrieve a single order by its ID.
+      operationId: getOrderById
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+        - name: X-Request-Id
+          in: header
+          required: false
+          description: |
+            Optional client-supplied correlation ID, echoed in logs and traces.
+          schema:
+            type: string
+            format: uuid
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: placed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    patch:
+      tags:
+        - Orders
+      summary: Partially update an order
+      description: |
+        Update an existing order status.
+        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+      operationId: updateOrder
+      security:
+        - OAuth2:
+            - orders:write
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              description: |
+                Partial order update using JSON Merge Patch - only include fields to update.
+              properties:
+                status:
+                  $ref: '#/components/schemas/OrderStatus'
+              required:
+                - status
+      responses:
+        '200':
+          description: Order updated successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: completed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    delete:
+      tags:
+        - Orders
+      summary: Delete an order
+      description: |
+        Delete the order.
+        To keep the order history, the order should be canceled instead of deleted.
+      operationId: deleteOrder
+      security:
+        - OAuth2:
+            - orders:write
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+      responses:
+        '204':
+          description: Order deleted successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /order-items:
+    get:
+      tags:
+        - Orders
+      summary: List all order items with menu item details
+      description: |
+        Returns an array of order items for a specific order.
+        Use the `filter` parameter to filter by order ID.
+      operationId: listOrderItems
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/Filter'
+          required: true
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                type: array
+                description: List of menu items that are part of the order.
+                items:
+                  $ref: '#/components/schemas/OrderItem'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /revenue:
+    get:
+      tags:
+        - Statistics
+      summary: Get revenue statistics
+      description: |
+        Retrieve revenue statistics for a configurable date range.
+        Returns revenue, order counts, average order amount, and other useful statistics.
+      operationId: getRevenue
+      security:
+        - ApiKey: []
+      parameters:
+        - name: startDate
+          in: query
+          required: false
+          description: |
+            Start date for the revenue calculation period (ISO 8601 datetime format).
+            Defaults to 30 days ago if not provided.
+          schema:
+            type: string
+            format: date
+          example: '2026-01-01'
+        - name: endDate
+          in: query
+          required: false
+          description: |
+            End date for the revenue calculation period (ISO 8601 datetime format).
+            Defaults to current time if not provided.
+          schema:
+            type: string
+            format: date
+          example: '2026-01-31'
+      responses:
+        '200':
+          description: Revenue statistics retrieved successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RevenueStatistics'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /oauth2/register:
+    post:
+      tags:
+        - Authorization
+      summary: Create OAuth2 client
+      description: |
+        Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+        - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type, 
+          `redirectUris` must be provided (per RFC 7591 Section 2).
+        - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+        Returns the registered client information per RFC 7591, including:
+        - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+      operationId: registerOAuth2Client
+      security: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/RegisterClientObject'
+      responses:
+        '201':
+          description: OAuth2 client registered successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OAuth2Client'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+webhooks:
+  order-notification:
+    post:
+      tags:
+        - Orders
+      operationId: orderNotificationWebhook
+      security: []
+      summary: Order notification webhook
+      description: Webhook triggered when a new order is placed.
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/OrderNotification'
+      responses:
+        '200':
+          description: Webhook received successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+components:
+  securitySchemes:
+    OAuth2:
+      type: oauth2
+      description: OAuth2 authorization for API access.
+      flows:
+        authorizationCode:
+          authorizationUrl: https://cafe.cloud.redocly.com/oauth2/authorize
+          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          scopes:
+            menu:read: Read access to menu items and images
+            menu:write: Write access to menu items (create, delete)
+            orders:read: Read access to orders
+            orders:write: Write access to orders (create, update, delete)
+        clientCredentials:
+          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          scopes:
+            menu:read: Read access to menu items and images
+            menu:write: Write access to menu items (create, delete)
+            orders:read: Read access to orders
+            orders:write: Write access to orders (create, update, delete)
+    ApiKey:
+      type: apiKey
+      name: X-API-Key
+      in: header
+      description: API key for internal operations.
+  parameters:
+    After:
+      name: after
+      in: query
+      required: false
+      description: Use the `endCursor` as a value for the `after` parameter to get the next page.
+      schema:
+        type: string
+      example: a25fgaksjf23la==
+    Before:
+      name: before
+      in: query
+      required: false
+      description: |
+        Use the `startCursor` as a value for the `before` parameter to get the next page.
+      schema:
+        type: string
+      example: bfg23aksjf23zb1==
+    Sort:
+      name: sort
+      description: |-
+        To sort by id in descending order use `-id`.
+        To sort by id in ascending order use `id`.
+      in: query
+      required: false
+      schema:
+        type: string
+      example: '-name'
+    Filter:
+      name: filter
+      description: |-
+        Filters the collection items using space-separated `field:value` pairs.
+
+        **Format:** `field1:value1 field2:value2`
+
+        **Supported operators:**
+        - `field:value` - Exact match
+        - `field:value1,value2` - Match any of the comma-separated values (OR)
+        - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+
+        **Examples:**
+        - `status:placed` - Filter by single status.
+        - `status:placed,completed` - Filter by multiple statuses.
+        - `createdAt:30d` - Filter orders created in the last 30 days.
+        - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+        - `status:placed createdAt:7d` - Combine multiple filters.
+      in: query
+      required: false
+      schema:
+        type: string
+      example: orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7
+    Search:
+      name: search
+      in: query
+      description: |-
+        Performs a case-insensitive text search across relevant fields in the collection.
+
+        **Fields searched depend on the endpoint:**
+        - **Menu items:** `name`, `photoTextDescription`
+        - **Orders:** `customerName`, `id`
+
+        Returns items where any of the searchable fields contain the search term as a substring.
+      required: false
+      schema:
+        type: string
+      example: coffee
+    Limit:
+      name: limit
+      description: |
+        Use to return a number of results per page.
+        If there is more data, use in combination with `after` to page through the data.
+      in: query
+      required: false
+      schema:
+        type: integer
+        minimum: 1
+        maximum: 100
+        default: 10
+      example: 10
+    MenuItemId:
+      name: menuItemId
+      in: path
+      description: ID of the menu item to retrieve.
+      required: true
+      schema:
+        type: string
+        pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+      example: prd_01h1s5z6vf2mm1mz3hevnn9va7
+    PhotoSize:
+      name: photoSize
+      in: query
+      description: Photo size to retrieve.
+      required: false
+      schema:
+        type: string
+        enum:
+          - thumbnail
+          - medium
+          - large
+        default: medium
+    OrderId:
+      name: orderId
+      in: path
+      description: ID of the order to retrieve.
+      required: true
+      schema:
+        type: string
+        pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+      example: ord_01h1s5z6vf2mm1mz3hevnn9va7
+  schemas:
+    Page:
+      type: object
+      properties:
+        endCursor:
+          type:
+            - string
+            - 'null'
+          description: |-
+            Use with the `after` query parameter to load the next page of data.
+            When `null`, there is no data.
+            The cursor is opaque and internal structure is subject to change.
+        startCursor:
+          type:
+            - string
+            - 'null'
+          description: |-
+            Use with the `before` query parameter to load the previous page of data.
+            When `null`, there is no data.
+            The cursor is opaque and internal structure is subject to change.
+        hasNextPage:
+          type: boolean
+          description: Indicates if there is a next page with items.
+        hasPrevPage:
+          type: boolean
+          description: Indicates if there is a previous page with items.
+        limit:
+          type: integer
+          minimum: 1
+          maximum: 100
+          default: 10
+          description: Value showing how many items are in the page limit.
+        total:
+          type: integer
+          description: Count of items across all pages.
+          minimum: 0
+      required:
+        - endCursor
+        - startCursor
+        - hasNextPage
+        - hasPrevPage
+        - limit
+        - total
+    MenuBaseItem:
+      type: object
+      properties:
+        createdAt:
+          description: Created date.
+          type: string
+          format: date-time
+          readOnly: true
+        updatedAt:
+          description: Updated date.
+          type: string
+          format: date-time
+          readOnly: true
+        id:
+          description: Menu item ID. Unique identifier prefixed with `prd_`.
+          type: string
+          readOnly: true
+          pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+          example: prd_01h1s5z6vf2mm1mz3hevnn9va7
+        object:
+          description: Entity name.
+          type: string
+          const: menuItem
+          readOnly: true
+        name:
+          description: Menu item name.
+          type: string
+          minLength: 1
+          maxLength: 50
+        price:
+          description: Price in cents.
+          type: integer
+          minimum: 0
+        photo:
+          writeOnly: true
+          type:
+            - string
+            - 'null'
+          format: binary
+          description: Photo of the menu item. Must be a PNG image and less than 1MB.
+        photoUrl:
+          readOnly: true
+          type: string
+          format: uri
+          description: Photo URL of the menu item.
+        photoTextDescription:
+          type:
+            - string
+            - 'null'
+      required:
+        - id
+        - name
+        - price
+        - createdAt
+        - updatedAt
+        - object
+    Beverage:
+      allOf:
+        - type: object
+          properties:
+            category:
+              description: Menu item category.
+              type: string
+              const: beverage
+            volume:
+              type: number
+              description: Size of the beverage in milliliters.
+              exclusiveMinimum: 0
+            containsCaffeine:
+              type: boolean
+              description: Indicates if the beverage contains caffeine.
+          required:
+            - category
+            - volume
+            - containsCaffeine
+        - $ref: '#/components/schemas/MenuBaseItem'
+    Dessert:
+      allOf:
+        - type: object
+          properties:
+            category:
+              description: Menu item category.
+              type: string
+              const: dessert
+            calories:
+              type: number
+              exclusiveMinimum: 0
+              description: Amount of calories.
+          required:
+            - category
+            - calories
+        - $ref: '#/components/schemas/MenuBaseItem'
+    MenuItem:
+      discriminator:
+        propertyName: category
+        mapping:
+          beverage: '#/components/schemas/Beverage'
+          dessert: '#/components/schemas/Dessert'
+      oneOf:
+        - $ref: '#/components/schemas/Beverage'
+        - $ref: '#/components/schemas/Dessert'
+      required:
+        - category
+    MenuItemList:
+      type: object
+      properties:
+        object:
+          type: string
+          const: list
+          description: Entity name.
+        page:
+          $ref: '#/components/schemas/Page'
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/MenuItem'
+      required:
+        - object
+        - page
+        - items
+    Error:
+      type: object
+      properties:
+        type:
+          type: string
+          format: uri-reference
+          description: URI reference that identifies the problem type.
+          default: about:blank
+        title:
+          type: string
+          description: Short summary of the problem type.
+        status:
+          type: integer
+          format: int32
+          description: |
+            HTTP status code generated by the origin server for this occurrence of the problem.
+          minimum: 100
+          exclusiveMaximum: 600
+        instance:
+          type: string
+          format: uri-reference
+          description: |
+            URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+            May be used to locate the root of this problem in the source code.
+          example: /some/uri-reference#specific-occurrence-context
+        details:
+          description: Additional error details.
+          type: object
+          additionalProperties: true
+      required:
+        - type
+        - title
+        - status
+    OrderStatus:
+      type: string
+      description: Order status.
+      enum:
+        - placed
+        - preparing
+        - completed
+        - canceled
+    Order:
+      type: object
+      title: Order
+      properties:
+        id:
+          description: Order ID. Unique identifier prefixed with `ord_`.
+          type: string
+          format: ulid
+          readOnly: true
+          pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+          example: ord_01h1s5z6vf2mm1mz3hevnn9va7
+        object:
+          description: Entity name.
+          type: string
+          const: order
+          readOnly: true
+        customerName:
+          description: |
+            Name of the customer who placed the order.
+            Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+          type: string
+          pattern: ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+          minLength: 1
+          maxLength: 100
+        status:
+          allOf:
+            - $ref: '#/components/schemas/OrderStatus'
+          readOnly: true
+        totalPrice:
+          description: Total order price in cents.
+          type: integer
+          minimum: 0
+          readOnly: true
+        createdAt:
+          description: Created date.
+          type: string
+          format: date-time
+          readOnly: true
+        updatedAt:
+          description: Updated date.
+          type: string
+          format: date-time
+          readOnly: true
+        orderItems:
+          type: array
+          description: List of items to include in the order.
+          minItems: 1
+          items:
+            type: object
+            properties:
+              menuItemId:
+                type: string
+                format: ulid
+                description: ID of the menu item to add to the order.
+              quantity:
+                type: integer
+                minimum: 1
+                description: Quantity of the menu item.
+              discount:
+                type: integer
+                minimum: 0
+                description: Discount amount in cents (absolute value).
+                default: 0
+              comment:
+                type: string
+                maxLength: 500
+                description: Optional comment for the order item (e.g., "No sugar").
+            required:
+              - menuItemId
+              - quantity
+      required:
+        - customerName
+        - orderItems
+    OrderList:
+      type: object
+      properties:
+        object:
+          type: string
+          const: list
+          description: Entity name.
+        page:
+          $ref: '#/components/schemas/Page'
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/Order'
+      required:
+        - object
+        - page
+        - items
+    OrderItem:
+      type: object
+      properties:
+        menuItemId:
+          type: string
+          description: ID of the menu item to add to the order.
+          writeOnly: true
+        menuItem:
+          allOf:
+            - $ref: '#/components/schemas/MenuItem'
+          description: Menu item that is part of the order.
+          readOnly: true
+        quantity:
+          type: integer
+          minimum: 1
+          description: Quantity of the menu item.
+        discount:
+          type: integer
+          minimum: 0
+          description: Discount amount in cents (absolute value).
+          default: 0
+        comment:
+          type: string
+          maxLength: 500
+          description: Optional comment for the order item (e.g., "No sugar").
+      required:
+        - menuItemId
+        - quantity
+    RevenueStatistics:
+      type: object
+      description: Revenue statistics for a given date range.
+      properties:
+        revenue:
+          type: number
+          format: float
+          description: Total revenue in cents from completed orders.
+          minimum: 0
+        averageOrderAmount:
+          type: number
+          format: float
+          description: Average order amount in cents (calculated from completed orders only).
+          minimum: 0
+        totalOrders:
+          type: integer
+          description: Total number of orders (all statuses) in the date range.
+          minimum: 0
+        placedOrders:
+          type: integer
+          description: Number of placed orders.
+          minimum: 0
+        preparingOrders:
+          type: integer
+          description: Number of preparing orders.
+          minimum: 0
+        completedOrders:
+          type: integer
+          description: Number of completed orders.
+          minimum: 0
+        canceledOrders:
+          type: integer
+          description: Number of canceled orders.
+          minimum: 0
+        startDate:
+          type: string
+          format: date
+          description: Start date of the revenue calculation period.
+        endDate:
+          type: string
+          format: date
+          description: End date of the revenue calculation period.
+      required:
+        - revenue
+        - averageOrderAmount
+        - totalOrders
+        - placedOrders
+        - preparingOrders
+        - completedOrders
+        - canceledOrders
+        - startDate
+        - endDate
+    RegisterClientObject:
+      type: object
+      properties:
+        name:
+          type: string
+          description: Client name.
+        redirectUris:
+          type: array
+          items:
+            type: string
+            format: uri
+          description: List of redirect URIs (optional, defaults to empty array).
+        scopes:
+          type: array
+          items:
+            type: string
+            enum:
+              - menu:read
+              - menu:write
+              - orders:read
+              - orders:write
+          description: List of scopes.
+        grantTypes:
+          type: array
+          items:
+            type: string
+            enum:
+              - authorization_code
+              - client_credentials
+          description: List of grant types.
+      required:
+        - name
+    OAuth2Client:
+      type: object
+      description: OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+      properties:
+        clientId:
+          type: string
+          description: Client identifier issued by the authorization server.
+        clientSecret:
+          type: string
+          description: Client secret issued by the authorization server.
+        clientIdIssuedAt:
+          type: integer
+          format: int64
+          description: Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+        clientSecretExpiresAt:
+          type: integer
+          format: int64
+          description: Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+        name:
+          type: string
+          description: Client name (registered metadata).
+        redirectUris:
+          type: array
+          items:
+            type: string
+            format: uri
+          description: List of redirect URIs (registered metadata).
+        registrationClientUri:
+          type: string
+          format: uri
+          description: URL of the client configuration endpoint for managing this client registration (RFC 7592).
+        registrationAccessToken:
+          type: string
+          description: Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+        scopes:
+          type: array
+          items:
+            type: string
+            enum:
+              - menu:read
+              - menu:write
+              - orders:read
+              - orders:write
+          description: List of scopes (registered metadata).
+        grantTypes:
+          type: array
+          items:
+            type: string
+            enum:
+              - authorization_code
+              - client_credentials
+          description: List of grant types (registered metadata).
+      required:
+        - clientId
+        - clientSecret
+        - clientIdIssuedAt
+        - clientSecretExpiresAt
+        - registrationClientUri
+        - registrationAccessToken
+    OrderNotification:
+      type: object
+      required:
+        - orderId
+        - orderStatus
+        - timestamp
+      properties:
+        orderId:
+          type: string
+          description: Unique order identifier.
+        orderStatus:
+          $ref: '#/components/schemas/OrderStatus'
+        timestamp:
+          type: string
+          format: date-time
+          description: When the event occurred.
+  responses:
+    BadRequest:
+      description: Bad request - invalid input parameters.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    InternalServerError:
+      description: Internal server error.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Unauthorized:
+      description: Unauthorized - authorization required.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Forbidden:
+      description: Forbidden - insufficient permissions.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Conflict:
+      description: Conflict - entity already exists.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    NotFound:
+      description: Resource not found.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
diff --git a/packages/openapi-typescript/examples/programmatic/package.json b/packages/openapi-typescript/examples/programmatic/package.json
new file mode 100644
index 0000000000..e2066df025
--- /dev/null
+++ b/packages/openapi-typescript/examples/programmatic/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "@redocly-examples/programmatic",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "generate": "tsx generate.ts"
+  },
+  "devDependencies": {
+    "@redocly/openapi-typescript": "latest",
+    "tsx": "^4.0.0",
+    "typescript": "^5.5.0"
+  }
+}
diff --git a/packages/openapi-typescript/examples/programmatic/src/api/client.ts b/packages/openapi-typescript/examples/programmatic/src/api/client.ts
new file mode 100644
index 0000000000..dcb4900f7c
--- /dev/null
+++ b/packages/openapi-typescript/examples/programmatic/src/api/client.ts
@@ -0,0 +1,1513 @@
+// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Redocly Cafe (v1.0.0)
+ * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+ * Create API credentials and try it yourself in a realistic OpenAPI workflow.
+ * 
+ */
+
+export type Page = {
+    /**
+     * Use with the `after` query parameter to load the next page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    endCursor: string | null;
+    /**
+     * Use with the `before` query parameter to load the previous page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    startCursor: string | null;
+    /**
+     * Indicates if there is a next page with items.
+     */
+    hasNextPage: boolean;
+    /**
+     * Indicates if there is a previous page with items.
+     */
+    hasPrevPage: boolean;
+    /**
+     * Value showing how many items are in the page limit.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit: number;
+    /**
+     * Count of items across all pages.
+     * @minimum 0
+     */
+    total: number;
+};
+
+export type MenuBaseItem = {
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt: string;
+    /**
+     * Menu item ID. Unique identifier prefixed with `prd_`.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    readonly id: string;
+    /**
+     * Entity name.
+     */
+    readonly object: "menuItem";
+    /**
+     * Menu item name.
+     * @minLength 1
+     * @maxLength 50
+     */
+    name: string;
+    /**
+     * Price in cents.
+     * @minimum 0
+     */
+    price: number;
+    /**
+     * Photo of the menu item. Must be a PNG image and less than 1MB.
+     * @format binary
+     */
+    photo?: Blob | null;
+    /**
+     * Photo URL of the menu item.
+     * @format uri
+     */
+    readonly photoUrl?: string;
+    photoTextDescription?: string | null;
+};
+
+export type Beverage = {
+    /**
+     * Menu item category.
+     */
+    category: "beverage";
+    /**
+     * Size of the beverage in milliliters.
+     * @exclusiveMinimum 0
+     */
+    volume: number;
+    /**
+     * Indicates if the beverage contains caffeine.
+     */
+    containsCaffeine: boolean;
+} & MenuBaseItem;
+
+export type Dessert = {
+    /**
+     * Menu item category.
+     */
+    category: "dessert";
+    /**
+     * Amount of calories.
+     * @exclusiveMinimum 0
+     */
+    calories: number;
+} & MenuBaseItem;
+
+export type MenuItem = Beverage | Dessert;
+
+export type MenuItemList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: MenuItem[];
+};
+
+export type Error = {
+    /**
+     * URI reference that identifies the problem type.
+     * @format uri-reference
+     */
+    type: string;
+    /**
+     * Short summary of the problem type.
+     */
+    title: string;
+    /**
+     * HTTP status code generated by the origin server for this occurrence of the problem.
+     * @minimum 100
+     * @exclusiveMaximum 600
+     * @format int32
+     */
+    status: number;
+    /**
+     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+     * May be used to locate the root of this problem in the source code.
+     * @format uri-reference
+     */
+    instance?: string;
+    /**
+     * Additional error details.
+     */
+    details?: Record<string, unknown>;
+};
+
+/**
+ * Order status.
+ */
+export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
+
+export const OrderStatus = {
+    placed: "placed",
+    preparing: "preparing",
+    completed: "completed",
+    canceled: "canceled"
+} as const;
+
+export type Order = {
+    /**
+     * Order ID. Unique identifier prefixed with `ord_`.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     * @format ulid
+     */
+    readonly id?: string;
+    /**
+     * Entity name.
+     */
+    readonly object?: "order";
+    /**
+     * Name of the customer who placed the order.
+     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+     * @minLength 1
+     * @maxLength 100
+     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+     */
+    customerName: string;
+    readonly status?: OrderStatus;
+    /**
+     * Total order price in cents.
+     * @minimum 0
+     */
+    readonly totalPrice?: number;
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt?: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt?: string;
+    /**
+     * List of items to include in the order.
+     * @minItems 1
+     */
+    orderItems: {
+        /**
+         * ID of the menu item to add to the order.
+         * @format ulid
+         */
+        menuItemId: string;
+        /**
+         * Quantity of the menu item.
+         * @minimum 1
+         */
+        quantity: number;
+        /**
+         * Discount amount in cents (absolute value).
+         * @minimum 0
+         */
+        discount?: number;
+        /**
+         * Optional comment for the order item (e.g., "No sugar").
+         * @maxLength 500
+         */
+        comment?: string;
+    }[];
+};
+
+export type OrderList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: Order[];
+};
+
+export type OrderItem = {
+    /**
+     * ID of the menu item to add to the order.
+     */
+    menuItemId: string;
+    /**
+     * Menu item that is part of the order.
+     */
+    readonly menuItem?: MenuItem;
+    /**
+     * Quantity of the menu item.
+     * @minimum 1
+     */
+    quantity: number;
+    /**
+     * Discount amount in cents (absolute value).
+     * @minimum 0
+     */
+    discount?: number;
+    /**
+     * Optional comment for the order item (e.g., "No sugar").
+     * @maxLength 500
+     */
+    comment?: string;
+};
+
+/**
+ * Revenue statistics for a given date range.
+ */
+export type RevenueStatistics = {
+    /**
+     * Total revenue in cents from completed orders.
+     * @minimum 0
+     * @format float
+     */
+    revenue: number;
+    /**
+     * Average order amount in cents (calculated from completed orders only).
+     * @minimum 0
+     * @format float
+     */
+    averageOrderAmount: number;
+    /**
+     * Total number of orders (all statuses) in the date range.
+     * @minimum 0
+     */
+    totalOrders: number;
+    /**
+     * Number of placed orders.
+     * @minimum 0
+     */
+    placedOrders: number;
+    /**
+     * Number of preparing orders.
+     * @minimum 0
+     */
+    preparingOrders: number;
+    /**
+     * Number of completed orders.
+     * @minimum 0
+     */
+    completedOrders: number;
+    /**
+     * Number of canceled orders.
+     * @minimum 0
+     */
+    canceledOrders: number;
+    /**
+     * Start date of the revenue calculation period.
+     * @format date
+     */
+    startDate: string;
+    /**
+     * End date of the revenue calculation period.
+     * @format date
+     */
+    endDate: string;
+};
+
+export type RegisterClientObject = {
+    /**
+     * Client name.
+     */
+    name: string;
+    /**
+     * List of redirect URIs (optional, defaults to empty array).
+     */
+    redirectUris?: string[];
+    /**
+     * List of scopes.
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types.
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+/**
+ * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+ */
+export type OAuth2Client = {
+    /**
+     * Client identifier issued by the authorization server.
+     */
+    clientId: string;
+    /**
+     * Client secret issued by the authorization server.
+     */
+    clientSecret: string;
+    /**
+     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+     * @format int64
+     */
+    clientIdIssuedAt: number;
+    /**
+     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+     * @format int64
+     */
+    clientSecretExpiresAt: number;
+    /**
+     * Client name (registered metadata).
+     */
+    name?: string;
+    /**
+     * List of redirect URIs (registered metadata).
+     */
+    redirectUris?: string[];
+    /**
+     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
+     * @format uri
+     */
+    registrationClientUri: string;
+    /**
+     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+     */
+    registrationAccessToken: string;
+    /**
+     * List of scopes (registered metadata).
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types (registered metadata).
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+export type OrderNotification = {
+    /**
+     * Unique order identifier.
+     */
+    orderId: string;
+    orderStatus: OrderStatus;
+    /**
+     * When the event occurred.
+     * @format date-time
+     */
+    timestamp: string;
+};
+
+/**
+ * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
+ */
+export function isBeverage(value: MenuItem): value is Beverage {
+    return (value as Record<string, unknown>)["category"] === "beverage";
+}
+
+/**
+ * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
+ */
+export function isDessert(value: MenuItem): value is Dessert {
+    return (value as Record<string, unknown>)["category"] === "dessert";
+}
+
+/**
+ * Static metadata for every operation, keyed by operationId: the HTTP `method`
+ * and the `path` template (with `{param}` placeholders intact). Minification-safe
+ * — useful for building cache/query keys, tracing span names, and request logging
+ * without re-deriving them at each call site.
+ */
+export const OPERATIONS = {
+    listMenuItems: { method: "GET", path: "/menu" },
+    createMenuItem: { method: "POST", path: "/menu" },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
+    listOrders: { method: "GET", path: "/orders" },
+    createOrder: { method: "POST", path: "/orders" },
+    getOrderById: { method: "GET", path: "/orders/{orderId}" },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
+    listOrderItems: { method: "GET", path: "/order-items" },
+    getRevenue: { method: "GET", path: "/revenue" },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
+} as const;
+
+/**
+ * The operationId of any operation in this client.
+ */
+export type OperationId = keyof typeof OPERATIONS;
+
+/**
+ * Static metadata describing one operation: its HTTP method and path template.
+ */
+export type OperationMetadata = {
+    readonly method: string;
+    readonly path: string;
+};
+
+let BASE = "https://cafe.cloud.redocly.com";
+
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+export type RequestContext = {
+    url: string;
+    method: string;
+    headers: Record<string, string>;
+    body?: unknown;
+};
+
+/**
+ * Configuration and extension hooks for a client. Supplied per-instance via
+ * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
+ * (functions facade).
+ */
+export type ClientConfig = {
+    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    baseUrl?: string;
+    /** Extra headers merged into every request; a function is invoked per request. */
+    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+    /** Transport used to issue requests. Defaults to the global `fetch`. */
+    fetch?: typeof fetch;
+    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    /** Observe — or replace, by returning a `Response` — the response before parsing. */
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    /**
+     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
+     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
+     */
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
+    /**
+     * Composable interceptors run around every request, alongside the single
+     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
+     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
+     * the last-registered middleware wraps closest to the network. Register more at runtime
+     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
+     */
+    middleware?: Middleware[];
+    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
+    retry?: RetryConfig;
+    /**
+     * Per-instance auth credentials. When set, they override the module-global
+     * `set*` helpers for requests made through this config (each scheme falls back
+     * to its global slot when omitted here). Only the schemes an operation declares
+     * in its `security` are ever sent.
+     */
+    auth?: AuthCredentials;
+};
+
+/**
+ * A request interceptor; every field is optional, so a middleware can hook any subset of
+ * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
+ * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
+ * failure into the error to throw, threaded through each middleware in turn.
+ */
+export type Middleware = {
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/** Context handed to `retryOn` for the attempt that just failed. */
+export type RetryContext = {
+    /** 1-based number of the attempt that just failed. */
+    attempt: number;
+    /** The request that was attempted. */
+    request: RequestContext;
+    /** Present when the server returned a (non-ok) response. */
+    response?: Response;
+    /** Present when the transport threw (network error, DNS, connection reset). */
+    error?: unknown;
+};
+
+/** Retry policy; all fields optional with sensible defaults. */
+export type RetryConfig = {
+    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
+    retries?: number;
+    /** Base delay in milliseconds. Default 1000. */
+    retryDelay?: number;
+    /** Backoff shape. Default 'exponential'. */
+    retryStrategy?: RetryStrategy;
+    /** Apply full jitter over the computed delay. Default true. */
+    jitter?: boolean;
+    /**
+     * Decide whether to retry a failed attempt. Default: retry only idempotent
+     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
+     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
+     */
+    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
+};
+
+/**
+ * How the response body is read. `'auto'` negotiates from the content type (the
+ * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
+ */
+export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
+
+/**
+ * The trailing per-operation argument: standard `RequestInit` plus an optional
+ * per-call retry override and a `parseAs` escape hatch.
+ *
+ * `parseAs` forces how the response body is read; overrides the inferred kind.
+ * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
+ * override — the static return type is unchanged.
+ */
+export type RequestOptions = RequestInit & {
+    retry?: Partial<RetryConfig>;
+    parseAs?: ParseAs;
+};
+
+/**
+ * Override the base URL used by every generated operation. Useful when the
+ * runtime environment differs from the value declared in `servers[0].url`
+ * (e.g. dev / staging / prod toggles in a single-page app).
+ *
+ * Mutates a module-scoped binding shared by the functions facade. For multiple
+ * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ */
+export function setBaseUrl(url: string): void {
+    BASE = url;
+}
+
+/** The global config used by the functions facade (see `configure`). */
+const __config: ClientConfig = {};
+
+/**
+ * Merge `config` into the global configuration used by the functions facade —
+ * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
+ * hooks once for every free function. The service-class facade configures per
+ * instance instead (`new Client(config)`).
+ */
+export function configure(config: ClientConfig): void {
+    Object.assign(__config, config);
+}
+
+/**
+ * Append interceptors to the functions facade's global middleware chain (see
+ * `ClientConfig.middleware`). The service-class facade registers per instance via
+ * `<Client>.use(...)` instead.
+ */
+export function use(...middleware: Middleware[]): void {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    __config.middleware = [...(__config.middleware ?? []), ...middleware];
+}
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function __middleware(config: ClientConfig): Middleware[] {
+    const single = config.onRequest || config.onResponse || config.onError
+        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+        : [];
+    return [...single, ...(config.middleware ?? [])];
+}
+
+export class ApiError extends Error {
+    public readonly url: string;
+    public readonly status: number;
+    public readonly statusText: string;
+    public readonly body: unknown;
+    constructor(url: string, status: number, statusText: string, body: unknown) {
+        super(`Request failed with status ${status}`);
+        this.name = 'ApiError';
+        this.url = url;
+        this.status = status;
+        this.statusText = statusText;
+        this.body = body;
+    }
+}
+
+type QueryPrimitive = string | number | boolean;
+
+type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
+
+/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
+type QueryStyle = {
+    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+    explode: boolean;
+    allowReserved?: boolean;
+};
+
+/**
+ * Percent-encode `value` but leave the RFC-3986 reserved set
+ * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
+ */
+function __encodeReserved(value: string): string {
+    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
+}
+
+function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
+    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    if (!query)
+        return url;
+    const params = new URLSearchParams();
+    const raw: string[] = [];
+    for (const [key, value] of Object.entries(query)) {
+        if (value === undefined || value === null)
+            continue;
+        const spec = styles?.[key];
+        if (!spec) {
+            if (Array.isArray(value)) {
+                for (const v of value) {
+                    if (v !== undefined && v !== null)
+                        params.append(key, String(v));
+                }
+            }
+            else if (typeof value === 'object') {
+                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+                for (const [subKey, subValue] of Object.entries(value)) {
+                    if (subValue !== undefined && subValue !== null) {
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                    }
+                }
+            }
+            else {
+                params.append(key, String(value));
+            }
+            continue;
+        }
+        if (Array.isArray(value)) {
+            const items = value.filter((v) => v !== undefined && v !== null).map(String);
+            if (spec.style === 'form' && spec.explode) {
+                for (const v of items) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}=${__encodeReserved(v)}`);
+                    else
+                        params.append(key, v);
+                }
+            }
+            else {
+                // Delimited styles put the LITERAL delimiter on the wire; only the
+                // values are encoded. `%20` (not `+`) is the literal space delimiter.
+                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
+                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+            }
+        }
+        else if (typeof value === 'object') {
+            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+            for (const [subKey, subValue] of Object.entries(value)) {
+                if (subValue !== undefined && subValue !== null) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
+                    else
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                }
+            }
+        }
+        else if (spec.allowReserved) {
+            raw.push(`${key}=${__encodeReserved(String(value))}`);
+        }
+        else {
+            params.append(key, String(value));
+        }
+    }
+    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+    return qs ? `${url}?${qs}` : url;
+}
+
+async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+    response: Response;
+    context: RequestContext;
+}> {
+    const { retry: callRetry, ...fetchInit } = init;
+    const retry: RetryConfig = { ...config.retry, ...callRetry };
+    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+    const headers: Record<string, string> = {
+        Accept: 'application/json',
+        ...extra,
+        ...(fetchInit.headers as Record<string, string> | undefined),
+    };
+    let payload: BodyInit | undefined;
+    if (body !== undefined) {
+        const isBinary = body instanceof Blob ||
+            body instanceof ArrayBuffer ||
+            ArrayBuffer.isView(body as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
+        const isURLSearchParams = body instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
+            payload = body as BodyInit;
+        }
+        else {
+            payload = JSON.stringify(body);
+            if (!('Content-Type' in headers) && !('content-type' in headers)) {
+                headers['Content-Type'] = 'application/json';
+            }
+        }
+    }
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    const doFetch = config.fetch ?? fetch;
+    const maxAttempts = 1 + (retry.retries ?? 0);
+    const retryOn = retry.retryOn ?? __defaultRetryOn;
+    const signal = fetchInit.signal ?? undefined;
+    let attempt = 0;
+    while (true) {
+        attempt++;
+        if (signal?.aborted)
+            throw __abortError(signal);
+        let response: Response;
+        try {
+            response = await doFetch(context.url, {
+                ...fetchInit,
+                method: context.method,
+                headers: context.headers,
+                body: payload,
+            });
+        }
+        catch (error) {
+            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
+                await __sleep(__retryDelay(retry, attempt, null), signal);
+                continue;
+            }
+            throw error;
+        }
+        // Reverse order: the last-registered middleware wraps closest to the network (onion).
+        for (let i = middleware.length - 1; i >= 0; i--) {
+            const onResponse = middleware[i].onResponse;
+            if (onResponse) {
+                const replaced = await onResponse(response, context);
+                if (replaced)
+                    response = replaced;
+            }
+        }
+        if (!response.ok &&
+            attempt < maxAttempts &&
+            !signal?.aborted &&
+            (await retryOn({ attempt, request: context, response }))) {
+            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            continue;
+        }
+        return { response, context };
+    }
+}
+
+async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+    if (kind === 'void' || response.status === 204)
+        return undefined;
+    if (kind === 'stream')
+        return response.body;
+    if (kind === 'blob')
+        return response.blob();
+    if (kind === 'arrayBuffer')
+        return response.arrayBuffer();
+    if (kind === 'formData')
+        return response.formData();
+    if (kind === 'text')
+        return response.text();
+    if (kind === 'json')
+        return response.json();
+    // 'auto' — negotiate from the response's content type.
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json'))
+        return response.json();
+    if (contentType.startsWith('text/'))
+        return response.text();
+    return response.blob();
+}
+
+async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+    const { parseAs, ...sendInit } = init;
+    const { response, context } = await __send(config, url, sendInit, body);
+    if (!response.ok) {
+        const errorBody = await readError(response);
+        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
+        // Thread the error through each middleware's onError in turn (each may replace it).
+        for (const mw of __middleware(config)) {
+            if (mw.onError)
+                error = await mw.onError(error as ApiError, context);
+        }
+        throw error;
+    }
+    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
+    return (await __parse(response, kind)) as T;
+}
+
+async function readError(response: Response): Promise<unknown> {
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json')) {
+        return response.json().catch(() => undefined);
+    }
+    return response.text().catch(() => undefined);
+}
+
+const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+
+const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+function __defaultRetryOn(ctx: RetryContext): boolean {
+    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
+        return false;
+    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+    if (retryAfter) {
+        const seconds = Number(retryAfter);
+        if (!Number.isNaN(seconds))
+            return seconds * 1000;
+        const when = Date.parse(retryAfter);
+        if (!Number.isNaN(when))
+            return Math.max(0, when - Date.now());
+    }
+    const base = retry.retryDelay ?? 1000;
+    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+    return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
+    return new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject(__abortError(signal));
+            return;
+        }
+        const onAbort = () => {
+            clearTimeout(timer);
+            reject(__abortError(signal as AbortSignal));
+        };
+        const timer = setTimeout(() => {
+            if (signal)
+                signal.removeEventListener('abort', onAbort);
+            resolve();
+        }, ms);
+        if (signal)
+            signal.addEventListener('abort', onAbort, { once: true });
+    });
+}
+
+function __abortError(signal: AbortSignal): globalThis.Error {
+    const reason = (signal as {
+        reason?: unknown;
+    }).reason;
+    if (reason instanceof Error)
+        return reason;
+    return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * Normalize an operation's header-parameter object into a plain string record,
+ * dropping any `undefined` / `null` entries (optional headers the caller omitted)
+ * and stringifying the rest. Mirrors __buildUrl's handling of query values.
+ */
+function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
+    const out: Record<string, string> = {};
+    for (const [key, value] of Object.entries(values)) {
+        if (value !== undefined && value !== null)
+            out[key] = String(value);
+    }
+    return out;
+}
+
+/**
+ * A credential value, or a (possibly async) function that returns one per request.
+ */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/**
+ * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
+ * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
+ * to the global slots.
+ */
+export type AuthCredentials = {
+    bearer?: TokenProvider;
+    apiKey?: Record<string, TokenProvider>;
+};
+
+let __bearerToken: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
+ * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
+ * (possibly async) function resolved per request.
+ */
+export function setBearer(token: TokenProvider | null): void {
+    __bearerToken = token;
+}
+
+let __apiKey_ApiKey: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
+ * string or a (possibly async) function resolved per request.
+ */
+export function setApiKey(key: TokenProvider | null): void {
+    __apiKey_ApiKey = key;
+}
+
+/**
+ * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
+ */
+async function __resolve(slot: TokenProvider | null): Promise<string | null> {
+    if (slot === null)
+        return null;
+    return typeof slot === "function" ? slot() : slot;
+}
+
+/**
+ * Build the auth `headers` and `query` for an operation from the currently-set credentials.
+ * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
+ * can always override by passing their own `init.headers`.
+ */
+async function __auth(schemes: string[], config: ClientConfig): Promise<{
+    headers: Record<string, string>;
+    query: Record<string, string>;
+}> {
+    const headers: Record<string, string> = {};
+    const query: Record<string, string> = {};
+    const cookies: string[] = [];
+    for (const scheme of schemes) {
+        switch (scheme) {
+            case "OAuth2": {
+                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
+                if (v !== null)
+                    headers["Authorization"] = `Bearer ${v}`;
+                break;
+            }
+            case "ApiKey": {
+                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
+                if (v !== null)
+                    headers["X-API-Key"] = v;
+                break;
+            }
+        }
+    }
+    if (cookies.length > 0)
+        headers["Cookie"] = cookies.join("; ");
+    return { headers, query };
+}
+
+export type ListMenuItemsResult = MenuItemList;
+
+export type ListMenuItemsParams = {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+};
+
+export type ListMenuItemsVariables = {
+    params?: ListMenuItemsParams;
+};
+
+/**
+ * List all menu items
+ *
+ * Retrieve a collection of menu items with optional filtering and pagination.
+ */
+export async function listMenuItems(params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
+    return __request<MenuItemList>(__config, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
+}
+
+export type CreateMenuItemResult = MenuItem;
+
+export type CreateMenuItemBody = FormData;
+
+export type CreateMenuItemVariables = {
+    body: CreateMenuItemBody;
+};
+
+/**
+ * Create menu item
+ *
+ * Create a new menu item.
+ */
+export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<MenuItem>(__config, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type DeleteMenuItemResult = void;
+
+export type DeleteMenuItemVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+};
+
+/**
+ * Delete a menu item
+ *
+ * Delete an existing menu item.
+ */
+export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type GetMenuItemPhotoResult = Blob | string;
+
+export type GetMenuItemPhotoParams = {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+};
+
+export type GetMenuItemPhotoVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+    params?: GetMenuItemPhotoParams;
+};
+
+/**
+ * Retrieve a menu item photo
+ *
+ * Retrieve the product photo image for a specific menu item.
+ */
+export async function getMenuItemPhoto(menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}): Promise<Blob | string> {
+    return __request<Blob | string>(__config, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+}
+
+export type ListOrdersResult = OrderList;
+
+export type ListOrdersParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+};
+
+export type ListOrdersVariables = {
+    params?: ListOrdersParams;
+};
+
+/**
+ * List all orders
+ *
+ * Retrieve a collection of orders with optional filtering and pagination.
+ */
+export async function listOrders(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderList> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderList>(__config, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+/**
+ * Create order
+ *
+ * Create a new order.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    headers?: GetOrderByIdHeaders;
+};
+
+/**
+ * Retrieve an order
+ *
+ * Retrieve a single order by its ID.
+ */
+export async function getOrderById(orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+}
+
+export type DeleteOrderResult = void;
+
+export type DeleteOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+};
+
+/**
+ * Delete an order
+ *
+ * Delete the order.
+ * To keep the order history, the order should be canceled instead of deleted.
+ */
+export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type UpdateOrderResult = Order;
+
+export type UpdateOrderBody = {
+    status: OrderStatus;
+};
+
+export type UpdateOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    body?: UpdateOrderBody;
+};
+
+/**
+ * Partially update an order
+ *
+ * Update an existing order status.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function updateOrder(orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type ListOrderItemsResult = OrderItem[];
+
+export type ListOrderItemsParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+};
+
+export type ListOrderItemsVariables = {
+    params?: ListOrderItemsParams;
+};
+
+/**
+ * List all order items with menu item details
+ *
+ * Returns an array of order items for a specific order.
+ * Use the `filter` parameter to filter by order ID.
+ */
+export async function listOrderItems(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderItem[]>(__config, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+/**
+ * Get revenue statistics
+ *
+ * Retrieve revenue statistics for a configurable date range.
+ * Returns revenue, order counts, average order amount, and other useful statistics.
+ */
+export async function getRevenue(params: {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
+    const __a = await __auth(["ApiKey"], __config);
+    return __request<RevenueStatistics>(__config, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Create OAuth2 client
+ *
+ * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+ * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
+ *   `redirectUris` must be provided (per RFC 7591 Section 2).
+ * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+ * Returns the registered client information per RFC 7591, including:
+ * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+ */
+export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
+    return __request<OAuth2Client>(__config, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+}
diff --git a/packages/openapi-typescript/examples/programmatic/src/main.ts b/packages/openapi-typescript/examples/programmatic/src/main.ts
new file mode 100644
index 0000000000..37a9f18687
--- /dev/null
+++ b/packages/openapi-typescript/examples/programmatic/src/main.ts
@@ -0,0 +1,9 @@
+// Consume the programmatically-generated client. The output is identical to the CLI's —
+// programmatic generation only changes *how* you invoke the generator, not what it emits.
+import { configure, listMenuItems } from './api/client';
+
+configure({ baseUrl: 'https://cafe.cloud.redocly.com' });
+
+export async function loadMenu() {
+  return listMenuItems();
+}
diff --git a/packages/openapi-typescript/examples/programmatic/tsconfig.json b/packages/openapi-typescript/examples/programmatic/tsconfig.json
new file mode 100644
index 0000000000..4bd6962d40
--- /dev/null
+++ b/packages/openapi-typescript/examples/programmatic/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../tsconfig.base.json",
+  "include": ["src"]
+}
diff --git a/packages/openapi-typescript/examples/service-class/.gitignore b/packages/openapi-typescript/examples/service-class/.gitignore
new file mode 100644
index 0000000000..f06235c460
--- /dev/null
+++ b/packages/openapi-typescript/examples/service-class/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+dist
diff --git a/packages/openapi-typescript/examples/service-class/README.md b/packages/openapi-typescript/examples/service-class/README.md
new file mode 100644
index 0000000000..d5d54d735c
--- /dev/null
+++ b/packages/openapi-typescript/examples/service-class/README.md
@@ -0,0 +1,14 @@
+# service-class example
+
+Generated TypeScript client using the **service-class facade** (`generators: ['sdk']`). Operations are
+methods on a `Client` configured per instance (`new Client({ baseUrl })`).
+
+## Run
+
+```bash
+npm install
+npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
+npm run dev        # open the printed local URL
+```
+
+The generated client under `src/api/` is committed and drift-checked against the generator in CI.
diff --git a/packages/openapi-typescript/examples/service-class/index.html b/packages/openapi-typescript/examples/service-class/index.html
new file mode 100644
index 0000000000..6476b9983e
--- /dev/null
+++ b/packages/openapi-typescript/examples/service-class/index.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>Redocly openapi-typescript — service-class example</title>
+  </head>
+  <body>
+    <pre id="out">Loading…</pre>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
diff --git a/packages/openapi-typescript/examples/service-class/openapi.yaml b/packages/openapi-typescript/examples/service-class/openapi.yaml
new file mode 100644
index 0000000000..a6a75dffd0
--- /dev/null
+++ b/packages/openapi-typescript/examples/service-class/openapi.yaml
@@ -0,0 +1,1163 @@
+openapi: 3.2.0
+info:
+  title: Redocly Cafe
+  description: |
+    Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+    Create API credentials and try it yourself in a realistic OpenAPI workflow.
+  version: 1.0.0
+  contact:
+    email: team@redocly.com
+    url: https://redocly.com/contact-us/
+  license:
+    name: MIT
+    url: https://opensource.org/licenses/MIT
+  termsOfService: https://redocly.com/subscription-agreement
+servers:
+  - url: https://cafe.cloud.redocly.com
+    description: Live server.
+tags:
+  - name: Authorization
+    description: Create a client to demo the API.
+  - name: Products
+    description: Operations related to products.
+  - name: Orders
+    description: Order management operations.
+  - name: Statistics
+    description: Statistics operations.
+paths:
+  /menu:
+    get:
+      tags:
+        - Products
+      summary: List all menu items
+      description: Retrieve a collection of menu items with optional filtering and pagination.
+      operationId: listMenuItems
+      security: []
+      parameters:
+        - $ref: '#/components/parameters/After'
+        - $ref: '#/components/parameters/Before'
+        - $ref: '#/components/parameters/Sort'
+        - $ref: '#/components/parameters/Filter'
+        - $ref: '#/components/parameters/Search'
+        - $ref: '#/components/parameters/Limit'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItemList'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    post:
+      tags:
+        - Products
+      summary: Create menu item
+      description: Create a new menu item.
+      operationId: createMenuItem
+      security:
+        - OAuth2:
+            - menu:write
+      requestBody:
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              $ref: '#/components/schemas/MenuItem'
+      responses:
+        '201':
+          description: Menu item created successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItem'
+              examples:
+                MenuItemResponse:
+                  value:
+                    id: prd_01khr487f7qm7p44xn427m43vb
+                    object: menuItem
+                    name: coffee
+                    price: 4000
+                    category: beverage
+                    createdAt: '2026-02-18T10:20:38.228Z'
+                    updatedAt: '2026-02-18T10:20:38.228Z'
+                    volume: 600
+                    containsCaffeine: false
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '409':
+          $ref: '#/components/responses/Conflict'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /menu/{menuItemId}:
+    parameters:
+      - $ref: '#/components/parameters/MenuItemId'
+    delete:
+      tags:
+        - Products
+      summary: Delete a menu item
+      description: Delete an existing menu item.
+      operationId: deleteMenuItem
+      security:
+        - OAuth2:
+            - menu:write
+      responses:
+        '204':
+          description: Menu item deleted successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /menu-item-images/{menuItemId}:
+    parameters:
+      - $ref: '#/components/parameters/MenuItemId'
+    get:
+      operationId: getMenuItemPhoto
+      summary: Retrieve a menu item photo
+      description: Retrieve the product photo image for a specific menu item.
+      security: []
+      tags:
+        - Products
+      parameters:
+        - $ref: '#/components/parameters/PhotoSize'
+      responses:
+        '200':
+          description: Menu item photo retrieved successfully.
+          content:
+            image/png:
+              schema:
+                type: string
+                format: binary
+            text/plain:
+              schema:
+                description: Alternative image text.
+                type: string
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /orders:
+    get:
+      tags:
+        - Orders
+      summary: List all orders
+      description: Retrieve a collection of orders with optional filtering and pagination.
+      operationId: listOrders
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/Filter'
+        - $ref: '#/components/parameters/Sort'
+        - $ref: '#/components/parameters/Limit'
+        - $ref: '#/components/parameters/After'
+        - $ref: '#/components/parameters/Before'
+        - $ref: '#/components/parameters/Search'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OrderList'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    post:
+      tags:
+        - Orders
+      summary: Create order
+      description: |
+        Create a new order.
+        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+      operationId: createOrder
+      security:
+        - OAuth2:
+            - orders:write
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Order'
+            examples:
+              OrderRequest:
+                dataValue:
+                  customerName: Mary Ann
+                  orderItems:
+                    - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                      quantity: 2
+                      comment: No sugar!
+                      discount: 0
+      responses:
+        '201':
+          description: Order placed successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: placed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /orders/{orderId}:
+    get:
+      tags:
+        - Orders
+      summary: Retrieve an order
+      description: Retrieve a single order by its ID.
+      operationId: getOrderById
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+        - name: X-Request-Id
+          in: header
+          required: false
+          description: |
+            Optional client-supplied correlation ID, echoed in logs and traces.
+          schema:
+            type: string
+            format: uuid
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: placed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    patch:
+      tags:
+        - Orders
+      summary: Partially update an order
+      description: |
+        Update an existing order status.
+        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+      operationId: updateOrder
+      security:
+        - OAuth2:
+            - orders:write
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              description: |
+                Partial order update using JSON Merge Patch - only include fields to update.
+              properties:
+                status:
+                  $ref: '#/components/schemas/OrderStatus'
+              required:
+                - status
+      responses:
+        '200':
+          description: Order updated successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: completed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    delete:
+      tags:
+        - Orders
+      summary: Delete an order
+      description: |
+        Delete the order.
+        To keep the order history, the order should be canceled instead of deleted.
+      operationId: deleteOrder
+      security:
+        - OAuth2:
+            - orders:write
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+      responses:
+        '204':
+          description: Order deleted successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /order-items:
+    get:
+      tags:
+        - Orders
+      summary: List all order items with menu item details
+      description: |
+        Returns an array of order items for a specific order.
+        Use the `filter` parameter to filter by order ID.
+      operationId: listOrderItems
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/Filter'
+          required: true
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                type: array
+                description: List of menu items that are part of the order.
+                items:
+                  $ref: '#/components/schemas/OrderItem'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /revenue:
+    get:
+      tags:
+        - Statistics
+      summary: Get revenue statistics
+      description: |
+        Retrieve revenue statistics for a configurable date range.
+        Returns revenue, order counts, average order amount, and other useful statistics.
+      operationId: getRevenue
+      security:
+        - ApiKey: []
+      parameters:
+        - name: startDate
+          in: query
+          required: false
+          description: |
+            Start date for the revenue calculation period (ISO 8601 datetime format).
+            Defaults to 30 days ago if not provided.
+          schema:
+            type: string
+            format: date
+          example: '2026-01-01'
+        - name: endDate
+          in: query
+          required: false
+          description: |
+            End date for the revenue calculation period (ISO 8601 datetime format).
+            Defaults to current time if not provided.
+          schema:
+            type: string
+            format: date
+          example: '2026-01-31'
+      responses:
+        '200':
+          description: Revenue statistics retrieved successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RevenueStatistics'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /oauth2/register:
+    post:
+      tags:
+        - Authorization
+      summary: Create OAuth2 client
+      description: |
+        Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+        - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type, 
+          `redirectUris` must be provided (per RFC 7591 Section 2).
+        - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+        Returns the registered client information per RFC 7591, including:
+        - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+      operationId: registerOAuth2Client
+      security: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/RegisterClientObject'
+      responses:
+        '201':
+          description: OAuth2 client registered successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OAuth2Client'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+webhooks:
+  order-notification:
+    post:
+      tags:
+        - Orders
+      operationId: orderNotificationWebhook
+      security: []
+      summary: Order notification webhook
+      description: Webhook triggered when a new order is placed.
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/OrderNotification'
+      responses:
+        '200':
+          description: Webhook received successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+components:
+  securitySchemes:
+    OAuth2:
+      type: oauth2
+      description: OAuth2 authorization for API access.
+      flows:
+        authorizationCode:
+          authorizationUrl: https://cafe.cloud.redocly.com/oauth2/authorize
+          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          scopes:
+            menu:read: Read access to menu items and images
+            menu:write: Write access to menu items (create, delete)
+            orders:read: Read access to orders
+            orders:write: Write access to orders (create, update, delete)
+        clientCredentials:
+          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          scopes:
+            menu:read: Read access to menu items and images
+            menu:write: Write access to menu items (create, delete)
+            orders:read: Read access to orders
+            orders:write: Write access to orders (create, update, delete)
+    ApiKey:
+      type: apiKey
+      name: X-API-Key
+      in: header
+      description: API key for internal operations.
+  parameters:
+    After:
+      name: after
+      in: query
+      required: false
+      description: Use the `endCursor` as a value for the `after` parameter to get the next page.
+      schema:
+        type: string
+      example: a25fgaksjf23la==
+    Before:
+      name: before
+      in: query
+      required: false
+      description: |
+        Use the `startCursor` as a value for the `before` parameter to get the next page.
+      schema:
+        type: string
+      example: bfg23aksjf23zb1==
+    Sort:
+      name: sort
+      description: |-
+        To sort by id in descending order use `-id`.
+        To sort by id in ascending order use `id`.
+      in: query
+      required: false
+      schema:
+        type: string
+      example: '-name'
+    Filter:
+      name: filter
+      description: |-
+        Filters the collection items using space-separated `field:value` pairs.
+
+        **Format:** `field1:value1 field2:value2`
+
+        **Supported operators:**
+        - `field:value` - Exact match
+        - `field:value1,value2` - Match any of the comma-separated values (OR)
+        - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+
+        **Examples:**
+        - `status:placed` - Filter by single status.
+        - `status:placed,completed` - Filter by multiple statuses.
+        - `createdAt:30d` - Filter orders created in the last 30 days.
+        - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+        - `status:placed createdAt:7d` - Combine multiple filters.
+      in: query
+      required: false
+      schema:
+        type: string
+      example: orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7
+    Search:
+      name: search
+      in: query
+      description: |-
+        Performs a case-insensitive text search across relevant fields in the collection.
+
+        **Fields searched depend on the endpoint:**
+        - **Menu items:** `name`, `photoTextDescription`
+        - **Orders:** `customerName`, `id`
+
+        Returns items where any of the searchable fields contain the search term as a substring.
+      required: false
+      schema:
+        type: string
+      example: coffee
+    Limit:
+      name: limit
+      description: |
+        Use to return a number of results per page.
+        If there is more data, use in combination with `after` to page through the data.
+      in: query
+      required: false
+      schema:
+        type: integer
+        minimum: 1
+        maximum: 100
+        default: 10
+      example: 10
+    MenuItemId:
+      name: menuItemId
+      in: path
+      description: ID of the menu item to retrieve.
+      required: true
+      schema:
+        type: string
+        pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+      example: prd_01h1s5z6vf2mm1mz3hevnn9va7
+    PhotoSize:
+      name: photoSize
+      in: query
+      description: Photo size to retrieve.
+      required: false
+      schema:
+        type: string
+        enum:
+          - thumbnail
+          - medium
+          - large
+        default: medium
+    OrderId:
+      name: orderId
+      in: path
+      description: ID of the order to retrieve.
+      required: true
+      schema:
+        type: string
+        pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+      example: ord_01h1s5z6vf2mm1mz3hevnn9va7
+  schemas:
+    Page:
+      type: object
+      properties:
+        endCursor:
+          type:
+            - string
+            - 'null'
+          description: |-
+            Use with the `after` query parameter to load the next page of data.
+            When `null`, there is no data.
+            The cursor is opaque and internal structure is subject to change.
+        startCursor:
+          type:
+            - string
+            - 'null'
+          description: |-
+            Use with the `before` query parameter to load the previous page of data.
+            When `null`, there is no data.
+            The cursor is opaque and internal structure is subject to change.
+        hasNextPage:
+          type: boolean
+          description: Indicates if there is a next page with items.
+        hasPrevPage:
+          type: boolean
+          description: Indicates if there is a previous page with items.
+        limit:
+          type: integer
+          minimum: 1
+          maximum: 100
+          default: 10
+          description: Value showing how many items are in the page limit.
+        total:
+          type: integer
+          description: Count of items across all pages.
+          minimum: 0
+      required:
+        - endCursor
+        - startCursor
+        - hasNextPage
+        - hasPrevPage
+        - limit
+        - total
+    MenuBaseItem:
+      type: object
+      properties:
+        createdAt:
+          description: Created date.
+          type: string
+          format: date-time
+          readOnly: true
+        updatedAt:
+          description: Updated date.
+          type: string
+          format: date-time
+          readOnly: true
+        id:
+          description: Menu item ID. Unique identifier prefixed with `prd_`.
+          type: string
+          readOnly: true
+          pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+          example: prd_01h1s5z6vf2mm1mz3hevnn9va7
+        object:
+          description: Entity name.
+          type: string
+          const: menuItem
+          readOnly: true
+        name:
+          description: Menu item name.
+          type: string
+          minLength: 1
+          maxLength: 50
+        price:
+          description: Price in cents.
+          type: integer
+          minimum: 0
+        photo:
+          writeOnly: true
+          type:
+            - string
+            - 'null'
+          format: binary
+          description: Photo of the menu item. Must be a PNG image and less than 1MB.
+        photoUrl:
+          readOnly: true
+          type: string
+          format: uri
+          description: Photo URL of the menu item.
+        photoTextDescription:
+          type:
+            - string
+            - 'null'
+      required:
+        - id
+        - name
+        - price
+        - createdAt
+        - updatedAt
+        - object
+    Beverage:
+      allOf:
+        - type: object
+          properties:
+            category:
+              description: Menu item category.
+              type: string
+              const: beverage
+            volume:
+              type: number
+              description: Size of the beverage in milliliters.
+              exclusiveMinimum: 0
+            containsCaffeine:
+              type: boolean
+              description: Indicates if the beverage contains caffeine.
+          required:
+            - category
+            - volume
+            - containsCaffeine
+        - $ref: '#/components/schemas/MenuBaseItem'
+    Dessert:
+      allOf:
+        - type: object
+          properties:
+            category:
+              description: Menu item category.
+              type: string
+              const: dessert
+            calories:
+              type: number
+              exclusiveMinimum: 0
+              description: Amount of calories.
+          required:
+            - category
+            - calories
+        - $ref: '#/components/schemas/MenuBaseItem'
+    MenuItem:
+      discriminator:
+        propertyName: category
+        mapping:
+          beverage: '#/components/schemas/Beverage'
+          dessert: '#/components/schemas/Dessert'
+      oneOf:
+        - $ref: '#/components/schemas/Beverage'
+        - $ref: '#/components/schemas/Dessert'
+      required:
+        - category
+    MenuItemList:
+      type: object
+      properties:
+        object:
+          type: string
+          const: list
+          description: Entity name.
+        page:
+          $ref: '#/components/schemas/Page'
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/MenuItem'
+      required:
+        - object
+        - page
+        - items
+    Error:
+      type: object
+      properties:
+        type:
+          type: string
+          format: uri-reference
+          description: URI reference that identifies the problem type.
+          default: about:blank
+        title:
+          type: string
+          description: Short summary of the problem type.
+        status:
+          type: integer
+          format: int32
+          description: |
+            HTTP status code generated by the origin server for this occurrence of the problem.
+          minimum: 100
+          exclusiveMaximum: 600
+        instance:
+          type: string
+          format: uri-reference
+          description: |
+            URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+            May be used to locate the root of this problem in the source code.
+          example: /some/uri-reference#specific-occurrence-context
+        details:
+          description: Additional error details.
+          type: object
+          additionalProperties: true
+      required:
+        - type
+        - title
+        - status
+    OrderStatus:
+      type: string
+      description: Order status.
+      enum:
+        - placed
+        - preparing
+        - completed
+        - canceled
+    Order:
+      type: object
+      title: Order
+      properties:
+        id:
+          description: Order ID. Unique identifier prefixed with `ord_`.
+          type: string
+          format: ulid
+          readOnly: true
+          pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+          example: ord_01h1s5z6vf2mm1mz3hevnn9va7
+        object:
+          description: Entity name.
+          type: string
+          const: order
+          readOnly: true
+        customerName:
+          description: |
+            Name of the customer who placed the order.
+            Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+          type: string
+          pattern: ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+          minLength: 1
+          maxLength: 100
+        status:
+          allOf:
+            - $ref: '#/components/schemas/OrderStatus'
+          readOnly: true
+        totalPrice:
+          description: Total order price in cents.
+          type: integer
+          minimum: 0
+          readOnly: true
+        createdAt:
+          description: Created date.
+          type: string
+          format: date-time
+          readOnly: true
+        updatedAt:
+          description: Updated date.
+          type: string
+          format: date-time
+          readOnly: true
+        orderItems:
+          type: array
+          description: List of items to include in the order.
+          minItems: 1
+          items:
+            type: object
+            properties:
+              menuItemId:
+                type: string
+                format: ulid
+                description: ID of the menu item to add to the order.
+              quantity:
+                type: integer
+                minimum: 1
+                description: Quantity of the menu item.
+              discount:
+                type: integer
+                minimum: 0
+                description: Discount amount in cents (absolute value).
+                default: 0
+              comment:
+                type: string
+                maxLength: 500
+                description: Optional comment for the order item (e.g., "No sugar").
+            required:
+              - menuItemId
+              - quantity
+      required:
+        - customerName
+        - orderItems
+    OrderList:
+      type: object
+      properties:
+        object:
+          type: string
+          const: list
+          description: Entity name.
+        page:
+          $ref: '#/components/schemas/Page'
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/Order'
+      required:
+        - object
+        - page
+        - items
+    OrderItem:
+      type: object
+      properties:
+        menuItemId:
+          type: string
+          description: ID of the menu item to add to the order.
+          writeOnly: true
+        menuItem:
+          allOf:
+            - $ref: '#/components/schemas/MenuItem'
+          description: Menu item that is part of the order.
+          readOnly: true
+        quantity:
+          type: integer
+          minimum: 1
+          description: Quantity of the menu item.
+        discount:
+          type: integer
+          minimum: 0
+          description: Discount amount in cents (absolute value).
+          default: 0
+        comment:
+          type: string
+          maxLength: 500
+          description: Optional comment for the order item (e.g., "No sugar").
+      required:
+        - menuItemId
+        - quantity
+    RevenueStatistics:
+      type: object
+      description: Revenue statistics for a given date range.
+      properties:
+        revenue:
+          type: number
+          format: float
+          description: Total revenue in cents from completed orders.
+          minimum: 0
+        averageOrderAmount:
+          type: number
+          format: float
+          description: Average order amount in cents (calculated from completed orders only).
+          minimum: 0
+        totalOrders:
+          type: integer
+          description: Total number of orders (all statuses) in the date range.
+          minimum: 0
+        placedOrders:
+          type: integer
+          description: Number of placed orders.
+          minimum: 0
+        preparingOrders:
+          type: integer
+          description: Number of preparing orders.
+          minimum: 0
+        completedOrders:
+          type: integer
+          description: Number of completed orders.
+          minimum: 0
+        canceledOrders:
+          type: integer
+          description: Number of canceled orders.
+          minimum: 0
+        startDate:
+          type: string
+          format: date
+          description: Start date of the revenue calculation period.
+        endDate:
+          type: string
+          format: date
+          description: End date of the revenue calculation period.
+      required:
+        - revenue
+        - averageOrderAmount
+        - totalOrders
+        - placedOrders
+        - preparingOrders
+        - completedOrders
+        - canceledOrders
+        - startDate
+        - endDate
+    RegisterClientObject:
+      type: object
+      properties:
+        name:
+          type: string
+          description: Client name.
+        redirectUris:
+          type: array
+          items:
+            type: string
+            format: uri
+          description: List of redirect URIs (optional, defaults to empty array).
+        scopes:
+          type: array
+          items:
+            type: string
+            enum:
+              - menu:read
+              - menu:write
+              - orders:read
+              - orders:write
+          description: List of scopes.
+        grantTypes:
+          type: array
+          items:
+            type: string
+            enum:
+              - authorization_code
+              - client_credentials
+          description: List of grant types.
+      required:
+        - name
+    OAuth2Client:
+      type: object
+      description: OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+      properties:
+        clientId:
+          type: string
+          description: Client identifier issued by the authorization server.
+        clientSecret:
+          type: string
+          description: Client secret issued by the authorization server.
+        clientIdIssuedAt:
+          type: integer
+          format: int64
+          description: Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+        clientSecretExpiresAt:
+          type: integer
+          format: int64
+          description: Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+        name:
+          type: string
+          description: Client name (registered metadata).
+        redirectUris:
+          type: array
+          items:
+            type: string
+            format: uri
+          description: List of redirect URIs (registered metadata).
+        registrationClientUri:
+          type: string
+          format: uri
+          description: URL of the client configuration endpoint for managing this client registration (RFC 7592).
+        registrationAccessToken:
+          type: string
+          description: Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+        scopes:
+          type: array
+          items:
+            type: string
+            enum:
+              - menu:read
+              - menu:write
+              - orders:read
+              - orders:write
+          description: List of scopes (registered metadata).
+        grantTypes:
+          type: array
+          items:
+            type: string
+            enum:
+              - authorization_code
+              - client_credentials
+          description: List of grant types (registered metadata).
+      required:
+        - clientId
+        - clientSecret
+        - clientIdIssuedAt
+        - clientSecretExpiresAt
+        - registrationClientUri
+        - registrationAccessToken
+    OrderNotification:
+      type: object
+      required:
+        - orderId
+        - orderStatus
+        - timestamp
+      properties:
+        orderId:
+          type: string
+          description: Unique order identifier.
+        orderStatus:
+          $ref: '#/components/schemas/OrderStatus'
+        timestamp:
+          type: string
+          format: date-time
+          description: When the event occurred.
+  responses:
+    BadRequest:
+      description: Bad request - invalid input parameters.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    InternalServerError:
+      description: Internal server error.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Unauthorized:
+      description: Unauthorized - authorization required.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Forbidden:
+      description: Forbidden - insufficient permissions.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Conflict:
+      description: Conflict - entity already exists.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    NotFound:
+      description: Resource not found.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
diff --git a/packages/openapi-typescript/examples/service-class/package.json b/packages/openapi-typescript/examples/service-class/package.json
new file mode 100644
index 0000000000..57bf21c8fb
--- /dev/null
+++ b/packages/openapi-typescript/examples/service-class/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "@redocly-examples/service-class",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "generate": "redocly generate-client",
+    "dev": "vite",
+    "build": "vite build"
+  },
+  "devDependencies": {
+    "@redocly/cli": "latest",
+    "typescript": "^5.5.0",
+    "vite": "^5.4.0"
+  }
+}
diff --git a/packages/openapi-typescript/examples/service-class/redocly.yaml b/packages/openapi-typescript/examples/service-class/redocly.yaml
new file mode 100644
index 0000000000..464630889c
--- /dev/null
+++ b/packages/openapi-typescript/examples/service-class/redocly.yaml
@@ -0,0 +1,9 @@
+# redocly.yaml — drives `redocly generate-client` for this example.
+# generate-client settings live under the `x-openapi-typescript` extension for now
+# (first-class config support is planned in @redocly/config).
+x-openapi-typescript:
+  input: ./openapi.yaml
+  output: ./src/api/client.ts
+  generators:
+    - sdk
+  facade: service-class
diff --git a/packages/openapi-typescript/examples/service-class/src/api/client.ts b/packages/openapi-typescript/examples/service-class/src/api/client.ts
new file mode 100644
index 0000000000..d3ff0b8f08
--- /dev/null
+++ b/packages/openapi-typescript/examples/service-class/src/api/client.ts
@@ -0,0 +1,1512 @@
+// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Redocly Cafe (v1.0.0)
+ * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+ * Create API credentials and try it yourself in a realistic OpenAPI workflow.
+ * 
+ */
+
+export type Page = {
+    /**
+     * Use with the `after` query parameter to load the next page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    endCursor: string | null;
+    /**
+     * Use with the `before` query parameter to load the previous page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    startCursor: string | null;
+    /**
+     * Indicates if there is a next page with items.
+     */
+    hasNextPage: boolean;
+    /**
+     * Indicates if there is a previous page with items.
+     */
+    hasPrevPage: boolean;
+    /**
+     * Value showing how many items are in the page limit.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit: number;
+    /**
+     * Count of items across all pages.
+     * @minimum 0
+     */
+    total: number;
+};
+
+export type MenuBaseItem = {
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt: string;
+    /**
+     * Menu item ID. Unique identifier prefixed with `prd_`.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    readonly id: string;
+    /**
+     * Entity name.
+     */
+    readonly object: "menuItem";
+    /**
+     * Menu item name.
+     * @minLength 1
+     * @maxLength 50
+     */
+    name: string;
+    /**
+     * Price in cents.
+     * @minimum 0
+     */
+    price: number;
+    /**
+     * Photo of the menu item. Must be a PNG image and less than 1MB.
+     * @format binary
+     */
+    photo?: Blob | null;
+    /**
+     * Photo URL of the menu item.
+     * @format uri
+     */
+    readonly photoUrl?: string;
+    photoTextDescription?: string | null;
+};
+
+export type Beverage = {
+    /**
+     * Menu item category.
+     */
+    category: "beverage";
+    /**
+     * Size of the beverage in milliliters.
+     * @exclusiveMinimum 0
+     */
+    volume: number;
+    /**
+     * Indicates if the beverage contains caffeine.
+     */
+    containsCaffeine: boolean;
+} & MenuBaseItem;
+
+export type Dessert = {
+    /**
+     * Menu item category.
+     */
+    category: "dessert";
+    /**
+     * Amount of calories.
+     * @exclusiveMinimum 0
+     */
+    calories: number;
+} & MenuBaseItem;
+
+export type MenuItem = Beverage | Dessert;
+
+export type MenuItemList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: MenuItem[];
+};
+
+export type Error = {
+    /**
+     * URI reference that identifies the problem type.
+     * @format uri-reference
+     */
+    type: string;
+    /**
+     * Short summary of the problem type.
+     */
+    title: string;
+    /**
+     * HTTP status code generated by the origin server for this occurrence of the problem.
+     * @minimum 100
+     * @exclusiveMaximum 600
+     * @format int32
+     */
+    status: number;
+    /**
+     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+     * May be used to locate the root of this problem in the source code.
+     * @format uri-reference
+     */
+    instance?: string;
+    /**
+     * Additional error details.
+     */
+    details?: Record<string, unknown>;
+};
+
+/**
+ * Order status.
+ */
+export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
+
+export const OrderStatus = {
+    placed: "placed",
+    preparing: "preparing",
+    completed: "completed",
+    canceled: "canceled"
+} as const;
+
+export type Order = {
+    /**
+     * Order ID. Unique identifier prefixed with `ord_`.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     * @format ulid
+     */
+    readonly id?: string;
+    /**
+     * Entity name.
+     */
+    readonly object?: "order";
+    /**
+     * Name of the customer who placed the order.
+     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+     * @minLength 1
+     * @maxLength 100
+     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+     */
+    customerName: string;
+    readonly status?: OrderStatus;
+    /**
+     * Total order price in cents.
+     * @minimum 0
+     */
+    readonly totalPrice?: number;
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt?: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt?: string;
+    /**
+     * List of items to include in the order.
+     * @minItems 1
+     */
+    orderItems: {
+        /**
+         * ID of the menu item to add to the order.
+         * @format ulid
+         */
+        menuItemId: string;
+        /**
+         * Quantity of the menu item.
+         * @minimum 1
+         */
+        quantity: number;
+        /**
+         * Discount amount in cents (absolute value).
+         * @minimum 0
+         */
+        discount?: number;
+        /**
+         * Optional comment for the order item (e.g., "No sugar").
+         * @maxLength 500
+         */
+        comment?: string;
+    }[];
+};
+
+export type OrderList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: Order[];
+};
+
+export type OrderItem = {
+    /**
+     * ID of the menu item to add to the order.
+     */
+    menuItemId: string;
+    /**
+     * Menu item that is part of the order.
+     */
+    readonly menuItem?: MenuItem;
+    /**
+     * Quantity of the menu item.
+     * @minimum 1
+     */
+    quantity: number;
+    /**
+     * Discount amount in cents (absolute value).
+     * @minimum 0
+     */
+    discount?: number;
+    /**
+     * Optional comment for the order item (e.g., "No sugar").
+     * @maxLength 500
+     */
+    comment?: string;
+};
+
+/**
+ * Revenue statistics for a given date range.
+ */
+export type RevenueStatistics = {
+    /**
+     * Total revenue in cents from completed orders.
+     * @minimum 0
+     * @format float
+     */
+    revenue: number;
+    /**
+     * Average order amount in cents (calculated from completed orders only).
+     * @minimum 0
+     * @format float
+     */
+    averageOrderAmount: number;
+    /**
+     * Total number of orders (all statuses) in the date range.
+     * @minimum 0
+     */
+    totalOrders: number;
+    /**
+     * Number of placed orders.
+     * @minimum 0
+     */
+    placedOrders: number;
+    /**
+     * Number of preparing orders.
+     * @minimum 0
+     */
+    preparingOrders: number;
+    /**
+     * Number of completed orders.
+     * @minimum 0
+     */
+    completedOrders: number;
+    /**
+     * Number of canceled orders.
+     * @minimum 0
+     */
+    canceledOrders: number;
+    /**
+     * Start date of the revenue calculation period.
+     * @format date
+     */
+    startDate: string;
+    /**
+     * End date of the revenue calculation period.
+     * @format date
+     */
+    endDate: string;
+};
+
+export type RegisterClientObject = {
+    /**
+     * Client name.
+     */
+    name: string;
+    /**
+     * List of redirect URIs (optional, defaults to empty array).
+     */
+    redirectUris?: string[];
+    /**
+     * List of scopes.
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types.
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+/**
+ * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+ */
+export type OAuth2Client = {
+    /**
+     * Client identifier issued by the authorization server.
+     */
+    clientId: string;
+    /**
+     * Client secret issued by the authorization server.
+     */
+    clientSecret: string;
+    /**
+     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+     * @format int64
+     */
+    clientIdIssuedAt: number;
+    /**
+     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+     * @format int64
+     */
+    clientSecretExpiresAt: number;
+    /**
+     * Client name (registered metadata).
+     */
+    name?: string;
+    /**
+     * List of redirect URIs (registered metadata).
+     */
+    redirectUris?: string[];
+    /**
+     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
+     * @format uri
+     */
+    registrationClientUri: string;
+    /**
+     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+     */
+    registrationAccessToken: string;
+    /**
+     * List of scopes (registered metadata).
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types (registered metadata).
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+export type OrderNotification = {
+    /**
+     * Unique order identifier.
+     */
+    orderId: string;
+    orderStatus: OrderStatus;
+    /**
+     * When the event occurred.
+     * @format date-time
+     */
+    timestamp: string;
+};
+
+/**
+ * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
+ */
+export function isBeverage(value: MenuItem): value is Beverage {
+    return (value as Record<string, unknown>)["category"] === "beverage";
+}
+
+/**
+ * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
+ */
+export function isDessert(value: MenuItem): value is Dessert {
+    return (value as Record<string, unknown>)["category"] === "dessert";
+}
+
+/**
+ * Static metadata for every operation, keyed by operationId: the HTTP `method`
+ * and the `path` template (with `{param}` placeholders intact). Minification-safe
+ * — useful for building cache/query keys, tracing span names, and request logging
+ * without re-deriving them at each call site.
+ */
+export const OPERATIONS = {
+    listMenuItems: { method: "GET", path: "/menu" },
+    createMenuItem: { method: "POST", path: "/menu" },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
+    listOrders: { method: "GET", path: "/orders" },
+    createOrder: { method: "POST", path: "/orders" },
+    getOrderById: { method: "GET", path: "/orders/{orderId}" },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
+    listOrderItems: { method: "GET", path: "/order-items" },
+    getRevenue: { method: "GET", path: "/revenue" },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
+} as const;
+
+/**
+ * The operationId of any operation in this client.
+ */
+export type OperationId = keyof typeof OPERATIONS;
+
+/**
+ * Static metadata describing one operation: its HTTP method and path template.
+ */
+export type OperationMetadata = {
+    readonly method: string;
+    readonly path: string;
+};
+
+let BASE = "https://cafe.cloud.redocly.com";
+
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+export type RequestContext = {
+    url: string;
+    method: string;
+    headers: Record<string, string>;
+    body?: unknown;
+};
+
+/**
+ * Configuration and extension hooks for a client. Supplied per-instance via
+ * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
+ * (functions facade).
+ */
+export type ClientConfig = {
+    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    baseUrl?: string;
+    /** Extra headers merged into every request; a function is invoked per request. */
+    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+    /** Transport used to issue requests. Defaults to the global `fetch`. */
+    fetch?: typeof fetch;
+    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    /** Observe — or replace, by returning a `Response` — the response before parsing. */
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    /**
+     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
+     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
+     */
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
+    /**
+     * Composable interceptors run around every request, alongside the single
+     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
+     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
+     * the last-registered middleware wraps closest to the network. Register more at runtime
+     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
+     */
+    middleware?: Middleware[];
+    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
+    retry?: RetryConfig;
+    /**
+     * Per-instance auth credentials. When set, they override the module-global
+     * `set*` helpers for requests made through this config (each scheme falls back
+     * to its global slot when omitted here). Only the schemes an operation declares
+     * in its `security` are ever sent.
+     */
+    auth?: AuthCredentials;
+};
+
+/**
+ * A request interceptor; every field is optional, so a middleware can hook any subset of
+ * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
+ * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
+ * failure into the error to throw, threaded through each middleware in turn.
+ */
+export type Middleware = {
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/** Context handed to `retryOn` for the attempt that just failed. */
+export type RetryContext = {
+    /** 1-based number of the attempt that just failed. */
+    attempt: number;
+    /** The request that was attempted. */
+    request: RequestContext;
+    /** Present when the server returned a (non-ok) response. */
+    response?: Response;
+    /** Present when the transport threw (network error, DNS, connection reset). */
+    error?: unknown;
+};
+
+/** Retry policy; all fields optional with sensible defaults. */
+export type RetryConfig = {
+    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
+    retries?: number;
+    /** Base delay in milliseconds. Default 1000. */
+    retryDelay?: number;
+    /** Backoff shape. Default 'exponential'. */
+    retryStrategy?: RetryStrategy;
+    /** Apply full jitter over the computed delay. Default true. */
+    jitter?: boolean;
+    /**
+     * Decide whether to retry a failed attempt. Default: retry only idempotent
+     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
+     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
+     */
+    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
+};
+
+/**
+ * How the response body is read. `'auto'` negotiates from the content type (the
+ * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
+ */
+export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
+
+/**
+ * The trailing per-operation argument: standard `RequestInit` plus an optional
+ * per-call retry override and a `parseAs` escape hatch.
+ *
+ * `parseAs` forces how the response body is read; overrides the inferred kind.
+ * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
+ * override — the static return type is unchanged.
+ */
+export type RequestOptions = RequestInit & {
+    retry?: Partial<RetryConfig>;
+    parseAs?: ParseAs;
+};
+
+/**
+ * Override the base URL used by every generated operation. Useful when the
+ * runtime environment differs from the value declared in `servers[0].url`
+ * (e.g. dev / staging / prod toggles in a single-page app).
+ *
+ * Mutates a module-scoped binding shared by the functions facade. For multiple
+ * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ */
+export function setBaseUrl(url: string): void {
+    BASE = url;
+}
+
+/** The global config used by the functions facade (see `configure`). */
+const __config: ClientConfig = {};
+
+/**
+ * Merge `config` into the global configuration used by the functions facade —
+ * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
+ * hooks once for every free function. The service-class facade configures per
+ * instance instead (`new Client(config)`).
+ */
+export function configure(config: ClientConfig): void {
+    Object.assign(__config, config);
+}
+
+/**
+ * Append interceptors to the functions facade's global middleware chain (see
+ * `ClientConfig.middleware`). The service-class facade registers per instance via
+ * `<Client>.use(...)` instead.
+ */
+export function use(...middleware: Middleware[]): void {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    __config.middleware = [...(__config.middleware ?? []), ...middleware];
+}
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function __middleware(config: ClientConfig): Middleware[] {
+    const single = config.onRequest || config.onResponse || config.onError
+        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+        : [];
+    return [...single, ...(config.middleware ?? [])];
+}
+
+export class ApiError extends Error {
+    public readonly url: string;
+    public readonly status: number;
+    public readonly statusText: string;
+    public readonly body: unknown;
+    constructor(url: string, status: number, statusText: string, body: unknown) {
+        super(`Request failed with status ${status}`);
+        this.name = 'ApiError';
+        this.url = url;
+        this.status = status;
+        this.statusText = statusText;
+        this.body = body;
+    }
+}
+
+type QueryPrimitive = string | number | boolean;
+
+type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
+
+/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
+type QueryStyle = {
+    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+    explode: boolean;
+    allowReserved?: boolean;
+};
+
+/**
+ * Percent-encode `value` but leave the RFC-3986 reserved set
+ * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
+ */
+function __encodeReserved(value: string): string {
+    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
+}
+
+function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
+    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    if (!query)
+        return url;
+    const params = new URLSearchParams();
+    const raw: string[] = [];
+    for (const [key, value] of Object.entries(query)) {
+        if (value === undefined || value === null)
+            continue;
+        const spec = styles?.[key];
+        if (!spec) {
+            if (Array.isArray(value)) {
+                for (const v of value) {
+                    if (v !== undefined && v !== null)
+                        params.append(key, String(v));
+                }
+            }
+            else if (typeof value === 'object') {
+                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+                for (const [subKey, subValue] of Object.entries(value)) {
+                    if (subValue !== undefined && subValue !== null) {
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                    }
+                }
+            }
+            else {
+                params.append(key, String(value));
+            }
+            continue;
+        }
+        if (Array.isArray(value)) {
+            const items = value.filter((v) => v !== undefined && v !== null).map(String);
+            if (spec.style === 'form' && spec.explode) {
+                for (const v of items) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}=${__encodeReserved(v)}`);
+                    else
+                        params.append(key, v);
+                }
+            }
+            else {
+                // Delimited styles put the LITERAL delimiter on the wire; only the
+                // values are encoded. `%20` (not `+`) is the literal space delimiter.
+                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
+                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+            }
+        }
+        else if (typeof value === 'object') {
+            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+            for (const [subKey, subValue] of Object.entries(value)) {
+                if (subValue !== undefined && subValue !== null) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
+                    else
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                }
+            }
+        }
+        else if (spec.allowReserved) {
+            raw.push(`${key}=${__encodeReserved(String(value))}`);
+        }
+        else {
+            params.append(key, String(value));
+        }
+    }
+    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+    return qs ? `${url}?${qs}` : url;
+}
+
+async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+    response: Response;
+    context: RequestContext;
+}> {
+    const { retry: callRetry, ...fetchInit } = init;
+    const retry: RetryConfig = { ...config.retry, ...callRetry };
+    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+    const headers: Record<string, string> = {
+        Accept: 'application/json',
+        ...extra,
+        ...(fetchInit.headers as Record<string, string> | undefined),
+    };
+    let payload: BodyInit | undefined;
+    if (body !== undefined) {
+        const isBinary = body instanceof Blob ||
+            body instanceof ArrayBuffer ||
+            ArrayBuffer.isView(body as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
+        const isURLSearchParams = body instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
+            payload = body as BodyInit;
+        }
+        else {
+            payload = JSON.stringify(body);
+            if (!('Content-Type' in headers) && !('content-type' in headers)) {
+                headers['Content-Type'] = 'application/json';
+            }
+        }
+    }
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    const doFetch = config.fetch ?? fetch;
+    const maxAttempts = 1 + (retry.retries ?? 0);
+    const retryOn = retry.retryOn ?? __defaultRetryOn;
+    const signal = fetchInit.signal ?? undefined;
+    let attempt = 0;
+    while (true) {
+        attempt++;
+        if (signal?.aborted)
+            throw __abortError(signal);
+        let response: Response;
+        try {
+            response = await doFetch(context.url, {
+                ...fetchInit,
+                method: context.method,
+                headers: context.headers,
+                body: payload,
+            });
+        }
+        catch (error) {
+            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
+                await __sleep(__retryDelay(retry, attempt, null), signal);
+                continue;
+            }
+            throw error;
+        }
+        // Reverse order: the last-registered middleware wraps closest to the network (onion).
+        for (let i = middleware.length - 1; i >= 0; i--) {
+            const onResponse = middleware[i].onResponse;
+            if (onResponse) {
+                const replaced = await onResponse(response, context);
+                if (replaced)
+                    response = replaced;
+            }
+        }
+        if (!response.ok &&
+            attempt < maxAttempts &&
+            !signal?.aborted &&
+            (await retryOn({ attempt, request: context, response }))) {
+            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            continue;
+        }
+        return { response, context };
+    }
+}
+
+async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+    if (kind === 'void' || response.status === 204)
+        return undefined;
+    if (kind === 'stream')
+        return response.body;
+    if (kind === 'blob')
+        return response.blob();
+    if (kind === 'arrayBuffer')
+        return response.arrayBuffer();
+    if (kind === 'formData')
+        return response.formData();
+    if (kind === 'text')
+        return response.text();
+    if (kind === 'json')
+        return response.json();
+    // 'auto' — negotiate from the response's content type.
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json'))
+        return response.json();
+    if (contentType.startsWith('text/'))
+        return response.text();
+    return response.blob();
+}
+
+async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+    const { parseAs, ...sendInit } = init;
+    const { response, context } = await __send(config, url, sendInit, body);
+    if (!response.ok) {
+        const errorBody = await readError(response);
+        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
+        // Thread the error through each middleware's onError in turn (each may replace it).
+        for (const mw of __middleware(config)) {
+            if (mw.onError)
+                error = await mw.onError(error as ApiError, context);
+        }
+        throw error;
+    }
+    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
+    return (await __parse(response, kind)) as T;
+}
+
+async function readError(response: Response): Promise<unknown> {
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json')) {
+        return response.json().catch(() => undefined);
+    }
+    return response.text().catch(() => undefined);
+}
+
+const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+
+const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+function __defaultRetryOn(ctx: RetryContext): boolean {
+    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
+        return false;
+    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+    if (retryAfter) {
+        const seconds = Number(retryAfter);
+        if (!Number.isNaN(seconds))
+            return seconds * 1000;
+        const when = Date.parse(retryAfter);
+        if (!Number.isNaN(when))
+            return Math.max(0, when - Date.now());
+    }
+    const base = retry.retryDelay ?? 1000;
+    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+    return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
+    return new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject(__abortError(signal));
+            return;
+        }
+        const onAbort = () => {
+            clearTimeout(timer);
+            reject(__abortError(signal as AbortSignal));
+        };
+        const timer = setTimeout(() => {
+            if (signal)
+                signal.removeEventListener('abort', onAbort);
+            resolve();
+        }, ms);
+        if (signal)
+            signal.addEventListener('abort', onAbort, { once: true });
+    });
+}
+
+function __abortError(signal: AbortSignal): globalThis.Error {
+    const reason = (signal as {
+        reason?: unknown;
+    }).reason;
+    if (reason instanceof Error)
+        return reason;
+    return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * Normalize an operation's header-parameter object into a plain string record,
+ * dropping any `undefined` / `null` entries (optional headers the caller omitted)
+ * and stringifying the rest. Mirrors __buildUrl's handling of query values.
+ */
+function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
+    const out: Record<string, string> = {};
+    for (const [key, value] of Object.entries(values)) {
+        if (value !== undefined && value !== null)
+            out[key] = String(value);
+    }
+    return out;
+}
+
+/**
+ * A credential value, or a (possibly async) function that returns one per request.
+ */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/**
+ * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
+ * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
+ * to the global slots.
+ */
+export type AuthCredentials = {
+    bearer?: TokenProvider;
+    apiKey?: Record<string, TokenProvider>;
+};
+
+let __bearerToken: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
+ * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
+ * (possibly async) function resolved per request.
+ */
+export function setBearer(token: TokenProvider | null): void {
+    __bearerToken = token;
+}
+
+let __apiKey_ApiKey: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
+ * string or a (possibly async) function resolved per request.
+ */
+export function setApiKey(key: TokenProvider | null): void {
+    __apiKey_ApiKey = key;
+}
+
+/**
+ * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
+ */
+async function __resolve(slot: TokenProvider | null): Promise<string | null> {
+    if (slot === null)
+        return null;
+    return typeof slot === "function" ? slot() : slot;
+}
+
+/**
+ * Build the auth `headers` and `query` for an operation from the currently-set credentials.
+ * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
+ * can always override by passing their own `init.headers`.
+ */
+async function __auth(schemes: string[], config: ClientConfig): Promise<{
+    headers: Record<string, string>;
+    query: Record<string, string>;
+}> {
+    const headers: Record<string, string> = {};
+    const query: Record<string, string> = {};
+    const cookies: string[] = [];
+    for (const scheme of schemes) {
+        switch (scheme) {
+            case "OAuth2": {
+                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
+                if (v !== null)
+                    headers["Authorization"] = `Bearer ${v}`;
+                break;
+            }
+            case "ApiKey": {
+                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
+                if (v !== null)
+                    headers["X-API-Key"] = v;
+                break;
+            }
+        }
+    }
+    if (cookies.length > 0)
+        headers["Cookie"] = cookies.join("; ");
+    return { headers, query };
+}
+
+export type ListMenuItemsResult = MenuItemList;
+
+export type ListMenuItemsParams = {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+};
+
+export type ListMenuItemsVariables = {
+    params?: ListMenuItemsParams;
+};
+
+export type CreateMenuItemResult = MenuItem;
+
+export type CreateMenuItemBody = FormData;
+
+export type CreateMenuItemVariables = {
+    body: CreateMenuItemBody;
+};
+
+export type DeleteMenuItemResult = void;
+
+export type DeleteMenuItemVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+};
+
+export type GetMenuItemPhotoResult = Blob | string;
+
+export type GetMenuItemPhotoParams = {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+};
+
+export type GetMenuItemPhotoVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+    params?: GetMenuItemPhotoParams;
+};
+
+export type ListOrdersResult = OrderList;
+
+export type ListOrdersParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+};
+
+export type ListOrdersVariables = {
+    params?: ListOrdersParams;
+};
+
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    headers?: GetOrderByIdHeaders;
+};
+
+export type DeleteOrderResult = void;
+
+export type DeleteOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+};
+
+export type UpdateOrderResult = Order;
+
+export type UpdateOrderBody = {
+    status: OrderStatus;
+};
+
+export type UpdateOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    body?: UpdateOrderBody;
+};
+
+export type ListOrderItemsResult = OrderItem[];
+
+export type ListOrderItemsParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+};
+
+export type ListOrderItemsVariables = {
+    params?: ListOrderItemsParams;
+};
+
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+export class Client {
+    constructor(private readonly config: ClientConfig = {}) { }
+    /**
+     * Register interceptors on this instance (see `ClientConfig.middleware`). Returns `this`.
+     */
+    use(...middleware: Middleware[]): this {
+        this.config.middleware = [...this.config.middleware ?? [], ...middleware];
+        return this;
+    }
+    /**
+     * List all menu items
+     *
+     * Retrieve a collection of menu items with optional filtering and pagination.
+     */
+    async listMenuItems(params: {
+        /**
+         * Use the `endCursor` as a value for the `after` parameter to get the next page.
+         */
+        after?: string;
+        /**
+         * Use the `startCursor` as a value for the `before` parameter to get the next page.
+         */
+        before?: string;
+        /**
+         * To sort by id in descending order use `-id`.
+         * To sort by id in ascending order use `id`.
+         */
+        sort?: string;
+        /**
+         * Filters the collection items using space-separated `field:value` pairs.
+         *
+         * **Format:** `field1:value1 field2:value2`
+         *
+         * **Supported operators:**
+         * - `field:value` - Exact match
+         * - `field:value1,value2` - Match any of the comma-separated values (OR)
+         * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+         *
+         * **Examples:**
+         * - `status:placed` - Filter by single status.
+         * - `status:placed,completed` - Filter by multiple statuses.
+         * - `createdAt:30d` - Filter orders created in the last 30 days.
+         * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+         * - `status:placed createdAt:7d` - Combine multiple filters.
+         */
+        filter?: string;
+        /**
+         * Performs a case-insensitive text search across relevant fields in the collection.
+         *
+         * **Fields searched depend on the endpoint:**
+         * - **Menu items:** `name`, `photoTextDescription`
+         * - **Orders:** `customerName`, `id`
+         *
+         * Returns items where any of the searchable fields contain the search term as a substring.
+         */
+        search?: string;
+        /**
+         * Use to return a number of results per page.
+         * If there is more data, use in combination with `after` to page through the data.
+         * @minimum 1
+         * @maximum 100
+         */
+        limit?: number;
+    } = {}, init: RequestOptions = {}): Promise<MenuItemList> {
+        return __request<MenuItemList>(this.config, __buildUrl(this.config, `/menu`, params), { method: "GET", ...init });
+    }
+    /**
+     * Create menu item
+     *
+     * Create a new menu item.
+     */
+    async createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
+        const __a = await __auth(["OAuth2"], this.config);
+        return __request<MenuItem>(this.config, __buildUrl(this.config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    }
+    /**
+     * Delete a menu item
+     *
+     * Delete an existing menu item.
+     */
+    async deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
+        const __a = await __auth(["OAuth2"], this.config);
+        return __request<void>(this.config, __buildUrl(this.config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+    }
+    /**
+     * Retrieve a menu item photo
+     *
+     * Retrieve the product photo image for a specific menu item.
+     */
+    async getMenuItemPhoto(menuItemId: string, params: {
+        /**
+         * Photo size to retrieve.
+         */
+        photoSize?: "thumbnail" | "medium" | "large";
+    } = {}, init: RequestOptions = {}): Promise<Blob | string> {
+        return __request<Blob | string>(this.config, __buildUrl(this.config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+    }
+    /**
+     * List all orders
+     *
+     * Retrieve a collection of orders with optional filtering and pagination.
+     */
+    async listOrders(params: {
+        /**
+         * Filters the collection items using space-separated `field:value` pairs.
+         *
+         * **Format:** `field1:value1 field2:value2`
+         *
+         * **Supported operators:**
+         * - `field:value` - Exact match
+         * - `field:value1,value2` - Match any of the comma-separated values (OR)
+         * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+         *
+         * **Examples:**
+         * - `status:placed` - Filter by single status.
+         * - `status:placed,completed` - Filter by multiple statuses.
+         * - `createdAt:30d` - Filter orders created in the last 30 days.
+         * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+         * - `status:placed createdAt:7d` - Combine multiple filters.
+         */
+        filter?: string;
+        /**
+         * To sort by id in descending order use `-id`.
+         * To sort by id in ascending order use `id`.
+         */
+        sort?: string;
+        /**
+         * Use to return a number of results per page.
+         * If there is more data, use in combination with `after` to page through the data.
+         * @minimum 1
+         * @maximum 100
+         */
+        limit?: number;
+        /**
+         * Use the `endCursor` as a value for the `after` parameter to get the next page.
+         */
+        after?: string;
+        /**
+         * Use the `startCursor` as a value for the `before` parameter to get the next page.
+         */
+        before?: string;
+        /**
+         * Performs a case-insensitive text search across relevant fields in the collection.
+         *
+         * **Fields searched depend on the endpoint:**
+         * - **Menu items:** `name`, `photoTextDescription`
+         * - **Orders:** `customerName`, `id`
+         *
+         * Returns items where any of the searchable fields contain the search term as a substring.
+         */
+        search?: string;
+    } = {}, init: RequestOptions = {}): Promise<OrderList> {
+        const __a = await __auth(["OAuth2"], this.config);
+        return __request<OrderList>(this.config, __buildUrl(this.config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    }
+    /**
+     * Create order
+     *
+     * Create a new order.
+     * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+     */
+    async createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
+        const __a = await __auth(["OAuth2"], this.config);
+        return __request<Order>(this.config, __buildUrl(this.config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    }
+    /**
+     * Retrieve an order
+     *
+     * Retrieve a single order by its ID.
+     */
+    async getOrderById(orderId: string, headers: {
+        /**
+         * Optional client-supplied correlation ID, echoed in logs and traces.
+         * @format uuid
+         */
+        "X-Request-Id"?: string;
+    } = {}, init: RequestOptions = {}): Promise<Order> {
+        const __a = await __auth(["OAuth2"], this.config);
+        return __request<Order>(this.config, __buildUrl(this.config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+    }
+    /**
+     * Delete an order
+     *
+     * Delete the order.
+     * To keep the order history, the order should be canceled instead of deleted.
+     */
+    async deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
+        const __a = await __auth(["OAuth2"], this.config);
+        return __request<void>(this.config, __buildUrl(this.config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+    }
+    /**
+     * Partially update an order
+     *
+     * Update an existing order status.
+     * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+     */
+    async updateOrder(orderId: string, body?: {
+        status: OrderStatus;
+    }, init: RequestOptions = {}): Promise<Order> {
+        const __a = await __auth(["OAuth2"], this.config);
+        return __request<Order>(this.config, __buildUrl(this.config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    }
+    /**
+     * List all order items with menu item details
+     *
+     * Returns an array of order items for a specific order.
+     * Use the `filter` parameter to filter by order ID.
+     */
+    async listOrderItems(params: {
+        /**
+         * Filters the collection items using space-separated `field:value` pairs.
+         *
+         * **Format:** `field1:value1 field2:value2`
+         *
+         * **Supported operators:**
+         * - `field:value` - Exact match
+         * - `field:value1,value2` - Match any of the comma-separated values (OR)
+         * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+         *
+         * **Examples:**
+         * - `status:placed` - Filter by single status.
+         * - `status:placed,completed` - Filter by multiple statuses.
+         * - `createdAt:30d` - Filter orders created in the last 30 days.
+         * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+         * - `status:placed createdAt:7d` - Combine multiple filters.
+         */
+        filter?: string;
+    } = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
+        const __a = await __auth(["OAuth2"], this.config);
+        return __request<OrderItem[]>(this.config, __buildUrl(this.config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    }
+    /**
+     * Get revenue statistics
+     *
+     * Retrieve revenue statistics for a configurable date range.
+     * Returns revenue, order counts, average order amount, and other useful statistics.
+     */
+    async getRevenue(params: {
+        /**
+         * Start date for the revenue calculation period (ISO 8601 datetime format).
+         * Defaults to 30 days ago if not provided.
+         * @format date
+         */
+        startDate?: string;
+        /**
+         * End date for the revenue calculation period (ISO 8601 datetime format).
+         * Defaults to current time if not provided.
+         * @format date
+         */
+        endDate?: string;
+    } = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
+        const __a = await __auth(["ApiKey"], this.config);
+        return __request<RevenueStatistics>(this.config, __buildUrl(this.config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    }
+    /**
+     * Create OAuth2 client
+     *
+     * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+     * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
+     *   `redirectUris` must be provided (per RFC 7591 Section 2).
+     * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+     * Returns the registered client information per RFC 7591, including:
+     * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+     */
+    async registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
+        return __request<OAuth2Client>(this.config, __buildUrl(this.config, `/oauth2/register`), { method: "POST", ...init }, body);
+    }
+}
diff --git a/packages/openapi-typescript/examples/service-class/src/main.ts b/packages/openapi-typescript/examples/service-class/src/main.ts
new file mode 100644
index 0000000000..73667fb75e
--- /dev/null
+++ b/packages/openapi-typescript/examples/service-class/src/main.ts
@@ -0,0 +1,19 @@
+import { Client, ApiError } from './api/client';
+
+const client = new Client({ baseUrl: 'https://cafe.cloud.redocly.com' });
+
+const out = document.querySelector<HTMLPreElement>('#out')!;
+
+async function main() {
+  try {
+    const items = await client.listMenuItems();
+    out.textContent = JSON.stringify(items, null, 2);
+  } catch (error) {
+    out.textContent =
+      error instanceof ApiError
+        ? `ApiError ${error.status}: ${error.statusText}`
+        : `Unexpected error: ${String(error)}`;
+  }
+}
+
+void main();
diff --git a/packages/openapi-typescript/examples/service-class/tsconfig.json b/packages/openapi-typescript/examples/service-class/tsconfig.json
new file mode 100644
index 0000000000..4bd6962d40
--- /dev/null
+++ b/packages/openapi-typescript/examples/service-class/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../tsconfig.base.json",
+  "include": ["src"]
+}
diff --git a/packages/openapi-typescript/examples/service-class/vite.config.ts b/packages/openapi-typescript/examples/service-class/vite.config.ts
new file mode 100644
index 0000000000..c049f46e10
--- /dev/null
+++ b/packages/openapi-typescript/examples/service-class/vite.config.ts
@@ -0,0 +1,3 @@
+import { defineConfig } from 'vite';
+
+export default defineConfig({});
diff --git a/packages/openapi-typescript/examples/tanstack-query/.gitignore b/packages/openapi-typescript/examples/tanstack-query/.gitignore
new file mode 100644
index 0000000000..f06235c460
--- /dev/null
+++ b/packages/openapi-typescript/examples/tanstack-query/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+dist
diff --git a/packages/openapi-typescript/examples/tanstack-query/README.md b/packages/openapi-typescript/examples/tanstack-query/README.md
new file mode 100644
index 0000000000..4c7f068188
--- /dev/null
+++ b/packages/openapi-typescript/examples/tanstack-query/README.md
@@ -0,0 +1,16 @@
+# tanstack-query example
+
+Generated TypeScript client plus **TanStack Query** (React) factories
+(`generators: ['sdk', 'tanstack-query']`). The app uses `useQuery(<op>Options())` under a
+`QueryClientProvider`.
+
+## Run
+
+```bash
+npm install
+npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
+npm run dev        # open the printed local URL
+```
+
+The generated client + TanStack factories under `src/api/` are committed and drift-checked against the
+generator in CI.
diff --git a/packages/openapi-typescript/examples/tanstack-query/index.html b/packages/openapi-typescript/examples/tanstack-query/index.html
new file mode 100644
index 0000000000..81fb887cbd
--- /dev/null
+++ b/packages/openapi-typescript/examples/tanstack-query/index.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>Redocly openapi-typescript — tanstack-query example</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.tsx"></script>
+  </body>
+</html>
diff --git a/packages/openapi-typescript/examples/tanstack-query/openapi.yaml b/packages/openapi-typescript/examples/tanstack-query/openapi.yaml
new file mode 100644
index 0000000000..a6a75dffd0
--- /dev/null
+++ b/packages/openapi-typescript/examples/tanstack-query/openapi.yaml
@@ -0,0 +1,1163 @@
+openapi: 3.2.0
+info:
+  title: Redocly Cafe
+  description: |
+    Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+    Create API credentials and try it yourself in a realistic OpenAPI workflow.
+  version: 1.0.0
+  contact:
+    email: team@redocly.com
+    url: https://redocly.com/contact-us/
+  license:
+    name: MIT
+    url: https://opensource.org/licenses/MIT
+  termsOfService: https://redocly.com/subscription-agreement
+servers:
+  - url: https://cafe.cloud.redocly.com
+    description: Live server.
+tags:
+  - name: Authorization
+    description: Create a client to demo the API.
+  - name: Products
+    description: Operations related to products.
+  - name: Orders
+    description: Order management operations.
+  - name: Statistics
+    description: Statistics operations.
+paths:
+  /menu:
+    get:
+      tags:
+        - Products
+      summary: List all menu items
+      description: Retrieve a collection of menu items with optional filtering and pagination.
+      operationId: listMenuItems
+      security: []
+      parameters:
+        - $ref: '#/components/parameters/After'
+        - $ref: '#/components/parameters/Before'
+        - $ref: '#/components/parameters/Sort'
+        - $ref: '#/components/parameters/Filter'
+        - $ref: '#/components/parameters/Search'
+        - $ref: '#/components/parameters/Limit'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItemList'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    post:
+      tags:
+        - Products
+      summary: Create menu item
+      description: Create a new menu item.
+      operationId: createMenuItem
+      security:
+        - OAuth2:
+            - menu:write
+      requestBody:
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              $ref: '#/components/schemas/MenuItem'
+      responses:
+        '201':
+          description: Menu item created successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItem'
+              examples:
+                MenuItemResponse:
+                  value:
+                    id: prd_01khr487f7qm7p44xn427m43vb
+                    object: menuItem
+                    name: coffee
+                    price: 4000
+                    category: beverage
+                    createdAt: '2026-02-18T10:20:38.228Z'
+                    updatedAt: '2026-02-18T10:20:38.228Z'
+                    volume: 600
+                    containsCaffeine: false
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '409':
+          $ref: '#/components/responses/Conflict'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /menu/{menuItemId}:
+    parameters:
+      - $ref: '#/components/parameters/MenuItemId'
+    delete:
+      tags:
+        - Products
+      summary: Delete a menu item
+      description: Delete an existing menu item.
+      operationId: deleteMenuItem
+      security:
+        - OAuth2:
+            - menu:write
+      responses:
+        '204':
+          description: Menu item deleted successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /menu-item-images/{menuItemId}:
+    parameters:
+      - $ref: '#/components/parameters/MenuItemId'
+    get:
+      operationId: getMenuItemPhoto
+      summary: Retrieve a menu item photo
+      description: Retrieve the product photo image for a specific menu item.
+      security: []
+      tags:
+        - Products
+      parameters:
+        - $ref: '#/components/parameters/PhotoSize'
+      responses:
+        '200':
+          description: Menu item photo retrieved successfully.
+          content:
+            image/png:
+              schema:
+                type: string
+                format: binary
+            text/plain:
+              schema:
+                description: Alternative image text.
+                type: string
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /orders:
+    get:
+      tags:
+        - Orders
+      summary: List all orders
+      description: Retrieve a collection of orders with optional filtering and pagination.
+      operationId: listOrders
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/Filter'
+        - $ref: '#/components/parameters/Sort'
+        - $ref: '#/components/parameters/Limit'
+        - $ref: '#/components/parameters/After'
+        - $ref: '#/components/parameters/Before'
+        - $ref: '#/components/parameters/Search'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OrderList'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    post:
+      tags:
+        - Orders
+      summary: Create order
+      description: |
+        Create a new order.
+        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+      operationId: createOrder
+      security:
+        - OAuth2:
+            - orders:write
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Order'
+            examples:
+              OrderRequest:
+                dataValue:
+                  customerName: Mary Ann
+                  orderItems:
+                    - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                      quantity: 2
+                      comment: No sugar!
+                      discount: 0
+      responses:
+        '201':
+          description: Order placed successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: placed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /orders/{orderId}:
+    get:
+      tags:
+        - Orders
+      summary: Retrieve an order
+      description: Retrieve a single order by its ID.
+      operationId: getOrderById
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+        - name: X-Request-Id
+          in: header
+          required: false
+          description: |
+            Optional client-supplied correlation ID, echoed in logs and traces.
+          schema:
+            type: string
+            format: uuid
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: placed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    patch:
+      tags:
+        - Orders
+      summary: Partially update an order
+      description: |
+        Update an existing order status.
+        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+      operationId: updateOrder
+      security:
+        - OAuth2:
+            - orders:write
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              description: |
+                Partial order update using JSON Merge Patch - only include fields to update.
+              properties:
+                status:
+                  $ref: '#/components/schemas/OrderStatus'
+              required:
+                - status
+      responses:
+        '200':
+          description: Order updated successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: completed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    delete:
+      tags:
+        - Orders
+      summary: Delete an order
+      description: |
+        Delete the order.
+        To keep the order history, the order should be canceled instead of deleted.
+      operationId: deleteOrder
+      security:
+        - OAuth2:
+            - orders:write
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+      responses:
+        '204':
+          description: Order deleted successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /order-items:
+    get:
+      tags:
+        - Orders
+      summary: List all order items with menu item details
+      description: |
+        Returns an array of order items for a specific order.
+        Use the `filter` parameter to filter by order ID.
+      operationId: listOrderItems
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/Filter'
+          required: true
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                type: array
+                description: List of menu items that are part of the order.
+                items:
+                  $ref: '#/components/schemas/OrderItem'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /revenue:
+    get:
+      tags:
+        - Statistics
+      summary: Get revenue statistics
+      description: |
+        Retrieve revenue statistics for a configurable date range.
+        Returns revenue, order counts, average order amount, and other useful statistics.
+      operationId: getRevenue
+      security:
+        - ApiKey: []
+      parameters:
+        - name: startDate
+          in: query
+          required: false
+          description: |
+            Start date for the revenue calculation period (ISO 8601 datetime format).
+            Defaults to 30 days ago if not provided.
+          schema:
+            type: string
+            format: date
+          example: '2026-01-01'
+        - name: endDate
+          in: query
+          required: false
+          description: |
+            End date for the revenue calculation period (ISO 8601 datetime format).
+            Defaults to current time if not provided.
+          schema:
+            type: string
+            format: date
+          example: '2026-01-31'
+      responses:
+        '200':
+          description: Revenue statistics retrieved successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RevenueStatistics'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /oauth2/register:
+    post:
+      tags:
+        - Authorization
+      summary: Create OAuth2 client
+      description: |
+        Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+        - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type, 
+          `redirectUris` must be provided (per RFC 7591 Section 2).
+        - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+        Returns the registered client information per RFC 7591, including:
+        - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+      operationId: registerOAuth2Client
+      security: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/RegisterClientObject'
+      responses:
+        '201':
+          description: OAuth2 client registered successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OAuth2Client'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+webhooks:
+  order-notification:
+    post:
+      tags:
+        - Orders
+      operationId: orderNotificationWebhook
+      security: []
+      summary: Order notification webhook
+      description: Webhook triggered when a new order is placed.
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/OrderNotification'
+      responses:
+        '200':
+          description: Webhook received successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+components:
+  securitySchemes:
+    OAuth2:
+      type: oauth2
+      description: OAuth2 authorization for API access.
+      flows:
+        authorizationCode:
+          authorizationUrl: https://cafe.cloud.redocly.com/oauth2/authorize
+          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          scopes:
+            menu:read: Read access to menu items and images
+            menu:write: Write access to menu items (create, delete)
+            orders:read: Read access to orders
+            orders:write: Write access to orders (create, update, delete)
+        clientCredentials:
+          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          scopes:
+            menu:read: Read access to menu items and images
+            menu:write: Write access to menu items (create, delete)
+            orders:read: Read access to orders
+            orders:write: Write access to orders (create, update, delete)
+    ApiKey:
+      type: apiKey
+      name: X-API-Key
+      in: header
+      description: API key for internal operations.
+  parameters:
+    After:
+      name: after
+      in: query
+      required: false
+      description: Use the `endCursor` as a value for the `after` parameter to get the next page.
+      schema:
+        type: string
+      example: a25fgaksjf23la==
+    Before:
+      name: before
+      in: query
+      required: false
+      description: |
+        Use the `startCursor` as a value for the `before` parameter to get the next page.
+      schema:
+        type: string
+      example: bfg23aksjf23zb1==
+    Sort:
+      name: sort
+      description: |-
+        To sort by id in descending order use `-id`.
+        To sort by id in ascending order use `id`.
+      in: query
+      required: false
+      schema:
+        type: string
+      example: '-name'
+    Filter:
+      name: filter
+      description: |-
+        Filters the collection items using space-separated `field:value` pairs.
+
+        **Format:** `field1:value1 field2:value2`
+
+        **Supported operators:**
+        - `field:value` - Exact match
+        - `field:value1,value2` - Match any of the comma-separated values (OR)
+        - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+
+        **Examples:**
+        - `status:placed` - Filter by single status.
+        - `status:placed,completed` - Filter by multiple statuses.
+        - `createdAt:30d` - Filter orders created in the last 30 days.
+        - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+        - `status:placed createdAt:7d` - Combine multiple filters.
+      in: query
+      required: false
+      schema:
+        type: string
+      example: orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7
+    Search:
+      name: search
+      in: query
+      description: |-
+        Performs a case-insensitive text search across relevant fields in the collection.
+
+        **Fields searched depend on the endpoint:**
+        - **Menu items:** `name`, `photoTextDescription`
+        - **Orders:** `customerName`, `id`
+
+        Returns items where any of the searchable fields contain the search term as a substring.
+      required: false
+      schema:
+        type: string
+      example: coffee
+    Limit:
+      name: limit
+      description: |
+        Use to return a number of results per page.
+        If there is more data, use in combination with `after` to page through the data.
+      in: query
+      required: false
+      schema:
+        type: integer
+        minimum: 1
+        maximum: 100
+        default: 10
+      example: 10
+    MenuItemId:
+      name: menuItemId
+      in: path
+      description: ID of the menu item to retrieve.
+      required: true
+      schema:
+        type: string
+        pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+      example: prd_01h1s5z6vf2mm1mz3hevnn9va7
+    PhotoSize:
+      name: photoSize
+      in: query
+      description: Photo size to retrieve.
+      required: false
+      schema:
+        type: string
+        enum:
+          - thumbnail
+          - medium
+          - large
+        default: medium
+    OrderId:
+      name: orderId
+      in: path
+      description: ID of the order to retrieve.
+      required: true
+      schema:
+        type: string
+        pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+      example: ord_01h1s5z6vf2mm1mz3hevnn9va7
+  schemas:
+    Page:
+      type: object
+      properties:
+        endCursor:
+          type:
+            - string
+            - 'null'
+          description: |-
+            Use with the `after` query parameter to load the next page of data.
+            When `null`, there is no data.
+            The cursor is opaque and internal structure is subject to change.
+        startCursor:
+          type:
+            - string
+            - 'null'
+          description: |-
+            Use with the `before` query parameter to load the previous page of data.
+            When `null`, there is no data.
+            The cursor is opaque and internal structure is subject to change.
+        hasNextPage:
+          type: boolean
+          description: Indicates if there is a next page with items.
+        hasPrevPage:
+          type: boolean
+          description: Indicates if there is a previous page with items.
+        limit:
+          type: integer
+          minimum: 1
+          maximum: 100
+          default: 10
+          description: Value showing how many items are in the page limit.
+        total:
+          type: integer
+          description: Count of items across all pages.
+          minimum: 0
+      required:
+        - endCursor
+        - startCursor
+        - hasNextPage
+        - hasPrevPage
+        - limit
+        - total
+    MenuBaseItem:
+      type: object
+      properties:
+        createdAt:
+          description: Created date.
+          type: string
+          format: date-time
+          readOnly: true
+        updatedAt:
+          description: Updated date.
+          type: string
+          format: date-time
+          readOnly: true
+        id:
+          description: Menu item ID. Unique identifier prefixed with `prd_`.
+          type: string
+          readOnly: true
+          pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+          example: prd_01h1s5z6vf2mm1mz3hevnn9va7
+        object:
+          description: Entity name.
+          type: string
+          const: menuItem
+          readOnly: true
+        name:
+          description: Menu item name.
+          type: string
+          minLength: 1
+          maxLength: 50
+        price:
+          description: Price in cents.
+          type: integer
+          minimum: 0
+        photo:
+          writeOnly: true
+          type:
+            - string
+            - 'null'
+          format: binary
+          description: Photo of the menu item. Must be a PNG image and less than 1MB.
+        photoUrl:
+          readOnly: true
+          type: string
+          format: uri
+          description: Photo URL of the menu item.
+        photoTextDescription:
+          type:
+            - string
+            - 'null'
+      required:
+        - id
+        - name
+        - price
+        - createdAt
+        - updatedAt
+        - object
+    Beverage:
+      allOf:
+        - type: object
+          properties:
+            category:
+              description: Menu item category.
+              type: string
+              const: beverage
+            volume:
+              type: number
+              description: Size of the beverage in milliliters.
+              exclusiveMinimum: 0
+            containsCaffeine:
+              type: boolean
+              description: Indicates if the beverage contains caffeine.
+          required:
+            - category
+            - volume
+            - containsCaffeine
+        - $ref: '#/components/schemas/MenuBaseItem'
+    Dessert:
+      allOf:
+        - type: object
+          properties:
+            category:
+              description: Menu item category.
+              type: string
+              const: dessert
+            calories:
+              type: number
+              exclusiveMinimum: 0
+              description: Amount of calories.
+          required:
+            - category
+            - calories
+        - $ref: '#/components/schemas/MenuBaseItem'
+    MenuItem:
+      discriminator:
+        propertyName: category
+        mapping:
+          beverage: '#/components/schemas/Beverage'
+          dessert: '#/components/schemas/Dessert'
+      oneOf:
+        - $ref: '#/components/schemas/Beverage'
+        - $ref: '#/components/schemas/Dessert'
+      required:
+        - category
+    MenuItemList:
+      type: object
+      properties:
+        object:
+          type: string
+          const: list
+          description: Entity name.
+        page:
+          $ref: '#/components/schemas/Page'
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/MenuItem'
+      required:
+        - object
+        - page
+        - items
+    Error:
+      type: object
+      properties:
+        type:
+          type: string
+          format: uri-reference
+          description: URI reference that identifies the problem type.
+          default: about:blank
+        title:
+          type: string
+          description: Short summary of the problem type.
+        status:
+          type: integer
+          format: int32
+          description: |
+            HTTP status code generated by the origin server for this occurrence of the problem.
+          minimum: 100
+          exclusiveMaximum: 600
+        instance:
+          type: string
+          format: uri-reference
+          description: |
+            URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+            May be used to locate the root of this problem in the source code.
+          example: /some/uri-reference#specific-occurrence-context
+        details:
+          description: Additional error details.
+          type: object
+          additionalProperties: true
+      required:
+        - type
+        - title
+        - status
+    OrderStatus:
+      type: string
+      description: Order status.
+      enum:
+        - placed
+        - preparing
+        - completed
+        - canceled
+    Order:
+      type: object
+      title: Order
+      properties:
+        id:
+          description: Order ID. Unique identifier prefixed with `ord_`.
+          type: string
+          format: ulid
+          readOnly: true
+          pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+          example: ord_01h1s5z6vf2mm1mz3hevnn9va7
+        object:
+          description: Entity name.
+          type: string
+          const: order
+          readOnly: true
+        customerName:
+          description: |
+            Name of the customer who placed the order.
+            Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+          type: string
+          pattern: ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+          minLength: 1
+          maxLength: 100
+        status:
+          allOf:
+            - $ref: '#/components/schemas/OrderStatus'
+          readOnly: true
+        totalPrice:
+          description: Total order price in cents.
+          type: integer
+          minimum: 0
+          readOnly: true
+        createdAt:
+          description: Created date.
+          type: string
+          format: date-time
+          readOnly: true
+        updatedAt:
+          description: Updated date.
+          type: string
+          format: date-time
+          readOnly: true
+        orderItems:
+          type: array
+          description: List of items to include in the order.
+          minItems: 1
+          items:
+            type: object
+            properties:
+              menuItemId:
+                type: string
+                format: ulid
+                description: ID of the menu item to add to the order.
+              quantity:
+                type: integer
+                minimum: 1
+                description: Quantity of the menu item.
+              discount:
+                type: integer
+                minimum: 0
+                description: Discount amount in cents (absolute value).
+                default: 0
+              comment:
+                type: string
+                maxLength: 500
+                description: Optional comment for the order item (e.g., "No sugar").
+            required:
+              - menuItemId
+              - quantity
+      required:
+        - customerName
+        - orderItems
+    OrderList:
+      type: object
+      properties:
+        object:
+          type: string
+          const: list
+          description: Entity name.
+        page:
+          $ref: '#/components/schemas/Page'
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/Order'
+      required:
+        - object
+        - page
+        - items
+    OrderItem:
+      type: object
+      properties:
+        menuItemId:
+          type: string
+          description: ID of the menu item to add to the order.
+          writeOnly: true
+        menuItem:
+          allOf:
+            - $ref: '#/components/schemas/MenuItem'
+          description: Menu item that is part of the order.
+          readOnly: true
+        quantity:
+          type: integer
+          minimum: 1
+          description: Quantity of the menu item.
+        discount:
+          type: integer
+          minimum: 0
+          description: Discount amount in cents (absolute value).
+          default: 0
+        comment:
+          type: string
+          maxLength: 500
+          description: Optional comment for the order item (e.g., "No sugar").
+      required:
+        - menuItemId
+        - quantity
+    RevenueStatistics:
+      type: object
+      description: Revenue statistics for a given date range.
+      properties:
+        revenue:
+          type: number
+          format: float
+          description: Total revenue in cents from completed orders.
+          minimum: 0
+        averageOrderAmount:
+          type: number
+          format: float
+          description: Average order amount in cents (calculated from completed orders only).
+          minimum: 0
+        totalOrders:
+          type: integer
+          description: Total number of orders (all statuses) in the date range.
+          minimum: 0
+        placedOrders:
+          type: integer
+          description: Number of placed orders.
+          minimum: 0
+        preparingOrders:
+          type: integer
+          description: Number of preparing orders.
+          minimum: 0
+        completedOrders:
+          type: integer
+          description: Number of completed orders.
+          minimum: 0
+        canceledOrders:
+          type: integer
+          description: Number of canceled orders.
+          minimum: 0
+        startDate:
+          type: string
+          format: date
+          description: Start date of the revenue calculation period.
+        endDate:
+          type: string
+          format: date
+          description: End date of the revenue calculation period.
+      required:
+        - revenue
+        - averageOrderAmount
+        - totalOrders
+        - placedOrders
+        - preparingOrders
+        - completedOrders
+        - canceledOrders
+        - startDate
+        - endDate
+    RegisterClientObject:
+      type: object
+      properties:
+        name:
+          type: string
+          description: Client name.
+        redirectUris:
+          type: array
+          items:
+            type: string
+            format: uri
+          description: List of redirect URIs (optional, defaults to empty array).
+        scopes:
+          type: array
+          items:
+            type: string
+            enum:
+              - menu:read
+              - menu:write
+              - orders:read
+              - orders:write
+          description: List of scopes.
+        grantTypes:
+          type: array
+          items:
+            type: string
+            enum:
+              - authorization_code
+              - client_credentials
+          description: List of grant types.
+      required:
+        - name
+    OAuth2Client:
+      type: object
+      description: OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+      properties:
+        clientId:
+          type: string
+          description: Client identifier issued by the authorization server.
+        clientSecret:
+          type: string
+          description: Client secret issued by the authorization server.
+        clientIdIssuedAt:
+          type: integer
+          format: int64
+          description: Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+        clientSecretExpiresAt:
+          type: integer
+          format: int64
+          description: Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+        name:
+          type: string
+          description: Client name (registered metadata).
+        redirectUris:
+          type: array
+          items:
+            type: string
+            format: uri
+          description: List of redirect URIs (registered metadata).
+        registrationClientUri:
+          type: string
+          format: uri
+          description: URL of the client configuration endpoint for managing this client registration (RFC 7592).
+        registrationAccessToken:
+          type: string
+          description: Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+        scopes:
+          type: array
+          items:
+            type: string
+            enum:
+              - menu:read
+              - menu:write
+              - orders:read
+              - orders:write
+          description: List of scopes (registered metadata).
+        grantTypes:
+          type: array
+          items:
+            type: string
+            enum:
+              - authorization_code
+              - client_credentials
+          description: List of grant types (registered metadata).
+      required:
+        - clientId
+        - clientSecret
+        - clientIdIssuedAt
+        - clientSecretExpiresAt
+        - registrationClientUri
+        - registrationAccessToken
+    OrderNotification:
+      type: object
+      required:
+        - orderId
+        - orderStatus
+        - timestamp
+      properties:
+        orderId:
+          type: string
+          description: Unique order identifier.
+        orderStatus:
+          $ref: '#/components/schemas/OrderStatus'
+        timestamp:
+          type: string
+          format: date-time
+          description: When the event occurred.
+  responses:
+    BadRequest:
+      description: Bad request - invalid input parameters.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    InternalServerError:
+      description: Internal server error.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Unauthorized:
+      description: Unauthorized - authorization required.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Forbidden:
+      description: Forbidden - insufficient permissions.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Conflict:
+      description: Conflict - entity already exists.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    NotFound:
+      description: Resource not found.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
diff --git a/packages/openapi-typescript/examples/tanstack-query/package.json b/packages/openapi-typescript/examples/tanstack-query/package.json
new file mode 100644
index 0000000000..49d2822510
--- /dev/null
+++ b/packages/openapi-typescript/examples/tanstack-query/package.json
@@ -0,0 +1,24 @@
+{
+  "name": "@redocly-examples/tanstack-query",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "generate": "redocly generate-client",
+    "dev": "vite",
+    "build": "vite build"
+  },
+  "dependencies": {
+    "@tanstack/react-query": "^5.0.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "devDependencies": {
+    "@redocly/cli": "latest",
+    "@types/react": "^18.2.0",
+    "@types/react-dom": "^18.2.0",
+    "@vitejs/plugin-react": "^4.3.0",
+    "typescript": "^5.5.0",
+    "vite": "^5.4.0"
+  }
+}
diff --git a/packages/openapi-typescript/examples/tanstack-query/redocly.yaml b/packages/openapi-typescript/examples/tanstack-query/redocly.yaml
new file mode 100644
index 0000000000..ea445f562e
--- /dev/null
+++ b/packages/openapi-typescript/examples/tanstack-query/redocly.yaml
@@ -0,0 +1,10 @@
+# redocly.yaml — drives `redocly generate-client` for this example.
+# generate-client settings live under the `x-openapi-typescript` extension for now
+# (first-class config support is planned in @redocly/config).
+x-openapi-typescript:
+  input: ./openapi.yaml
+  output: ./src/api/client.ts
+  generators:
+    - sdk
+    - tanstack-query
+  facade: functions
diff --git a/packages/openapi-typescript/examples/tanstack-query/src/App.tsx b/packages/openapi-typescript/examples/tanstack-query/src/App.tsx
new file mode 100644
index 0000000000..4063874827
--- /dev/null
+++ b/packages/openapi-typescript/examples/tanstack-query/src/App.tsx
@@ -0,0 +1,13 @@
+import { useQuery } from '@tanstack/react-query';
+
+import { configure } from './api/client';
+import { listMenuItemsOptions } from './api/client.tanstack';
+
+configure({ baseUrl: 'https://cafe.cloud.redocly.com' });
+
+export function App() {
+  const { data, error, isLoading } = useQuery(listMenuItemsOptions({}));
+  if (isLoading) return <p>Loading…</p>;
+  if (error) return <p>Error: {String(error)}</p>;
+  return <pre>{JSON.stringify(data, null, 2)}</pre>;
+}
diff --git a/packages/openapi-typescript/examples/tanstack-query/src/api/client.tanstack.ts b/packages/openapi-typescript/examples/tanstack-query/src/api/client.tanstack.ts
new file mode 100644
index 0000000000..1ac33abde9
--- /dev/null
+++ b/packages/openapi-typescript/examples/tanstack-query/src/api/client.tanstack.ts
@@ -0,0 +1,78 @@
+// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+import { queryOptions } from "@tanstack/react-query";
+
+import { createMenuItem, createOrder, deleteMenuItem, deleteOrder, getMenuItemPhoto, getOrderById, getRevenue, listMenuItems, listOrderItems, listOrders, registerOAuth2Client, updateOrder, type CreateMenuItemVariables, type CreateOrderVariables, type DeleteMenuItemVariables, type DeleteOrderVariables, type GetMenuItemPhotoVariables, type GetOrderByIdVariables, type GetRevenueVariables, type ListMenuItemsVariables, type ListOrderItemsVariables, type ListOrdersVariables, type RegisterOAuth2ClientVariables, type UpdateOrderVariables, type RequestOptions } from "./client.js";
+
+export const listMenuItemsQueryKey = (vars: ListMenuItemsVariables) => ["listMenuItems", vars] as const;
+
+export const listMenuItemsOptions = (vars: ListMenuItemsVariables, init?: RequestOptions) => queryOptions({
+    queryKey: listMenuItemsQueryKey(vars),
+    queryFn: () => listMenuItems(vars.params, init)
+});
+
+export const createMenuItemMutation = () => ({
+    mutationKey: ["createMenuItem"] as const,
+    mutationFn: (vars: CreateMenuItemVariables) => createMenuItem(vars.body)
+});
+
+export const deleteMenuItemMutation = () => ({
+    mutationKey: ["deleteMenuItem"] as const,
+    mutationFn: (vars: DeleteMenuItemVariables) => deleteMenuItem(vars.menuItemId)
+});
+
+export const getMenuItemPhotoQueryKey = (vars: GetMenuItemPhotoVariables) => ["getMenuItemPhoto", vars] as const;
+
+export const getMenuItemPhotoOptions = (vars: GetMenuItemPhotoVariables, init?: RequestOptions) => queryOptions({
+    queryKey: getMenuItemPhotoQueryKey(vars),
+    queryFn: () => getMenuItemPhoto(vars.menuItemId, vars.params, init)
+});
+
+export const listOrdersQueryKey = (vars: ListOrdersVariables) => ["listOrders", vars] as const;
+
+export const listOrdersOptions = (vars: ListOrdersVariables, init?: RequestOptions) => queryOptions({
+    queryKey: listOrdersQueryKey(vars),
+    queryFn: () => listOrders(vars.params, init)
+});
+
+export const createOrderMutation = () => ({
+    mutationKey: ["createOrder"] as const,
+    mutationFn: (vars: CreateOrderVariables) => createOrder(vars.body)
+});
+
+export const getOrderByIdQueryKey = (vars: GetOrderByIdVariables) => ["getOrderById", vars] as const;
+
+export const getOrderByIdOptions = (vars: GetOrderByIdVariables, init?: RequestOptions) => queryOptions({
+    queryKey: getOrderByIdQueryKey(vars),
+    queryFn: () => getOrderById(vars.orderId, vars.headers, init)
+});
+
+export const deleteOrderMutation = () => ({
+    mutationKey: ["deleteOrder"] as const,
+    mutationFn: (vars: DeleteOrderVariables) => deleteOrder(vars.orderId)
+});
+
+export const updateOrderMutation = () => ({
+    mutationKey: ["updateOrder"] as const,
+    mutationFn: (vars: UpdateOrderVariables) => updateOrder(vars.orderId, vars.body)
+});
+
+export const listOrderItemsQueryKey = (vars: ListOrderItemsVariables) => ["listOrderItems", vars] as const;
+
+export const listOrderItemsOptions = (vars: ListOrderItemsVariables, init?: RequestOptions) => queryOptions({
+    queryKey: listOrderItemsQueryKey(vars),
+    queryFn: () => listOrderItems(vars.params, init)
+});
+
+export const getRevenueQueryKey = (vars: GetRevenueVariables) => ["getRevenue", vars] as const;
+
+export const getRevenueOptions = (vars: GetRevenueVariables, init?: RequestOptions) => queryOptions({
+    queryKey: getRevenueQueryKey(vars),
+    queryFn: () => getRevenue(vars.params, init)
+});
+
+export const registerOAuth2ClientMutation = () => ({
+    mutationKey: ["registerOAuth2Client"] as const,
+    mutationFn: (vars: RegisterOAuth2ClientVariables) => registerOAuth2Client(vars.body)
+});
\ No newline at end of file
diff --git a/packages/openapi-typescript/examples/tanstack-query/src/api/client.ts b/packages/openapi-typescript/examples/tanstack-query/src/api/client.ts
new file mode 100644
index 0000000000..dcb4900f7c
--- /dev/null
+++ b/packages/openapi-typescript/examples/tanstack-query/src/api/client.ts
@@ -0,0 +1,1513 @@
+// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Redocly Cafe (v1.0.0)
+ * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+ * Create API credentials and try it yourself in a realistic OpenAPI workflow.
+ * 
+ */
+
+export type Page = {
+    /**
+     * Use with the `after` query parameter to load the next page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    endCursor: string | null;
+    /**
+     * Use with the `before` query parameter to load the previous page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    startCursor: string | null;
+    /**
+     * Indicates if there is a next page with items.
+     */
+    hasNextPage: boolean;
+    /**
+     * Indicates if there is a previous page with items.
+     */
+    hasPrevPage: boolean;
+    /**
+     * Value showing how many items are in the page limit.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit: number;
+    /**
+     * Count of items across all pages.
+     * @minimum 0
+     */
+    total: number;
+};
+
+export type MenuBaseItem = {
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt: string;
+    /**
+     * Menu item ID. Unique identifier prefixed with `prd_`.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    readonly id: string;
+    /**
+     * Entity name.
+     */
+    readonly object: "menuItem";
+    /**
+     * Menu item name.
+     * @minLength 1
+     * @maxLength 50
+     */
+    name: string;
+    /**
+     * Price in cents.
+     * @minimum 0
+     */
+    price: number;
+    /**
+     * Photo of the menu item. Must be a PNG image and less than 1MB.
+     * @format binary
+     */
+    photo?: Blob | null;
+    /**
+     * Photo URL of the menu item.
+     * @format uri
+     */
+    readonly photoUrl?: string;
+    photoTextDescription?: string | null;
+};
+
+export type Beverage = {
+    /**
+     * Menu item category.
+     */
+    category: "beverage";
+    /**
+     * Size of the beverage in milliliters.
+     * @exclusiveMinimum 0
+     */
+    volume: number;
+    /**
+     * Indicates if the beverage contains caffeine.
+     */
+    containsCaffeine: boolean;
+} & MenuBaseItem;
+
+export type Dessert = {
+    /**
+     * Menu item category.
+     */
+    category: "dessert";
+    /**
+     * Amount of calories.
+     * @exclusiveMinimum 0
+     */
+    calories: number;
+} & MenuBaseItem;
+
+export type MenuItem = Beverage | Dessert;
+
+export type MenuItemList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: MenuItem[];
+};
+
+export type Error = {
+    /**
+     * URI reference that identifies the problem type.
+     * @format uri-reference
+     */
+    type: string;
+    /**
+     * Short summary of the problem type.
+     */
+    title: string;
+    /**
+     * HTTP status code generated by the origin server for this occurrence of the problem.
+     * @minimum 100
+     * @exclusiveMaximum 600
+     * @format int32
+     */
+    status: number;
+    /**
+     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+     * May be used to locate the root of this problem in the source code.
+     * @format uri-reference
+     */
+    instance?: string;
+    /**
+     * Additional error details.
+     */
+    details?: Record<string, unknown>;
+};
+
+/**
+ * Order status.
+ */
+export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
+
+export const OrderStatus = {
+    placed: "placed",
+    preparing: "preparing",
+    completed: "completed",
+    canceled: "canceled"
+} as const;
+
+export type Order = {
+    /**
+     * Order ID. Unique identifier prefixed with `ord_`.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     * @format ulid
+     */
+    readonly id?: string;
+    /**
+     * Entity name.
+     */
+    readonly object?: "order";
+    /**
+     * Name of the customer who placed the order.
+     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+     * @minLength 1
+     * @maxLength 100
+     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+     */
+    customerName: string;
+    readonly status?: OrderStatus;
+    /**
+     * Total order price in cents.
+     * @minimum 0
+     */
+    readonly totalPrice?: number;
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt?: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt?: string;
+    /**
+     * List of items to include in the order.
+     * @minItems 1
+     */
+    orderItems: {
+        /**
+         * ID of the menu item to add to the order.
+         * @format ulid
+         */
+        menuItemId: string;
+        /**
+         * Quantity of the menu item.
+         * @minimum 1
+         */
+        quantity: number;
+        /**
+         * Discount amount in cents (absolute value).
+         * @minimum 0
+         */
+        discount?: number;
+        /**
+         * Optional comment for the order item (e.g., "No sugar").
+         * @maxLength 500
+         */
+        comment?: string;
+    }[];
+};
+
+export type OrderList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: Order[];
+};
+
+export type OrderItem = {
+    /**
+     * ID of the menu item to add to the order.
+     */
+    menuItemId: string;
+    /**
+     * Menu item that is part of the order.
+     */
+    readonly menuItem?: MenuItem;
+    /**
+     * Quantity of the menu item.
+     * @minimum 1
+     */
+    quantity: number;
+    /**
+     * Discount amount in cents (absolute value).
+     * @minimum 0
+     */
+    discount?: number;
+    /**
+     * Optional comment for the order item (e.g., "No sugar").
+     * @maxLength 500
+     */
+    comment?: string;
+};
+
+/**
+ * Revenue statistics for a given date range.
+ */
+export type RevenueStatistics = {
+    /**
+     * Total revenue in cents from completed orders.
+     * @minimum 0
+     * @format float
+     */
+    revenue: number;
+    /**
+     * Average order amount in cents (calculated from completed orders only).
+     * @minimum 0
+     * @format float
+     */
+    averageOrderAmount: number;
+    /**
+     * Total number of orders (all statuses) in the date range.
+     * @minimum 0
+     */
+    totalOrders: number;
+    /**
+     * Number of placed orders.
+     * @minimum 0
+     */
+    placedOrders: number;
+    /**
+     * Number of preparing orders.
+     * @minimum 0
+     */
+    preparingOrders: number;
+    /**
+     * Number of completed orders.
+     * @minimum 0
+     */
+    completedOrders: number;
+    /**
+     * Number of canceled orders.
+     * @minimum 0
+     */
+    canceledOrders: number;
+    /**
+     * Start date of the revenue calculation period.
+     * @format date
+     */
+    startDate: string;
+    /**
+     * End date of the revenue calculation period.
+     * @format date
+     */
+    endDate: string;
+};
+
+export type RegisterClientObject = {
+    /**
+     * Client name.
+     */
+    name: string;
+    /**
+     * List of redirect URIs (optional, defaults to empty array).
+     */
+    redirectUris?: string[];
+    /**
+     * List of scopes.
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types.
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+/**
+ * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+ */
+export type OAuth2Client = {
+    /**
+     * Client identifier issued by the authorization server.
+     */
+    clientId: string;
+    /**
+     * Client secret issued by the authorization server.
+     */
+    clientSecret: string;
+    /**
+     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+     * @format int64
+     */
+    clientIdIssuedAt: number;
+    /**
+     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+     * @format int64
+     */
+    clientSecretExpiresAt: number;
+    /**
+     * Client name (registered metadata).
+     */
+    name?: string;
+    /**
+     * List of redirect URIs (registered metadata).
+     */
+    redirectUris?: string[];
+    /**
+     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
+     * @format uri
+     */
+    registrationClientUri: string;
+    /**
+     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+     */
+    registrationAccessToken: string;
+    /**
+     * List of scopes (registered metadata).
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types (registered metadata).
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+export type OrderNotification = {
+    /**
+     * Unique order identifier.
+     */
+    orderId: string;
+    orderStatus: OrderStatus;
+    /**
+     * When the event occurred.
+     * @format date-time
+     */
+    timestamp: string;
+};
+
+/**
+ * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
+ */
+export function isBeverage(value: MenuItem): value is Beverage {
+    return (value as Record<string, unknown>)["category"] === "beverage";
+}
+
+/**
+ * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
+ */
+export function isDessert(value: MenuItem): value is Dessert {
+    return (value as Record<string, unknown>)["category"] === "dessert";
+}
+
+/**
+ * Static metadata for every operation, keyed by operationId: the HTTP `method`
+ * and the `path` template (with `{param}` placeholders intact). Minification-safe
+ * — useful for building cache/query keys, tracing span names, and request logging
+ * without re-deriving them at each call site.
+ */
+export const OPERATIONS = {
+    listMenuItems: { method: "GET", path: "/menu" },
+    createMenuItem: { method: "POST", path: "/menu" },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
+    listOrders: { method: "GET", path: "/orders" },
+    createOrder: { method: "POST", path: "/orders" },
+    getOrderById: { method: "GET", path: "/orders/{orderId}" },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
+    listOrderItems: { method: "GET", path: "/order-items" },
+    getRevenue: { method: "GET", path: "/revenue" },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
+} as const;
+
+/**
+ * The operationId of any operation in this client.
+ */
+export type OperationId = keyof typeof OPERATIONS;
+
+/**
+ * Static metadata describing one operation: its HTTP method and path template.
+ */
+export type OperationMetadata = {
+    readonly method: string;
+    readonly path: string;
+};
+
+let BASE = "https://cafe.cloud.redocly.com";
+
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+export type RequestContext = {
+    url: string;
+    method: string;
+    headers: Record<string, string>;
+    body?: unknown;
+};
+
+/**
+ * Configuration and extension hooks for a client. Supplied per-instance via
+ * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
+ * (functions facade).
+ */
+export type ClientConfig = {
+    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    baseUrl?: string;
+    /** Extra headers merged into every request; a function is invoked per request. */
+    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+    /** Transport used to issue requests. Defaults to the global `fetch`. */
+    fetch?: typeof fetch;
+    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    /** Observe — or replace, by returning a `Response` — the response before parsing. */
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    /**
+     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
+     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
+     */
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
+    /**
+     * Composable interceptors run around every request, alongside the single
+     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
+     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
+     * the last-registered middleware wraps closest to the network. Register more at runtime
+     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
+     */
+    middleware?: Middleware[];
+    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
+    retry?: RetryConfig;
+    /**
+     * Per-instance auth credentials. When set, they override the module-global
+     * `set*` helpers for requests made through this config (each scheme falls back
+     * to its global slot when omitted here). Only the schemes an operation declares
+     * in its `security` are ever sent.
+     */
+    auth?: AuthCredentials;
+};
+
+/**
+ * A request interceptor; every field is optional, so a middleware can hook any subset of
+ * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
+ * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
+ * failure into the error to throw, threaded through each middleware in turn.
+ */
+export type Middleware = {
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/** Context handed to `retryOn` for the attempt that just failed. */
+export type RetryContext = {
+    /** 1-based number of the attempt that just failed. */
+    attempt: number;
+    /** The request that was attempted. */
+    request: RequestContext;
+    /** Present when the server returned a (non-ok) response. */
+    response?: Response;
+    /** Present when the transport threw (network error, DNS, connection reset). */
+    error?: unknown;
+};
+
+/** Retry policy; all fields optional with sensible defaults. */
+export type RetryConfig = {
+    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
+    retries?: number;
+    /** Base delay in milliseconds. Default 1000. */
+    retryDelay?: number;
+    /** Backoff shape. Default 'exponential'. */
+    retryStrategy?: RetryStrategy;
+    /** Apply full jitter over the computed delay. Default true. */
+    jitter?: boolean;
+    /**
+     * Decide whether to retry a failed attempt. Default: retry only idempotent
+     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
+     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
+     */
+    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
+};
+
+/**
+ * How the response body is read. `'auto'` negotiates from the content type (the
+ * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
+ */
+export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
+
+/**
+ * The trailing per-operation argument: standard `RequestInit` plus an optional
+ * per-call retry override and a `parseAs` escape hatch.
+ *
+ * `parseAs` forces how the response body is read; overrides the inferred kind.
+ * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
+ * override — the static return type is unchanged.
+ */
+export type RequestOptions = RequestInit & {
+    retry?: Partial<RetryConfig>;
+    parseAs?: ParseAs;
+};
+
+/**
+ * Override the base URL used by every generated operation. Useful when the
+ * runtime environment differs from the value declared in `servers[0].url`
+ * (e.g. dev / staging / prod toggles in a single-page app).
+ *
+ * Mutates a module-scoped binding shared by the functions facade. For multiple
+ * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ */
+export function setBaseUrl(url: string): void {
+    BASE = url;
+}
+
+/** The global config used by the functions facade (see `configure`). */
+const __config: ClientConfig = {};
+
+/**
+ * Merge `config` into the global configuration used by the functions facade —
+ * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
+ * hooks once for every free function. The service-class facade configures per
+ * instance instead (`new Client(config)`).
+ */
+export function configure(config: ClientConfig): void {
+    Object.assign(__config, config);
+}
+
+/**
+ * Append interceptors to the functions facade's global middleware chain (see
+ * `ClientConfig.middleware`). The service-class facade registers per instance via
+ * `<Client>.use(...)` instead.
+ */
+export function use(...middleware: Middleware[]): void {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    __config.middleware = [...(__config.middleware ?? []), ...middleware];
+}
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function __middleware(config: ClientConfig): Middleware[] {
+    const single = config.onRequest || config.onResponse || config.onError
+        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+        : [];
+    return [...single, ...(config.middleware ?? [])];
+}
+
+export class ApiError extends Error {
+    public readonly url: string;
+    public readonly status: number;
+    public readonly statusText: string;
+    public readonly body: unknown;
+    constructor(url: string, status: number, statusText: string, body: unknown) {
+        super(`Request failed with status ${status}`);
+        this.name = 'ApiError';
+        this.url = url;
+        this.status = status;
+        this.statusText = statusText;
+        this.body = body;
+    }
+}
+
+type QueryPrimitive = string | number | boolean;
+
+type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
+
+/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
+type QueryStyle = {
+    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+    explode: boolean;
+    allowReserved?: boolean;
+};
+
+/**
+ * Percent-encode `value` but leave the RFC-3986 reserved set
+ * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
+ */
+function __encodeReserved(value: string): string {
+    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
+}
+
+function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
+    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    if (!query)
+        return url;
+    const params = new URLSearchParams();
+    const raw: string[] = [];
+    for (const [key, value] of Object.entries(query)) {
+        if (value === undefined || value === null)
+            continue;
+        const spec = styles?.[key];
+        if (!spec) {
+            if (Array.isArray(value)) {
+                for (const v of value) {
+                    if (v !== undefined && v !== null)
+                        params.append(key, String(v));
+                }
+            }
+            else if (typeof value === 'object') {
+                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+                for (const [subKey, subValue] of Object.entries(value)) {
+                    if (subValue !== undefined && subValue !== null) {
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                    }
+                }
+            }
+            else {
+                params.append(key, String(value));
+            }
+            continue;
+        }
+        if (Array.isArray(value)) {
+            const items = value.filter((v) => v !== undefined && v !== null).map(String);
+            if (spec.style === 'form' && spec.explode) {
+                for (const v of items) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}=${__encodeReserved(v)}`);
+                    else
+                        params.append(key, v);
+                }
+            }
+            else {
+                // Delimited styles put the LITERAL delimiter on the wire; only the
+                // values are encoded. `%20` (not `+`) is the literal space delimiter.
+                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
+                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+            }
+        }
+        else if (typeof value === 'object') {
+            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+            for (const [subKey, subValue] of Object.entries(value)) {
+                if (subValue !== undefined && subValue !== null) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
+                    else
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                }
+            }
+        }
+        else if (spec.allowReserved) {
+            raw.push(`${key}=${__encodeReserved(String(value))}`);
+        }
+        else {
+            params.append(key, String(value));
+        }
+    }
+    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+    return qs ? `${url}?${qs}` : url;
+}
+
+async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+    response: Response;
+    context: RequestContext;
+}> {
+    const { retry: callRetry, ...fetchInit } = init;
+    const retry: RetryConfig = { ...config.retry, ...callRetry };
+    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+    const headers: Record<string, string> = {
+        Accept: 'application/json',
+        ...extra,
+        ...(fetchInit.headers as Record<string, string> | undefined),
+    };
+    let payload: BodyInit | undefined;
+    if (body !== undefined) {
+        const isBinary = body instanceof Blob ||
+            body instanceof ArrayBuffer ||
+            ArrayBuffer.isView(body as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
+        const isURLSearchParams = body instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
+            payload = body as BodyInit;
+        }
+        else {
+            payload = JSON.stringify(body);
+            if (!('Content-Type' in headers) && !('content-type' in headers)) {
+                headers['Content-Type'] = 'application/json';
+            }
+        }
+    }
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    const doFetch = config.fetch ?? fetch;
+    const maxAttempts = 1 + (retry.retries ?? 0);
+    const retryOn = retry.retryOn ?? __defaultRetryOn;
+    const signal = fetchInit.signal ?? undefined;
+    let attempt = 0;
+    while (true) {
+        attempt++;
+        if (signal?.aborted)
+            throw __abortError(signal);
+        let response: Response;
+        try {
+            response = await doFetch(context.url, {
+                ...fetchInit,
+                method: context.method,
+                headers: context.headers,
+                body: payload,
+            });
+        }
+        catch (error) {
+            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
+                await __sleep(__retryDelay(retry, attempt, null), signal);
+                continue;
+            }
+            throw error;
+        }
+        // Reverse order: the last-registered middleware wraps closest to the network (onion).
+        for (let i = middleware.length - 1; i >= 0; i--) {
+            const onResponse = middleware[i].onResponse;
+            if (onResponse) {
+                const replaced = await onResponse(response, context);
+                if (replaced)
+                    response = replaced;
+            }
+        }
+        if (!response.ok &&
+            attempt < maxAttempts &&
+            !signal?.aborted &&
+            (await retryOn({ attempt, request: context, response }))) {
+            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            continue;
+        }
+        return { response, context };
+    }
+}
+
+async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+    if (kind === 'void' || response.status === 204)
+        return undefined;
+    if (kind === 'stream')
+        return response.body;
+    if (kind === 'blob')
+        return response.blob();
+    if (kind === 'arrayBuffer')
+        return response.arrayBuffer();
+    if (kind === 'formData')
+        return response.formData();
+    if (kind === 'text')
+        return response.text();
+    if (kind === 'json')
+        return response.json();
+    // 'auto' — negotiate from the response's content type.
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json'))
+        return response.json();
+    if (contentType.startsWith('text/'))
+        return response.text();
+    return response.blob();
+}
+
+async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+    const { parseAs, ...sendInit } = init;
+    const { response, context } = await __send(config, url, sendInit, body);
+    if (!response.ok) {
+        const errorBody = await readError(response);
+        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
+        // Thread the error through each middleware's onError in turn (each may replace it).
+        for (const mw of __middleware(config)) {
+            if (mw.onError)
+                error = await mw.onError(error as ApiError, context);
+        }
+        throw error;
+    }
+    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
+    return (await __parse(response, kind)) as T;
+}
+
+async function readError(response: Response): Promise<unknown> {
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json')) {
+        return response.json().catch(() => undefined);
+    }
+    return response.text().catch(() => undefined);
+}
+
+const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+
+const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+function __defaultRetryOn(ctx: RetryContext): boolean {
+    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
+        return false;
+    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+    if (retryAfter) {
+        const seconds = Number(retryAfter);
+        if (!Number.isNaN(seconds))
+            return seconds * 1000;
+        const when = Date.parse(retryAfter);
+        if (!Number.isNaN(when))
+            return Math.max(0, when - Date.now());
+    }
+    const base = retry.retryDelay ?? 1000;
+    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+    return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
+    return new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject(__abortError(signal));
+            return;
+        }
+        const onAbort = () => {
+            clearTimeout(timer);
+            reject(__abortError(signal as AbortSignal));
+        };
+        const timer = setTimeout(() => {
+            if (signal)
+                signal.removeEventListener('abort', onAbort);
+            resolve();
+        }, ms);
+        if (signal)
+            signal.addEventListener('abort', onAbort, { once: true });
+    });
+}
+
+function __abortError(signal: AbortSignal): globalThis.Error {
+    const reason = (signal as {
+        reason?: unknown;
+    }).reason;
+    if (reason instanceof Error)
+        return reason;
+    return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * Normalize an operation's header-parameter object into a plain string record,
+ * dropping any `undefined` / `null` entries (optional headers the caller omitted)
+ * and stringifying the rest. Mirrors __buildUrl's handling of query values.
+ */
+function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
+    const out: Record<string, string> = {};
+    for (const [key, value] of Object.entries(values)) {
+        if (value !== undefined && value !== null)
+            out[key] = String(value);
+    }
+    return out;
+}
+
+/**
+ * A credential value, or a (possibly async) function that returns one per request.
+ */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/**
+ * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
+ * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
+ * to the global slots.
+ */
+export type AuthCredentials = {
+    bearer?: TokenProvider;
+    apiKey?: Record<string, TokenProvider>;
+};
+
+let __bearerToken: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
+ * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
+ * (possibly async) function resolved per request.
+ */
+export function setBearer(token: TokenProvider | null): void {
+    __bearerToken = token;
+}
+
+let __apiKey_ApiKey: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
+ * string or a (possibly async) function resolved per request.
+ */
+export function setApiKey(key: TokenProvider | null): void {
+    __apiKey_ApiKey = key;
+}
+
+/**
+ * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
+ */
+async function __resolve(slot: TokenProvider | null): Promise<string | null> {
+    if (slot === null)
+        return null;
+    return typeof slot === "function" ? slot() : slot;
+}
+
+/**
+ * Build the auth `headers` and `query` for an operation from the currently-set credentials.
+ * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
+ * can always override by passing their own `init.headers`.
+ */
+async function __auth(schemes: string[], config: ClientConfig): Promise<{
+    headers: Record<string, string>;
+    query: Record<string, string>;
+}> {
+    const headers: Record<string, string> = {};
+    const query: Record<string, string> = {};
+    const cookies: string[] = [];
+    for (const scheme of schemes) {
+        switch (scheme) {
+            case "OAuth2": {
+                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
+                if (v !== null)
+                    headers["Authorization"] = `Bearer ${v}`;
+                break;
+            }
+            case "ApiKey": {
+                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
+                if (v !== null)
+                    headers["X-API-Key"] = v;
+                break;
+            }
+        }
+    }
+    if (cookies.length > 0)
+        headers["Cookie"] = cookies.join("; ");
+    return { headers, query };
+}
+
+export type ListMenuItemsResult = MenuItemList;
+
+export type ListMenuItemsParams = {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+};
+
+export type ListMenuItemsVariables = {
+    params?: ListMenuItemsParams;
+};
+
+/**
+ * List all menu items
+ *
+ * Retrieve a collection of menu items with optional filtering and pagination.
+ */
+export async function listMenuItems(params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
+    return __request<MenuItemList>(__config, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
+}
+
+export type CreateMenuItemResult = MenuItem;
+
+export type CreateMenuItemBody = FormData;
+
+export type CreateMenuItemVariables = {
+    body: CreateMenuItemBody;
+};
+
+/**
+ * Create menu item
+ *
+ * Create a new menu item.
+ */
+export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<MenuItem>(__config, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type DeleteMenuItemResult = void;
+
+export type DeleteMenuItemVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+};
+
+/**
+ * Delete a menu item
+ *
+ * Delete an existing menu item.
+ */
+export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type GetMenuItemPhotoResult = Blob | string;
+
+export type GetMenuItemPhotoParams = {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+};
+
+export type GetMenuItemPhotoVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+    params?: GetMenuItemPhotoParams;
+};
+
+/**
+ * Retrieve a menu item photo
+ *
+ * Retrieve the product photo image for a specific menu item.
+ */
+export async function getMenuItemPhoto(menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}): Promise<Blob | string> {
+    return __request<Blob | string>(__config, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+}
+
+export type ListOrdersResult = OrderList;
+
+export type ListOrdersParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+};
+
+export type ListOrdersVariables = {
+    params?: ListOrdersParams;
+};
+
+/**
+ * List all orders
+ *
+ * Retrieve a collection of orders with optional filtering and pagination.
+ */
+export async function listOrders(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderList> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderList>(__config, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+/**
+ * Create order
+ *
+ * Create a new order.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    headers?: GetOrderByIdHeaders;
+};
+
+/**
+ * Retrieve an order
+ *
+ * Retrieve a single order by its ID.
+ */
+export async function getOrderById(orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+}
+
+export type DeleteOrderResult = void;
+
+export type DeleteOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+};
+
+/**
+ * Delete an order
+ *
+ * Delete the order.
+ * To keep the order history, the order should be canceled instead of deleted.
+ */
+export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type UpdateOrderResult = Order;
+
+export type UpdateOrderBody = {
+    status: OrderStatus;
+};
+
+export type UpdateOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    body?: UpdateOrderBody;
+};
+
+/**
+ * Partially update an order
+ *
+ * Update an existing order status.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function updateOrder(orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type ListOrderItemsResult = OrderItem[];
+
+export type ListOrderItemsParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+};
+
+export type ListOrderItemsVariables = {
+    params?: ListOrderItemsParams;
+};
+
+/**
+ * List all order items with menu item details
+ *
+ * Returns an array of order items for a specific order.
+ * Use the `filter` parameter to filter by order ID.
+ */
+export async function listOrderItems(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderItem[]>(__config, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+/**
+ * Get revenue statistics
+ *
+ * Retrieve revenue statistics for a configurable date range.
+ * Returns revenue, order counts, average order amount, and other useful statistics.
+ */
+export async function getRevenue(params: {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
+    const __a = await __auth(["ApiKey"], __config);
+    return __request<RevenueStatistics>(__config, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Create OAuth2 client
+ *
+ * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+ * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
+ *   `redirectUris` must be provided (per RFC 7591 Section 2).
+ * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+ * Returns the registered client information per RFC 7591, including:
+ * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+ */
+export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
+    return __request<OAuth2Client>(__config, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+}
diff --git a/packages/openapi-typescript/examples/tanstack-query/src/main.tsx b/packages/openapi-typescript/examples/tanstack-query/src/main.tsx
new file mode 100644
index 0000000000..599220e9a4
--- /dev/null
+++ b/packages/openapi-typescript/examples/tanstack-query/src/main.tsx
@@ -0,0 +1,15 @@
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import React from 'react';
+import { createRoot } from 'react-dom/client';
+
+import { App } from './App';
+
+const queryClient = new QueryClient();
+
+createRoot(document.getElementById('root')!).render(
+  <React.StrictMode>
+    <QueryClientProvider client={queryClient}>
+      <App />
+    </QueryClientProvider>
+  </React.StrictMode>
+);
diff --git a/packages/openapi-typescript/examples/tanstack-query/tsconfig.json b/packages/openapi-typescript/examples/tanstack-query/tsconfig.json
new file mode 100644
index 0000000000..5e95adc139
--- /dev/null
+++ b/packages/openapi-typescript/examples/tanstack-query/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "jsx": "react-jsx"
+  },
+  "include": ["src"]
+}
diff --git a/packages/openapi-typescript/examples/tanstack-query/vite.config.ts b/packages/openapi-typescript/examples/tanstack-query/vite.config.ts
new file mode 100644
index 0000000000..f1134976b7
--- /dev/null
+++ b/packages/openapi-typescript/examples/tanstack-query/vite.config.ts
@@ -0,0 +1,4 @@
+import react from '@vitejs/plugin-react';
+import { defineConfig } from 'vite';
+
+export default defineConfig({ plugins: [react()] });
diff --git a/packages/openapi-typescript/examples/tsconfig.base.json b/packages/openapi-typescript/examples/tsconfig.base.json
new file mode 100644
index 0000000000..59c1ef1ffb
--- /dev/null
+++ b/packages/openapi-typescript/examples/tsconfig.base.json
@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "strict": true,
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "noEmit": true,
+    "skipLibCheck": true,
+    "verbatimModuleSyntax": true
+  }
+}
diff --git a/packages/openapi-typescript/examples/zod/.gitignore b/packages/openapi-typescript/examples/zod/.gitignore
new file mode 100644
index 0000000000..f06235c460
--- /dev/null
+++ b/packages/openapi-typescript/examples/zod/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+dist
diff --git a/packages/openapi-typescript/examples/zod/README.md b/packages/openapi-typescript/examples/zod/README.md
new file mode 100644
index 0000000000..5ee02e44d5
--- /dev/null
+++ b/packages/openapi-typescript/examples/zod/README.md
@@ -0,0 +1,15 @@
+# zod example
+
+Generated TypeScript client plus **zod** schemas (`generators: ['sdk', 'zod']`). The app fetches with
+the sdk, then validates the response at runtime against the generated `*.zod` schema.
+
+## Run
+
+```bash
+npm install
+npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
+npm run dev        # open the printed local URL
+```
+
+The generated client + zod schemas under `src/api/` are committed and drift-checked against the
+generator in CI.
diff --git a/packages/openapi-typescript/examples/zod/index.html b/packages/openapi-typescript/examples/zod/index.html
new file mode 100644
index 0000000000..d1621f420e
--- /dev/null
+++ b/packages/openapi-typescript/examples/zod/index.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>Redocly openapi-typescript — zod example</title>
+  </head>
+  <body>
+    <pre id="out">Loading…</pre>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
diff --git a/packages/openapi-typescript/examples/zod/openapi.yaml b/packages/openapi-typescript/examples/zod/openapi.yaml
new file mode 100644
index 0000000000..a6a75dffd0
--- /dev/null
+++ b/packages/openapi-typescript/examples/zod/openapi.yaml
@@ -0,0 +1,1163 @@
+openapi: 3.2.0
+info:
+  title: Redocly Cafe
+  description: |
+    Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+    Create API credentials and try it yourself in a realistic OpenAPI workflow.
+  version: 1.0.0
+  contact:
+    email: team@redocly.com
+    url: https://redocly.com/contact-us/
+  license:
+    name: MIT
+    url: https://opensource.org/licenses/MIT
+  termsOfService: https://redocly.com/subscription-agreement
+servers:
+  - url: https://cafe.cloud.redocly.com
+    description: Live server.
+tags:
+  - name: Authorization
+    description: Create a client to demo the API.
+  - name: Products
+    description: Operations related to products.
+  - name: Orders
+    description: Order management operations.
+  - name: Statistics
+    description: Statistics operations.
+paths:
+  /menu:
+    get:
+      tags:
+        - Products
+      summary: List all menu items
+      description: Retrieve a collection of menu items with optional filtering and pagination.
+      operationId: listMenuItems
+      security: []
+      parameters:
+        - $ref: '#/components/parameters/After'
+        - $ref: '#/components/parameters/Before'
+        - $ref: '#/components/parameters/Sort'
+        - $ref: '#/components/parameters/Filter'
+        - $ref: '#/components/parameters/Search'
+        - $ref: '#/components/parameters/Limit'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItemList'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    post:
+      tags:
+        - Products
+      summary: Create menu item
+      description: Create a new menu item.
+      operationId: createMenuItem
+      security:
+        - OAuth2:
+            - menu:write
+      requestBody:
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              $ref: '#/components/schemas/MenuItem'
+      responses:
+        '201':
+          description: Menu item created successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItem'
+              examples:
+                MenuItemResponse:
+                  value:
+                    id: prd_01khr487f7qm7p44xn427m43vb
+                    object: menuItem
+                    name: coffee
+                    price: 4000
+                    category: beverage
+                    createdAt: '2026-02-18T10:20:38.228Z'
+                    updatedAt: '2026-02-18T10:20:38.228Z'
+                    volume: 600
+                    containsCaffeine: false
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '409':
+          $ref: '#/components/responses/Conflict'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /menu/{menuItemId}:
+    parameters:
+      - $ref: '#/components/parameters/MenuItemId'
+    delete:
+      tags:
+        - Products
+      summary: Delete a menu item
+      description: Delete an existing menu item.
+      operationId: deleteMenuItem
+      security:
+        - OAuth2:
+            - menu:write
+      responses:
+        '204':
+          description: Menu item deleted successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /menu-item-images/{menuItemId}:
+    parameters:
+      - $ref: '#/components/parameters/MenuItemId'
+    get:
+      operationId: getMenuItemPhoto
+      summary: Retrieve a menu item photo
+      description: Retrieve the product photo image for a specific menu item.
+      security: []
+      tags:
+        - Products
+      parameters:
+        - $ref: '#/components/parameters/PhotoSize'
+      responses:
+        '200':
+          description: Menu item photo retrieved successfully.
+          content:
+            image/png:
+              schema:
+                type: string
+                format: binary
+            text/plain:
+              schema:
+                description: Alternative image text.
+                type: string
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /orders:
+    get:
+      tags:
+        - Orders
+      summary: List all orders
+      description: Retrieve a collection of orders with optional filtering and pagination.
+      operationId: listOrders
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/Filter'
+        - $ref: '#/components/parameters/Sort'
+        - $ref: '#/components/parameters/Limit'
+        - $ref: '#/components/parameters/After'
+        - $ref: '#/components/parameters/Before'
+        - $ref: '#/components/parameters/Search'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OrderList'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    post:
+      tags:
+        - Orders
+      summary: Create order
+      description: |
+        Create a new order.
+        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+      operationId: createOrder
+      security:
+        - OAuth2:
+            - orders:write
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Order'
+            examples:
+              OrderRequest:
+                dataValue:
+                  customerName: Mary Ann
+                  orderItems:
+                    - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                      quantity: 2
+                      comment: No sugar!
+                      discount: 0
+      responses:
+        '201':
+          description: Order placed successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: placed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /orders/{orderId}:
+    get:
+      tags:
+        - Orders
+      summary: Retrieve an order
+      description: Retrieve a single order by its ID.
+      operationId: getOrderById
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+        - name: X-Request-Id
+          in: header
+          required: false
+          description: |
+            Optional client-supplied correlation ID, echoed in logs and traces.
+          schema:
+            type: string
+            format: uuid
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: placed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    patch:
+      tags:
+        - Orders
+      summary: Partially update an order
+      description: |
+        Update an existing order status.
+        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+      operationId: updateOrder
+      security:
+        - OAuth2:
+            - orders:write
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              description: |
+                Partial order update using JSON Merge Patch - only include fields to update.
+              properties:
+                status:
+                  $ref: '#/components/schemas/OrderStatus'
+              required:
+                - status
+      responses:
+        '200':
+          description: Order updated successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: completed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    delete:
+      tags:
+        - Orders
+      summary: Delete an order
+      description: |
+        Delete the order.
+        To keep the order history, the order should be canceled instead of deleted.
+      operationId: deleteOrder
+      security:
+        - OAuth2:
+            - orders:write
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+      responses:
+        '204':
+          description: Order deleted successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /order-items:
+    get:
+      tags:
+        - Orders
+      summary: List all order items with menu item details
+      description: |
+        Returns an array of order items for a specific order.
+        Use the `filter` parameter to filter by order ID.
+      operationId: listOrderItems
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/Filter'
+          required: true
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                type: array
+                description: List of menu items that are part of the order.
+                items:
+                  $ref: '#/components/schemas/OrderItem'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /revenue:
+    get:
+      tags:
+        - Statistics
+      summary: Get revenue statistics
+      description: |
+        Retrieve revenue statistics for a configurable date range.
+        Returns revenue, order counts, average order amount, and other useful statistics.
+      operationId: getRevenue
+      security:
+        - ApiKey: []
+      parameters:
+        - name: startDate
+          in: query
+          required: false
+          description: |
+            Start date for the revenue calculation period (ISO 8601 datetime format).
+            Defaults to 30 days ago if not provided.
+          schema:
+            type: string
+            format: date
+          example: '2026-01-01'
+        - name: endDate
+          in: query
+          required: false
+          description: |
+            End date for the revenue calculation period (ISO 8601 datetime format).
+            Defaults to current time if not provided.
+          schema:
+            type: string
+            format: date
+          example: '2026-01-31'
+      responses:
+        '200':
+          description: Revenue statistics retrieved successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RevenueStatistics'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /oauth2/register:
+    post:
+      tags:
+        - Authorization
+      summary: Create OAuth2 client
+      description: |
+        Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+        - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type, 
+          `redirectUris` must be provided (per RFC 7591 Section 2).
+        - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+        Returns the registered client information per RFC 7591, including:
+        - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+      operationId: registerOAuth2Client
+      security: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/RegisterClientObject'
+      responses:
+        '201':
+          description: OAuth2 client registered successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OAuth2Client'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+webhooks:
+  order-notification:
+    post:
+      tags:
+        - Orders
+      operationId: orderNotificationWebhook
+      security: []
+      summary: Order notification webhook
+      description: Webhook triggered when a new order is placed.
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/OrderNotification'
+      responses:
+        '200':
+          description: Webhook received successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+components:
+  securitySchemes:
+    OAuth2:
+      type: oauth2
+      description: OAuth2 authorization for API access.
+      flows:
+        authorizationCode:
+          authorizationUrl: https://cafe.cloud.redocly.com/oauth2/authorize
+          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          scopes:
+            menu:read: Read access to menu items and images
+            menu:write: Write access to menu items (create, delete)
+            orders:read: Read access to orders
+            orders:write: Write access to orders (create, update, delete)
+        clientCredentials:
+          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          scopes:
+            menu:read: Read access to menu items and images
+            menu:write: Write access to menu items (create, delete)
+            orders:read: Read access to orders
+            orders:write: Write access to orders (create, update, delete)
+    ApiKey:
+      type: apiKey
+      name: X-API-Key
+      in: header
+      description: API key for internal operations.
+  parameters:
+    After:
+      name: after
+      in: query
+      required: false
+      description: Use the `endCursor` as a value for the `after` parameter to get the next page.
+      schema:
+        type: string
+      example: a25fgaksjf23la==
+    Before:
+      name: before
+      in: query
+      required: false
+      description: |
+        Use the `startCursor` as a value for the `before` parameter to get the next page.
+      schema:
+        type: string
+      example: bfg23aksjf23zb1==
+    Sort:
+      name: sort
+      description: |-
+        To sort by id in descending order use `-id`.
+        To sort by id in ascending order use `id`.
+      in: query
+      required: false
+      schema:
+        type: string
+      example: '-name'
+    Filter:
+      name: filter
+      description: |-
+        Filters the collection items using space-separated `field:value` pairs.
+
+        **Format:** `field1:value1 field2:value2`
+
+        **Supported operators:**
+        - `field:value` - Exact match
+        - `field:value1,value2` - Match any of the comma-separated values (OR)
+        - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+
+        **Examples:**
+        - `status:placed` - Filter by single status.
+        - `status:placed,completed` - Filter by multiple statuses.
+        - `createdAt:30d` - Filter orders created in the last 30 days.
+        - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+        - `status:placed createdAt:7d` - Combine multiple filters.
+      in: query
+      required: false
+      schema:
+        type: string
+      example: orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7
+    Search:
+      name: search
+      in: query
+      description: |-
+        Performs a case-insensitive text search across relevant fields in the collection.
+
+        **Fields searched depend on the endpoint:**
+        - **Menu items:** `name`, `photoTextDescription`
+        - **Orders:** `customerName`, `id`
+
+        Returns items where any of the searchable fields contain the search term as a substring.
+      required: false
+      schema:
+        type: string
+      example: coffee
+    Limit:
+      name: limit
+      description: |
+        Use to return a number of results per page.
+        If there is more data, use in combination with `after` to page through the data.
+      in: query
+      required: false
+      schema:
+        type: integer
+        minimum: 1
+        maximum: 100
+        default: 10
+      example: 10
+    MenuItemId:
+      name: menuItemId
+      in: path
+      description: ID of the menu item to retrieve.
+      required: true
+      schema:
+        type: string
+        pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+      example: prd_01h1s5z6vf2mm1mz3hevnn9va7
+    PhotoSize:
+      name: photoSize
+      in: query
+      description: Photo size to retrieve.
+      required: false
+      schema:
+        type: string
+        enum:
+          - thumbnail
+          - medium
+          - large
+        default: medium
+    OrderId:
+      name: orderId
+      in: path
+      description: ID of the order to retrieve.
+      required: true
+      schema:
+        type: string
+        pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+      example: ord_01h1s5z6vf2mm1mz3hevnn9va7
+  schemas:
+    Page:
+      type: object
+      properties:
+        endCursor:
+          type:
+            - string
+            - 'null'
+          description: |-
+            Use with the `after` query parameter to load the next page of data.
+            When `null`, there is no data.
+            The cursor is opaque and internal structure is subject to change.
+        startCursor:
+          type:
+            - string
+            - 'null'
+          description: |-
+            Use with the `before` query parameter to load the previous page of data.
+            When `null`, there is no data.
+            The cursor is opaque and internal structure is subject to change.
+        hasNextPage:
+          type: boolean
+          description: Indicates if there is a next page with items.
+        hasPrevPage:
+          type: boolean
+          description: Indicates if there is a previous page with items.
+        limit:
+          type: integer
+          minimum: 1
+          maximum: 100
+          default: 10
+          description: Value showing how many items are in the page limit.
+        total:
+          type: integer
+          description: Count of items across all pages.
+          minimum: 0
+      required:
+        - endCursor
+        - startCursor
+        - hasNextPage
+        - hasPrevPage
+        - limit
+        - total
+    MenuBaseItem:
+      type: object
+      properties:
+        createdAt:
+          description: Created date.
+          type: string
+          format: date-time
+          readOnly: true
+        updatedAt:
+          description: Updated date.
+          type: string
+          format: date-time
+          readOnly: true
+        id:
+          description: Menu item ID. Unique identifier prefixed with `prd_`.
+          type: string
+          readOnly: true
+          pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+          example: prd_01h1s5z6vf2mm1mz3hevnn9va7
+        object:
+          description: Entity name.
+          type: string
+          const: menuItem
+          readOnly: true
+        name:
+          description: Menu item name.
+          type: string
+          minLength: 1
+          maxLength: 50
+        price:
+          description: Price in cents.
+          type: integer
+          minimum: 0
+        photo:
+          writeOnly: true
+          type:
+            - string
+            - 'null'
+          format: binary
+          description: Photo of the menu item. Must be a PNG image and less than 1MB.
+        photoUrl:
+          readOnly: true
+          type: string
+          format: uri
+          description: Photo URL of the menu item.
+        photoTextDescription:
+          type:
+            - string
+            - 'null'
+      required:
+        - id
+        - name
+        - price
+        - createdAt
+        - updatedAt
+        - object
+    Beverage:
+      allOf:
+        - type: object
+          properties:
+            category:
+              description: Menu item category.
+              type: string
+              const: beverage
+            volume:
+              type: number
+              description: Size of the beverage in milliliters.
+              exclusiveMinimum: 0
+            containsCaffeine:
+              type: boolean
+              description: Indicates if the beverage contains caffeine.
+          required:
+            - category
+            - volume
+            - containsCaffeine
+        - $ref: '#/components/schemas/MenuBaseItem'
+    Dessert:
+      allOf:
+        - type: object
+          properties:
+            category:
+              description: Menu item category.
+              type: string
+              const: dessert
+            calories:
+              type: number
+              exclusiveMinimum: 0
+              description: Amount of calories.
+          required:
+            - category
+            - calories
+        - $ref: '#/components/schemas/MenuBaseItem'
+    MenuItem:
+      discriminator:
+        propertyName: category
+        mapping:
+          beverage: '#/components/schemas/Beverage'
+          dessert: '#/components/schemas/Dessert'
+      oneOf:
+        - $ref: '#/components/schemas/Beverage'
+        - $ref: '#/components/schemas/Dessert'
+      required:
+        - category
+    MenuItemList:
+      type: object
+      properties:
+        object:
+          type: string
+          const: list
+          description: Entity name.
+        page:
+          $ref: '#/components/schemas/Page'
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/MenuItem'
+      required:
+        - object
+        - page
+        - items
+    Error:
+      type: object
+      properties:
+        type:
+          type: string
+          format: uri-reference
+          description: URI reference that identifies the problem type.
+          default: about:blank
+        title:
+          type: string
+          description: Short summary of the problem type.
+        status:
+          type: integer
+          format: int32
+          description: |
+            HTTP status code generated by the origin server for this occurrence of the problem.
+          minimum: 100
+          exclusiveMaximum: 600
+        instance:
+          type: string
+          format: uri-reference
+          description: |
+            URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+            May be used to locate the root of this problem in the source code.
+          example: /some/uri-reference#specific-occurrence-context
+        details:
+          description: Additional error details.
+          type: object
+          additionalProperties: true
+      required:
+        - type
+        - title
+        - status
+    OrderStatus:
+      type: string
+      description: Order status.
+      enum:
+        - placed
+        - preparing
+        - completed
+        - canceled
+    Order:
+      type: object
+      title: Order
+      properties:
+        id:
+          description: Order ID. Unique identifier prefixed with `ord_`.
+          type: string
+          format: ulid
+          readOnly: true
+          pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+          example: ord_01h1s5z6vf2mm1mz3hevnn9va7
+        object:
+          description: Entity name.
+          type: string
+          const: order
+          readOnly: true
+        customerName:
+          description: |
+            Name of the customer who placed the order.
+            Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+          type: string
+          pattern: ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+          minLength: 1
+          maxLength: 100
+        status:
+          allOf:
+            - $ref: '#/components/schemas/OrderStatus'
+          readOnly: true
+        totalPrice:
+          description: Total order price in cents.
+          type: integer
+          minimum: 0
+          readOnly: true
+        createdAt:
+          description: Created date.
+          type: string
+          format: date-time
+          readOnly: true
+        updatedAt:
+          description: Updated date.
+          type: string
+          format: date-time
+          readOnly: true
+        orderItems:
+          type: array
+          description: List of items to include in the order.
+          minItems: 1
+          items:
+            type: object
+            properties:
+              menuItemId:
+                type: string
+                format: ulid
+                description: ID of the menu item to add to the order.
+              quantity:
+                type: integer
+                minimum: 1
+                description: Quantity of the menu item.
+              discount:
+                type: integer
+                minimum: 0
+                description: Discount amount in cents (absolute value).
+                default: 0
+              comment:
+                type: string
+                maxLength: 500
+                description: Optional comment for the order item (e.g., "No sugar").
+            required:
+              - menuItemId
+              - quantity
+      required:
+        - customerName
+        - orderItems
+    OrderList:
+      type: object
+      properties:
+        object:
+          type: string
+          const: list
+          description: Entity name.
+        page:
+          $ref: '#/components/schemas/Page'
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/Order'
+      required:
+        - object
+        - page
+        - items
+    OrderItem:
+      type: object
+      properties:
+        menuItemId:
+          type: string
+          description: ID of the menu item to add to the order.
+          writeOnly: true
+        menuItem:
+          allOf:
+            - $ref: '#/components/schemas/MenuItem'
+          description: Menu item that is part of the order.
+          readOnly: true
+        quantity:
+          type: integer
+          minimum: 1
+          description: Quantity of the menu item.
+        discount:
+          type: integer
+          minimum: 0
+          description: Discount amount in cents (absolute value).
+          default: 0
+        comment:
+          type: string
+          maxLength: 500
+          description: Optional comment for the order item (e.g., "No sugar").
+      required:
+        - menuItemId
+        - quantity
+    RevenueStatistics:
+      type: object
+      description: Revenue statistics for a given date range.
+      properties:
+        revenue:
+          type: number
+          format: float
+          description: Total revenue in cents from completed orders.
+          minimum: 0
+        averageOrderAmount:
+          type: number
+          format: float
+          description: Average order amount in cents (calculated from completed orders only).
+          minimum: 0
+        totalOrders:
+          type: integer
+          description: Total number of orders (all statuses) in the date range.
+          minimum: 0
+        placedOrders:
+          type: integer
+          description: Number of placed orders.
+          minimum: 0
+        preparingOrders:
+          type: integer
+          description: Number of preparing orders.
+          minimum: 0
+        completedOrders:
+          type: integer
+          description: Number of completed orders.
+          minimum: 0
+        canceledOrders:
+          type: integer
+          description: Number of canceled orders.
+          minimum: 0
+        startDate:
+          type: string
+          format: date
+          description: Start date of the revenue calculation period.
+        endDate:
+          type: string
+          format: date
+          description: End date of the revenue calculation period.
+      required:
+        - revenue
+        - averageOrderAmount
+        - totalOrders
+        - placedOrders
+        - preparingOrders
+        - completedOrders
+        - canceledOrders
+        - startDate
+        - endDate
+    RegisterClientObject:
+      type: object
+      properties:
+        name:
+          type: string
+          description: Client name.
+        redirectUris:
+          type: array
+          items:
+            type: string
+            format: uri
+          description: List of redirect URIs (optional, defaults to empty array).
+        scopes:
+          type: array
+          items:
+            type: string
+            enum:
+              - menu:read
+              - menu:write
+              - orders:read
+              - orders:write
+          description: List of scopes.
+        grantTypes:
+          type: array
+          items:
+            type: string
+            enum:
+              - authorization_code
+              - client_credentials
+          description: List of grant types.
+      required:
+        - name
+    OAuth2Client:
+      type: object
+      description: OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+      properties:
+        clientId:
+          type: string
+          description: Client identifier issued by the authorization server.
+        clientSecret:
+          type: string
+          description: Client secret issued by the authorization server.
+        clientIdIssuedAt:
+          type: integer
+          format: int64
+          description: Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+        clientSecretExpiresAt:
+          type: integer
+          format: int64
+          description: Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+        name:
+          type: string
+          description: Client name (registered metadata).
+        redirectUris:
+          type: array
+          items:
+            type: string
+            format: uri
+          description: List of redirect URIs (registered metadata).
+        registrationClientUri:
+          type: string
+          format: uri
+          description: URL of the client configuration endpoint for managing this client registration (RFC 7592).
+        registrationAccessToken:
+          type: string
+          description: Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+        scopes:
+          type: array
+          items:
+            type: string
+            enum:
+              - menu:read
+              - menu:write
+              - orders:read
+              - orders:write
+          description: List of scopes (registered metadata).
+        grantTypes:
+          type: array
+          items:
+            type: string
+            enum:
+              - authorization_code
+              - client_credentials
+          description: List of grant types (registered metadata).
+      required:
+        - clientId
+        - clientSecret
+        - clientIdIssuedAt
+        - clientSecretExpiresAt
+        - registrationClientUri
+        - registrationAccessToken
+    OrderNotification:
+      type: object
+      required:
+        - orderId
+        - orderStatus
+        - timestamp
+      properties:
+        orderId:
+          type: string
+          description: Unique order identifier.
+        orderStatus:
+          $ref: '#/components/schemas/OrderStatus'
+        timestamp:
+          type: string
+          format: date-time
+          description: When the event occurred.
+  responses:
+    BadRequest:
+      description: Bad request - invalid input parameters.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    InternalServerError:
+      description: Internal server error.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Unauthorized:
+      description: Unauthorized - authorization required.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Forbidden:
+      description: Forbidden - insufficient permissions.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Conflict:
+      description: Conflict - entity already exists.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    NotFound:
+      description: Resource not found.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
diff --git a/packages/openapi-typescript/examples/zod/package.json b/packages/openapi-typescript/examples/zod/package.json
new file mode 100644
index 0000000000..9910b341de
--- /dev/null
+++ b/packages/openapi-typescript/examples/zod/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "@redocly-examples/zod",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "generate": "redocly generate-client",
+    "dev": "vite",
+    "build": "vite build"
+  },
+  "devDependencies": {
+    "@redocly/cli": "latest",
+    "typescript": "^5.5.0",
+    "vite": "^5.4.0",
+    "zod": "^4.0.0"
+  }
+}
diff --git a/packages/openapi-typescript/examples/zod/redocly.yaml b/packages/openapi-typescript/examples/zod/redocly.yaml
new file mode 100644
index 0000000000..9c95ea8a71
--- /dev/null
+++ b/packages/openapi-typescript/examples/zod/redocly.yaml
@@ -0,0 +1,10 @@
+# redocly.yaml — drives `redocly generate-client` for this example.
+# generate-client settings live under the `x-openapi-typescript` extension for now
+# (first-class config support is planned in @redocly/config).
+x-openapi-typescript:
+  input: ./openapi.yaml
+  output: ./src/api/client.ts
+  generators:
+    - sdk
+    - zod
+  facade: functions
diff --git a/packages/openapi-typescript/examples/zod/src/api/client.ts b/packages/openapi-typescript/examples/zod/src/api/client.ts
new file mode 100644
index 0000000000..dcb4900f7c
--- /dev/null
+++ b/packages/openapi-typescript/examples/zod/src/api/client.ts
@@ -0,0 +1,1513 @@
+// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Redocly Cafe (v1.0.0)
+ * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+ * Create API credentials and try it yourself in a realistic OpenAPI workflow.
+ * 
+ */
+
+export type Page = {
+    /**
+     * Use with the `after` query parameter to load the next page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    endCursor: string | null;
+    /**
+     * Use with the `before` query parameter to load the previous page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    startCursor: string | null;
+    /**
+     * Indicates if there is a next page with items.
+     */
+    hasNextPage: boolean;
+    /**
+     * Indicates if there is a previous page with items.
+     */
+    hasPrevPage: boolean;
+    /**
+     * Value showing how many items are in the page limit.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit: number;
+    /**
+     * Count of items across all pages.
+     * @minimum 0
+     */
+    total: number;
+};
+
+export type MenuBaseItem = {
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt: string;
+    /**
+     * Menu item ID. Unique identifier prefixed with `prd_`.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    readonly id: string;
+    /**
+     * Entity name.
+     */
+    readonly object: "menuItem";
+    /**
+     * Menu item name.
+     * @minLength 1
+     * @maxLength 50
+     */
+    name: string;
+    /**
+     * Price in cents.
+     * @minimum 0
+     */
+    price: number;
+    /**
+     * Photo of the menu item. Must be a PNG image and less than 1MB.
+     * @format binary
+     */
+    photo?: Blob | null;
+    /**
+     * Photo URL of the menu item.
+     * @format uri
+     */
+    readonly photoUrl?: string;
+    photoTextDescription?: string | null;
+};
+
+export type Beverage = {
+    /**
+     * Menu item category.
+     */
+    category: "beverage";
+    /**
+     * Size of the beverage in milliliters.
+     * @exclusiveMinimum 0
+     */
+    volume: number;
+    /**
+     * Indicates if the beverage contains caffeine.
+     */
+    containsCaffeine: boolean;
+} & MenuBaseItem;
+
+export type Dessert = {
+    /**
+     * Menu item category.
+     */
+    category: "dessert";
+    /**
+     * Amount of calories.
+     * @exclusiveMinimum 0
+     */
+    calories: number;
+} & MenuBaseItem;
+
+export type MenuItem = Beverage | Dessert;
+
+export type MenuItemList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: MenuItem[];
+};
+
+export type Error = {
+    /**
+     * URI reference that identifies the problem type.
+     * @format uri-reference
+     */
+    type: string;
+    /**
+     * Short summary of the problem type.
+     */
+    title: string;
+    /**
+     * HTTP status code generated by the origin server for this occurrence of the problem.
+     * @minimum 100
+     * @exclusiveMaximum 600
+     * @format int32
+     */
+    status: number;
+    /**
+     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+     * May be used to locate the root of this problem in the source code.
+     * @format uri-reference
+     */
+    instance?: string;
+    /**
+     * Additional error details.
+     */
+    details?: Record<string, unknown>;
+};
+
+/**
+ * Order status.
+ */
+export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
+
+export const OrderStatus = {
+    placed: "placed",
+    preparing: "preparing",
+    completed: "completed",
+    canceled: "canceled"
+} as const;
+
+export type Order = {
+    /**
+     * Order ID. Unique identifier prefixed with `ord_`.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     * @format ulid
+     */
+    readonly id?: string;
+    /**
+     * Entity name.
+     */
+    readonly object?: "order";
+    /**
+     * Name of the customer who placed the order.
+     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+     * @minLength 1
+     * @maxLength 100
+     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+     */
+    customerName: string;
+    readonly status?: OrderStatus;
+    /**
+     * Total order price in cents.
+     * @minimum 0
+     */
+    readonly totalPrice?: number;
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt?: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt?: string;
+    /**
+     * List of items to include in the order.
+     * @minItems 1
+     */
+    orderItems: {
+        /**
+         * ID of the menu item to add to the order.
+         * @format ulid
+         */
+        menuItemId: string;
+        /**
+         * Quantity of the menu item.
+         * @minimum 1
+         */
+        quantity: number;
+        /**
+         * Discount amount in cents (absolute value).
+         * @minimum 0
+         */
+        discount?: number;
+        /**
+         * Optional comment for the order item (e.g., "No sugar").
+         * @maxLength 500
+         */
+        comment?: string;
+    }[];
+};
+
+export type OrderList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: Order[];
+};
+
+export type OrderItem = {
+    /**
+     * ID of the menu item to add to the order.
+     */
+    menuItemId: string;
+    /**
+     * Menu item that is part of the order.
+     */
+    readonly menuItem?: MenuItem;
+    /**
+     * Quantity of the menu item.
+     * @minimum 1
+     */
+    quantity: number;
+    /**
+     * Discount amount in cents (absolute value).
+     * @minimum 0
+     */
+    discount?: number;
+    /**
+     * Optional comment for the order item (e.g., "No sugar").
+     * @maxLength 500
+     */
+    comment?: string;
+};
+
+/**
+ * Revenue statistics for a given date range.
+ */
+export type RevenueStatistics = {
+    /**
+     * Total revenue in cents from completed orders.
+     * @minimum 0
+     * @format float
+     */
+    revenue: number;
+    /**
+     * Average order amount in cents (calculated from completed orders only).
+     * @minimum 0
+     * @format float
+     */
+    averageOrderAmount: number;
+    /**
+     * Total number of orders (all statuses) in the date range.
+     * @minimum 0
+     */
+    totalOrders: number;
+    /**
+     * Number of placed orders.
+     * @minimum 0
+     */
+    placedOrders: number;
+    /**
+     * Number of preparing orders.
+     * @minimum 0
+     */
+    preparingOrders: number;
+    /**
+     * Number of completed orders.
+     * @minimum 0
+     */
+    completedOrders: number;
+    /**
+     * Number of canceled orders.
+     * @minimum 0
+     */
+    canceledOrders: number;
+    /**
+     * Start date of the revenue calculation period.
+     * @format date
+     */
+    startDate: string;
+    /**
+     * End date of the revenue calculation period.
+     * @format date
+     */
+    endDate: string;
+};
+
+export type RegisterClientObject = {
+    /**
+     * Client name.
+     */
+    name: string;
+    /**
+     * List of redirect URIs (optional, defaults to empty array).
+     */
+    redirectUris?: string[];
+    /**
+     * List of scopes.
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types.
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+/**
+ * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+ */
+export type OAuth2Client = {
+    /**
+     * Client identifier issued by the authorization server.
+     */
+    clientId: string;
+    /**
+     * Client secret issued by the authorization server.
+     */
+    clientSecret: string;
+    /**
+     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+     * @format int64
+     */
+    clientIdIssuedAt: number;
+    /**
+     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+     * @format int64
+     */
+    clientSecretExpiresAt: number;
+    /**
+     * Client name (registered metadata).
+     */
+    name?: string;
+    /**
+     * List of redirect URIs (registered metadata).
+     */
+    redirectUris?: string[];
+    /**
+     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
+     * @format uri
+     */
+    registrationClientUri: string;
+    /**
+     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+     */
+    registrationAccessToken: string;
+    /**
+     * List of scopes (registered metadata).
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types (registered metadata).
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+export type OrderNotification = {
+    /**
+     * Unique order identifier.
+     */
+    orderId: string;
+    orderStatus: OrderStatus;
+    /**
+     * When the event occurred.
+     * @format date-time
+     */
+    timestamp: string;
+};
+
+/**
+ * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
+ */
+export function isBeverage(value: MenuItem): value is Beverage {
+    return (value as Record<string, unknown>)["category"] === "beverage";
+}
+
+/**
+ * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
+ */
+export function isDessert(value: MenuItem): value is Dessert {
+    return (value as Record<string, unknown>)["category"] === "dessert";
+}
+
+/**
+ * Static metadata for every operation, keyed by operationId: the HTTP `method`
+ * and the `path` template (with `{param}` placeholders intact). Minification-safe
+ * — useful for building cache/query keys, tracing span names, and request logging
+ * without re-deriving them at each call site.
+ */
+export const OPERATIONS = {
+    listMenuItems: { method: "GET", path: "/menu" },
+    createMenuItem: { method: "POST", path: "/menu" },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
+    listOrders: { method: "GET", path: "/orders" },
+    createOrder: { method: "POST", path: "/orders" },
+    getOrderById: { method: "GET", path: "/orders/{orderId}" },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
+    listOrderItems: { method: "GET", path: "/order-items" },
+    getRevenue: { method: "GET", path: "/revenue" },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
+} as const;
+
+/**
+ * The operationId of any operation in this client.
+ */
+export type OperationId = keyof typeof OPERATIONS;
+
+/**
+ * Static metadata describing one operation: its HTTP method and path template.
+ */
+export type OperationMetadata = {
+    readonly method: string;
+    readonly path: string;
+};
+
+let BASE = "https://cafe.cloud.redocly.com";
+
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+export type RequestContext = {
+    url: string;
+    method: string;
+    headers: Record<string, string>;
+    body?: unknown;
+};
+
+/**
+ * Configuration and extension hooks for a client. Supplied per-instance via
+ * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
+ * (functions facade).
+ */
+export type ClientConfig = {
+    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    baseUrl?: string;
+    /** Extra headers merged into every request; a function is invoked per request. */
+    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+    /** Transport used to issue requests. Defaults to the global `fetch`. */
+    fetch?: typeof fetch;
+    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    /** Observe — or replace, by returning a `Response` — the response before parsing. */
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    /**
+     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
+     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
+     */
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
+    /**
+     * Composable interceptors run around every request, alongside the single
+     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
+     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
+     * the last-registered middleware wraps closest to the network. Register more at runtime
+     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
+     */
+    middleware?: Middleware[];
+    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
+    retry?: RetryConfig;
+    /**
+     * Per-instance auth credentials. When set, they override the module-global
+     * `set*` helpers for requests made through this config (each scheme falls back
+     * to its global slot when omitted here). Only the schemes an operation declares
+     * in its `security` are ever sent.
+     */
+    auth?: AuthCredentials;
+};
+
+/**
+ * A request interceptor; every field is optional, so a middleware can hook any subset of
+ * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
+ * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
+ * failure into the error to throw, threaded through each middleware in turn.
+ */
+export type Middleware = {
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/** Context handed to `retryOn` for the attempt that just failed. */
+export type RetryContext = {
+    /** 1-based number of the attempt that just failed. */
+    attempt: number;
+    /** The request that was attempted. */
+    request: RequestContext;
+    /** Present when the server returned a (non-ok) response. */
+    response?: Response;
+    /** Present when the transport threw (network error, DNS, connection reset). */
+    error?: unknown;
+};
+
+/** Retry policy; all fields optional with sensible defaults. */
+export type RetryConfig = {
+    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
+    retries?: number;
+    /** Base delay in milliseconds. Default 1000. */
+    retryDelay?: number;
+    /** Backoff shape. Default 'exponential'. */
+    retryStrategy?: RetryStrategy;
+    /** Apply full jitter over the computed delay. Default true. */
+    jitter?: boolean;
+    /**
+     * Decide whether to retry a failed attempt. Default: retry only idempotent
+     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
+     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
+     */
+    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
+};
+
+/**
+ * How the response body is read. `'auto'` negotiates from the content type (the
+ * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
+ */
+export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
+
+/**
+ * The trailing per-operation argument: standard `RequestInit` plus an optional
+ * per-call retry override and a `parseAs` escape hatch.
+ *
+ * `parseAs` forces how the response body is read; overrides the inferred kind.
+ * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
+ * override — the static return type is unchanged.
+ */
+export type RequestOptions = RequestInit & {
+    retry?: Partial<RetryConfig>;
+    parseAs?: ParseAs;
+};
+
+/**
+ * Override the base URL used by every generated operation. Useful when the
+ * runtime environment differs from the value declared in `servers[0].url`
+ * (e.g. dev / staging / prod toggles in a single-page app).
+ *
+ * Mutates a module-scoped binding shared by the functions facade. For multiple
+ * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ */
+export function setBaseUrl(url: string): void {
+    BASE = url;
+}
+
+/** The global config used by the functions facade (see `configure`). */
+const __config: ClientConfig = {};
+
+/**
+ * Merge `config` into the global configuration used by the functions facade —
+ * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
+ * hooks once for every free function. The service-class facade configures per
+ * instance instead (`new Client(config)`).
+ */
+export function configure(config: ClientConfig): void {
+    Object.assign(__config, config);
+}
+
+/**
+ * Append interceptors to the functions facade's global middleware chain (see
+ * `ClientConfig.middleware`). The service-class facade registers per instance via
+ * `<Client>.use(...)` instead.
+ */
+export function use(...middleware: Middleware[]): void {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    __config.middleware = [...(__config.middleware ?? []), ...middleware];
+}
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function __middleware(config: ClientConfig): Middleware[] {
+    const single = config.onRequest || config.onResponse || config.onError
+        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+        : [];
+    return [...single, ...(config.middleware ?? [])];
+}
+
+export class ApiError extends Error {
+    public readonly url: string;
+    public readonly status: number;
+    public readonly statusText: string;
+    public readonly body: unknown;
+    constructor(url: string, status: number, statusText: string, body: unknown) {
+        super(`Request failed with status ${status}`);
+        this.name = 'ApiError';
+        this.url = url;
+        this.status = status;
+        this.statusText = statusText;
+        this.body = body;
+    }
+}
+
+type QueryPrimitive = string | number | boolean;
+
+type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
+
+/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
+type QueryStyle = {
+    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+    explode: boolean;
+    allowReserved?: boolean;
+};
+
+/**
+ * Percent-encode `value` but leave the RFC-3986 reserved set
+ * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
+ */
+function __encodeReserved(value: string): string {
+    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
+}
+
+function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
+    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    if (!query)
+        return url;
+    const params = new URLSearchParams();
+    const raw: string[] = [];
+    for (const [key, value] of Object.entries(query)) {
+        if (value === undefined || value === null)
+            continue;
+        const spec = styles?.[key];
+        if (!spec) {
+            if (Array.isArray(value)) {
+                for (const v of value) {
+                    if (v !== undefined && v !== null)
+                        params.append(key, String(v));
+                }
+            }
+            else if (typeof value === 'object') {
+                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+                for (const [subKey, subValue] of Object.entries(value)) {
+                    if (subValue !== undefined && subValue !== null) {
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                    }
+                }
+            }
+            else {
+                params.append(key, String(value));
+            }
+            continue;
+        }
+        if (Array.isArray(value)) {
+            const items = value.filter((v) => v !== undefined && v !== null).map(String);
+            if (spec.style === 'form' && spec.explode) {
+                for (const v of items) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}=${__encodeReserved(v)}`);
+                    else
+                        params.append(key, v);
+                }
+            }
+            else {
+                // Delimited styles put the LITERAL delimiter on the wire; only the
+                // values are encoded. `%20` (not `+`) is the literal space delimiter.
+                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
+                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+            }
+        }
+        else if (typeof value === 'object') {
+            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+            for (const [subKey, subValue] of Object.entries(value)) {
+                if (subValue !== undefined && subValue !== null) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
+                    else
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                }
+            }
+        }
+        else if (spec.allowReserved) {
+            raw.push(`${key}=${__encodeReserved(String(value))}`);
+        }
+        else {
+            params.append(key, String(value));
+        }
+    }
+    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+    return qs ? `${url}?${qs}` : url;
+}
+
+async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+    response: Response;
+    context: RequestContext;
+}> {
+    const { retry: callRetry, ...fetchInit } = init;
+    const retry: RetryConfig = { ...config.retry, ...callRetry };
+    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+    const headers: Record<string, string> = {
+        Accept: 'application/json',
+        ...extra,
+        ...(fetchInit.headers as Record<string, string> | undefined),
+    };
+    let payload: BodyInit | undefined;
+    if (body !== undefined) {
+        const isBinary = body instanceof Blob ||
+            body instanceof ArrayBuffer ||
+            ArrayBuffer.isView(body as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
+        const isURLSearchParams = body instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
+            payload = body as BodyInit;
+        }
+        else {
+            payload = JSON.stringify(body);
+            if (!('Content-Type' in headers) && !('content-type' in headers)) {
+                headers['Content-Type'] = 'application/json';
+            }
+        }
+    }
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    const doFetch = config.fetch ?? fetch;
+    const maxAttempts = 1 + (retry.retries ?? 0);
+    const retryOn = retry.retryOn ?? __defaultRetryOn;
+    const signal = fetchInit.signal ?? undefined;
+    let attempt = 0;
+    while (true) {
+        attempt++;
+        if (signal?.aborted)
+            throw __abortError(signal);
+        let response: Response;
+        try {
+            response = await doFetch(context.url, {
+                ...fetchInit,
+                method: context.method,
+                headers: context.headers,
+                body: payload,
+            });
+        }
+        catch (error) {
+            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
+                await __sleep(__retryDelay(retry, attempt, null), signal);
+                continue;
+            }
+            throw error;
+        }
+        // Reverse order: the last-registered middleware wraps closest to the network (onion).
+        for (let i = middleware.length - 1; i >= 0; i--) {
+            const onResponse = middleware[i].onResponse;
+            if (onResponse) {
+                const replaced = await onResponse(response, context);
+                if (replaced)
+                    response = replaced;
+            }
+        }
+        if (!response.ok &&
+            attempt < maxAttempts &&
+            !signal?.aborted &&
+            (await retryOn({ attempt, request: context, response }))) {
+            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            continue;
+        }
+        return { response, context };
+    }
+}
+
+async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+    if (kind === 'void' || response.status === 204)
+        return undefined;
+    if (kind === 'stream')
+        return response.body;
+    if (kind === 'blob')
+        return response.blob();
+    if (kind === 'arrayBuffer')
+        return response.arrayBuffer();
+    if (kind === 'formData')
+        return response.formData();
+    if (kind === 'text')
+        return response.text();
+    if (kind === 'json')
+        return response.json();
+    // 'auto' — negotiate from the response's content type.
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json'))
+        return response.json();
+    if (contentType.startsWith('text/'))
+        return response.text();
+    return response.blob();
+}
+
+async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+    const { parseAs, ...sendInit } = init;
+    const { response, context } = await __send(config, url, sendInit, body);
+    if (!response.ok) {
+        const errorBody = await readError(response);
+        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
+        // Thread the error through each middleware's onError in turn (each may replace it).
+        for (const mw of __middleware(config)) {
+            if (mw.onError)
+                error = await mw.onError(error as ApiError, context);
+        }
+        throw error;
+    }
+    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
+    return (await __parse(response, kind)) as T;
+}
+
+async function readError(response: Response): Promise<unknown> {
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json')) {
+        return response.json().catch(() => undefined);
+    }
+    return response.text().catch(() => undefined);
+}
+
+const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+
+const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+function __defaultRetryOn(ctx: RetryContext): boolean {
+    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
+        return false;
+    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+    if (retryAfter) {
+        const seconds = Number(retryAfter);
+        if (!Number.isNaN(seconds))
+            return seconds * 1000;
+        const when = Date.parse(retryAfter);
+        if (!Number.isNaN(when))
+            return Math.max(0, when - Date.now());
+    }
+    const base = retry.retryDelay ?? 1000;
+    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+    return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
+    return new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject(__abortError(signal));
+            return;
+        }
+        const onAbort = () => {
+            clearTimeout(timer);
+            reject(__abortError(signal as AbortSignal));
+        };
+        const timer = setTimeout(() => {
+            if (signal)
+                signal.removeEventListener('abort', onAbort);
+            resolve();
+        }, ms);
+        if (signal)
+            signal.addEventListener('abort', onAbort, { once: true });
+    });
+}
+
+function __abortError(signal: AbortSignal): globalThis.Error {
+    const reason = (signal as {
+        reason?: unknown;
+    }).reason;
+    if (reason instanceof Error)
+        return reason;
+    return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * Normalize an operation's header-parameter object into a plain string record,
+ * dropping any `undefined` / `null` entries (optional headers the caller omitted)
+ * and stringifying the rest. Mirrors __buildUrl's handling of query values.
+ */
+function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
+    const out: Record<string, string> = {};
+    for (const [key, value] of Object.entries(values)) {
+        if (value !== undefined && value !== null)
+            out[key] = String(value);
+    }
+    return out;
+}
+
+/**
+ * A credential value, or a (possibly async) function that returns one per request.
+ */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/**
+ * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
+ * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
+ * to the global slots.
+ */
+export type AuthCredentials = {
+    bearer?: TokenProvider;
+    apiKey?: Record<string, TokenProvider>;
+};
+
+let __bearerToken: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
+ * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
+ * (possibly async) function resolved per request.
+ */
+export function setBearer(token: TokenProvider | null): void {
+    __bearerToken = token;
+}
+
+let __apiKey_ApiKey: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
+ * string or a (possibly async) function resolved per request.
+ */
+export function setApiKey(key: TokenProvider | null): void {
+    __apiKey_ApiKey = key;
+}
+
+/**
+ * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
+ */
+async function __resolve(slot: TokenProvider | null): Promise<string | null> {
+    if (slot === null)
+        return null;
+    return typeof slot === "function" ? slot() : slot;
+}
+
+/**
+ * Build the auth `headers` and `query` for an operation from the currently-set credentials.
+ * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
+ * can always override by passing their own `init.headers`.
+ */
+async function __auth(schemes: string[], config: ClientConfig): Promise<{
+    headers: Record<string, string>;
+    query: Record<string, string>;
+}> {
+    const headers: Record<string, string> = {};
+    const query: Record<string, string> = {};
+    const cookies: string[] = [];
+    for (const scheme of schemes) {
+        switch (scheme) {
+            case "OAuth2": {
+                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
+                if (v !== null)
+                    headers["Authorization"] = `Bearer ${v}`;
+                break;
+            }
+            case "ApiKey": {
+                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
+                if (v !== null)
+                    headers["X-API-Key"] = v;
+                break;
+            }
+        }
+    }
+    if (cookies.length > 0)
+        headers["Cookie"] = cookies.join("; ");
+    return { headers, query };
+}
+
+export type ListMenuItemsResult = MenuItemList;
+
+export type ListMenuItemsParams = {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+};
+
+export type ListMenuItemsVariables = {
+    params?: ListMenuItemsParams;
+};
+
+/**
+ * List all menu items
+ *
+ * Retrieve a collection of menu items with optional filtering and pagination.
+ */
+export async function listMenuItems(params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
+    return __request<MenuItemList>(__config, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
+}
+
+export type CreateMenuItemResult = MenuItem;
+
+export type CreateMenuItemBody = FormData;
+
+export type CreateMenuItemVariables = {
+    body: CreateMenuItemBody;
+};
+
+/**
+ * Create menu item
+ *
+ * Create a new menu item.
+ */
+export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<MenuItem>(__config, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type DeleteMenuItemResult = void;
+
+export type DeleteMenuItemVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+};
+
+/**
+ * Delete a menu item
+ *
+ * Delete an existing menu item.
+ */
+export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type GetMenuItemPhotoResult = Blob | string;
+
+export type GetMenuItemPhotoParams = {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+};
+
+export type GetMenuItemPhotoVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+    params?: GetMenuItemPhotoParams;
+};
+
+/**
+ * Retrieve a menu item photo
+ *
+ * Retrieve the product photo image for a specific menu item.
+ */
+export async function getMenuItemPhoto(menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}): Promise<Blob | string> {
+    return __request<Blob | string>(__config, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+}
+
+export type ListOrdersResult = OrderList;
+
+export type ListOrdersParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+};
+
+export type ListOrdersVariables = {
+    params?: ListOrdersParams;
+};
+
+/**
+ * List all orders
+ *
+ * Retrieve a collection of orders with optional filtering and pagination.
+ */
+export async function listOrders(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderList> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderList>(__config, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+/**
+ * Create order
+ *
+ * Create a new order.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    headers?: GetOrderByIdHeaders;
+};
+
+/**
+ * Retrieve an order
+ *
+ * Retrieve a single order by its ID.
+ */
+export async function getOrderById(orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+}
+
+export type DeleteOrderResult = void;
+
+export type DeleteOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+};
+
+/**
+ * Delete an order
+ *
+ * Delete the order.
+ * To keep the order history, the order should be canceled instead of deleted.
+ */
+export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type UpdateOrderResult = Order;
+
+export type UpdateOrderBody = {
+    status: OrderStatus;
+};
+
+export type UpdateOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    body?: UpdateOrderBody;
+};
+
+/**
+ * Partially update an order
+ *
+ * Update an existing order status.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function updateOrder(orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type ListOrderItemsResult = OrderItem[];
+
+export type ListOrderItemsParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+};
+
+export type ListOrderItemsVariables = {
+    params?: ListOrderItemsParams;
+};
+
+/**
+ * List all order items with menu item details
+ *
+ * Returns an array of order items for a specific order.
+ * Use the `filter` parameter to filter by order ID.
+ */
+export async function listOrderItems(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderItem[]>(__config, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+/**
+ * Get revenue statistics
+ *
+ * Retrieve revenue statistics for a configurable date range.
+ * Returns revenue, order counts, average order amount, and other useful statistics.
+ */
+export async function getRevenue(params: {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
+    const __a = await __auth(["ApiKey"], __config);
+    return __request<RevenueStatistics>(__config, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Create OAuth2 client
+ *
+ * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+ * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
+ *   `redirectUris` must be provided (per RFC 7591 Section 2).
+ * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+ * Returns the registered client information per RFC 7591, including:
+ * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+ */
+export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
+    return __request<OAuth2Client>(__config, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+}
diff --git a/packages/openapi-typescript/examples/zod/src/api/client.zod.ts b/packages/openapi-typescript/examples/zod/src/api/client.zod.ts
new file mode 100644
index 0000000000..7e8295f73d
--- /dev/null
+++ b/packages/openapi-typescript/examples/zod/src/api/client.zod.ts
@@ -0,0 +1,122 @@
+// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+import { z } from "zod";
+
+export const PageSchema = z.object({
+    endCursor: z.union([z.string(), z.null()]),
+    startCursor: z.union([z.string(), z.null()]),
+    hasNextPage: z.boolean(),
+    hasPrevPage: z.boolean(),
+    limit: z.number().int().min(1).max(100),
+    total: z.number().int().min(0)
+});
+
+export const MenuBaseItemSchema = z.object({
+    createdAt: z.string(),
+    updatedAt: z.string(),
+    id: z.string().regex(new RegExp("^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$")),
+    object: z.literal("menuItem"),
+    name: z.string().min(1).max(50),
+    price: z.number().int().min(0),
+    photo: z.union([z.instanceof(Blob), z.null()]).optional(),
+    photoUrl: z.string().optional(),
+    photoTextDescription: z.union([z.string(), z.null()]).optional()
+});
+
+export const BeverageSchema = z.object({
+    category: z.literal("beverage"),
+    volume: z.number().gt(0),
+    containsCaffeine: z.boolean()
+}).and(z.lazy(() => MenuBaseItemSchema));
+
+export const DessertSchema = z.object({
+    category: z.literal("dessert"),
+    calories: z.number().gt(0)
+}).and(z.lazy(() => MenuBaseItemSchema));
+
+export const MenuItemSchema = z.union([z.lazy(() => BeverageSchema), z.lazy(() => DessertSchema)]);
+
+export const MenuItemListSchema = z.object({
+    object: z.literal("list"),
+    page: z.lazy(() => PageSchema),
+    items: z.array(z.lazy(() => MenuItemSchema))
+});
+
+export const ErrorSchema = z.object({
+    type: z.string(),
+    title: z.string(),
+    status: z.number().int().min(100).lt(600),
+    instance: z.string().optional(),
+    details: z.record(z.string(), z.unknown()).optional()
+});
+
+export const OrderStatusSchema = z.enum(["placed", "preparing", "completed", "canceled"]);
+
+export const OrderSchema = z.object({
+    id: z.string().regex(new RegExp("^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$")).optional(),
+    object: z.literal("order").optional(),
+    customerName: z.string().min(1).max(100).regex(new RegExp("^[A-Za-z]+(?:[\\s'-][A-Za-z]+)*$")),
+    status: z.lazy(() => OrderStatusSchema).optional(),
+    totalPrice: z.number().int().min(0).optional(),
+    createdAt: z.string().optional(),
+    updatedAt: z.string().optional(),
+    orderItems: z.array(z.object({
+        menuItemId: z.string(),
+        quantity: z.number().int().min(1),
+        discount: z.number().int().min(0).optional(),
+        comment: z.string().max(500).optional()
+    })).min(1)
+});
+
+export const OrderListSchema = z.object({
+    object: z.literal("list"),
+    page: z.lazy(() => PageSchema),
+    items: z.array(z.lazy(() => OrderSchema))
+});
+
+export const OrderItemSchema = z.object({
+    menuItemId: z.string(),
+    menuItem: z.lazy(() => MenuItemSchema).optional(),
+    quantity: z.number().int().min(1),
+    discount: z.number().int().min(0).optional(),
+    comment: z.string().max(500).optional()
+});
+
+export const RevenueStatisticsSchema = z.object({
+    revenue: z.number().min(0),
+    averageOrderAmount: z.number().min(0),
+    totalOrders: z.number().int().min(0),
+    placedOrders: z.number().int().min(0),
+    preparingOrders: z.number().int().min(0),
+    completedOrders: z.number().int().min(0),
+    canceledOrders: z.number().int().min(0),
+    startDate: z.string(),
+    endDate: z.string()
+});
+
+export const RegisterClientObjectSchema = z.object({
+    name: z.string(),
+    redirectUris: z.array(z.string()).optional(),
+    scopes: z.array(z.enum(["menu:read", "menu:write", "orders:read", "orders:write"])).optional(),
+    grantTypes: z.array(z.enum(["authorization_code", "client_credentials"])).optional()
+});
+
+export const OAuth2ClientSchema = z.object({
+    clientId: z.string(),
+    clientSecret: z.string(),
+    clientIdIssuedAt: z.number().int(),
+    clientSecretExpiresAt: z.number().int(),
+    name: z.string().optional(),
+    redirectUris: z.array(z.string()).optional(),
+    registrationClientUri: z.string(),
+    registrationAccessToken: z.string(),
+    scopes: z.array(z.enum(["menu:read", "menu:write", "orders:read", "orders:write"])).optional(),
+    grantTypes: z.array(z.enum(["authorization_code", "client_credentials"])).optional()
+});
+
+export const OrderNotificationSchema = z.object({
+    orderId: z.string(),
+    orderStatus: z.lazy(() => OrderStatusSchema),
+    timestamp: z.string()
+});
\ No newline at end of file
diff --git a/packages/openapi-typescript/examples/zod/src/main.ts b/packages/openapi-typescript/examples/zod/src/main.ts
new file mode 100644
index 0000000000..16bbea3025
--- /dev/null
+++ b/packages/openapi-typescript/examples/zod/src/main.ts
@@ -0,0 +1,19 @@
+import { configure, listMenuItems, ApiError } from './api/client';
+import { MenuItemListSchema } from './api/client.zod';
+
+configure({ baseUrl: 'https://cafe.cloud.redocly.com' });
+
+const out = document.querySelector<HTMLPreElement>('#out')!;
+
+async function main() {
+  try {
+    const response = await listMenuItems();
+    const parsed = MenuItemListSchema.parse(response);
+    out.textContent = `Validated ${parsed.items.length} items:\n${JSON.stringify(parsed, null, 2)}`;
+  } catch (error) {
+    out.textContent =
+      error instanceof ApiError ? `ApiError ${error.status}` : `Error: ${String(error)}`;
+  }
+}
+
+void main();
diff --git a/packages/openapi-typescript/examples/zod/tsconfig.json b/packages/openapi-typescript/examples/zod/tsconfig.json
new file mode 100644
index 0000000000..4bd6962d40
--- /dev/null
+++ b/packages/openapi-typescript/examples/zod/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../tsconfig.base.json",
+  "include": ["src"]
+}
diff --git a/packages/openapi-typescript/examples/zod/vite.config.ts b/packages/openapi-typescript/examples/zod/vite.config.ts
new file mode 100644
index 0000000000..c049f46e10
--- /dev/null
+++ b/packages/openapi-typescript/examples/zod/vite.config.ts
@@ -0,0 +1,3 @@
+import { defineConfig } from 'vite';
+
+export default defineConfig({});
diff --git a/packages/openapi-typescript/package.json b/packages/openapi-typescript/package.json
new file mode 100644
index 0000000000..4d8e890ece
--- /dev/null
+++ b/packages/openapi-typescript/package.json
@@ -0,0 +1,61 @@
+{
+  "name": "@redocly/openapi-typescript",
+  "version": "0.0.0",
+  "description": "Generate TypeScript clients (types, fetch, service-class) from OpenAPI descriptions.",
+  "type": "module",
+  "types": "lib/index.d.ts",
+  "sideEffects": false,
+  "exports": {
+    ".": {
+      "import": "./lib/index.js",
+      "types": "./lib/index.d.ts"
+    },
+    "./config-file": {
+      "import": "./lib/config-file.js",
+      "types": "./lib/config-file.d.ts"
+    },
+    "./plugin": {
+      "import": "./lib/plugin.js",
+      "types": "./lib/plugin.d.ts"
+    }
+  },
+  "engines": {
+    "node": ">=22.12.0 || >=20.19.0 <21.0.0",
+    "npm": ">=10"
+  },
+  "engineStrict": true,
+  "scripts": {
+    "examples:regen": "node scripts/regenerate-examples.mjs",
+    "typecheck:examples": "node scripts/typecheck-examples.mjs"
+  },
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Redocly/redocly-cli.git"
+  },
+  "homepage": "https://github.com/Redocly/redocly-cli",
+  "keywords": [
+    "OpenAPI",
+    "Swagger",
+    "TypeScript",
+    "client",
+    "generator",
+    "codegen",
+    "fetch"
+  ],
+  "contributors": [
+    "Roman Marshevskyi <roman.marshevskyy@redocly.com> (https://redocly.com/)"
+  ],
+  "dependencies": {
+    "@redocly/openapi-core": "2.31.4"
+  },
+  "peerDependencies": {
+    "typescript": ">=5.5.0"
+  },
+  "devDependencies": {
+    "typescript": "6.0.2"
+  },
+  "files": [
+    "lib"
+  ]
+}
diff --git a/packages/openapi-typescript/scripts/regenerate-examples.mjs b/packages/openapi-typescript/scripts/regenerate-examples.mjs
new file mode 100644
index 0000000000..dea7ca7ba4
--- /dev/null
+++ b/packages/openapi-typescript/scripts/regenerate-examples.mjs
@@ -0,0 +1,29 @@
+import { spawnSync } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+// Regenerate each example's client in place. A `redocly.yaml` example uses the CLI
+// (auto-discovering its `x-openapi-typescript` block); the programmatic example runs
+// its own `generate.ts`.
+const pkgRoot = join(dirname(fileURLToPath(import.meta.url)), '..');
+const repoRoot = join(pkgRoot, '..', '..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const tsx = join(repoRoot, 'node_modules/.bin/tsx');
+const examples = [
+  'fetch-functions',
+  'service-class',
+  'zod',
+  'mock',
+  'custom-generator',
+  'tanstack-query',
+  'programmatic',
+];
+
+for (const name of examples) {
+  const cwd = join(pkgRoot, 'examples', name);
+  const res = existsSync(join(cwd, 'redocly.yaml'))
+    ? spawnSync('node', [cli, 'generate-client'], { cwd, stdio: 'inherit' })
+    : spawnSync(tsx, [join(cwd, 'generate.ts')], { cwd, stdio: 'inherit' });
+  if (res.status !== 0) process.exit(res.status ?? 1);
+}
diff --git a/packages/openapi-typescript/scripts/typecheck-examples.mjs b/packages/openapi-typescript/scripts/typecheck-examples.mjs
new file mode 100644
index 0000000000..7e84943937
--- /dev/null
+++ b/packages/openapi-typescript/scripts/typecheck-examples.mjs
@@ -0,0 +1,30 @@
+import { spawnSync } from 'node:child_process';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+// Type-check each example against its own (strict, browser-targeted) tsconfig. The
+// root `npm run typecheck` is a single Node-targeted pass and excludes `examples/`
+// (they are Vite/React apps needing DOM + JSX + bundler resolution), so they are
+// verified here instead — same rigor, the right compiler options per project.
+const pkgRoot = join(dirname(fileURLToPath(import.meta.url)), '..');
+const repoRoot = join(pkgRoot, '..', '..');
+const tsc = join(repoRoot, 'node_modules/.bin/tsc');
+const examplesDir = join(pkgRoot, 'examples');
+const examples = [
+  'fetch-functions',
+  'service-class',
+  'zod',
+  'tanstack-query',
+  'programmatic',
+  'mock',
+  'custom-generator',
+];
+
+let failed = false;
+for (const name of examples) {
+  const res = spawnSync(tsc, ['--noEmit', '-p', join(examplesDir, name, 'tsconfig.json')], {
+    stdio: 'inherit',
+  });
+  if (res.status !== 0) failed = true;
+}
+if (failed) process.exit(1);
diff --git a/packages/openapi-typescript/src/__tests__/config-file.test.ts b/packages/openapi-typescript/src/__tests__/config-file.test.ts
new file mode 100644
index 0000000000..6efddfa1a0
--- /dev/null
+++ b/packages/openapi-typescript/src/__tests__/config-file.test.ts
@@ -0,0 +1,72 @@
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import { loadConfigFile, mergeConfig } from '../config-file.js';
+
+describe('mergeConfig', () => {
+  it('CLI overrides win over config-file values; undefined overrides are ignored', () => {
+    const merged = mergeConfig(
+      { input: 'spec.yaml', output: 'a.ts', outputMode: 'single' },
+      { output: 'b.ts', outputMode: undefined, facade: 'service-class' }
+    );
+    expect(merged).toEqual({
+      input: 'spec.yaml',
+      output: 'b.ts',
+      outputMode: 'single',
+      facade: 'service-class',
+    });
+  });
+});
+
+describe('loadConfigFile', () => {
+  let dir = '';
+  beforeAll(() => {
+    dir = mkdtempSync(join(tmpdir(), 'ots-cfg-'));
+  });
+  afterAll(() => rmSync(dir, { recursive: true, force: true }));
+
+  it('imports the default export of an explicit .mjs config path', async () => {
+    const file = join(dir, 'my.config.mjs');
+    writeFileSync(
+      file,
+      `export default { input: 'spec.yaml', output: 'out.ts', generators: ['sdk'] };\n`,
+      'utf-8'
+    );
+    const config = await loadConfigFile(file);
+    expect(config).toEqual({ input: 'spec.yaml', output: 'out.ts', generators: ['sdk'] });
+  });
+
+  it('returns undefined when no path is given and none is discovered', async () => {
+    const config = await loadConfigFile(undefined, dir);
+    expect(config).toBeUndefined();
+  });
+
+  it('discovers a default-named config when no explicit path is given', async () => {
+    const file = join(dir, 'redocly-openapi-typescript.config.mjs');
+    writeFileSync(
+      file,
+      `export default { input: 'discovered.yaml', output: 'discovered.ts' };\n`,
+      'utf-8'
+    );
+    const config = await loadConfigFile(undefined, dir);
+    expect(config).toEqual({ input: 'discovered.yaml', output: 'discovered.ts' });
+  });
+
+  it('throws when the config file has no default export', async () => {
+    const file = join(dir, 'no-default.config.mjs');
+    writeFileSync(file, `export const x = 1;\n`, 'utf-8');
+    await expect(loadConfigFile(file)).rejects.toThrow(/export default/);
+  });
+
+  it('resolves a relative path against the given cwd', async () => {
+    // Write a config in dir and pass a relative filename + cwd=dir
+    writeFileSync(
+      join(dir, 'relative.config.mjs'),
+      `export default { input: 'rel.yaml', output: 'rel.ts' };\n`,
+      'utf-8'
+    );
+    const config = await loadConfigFile('relative.config.mjs', dir);
+    expect(config).toEqual({ input: 'rel.yaml', output: 'rel.ts' });
+  });
+});
diff --git a/packages/openapi-typescript/src/__tests__/config.test.ts b/packages/openapi-typescript/src/__tests__/config.test.ts
new file mode 100644
index 0000000000..5ebf8a093f
--- /dev/null
+++ b/packages/openapi-typescript/src/__tests__/config.test.ts
@@ -0,0 +1,26 @@
+// packages/openapi-typescript/src/__tests__/config.test.ts
+import { defineConfig } from '../config.js';
+
+describe('defineConfig', () => {
+  it('returns its argument unchanged (identity, for type-safe config authoring)', () => {
+    const config = defineConfig({
+      input: './openapi.yaml',
+      output: './src/api.ts',
+      outputMode: 'split',
+      generators: ['sdk'],
+    });
+    expect(config).toEqual({
+      input: './openapi.yaml',
+      output: './src/api.ts',
+      outputMode: 'split',
+      generators: ['sdk'],
+    });
+  });
+
+  it('accepts a minimal config (input + output only)', () => {
+    expect(defineConfig({ input: 'a.yaml', output: 'a.ts' })).toEqual({
+      input: 'a.yaml',
+      output: 'a.ts',
+    });
+  });
+});
diff --git a/packages/openapi-typescript/src/__tests__/errors.test.ts b/packages/openapi-typescript/src/__tests__/errors.test.ts
new file mode 100644
index 0000000000..65dabe3c7f
--- /dev/null
+++ b/packages/openapi-typescript/src/__tests__/errors.test.ts
@@ -0,0 +1,15 @@
+import { NotSupportedError } from '../errors.js';
+
+describe('NotSupportedError', () => {
+  it('is an instance of Error and exposes the given message', () => {
+    const err = new NotSupportedError('boom');
+    expect(err).toBeInstanceOf(Error);
+    expect(err).toBeInstanceOf(NotSupportedError);
+    expect(err.message).toBe('boom');
+  });
+
+  it('sets name to "NotSupportedError"', () => {
+    const err = new NotSupportedError('x');
+    expect(err.name).toBe('NotSupportedError');
+  });
+});
diff --git a/packages/openapi-typescript/src/__tests__/index.test.ts b/packages/openapi-typescript/src/__tests__/index.test.ts
new file mode 100644
index 0000000000..88cc66c873
--- /dev/null
+++ b/packages/openapi-typescript/src/__tests__/index.test.ts
@@ -0,0 +1,165 @@
+import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import { collectGeneratedFiles, generateClient } from '../index.js';
+import type { ApiModel } from '../ir/model.js';
+
+function model(): ApiModel {
+  return {
+    title: 'T',
+    version: '1',
+    baseUrl: 'https://x',
+    services: [{ name: 'Default', operations: [] }],
+    schemas: [],
+    securitySchemes: [],
+  };
+}
+
+describe('collectGeneratedFiles', () => {
+  it('runs the given generators and concatenates their files', () => {
+    const files = collectGeneratedFiles(model(), {
+      outputPath: '/out/api.ts',
+      outputMode: 'single',
+      emit: {},
+      generators: ['sdk'],
+    });
+    expect(files.length).toBe(1);
+    expect(files[0].path).toBe('/out/api.ts');
+  });
+
+  it('throws when two generators emit the same path', () => {
+    expect(() =>
+      collectGeneratedFiles(model(), {
+        outputPath: '/out/api.ts',
+        outputMode: 'single',
+        emit: {},
+        generators: ['sdk', 'sdk'],
+      })
+    ).toThrow(/already emitted/);
+  });
+});
+
+describe('generateClient — end-to-end orchestration', () => {
+  let workDir: string;
+
+  beforeEach(async () => {
+    workDir = await mkdtemp(join(tmpdir(), 'client-gen-index-'));
+  });
+
+  afterEach(async () => {
+    await rm(workDir, { recursive: true, force: true });
+  });
+
+  it('writes the generated file to disk and reports its size', async () => {
+    const input = join(workDir, 'spec.yaml');
+    await writeFile(
+      input,
+      `openapi: 3.0.3
+info:
+  title: Tiny
+  version: 1.0.0
+paths:
+  /ping:
+    get:
+      operationId: ping
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema: { type: string }
+`,
+      'utf-8'
+    );
+
+    const output = join(workDir, 'nested/dir/api.ts');
+    const result = await generateClient({ input, output });
+
+    expect(result.outputPath).toBe(output);
+    expect(result.bytes).toBeGreaterThan(0);
+
+    const contents = await readFile(output, 'utf-8');
+    expect(contents).toContain('export async function ping(');
+    expect(contents).toContain('// Generated by @redocly/openapi-typescript');
+    // bytes should match what we wrote.
+    expect(result.bytes).toBe(Buffer.byteLength(contents, 'utf-8'));
+  });
+
+  it('emits the result shape when errorMode is `result`', async () => {
+    const input = join(workDir, 'errmode.yaml');
+    await writeFile(
+      input,
+      `openapi: 3.0.3
+info:
+  title: Tiny
+  version: 1.0.0
+paths:
+  /ping:
+    get:
+      operationId: ping
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema: { type: string }
+`,
+      'utf-8'
+    );
+
+    const resultOutput = join(workDir, 'result.ts');
+    await generateClient({ input, output: resultOutput, errorMode: 'result' });
+    const resultContents = await readFile(resultOutput, 'utf-8');
+    expect(resultContents).toContain('__requestResult');
+    expect(resultContents).toContain('export type Result<');
+
+    const throwOutput = join(workDir, 'throw.ts');
+    await generateClient({ input, output: throwOutput });
+    const throwContents = await readFile(throwOutput, 'utf-8');
+    expect(throwContents).not.toContain('__requestResult');
+    expect(throwContents).not.toContain('export type Result<');
+  });
+
+  it('normalizes a Swagger 2.0 document before generating', async () => {
+    const input = join(workDir, 'swagger2.yaml');
+    await writeFile(
+      input,
+      `swagger: '2.0'
+info:
+  title: Tiny2
+  version: 1.0.0
+host: api.example.com
+basePath: /v1
+schemes: [https]
+consumes: [application/json]
+produces: [application/json]
+paths:
+  /items:
+    get:
+      operationId: listItems
+      parameters:
+        - { name: page, in: query, required: false, type: integer }
+      responses:
+        '200':
+          description: ok
+          schema: { $ref: '#/definitions/Item' }
+definitions:
+  Item:
+    type: object
+    properties:
+      id: { type: integer }
+`,
+      'utf-8'
+    );
+
+    const output = join(workDir, 'api2.ts');
+    const result = await generateClient({ input, output });
+
+    expect(result.bytes).toBeGreaterThan(0);
+    const contents = await readFile(output, 'utf-8');
+    expect(contents).toContain('export async function listItems(');
+    expect(contents).toContain('export type Item');
+    expect(contents).toContain('let BASE = "https://api.example.com/v1"');
+  });
+});
diff --git a/packages/openapi-typescript/src/__tests__/loader.test.ts b/packages/openapi-typescript/src/__tests__/loader.test.ts
new file mode 100644
index 0000000000..a87d36291f
--- /dev/null
+++ b/packages/openapi-typescript/src/__tests__/loader.test.ts
@@ -0,0 +1,121 @@
+import { createConfig } from '@redocly/openapi-core';
+import { mkdtemp, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import { loadSpec } from '../loader.js';
+
+describe('loadSpec', () => {
+  let workDir: string;
+
+  beforeEach(async () => {
+    workDir = await mkdtemp(join(tmpdir(), 'client-gen-loader-'));
+  });
+
+  afterEach(async () => {
+    await rm(workDir, { recursive: true, force: true });
+  });
+
+  async function write(name: string, contents: string): Promise<string> {
+    const file = join(workDir, name);
+    await writeFile(file, contents, 'utf-8');
+    return file;
+  }
+
+  it('loads a valid OpenAPI document and returns the parsed bundle', async () => {
+    const file = await write(
+      'minimal.yaml',
+      `openapi: 3.0.3
+info:
+  title: Minimal
+  version: 1.0.0
+paths: {}
+`
+    );
+
+    const { document } = await loadSpec(file);
+    expect(document.openapi).toBe('3.0.3');
+    expect(document.info?.title).toBe('Minimal');
+  });
+
+  it('uses a caller-supplied Config instead of building a fresh one', async () => {
+    const file = await write(
+      'with-config.yaml',
+      `openapi: 3.0.3
+info:
+  title: Minimal
+  version: 1.0.0
+paths: {}
+`
+    );
+    const config = await createConfig({});
+    const { document } = await loadSpec(file, config);
+    expect(document.openapi).toBe('3.0.3');
+  });
+
+  // The underlying `bundle()` already validates document shape and OpenAPI version, so
+  // these failure paths are exercised by openapi-core itself. We re-assert that the loader
+  // surfaces those errors instead of swallowing them.
+  it('detects the spec version (oas3_0)', async () => {
+    const file = await write(
+      'oas3_0.yaml',
+      `openapi: 3.0.3
+info:
+  title: Minimal
+  version: 1.0.0
+paths: {}
+`
+    );
+    const result = await loadSpec(file);
+    expect(result.version).toBe('oas3_0');
+  });
+
+  it('returns the source files read — the entry plus external $ref targets', async () => {
+    const pet = await write(
+      'pet.yaml',
+      `type: object
+properties:
+  id: { type: integer }
+`
+    );
+    const entry = await write(
+      'split.yaml',
+      `openapi: 3.0.3
+info:
+  title: Split
+  version: 1.0.0
+paths:
+  /pets:
+    get:
+      responses:
+        '200':
+          description: ok
+          content:
+            application/json:
+              schema:
+                $ref: './pet.yaml'
+`
+    );
+    const { fileDependencies } = await loadSpec(entry);
+    expect(fileDependencies.has(entry)).toBe(true);
+    expect(fileDependencies.has(pet)).toBe(true);
+  });
+
+  it('propagates errors from bundle() for null/empty documents', async () => {
+    const file = await write('null.yaml', 'null\n');
+    await expect(loadSpec(file)).rejects.toThrow();
+  });
+
+  it('propagates errors from bundle() for documents missing "openapi"', async () => {
+    const file = await write('no-openapi.yaml', 'foo: bar\n');
+    await expect(loadSpec(file)).rejects.toThrow();
+  });
+
+  it('propagates errors from bundle() for non-string "openapi" values', async () => {
+    const file = await write(
+      'numeric-openapi.yaml',
+      'openapi: 3\ninfo:\n  title: x\n  version: y\npaths: {}\n'
+    );
+    await expect(loadSpec(file)).rejects.toThrow();
+  });
+});
diff --git a/packages/openapi-typescript/src/__tests__/plugin.test.ts b/packages/openapi-typescript/src/__tests__/plugin.test.ts
new file mode 100644
index 0000000000..b62f2f5f21
--- /dev/null
+++ b/packages/openapi-typescript/src/__tests__/plugin.test.ts
@@ -0,0 +1,27 @@
+import {
+  type CustomGenerator,
+  defineGenerator,
+  operationSignature,
+  pascalCase,
+  printStatements,
+  safeIdent,
+  schemaToTypeNode,
+  ts,
+} from '../plugin.js';
+
+describe('plugin entry', () => {
+  it('defineGenerator returns its argument unchanged', () => {
+    const gen: CustomGenerator = { name: 'route-map', requires: ['sdk'], run: () => [] };
+    expect(defineGenerator(gen)).toBe(gen);
+  });
+
+  it('re-exports the codegen toolkit the built-in generators use', () => {
+    // Value re-exports are reachable and usable from the public entry.
+    expect(typeof ts.factory).toBe('object');
+    expect(typeof printStatements).toBe('function');
+    expect(typeof operationSignature).toBe('function');
+    expect(typeof schemaToTypeNode).toBe('function');
+    expect(pascalCase('pet')).toBe('Pet');
+    expect(safeIdent('123')).not.toBe('123');
+  });
+});
diff --git a/packages/openapi-typescript/src/config-file.ts b/packages/openapi-typescript/src/config-file.ts
new file mode 100644
index 0000000000..edece0cfe4
--- /dev/null
+++ b/packages/openapi-typescript/src/config-file.ts
@@ -0,0 +1,50 @@
+// packages/openapi-typescript/src/config-file.ts
+import { existsSync } from 'node:fs';
+import { isAbsolute, join, resolve } from 'node:path';
+import { pathToFileURL } from 'node:url';
+
+import type { Config } from './config.js';
+
+const DEFAULT_NAMES = [
+  'redocly-openapi-typescript.config.ts',
+  'redocly-openapi-typescript.config.mjs',
+  'redocly-openapi-typescript.config.js',
+];
+
+/**
+ * Load a config file's default export. With an explicit `path`, imports it; else
+ * discovers a default-named config in `cwd`. Returns `undefined` when none is found.
+ *
+ * Uses native dynamic `import()` — no transpiler dependency. `.ts` configs require
+ * a host runtime that strips types (Node >= 22.18); otherwise pass a `.mjs`/`.js`
+ * config or run under a TS-capable runtime.
+ */
+export async function loadConfigFile(
+  path: string | undefined,
+  cwd: string = process.cwd()
+): Promise<Config | undefined> {
+  const resolved = path
+    ? isAbsolute(path)
+      ? path
+      : resolve(cwd, path)
+    : DEFAULT_NAMES.map((name) => join(cwd, name)).find((candidate) => existsSync(candidate));
+  if (!resolved) return undefined;
+  const module = (await import(pathToFileURL(resolved).href)) as { default?: Config };
+  if (!module.default) {
+    throw new Error(`Config file ${resolved} must \`export default\` a config object.`);
+  }
+  return module.default;
+}
+
+/**
+ * Merge a base config (from a file) with CLI overrides. Defined keys in
+ * `overrides` win; `undefined` override values are ignored so absent flags don't
+ * clobber file values.
+ */
+export function mergeConfig(base: Partial<Config>, overrides: Partial<Config>): Partial<Config> {
+  const merged: Partial<Config> = { ...base };
+  for (const [key, value] of Object.entries(overrides)) {
+    if (value !== undefined) (merged as Record<string, unknown>)[key] = value;
+  }
+  return merged;
+}
diff --git a/packages/openapi-typescript/src/config.ts b/packages/openapi-typescript/src/config.ts
new file mode 100644
index 0000000000..3cd5f72d06
--- /dev/null
+++ b/packages/openapi-typescript/src/config.ts
@@ -0,0 +1,64 @@
+import type { ArgsStyle, Facade } from './emitters/client.js';
+// packages/openapi-typescript/src/config.ts
+import type { CustomGenerator } from './generators/types.js';
+import type { OutputMode } from './writers/types.js';
+
+/**
+ * The user-facing generation config — what `defineConfig` accepts and what a
+ * `*.config.ts` default-exports. A superset of the programmatic options plus the
+ * `generators` list. `redocly.yaml` ingestion is intentionally not modeled here
+ * (roadmap P7.5).
+ */
+export type Config = {
+  /** Path or URL to the OpenAPI document. */
+  input: string;
+  /** Output anchor path (a `.ts` file; multi-file modes derive siblings from it). */
+  output: string;
+  /** File partitioning. Defaults to `single`. */
+  outputMode?: OutputMode;
+  /** Developer-facing operation shape. Defaults to `functions`. */
+  facade?: Facade;
+  /** How inputs are passed. Defaults to `flat`. */
+  argsStyle?: ArgsStyle;
+  /** Class name for the service-class facade. Defaults to `Client`. */
+  name?: string;
+  /** Override the inlined base URL (else derived from `servers[0].url`). */
+  baseUrl?: string;
+  /** Named-enum emission. Defaults to `const-object`. */
+  enumStyle?: 'union' | 'const-object';
+  /** Error-handling shape of the generated client. `'throw'` (default) throws `ApiError`
+   * on non-2xx; `'result'` returns a discriminated `{ data, error, response }`. */
+  errorMode?: 'throw' | 'result';
+  /** How `date-time`/`date` string fields are typed. `'string'` (default) keeps the
+   * ISO wire shape; `'Date'` emits a `Date` reference (pair with the `transformers`
+   * generator so the runtime value matches). */
+  dateType?: 'string' | 'Date';
+  /** TanStack Query adapter the `tanstack-query` generator imports from
+   * (`@tanstack/${queryFramework}-query`). Defaults to `react`; only the import
+   * specifier changes. */
+  queryFramework?: 'react' | 'vue' | 'svelte' | 'solid';
+  /** How the `mock` generator produces data. `'baked'` (default) inlines deterministic
+   * literals (zero-dep); `'faker'` emits `@faker-js/faker` calls for realistic data
+   * (the consumer adds `@faker-js/faker` as a dev-dep). */
+  mockData?: 'baked' | 'faker';
+  /** Seed for faker-mode mocks: emits `faker.seed(<n>)` so runs reproduce. Baked mode ignores it. */
+  mockSeed?: number;
+  /**
+   * Generators to run, in order. Defaults to `['sdk']`. Each entry is a built-in name, the `name`
+   * of an inline `customGenerators` entry, or an import specifier (path or package) for a plugin.
+   */
+  generators?: string[];
+  /**
+   * Inline custom generators (the experimental plugin API), registered so they can be selected in
+   * `generators` by `name`. Authored with `defineGenerator` from `@redocly/openapi-typescript/plugin`.
+   */
+  customGenerators?: CustomGenerator[];
+};
+
+/**
+ * Identity helper for type-safe config authoring in a `*.config.ts` file:
+ * `export default defineConfig({ … })`. Returns its argument unchanged.
+ */
+export function defineConfig(config: Config): Config {
+  return config;
+}
diff --git a/packages/openapi-typescript/src/emitters/__tests__/auth.test.ts b/packages/openapi-typescript/src/emitters/__tests__/auth.test.ts
new file mode 100644
index 0000000000..f0a1c357c4
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/__tests__/auth.test.ts
@@ -0,0 +1,349 @@
+import type { SecuritySchemeModel } from '../../ir/model.js';
+import { authSetterNames, authTypeNames, renderAuth } from '../auth.js';
+
+/** A spec exercising all five injectable kinds at once. */
+const allKinds: SecuritySchemeModel[] = [
+  { kind: 'bearer', key: 'OAuth2' },
+  { kind: 'basic', key: 'Basic' },
+  { kind: 'apiKeyHeader', key: 'HeaderKey', headerName: 'X-API-Key' },
+  { kind: 'apiKeyQuery', key: 'QueryKey', paramName: 'api_key' },
+  { kind: 'apiKeyCookie', key: 'CookieKey', cookieName: 'sid' },
+];
+
+describe('renderAuth', () => {
+  it('returns "" when there are no schemes', () => {
+    expect(renderAuth([], true, true)).toBe('');
+    expect(renderAuth([], false, false)).toBe('');
+  });
+
+  describe('TokenProvider type', () => {
+    it('emits + exports TokenProvider when any bearer/apiKey scheme exists', () => {
+      const out = renderAuth([{ kind: 'bearer', key: 'OAuth2' }], false, false);
+      expect(out).toContain(
+        'export type TokenProvider = string | (() => string | Promise<string>);'
+      );
+    });
+
+    it('emits TokenProvider for an apiKey-only scheme set', () => {
+      const out = renderAuth(
+        [{ kind: 'apiKeyQuery', key: 'k', paramName: 'api_key' }],
+        false,
+        false
+      );
+      expect(out).toContain('export type TokenProvider =');
+    });
+
+    it('does NOT emit TokenProvider for a basic-only scheme set', () => {
+      const out = renderAuth([{ kind: 'basic', key: 'Basic' }], false, false);
+      expect(out).not.toContain('TokenProvider');
+    });
+  });
+
+  describe('AuthCredentials type (per-instance config.auth)', () => {
+    it('emits a field per declared scheme kind', () => {
+      const out = renderAuth(allKinds, true, true);
+      expect(out).toContain('export type AuthCredentials = {');
+      expect(out).toContain('bearer?: TokenProvider;');
+      expect(out).toContain('basic?: {');
+      expect(out).toContain('username: string;');
+      expect(out).toContain('password: string;');
+      expect(out).toContain('apiKey?: Record<string, TokenProvider>;');
+    });
+
+    it('a basic-only set has only the basic field (no TokenProvider reference)', () => {
+      const out = renderAuth([{ kind: 'basic', key: 'Basic' }], true, false);
+      expect(out).toContain('export type AuthCredentials = {');
+      expect(out).toContain('basic?: {');
+      expect(out).not.toContain('bearer?:');
+      expect(out).not.toContain('apiKey?:');
+      expect(out).not.toContain('TokenProvider');
+    });
+
+    it('is emitted whenever schemes exist, even with no authed operation', () => {
+      const out = renderAuth([{ kind: 'bearer', key: 'OAuth2' }], false, false);
+      expect(out).toContain('export type AuthCredentials = {');
+    });
+  });
+
+  describe('bearer', () => {
+    it('emits one shared slot + setBearer for bearer schemes', () => {
+      const out = renderAuth(
+        [
+          { kind: 'bearer', key: 'OAuth2' },
+          { kind: 'bearer', key: 'BearerHttp' },
+        ],
+        false,
+        false
+      );
+      expect(out).toContain('let __bearerToken: TokenProvider | null = null;');
+      expect(out.match(/let __bearerToken/g)).toHaveLength(1);
+      expect(out).toContain('export function setBearer(token: TokenProvider | null): void {');
+      expect(out).toContain('__bearerToken = token;');
+      expect(out.match(/export function setBearer\(/g)).toHaveLength(1);
+    });
+  });
+
+  describe('basic', () => {
+    it('emits one shared __basicAuth slot + setBasicAuth storing btoa(user:pass)', () => {
+      const out = renderAuth(
+        [
+          { kind: 'basic', key: 'Basic' },
+          { kind: 'basic', key: 'Basic2' },
+        ],
+        false,
+        false
+      );
+      expect(out).toContain('let __basicAuth: string | null = null;');
+      expect(out.match(/let __basicAuth/g)).toHaveLength(1);
+      expect(out).toContain(
+        'export function setBasicAuth(username: string, password: string): void {'
+      );
+      expect(out).toContain('__basicAuth = btoa(`${username}:${password}`);');
+      expect(out.match(/export function setBasicAuth\(/g)).toHaveLength(1);
+    });
+  });
+
+  describe('apiKey setters', () => {
+    it('emits a slot + setApiKey for a sole apiKey scheme (any in)', () => {
+      const out = renderAuth(
+        [{ kind: 'apiKeyQuery', key: 'QueryKey', paramName: 'api_key' }],
+        false,
+        false
+      );
+      expect(out).toContain('let __apiKey_QueryKey: TokenProvider | null = null;');
+      expect(out).toContain('export function setApiKey(key: TokenProvider | null): void {');
+      expect(out).toContain('__apiKey_QueryKey = key;');
+    });
+
+    it('treats a sole apiKey scheme as sole regardless of its in (cookie)', () => {
+      const out = renderAuth(
+        [{ kind: 'apiKeyCookie', key: 'CookieKey', cookieName: 'sid' }],
+        false,
+        false
+      );
+      expect(out).toContain('export function setApiKey(key: TokenProvider | null): void {');
+    });
+
+    it('keyed names when more than one apiKey scheme exists across different in', () => {
+      const out = renderAuth(
+        [
+          { kind: 'apiKeyHeader', key: 'HeaderKey', headerName: 'X-API-Key' },
+          { kind: 'apiKeyQuery', key: 'QueryKey', paramName: 'api_key' },
+        ],
+        false,
+        false
+      );
+      expect(out).toContain(
+        'export function setApiKeyHeaderKey(key: TokenProvider | null): void {'
+      );
+      expect(out).toContain('export function setApiKeyQueryKey(key: TokenProvider | null): void {');
+      expect(out).not.toContain('export function setApiKey(');
+    });
+
+    it('sanitizes non-identifier characters in the slot name', () => {
+      const out = renderAuth(
+        [{ kind: 'apiKeyHeader', key: 'my-key.v2', headerName: 'X-Key' }],
+        false,
+        false
+      );
+      expect(out).toContain('let __apiKey_my_key_v2: TokenProvider | null = null;');
+    });
+  });
+
+  describe('__resolve + __auth emission gating', () => {
+    it('emits neither __resolve nor __auth when no operation is authed', () => {
+      const out = renderAuth([{ kind: 'bearer', key: 'OAuth2' }], false, false);
+      expect(out).toContain('export function setBearer');
+      expect(out).not.toContain('function __auth(');
+      expect(out).not.toContain('function __resolve(');
+    });
+
+    it('emits __resolve + __auth when an operation is authed and a resolvable scheme exists', () => {
+      const out = renderAuth([{ kind: 'bearer', key: 'OAuth2' }], true, false);
+      expect(out).toContain(
+        'async function __resolve(slot: TokenProvider | null): Promise<string | null> {'
+      );
+      expect(out).toContain('return typeof slot === "function" ? slot() : slot;');
+      expect(out).toContain('async function __auth(schemes: string[], config: ClientConfig)');
+    });
+
+    it('does NOT emit __resolve for a basic-only authed set (nothing resolvable)', () => {
+      const out = renderAuth([{ kind: 'basic', key: 'Basic' }], true, false);
+      expect(out).not.toContain('function __resolve(');
+      // but __auth IS emitted (basic still needs a switch).
+      expect(out).toContain('async function __auth(schemes: string[], config: ClientConfig)');
+    });
+
+    it('references each write-only slot via `void` when no operation is authed (noUnusedLocals)', () => {
+      // With no __auth to read them, the setter-written slots are otherwise
+      // unused and would trip TS6133 under --noUnusedLocals.
+      const out = renderAuth(allKinds, false, false);
+      expect(out).toContain('void __bearerToken;');
+      expect(out).toContain('void __basicAuth;');
+      expect(out).toContain('void __apiKey_HeaderKey;');
+      expect(out).toContain('void __apiKey_QueryKey;');
+      expect(out).toContain('void __apiKey_CookieKey;');
+    });
+
+    it('omits the `void` no-op block when an operation IS authed (slots are read)', () => {
+      const out = renderAuth(allKinds, true, false);
+      expect(out).not.toContain('void __bearerToken;');
+      expect(out).not.toContain('void __basicAuth;');
+    });
+  });
+
+  describe('__auth body', () => {
+    const out = renderAuth(allKinds, true, true);
+
+    it('is async returning Promise<{ headers; query }> with the export prefix', () => {
+      expect(out).toContain(
+        'export async function __auth(schemes: string[], config: ClientConfig): Promise<{'
+      );
+      expect(out).toContain('headers: Record<string, string>;');
+      expect(out).toContain('query: Record<string, string>;');
+      expect(out).toContain('const headers: Record<string, string> = {};');
+      expect(out).toContain('const query: Record<string, string> = {};');
+      expect(out).toContain('const cookies: string[] = [];');
+      expect(out).toContain('if (cookies.length > 0)');
+      expect(out).toContain('headers["Cookie"] = cookies.join("; ");');
+      expect(out).toContain('return { headers, query };');
+    });
+
+    it('honors the export prefix toggle', () => {
+      const internal = renderAuth(allKinds, true, false);
+      expect(internal).toContain('async function __auth(schemes: string[], config: ClientConfig)');
+      expect(internal).not.toContain('export async function __auth(');
+    });
+
+    it('emits a bearer case awaiting __resolve(__bearerToken)', () => {
+      expect(out).toContain('case "OAuth2": {');
+      // Prefers the per-instance credential, falling back to the global slot.
+      expect(out).toContain('const v = await __resolve(config.auth?.bearer ?? __bearerToken);');
+      expect(out).toContain('headers["Authorization"] = `Bearer ${v}`;');
+    });
+
+    it('emits a basic case preferring config.auth.basic over the global __basicAuth', () => {
+      expect(out).toContain('case "Basic":');
+      expect(out).toContain('const b = config.auth?.basic;');
+      expect(out).toContain('const basic = b ? btoa(`${b.username}:${b.password}`) : __basicAuth;');
+      expect(out).toContain('if (basic !== null)');
+      expect(out).toContain('headers["Authorization"] = `Basic ${basic}`;');
+    });
+
+    it('emits an apiKeyHeader case assigning headers[name]', () => {
+      expect(out).toContain('case "HeaderKey": {');
+      expect(out).toContain(
+        'const v = await __resolve(config.auth?.apiKey?.["HeaderKey"] ?? __apiKey_HeaderKey);'
+      );
+      expect(out).toContain('headers["X-API-Key"] = v;');
+    });
+
+    it('emits an apiKeyQuery case assigning query[param]', () => {
+      expect(out).toContain('case "QueryKey": {');
+      expect(out).toContain(
+        'const v = await __resolve(config.auth?.apiKey?.["QueryKey"] ?? __apiKey_QueryKey);'
+      );
+      expect(out).toContain('query["api_key"] = v;');
+    });
+
+    it('emits an apiKeyCookie case pushing `<name>=<value>`', () => {
+      expect(out).toContain('case "CookieKey": {');
+      expect(out).toContain(
+        'const v = await __resolve(config.auth?.apiKey?.["CookieKey"] ?? __apiKey_CookieKey);'
+      );
+      expect(out).toContain('cookies.push("sid=" + v);');
+    });
+
+    it('escapes a cookieName containing a backtick and `${` without breaking out of a template', () => {
+      const out = renderAuth(
+        [{ kind: 'apiKeyCookie', key: 'CookieKey', cookieName: 'we`ird${x}' }],
+        true,
+        true
+      );
+      // The name is emitted as a JSON string literal concatenated with the value,
+      // never interpolated into a backtick template.
+      expect(out).toContain('cookies.push("we`ird${x}=" + v);');
+      // No backtick template literal anywhere in the emitted cookie handling.
+      expect(out).not.toContain('cookies.push(`');
+      // The dangerous template-break sequence is only ever inside the JSON literal,
+      // so the emitted body has no unterminated/escaped-into-template fragment.
+      expect(out).not.toContain('`we`ird');
+    });
+
+    it('produces no undefined-indexed assignment and every case references a declared slot', () => {
+      expect(out).not.toContain('out[undefined]');
+      expect(out).not.toContain('[undefined]');
+      // Every `case "<key>":` body references a known slot / __basicAuth.
+      const slots = ['__bearerToken', '__basicAuth', '__apiKey_'];
+      const cases = out.split(/case "/).slice(1);
+      for (const c of cases) {
+        const body = c.slice(0, c.indexOf('break;'));
+        expect(slots.some((s) => body.includes(s))).toBe(true);
+      }
+    });
+  });
+});
+
+describe('authTypeNames', () => {
+  it('returns [] when there are no schemes', () => {
+    expect(authTypeNames([])).toEqual([]);
+  });
+
+  it('returns [TokenProvider, AuthCredentials] when a bearer scheme exists', () => {
+    expect(authTypeNames([{ kind: 'bearer', key: 'oauth' }])).toEqual([
+      'TokenProvider',
+      'AuthCredentials',
+    ]);
+  });
+
+  it('returns [TokenProvider, AuthCredentials] when an apiKey scheme exists', () => {
+    expect(authTypeNames([{ kind: 'apiKeyQuery', key: 'k', paramName: 'api_key' }])).toEqual([
+      'TokenProvider',
+      'AuthCredentials',
+    ]);
+  });
+
+  it('returns [AuthCredentials] for a basic-only scheme set (no TokenProvider)', () => {
+    expect(authTypeNames([{ kind: 'basic', key: 'Basic' }])).toEqual(['AuthCredentials']);
+  });
+});
+
+describe('authSetterNames', () => {
+  it('returns nothing when there are no schemes', () => {
+    expect(authSetterNames([])).toEqual([]);
+  });
+
+  it('names setBearer for a bearer scheme', () => {
+    expect(authSetterNames([{ kind: 'bearer', key: 'oauth' }])).toEqual(['setBearer']);
+  });
+
+  it('names setBasicAuth for a basic scheme', () => {
+    expect(authSetterNames([{ kind: 'basic', key: 'Basic' }])).toEqual(['setBasicAuth']);
+  });
+
+  it('names a sole apiKey scheme (any in) setApiKey', () => {
+    expect(authSetterNames([{ kind: 'apiKeyQuery', key: 'k', paramName: 'api_key' }])).toEqual([
+      'setApiKey',
+    ]);
+  });
+
+  it('orders setBearer, setBasicAuth, then apiKey setters in scheme order', () => {
+    expect(
+      authSetterNames([
+        { kind: 'apiKeyHeader', key: 'admin', headerName: 'X-Admin' },
+        { kind: 'basic', key: 'Basic' },
+        { kind: 'bearer', key: 'oauth' },
+        { kind: 'apiKeyCookie', key: 'tenant', cookieName: 'sid' },
+      ])
+    ).toEqual(['setBearer', 'setBasicAuth', 'setApiKeyAdmin', 'setApiKeyTenant']);
+  });
+
+  it('counts all apiKey kinds (any in) for the sole-naming rule', () => {
+    expect(
+      authSetterNames([
+        { kind: 'apiKeyHeader', key: 'h', headerName: 'X-H' },
+        { kind: 'apiKeyQuery', key: 'q', paramName: 'api_key' },
+      ])
+    ).toEqual(['setApiKeyH', 'setApiKeyQ']);
+  });
+});
diff --git a/packages/openapi-typescript/src/emitters/__tests__/client.test.ts b/packages/openapi-typescript/src/emitters/__tests__/client.test.ts
new file mode 100644
index 0000000000..8eb9880727
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/__tests__/client.test.ts
@@ -0,0 +1,518 @@
+import type { ApiModel, OperationModel } from '../../ir/model.js';
+import { emitModules, emitSingleFile } from '../client.js';
+import { apiModel, emitWithOp, namedSchema, operation, param } from './fixtures.js';
+
+/** An SSE operation streaming `Message` events (event-stream success + itemSchema $ref). */
+function sseOperation(overrides: Partial<OperationModel> = {}): OperationModel {
+  return operation({
+    name: 'streamMessages',
+    path: '/stream',
+    successResponses: [
+      {
+        contentType: 'text/event-stream',
+        status: 200,
+        schema: { kind: 'unknown' },
+        itemSchema: { kind: 'ref', name: 'Message' },
+      },
+    ],
+    ...overrides,
+  });
+}
+
+/** A model with one SSE op + the `Message` schema it streams. */
+function sseModel(overrides: Partial<ApiModel> = {}): ApiModel {
+  return apiModel({
+    schemas: [namedSchema('Message', { kind: 'object', properties: [] })],
+    services: [{ name: 'Default', operations: [sseOperation()] }],
+    ...overrides,
+  });
+}
+
+describe('emitSingleFile — top-level layout', () => {
+  it('includes the generated-by header and ends with a newline', () => {
+    const out = emitSingleFile(apiModel());
+    expect(out.startsWith('// Generated by @redocly/openapi-typescript')).toBe(true);
+    expect(out.endsWith('\n')).toBe(true);
+  });
+
+  it('inlines the baseUrl as a mutable `let` binding so setBaseUrl() can update it', () => {
+    const out = emitSingleFile(apiModel({ baseUrl: 'https://api.example.com/v1' }));
+    expect(out).toContain('let BASE = "https://api.example.com/v1";');
+    expect(out).not.toContain('const BASE = ');
+  });
+
+  it('always exports a setBaseUrl() helper that reassigns the BASE binding', () => {
+    const out = emitSingleFile(apiModel({ baseUrl: 'https://api.example.com' }));
+    expect(out).toContain('export function setBaseUrl(url: string): void');
+    expect(out).toMatch(/BASE\s*=\s*url/);
+  });
+
+  it('lets a caller override the spec-derived baseUrl via options.baseUrl', () => {
+    const out = emitSingleFile(apiModel({ baseUrl: 'https://from-spec.example.com' }), {
+      baseUrl: 'http://127.0.0.1:3101',
+    });
+    expect(out).toContain('let BASE = "http://127.0.0.1:3101";');
+    expect(out).not.toContain('from-spec.example.com');
+  });
+
+  it('emits a JSDoc title with the title and version', () => {
+    const out = emitSingleFile(apiModel({ title: 'My API', version: '2.0.0' }));
+    expect(out).toContain('* My API (v2.0.0)');
+  });
+
+  it('appends multi-line descriptions in the JSDoc title block', () => {
+    const out = emitSingleFile(apiModel({ title: 'D', description: 'line one\nline two' }));
+    expect(out).toContain(' * line one');
+    expect(out).toContain(' * line two');
+  });
+});
+
+describe('emitSingleFile — service-class facade', () => {
+  it('emits a Client class by default (name omitted)', () => {
+    const out = emitSingleFile(
+      apiModel({
+        services: [{ name: 'Default', operations: [operation({ name: 'ping' })] }],
+      }),
+      { facade: 'service-class' }
+    );
+    expect(out).toContain('export class Client {');
+    expect(out).toMatch(/\basync ping\(/);
+  });
+
+  it('honors a custom class name via options.name', () => {
+    const out = emitSingleFile(
+      apiModel({
+        services: [{ name: 'Default', operations: [operation({ name: 'ping' })] }],
+      }),
+      { facade: 'service-class', name: 'CafeClient' }
+    );
+    expect(out).toContain('export class CafeClient {');
+    expect(out).not.toContain('export class Client {');
+  });
+
+  it('shares the identical http + schemas modules with the functions facade (core unchanged)', () => {
+    const model = apiModel({
+      services: [{ name: 'Default', operations: [operation({ name: 'ping' })] }],
+    });
+    const fns = emitModules(model, { facade: 'functions' });
+    const cls = emitModules(model, { facade: 'service-class' });
+    // The facade changes only the endpoints; the shared http (runtime + auth) and
+    // schemas (types + guards) modules are byte-identical across facades.
+    expect(cls.http).toBe(fns.http);
+    expect(cls.schemas).toBe(fns.schemas);
+  });
+});
+
+describe('extension contract (ClientConfig)', () => {
+  it('emits the ClientConfig + RequestContext types, the global __config, and configure()', () => {
+    const out = emitSingleFile(apiModel());
+    expect(out).toContain('export type ClientConfig = {');
+    expect(out).toContain('export type RequestContext = {');
+    expect(out).toContain('const __config: ClientConfig = {};');
+    expect(out).toContain('export function configure(config: ClientConfig): void {');
+    expect(out).toContain('Object.assign(__config, config);');
+  });
+
+  it('threads the global __config through functions (both __buildUrl and __request)', () => {
+    const out = emitWithOp({ name: 'ping', path: '/p' });
+    expect(out).toContain('__buildUrl(__config, `/p`)');
+    // __request receives __config as its first argument.
+    expect(out).toContain('return __request<void>(__config,');
+  });
+
+  it('runtime resolves config.baseUrl ?? BASE and config.fetch ?? fetch', () => {
+    const out = emitSingleFile(apiModel());
+    expect(out).toContain('(config.baseUrl ?? BASE)');
+    expect(out).toContain('const doFetch = config.fetch ?? fetch;');
+  });
+
+  it('runs the request through the composable middleware chain (single hooks + use())', () => {
+    const out = emitSingleFile(apiModel());
+    // The single config hooks are folded into one implicit first middleware.
+    expect(out).toContain('function __middleware(config: ClientConfig): Middleware[]');
+    expect(out).toContain('for (const mw of middleware)');
+    expect(out).toContain('if (mw.onRequest)');
+    // onResponse runs in reverse (onion).
+    expect(out).toContain('for (let i = middleware.length - 1; i >= 0; i--)');
+    // onError threads through each middleware.
+    expect(out).toContain('error = await mw.onError(error as ApiError, context);');
+    // The `use()` registrar is exported for the functions facade.
+    expect(out).toContain('export function use(...middleware: Middleware[]): void');
+  });
+
+  it('service-class takes a ClientConfig constructor and threads this.config', () => {
+    const out = emitSingleFile(
+      apiModel({
+        services: [
+          {
+            name: 'Default',
+            operations: [operation({ name: 'ping', path: '/p' })],
+          },
+        ],
+      }),
+      { facade: 'service-class' }
+    );
+    expect(out).toContain('constructor(private readonly config: ClientConfig = {}) { }');
+    expect(out).toContain('__buildUrl(this.config, `/p`)');
+    expect(out).toContain('return __request<void>(this.config,');
+  });
+});
+
+describe('runtime — retry config types', () => {
+  it('emits the retry types and a ClientConfig.retry field', () => {
+    const out = emitSingleFile(apiModel());
+    expect(out).toContain('export type RetryStrategy =');
+    expect(out).toContain('export type RetryConfig = {');
+    expect(out).toContain('export type RetryContext = {');
+    // The printer reflows the `RequestOptions` type literal across lines.
+    expect(out).toContain('export type RequestOptions = RequestInit & {');
+    expect(out).toContain('parseAs?: ParseAs;');
+    expect(out).toContain('retry?: RetryConfig;');
+  });
+
+  it('emits the retry loop, default predicate, backoff, and Retry-After handling', () => {
+    const out = emitSingleFile(apiModel());
+    expect(out).toContain('function __defaultRetryOn(ctx: RetryContext): boolean');
+    expect(out).toContain("['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']");
+    expect(out).toContain('[408, 429, 500, 502, 503, 504]');
+    expect(out).toContain('function __retryDelay(');
+    expect(out).toContain('function __sleep(');
+    expect(out).toContain("response.headers.get('retry-after')");
+    expect(out).toContain('const { retry: callRetry, ...fetchInit } = init;');
+    // The abort helper must use `globalThis.Error` so a spec-defined `Error`
+    // schema (e.g. cafe.yaml) does not shadow the built-in error type.
+    expect(out).toContain('function __abortError(signal: AbortSignal): globalThis.Error');
+  });
+});
+
+describe('renderRuntime contents (smoke)', () => {
+  it('embeds the QueryValue / __buildUrl / __request / readError surface', () => {
+    const out = emitSingleFile(apiModel());
+    expect(out).toContain('type QueryValue');
+    expect(out).toContain('function __buildUrl(');
+    expect(out).toContain('async function __request<T>(');
+    expect(out).toContain('async function readError(');
+    expect(out).toContain('class ApiError extends Error');
+  });
+});
+
+describe('emitModules — writer-facing module interface', () => {
+  it('exposes the http module (runtime + auth helpers exported) and the endpoints', () => {
+    const m = emitModules(apiModel({ services: [{ name: 'Default', operations: [operation()] }] }));
+    expect(m.http).toContain('export function __buildUrl(');
+    expect(m.http).toContain('export async function __request<T>(');
+    expect(m.operations).toContain('export async function op(');
+  });
+
+  it('reports hasSchemas and fills the schemas module from the model types', () => {
+    const withSchemas = emitModules(
+      apiModel({ schemas: [namedSchema('Foo', { kind: 'scalar', scalar: 'string' })] })
+    );
+    expect(withSchemas.hasSchemas).toBe(true);
+    expect(withSchemas.schemas).toContain('export type Foo = string;');
+
+    const noSchemas = emitModules(apiModel({ schemas: [] }));
+    expect(noSchemas.hasSchemas).toBe(false);
+  });
+
+  it('renderEndpoints renders a named subset; endpointImports wires the shared modules', () => {
+    const m = emitModules(
+      apiModel({
+        services: [
+          {
+            name: 'Default',
+            operations: [
+              operation({
+                name: 'getPet',
+                path: '/pets/{id}',
+                pathParams: [param('id', 'path', true)],
+                successResponses: [
+                  {
+                    contentType: 'application/json',
+                    schema: { kind: 'ref', name: 'Pet' },
+                    status: 200,
+                  },
+                ],
+              }),
+            ],
+          },
+        ],
+      })
+    );
+    const ops = [
+      operation({
+        name: 'getPet',
+        path: '/pets/{id}',
+        pathParams: [param('id', 'path', true)],
+        successResponses: [
+          { contentType: 'application/json', schema: { kind: 'ref', name: 'Pet' }, status: 200 },
+        ],
+      }),
+    ];
+    expect(m.renderEndpoints(ops, 'PetsService')).toContain('export async function getPet(');
+    const imports = m.endpointImports(ops, 'client');
+    expect(imports).toContain('from "./client.http.js"');
+    expect(imports).toContain('import type { Pet } from "./client.schemas.js";');
+    // `prefix` reaches one folder up for the tags-split layout.
+    expect(m.endpointImports(ops, 'client', '../')).toContain('from "../client.http.js"');
+  });
+
+  it('publicReexport re-exports the public runtime values and config types', () => {
+    const m = emitModules(apiModel());
+    const reexport = m.publicReexport('client');
+    expect(reexport).toContain(
+      'export { ApiError, configure, setBaseUrl } from "./client.http.js";'
+    );
+    expect(reexport).toContain('export type {');
+  });
+});
+
+describe('SSE plumbing (single + multi-file)', () => {
+  it('emitSingleFile emits the __sse runtime block and the sse aggregate for an SSE op', () => {
+    const out = emitSingleFile(sseModel());
+    expect(out).toContain('async function* __sse');
+    expect(out).toContain('export const sse =');
+  });
+
+  it('emitSingleFile omits __sse and the sse aggregate when no op streams', () => {
+    const out = emitSingleFile(
+      apiModel({ services: [{ name: 'Default', operations: [operation()] }] })
+    );
+    expect(out).not.toContain('async function* __sse');
+    expect(out).not.toContain('export const sse =');
+  });
+
+  it('emitModules http exports the __sse generator for an SSE model', () => {
+    const m = emitModules(sseModel());
+    expect(m.http).toContain('export async function* __sse');
+  });
+
+  it('publicReexport re-exports ServerSentEvent + SseOptions only for an SSE model', () => {
+    const sse = emitModules(sseModel()).publicReexport('client');
+    const typeLine = sse.split('\n').find((l) => l.startsWith('export type {')) ?? '';
+    expect(typeLine).toContain('ServerSentEvent');
+    expect(typeLine).toContain('SseOptions');
+
+    const plain = emitModules(apiModel()).publicReexport('client');
+    expect(plain).not.toContain('ServerSentEvent');
+    expect(plain).not.toContain('SseOptions');
+  });
+
+  it('endpointImports pulls __sse (value) + ServerSentEvent/SseOptions (types) + the event type', () => {
+    const ops = [sseOperation()];
+    const imports = emitModules(sseModel()).endpointImports(ops, 'client');
+    expect(imports).toContain('__sse');
+    expect(imports).toContain('type ServerSentEvent');
+    expect(imports).toContain('type SseOptions');
+    // The streamed event schema is imported from the schemas module.
+    expect(imports).toContain('import type { Message } from "./client.schemas.js";');
+    // An SSE-only file never references the regular request terminal or RequestOptions.
+    expect(imports).not.toMatch(/\b__request\b/);
+    expect(imports).not.toContain('RequestOptions');
+  });
+
+  it('a regular-only endpoints file imports no SSE symbols', () => {
+    const ops = [
+      operation({
+        name: 'getPet',
+        path: '/pets/{id}',
+        pathParams: [param('id', 'path', true)],
+        successResponses: [
+          { contentType: 'application/json', schema: { kind: 'ref', name: 'Pet' }, status: 200 },
+        ],
+      }),
+    ];
+    const imports = emitModules(sseModel()).endpointImports(ops, 'client');
+    expect(imports).not.toMatch(/\b__sse\b/);
+    expect(imports).not.toContain('ServerSentEvent');
+    expect(imports).not.toContain('SseOptions');
+  });
+});
+
+describe('query-auth + TokenProvider threading', () => {
+  const queryAuthModel = apiModel({
+    securitySchemes: [{ kind: 'apiKeyQuery', key: 'ApiKeyQuery', paramName: 'api_key' }],
+    services: [
+      {
+        name: 'Default',
+        operations: [operation({ name: 'ping', path: '/p', security: ['ApiKeyQuery'] })],
+      },
+    ],
+  });
+
+  it('emitSingleFile merges __a.query into the URL for an apiKey-query op (end-to-end)', () => {
+    const out = emitSingleFile(queryAuthModel, {});
+    expect(out).toContain('...__a.query');
+    expect(out).toContain('export type TokenProvider');
+    expect(out).toContain('export function setApiKey(');
+  });
+
+  it('publicReexport type list includes TokenProvider; value list includes setBearer', () => {
+    const bearerModel = apiModel({
+      securitySchemes: [{ kind: 'bearer', key: 'Bearer' }],
+    });
+    const reexport = emitModules(bearerModel, {}).publicReexport('client');
+    const valueLine = reexport.split('\n').find((l) => l.startsWith('export {')) ?? '';
+    const typeLine = reexport.split('\n').find((l) => l.startsWith('export type {')) ?? '';
+    expect(valueLine).toContain('setBearer');
+    expect(typeLine).toContain('TokenProvider');
+  });
+
+  it('publicReexport value list includes setBasicAuth + apiKey setters across all in', () => {
+    const mixed = apiModel({
+      securitySchemes: [
+        { kind: 'basic', key: 'Basic' },
+        { kind: 'apiKeyQuery', key: 'Q', paramName: 'q' },
+        { kind: 'apiKeyCookie', key: 'C', cookieName: 'c' },
+      ],
+    });
+    const reexport = emitModules(mixed, {}).publicReexport('client');
+    const valueLine = reexport.split('\n').find((l) => l.startsWith('export {')) ?? '';
+    const typeLine = reexport.split('\n').find((l) => l.startsWith('export type {')) ?? '';
+    expect(valueLine).toContain('setBasicAuth');
+    // Two apiKey schemes of distinct `in` → distinct setters.
+    expect(valueLine).toMatch(/setApiKey\w+/);
+    expect(typeLine).toContain('TokenProvider');
+  });
+
+  it('renderEndpoints threads queryAuthKeys into the per-tag endpoint render', () => {
+    const m = emitModules(queryAuthModel, {});
+    const ops = [operation({ name: 'ping', path: '/p', security: ['ApiKeyQuery'] })];
+    expect(m.renderEndpoints(ops, 'PingService')).toContain('...__a.query');
+  });
+});
+
+describe('errorMode threading', () => {
+  const resultModel = apiModel({
+    services: [{ name: 'Default', operations: [operation({ name: 'ping', path: '/p' })] }],
+  });
+
+  it('emitSingleFile honors errorMode: result in runtime + operations', () => {
+    const out = emitSingleFile(resultModel, { errorMode: 'result' });
+    expect(out).toContain('__requestResult');
+    expect(out).toContain('export type Result<');
+    expect(out).toContain('Promise<Result<');
+  });
+
+  it('emitSingleFile defaults to throw mode (no result surface)', () => {
+    const out = emitSingleFile(resultModel, {});
+    expect(out).not.toContain('__requestResult');
+    expect(out).not.toContain('export type Result<');
+    expect(out).not.toContain('Promise<Result<');
+  });
+
+  it('emitModules publicReexport re-exports Result only in result mode', () => {
+    const reexportLine = (out: string) =>
+      out.split('\n').find((l) => l.startsWith('export type {')) ?? '';
+
+    const result = emitModules(resultModel, { errorMode: 'result' }).publicReexport('client');
+    expect(reexportLine(result)).toContain('Result');
+
+    const thrown = emitModules(resultModel, {}).publicReexport('client');
+    expect(reexportLine(thrown)).not.toContain('Result');
+  });
+
+  it('renderEndpoints emits result-mode operations (the per-tag layout path)', () => {
+    const m = emitModules(resultModel, { errorMode: 'result' });
+    const ops = [operation({ name: 'ping', path: '/p' })];
+    const out = m.renderEndpoints(ops, 'PingService');
+    expect(out).toContain('__requestResult<');
+    expect(out).toContain('Promise<Result<');
+    expect(out).not.toContain('__request<');
+  });
+
+  it('endpointImports pulls __requestResult in result mode, __request in throw mode', () => {
+    const ops = [operation({ name: 'ping', path: '/p' })];
+
+    const result = emitModules(resultModel, { errorMode: 'result' });
+    const resultImports = result.endpointImports(ops, 'client');
+    expect(resultImports).toContain('__requestResult');
+    expect(resultImports).not.toContain('__request,');
+    expect(resultImports).not.toMatch(/\b__request\b(?!Result)/);
+    // Result-mode signatures reference `Result<…>`, so the endpoints file must
+    // import the type from the http module.
+    expect(resultImports).toContain('type Result');
+
+    const thrown = emitModules(resultModel, {});
+    const thrownImports = thrown.endpointImports(ops, 'client');
+    expect(thrownImports).toMatch(/\b__request\b/);
+    expect(thrownImports).not.toContain('__requestResult');
+    expect(thrownImports).not.toContain('type Result');
+  });
+
+  it('endpointImports imports error-body schemas only in result mode', () => {
+    // An op whose only named-schema reference is in its error response.
+    const ops = [
+      operation({
+        name: 'ping',
+        path: '/p',
+        errorResponses: [
+          {
+            contentType: 'application/json',
+            schema: { kind: 'ref', name: 'Problem' },
+            status: 200,
+          },
+        ],
+      }),
+    ];
+
+    // Result mode names the error body (`PingError = Problem`), so it imports `Problem`.
+    expect(
+      emitModules(resultModel, { errorMode: 'result' }).endpointImports(ops, 'client')
+    ).toContain('Problem');
+    // Throw mode never names the error body — importing it would trip `noUnusedLocals`.
+    expect(emitModules(resultModel, {}).endpointImports(ops, 'client')).not.toContain('Problem');
+  });
+});
+
+describe('multipart serialization helper (#5)', () => {
+  const uploadModel = apiModel({
+    services: [
+      {
+        name: 'Default',
+        operations: [
+          operation({
+            name: 'upload',
+            method: 'post',
+            requestBody: {
+              contentType: 'multipart/form-data',
+              required: true,
+              schema: {
+                kind: 'object',
+                properties: [
+                  {
+                    name: 'file',
+                    schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'binary' } },
+                    required: true,
+                  },
+                ],
+              },
+            },
+          }),
+        ],
+      },
+    ],
+  });
+
+  it('emits __toFormData when an operation has a typed multipart body', () => {
+    expect(emitSingleFile(uploadModel)).toContain('function __toFormData');
+  });
+
+  it('omits __toFormData when no operation needs it', () => {
+    expect(emitSingleFile(apiModel())).not.toContain('__toFormData');
+  });
+
+  it('imports __toFormData into the endpoints module in multi-file output', () => {
+    const ops = uploadModel.services[0].operations;
+    // The call site lives in the endpoints module; the helper in the http module — so a
+    // multipart op must pull `__toFormData` across the module boundary (else TS2552).
+    expect(emitModules(uploadModel, {}).endpointImports(ops, 'client')).toContain('__toFormData');
+    // A non-multipart op must NOT import it (noUnusedLocals).
+    const plain = apiModel({
+      services: [{ name: 'Default', operations: [operation({ name: 'ping' })] }],
+    });
+    expect(
+      emitModules(plain, {}).endpointImports(plain.services[0].operations, 'client')
+    ).not.toContain('__toFormData');
+  });
+});
diff --git a/packages/openapi-typescript/src/emitters/__tests__/faker.test.ts b/packages/openapi-typescript/src/emitters/__tests__/faker.test.ts
new file mode 100644
index 0000000000..ef7fa36e18
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/__tests__/faker.test.ts
@@ -0,0 +1,333 @@
+import type { NamedSchemaModel, SchemaModel } from '../../ir/model.js';
+import { fakerExpression } from '../faker.js';
+import { printNodes } from '../ts.js';
+
+/** Emit `schema`'s faker expression and print it to source for substring assertions. */
+function emit(
+  schema: SchemaModel,
+  schemas: NamedSchemaModel[] = [],
+  dateType?: 'string' | 'Date'
+): string {
+  return printNodes([fakerExpression(schema, schemas, { dateType })]);
+}
+
+describe('fakerExpression', () => {
+  it('maps a boolean scalar to faker.datatype.boolean()', () => {
+    expect(emit({ kind: 'scalar', scalar: 'boolean' })).toContain('faker.datatype.boolean()');
+  });
+
+  it('maps an integer scalar to faker.number.int()', () => {
+    expect(emit({ kind: 'scalar', scalar: 'integer' })).toBe('faker.number.int()');
+  });
+
+  it('passes { min, max } to faker.number.int when bounds are present', () => {
+    const out = emit({ kind: 'scalar', scalar: 'integer', metadata: { minimum: 1, maximum: 9 } });
+    expect(out).toContain('faker.number.int(');
+    expect(out).toContain('min: 1');
+    expect(out).toContain('max: 9');
+  });
+
+  it('maps a number scalar to faker.number.float(), respecting bounds', () => {
+    expect(emit({ kind: 'scalar', scalar: 'number' })).toBe('faker.number.float()');
+    const out = emit({ kind: 'scalar', scalar: 'number', metadata: { minimum: 0, maximum: 1 } });
+    expect(out).toContain('faker.number.float(');
+    expect(out).toContain('min: 0');
+    expect(out).toContain('max: 1');
+  });
+
+  it('maps string formats to the matching faker call', () => {
+    const str = (format: string) =>
+      emit({ kind: 'scalar', scalar: 'string', metadata: { format } });
+    expect(str('email')).toBe('faker.internet.email()');
+    expect(str('uuid')).toBe('faker.string.uuid()');
+    expect(str('uri')).toBe('faker.internet.url()');
+    expect(str('url')).toBe('faker.internet.url()');
+    expect(str('hostname')).toBe('faker.internet.domainName()');
+    expect(str('ipv4')).toBe('faker.internet.ipv4()');
+  });
+
+  it('maps date-time/date to faker.date.recent() honoring dateType', () => {
+    const dt = { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } } as const;
+    const d = { kind: 'scalar', scalar: 'string', metadata: { format: 'date' } } as const;
+    expect(emit(dt, [], 'Date')).toBe('faker.date.recent()');
+    expect(emit(dt, [], 'string')).toBe('faker.date.recent().toISOString()');
+    expect(emit(d, [], 'Date')).toBe('faker.date.recent()');
+    expect(emit(d, [], 'string')).toBe('faker.date.recent().toISOString().slice(0, 10)');
+  });
+
+  it('maps a binary field to new Blob([]) (faker cannot make a Blob)', () => {
+    expect(emit({ kind: 'scalar', scalar: 'string', metadata: { format: 'binary' } })).toBe(
+      'new Blob([])'
+    );
+  });
+
+  it('falls back to faker.lorem.word() for a plain string', () => {
+    expect(emit({ kind: 'scalar', scalar: 'string' })).toBe('faker.lorem.word()');
+  });
+
+  it('maps an enum to faker.helpers.arrayElement([...] as const)', () => {
+    const out = emit({ kind: 'enum', scalar: 'string', values: ['a', 'b'] });
+    expect(out).toContain('faker.helpers.arrayElement(');
+    expect(out).toContain('"a"');
+    expect(out).toContain('"b"');
+    expect(out).toContain('as const');
+  });
+
+  it('emits a literal value as-is (a const cannot be randomized)', () => {
+    expect(emit({ kind: 'literal', value: 'fixed' })).toBe('"fixed"');
+    expect(emit({ kind: 'literal', value: 42 })).toBe('42');
+    expect(emit({ kind: 'literal', value: -3 })).toBe('-3');
+    expect(emit({ kind: 'literal', value: true })).toBe('true');
+  });
+
+  it('maps an array to faker.helpers.multiple(() => <item>, { count: 1 })', () => {
+    const out = emit({ kind: 'array', items: { kind: 'scalar', scalar: 'boolean' } });
+    expect(out).toContain('faker.helpers.multiple(');
+    expect(out).toContain('faker.datatype.boolean()');
+    expect(out).toContain('count: 1');
+  });
+
+  it('maps an object to an object literal of per-property faker exprs', () => {
+    const out = emit({
+      kind: 'object',
+      properties: [
+        { name: 'id', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
+        { name: 'x-h', schema: { kind: 'scalar', scalar: 'string' }, required: true },
+      ],
+    });
+    expect(out).toContain('id: faker.number.int()');
+    expect(out).toContain('"x-h": faker.lorem.word()');
+  });
+
+  it('maps a record to { key: <value expr> }', () => {
+    const out = emit({ kind: 'record', value: { kind: 'scalar', scalar: 'boolean' } });
+    expect(out).toContain('key: faker.datatype.boolean()');
+  });
+
+  it('uses the first member of a union', () => {
+    const out = emit({
+      kind: 'union',
+      members: [
+        { kind: 'scalar', scalar: 'boolean' },
+        { kind: 'scalar', scalar: 'integer' },
+      ],
+    });
+    expect(out).toBe('faker.datatype.boolean()');
+  });
+
+  it('emits null for an empty union', () => {
+    expect(emit({ kind: 'union', members: [] })).toBe('null');
+  });
+
+  it('merges object members of an intersection', () => {
+    const out = emit({
+      kind: 'intersection',
+      members: [
+        {
+          kind: 'object',
+          properties: [
+            { name: 'a', schema: { kind: 'scalar', scalar: 'boolean' }, required: true },
+          ],
+        },
+        {
+          kind: 'object',
+          properties: [
+            { name: 'b', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
+          ],
+        },
+        // a non-object member contributes nothing
+        { kind: 'scalar', scalar: 'string' },
+      ],
+    });
+    expect(out).toContain('a: faker.datatype.boolean()');
+    expect(out).toContain('b: faker.number.int()');
+    expect(out).not.toContain('faker.lorem.word()');
+  });
+
+  it('resolves a ref and inlines its faker expr', () => {
+    const schemas: NamedSchemaModel[] = [
+      {
+        name: 'Pet',
+        schema: {
+          kind: 'object',
+          properties: [
+            { name: 'id', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
+          ],
+        },
+      },
+    ];
+    const out = emit({ kind: 'ref', name: 'Pet' }, schemas);
+    expect(out).toContain('id: faker.number.int()');
+    // Inlined — NOT a createPet() factory call (that would infinitely recurse on cycles).
+    expect(out).not.toContain('createPet');
+  });
+
+  it('emits null for an unresolvable ref', () => {
+    expect(emit({ kind: 'ref', name: 'Missing' }, [])).toBe('null');
+  });
+
+  it('terminates a cyclic ref with null', () => {
+    const schemas: NamedSchemaModel[] = [
+      {
+        name: 'Node',
+        schema: {
+          kind: 'object',
+          properties: [
+            { name: 'value', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
+            { name: 'next', schema: { kind: 'ref', name: 'Node' }, required: true },
+          ],
+        },
+      },
+    ];
+    const out = emit({ kind: 'ref', name: 'Node' }, schemas);
+    expect(out).toContain('value: faker.number.int()');
+    expect(out).toContain('next: null');
+  });
+
+  it('terminates a cyclic ref behind an ARRAY with an empty array (a valid `T[]`, not `[null]`)', () => {
+    const schemas: NamedSchemaModel[] = [
+      {
+        name: 'Category',
+        schema: {
+          kind: 'object',
+          properties: [
+            { name: 'id', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
+            {
+              name: 'children',
+              schema: { kind: 'array', items: { kind: 'ref', name: 'Category' } },
+              required: true,
+            },
+          ],
+        },
+      },
+    ];
+    const out = emit({ kind: 'ref', name: 'Category' }, schemas);
+    expect(out).toContain('children: []');
+    expect(out).not.toContain('null');
+  });
+
+  it('terminates a cyclic ref behind an OPTIONAL property by omitting it', () => {
+    const schemas: NamedSchemaModel[] = [
+      {
+        name: 'Node',
+        schema: {
+          kind: 'object',
+          properties: [
+            { name: 'value', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
+            { name: 'next', schema: { kind: 'ref', name: 'Node' }, required: false },
+          ],
+        },
+      },
+    ];
+    const out = emit({ kind: 'ref', name: 'Node' }, schemas);
+    expect(out).toContain('value: faker.number.int()');
+    expect(out).not.toContain('next');
+  });
+
+  it('terminates a cyclic ref behind a RECORD with an empty object', () => {
+    const schemas: NamedSchemaModel[] = [
+      {
+        name: 'Tree',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'nodes',
+              schema: { kind: 'record', value: { kind: 'ref', name: 'Tree' } },
+              required: true,
+            },
+          ],
+        },
+      },
+    ];
+    const out = emit({ kind: 'ref', name: 'Tree' }, schemas);
+    expect(out).toContain('nodes: {}');
+    expect(out).not.toContain('null');
+  });
+
+  it('resolves a self-referential union with no inhabitable member to null', () => {
+    const schemas: NamedSchemaModel[] = [
+      { name: 'A', schema: { kind: 'union', members: [{ kind: 'ref', name: 'A' }] } },
+    ];
+    expect(emit({ kind: 'ref', name: 'A' }, schemas)).toBe('null');
+  });
+
+  it('builds an omit as the base faker expr minus the dropped keys', () => {
+    const schemas: NamedSchemaModel[] = [
+      {
+        name: 'Pet',
+        schema: {
+          kind: 'object',
+          properties: [
+            { name: 'id', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
+            { name: 'name', schema: { kind: 'scalar', scalar: 'string' }, required: true },
+          ],
+        },
+      },
+    ];
+    const out = emit({ kind: 'omit', base: 'Pet', keys: ['id'] }, schemas);
+    expect(out).toContain('name: faker.lorem.word()');
+    expect(out).not.toContain('id:');
+  });
+
+  it('emits null for an omit whose base is unresolvable', () => {
+    expect(emit({ kind: 'omit', base: 'Missing', keys: [] }, [])).toBe('null');
+  });
+
+  it('emits the base expr unchanged for an omit whose base is not an object', () => {
+    const schemas: NamedSchemaModel[] = [
+      { name: 'Name', schema: { kind: 'scalar', scalar: 'string' } },
+    ];
+    expect(emit({ kind: 'omit', base: 'Name', keys: ['x'] }, schemas)).toBe('faker.lorem.word()');
+  });
+
+  it('emits null for null and unknown schemas', () => {
+    expect(emit({ kind: 'null' })).toBe('null');
+    expect(emit({ kind: 'unknown' })).toBe('null');
+  });
+
+  it('ignores example/default (faker mode generates data)', () => {
+    const out = emit({ kind: 'scalar', scalar: 'string', metadata: { example: 'ignored' } });
+    expect(out).toBe('faker.lorem.word()');
+  });
+
+  it('defaults dateType to string when opts is omitted', () => {
+    const out = printNodes([
+      fakerExpression({ kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } }, []),
+    ]);
+    expect(out).toBe('faker.date.recent().toISOString()');
+  });
+
+  it('renders boolean enum values as literals', () => {
+    const out = emit({ kind: 'enum', scalar: 'boolean', values: [true, false] });
+    expect(out).toContain('true');
+    expect(out).toContain('false');
+  });
+
+  it('drops a quoted (non-identifier) key from an omit', () => {
+    const schemas: NamedSchemaModel[] = [
+      {
+        name: 'Trace',
+        schema: {
+          kind: 'object',
+          properties: [
+            { name: 'x-id', schema: { kind: 'scalar', scalar: 'string' }, required: true },
+            { name: 'ok', schema: { kind: 'scalar', scalar: 'boolean' }, required: true },
+          ],
+        },
+      },
+    ];
+    const out = emit({ kind: 'omit', base: 'Trace', keys: ['x-id'] }, schemas);
+    expect(out).not.toContain('x-id');
+    expect(out).toContain('ok: faker.datatype.boolean()');
+  });
+
+  it('still honors a binary type-demand over an example', () => {
+    const out = emit({
+      kind: 'scalar',
+      scalar: 'string',
+      metadata: { format: 'binary', example: 'ignored' },
+    });
+    expect(out).toBe('new Blob([])');
+  });
+});
diff --git a/packages/openapi-typescript/src/emitters/__tests__/fixtures.ts b/packages/openapi-typescript/src/emitters/__tests__/fixtures.ts
new file mode 100644
index 0000000000..c83fec463f
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/__tests__/fixtures.ts
@@ -0,0 +1,69 @@
+import type {
+  ApiModel,
+  NamedSchemaModel,
+  OperationModel,
+  ParamModel,
+  ResponseBodyModel,
+  SchemaModel,
+} from '../../ir/model.js';
+import { emitSingleFile } from '../client.js';
+
+/** A plain `string` scalar — the default schema for params and the most-reused leaf. */
+export const SCALAR: SchemaModel = { kind: 'scalar', scalar: 'string' };
+
+/** A minimal valid `ApiModel`; spread `overrides` to vary one facet per test. */
+export function apiModel(overrides: Partial<ApiModel> = {}): ApiModel {
+  return {
+    title: 'T',
+    version: '1.0.0',
+    baseUrl: 'https://api.example.com',
+    services: [{ name: 'Default', operations: [] }],
+    schemas: [],
+    securitySchemes: [],
+    ...overrides,
+  };
+}
+
+export function namedSchema(
+  name: string,
+  schema: SchemaModel,
+  description?: string
+): NamedSchemaModel {
+  return { name, schema, description };
+}
+
+/** A minimal `GET /p` operation; spread `overrides` to add params, a body, responses, etc. */
+export function operation(overrides: Partial<OperationModel> = {}): OperationModel {
+  return {
+    name: 'op',
+    method: 'get',
+    path: '/p',
+    pathParams: [],
+    queryParams: [],
+    headerParams: [],
+    successResponses: [],
+    errorResponses: [],
+    security: [],
+    tags: [],
+    ...overrides,
+  };
+}
+
+export function param(
+  name: string,
+  loc: ParamModel['in'],
+  required = false,
+  schema: SchemaModel = SCALAR
+): ParamModel {
+  return { name, in: loc, schema, required };
+}
+
+/** A JSON `ResponseBodyModel`, defaulting to `status: 200`; spread to vary status/schema. */
+export function response(overrides: Partial<ResponseBodyModel> = {}): ResponseBodyModel {
+  return { contentType: 'application/json', schema: SCALAR, status: 200, ...overrides };
+}
+
+/** Emit a single-file client whose only operation is `operation(op)`. */
+export function emitWithOp(op: Partial<OperationModel>): string {
+  return emitSingleFile(apiModel({ services: [{ name: 'Default', operations: [operation(op)] }] }));
+}
diff --git a/packages/openapi-typescript/src/emitters/__tests__/identifier.test.ts b/packages/openapi-typescript/src/emitters/__tests__/identifier.test.ts
new file mode 100644
index 0000000000..0aeee91550
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/__tests__/identifier.test.ts
@@ -0,0 +1,58 @@
+import { isIdentifier, safeIdent, uniqueIdent } from '../identifier.js';
+
+describe('isIdentifier', () => {
+  it('accepts valid identifiers (letters, _, $, digits after the first char)', () => {
+    expect(isIdentifier('foo')).toBe(true);
+    expect(isIdentifier('_foo')).toBe(true);
+    expect(isIdentifier('$foo')).toBe(true);
+    expect(isIdentifier('foo123')).toBe(true);
+  });
+
+  it('rejects names that are not valid identifiers', () => {
+    expect(isIdentifier('foo-bar')).toBe(false);
+    expect(isIdentifier('2fa')).toBe(false);
+    expect(isIdentifier('has space')).toBe(false);
+    expect(isIdentifier('')).toBe(false);
+  });
+});
+
+describe('safeIdent', () => {
+  it('returns a valid, non-reserved name bare', () => {
+    expect(safeIdent('limit')).toBe('limit');
+  });
+
+  it('quotes a reserved word (a bare reserved word would not be a usable key)', () => {
+    expect(safeIdent('default')).toBe('"default"');
+  });
+
+  it('quotes a name that is not a valid identifier', () => {
+    expect(safeIdent('X-Request-Id')).toBe('"X-Request-Id"');
+  });
+});
+
+describe('uniqueIdent', () => {
+  it('keeps a clean identifier unchanged and records it', () => {
+    const used = new Set<string>();
+    expect(uniqueIdent('orderId', used)).toBe('orderId');
+    expect(used.has('orderId')).toBe(true);
+  });
+
+  it('replaces non-identifier characters with underscores', () => {
+    expect(uniqueIdent('pet-id', new Set())).toBe('pet_id');
+  });
+
+  it('prefixes a leading digit with an underscore', () => {
+    expect(uniqueIdent('2fa', new Set())).toBe('_2fa');
+  });
+
+  it('prefixes a reserved word with an underscore', () => {
+    expect(uniqueIdent('new', new Set())).toBe('_new');
+  });
+
+  it('suffixes collisions with an incrementing counter', () => {
+    const used = new Set<string>();
+    expect(uniqueIdent('a.b', used)).toBe('a_b');
+    expect(uniqueIdent('a-b', used)).toBe('a_b_2');
+    expect(uniqueIdent('a b', used)).toBe('a_b_3');
+  });
+});
diff --git a/packages/openapi-typescript/src/emitters/__tests__/mock.test.ts b/packages/openapi-typescript/src/emitters/__tests__/mock.test.ts
new file mode 100644
index 0000000000..402b78de34
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/__tests__/mock.test.ts
@@ -0,0 +1,696 @@
+import { renderMockModule } from '../mock.js';
+import { apiModel, namedSchema, operation, param } from './fixtures.js';
+
+describe('renderMockModule', () => {
+  it('emits the msw import, a factory per named schema, and a handlers array', () => {
+    const model = apiModel({
+      schemas: [
+        namedSchema('Pet', {
+          kind: 'object',
+          properties: [
+            { name: 'id', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
+          ],
+        }),
+      ],
+      services: [
+        {
+          name: 'Default',
+          operations: [
+            operation({
+              name: 'getPet',
+              method: 'get',
+              path: '/pets/{petId}',
+              pathParams: [param('petId', 'path', true)],
+              successResponses: [
+                {
+                  contentType: 'application/json',
+                  schema: { kind: 'ref', name: 'Pet' },
+                  status: 200,
+                },
+              ],
+            }),
+          ],
+        },
+      ],
+    });
+    const out = renderMockModule(model, { sdkModule: './client.js' });
+    // The `msw` import is the one hand-written line (single-quoted); everything
+    // else is printer output, which double-quotes strings. A downstream formatter
+    // normalizes both, so assertions track each source's raw form.
+    expect(out).toContain("import { http, HttpResponse } from 'msw';");
+    // The factories reference the generated schema types, so the module type-imports
+    // them from the sdk entry (printer double-quotes the specifier).
+    expect(out).toContain('import type { Pet } from "./client.js";');
+    expect(out).toContain('export function createPet(overrides?: Partial<Pet>): Pet {');
+    expect(out).toContain('id: 0');
+    expect(out).toContain('...overrides');
+    expect(out).toContain('http.get("*/pets/:petId",');
+    expect(out).toContain('HttpResponse.json(createPet(override))');
+    expect(out).toContain('export const handlers = [getPetHandler()];');
+  });
+
+  it('emits a body-less handler for a success response with no content', () => {
+    const model = apiModel({
+      schemas: [],
+      services: [
+        {
+          name: 'Default',
+          operations: [
+            operation({ name: 'ping', method: 'get', path: '/ping', successResponses: [] }),
+          ],
+        },
+      ],
+    });
+    const out = renderMockModule(model, { sdkModule: './client.js' });
+    expect(out).toContain('http.get("*/ping",');
+    expect(out).toContain('new HttpResponse(null, { status: 200 })');
+    expect(out).not.toContain('HttpResponse.json');
+  });
+
+  it('samples an inline (unnamed) success body in place', () => {
+    const model = apiModel({
+      schemas: [],
+      services: [
+        {
+          name: 'Default',
+          operations: [
+            operation({
+              name: 'health',
+              method: 'get',
+              path: '/health',
+              successResponses: [
+                {
+                  contentType: 'application/json',
+                  status: 200,
+                  schema: {
+                    kind: 'object',
+                    properties: [
+                      { name: 'ok', schema: { kind: 'scalar', scalar: 'boolean' }, required: true },
+                    ],
+                  },
+                },
+              ],
+            }),
+          ],
+        },
+      ],
+    });
+    const out = renderMockModule(model, { sdkModule: './client.js' });
+    expect(out).toContain('ok: true');
+    expect(out).not.toContain('create'); // no named factory for an inline body
+    expect(out).toContain('...override');
+  });
+
+  it('prints string, negative-number, array, and null defaults as literals', () => {
+    const model = apiModel({
+      schemas: [
+        namedSchema('Mixed', {
+          kind: 'object',
+          properties: [
+            { name: 'label', schema: { kind: 'scalar', scalar: 'string' }, required: true },
+            {
+              name: 'offset',
+              schema: { kind: 'scalar', scalar: 'integer', metadata: { default: -1 } },
+              required: true,
+            },
+            {
+              name: 'tags',
+              schema: { kind: 'array', items: { kind: 'scalar', scalar: 'string' } },
+              required: true,
+            },
+            { name: 'nothing', schema: { kind: 'null' }, required: true },
+            {
+              name: 'disabled',
+              schema: { kind: 'scalar', scalar: 'boolean', metadata: { example: false } },
+              required: true,
+            },
+          ],
+        }),
+      ],
+      services: [
+        {
+          name: 'Default',
+          operations: [
+            operation({
+              name: 'getMixed',
+              method: 'get',
+              path: '/mixed',
+              successResponses: [
+                {
+                  contentType: 'application/json',
+                  schema: { kind: 'ref', name: 'Mixed' },
+                  status: 200,
+                },
+              ],
+            }),
+          ],
+        },
+      ],
+    });
+    const out = renderMockModule(model, { sdkModule: './client.js' });
+    expect(out).toContain('label: "string"');
+    expect(out).toContain('offset: -1');
+    expect(out).toContain('tags: [');
+    expect(out).toContain('"string"');
+    expect(out).toContain('nothing: null');
+    expect(out).toContain('disabled: false');
+  });
+
+  it('passes a non-object inline body through without an override spread', () => {
+    const model = apiModel({
+      schemas: [],
+      services: [
+        {
+          name: 'Default',
+          operations: [
+            operation({
+              name: 'count',
+              method: 'get',
+              path: '/count',
+              successResponses: [
+                {
+                  contentType: 'application/json',
+                  schema: { kind: 'scalar', scalar: 'integer' },
+                  status: 200,
+                },
+              ],
+            }),
+          ],
+        },
+      ],
+    });
+    const out = renderMockModule(model, { sdkModule: './client.js' });
+    expect(out).toContain('HttpResponse.json(0)');
+    expect(out).not.toContain('...override');
+  });
+
+  it('quotes non-identifier object keys', () => {
+    const model = apiModel({
+      schemas: [
+        namedSchema('Trace', {
+          kind: 'object',
+          properties: [
+            { name: 'x-trace-id', schema: { kind: 'scalar', scalar: 'string' }, required: true },
+          ],
+        }),
+      ],
+      services: [
+        {
+          name: 'Default',
+          operations: [
+            operation({
+              name: 'getTrace',
+              method: 'get',
+              path: '/trace',
+              successResponses: [
+                {
+                  contentType: 'application/json',
+                  schema: { kind: 'ref', name: 'Trace' },
+                  status: 200,
+                },
+              ],
+            }),
+          ],
+        },
+      ],
+    });
+    const out = renderMockModule(model, { sdkModule: './client.js' });
+    expect(out).toContain('"x-trace-id": "string"');
+  });
+
+  it('emits a `format: binary` field as `new Blob([])`, not a "string" literal', () => {
+    const model = apiModel({
+      schemas: [
+        namedSchema('Upload', {
+          kind: 'object',
+          properties: [
+            {
+              name: 'photo',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'binary' } },
+              required: true,
+            },
+          ],
+        }),
+      ],
+      services: [
+        {
+          name: 'Default',
+          operations: [
+            operation({
+              name: 'getUpload',
+              method: 'get',
+              path: '/upload',
+              successResponses: [
+                {
+                  contentType: 'application/json',
+                  schema: { kind: 'ref', name: 'Upload' },
+                  status: 200,
+                },
+              ],
+            }),
+          ],
+        },
+      ],
+    });
+    const out = renderMockModule(model, { sdkModule: './client.js' });
+    expect(out).toContain('photo: new Blob([])');
+    expect(out).not.toContain('photo: "string"');
+  });
+
+  it('casts a union-schema factory body `as <Type>` so the `Partial<Union>` override spread keeps narrowing', () => {
+    const model = apiModel({
+      schemas: [
+        namedSchema('Shape', {
+          kind: 'union',
+          members: [
+            {
+              kind: 'object',
+              properties: [
+                { name: 'kind', schema: { kind: 'literal', value: 'circle' }, required: true },
+                { name: 'r', schema: { kind: 'scalar', scalar: 'number' }, required: true },
+              ],
+            },
+            {
+              kind: 'object',
+              properties: [
+                { name: 'kind', schema: { kind: 'literal', value: 'square' }, required: true },
+                { name: 'side', schema: { kind: 'scalar', scalar: 'number' }, required: true },
+              ],
+            },
+          ],
+        }),
+      ],
+      services: [
+        {
+          name: 'Default',
+          operations: [
+            operation({
+              name: 'getShape',
+              method: 'get',
+              path: '/shape',
+              successResponses: [
+                {
+                  contentType: 'application/json',
+                  schema: { kind: 'ref', name: 'Shape' },
+                  status: 200,
+                },
+              ],
+            }),
+          ],
+        },
+      ],
+    });
+    const out = renderMockModule(model, { sdkModule: './client.js' });
+    expect(out).toContain('export function createShape(overrides?: Partial<Shape>): Shape {');
+    expect(out).toMatch(/\.\.\.overrides\s*\} as Shape/);
+  });
+
+  it('bakes a `format: date-time` field as `new Date(...)` under dateType `Date`', () => {
+    const model = apiModel({
+      schemas: [
+        namedSchema('Event', {
+          kind: 'object',
+          properties: [
+            {
+              name: 'at',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+              required: true,
+            },
+          ],
+        }),
+      ],
+      services: [
+        {
+          name: 'Default',
+          operations: [
+            operation({
+              name: 'getEvent',
+              method: 'get',
+              path: '/event',
+              successResponses: [
+                {
+                  contentType: 'application/json',
+                  schema: { kind: 'ref', name: 'Event' },
+                  status: 200,
+                },
+              ],
+            }),
+          ],
+        },
+      ],
+    });
+    const out = renderMockModule(model, { sdkModule: './client.js', dateType: 'Date' });
+    expect(out).toContain('at: new Date(');
+    expect(out).not.toContain('at: "2024-01-01T00:00:00Z"');
+  });
+
+  it('passes { status: 201 } to HttpResponse.json for a non-200 success', () => {
+    const model = apiModel({
+      schemas: [],
+      services: [
+        {
+          name: 'Default',
+          operations: [
+            operation({
+              name: 'create',
+              method: 'post',
+              path: '/things',
+              successResponses: [
+                {
+                  contentType: 'application/json',
+                  schema: { kind: 'scalar', scalar: 'integer' },
+                  status: 201,
+                },
+              ],
+            }),
+          ],
+        },
+      ],
+    });
+    const out = renderMockModule(model, { sdkModule: './client.js' });
+    expect(out).toContain('HttpResponse.json(0, { status: 201 })');
+  });
+
+  it('omits the status init for a 200 success (byte-identical to the no-status form)', () => {
+    const model = apiModel({
+      schemas: [],
+      services: [
+        {
+          name: 'Default',
+          operations: [
+            operation({
+              name: 'count',
+              method: 'get',
+              path: '/count',
+              successResponses: [
+                {
+                  contentType: 'application/json',
+                  schema: { kind: 'scalar', scalar: 'integer' },
+                  status: 200,
+                },
+              ],
+            }),
+          ],
+        },
+      ],
+    });
+    const out = renderMockModule(model, { sdkModule: './client.js' });
+    expect(out).toContain('HttpResponse.json(0)');
+    expect(out).not.toContain('{ status:');
+  });
+
+  it('emits a body-less response carrying the success status (204)', () => {
+    const model = apiModel({
+      schemas: [],
+      services: [
+        {
+          name: 'Default',
+          operations: [
+            operation({
+              name: 'remove',
+              method: 'delete',
+              path: '/things/{id}',
+              pathParams: [param('id', 'path', true)],
+              successResponses: [
+                { contentType: 'application/json', schema: { kind: 'unknown' }, status: 204 },
+              ],
+            }),
+          ],
+        },
+      ],
+    });
+    const out = renderMockModule(model, { sdkModule: './client.js' });
+    expect(out).toContain('new HttpResponse(null, { status: 204 })');
+    expect(out).not.toContain('HttpResponse.json');
+  });
+
+  it('emits an opt-in error handler typed with the declared status, kept out of `handlers`', () => {
+    const model = apiModel({
+      schemas: [
+        namedSchema('Problem', {
+          kind: 'object',
+          properties: [
+            { name: 'message', schema: { kind: 'scalar', scalar: 'string' }, required: true },
+          ],
+        }),
+      ],
+      services: [
+        {
+          name: 'Default',
+          operations: [
+            operation({
+              name: 'getPet',
+              method: 'get',
+              path: '/pets/{petId}',
+              pathParams: [param('petId', 'path', true)],
+              successResponses: [
+                {
+                  contentType: 'application/json',
+                  schema: { kind: 'ref', name: 'Problem' },
+                  status: 200,
+                },
+              ],
+              errorResponses: [
+                {
+                  contentType: 'application/json',
+                  schema: { kind: 'ref', name: 'Problem' },
+                  status: 404,
+                },
+              ],
+            }),
+          ],
+        },
+      ],
+    });
+    const out = renderMockModule(model, { sdkModule: './client.js' });
+    expect(out).toContain('export const getPetErrorHandler = (status: 404, body?: Problem) =>');
+    expect(out).toContain('http.get("*/pets/:petId", () => HttpResponse.json(body ?? {');
+    expect(out).toContain('{ status })');
+    // The error handler stays opt-in: only the success handler is in the array.
+    expect(out).toContain('export const handlers = [getPetHandler()];');
+    expect(out).not.toContain('getPetErrorHandler()');
+  });
+
+  it('unions multiple declared error statuses', () => {
+    const model = apiModel({
+      schemas: [],
+      services: [
+        {
+          name: 'Default',
+          operations: [
+            operation({
+              name: 'submit',
+              method: 'post',
+              path: '/submit',
+              errorResponses: [
+                {
+                  contentType: 'application/json',
+                  schema: { kind: 'scalar', scalar: 'string' },
+                  status: 404,
+                },
+                {
+                  contentType: 'application/json',
+                  schema: { kind: 'scalar', scalar: 'string' },
+                  status: 422,
+                },
+              ],
+            }),
+          ],
+        },
+      ],
+    });
+    const out = renderMockModule(model, { sdkModule: './client.js' });
+    expect(out).toContain('submitErrorHandler = (status: 404 | 422,');
+  });
+
+  it('widens the error-status union with `number` for a `default` error', () => {
+    const model = apiModel({
+      schemas: [],
+      services: [
+        {
+          name: 'Default',
+          operations: [
+            operation({
+              name: 'submit',
+              method: 'post',
+              path: '/submit',
+              errorResponses: [
+                {
+                  contentType: 'application/json',
+                  schema: { kind: 'scalar', scalar: 'string' },
+                  status: 404,
+                },
+                {
+                  contentType: 'application/json',
+                  schema: { kind: 'scalar', scalar: 'string' },
+                  status: 'default',
+                },
+              ],
+            }),
+          ],
+        },
+      ],
+    });
+    const out = renderMockModule(model, { sdkModule: './client.js' });
+    expect(out).toContain('status: 404 | number');
+  });
+
+  it('unions distinct error body types', () => {
+    const model = apiModel({
+      schemas: [
+        namedSchema('NotFound', {
+          kind: 'object',
+          properties: [
+            { name: 'message', schema: { kind: 'scalar', scalar: 'string' }, required: true },
+          ],
+        }),
+        namedSchema('Invalid', {
+          kind: 'object',
+          properties: [
+            { name: 'field', schema: { kind: 'scalar', scalar: 'string' }, required: true },
+          ],
+        }),
+      ],
+      services: [
+        {
+          name: 'Default',
+          operations: [
+            operation({
+              name: 'submit',
+              method: 'post',
+              path: '/submit',
+              errorResponses: [
+                {
+                  contentType: 'application/json',
+                  schema: { kind: 'ref', name: 'NotFound' },
+                  status: 404,
+                },
+                {
+                  contentType: 'application/json',
+                  schema: { kind: 'ref', name: 'Invalid' },
+                  status: 422,
+                },
+              ],
+            }),
+          ],
+        },
+      ],
+    });
+    const out = renderMockModule(model, { sdkModule: './client.js' });
+    expect(out).toContain('body?: NotFound | Invalid)');
+  });
+
+  it('emits no error handler for an op without error responses', () => {
+    const model = apiModel({
+      schemas: [],
+      services: [
+        {
+          name: 'Default',
+          operations: [
+            operation({
+              name: 'ping',
+              method: 'get',
+              path: '/ping',
+              successResponses: [
+                {
+                  contentType: 'application/json',
+                  schema: { kind: 'scalar', scalar: 'integer' },
+                  status: 200,
+                },
+              ],
+            }),
+          ],
+        },
+      ],
+    });
+    const out = renderMockModule(model, { sdkModule: './client.js' });
+    expect(out).not.toContain('ErrorHandler');
+  });
+
+  it('returns empty string when there are no operations', () => {
+    const model = apiModel({ schemas: [], services: [{ name: 'Default', operations: [] }] });
+    expect(renderMockModule(model, { sdkModule: './client.js' })).toBe('');
+  });
+
+  describe('faker mode', () => {
+    const fakerModel = () =>
+      apiModel({
+        schemas: [
+          namedSchema('Pet', {
+            kind: 'object',
+            properties: [
+              { name: 'id', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
+              { name: 'name', schema: { kind: 'scalar', scalar: 'string' }, required: true },
+            ],
+          }),
+        ],
+        services: [
+          {
+            name: 'Default',
+            operations: [
+              operation({
+                name: 'getPet',
+                method: 'get',
+                path: '/pets/{petId}',
+                pathParams: [param('petId', 'path', true)],
+                successResponses: [
+                  {
+                    contentType: 'application/json',
+                    schema: { kind: 'ref', name: 'Pet' },
+                    status: 200,
+                  },
+                ],
+                errorResponses: [
+                  {
+                    contentType: 'application/json',
+                    schema: { kind: 'ref', name: 'Pet' },
+                    status: 404,
+                  },
+                ],
+              }),
+            ],
+          },
+        ],
+      });
+
+    it('imports faker and uses faker calls in factory bodies', () => {
+      const out = renderMockModule(fakerModel(), { sdkModule: './client.js', mockData: 'faker' });
+      expect(out).toContain("import { faker } from '@faker-js/faker';");
+      expect(out).toContain('id: faker.number.int()');
+      expect(out).toContain('name: faker.lorem.word()');
+      // No baked literals leaked in.
+      expect(out).not.toContain('id: 0');
+      expect(out).not.toContain('name: "string"');
+    });
+
+    it('emits faker.seed(n) once when mockSeed is set', () => {
+      const out = renderMockModule(fakerModel(), {
+        sdkModule: './client.js',
+        mockData: 'faker',
+        mockSeed: 42,
+      });
+      expect(out).toContain('faker.seed(42);');
+      expect(out.match(/faker\.seed\(/g)).toHaveLength(1);
+    });
+
+    it('emits no seed call when mockSeed is absent', () => {
+      const out = renderMockModule(fakerModel(), { sdkModule: './client.js', mockData: 'faker' });
+      expect(out).not.toContain('faker.seed(');
+    });
+
+    it('uses a faker expression for the error-handler fallback body', () => {
+      const out = renderMockModule(fakerModel(), { sdkModule: './client.js', mockData: 'faker' });
+      expect(out).toContain('export const getPetErrorHandler');
+      expect(out).toContain('body ?? {');
+      // The fallback samples the error schema via faker, not a baked literal.
+      expect(out).toMatch(/body \?\? \{[\s\S]*faker\.number\.int\(\)/);
+    });
+
+    it('baked mode (default) emits no faker import or seed call', () => {
+      const out = renderMockModule(fakerModel(), { sdkModule: './client.js' });
+      expect(out).not.toContain('@faker-js/faker');
+      expect(out).not.toContain('faker.');
+      expect(out).toContain('id: 0');
+    });
+  });
+});
diff --git a/packages/openapi-typescript/src/emitters/__tests__/operation-signature.test.ts b/packages/openapi-typescript/src/emitters/__tests__/operation-signature.test.ts
new file mode 100644
index 0000000000..a0cd82f8b3
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/__tests__/operation-signature.test.ts
@@ -0,0 +1,59 @@
+import { operationSignature } from '../operation-signature.js';
+import { operation, param } from './fixtures.js';
+
+describe('operationSignature', () => {
+  it('orders path params by URL-template position and assigns unique identifiers', () => {
+    // Declared out of order; the path dictates order. `a-b` sanitizes to `a_b`.
+    const sig = operationSignature(
+      operation({
+        path: '/x/{second}/y/{a-b}',
+        pathParams: [param('a-b', 'path', true), param('second', 'path', true)],
+      })
+    );
+    expect(sig.pathParams.map((p) => p.param.name)).toEqual(['second', 'a-b']);
+    expect(sig.pathParams.map((p) => p.ident)).toEqual(['second', 'a_b']);
+  });
+
+  it('reports slot presence and hasInputs', () => {
+    const none = operationSignature(operation({ path: '/x', method: 'get' }));
+    expect(none).toMatchObject({
+      hasQuery: false,
+      hasBody: false,
+      hasHeaders: false,
+      hasInputs: false,
+    });
+
+    const all = operationSignature(
+      operation({
+        path: '/x/{id}',
+        pathParams: [param('id', 'path', true)],
+        queryParams: [param('q', 'query', false)],
+        headerParams: [param('h', 'header', false)],
+        requestBody: {
+          contentType: 'application/json',
+          schema: { kind: 'ref', name: 'Body' },
+          required: false,
+        },
+      })
+    );
+    expect(all).toMatchObject({ hasQuery: true, hasBody: true, hasHeaders: true, hasInputs: true });
+  });
+
+  it('marks vars required when any input is required', () => {
+    const required = operationSignature(
+      operation({ path: '/x', queryParams: [param('q', 'query', true)] })
+    );
+    expect(required.varsRequired).toBe(true);
+
+    const optional = operationSignature(
+      operation({ path: '/x', queryParams: [param('q', 'query', false)] })
+    );
+    expect(optional).toMatchObject({ hasInputs: true, varsRequired: false });
+  });
+
+  it('derives the <Op>Variables type name from the (PascalCased) operation name', () => {
+    expect(operationSignature(operation({ name: 'getPet' })).variablesTypeName).toBe(
+      'GetPetVariables'
+    );
+  });
+});
diff --git a/packages/openapi-typescript/src/emitters/__tests__/operations.test.ts b/packages/openapi-typescript/src/emitters/__tests__/operations.test.ts
new file mode 100644
index 0000000000..24aa72b999
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/__tests__/operations.test.ts
@@ -0,0 +1,1888 @@
+import type {
+  OperationModel,
+  RequestBodyModel,
+  ResponseBodyModel,
+  SchemaModel,
+} from '../../ir/model.js';
+import { emitSingleFile } from '../client.js';
+import { renderOperationsBlock, renderOperationsMeta, serviceClassName } from '../operations.js';
+import { SCALAR, apiModel, emitWithOp, namedSchema, operation, param } from './fixtures.js';
+
+describe('serviceClassName', () => {
+  it('PascalCases the label and appends Service', () => {
+    expect(serviceClassName('products')).toBe('ProductsService');
+    expect(serviceClassName('Orders')).toBe('OrdersService');
+  });
+
+  it('produces a valid identifier from non-identifier labels', () => {
+    expect(serviceClassName('pet-store')).toBe('PetStoreService');
+    expect(serviceClassName('default')).toBe('DefaultService');
+    expect(serviceClassName('user accounts')).toBe('UserAccountsService');
+  });
+
+  it('falls back to DefaultService when the label has no identifier chars', () => {
+    expect(serviceClassName('---')).toBe('DefaultService');
+  });
+
+  it('prefixes a leading digit so the result is a valid identifier', () => {
+    expect(serviceClassName('2023-api')).toBe('_2023ApiService');
+  });
+});
+
+describe('renderOperationsBlock — facade seam', () => {
+  const ops = [
+    operation({
+      name: 'getThing',
+      path: '/things/{id}',
+      pathParams: [param('id', 'path', true)],
+    }),
+    operation({ name: 'listThings', path: '/things' }),
+  ];
+
+  it('functions facade emits standalone exported async functions joined by a blank line', () => {
+    const out = renderOperationsBlock(ops, {
+      facade: 'functions',
+      className: 'Ignored',
+    });
+    expect(out).toContain('export async function getThing(');
+    expect(out).toContain('export async function listThings(');
+    expect(out).not.toContain('export class');
+    // className is ignored by the functions facade.
+    expect(out).not.toContain('Ignored');
+  });
+
+  it('functions facade output equals the per-operation join (byte-identical seam)', () => {
+    const block = renderOperationsBlock(ops, {
+      facade: 'functions',
+      className: 'X',
+    });
+    const viaSingle = emitSingleFile(
+      apiModel({ services: [{ name: 'Default', operations: ops }] })
+    );
+    expect(viaSingle).toContain(block);
+  });
+
+  it('service-class facade wraps operations as methods of the named class', () => {
+    const out = renderOperationsBlock(ops, {
+      facade: 'service-class',
+      className: 'ThingsService',
+    });
+    expect(out).toContain('export class ThingsService {');
+    // Methods have no `export`/`function` keywords — they are class members.
+    expect(out).toMatch(/\basync getThing\(/);
+    expect(out).toMatch(/\basync listThings\(/);
+    expect(out).not.toContain('export async function');
+    // The method body calls the runtime via `this.config`.
+    expect(out).toContain('return __request<void>(this.config,');
+  });
+
+  it('service-class emits a chainable use() method that registers middleware on the instance', () => {
+    const out = renderOperationsBlock(ops, {
+      facade: 'service-class',
+      className: 'ThingsService',
+    });
+    expect(out).toContain('use(...middleware: Middleware[]): this {');
+    expect(out).toContain(
+      'this.config.middleware = [...this.config.middleware ?? [], ...middleware];'
+    );
+    expect(out).toContain('return this;');
+  });
+
+  describe('<Op>Result / schema name collision (#9)', () => {
+    const archive = operation({
+      name: 'archive',
+      path: '/pets/{id}/archive',
+      method: 'post',
+      pathParams: [param('id', 'path', true)],
+      // Returns `Pet`; the derived alias name `ArchiveResult` collides with a sibling schema.
+      successResponses: [
+        { contentType: 'application/json', schema: { kind: 'ref', name: 'Pet' }, status: 200 },
+      ],
+    });
+
+    it('suppresses the <Op>Result alias when its name collides with a schema (throw mode)', () => {
+      const out = renderOperationsBlock([archive], {
+        facade: 'functions',
+        className: 'C',
+        schemaNames: new Set(['ArchiveResult']),
+      });
+      expect(out).not.toContain('export type ArchiveResult');
+      // The function still returns the underlying response type.
+      expect(out).toContain('Promise<Pet>');
+    });
+
+    it('inlines the response type in result mode on collision (no resultRef)', () => {
+      const out = renderOperationsBlock([archive], {
+        facade: 'functions',
+        className: 'C',
+        errorMode: 'result',
+        schemaNames: new Set(['ArchiveResult']),
+      });
+      expect(out).not.toContain('export type ArchiveResult');
+      expect(out).toContain('Result<Pet,');
+      expect(out).not.toContain('Result<ArchiveResult,');
+    });
+
+    it('still emits the alias when there is no collision', () => {
+      const out = renderOperationsBlock([archive], {
+        facade: 'functions',
+        className: 'C',
+        schemaNames: new Set(['Pet']),
+      });
+      expect(out).toContain('export type ArchiveResult = Pet;');
+    });
+
+    it('suppresses *Error and inlines the error type on collision (result mode)', () => {
+      const login = operation({
+        name: 'login',
+        method: 'post',
+        successResponses: [
+          {
+            contentType: 'application/json',
+            schema: { kind: 'ref', name: 'Session' },
+            status: 200,
+          },
+        ],
+        errorResponses: [
+          {
+            contentType: 'application/json',
+            schema: { kind: 'ref', name: 'Problem' },
+            status: 200,
+          },
+        ],
+      });
+      const out = renderOperationsBlock([login], {
+        facade: 'functions',
+        className: 'C',
+        errorMode: 'result',
+        schemaNames: new Set(['LoginError']),
+      });
+      expect(out).not.toContain('export type LoginError');
+      // The Result error arg references the schema directly, not the (absent) alias.
+      expect(out).toContain('Result<LoginResult, Problem>');
+    });
+
+    it('suppresses *Params/*Body/*Headers aliases on collision (flat mode inlines them)', () => {
+      const list = operation({
+        name: 'list',
+        method: 'get',
+        queryParams: [param('q', 'query', false)],
+      });
+      const out = renderOperationsBlock([list], {
+        facade: 'functions',
+        className: 'C',
+        schemaNames: new Set(['ListParams']),
+      });
+      expect(out).not.toContain('export type ListParams');
+      // The flat signature still carries an inline params object.
+      expect(out).toMatch(/params\?: \{/);
+    });
+
+    it('suppresses *Variables and inlines it in the grouped signature on collision', () => {
+      const get = operation({
+        name: 'get',
+        method: 'get',
+        path: '/x/{id}',
+        pathParams: [param('id', 'path', true)],
+      });
+      const out = renderOperationsBlock([get], {
+        facade: 'functions',
+        className: 'C',
+        argsStyle: 'grouped',
+        schemaNames: new Set(['GetVariables']),
+      });
+      expect(out).not.toContain('export type GetVariables');
+      expect(out).toContain('vars: {'); // inline object, not a reference to GetVariables
+    });
+
+    it('inlines a *Params prop inside *Variables when *Params collides (grouped)', () => {
+      const list = operation({
+        name: 'list',
+        method: 'get',
+        queryParams: [param('q', 'query', true)],
+      });
+      const out = renderOperationsBlock([list], {
+        facade: 'functions',
+        className: 'C',
+        argsStyle: 'grouped',
+        schemaNames: new Set(['ListParams']),
+      });
+      expect(out).not.toContain('export type ListParams');
+      expect(out).toContain('export type ListVariables'); // Variables itself doesn't collide
+      expect(out).not.toMatch(/params\??: ListParams/); // the prop is inlined, not a ref
+    });
+
+    it('inlines colliding *Body and *Headers props in *Variables (grouped)', () => {
+      const send = operation({
+        name: 'send',
+        method: 'post',
+        requestBody: {
+          contentType: 'application/json',
+          required: true,
+          schema: { kind: 'ref', name: 'Payload' },
+        },
+        headerParams: [param('x-trace', 'header', false)],
+      });
+      const out = renderOperationsBlock([send], {
+        facade: 'functions',
+        className: 'C',
+        argsStyle: 'grouped',
+        schemaNames: new Set(['SendBody', 'SendHeaders']),
+      });
+      expect(out).not.toContain('export type SendBody');
+      expect(out).not.toContain('export type SendHeaders');
+      expect(out).toContain('export type SendVariables'); // inlines body/headers rather than referencing
+      expect(out).toContain('body: Payload;');
+    });
+
+    it('suppresses an SSE op input alias (<Op>Variables) that collides with a schema', () => {
+      const stream = operation({
+        name: 'streamEvents',
+        method: 'get',
+        path: '/events/{id}',
+        pathParams: [param('id', 'path', true)],
+        successResponses: [
+          {
+            contentType: 'text/event-stream',
+            schema: { kind: 'scalar', scalar: 'string' },
+            status: 200,
+          },
+        ],
+      });
+      const out = renderOperationsBlock([stream], {
+        facade: 'functions',
+        className: 'C',
+        schemaNames: new Set(['StreamEventsVariables']),
+      });
+      // SSE input aliases are not exempt from collision handling.
+      expect(out).not.toContain('export type StreamEventsVariables');
+    });
+
+    it('inlines a multi-member error union when *Error collides (result mode)', () => {
+      const op2 = operation({
+        name: 'op2',
+        method: 'post',
+        successResponses: [
+          { contentType: 'application/json', schema: { kind: 'ref', name: 'Ok' }, status: 200 },
+        ],
+        errorResponses: [
+          { contentType: 'application/json', schema: { kind: 'ref', name: 'E1' }, status: 200 },
+          { contentType: 'application/json', schema: { kind: 'ref', name: 'E2' }, status: 200 },
+        ],
+      });
+      const out = renderOperationsBlock([op2], {
+        facade: 'functions',
+        className: 'C',
+        errorMode: 'result',
+        schemaNames: new Set(['Op2Error']),
+      });
+      expect(out).not.toContain('export type Op2Error');
+      expect(out).toContain('Result<Op2Result, E1 | E2>'); // inline union, not the alias
+    });
+  });
+
+  describe('multipart request bodies (#5)', () => {
+    const uploadOp = operation({
+      name: 'upload',
+      method: 'post',
+      requestBody: {
+        contentType: 'multipart/form-data',
+        required: true,
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'file',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'binary' } },
+              required: true,
+            },
+            { name: 'orgId', schema: { kind: 'scalar', scalar: 'string' }, required: true },
+            {
+              name: 'tags',
+              schema: { kind: 'array', items: { kind: 'scalar', scalar: 'string' } },
+              required: false,
+            },
+          ],
+        },
+      },
+    });
+
+    it('emits a typed body (binary→Blob) instead of raw FormData, serialized via __toFormData', () => {
+      const out = renderOperationsBlock([uploadOp], { facade: 'functions', className: 'C' });
+      expect(out).toContain('export type UploadBody = {');
+      expect(out).toContain('file: Blob;');
+      expect(out).toContain('orgId: string;');
+      expect(out).toContain('tags?: string[];');
+      expect(out).not.toContain('UploadBody = FormData');
+      // The typed object is serialized to FormData at the call site.
+      expect(out).toContain('__toFormData(body)');
+    });
+
+    it('falls back to raw FormData when the multipart schema is not an object', () => {
+      const out = renderOperationsBlock(
+        [
+          operation({
+            name: 'rawUpload',
+            method: 'post',
+            requestBody: {
+              contentType: 'multipart/form-data',
+              required: true,
+              schema: { kind: 'unknown' },
+            },
+          }),
+        ],
+        { facade: 'functions', className: 'C' }
+      );
+      expect(out).toContain('export type RawUploadBody = FormData;');
+      expect(out).not.toContain('__toFormData');
+    });
+  });
+
+  it('service-class hoists operation type aliases to module level (before the class)', () => {
+    const out = renderOperationsBlock(ops, {
+      facade: 'service-class',
+      className: 'C',
+    });
+    // `export type` aliases can't live inside a class body — they must precede it.
+    expect(out).toContain('export type GetThingResult');
+    expect(out.indexOf('export type GetThingResult')).toBeLessThan(out.indexOf('export class C {'));
+    // The alias is not re-emitted inside the class body.
+    const classBody = out.slice(out.indexOf('export class C {'));
+    expect(classBody).not.toContain('export type');
+  });
+});
+
+describe("errorMode: 'result' — result shape + typed errors", () => {
+  const okResponse: ResponseBodyModel = {
+    contentType: 'application/json',
+    status: 200,
+    schema: { kind: 'ref', name: 'Pet' },
+  };
+
+  function emitResult(op: Partial<OperationModel>): string {
+    return renderOperationsBlock([operation(op)], {
+      facade: 'functions',
+      className: 'Client',
+      argsStyle: 'flat',
+      errorMode: 'result',
+    });
+  }
+
+  it('emits a *Error alias and a Result-typed signature/body when the op declares an error response', () => {
+    const out = emitResult({
+      name: 'getPet',
+      successResponses: [okResponse],
+      errorResponses: [
+        {
+          contentType: 'application/json',
+          schema: { kind: 'ref', name: 'ProblemDetails' },
+          status: 200,
+        },
+      ],
+    });
+    expect(out).toContain('export type GetPetError = ProblemDetails;');
+    expect(out).toContain('): Promise<Result<GetPetResult, GetPetError>>');
+    expect(out).toContain('return __requestResult<GetPetResult, GetPetError>(');
+  });
+
+  it('falls back to `unknown` (and emits no *Error alias) when the op has no error responses', () => {
+    const out = emitResult({ name: 'getPet', successResponses: [okResponse] });
+    expect(out).not.toContain('GetPetError');
+    expect(out).toContain('): Promise<Result<GetPetResult, unknown>>');
+    expect(out).toContain('return __requestResult<GetPetResult, unknown>(');
+  });
+
+  it('unions multiple error-response body types in the *Error alias', () => {
+    const out = emitResult({
+      name: 'getPet',
+      successResponses: [okResponse],
+      errorResponses: [
+        { contentType: 'application/json', schema: { kind: 'ref', name: 'A' }, status: 200 },
+        { contentType: 'application/json', schema: { kind: 'ref', name: 'B' }, status: 200 },
+      ],
+    });
+    expect(out).toContain('export type GetPetError = A | B;');
+    expect(out).toContain('): Promise<Result<GetPetResult, GetPetError>>');
+  });
+
+  it('dedupes identical error-response body types in the *Error alias', () => {
+    const out = emitResult({
+      name: 'getPet',
+      successResponses: [okResponse],
+      errorResponses: [
+        {
+          contentType: 'application/json',
+          schema: { kind: 'ref', name: 'ProblemDetails' },
+          status: 200,
+        },
+        {
+          contentType: 'application/problem+json',
+          status: 200,
+          schema: { kind: 'ref', name: 'ProblemDetails' },
+        },
+      ],
+    });
+    expect(out).toContain('export type GetPetError = ProblemDetails;');
+    expect(out).not.toContain('ProblemDetails | ProblemDetails');
+  });
+
+  it('also applies under the service-class facade', () => {
+    const out = renderOperationsBlock(
+      [
+        operation({
+          name: 'getPet',
+          successResponses: [okResponse],
+          errorResponses: [
+            {
+              contentType: 'application/json',
+              schema: { kind: 'ref', name: 'ProblemDetails' },
+              status: 200,
+            },
+          ],
+        }),
+      ],
+      { facade: 'service-class', className: 'Client', errorMode: 'result' }
+    );
+    expect(out).toContain('export type GetPetError = ProblemDetails;');
+    expect(out).toContain('): Promise<Result<GetPetResult, GetPetError>>');
+    expect(out).toContain('return __requestResult<GetPetResult, GetPetError>(');
+  });
+
+  it('throw mode (no errorMode) is unchanged: no Result, no *Error, still __request<…>', () => {
+    const out = renderOperationsBlock(
+      [
+        operation({
+          name: 'getPet',
+          successResponses: [okResponse],
+          errorResponses: [
+            {
+              contentType: 'application/json',
+              schema: { kind: 'ref', name: 'ProblemDetails' },
+              status: 200,
+            },
+          ],
+        }),
+      ],
+      { facade: 'functions', className: 'Client', argsStyle: 'flat' }
+    );
+    expect(out).toContain('): Promise<Pet>');
+    expect(out).toContain('return __request<Pet>(');
+    expect(out).not.toContain('Result<');
+    expect(out).not.toContain('__requestResult');
+    expect(out).not.toContain('GetPetError');
+  });
+});
+
+describe('auth — await __auth, spread headers, merge query', () => {
+  const okResponse: ResponseBodyModel = {
+    contentType: 'application/json',
+    status: 200,
+    schema: { kind: 'ref', name: 'Pet' },
+  };
+
+  it('header-auth op awaits __auth, spreads ...__a.headers, leaves the URL unchanged', () => {
+    const out = renderOperationsBlock(
+      [operation({ name: 'getPet', security: ['Bearer'], successResponses: [okResponse] })],
+      { facade: 'functions', className: 'Client', argsStyle: 'flat', queryAuthKeys: new Set() }
+    );
+    expect(out).toContain('const __a = await __auth(["Bearer"], __config);');
+    expect(out).toContain('...__a.headers');
+    expect(out).not.toContain('...__auth(');
+    // No query param + no query auth ⇒ URL call has no third arg.
+    expect(out).toContain('__buildUrl(__config, `/p`)');
+    expect(out).not.toContain('__a.query');
+  });
+
+  it('query-auth op with a query param merges { ...params, ...__a.query } into __buildUrl', () => {
+    const out = renderOperationsBlock(
+      [
+        operation({
+          name: 'listPets',
+          security: ['QueryKey'],
+          queryParams: [param('limit', 'query', false)],
+        }),
+      ],
+      {
+        facade: 'functions',
+        className: 'Client',
+        argsStyle: 'flat',
+        queryAuthKeys: new Set(['QueryKey']),
+      }
+    );
+    expect(out).toContain('const __a = await __auth(["QueryKey"], __config);');
+    expect(out).toContain('__buildUrl(__config, `/p`, { ...params, ...__a.query })');
+  });
+
+  it('query-auth op with no query param passes { ...__a.query } as the third arg', () => {
+    const out = renderOperationsBlock([operation({ name: 'listPets', security: ['QueryKey'] })], {
+      facade: 'functions',
+      className: 'Client',
+      argsStyle: 'flat',
+      queryAuthKeys: new Set(['QueryKey']),
+    });
+    expect(out).toContain('__buildUrl(__config, `/p`, { ...__a.query })');
+  });
+
+  it('grouped args-style merges via vars.params: { ...vars.params, ...__a.query } / { ...__a.query }', () => {
+    const withQuery = renderOperationsBlock(
+      [
+        operation({
+          name: 'listPets',
+          security: ['QueryKey'],
+          queryParams: [param('limit', 'query', false)],
+        }),
+      ],
+      {
+        facade: 'functions',
+        className: 'Client',
+        argsStyle: 'grouped',
+        queryAuthKeys: new Set(['QueryKey']),
+      }
+    );
+    expect(withQuery).toContain('__buildUrl(__config, `/p`, { ...vars.params, ...__a.query })');
+
+    const noQuery = renderOperationsBlock(
+      [operation({ name: 'listPets', security: ['QueryKey'] })],
+      {
+        facade: 'functions',
+        className: 'Client',
+        argsStyle: 'grouped',
+        queryAuthKeys: new Set(['QueryKey']),
+      }
+    );
+    expect(noQuery).toContain('__buildUrl(__config, `/p`, { ...__a.query })');
+  });
+
+  it('composes with errorMode: result — awaits __auth then calls __requestResult', () => {
+    const out = renderOperationsBlock(
+      [
+        operation({
+          name: 'getPet',
+          security: ['Bearer'],
+          successResponses: [okResponse],
+          errorResponses: [
+            {
+              contentType: 'application/json',
+              schema: { kind: 'ref', name: 'ProblemDetails' },
+              status: 200,
+            },
+          ],
+        }),
+      ],
+      {
+        facade: 'functions',
+        className: 'Client',
+        argsStyle: 'flat',
+        errorMode: 'result',
+        queryAuthKeys: new Set(),
+      }
+    );
+    expect(out).toContain('const __a = await __auth(["Bearer"], __config);');
+    expect(out).toContain('...__a.headers');
+    expect(out).toContain('return __requestResult<GetPetResult, GetPetError>(');
+  });
+
+  it('service-class authed method indents the const __a line correctly', () => {
+    const out = renderOperationsBlock(
+      [operation({ name: 'getPet', security: ['Bearer'], successResponses: [okResponse] })],
+      { facade: 'service-class', className: 'Client', queryAuthKeys: new Set() }
+    );
+    // Method body lives one indent level deeper than the function form (4 spaces).
+    expect(out).toContain('    const __a = await __auth(["Bearer"], this.config);');
+    expect(out).toContain('...__a.headers');
+  });
+
+  it('non-authed op emits no __a/__auth and threads the plain runtime call', () => {
+    const out = renderOperationsBlock([operation({ name: 'op' })], {
+      facade: 'functions',
+      className: 'Client',
+      argsStyle: 'flat',
+      queryAuthKeys: new Set(),
+    });
+    expect(out).not.toContain('__a');
+    expect(out).not.toContain('__auth');
+    expect(out).toContain(
+      'return __request<void>(__config, __buildUrl(__config, `/p`), { method: "GET", ...init }, undefined, "void");'
+    );
+  });
+});
+
+describe('renderOperation — argument-list permutations', () => {
+  it('renders an operation with no params, no body, no responses → returns Promise<void>', () => {
+    const out = emitWithOp({});
+    expect(out).toContain('export async function op(');
+    expect(out).toContain('init: RequestOptions = {}');
+    expect(out).toContain('): Promise<void>');
+    expect(out).toContain('{ method: "GET", ...init }');
+    expect(out).toContain('"void"');
+  });
+
+  it('orders path params by their position in the URL template, not in pathParams[]', () => {
+    const out = emitWithOp({
+      path: '/x/{first}/y/{second}',
+      pathParams: [
+        param('second', 'path', true, { kind: 'scalar', scalar: 'number' }),
+        param('first', 'path', true, { kind: 'scalar', scalar: 'string' }),
+      ],
+    });
+    const argLine = out.split('\n').find((l) => l.includes('first: string')) ?? '';
+    expect(argLine).toMatch(/first: string/);
+    expect(out.indexOf('first: string')).toBeLessThan(out.indexOf('second: number'));
+  });
+
+  it('skips path params that are declared but missing from the URL template', () => {
+    const out = emitWithOp({
+      path: '/x',
+      pathParams: [param('ghost', 'path', true)],
+    });
+    expect(out).not.toContain('ghost: string');
+  });
+
+  it('leaves a path template variable with no matching declared pathParam as a literal', () => {
+    // Template references {missing} but the operation declares no path param for it.
+    const out = emitWithOp({ path: '/x/{missing}', pathParams: [] });
+    expect(out).not.toContain('missing:');
+    // No substitution: emitting `encodeURIComponent(String(missing))` would
+    // reference an undeclared variable and break the generated client. The
+    // segment is left literal instead.
+    expect(out).not.toContain('encodeURIComponent(String(missing))');
+    expect(out).toContain('`/x/{missing}`');
+  });
+
+  it('sanitizes a non-identifier path param name into a safe argument + URL ref', () => {
+    // `pet-id` is a legal OpenAPI name but not a usable JS identifier.
+    const out = emitWithOp({
+      path: '/pets/{pet-id}',
+      pathParams: [param('pet-id', 'path', true)],
+    });
+    expect(out).toContain('pet_id: string');
+    expect(out).toContain('${encodeURIComponent(String(pet_id))}');
+    // The quoted form (which would be a syntax error as a parameter) is gone.
+    expect(out).not.toContain('"pet-id": string');
+  });
+
+  it('prefixes a digit-leading path param name with `_`', () => {
+    const out = emitWithOp({
+      path: '/x/{2fa}',
+      pathParams: [param('2fa', 'path', true)],
+    });
+    expect(out).toContain('_2fa: string');
+    expect(out).toContain('${encodeURIComponent(String(_2fa))}');
+  });
+
+  it('prefixes a reserved-word path param name with `_`', () => {
+    const out = emitWithOp({
+      path: '/x/{new}',
+      pathParams: [param('new', 'path', true)],
+    });
+    expect(out).toContain('_new: string');
+    expect(out).toContain('${encodeURIComponent(String(_new))}');
+  });
+
+  it('disambiguates path param names that sanitize to the same identifier', () => {
+    const out = emitWithOp({
+      path: '/x/{a-b}/{a.b}',
+      pathParams: [param('a-b', 'path', true), param('a.b', 'path', true)],
+    });
+    // First wins the base name; the colliding second gets a numeric suffix.
+    expect(out).toContain('a_b: string');
+    expect(out).toContain('a_b_2: string');
+    expect(out).toContain('${encodeURIComponent(String(a_b))}');
+    expect(out).toContain('${encodeURIComponent(String(a_b_2))}');
+  });
+
+  it('emits `params = {}` default when all query params are optional', () => {
+    const out = emitWithOp({
+      queryParams: [param('q', 'query', false), param('r', 'query', false)],
+    });
+    expect(out).toContain('params: {');
+    // All-optional ⇒ the params object arg defaults to `= {}`.
+    expect(out).toMatch(/\} = \{\}/);
+  });
+
+  it('makes `params` required when at least one query param is required', () => {
+    const out = emitWithOp({
+      queryParams: [param('q', 'query', true), param('r', 'query', false)],
+    });
+    // Multi-line layout so per-param JSDoc fits.
+    expect(out).toMatch(/params: \{\n {4}q: string;\n {4}r\?: string;\n\}/);
+    // Required (any required prop) ⇒ no `= {}` default.
+    expect(out).not.toMatch(/params: \{[\s\S]*?\} = \{\}/);
+  });
+
+  it('passes `params` into __buildUrl when query params are present', () => {
+    const out = emitWithOp({ queryParams: [param('q', 'query', true)] });
+    expect(out).toContain('__buildUrl(__config, `/p`, params)');
+  });
+
+  it('default-styled query params get NO 4th styles arg (byte-identical)', () => {
+    // `style: form` + `explode: true` is the OpenAPI default ⇒ no spec entry.
+    const out = emitWithOp({
+      queryParams: [
+        { name: 'q', in: 'query', schema: SCALAR, required: true },
+        { name: 'r', in: 'query', schema: SCALAR, required: false, style: 'form', explode: true },
+      ],
+    });
+    // The call is byte-identical to a plain query op: no 4th styles arg.
+    expect(out).toContain('__buildUrl(__config, `/p`, params)');
+    expect(out).not.toContain('__buildUrl(__config, `/p`, params, {');
+  });
+
+  it('passes a styles spec as the 4th arg for a non-default pipeDelimited+explode:false param', () => {
+    const out = emitWithOp({
+      queryParams: [
+        {
+          name: 'tags',
+          in: 'query',
+          schema: { kind: 'array', items: SCALAR },
+          required: false,
+          style: 'pipeDelimited',
+          explode: false,
+        },
+      ],
+    });
+    expect(out).toContain(
+      '__buildUrl(__config, `/p`, params, { "tags": { style: "pipeDelimited", explode: false } })'
+    );
+  });
+
+  it('explode:false alone (default style) is non-default and emits style "form"', () => {
+    const out = emitWithOp({
+      queryParams: [
+        {
+          name: 'ids',
+          in: 'query',
+          schema: { kind: 'array', items: SCALAR },
+          required: false,
+          explode: false,
+        },
+      ],
+    });
+    expect(out).toContain(
+      '__buildUrl(__config, `/p`, params, { "ids": { style: "form", explode: false } })'
+    );
+  });
+
+  it('allowReserved:true is non-default and emits allowReserved (defaults otherwise)', () => {
+    const out = emitWithOp({
+      queryParams: [
+        { name: 'x', in: 'query', schema: SCALAR, required: false, allowReserved: true },
+      ],
+    });
+    expect(out).toContain(
+      '__buildUrl(__config, `/p`, params, { "x": { style: "form", explode: true, allowReserved: true } })'
+    );
+  });
+
+  it('omits allowReserved when false; only includes non-default params', () => {
+    const out = emitWithOp({
+      queryParams: [
+        { name: 'a', in: 'query', schema: SCALAR, required: false },
+        {
+          name: 'b',
+          in: 'query',
+          schema: { kind: 'array', items: SCALAR },
+          required: false,
+          style: 'spaceDelimited',
+          explode: false,
+          allowReserved: false,
+        },
+      ],
+    });
+    // `b` is the only non-default param; `a` is default (no entry), and
+    // `allowReserved: false` is omitted from `b`'s spec.
+    expect(out).toContain(
+      '__buildUrl(__config, `/p`, params, { "b": { style: "spaceDelimited", explode: false } })'
+    );
+    expect(out).not.toContain('"a":');
+    expect(out).not.toContain('allowReserved:');
+  });
+
+  it('explicit deepObject is non-default and emits a spec entry', () => {
+    const out = emitWithOp({
+      queryParams: [
+        {
+          name: 'filter',
+          in: 'query',
+          schema: { kind: 'object', properties: [] },
+          required: false,
+          style: 'deepObject',
+          explode: true,
+        },
+      ],
+    });
+    expect(out).toContain(
+      '__buildUrl(__config, `/p`, params, { "filter": { style: "deepObject", explode: true } })'
+    );
+  });
+
+  it('composes the styles arg with the query-auth merge as the 4th arg', () => {
+    const out = renderOperationsBlock(
+      [
+        operation({
+          name: 'listPets',
+          security: ['QueryKey'],
+          queryParams: [
+            {
+              name: 'tags',
+              in: 'query',
+              schema: { kind: 'array', items: SCALAR },
+              required: false,
+              style: 'pipeDelimited',
+              explode: false,
+            },
+          ],
+        }),
+      ],
+      {
+        facade: 'functions',
+        className: 'Client',
+        argsStyle: 'flat',
+        queryAuthKeys: new Set(['QueryKey']),
+      }
+    );
+    expect(out).toContain(
+      '__buildUrl(__config, `/p`, { ...params, ...__a.query }, { "tags": { style: "pipeDelimited", explode: false } })'
+    );
+  });
+
+  it('produces `body: T` for required JSON bodies', () => {
+    const body: RequestBodyModel = {
+      contentType: 'application/json',
+      schema: { kind: 'ref', name: 'Pet' },
+      required: true,
+    };
+    const out = emitWithOp({ requestBody: body });
+    expect(out).toContain('body: Pet');
+  });
+
+  it('produces `body?: T` for optional JSON bodies', () => {
+    const body: RequestBodyModel = {
+      contentType: 'application/json',
+      schema: SCALAR,
+      required: false,
+    };
+    const out = emitWithOp({ requestBody: body });
+    expect(out).toContain('body?: string');
+  });
+
+  it('uses raw `FormData` for a multipart body that is not a concrete object', () => {
+    // A typed object multipart body is covered in the `multipart request bodies (#5)` block;
+    // here the schema isn't an object, so the raw FormData escape hatch is kept.
+    const body: RequestBodyModel = {
+      contentType: 'multipart/form-data',
+      schema: { kind: 'unknown' },
+      required: true,
+    };
+    const out = emitWithOp({ requestBody: body });
+    expect(out).toContain('body: FormData');
+  });
+
+  it('uses `URLSearchParams` for urlencoded bodies', () => {
+    const body: RequestBodyModel = {
+      contentType: 'application/x-www-form-urlencoded',
+      schema: { kind: 'object', properties: [] },
+      required: true,
+    };
+    const out = emitWithOp({ requestBody: body });
+    expect(out).toContain('body: URLSearchParams');
+  });
+
+  it('uses `Blob | ArrayBuffer` for octet-stream bodies', () => {
+    const body: RequestBodyModel = {
+      contentType: 'application/octet-stream',
+      schema: SCALAR,
+      required: true,
+    };
+    const out = emitWithOp({ requestBody: body });
+    expect(out).toContain('body: Blob | ArrayBuffer');
+  });
+
+  it('encodes path params via encodeURIComponent in the URL template', () => {
+    const out = emitWithOp({
+      path: '/x/{id}',
+      pathParams: [param('id', 'path', true)],
+    });
+    expect(out).toContain('${encodeURIComponent(String(id))}');
+  });
+
+  it('escapes backticks and backslashes in the path template', () => {
+    const out = emitWithOp({ path: '/x/`back\\slash' });
+    // Escaped string in the template literal.
+    expect(out).toContain('`/x/\\`back\\\\slash`');
+  });
+
+  it('upper-cases the HTTP method', () => {
+    const out = emitWithOp({ method: 'patch' });
+    expect(out).toContain('{ method: "PATCH", ...init }');
+  });
+
+  it('passes only url+init+body to __request when responseKind defaults to json', () => {
+    const responseSchema: SchemaModel = { kind: 'ref', name: 'Pet' };
+    const out = emitWithOp({
+      requestBody: {
+        contentType: 'application/json',
+        schema: { kind: 'ref', name: 'PetIn' },
+        required: true,
+      },
+      successResponses: [{ contentType: 'application/json', schema: responseSchema, status: 200 }],
+    });
+    expect(out).toContain('__request<Pet>(');
+    // No explicit 'json' arg since that's the default.
+    expect(out).not.toMatch(/"json"/);
+  });
+
+  it('passes undefined as body placeholder when responseKind is non-json but there is no body', () => {
+    const out = emitWithOp({
+      successResponses: [{ contentType: 'image/png', schema: { kind: 'unknown' }, status: 200 }],
+    });
+    // Blob response → kind 'blob' → emitter inserts `undefined` as body placeholder
+    // followed by `"blob"` so positional args line up.
+    expect(out).toContain('undefined, "blob"');
+  });
+});
+
+describe("argsStyle: 'grouped' — single options object", () => {
+  function emitObj(op: Partial<OperationModel>): string {
+    return emitSingleFile(
+      apiModel({ services: [{ name: 'Default', operations: [operation(op)] }] }),
+      { argsStyle: 'grouped' }
+    );
+  }
+
+  it('takes no vars object for an operation with no inputs — only the trailing init', () => {
+    const out = emitObj({ name: 'op' });
+    expect(out).toContain('export async function op(init: RequestOptions = {})');
+    expect(out).not.toContain('vars:');
+  });
+
+  it('bundles path params into a required `vars: <Op>Variables` and references them via `vars.*`', () => {
+    const out = emitObj({
+      name: 'getPet',
+      path: '/pets/{petId}',
+      pathParams: [param('petId', 'path', true)],
+    });
+    // Required (path params are always required) ⇒ no `= {}` default.
+    expect(out).toContain('vars: GetPetVariables,');
+    expect(out).not.toContain('vars: GetPetVariables = {}');
+    expect(out).toContain('${encodeURIComponent(String(vars.petId))}');
+  });
+
+  it('sanitizes non-identifier path param names the same way, prefixed by `vars.`', () => {
+    const out = emitObj({
+      name: 'getPet',
+      path: '/pets/{pet-id}',
+      pathParams: [param('pet-id', 'path', true)],
+    });
+    expect(out).toContain('${encodeURIComponent(String(vars.pet_id))}');
+  });
+
+  it('makes `vars` optional (`= {}`) when every input is optional (query only)', () => {
+    const out = emitObj({ name: 'listPets', queryParams: [param('q', 'query', false)] });
+    expect(out).toContain('vars: ListPetsVariables = {}');
+    expect(out).toContain('__buildUrl(__config, `/p`, vars.params)');
+  });
+
+  it('makes `vars` required when a query param is required', () => {
+    const out = emitObj({ name: 'searchPets', queryParams: [param('q', 'query', true)] });
+    expect(out).toContain('vars: SearchPetsVariables,');
+    expect(out).not.toContain('vars: SearchPetsVariables = {}');
+  });
+
+  it('passes `vars.body` to __request and requires `vars` for a required body', () => {
+    const out = emitObj({
+      name: 'createPet',
+      requestBody: {
+        contentType: 'application/json',
+        schema: { kind: 'ref', name: 'Pet' },
+        required: true,
+      },
+    });
+    expect(out).toContain('vars: CreatePetVariables,');
+    expect(out).not.toContain('vars: CreatePetVariables = {}');
+    expect(out).toContain('vars.body');
+  });
+
+  it('keeps `vars` optional when the only input is an optional body', () => {
+    const out = emitObj({
+      name: 'updatePet',
+      requestBody: {
+        contentType: 'application/json',
+        schema: { kind: 'ref', name: 'PetPatch' },
+        required: false,
+      },
+    });
+    expect(out).toContain('vars: UpdatePetVariables = {}');
+    expect(out).toContain('vars.body');
+  });
+
+  it('passes `vars.headers` straight to __headers for required header params', () => {
+    const out = emitObj({ name: 'op', headerParams: [param('X-Token', 'header', true)] });
+    expect(out).toContain('...__headers(vars.headers)');
+    expect(out).toContain('vars: OpVariables,');
+    expect(out).not.toContain('vars.headers ?? {}');
+  });
+
+  it('falls back to `{}` for optional header params (which may be absent on vars)', () => {
+    const out = emitObj({ name: 'op', headerParams: [param('X-Token', 'header', false)] });
+    expect(out).toContain('...__headers(vars.headers ?? {})');
+    expect(out).toContain('vars: OpVariables = {}');
+  });
+
+  it('works with the service-class facade — methods take the same `vars` object', () => {
+    const out = renderOperationsBlock(
+      [
+        operation({
+          name: 'getPet',
+          path: '/pets/{id}',
+          pathParams: [param('id', 'path', true)],
+        }),
+      ],
+      { facade: 'service-class', className: 'Client', argsStyle: 'grouped' }
+    );
+    expect(out).toContain('async getPet(vars: GetPetVariables,');
+    expect(out).toContain('${encodeURIComponent(String(vars.id))}');
+  });
+});
+
+describe('operation type aliases (*Result / *Params / *Body / *Variables)', () => {
+  it('emits <PascalCaseOpName>Result for every operation, even the trivial void ones', () => {
+    const out = emitWithOp({ name: 'ping' });
+    expect(out).toContain('export type PingResult = void;');
+  });
+
+  it('uses the same response type the function returns', () => {
+    const out = emitWithOp({
+      name: 'getPet',
+      successResponses: [
+        {
+          contentType: 'application/json',
+          status: 200,
+          schema: { kind: 'ref', name: 'Pet' },
+        },
+      ],
+    });
+    expect(out).toContain('export type GetPetResult = Pet;');
+    // The function itself still resolves to the explicit type — aliases are emit-only,
+    // they do not rewrite the function signature.
+    expect(out).toContain('Promise<Pet>');
+  });
+
+  it('skips the *Result alias when it collides with the response schema name (self-referential)', () => {
+    // Operation `search` → `SearchResult`, returning the schema named `SearchResult`.
+    // Emitting `export type SearchResult = SearchResult;` is circular and collides with
+    // the declared schema (TS2440 / barrel TS2308). The method references the schema
+    // directly, so the alias is redundant and must be omitted.
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [namedSchema('SearchResult', { kind: 'object', properties: [] })],
+        services: [
+          {
+            name: 'Default',
+            operations: [
+              operation({
+                name: 'search',
+                method: 'post',
+                successResponses: [
+                  {
+                    contentType: 'application/json',
+                    status: 200,
+                    schema: { kind: 'ref', name: 'SearchResult' },
+                  },
+                ],
+              }),
+            ],
+          },
+        ],
+      })
+    );
+    expect(out).not.toContain('export type SearchResult = SearchResult;');
+    expect(out).toContain('Promise<SearchResult>');
+    // Exactly one `SearchResult` declaration — the schema, not a colliding alias.
+    expect(out.match(/export type SearchResult\b/g)).toHaveLength(1);
+  });
+
+  it('handles unions in the result type', () => {
+    const out = emitWithOp({
+      name: 'getPhoto',
+      successResponses: [
+        { contentType: 'image/png', schema: { kind: 'unknown' }, status: 200 },
+        { contentType: 'text/plain', schema: { kind: 'unknown' }, status: 200 },
+      ],
+    });
+    expect(out).toContain('export type GetPhotoResult = Blob | string;');
+  });
+
+  it('PascalCases an operationId that starts lowercase', () => {
+    const out = emitWithOp({ name: 'listMenuItems' });
+    expect(out).toContain('export type ListMenuItemsResult');
+  });
+
+  it('leaves an already-PascalCase operationId untouched', () => {
+    const out = emitWithOp({ name: 'CreateOrder' });
+    expect(out).toContain('export type CreateOrderResult');
+  });
+
+  it('emits the *Result alias BEFORE the function so it is declared top-down', () => {
+    const out = emitWithOp({ name: 'op' });
+    const aliasIdx = out.indexOf('export type OpResult');
+    const fnIdx = out.indexOf('export async function op(');
+    expect(aliasIdx).toBeGreaterThanOrEqual(0);
+    expect(fnIdx).toBeGreaterThanOrEqual(0);
+    expect(aliasIdx).toBeLessThan(fnIdx);
+  });
+
+  it('emits *Params for operations that have query params', () => {
+    const out = emitWithOp({
+      name: 'listPets',
+      queryParams: [
+        param('limit', 'query', false, { kind: 'scalar', scalar: 'integer' }),
+        param('cursor', 'query', false, SCALAR),
+      ],
+    });
+    expect(out).toContain('export type ListPetsParams =');
+    expect(out).toMatch(
+      /export type ListPetsParams = \{[\s\S]*?limit\?: number;[\s\S]*?cursor\?: string;[\s\S]*?\};/
+    );
+  });
+
+  it('omits *Params for operations with no query params', () => {
+    const out = emitWithOp({ name: 'ping' });
+    expect(out).not.toContain('PingParams');
+  });
+
+  it('carries the same per-prop JSDoc tags into the *Params alias as C6.1 emits inline', () => {
+    const out = emitWithOp({
+      name: 'listPets',
+      queryParams: [
+        {
+          name: 'limit',
+          in: 'query',
+          required: false,
+          description: 'Page size.',
+          schema: {
+            kind: 'scalar',
+            scalar: 'integer',
+            metadata: { minimum: 1, maximum: 100 },
+          },
+        },
+      ],
+    });
+    // Tags + description appear inside the alias body, not just the function sig.
+    expect(out).toMatch(
+      /export type ListPetsParams = \{[\s\S]*?Page size\.[\s\S]*?@minimum 1[\s\S]*?@maximum 100[\s\S]*?limit\?: number;[\s\S]*?\};/
+    );
+  });
+
+  it('marks the *Params alias optionality per-prop, independent of any function-sig default', () => {
+    const out = emitWithOp({
+      name: 'listPets',
+      queryParams: [param('required', 'query', true), param('optional', 'query', false)],
+    });
+    expect(out).toMatch(
+      /export type ListPetsParams = \{[\s\S]*required: string;[\s\S]*optional\?: string;[\s\S]*\};/
+    );
+  });
+
+  it('emits *Body for operations that have a JSON request body', () => {
+    const out = emitWithOp({
+      name: 'createPet',
+      requestBody: {
+        contentType: 'application/json',
+        schema: { kind: 'ref', name: 'Pet' },
+        required: true,
+      },
+    });
+    expect(out).toContain('export type CreatePetBody = Pet;');
+  });
+
+  it('emits *Body using the same content-type mapping as the function signature', () => {
+    const out = emitWithOp({
+      name: 'uploadPhoto',
+      requestBody: {
+        contentType: 'multipart/form-data',
+        schema: { kind: 'unknown' },
+        required: true,
+      },
+    });
+    expect(out).toContain('export type UploadPhotoBody = FormData;');
+  });
+
+  it('emits *Body as `URLSearchParams` for urlencoded bodies', () => {
+    const out = emitWithOp({
+      name: 'submitForm',
+      requestBody: {
+        contentType: 'application/x-www-form-urlencoded',
+        schema: { kind: 'object', properties: [] },
+        required: true,
+      },
+    });
+    expect(out).toContain('export type SubmitFormBody = URLSearchParams;');
+  });
+
+  it('omits *Body for operations with no request body', () => {
+    const out = emitWithOp({ name: 'ping' });
+    expect(out).not.toContain('PingBody');
+  });
+
+  it('omits *Variables entirely for operations with no inputs', () => {
+    const out = emitWithOp({ name: 'ping' });
+    expect(out).not.toContain('PingVariables');
+  });
+
+  it('emits *Variables with path params as required properties (path templating requires them)', () => {
+    const out = emitWithOp({
+      name: 'getPet',
+      path: '/pets/{petId}',
+      pathParams: [param('petId', 'path', true)],
+    });
+    expect(out).toMatch(/export type GetPetVariables = \{[\s\S]*petId: string;[\s\S]*\};/);
+  });
+
+  it('orders path-param props in URL-template order (not pathParams[] insertion order)', () => {
+    const out = emitWithOp({
+      name: 'getNested',
+      path: '/x/{first}/y/{second}',
+      pathParams: [
+        param('second', 'path', true, { kind: 'scalar', scalar: 'number' }),
+        param('first', 'path', true, { kind: 'scalar', scalar: 'string' }),
+      ],
+    });
+    const match = out.match(/export type GetNestedVariables = \{([\s\S]*?)\};/);
+    expect(match).not.toBeNull();
+    const body = match![1];
+    expect(body.indexOf('first:')).toBeGreaterThanOrEqual(0);
+    expect(body.indexOf('first:')).toBeLessThan(body.indexOf('second:'));
+  });
+
+  it('renders JSDoc (description + schema metadata) above path-param props in *Variables', () => {
+    const out = emitWithOp({
+      name: 'getOrder',
+      path: '/orders/{orderId}',
+      pathParams: [
+        {
+          name: 'orderId',
+          in: 'path',
+          required: true,
+          description: 'Order ID.',
+          schema: {
+            kind: 'scalar',
+            scalar: 'string',
+            metadata: { pattern: '^ord_[a-z0-9]+$' },
+          },
+        },
+      ],
+    });
+    expect(out).toMatch(
+      /export type GetOrderVariables = \{[\s\S]*Order ID\.[\s\S]*@pattern \^ord_\[a-z0-9\]\+\$[\s\S]*orderId: string;[\s\S]*\};/
+    );
+  });
+
+  it('references the *Params alias in *Variables when query params exist', () => {
+    const out = emitWithOp({
+      name: 'listPets',
+      queryParams: [param('limit', 'query', false, { kind: 'scalar', scalar: 'integer' })],
+    });
+    // `params?` (optional) because all query params are optional ⇒ function defaults to `= {}`.
+    expect(out).toMatch(
+      /export type ListPetsVariables = \{[\s\S]*params\?: ListPetsParams;[\s\S]*\};/
+    );
+  });
+
+  it('marks *Variables.params required when any query param is required', () => {
+    const out = emitWithOp({
+      name: 'searchPets',
+      queryParams: [param('q', 'query', true), param('limit', 'query', false)],
+    });
+    expect(out).toMatch(
+      /export type SearchPetsVariables = \{[\s\S]*params: SearchPetsParams;[\s\S]*\};/
+    );
+  });
+
+  it('references the *Body alias in *Variables when the op has a body', () => {
+    const out = emitWithOp({
+      name: 'createPet',
+      requestBody: {
+        contentType: 'application/json',
+        schema: { kind: 'ref', name: 'Pet' },
+        required: true,
+      },
+    });
+    expect(out).toMatch(/export type CreatePetVariables = \{[\s\S]*body: CreatePetBody;[\s\S]*\};/);
+  });
+
+  it('marks *Variables.body optional when the request body is optional', () => {
+    const out = emitWithOp({
+      name: 'updatePet',
+      requestBody: {
+        contentType: 'application/json',
+        schema: { kind: 'ref', name: 'PetPatch' },
+        required: false,
+      },
+    });
+    expect(out).toMatch(
+      /export type UpdatePetVariables = \{[\s\S]*body\?: UpdatePetBody;[\s\S]*\};/
+    );
+  });
+
+  it('combines path + params + body in *Variables in a stable order: path, params, body', () => {
+    const out = emitWithOp({
+      name: 'updateOrder',
+      path: '/orders/{orderId}',
+      pathParams: [param('orderId', 'path', true)],
+      queryParams: [param('include', 'query', false)],
+      requestBody: {
+        contentType: 'application/json',
+        schema: { kind: 'ref', name: 'Order' },
+        required: true,
+      },
+    });
+    const match = out.match(/export type UpdateOrderVariables = \{([\s\S]*?)\};/);
+    expect(match).not.toBeNull();
+    const body = match![1];
+    expect(body.indexOf('orderId')).toBeLessThan(body.indexOf('params'));
+    expect(body.indexOf('params')).toBeLessThan(body.indexOf('body'));
+  });
+
+  it('emits aliases in the order: Result, Params, Body, Variables', () => {
+    const out = emitWithOp({
+      name: 'updateOrder',
+      path: '/orders/{orderId}',
+      pathParams: [param('orderId', 'path', true)],
+      queryParams: [param('include', 'query', false)],
+      requestBody: {
+        contentType: 'application/json',
+        schema: { kind: 'ref', name: 'Order' },
+        required: true,
+      },
+      successResponses: [
+        {
+          contentType: 'application/json',
+          status: 200,
+          schema: { kind: 'ref', name: 'Order' },
+        },
+      ],
+    });
+    const order = [
+      'UpdateOrderResult',
+      'UpdateOrderParams',
+      'UpdateOrderBody',
+      'UpdateOrderVariables',
+    ].map((a) => ({ a, idx: out.indexOf(a) }));
+    for (const { a, idx } of order) {
+      expect(idx, `${a} should appear in the output`).toBeGreaterThanOrEqual(0);
+    }
+    for (let i = 1; i < order.length; i++) {
+      expect(order[i].idx, `${order[i].a} should appear after ${order[i - 1].a}`).toBeGreaterThan(
+        order[i - 1].idx
+      );
+    }
+  });
+});
+
+describe('header parameters (C6.7)', () => {
+  it('emits header params as a single `headers` object arg in the signature', () => {
+    const out = emitWithOp({
+      name: 'getThing',
+      headerParams: [param('X-Api-Version', 'header', true)],
+    });
+    expect(out).toContain('headers: {');
+    expect(out).toMatch(/"X-Api-Version": string;/);
+  });
+
+  it('makes the `headers` arg required (no `= {}`) when any header param is required', () => {
+    const out = emitWithOp({
+      name: 'getThing',
+      headerParams: [param('X-Api-Version', 'header', true)],
+    });
+    expect(out).not.toMatch(/headers: \{[\s\S]*?\} = \{\}/);
+  });
+
+  it('defaults the `headers` arg to `= {}` when all header params are optional', () => {
+    const out = emitWithOp({
+      name: 'getThing',
+      headerParams: [param('X-Trace', 'header', false)],
+    });
+    expect(out).toMatch(/headers: \{[\s\S]*?\} = \{\}/);
+    expect(out).toMatch(/"X-Trace"\?: string;/);
+  });
+
+  it('omits the `headers` arg entirely for operations with no header params', () => {
+    const out = emitWithOp({ name: 'ping' });
+    expect(out).not.toContain('headers: {');
+  });
+
+  it('injects header params into the request, with caller init.headers winning', () => {
+    const out = emitWithOp({
+      name: 'getThing',
+      headerParams: [param('X-Api-Version', 'header', true)],
+    });
+    // Generated header values come first, caller-supplied init.headers spread last (wins).
+    expect(out).toMatch(
+      /headers: \{ \.\.\.__headers\(headers\), \.\.\.init\.headers as Record<string, string> \| undefined \}/
+    );
+  });
+
+  it('emits the __headers runtime helper when any operation has header params', () => {
+    const out = emitWithOp({
+      name: 'getThing',
+      headerParams: [param('X-Api-Version', 'header', true)],
+    });
+    expect(out).toContain('function __headers(');
+  });
+
+  it('renders per-prop JSDoc (description + metadata) on header params', () => {
+    const out = emitWithOp({
+      name: 'getThing',
+      headerParams: [
+        {
+          name: 'X-Api-Version',
+          in: 'header',
+          required: true,
+          description: 'API version pin.',
+          schema: {
+            kind: 'scalar',
+            scalar: 'string',
+            metadata: { pattern: '^v\\d+$' },
+          },
+        },
+      ],
+    });
+    expect(out).toMatch(
+      /API version pin\.[\s\S]*@pattern \^v\\d\+\$[\s\S]*"X-Api-Version": string;/
+    );
+  });
+
+  it('emits a *Headers alias and a headers prop in *Variables', () => {
+    const out = emitWithOp({
+      name: 'getThing',
+      headerParams: [param('X-Api-Version', 'header', true)],
+    });
+    expect(out).toContain('export type GetThingHeaders =');
+    expect(out).toMatch(
+      /export type GetThingVariables = \{[\s\S]*headers: GetThingHeaders;[\s\S]*\};/
+    );
+  });
+
+  it('marks *Variables.headers optional when all header params are optional', () => {
+    const out = emitWithOp({
+      name: 'getThing',
+      headerParams: [param('X-Trace', 'header', false)],
+    });
+    expect(out).toMatch(
+      /export type GetThingVariables = \{[\s\S]*headers\?: GetThingHeaders;[\s\S]*\};/
+    );
+  });
+});
+
+describe('JSDoc on query-param object', () => {
+  it('renders each param on its own line so JSDoc can hang above it', () => {
+    const out = emitWithOp({
+      queryParams: [param('q', 'query', true), param('r', 'query', false)],
+    });
+    expect(out).toMatch(/params: \{\n {4}q: string;\n {4}r\?: string;\n\}/);
+  });
+
+  it('emits JSDoc tags from query param schema metadata', () => {
+    const out = emitWithOp({
+      queryParams: [
+        {
+          name: 'limit',
+          in: 'query',
+          required: false,
+          schema: {
+            kind: 'scalar',
+            scalar: 'integer',
+            metadata: { minimum: 1, maximum: 100 },
+          },
+        },
+      ],
+    });
+    expect(out).toContain('@minimum 1');
+    expect(out).toContain('@maximum 100');
+  });
+
+  it('emits a single-line JSDoc with the param description', () => {
+    const out = emitWithOp({
+      queryParams: [
+        {
+          name: 'q',
+          in: 'query',
+          required: false,
+          description: 'Free-text search.',
+          schema: SCALAR,
+        },
+      ],
+    });
+    expect(out).toMatch(/\/\*\*\n {5}\* Free-text search\.\n {5}\*\/\n {4}q\?: string;/);
+  });
+
+  it('combines the param description and the schema metadata in one block', () => {
+    const out = emitWithOp({
+      queryParams: [
+        {
+          name: 'limit',
+          in: 'query',
+          required: false,
+          description: 'Page size.',
+          schema: {
+            kind: 'scalar',
+            scalar: 'integer',
+            metadata: { minimum: 1, maximum: 100 },
+          },
+        },
+      ],
+    });
+    expect(out).toMatch(/Page size\.[\s\S]*@minimum 1[\s\S]*@maximum 100/);
+  });
+
+  it('omits the JSDoc block for a bare query param with no description and no metadata', () => {
+    const out = emitWithOp({
+      queryParams: [param('q', 'query', false)],
+    });
+    // Param line is present, but no `/**` directly before it.
+    expect(out).toMatch(/\n {4}q\?: string;/);
+    expect(out).not.toMatch(/\/\*\*[^/]*\*\/\n {4}q\?: string;/);
+  });
+});
+
+describe('JSDoc on operations', () => {
+  it('emits nothing when there is no summary or description', () => {
+    const out = emitWithOp({});
+    // No JSDoc immediately before the `export async function op` line.
+    expect(out).not.toMatch(/\*\/\nexport async function op\(/);
+  });
+
+  it('emits a JSDoc block when only summary is present', () => {
+    const out = emitWithOp({ summary: 'one liner' });
+    expect(out).toContain('/**\n * one liner\n */');
+  });
+
+  it('emits block JSDoc when description spans multiple lines', () => {
+    const out = emitWithOp({ description: 'first\nsecond' });
+    expect(out).toContain('/**\n * first\n * second\n */');
+  });
+
+  it('inserts a blank line between summary and description', () => {
+    const out = emitWithOp({ summary: 'sum', description: 'more details' });
+    // The intermediate empty line renders as a bare ` *` (trailing space stripped).
+    expect(out).toMatch(/\/\*\*\n \* sum\n \*\n \* more details\n \*\//);
+  });
+
+  it('trims trailing blank lines so the block has no dangling ` *`', () => {
+    const out = emitWithOp({ description: 'details\n' });
+    expect(out).toContain('/**\n * details\n */');
+    expect(out).not.toMatch(/\* details\n \*\n \*\//);
+  });
+});
+
+describe('computeResponse — response type discovery', () => {
+  it('void when there are no responses', () => {
+    const out = emitWithOp({});
+    expect(out).toContain('Promise<void>');
+  });
+
+  it('JSON: uses the schema directly', () => {
+    const out = emitWithOp({
+      successResponses: [
+        {
+          contentType: 'application/json',
+          status: 200,
+          schema: { kind: 'ref', name: 'Pet' },
+        },
+      ],
+    });
+    expect(out).toContain('Promise<Pet>');
+  });
+
+  it('Binary-only responses → Blob and responseKind=blob', () => {
+    const out = emitWithOp({
+      successResponses: [{ contentType: 'image/png', schema: { kind: 'unknown' }, status: 200 }],
+    });
+    expect(out).toContain('Promise<Blob>');
+    expect(out).toContain('"blob"');
+  });
+
+  it('Text-only responses → string and responseKind=text', () => {
+    const out = emitWithOp({
+      successResponses: [{ contentType: 'text/plain', schema: { kind: 'unknown' }, status: 200 }],
+    });
+    expect(out).toContain('Promise<string>');
+    expect(out).toContain('"text"');
+  });
+
+  it('Mixed binary + text responses pick blob (hasBinary wins) and dedupe types', () => {
+    const out = emitWithOp({
+      successResponses: [
+        { contentType: 'image/png', schema: { kind: 'unknown' }, status: 200 },
+        { contentType: 'text/plain', schema: { kind: 'unknown' }, status: 200 },
+      ],
+    });
+    expect(out).toContain('Promise<Blob | string>');
+    expect(out).toContain('"blob"');
+  });
+
+  it('dedupes identical non-json response types into a single Blob', () => {
+    const out = emitWithOp({
+      successResponses: [
+        { contentType: 'image/png', schema: { kind: 'unknown' }, status: 200 },
+        { contentType: 'image/jpeg', schema: { kind: 'unknown' }, status: 200 },
+      ],
+    });
+    // Both binary content types collapse to one `Blob` (no `Blob | Blob`).
+    expect(out).toContain('Promise<Blob>');
+    expect(out).not.toContain('Blob | Blob');
+    expect(out).toContain('"blob"');
+  });
+
+  it('Non-json/non-binary/non-text responses fall back to renderSchema with responseKind=json', () => {
+    const out = emitWithOp({
+      successResponses: [
+        {
+          contentType: 'application/xml',
+          status: 200,
+          schema: { kind: 'ref', name: 'XmlBody' },
+        },
+      ],
+    });
+    expect(out).toContain('Promise<XmlBody>');
+    // responseKind is 'json' (default) because hasBinary && hasText were both false.
+    expect(out).not.toContain('"blob"');
+    expect(out).not.toContain('"text"');
+  });
+
+  it('Picks JSON when both JSON and non-JSON content types coexist', () => {
+    const out = emitWithOp({
+      successResponses: [
+        { contentType: 'application/xml', schema: { kind: 'ref', name: 'X' }, status: 200 },
+        { contentType: 'application/json', schema: { kind: 'ref', name: 'J' }, status: 200 },
+      ],
+    });
+    expect(out).toContain('Promise<J>');
+  });
+});
+
+describe('emitOperations — multiple operations', () => {
+  it('renders each operation across services', () => {
+    const op1 = operation({ name: 'a', path: '/a' });
+    const op2 = operation({ name: 'b', path: '/b' });
+    const op3 = operation({ name: 'c', path: '/c' });
+    const out = emitSingleFile(
+      apiModel({
+        services: [
+          { name: 'S1', operations: [op1, op2] },
+          { name: 'S2', operations: [op3] },
+        ],
+      })
+    );
+    expect(out).toContain('export async function a(');
+    expect(out).toContain('export async function b(');
+    expect(out).toContain('export async function c(');
+  });
+});
+
+describe('response argument layout in __request', () => {
+  it('emits body placeholder + responseKind together when both bodyVar exists and responseKind is non-json', () => {
+    const out = emitWithOp({
+      requestBody: {
+        contentType: 'application/json',
+        schema: SCALAR,
+        required: true,
+      },
+      successResponses: [{ contentType: 'image/png', schema: { kind: 'unknown' }, status: 200 }],
+    });
+    // Should have: config, url, init, body, "blob"
+    expect(out).toContain('body, "blob"');
+  });
+});
+
+describe('responses ignored details', () => {
+  // Belt-and-braces test to keep ResponseBodyModel non-trivial parsing exercised.
+  it('preserves a textual response schema when content-type is text/*', () => {
+    const resp: ResponseBodyModel = {
+      contentType: 'text/plain',
+      status: 200,
+      schema: { kind: 'unknown' },
+    };
+    const out = emitWithOp({ successResponses: [resp] });
+    expect(out).toContain('Promise<string>');
+  });
+});
+
+describe('SSE — async generators + sse aggregate', () => {
+  const sseResponse: ResponseBodyModel = {
+    contentType: 'text/event-stream',
+    status: 200,
+    schema: { kind: 'unknown' },
+    itemSchema: { kind: 'ref', name: 'Message' },
+  };
+
+  function sseOp(over: Partial<OperationModel> = {}): OperationModel {
+    return operation({
+      name: 'streamMessages',
+      path: '/messages',
+      queryParams: [param('after', 'query', false)],
+      successResponses: [sseResponse],
+      ...over,
+    });
+  }
+
+  it('functions facade: emits a NON-exported async generator + a `sse` aggregate', () => {
+    const out = renderOperationsBlock(
+      [sseOp(), operation({ name: 'listThings', path: '/things' })],
+      {
+        facade: 'functions',
+        className: 'Ignored',
+      }
+    );
+    expect(out).toContain('async function* streamMessages(');
+    // The generator is not individually exported — only the aggregate is.
+    expect(out).not.toContain('export async function* streamMessages');
+    expect(out).toContain('yield* __sse<Message>');
+    expect(out).toContain(', "json");');
+    expect(out).toContain('export const sse = { streamMessages };');
+    // The regular op is still its own export, and is NOT in the sse object.
+    expect(out).toContain('export async function listThings(');
+    expect(out).not.toContain('sse = { streamMessages, listThings }');
+  });
+
+  it('functions facade: a string-event SSE op streams ServerSentEvent<string> via __sse<string> + text', () => {
+    const out = renderOperationsBlock(
+      [
+        sseOp({
+          successResponses: [
+            { contentType: 'text/event-stream', schema: { kind: 'unknown' }, status: 200 },
+          ],
+        }),
+      ],
+      { facade: 'functions', className: 'C' }
+    );
+    expect(out).toContain('yield* __sse<string>');
+    expect(out).toContain(', "text");');
+    expect(out).toContain('AsyncGenerator<ServerSentEvent<string>>');
+  });
+
+  it('the SSE op trailing init param is `SseOptions`; regular ops stay `RequestOptions`', () => {
+    const out = renderOperationsBlock(
+      [sseOp(), operation({ name: 'listThings', path: '/things' })],
+      {
+        facade: 'functions',
+        className: 'C',
+      }
+    );
+    expect(out).toContain('init: SseOptions');
+    expect(out).toContain('init: RequestOptions');
+  });
+
+  it('the SSE op exposes its input aliases but NOT a *Result alias', () => {
+    const out = renderOperationsBlock([sseOp()], { facade: 'functions', className: 'C' });
+    expect(out).toContain('export type StreamMessagesParams');
+    expect(out).not.toContain('StreamMessagesResult');
+  });
+
+  it('an authed SSE op awaits __auth before delegating to __sse, and merges __a.query/headers', () => {
+    const out = renderOperationsBlock([sseOp({ security: ['QueryKey'] })], {
+      facade: 'functions',
+      className: 'C',
+      queryAuthKeys: new Set(['QueryKey']),
+    });
+    // The auth prefix is resolved up front (lazily, on first iteration), then the
+    // generator delegates to __sse — credentials merge into URL query + headers.
+    expect(out).toContain('const __a = await __auth(["QueryKey"], __config);');
+    expect(out).toContain('...__a.query');
+    expect(out).toContain('...__a.headers');
+    expect(out).toContain('yield* __sse<Message>');
+  });
+
+  it('service-class facade: emits a `private async *` method + a `readonly sse` field', () => {
+    const out = renderOperationsBlock([sseOp()], {
+      facade: 'service-class',
+      className: 'MessagesService',
+    });
+    expect(out).toContain('private async *streamMessages(');
+    expect(out).toContain('readonly sse = { streamMessages: this.streamMessages.bind(this) };');
+  });
+
+  it('a block with NO SSE ops emits no sse aggregate / no __sse', () => {
+    const out = renderOperationsBlock([operation({ name: 'listThings', path: '/things' })], {
+      facade: 'functions',
+      className: 'C',
+    });
+    expect(out).not.toContain('export const sse');
+    expect(out).not.toContain('__sse');
+  });
+
+  it('service-class with NO SSE ops emits no readonly sse field', () => {
+    const out = renderOperationsBlock([operation({ name: 'listThings', path: '/things' })], {
+      facade: 'service-class',
+      className: 'C',
+    });
+    expect(out).not.toContain('readonly sse');
+    expect(out).not.toContain('__sse');
+  });
+
+  it('honors a custom sseExportName, defaulting to `sse`', () => {
+    const out = renderOperationsBlock([sseOp()], {
+      facade: 'functions',
+      className: 'C',
+      sseExportName: 'streams',
+    });
+    expect(out).toContain('export const streams = { streamMessages };');
+  });
+});
+
+describe('renderOperationsMeta — OPERATIONS metadata map', () => {
+  it('returns an empty string when there are no operations', () => {
+    expect(renderOperationsMeta([])).toBe('');
+  });
+
+  it('emits one entry per operation keyed by operationId, with uppercased method and path template', () => {
+    const out = renderOperationsMeta([
+      operation({
+        name: 'getProjectById',
+        method: 'get',
+        path: '/orgs/{orgId}/projects/{projectId}',
+      }),
+      operation({
+        name: 'createProject',
+        method: 'post',
+        path: '/orgs/{orgId}/projects',
+      }),
+    ]);
+    expect(out).toContain(
+      'getProjectById: { method: "GET", path: "/orgs/{orgId}/projects/{projectId}" }'
+    );
+    expect(out).toContain('createProject: { method: "POST", path: "/orgs/{orgId}/projects" }');
+  });
+
+  it('emits the OperationId and OperationMetadata helper types', () => {
+    const out = renderOperationsMeta([operation({ name: 'getThing' })]);
+    expect(out).toContain('export const OPERATIONS = {');
+    expect(out).toContain('} as const;');
+    expect(out).toContain('export type OperationId = keyof typeof OPERATIONS;');
+    expect(out).toMatch(
+      /export type OperationMetadata = \{\n {4}readonly method: string;\n {4}readonly path: string;\n\};/
+    );
+  });
+
+  it('quotes operationIds that are not bare identifiers', () => {
+    const out = renderOperationsMeta([operation({ name: 'weird-op', path: '/w' })]);
+    expect(out).toContain('"weird-op": { method: "GET", path: "/w" }');
+  });
+
+  it('is included in single-file output between the type guards and the runtime', () => {
+    const out = emitWithOp({
+      name: 'listThings',
+      method: 'get',
+      path: '/things',
+    });
+    expect(out).toContain('export const OPERATIONS = {');
+    expect(out).toContain('listThings: { method: "GET", path: "/things" }');
+    // Metadata is declarative data, so it precedes the runtime (`let BASE`).
+    expect(out.indexOf('export const OPERATIONS = {')).toBeLessThan(out.indexOf('let BASE ='));
+  });
+
+  it('is omitted from single-file output when the document has no operations', () => {
+    expect(emitSingleFile(apiModel())).not.toContain('export const OPERATIONS');
+  });
+});
diff --git a/packages/openapi-typescript/src/emitters/__tests__/runtime.test.ts b/packages/openapi-typescript/src/emitters/__tests__/runtime.test.ts
new file mode 100644
index 0000000000..eb36b59439
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/__tests__/runtime.test.ts
@@ -0,0 +1,240 @@
+import { renderRuntime, runtimeStatements, PUBLIC_RUNTIME_TYPES } from '../runtime.js';
+import { printStatements } from '../ts.js';
+
+describe('renderRuntime — shared core + terminal selection', () => {
+  describe('throw mode (default)', () => {
+    it('emits __send, __parse, and __request<T> and no result terminal', () => {
+      const out = renderRuntime('https://api.example.com', false, false);
+      expect(out).toContain('async function __send(');
+      expect(out).toContain('async function __parse(');
+      expect(out).toContain('async function __request<T>(');
+      expect(out).not.toContain('__requestResult');
+      expect(out).not.toContain('export type Result<');
+    });
+
+    it("treats an explicit 'throw' identically to the default", () => {
+      expect(renderRuntime('https://api.example.com', false, false, 'throw')).toBe(
+        renderRuntime('https://api.example.com', false, false)
+      );
+    });
+  });
+
+  describe('runtimeStatements', () => {
+    it('returns parsed statements that print to the same source renderRuntime emits', () => {
+      const statements = runtimeStatements('https://api.example.com', false, false);
+      expect(statements.length).toBeGreaterThan(0);
+      expect(printStatements(statements)).toBe(
+        renderRuntime('https://api.example.com', false, false)
+      );
+    });
+
+    it('defaults errorMode to throw (emits __request, not __requestResult)', () => {
+      const out = printStatements(runtimeStatements('https://api.example.com', false, false));
+      expect(out).toContain('async function __request<T>(');
+      expect(out).not.toContain('__requestResult');
+    });
+  });
+
+  describe('result mode', () => {
+    const out = renderRuntime('https://api.example.com', false, true, 'result');
+
+    it('emits __send, __parse, the Result type, and __requestResult', () => {
+      expect(out).toContain('async function __send(');
+      expect(out).toContain('async function __parse(');
+      expect(out).toContain('export type Result<TData, TError>');
+      expect(out).toContain('async function __requestResult<TData, TError>(');
+    });
+
+    it('does not emit the throwing terminal', () => {
+      expect(out).not.toContain('async function __request<T>(');
+    });
+  });
+
+  describe('shared surface present in both modes', () => {
+    const cases: Array<['throw' | 'result', string]> = [
+      ['throw', renderRuntime('https://api.example.com', true, true, 'throw')],
+      ['result', renderRuntime('https://api.example.com', true, true, 'result')],
+    ];
+    it.each(cases)('keeps retry helpers + ApiError + header helper in %s mode', (_mode, out) => {
+      expect(out).toContain('function __defaultRetryOn(');
+      expect(out).toContain('function __retryDelay(');
+      expect(out).toContain('function __sleep(');
+      expect(out).toContain('function __abortError(');
+      expect(out).toContain('class ApiError extends Error');
+      expect(out).toContain('async function readError(');
+      expect(out).toContain('function __headers(');
+    });
+  });
+
+  it('honors the export prefix for __send/__parse and the terminal', () => {
+    const exported = renderRuntime('https://api.example.com', false, true);
+    expect(exported).toContain('export async function __send(');
+    expect(exported).toContain('export async function __parse(');
+    expect(exported).toContain('export async function __request<T>(');
+
+    const inlined = renderRuntime('https://api.example.com', false, false);
+    expect(inlined).toContain('async function __send(');
+    expect(inlined).not.toContain('export async function __send(');
+  });
+
+  it('documents onError as throw-mode only', () => {
+    const out = renderRuntime('https://api.example.com', false, false);
+    expect(out).toContain('(throw mode only)');
+  });
+
+  describe('__buildUrl query serialization styles', () => {
+    const out = renderRuntime('https://api.example.com', false, false);
+
+    it('accepts an optional per-key styles spec as the 4th param', () => {
+      expect(out).toContain("style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject'");
+      expect(out).toContain('explode: boolean');
+      expect(out).toContain('allowReserved?: boolean');
+      expect(out).toContain('const spec = styles?.[key];');
+    });
+
+    it('keeps the default branch (no spec) byte-identical to the unstyled path', () => {
+      // The pre-styles repeat/deepObject/scalar behavior, reached when spec is absent.
+      // The printer reflows `if (cond) stmt;` onto two lines, so assert the parts.
+      expect(out).toContain('if (!spec) {');
+      expect(out).toContain('if (v !== undefined && v !== null)');
+      expect(out).toContain('params.append(key, String(v));');
+      expect(out).toContain('params.append(`${key}[${subKey}]`, String(subValue));');
+    });
+
+    it('emits the delimited-array branches with literal delimiters', () => {
+      // The delimiter goes on the wire LITERAL; only values are encoded.
+      // pipeDelimited → '|', spaceDelimited → '%20' (NOT '+'), form non-explode → ','.
+      expect(out).toContain(
+        "const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';"
+      );
+      // Each value is encoded individually, then joined with the literal delimiter
+      // and pushed to `raw` — NOT run through params.append(key, joined).
+      expect(out).toContain(
+        'const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;'
+      );
+      expect(out).toContain(
+        'raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);'
+      );
+      expect(out).not.toContain('const joined = items.join(sep);');
+      expect(out).not.toContain('params.append(key, joined)');
+      expect(out).toContain("if (spec.style === 'form' && spec.explode)");
+    });
+
+    it('emits allowReserved handling that preserves reserved chars', () => {
+      expect(out).toContain('allowReserved');
+      // A helper that encodes everything except the RFC-3986 reserved set, plus
+      // raw query pieces appended after URLSearchParams.toString().
+      expect(out).toContain('function __encodeReserved(');
+      expect(out).toContain('const raw: string[] = [];');
+    });
+
+    it('assembles params + raw allowReserved pieces into the final query string', () => {
+      expect(out).toContain("const qs = [params.toString(), ...raw].filter(Boolean).join('&');");
+      expect(out).toContain('return qs ? `${url}?${qs}` : url;');
+    });
+  });
+
+  describe('parseAs escape hatch', () => {
+    it("lists 'ParseAs' in PUBLIC_RUNTIME_TYPES", () => {
+      expect(PUBLIC_RUNTIME_TYPES).toContain('ParseAs');
+    });
+
+    it('emits the ParseAs union type and parseAs on RequestOptions', () => {
+      const out = renderRuntime('https://api.example.com', false, false);
+      expect(out).toContain(
+        "export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';"
+      );
+      // The printer reflows the `RequestOptions` type literal across lines.
+      expect(out).toContain('export type RequestOptions = RequestInit & {');
+      expect(out).toContain('retry?: Partial<RetryConfig>;');
+      expect(out).toContain('parseAs?: ParseAs;');
+    });
+
+    it('extends __parse to accept ParseAs | void and decode every kind', () => {
+      const out = renderRuntime('https://api.example.com', false, false);
+      // The printer splits single-line `if (cond) return x;` onto two lines; assert
+      // each condition and its return value survive (semantics preserved, layout reflowed).
+      expect(out).toContain("kind: ParseAs | 'void'");
+      expect(out).toContain("if (kind === 'void' || response.status === 204)");
+      expect(out).toContain('return undefined;');
+      expect(out).toContain("if (kind === 'stream')");
+      expect(out).toContain('return response.body;');
+      expect(out).toContain("if (kind === 'blob')");
+      expect(out).toContain("if (kind === 'arrayBuffer')");
+      expect(out).toContain('return response.arrayBuffer();');
+      expect(out).toContain("if (kind === 'formData')");
+      expect(out).toContain('return response.formData();');
+      expect(out).toContain("if (kind === 'text')");
+      expect(out).toContain('return response.text();');
+      expect(out).toContain("if (kind === 'json')");
+      expect(out).toContain('return response.json();');
+      // 'auto' sniff branch — json → text/ → blob
+      expect(out).toContain("if (contentType.toLowerCase().includes('json'))");
+      expect(out).toContain("if (contentType.startsWith('text/'))");
+      expect(out).toContain('return response.blob();');
+    });
+
+    const terminals: Array<['throw' | 'result', string, string]> = [
+      [
+        'throw',
+        renderRuntime('https://api.example.com', false, false, 'throw'),
+        'const { response, context } = await __send(config, url, sendInit, body);',
+      ],
+      [
+        'result',
+        renderRuntime('https://api.example.com', false, true, 'result'),
+        'const { response } = await __send(config, url, sendInit, body);',
+      ],
+    ];
+    it.each(terminals)(
+      'in %s mode strips parseAs before __send and maps the default kind',
+      (_mode, out, sendLine) => {
+        expect(out).toContain('const { parseAs, ...sendInit } = init;');
+        expect(out).toContain(sendLine);
+        expect(out).toContain(
+          "const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);"
+        );
+        expect(out).toContain('__parse(response, kind)');
+        expect(out).not.toContain('__parse(response, responseKind)');
+      }
+    );
+  });
+
+  describe('SSE runtime (gated on needsSse)', () => {
+    it('omits all SSE surface when needsSse is false', () => {
+      const out = renderRuntime('https://api.example.com', false, false, 'throw', false);
+      expect(out).not.toContain('__sse');
+      expect(out).not.toContain('ServerSentEvent');
+      expect(out).not.toContain('SseOptions');
+    });
+
+    it('emits ServerSentEvent, SseOptions, and __sse when needsSse is true', () => {
+      const out = renderRuntime('https://api.example.com', false, false, 'throw', true);
+      // The printer reflows type literals across lines; assert the parts survive.
+      expect(out).toContain('export type ServerSentEvent<T> = {');
+      expect(out).toContain('event?: string;');
+      expect(out).toContain('data: T;');
+      expect(out).toContain('id?: string;');
+      expect(out).toContain('retry?: number;');
+      expect(out).toContain('export type SseOptions = RequestInit & {');
+      expect(out).toContain('reconnect?: boolean;');
+      expect(out).toContain('reconnectDelay?: number;');
+      expect(out).toContain('async function* __sse<T>(');
+      expect(out).toContain("dataKind: 'json' | 'text' = 'text'");
+      expect(out).toContain('AsyncGenerator<ServerSentEvent<T>>');
+      expect(out).toContain("Accept: 'text/event-stream'");
+      expect(out).toContain("'Last-Event-ID'");
+      expect(out).toContain('getReader()');
+      expect(out).toContain('new TextDecoder()');
+      expect(out).toContain('__parseSseFrame');
+      expect(out).toContain('JSON.parse');
+    });
+
+    it('exports __sse in multi-file but keeps __parseSseFrame module-private', () => {
+      const out = renderRuntime('https://api.example.com', false, true, 'throw', true);
+      expect(out).toContain('export async function* __sse');
+      expect(out).not.toContain('export function __parseSseFrame');
+      expect(out).not.toContain('export async function __parseSseFrame');
+    });
+  });
+});
diff --git a/packages/openapi-typescript/src/emitters/__tests__/sample.test.ts b/packages/openapi-typescript/src/emitters/__tests__/sample.test.ts
new file mode 100644
index 0000000000..9313a9288f
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/__tests__/sample.test.ts
@@ -0,0 +1,356 @@
+import type { NamedSchemaModel, SchemaModel } from '../../ir/model.js';
+import { sampleValue, SampleExpression } from '../sample.js';
+
+describe('sampleValue', () => {
+  it('samples scalars with deterministic, format-aware values', () => {
+    expect(sampleValue({ kind: 'scalar', scalar: 'string' }, [])).toBe('string');
+    expect(sampleValue({ kind: 'scalar', scalar: 'integer' }, [])).toBe(0);
+    expect(sampleValue({ kind: 'scalar', scalar: 'number' }, [])).toBe(0);
+    expect(sampleValue({ kind: 'scalar', scalar: 'boolean' }, [])).toBe(true);
+    expect(
+      sampleValue({ kind: 'scalar', scalar: 'string', metadata: { format: 'email' } }, [])
+    ).toBe('user@example.com');
+    expect(
+      sampleValue({ kind: 'scalar', scalar: 'string', metadata: { format: 'uuid' } }, [])
+    ).toBe('00000000-0000-4000-8000-000000000000');
+    expect(
+      sampleValue({ kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } }, [])
+    ).toBe('2024-01-01T00:00:00Z');
+    expect(
+      sampleValue({ kind: 'scalar', scalar: 'string', metadata: { format: 'date' } }, [])
+    ).toBe('2024-01-01');
+    expect(sampleValue({ kind: 'scalar', scalar: 'string', metadata: { format: 'uri' } }, [])).toBe(
+      'https://example.com'
+    );
+    expect(sampleValue({ kind: 'scalar', scalar: 'string', metadata: { format: 'url' } }, [])).toBe(
+      'https://example.com'
+    );
+  });
+
+  it('samples a `format: binary` field as a `new Blob([])` raw expression (not a JSON literal)', () => {
+    const sampled = sampleValue(
+      { kind: 'scalar', scalar: 'string', metadata: { format: 'binary' } },
+      []
+    );
+    expect(sampled).toBeInstanceOf(SampleExpression);
+    expect((sampled as SampleExpression).code).toBe('new Blob([])');
+  });
+
+  it('samples a `format: binary` field as `new Blob([])` even when an example is present', () => {
+    // The generated type is `Blob` regardless of any spec example, so baking the
+    // example string would not type-check — the type-demanded expression wins.
+    expect(
+      sampleValue(
+        { kind: 'scalar', scalar: 'string', metadata: { format: 'binary', example: 'AAAA' } },
+        []
+      )
+    ).toBeInstanceOf(SampleExpression);
+  });
+
+  it('samples date/date-time as `new Date(...)` when dateType is `Date`', () => {
+    const dt = sampleValue(
+      { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+      [],
+      { dateType: 'Date' }
+    );
+    expect(dt).toBeInstanceOf(SampleExpression);
+    expect((dt as SampleExpression).code).toBe('new Date("2024-01-01T00:00:00Z")');
+
+    const d = sampleValue({ kind: 'scalar', scalar: 'string', metadata: { format: 'date' } }, [], {
+      dateType: 'Date',
+    });
+    expect((d as SampleExpression).code).toBe('new Date("2024-01-01")');
+  });
+
+  it('samples date-time as `new Date(...)` even with an example when dateType is `Date`', () => {
+    expect(
+      sampleValue(
+        {
+          kind: 'scalar',
+          scalar: 'string',
+          metadata: { format: 'date-time', example: '2020-05-05T00:00:00Z' },
+        },
+        [],
+        { dateType: 'Date' }
+      )
+    ).toBeInstanceOf(SampleExpression);
+  });
+
+  it('under dateType `Date`, a non-date scalar still samples normally (no type demand)', () => {
+    expect(
+      sampleValue({ kind: 'scalar', scalar: 'string', metadata: { format: 'email' } }, [], {
+        dateType: 'Date',
+      })
+    ).toBe('user@example.com');
+  });
+
+  it('regression: default dateType `string` bakes the ISO string and still honors an example', () => {
+    expect(
+      sampleValue({ kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } }, [])
+    ).toBe('2024-01-01T00:00:00Z');
+    expect(
+      sampleValue(
+        {
+          kind: 'scalar',
+          scalar: 'string',
+          metadata: { format: 'date-time', example: '2020-01-01T00:00:00Z' },
+        },
+        []
+      )
+    ).toBe('2020-01-01T00:00:00Z');
+  });
+
+  it('prefers example then default over synthesis', () => {
+    expect(
+      sampleValue({ kind: 'scalar', scalar: 'string', metadata: { example: 'Ada' } }, [])
+    ).toBe('Ada');
+    expect(sampleValue({ kind: 'scalar', scalar: 'string', metadata: { default: 'D' } }, [])).toBe(
+      'D'
+    );
+    expect(
+      sampleValue(
+        { kind: 'scalar', scalar: 'string', metadata: { example: 'E', default: 'D' } },
+        []
+      )
+    ).toBe('E');
+  });
+
+  it('samples enum (first value) and literal (its value)', () => {
+    expect(sampleValue({ kind: 'enum', scalar: 'string', values: ['a', 'b'] }, [])).toBe('a');
+    expect(sampleValue({ kind: 'literal', value: 42 }, [])).toBe(42);
+  });
+
+  it('samples objects (all properties) and arrays (one item)', () => {
+    const obj: SchemaModel = {
+      kind: 'object',
+      properties: [
+        { name: 'id', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
+        { name: 'tag', schema: { kind: 'scalar', scalar: 'string' }, required: false },
+      ],
+    };
+    expect(sampleValue(obj, [])).toEqual({ id: 0, tag: 'string' });
+    expect(
+      sampleValue({ kind: 'array', items: { kind: 'scalar', scalar: 'boolean' } }, [])
+    ).toEqual([true]);
+  });
+
+  it('resolves refs against the named-schema set', () => {
+    const schemas: NamedSchemaModel[] = [
+      {
+        name: 'Pet',
+        schema: {
+          kind: 'object',
+          properties: [
+            { name: 'name', schema: { kind: 'scalar', scalar: 'string' }, required: true },
+          ],
+        },
+      },
+    ];
+    expect(sampleValue({ kind: 'ref', name: 'Pet' }, schemas)).toEqual({ name: 'string' });
+  });
+
+  it('returns null for an unresolved ref', () => {
+    expect(sampleValue({ kind: 'ref', name: 'Missing' }, [])).toBeNull();
+  });
+
+  it('terminates a recursive ref behind an OPTIONAL property by omitting it (a null would not type-check)', () => {
+    // `next?: Node` is `Node | undefined`; a `null` there is a TS2322. Omitting the
+    // optional property is the type-correct way to break the cycle.
+    const schemas: NamedSchemaModel[] = [
+      {
+        name: 'Node',
+        schema: {
+          kind: 'object',
+          properties: [{ name: 'next', schema: { kind: 'ref', name: 'Node' }, required: false }],
+        },
+      },
+    ];
+    expect(sampleValue({ kind: 'ref', name: 'Node' }, schemas)).toEqual({});
+  });
+
+  it('terminates a recursive ref behind an ARRAY with an empty array (a valid `T[]`)', () => {
+    // A tree: `children: Category[]` (required). At the cycle the array must collapse to
+    // `[]` — which IS a valid `Category[]` — rather than `[null]` (TS2322).
+    const schemas: NamedSchemaModel[] = [
+      {
+        name: 'Category',
+        schema: {
+          kind: 'object',
+          properties: [
+            { name: 'id', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
+            {
+              name: 'children',
+              schema: { kind: 'array', items: { kind: 'ref', name: 'Category' } },
+              required: true,
+            },
+          ],
+        },
+      },
+    ];
+    expect(sampleValue({ kind: 'ref', name: 'Category' }, schemas)).toEqual({
+      id: 0,
+      children: [],
+    });
+  });
+
+  it('terminates a recursive ref behind a RECORD with an empty record', () => {
+    const schemas: NamedSchemaModel[] = [
+      {
+        name: 'Tree',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'nodes',
+              schema: { kind: 'record', value: { kind: 'ref', name: 'Tree' } },
+              required: true,
+            },
+          ],
+        },
+      },
+    ];
+    expect(sampleValue({ kind: 'ref', name: 'Tree' }, schemas)).toEqual({
+      nodes: {},
+    });
+  });
+
+  it('a REQUIRED direct self-ref is genuinely uninhabitable, so it falls back to null', () => {
+    // `self: Node` (required, not behind an array/optional) cannot be finitely constructed;
+    // null is the only available stand-in (and the schema itself is uninhabitable).
+    const schemas: NamedSchemaModel[] = [
+      {
+        name: 'Node',
+        schema: {
+          kind: 'object',
+          properties: [{ name: 'self', schema: { kind: 'ref', name: 'Node' }, required: true }],
+        },
+      },
+    ];
+    expect(sampleValue({ kind: 'ref', name: 'Node' }, schemas)).toEqual({ self: null });
+  });
+
+  it('a self-referential union with no inhabitable member resolves to null', () => {
+    const schemas: NamedSchemaModel[] = [
+      { name: 'A', schema: { kind: 'union', members: [{ kind: 'ref', name: 'A' }] } },
+    ];
+    expect(sampleValue({ kind: 'ref', name: 'A' }, schemas)).toBeNull();
+  });
+
+  it('samples union (first member), intersection (merged objects), null, unknown, record', () => {
+    expect(
+      sampleValue(
+        { kind: 'union', members: [{ kind: 'literal', value: 'x' }, { kind: 'null' }] },
+        []
+      )
+    ).toBe('x');
+    expect(
+      sampleValue(
+        {
+          kind: 'intersection',
+          members: [
+            {
+              kind: 'object',
+              properties: [
+                { name: 'a', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
+              ],
+            },
+            {
+              kind: 'object',
+              properties: [
+                { name: 'b', schema: { kind: 'scalar', scalar: 'boolean' }, required: true },
+              ],
+            },
+          ],
+        },
+        []
+      )
+    ).toEqual({ a: 0, b: true });
+    expect(sampleValue({ kind: 'null' }, [])).toBeNull();
+    expect(sampleValue({ kind: 'unknown' }, [])).toBeNull();
+    expect(
+      sampleValue({ kind: 'record', value: { kind: 'scalar', scalar: 'string' } }, [])
+    ).toEqual({ key: 'string' });
+  });
+
+  it('samples omit by dropping the named keys from the base named schema', () => {
+    const schemas: NamedSchemaModel[] = [
+      {
+        name: 'Full',
+        schema: {
+          kind: 'object',
+          properties: [
+            { name: 'id', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
+            { name: 'secret', schema: { kind: 'scalar', scalar: 'string' }, required: false },
+          ],
+        },
+      },
+    ];
+    // omit.base is a string (named schema reference), not a SchemaModel
+    expect(sampleValue({ kind: 'omit', base: 'Full', keys: ['secret'] }, schemas)).toEqual({
+      id: 0,
+    });
+  });
+
+  it('returns null for omit with an unresolved base', () => {
+    expect(sampleValue({ kind: 'omit', base: 'Missing', keys: ['x'] }, [])).toBeNull();
+  });
+
+  it('returns base value unchanged for omit when base resolves to a non-object', () => {
+    const schemas: NamedSchemaModel[] = [
+      { name: 'Scalar', schema: { kind: 'scalar', scalar: 'string' } },
+    ];
+    expect(sampleValue({ kind: 'omit', base: 'Scalar', keys: ['x'] }, schemas)).toBe('string');
+  });
+
+  it('omit does not mutate the base schema — sampling the same omit node twice yields independent objects', () => {
+    const schemas: NamedSchemaModel[] = [
+      {
+        name: 'Full',
+        schema: {
+          kind: 'object',
+          properties: [
+            { name: 'id', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
+            { name: 'secret', schema: { kind: 'scalar', scalar: 'string' }, required: false },
+          ],
+        },
+      },
+    ];
+    const omitSchema: SchemaModel = { kind: 'omit', base: 'Full', keys: ['secret'] };
+    // First sample should drop 'secret'
+    const first = sampleValue(omitSchema, schemas) as Record<string, unknown>;
+    expect(first).toEqual({ id: 0 });
+    // The base named schema 'Full' must still produce both keys (no mutation leaked)
+    expect(sampleValue({ kind: 'ref', name: 'Full' }, schemas)).toEqual({
+      id: 0,
+      secret: 'string',
+    });
+    // Second omit sample must still work correctly
+    const second = sampleValue(omitSchema, schemas) as Record<string, unknown>;
+    expect(second).toEqual({ id: 0 });
+  });
+
+  it('returns null for a union with no members', () => {
+    expect(sampleValue({ kind: 'union', members: [] }, [])).toBeNull();
+  });
+
+  it('intersection skips non-object members', () => {
+    // A union member that resolves to a scalar (non-object) should be skipped in reduce
+    expect(
+      sampleValue(
+        {
+          kind: 'intersection',
+          members: [
+            { kind: 'scalar', scalar: 'string' },
+            {
+              kind: 'object',
+              properties: [
+                { name: 'a', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
+              ],
+            },
+          ],
+        },
+        []
+      )
+    ).toEqual({ a: 0 });
+  });
+});
diff --git a/packages/openapi-typescript/src/emitters/__tests__/sse.deletion.test.ts b/packages/openapi-typescript/src/emitters/__tests__/sse.deletion.test.ts
new file mode 100644
index 0000000000..22b914ca4b
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/__tests__/sse.deletion.test.ts
@@ -0,0 +1,72 @@
+// Deletion test guarding the SSE gating seam: the `__sse` runtime block and the
+// public `sse` aggregate must appear ONLY when a model declares a
+// `text/event-stream` operation. A non-streaming model must be byte-free of
+// both — this protects the "non-SSE clients are unchanged" invariant.
+import type { ApiModel } from '../../ir/model.js';
+import { emitSingleFile } from '../client.js';
+import { apiModel, namedSchema, operation } from './fixtures.js';
+
+/** A model with one SSE op (event-stream success + an `itemSchema` ref). */
+function sseModel(): ApiModel {
+  return apiModel({
+    schemas: [namedSchema('Message', { kind: 'object', properties: [] })],
+    services: [
+      {
+        name: 'Default',
+        operations: [
+          operation({
+            name: 'streamMessages',
+            path: '/stream',
+            successResponses: [
+              {
+                contentType: 'text/event-stream',
+                status: 200,
+                schema: { kind: 'unknown' },
+                itemSchema: { kind: 'ref', name: 'Message' },
+              },
+            ],
+          }),
+        ],
+      },
+    ],
+  });
+}
+
+/** A model with one plain JSON op (no streaming). */
+function plainModel(): ApiModel {
+  return apiModel({
+    schemas: [namedSchema('Thing', { kind: 'object', properties: [] })],
+    services: [
+      {
+        name: 'Default',
+        operations: [
+          operation({
+            name: 'getThing',
+            path: '/thing',
+            successResponses: [
+              {
+                contentType: 'application/json',
+                schema: { kind: 'ref', name: 'Thing' },
+                status: 200,
+              },
+            ],
+          }),
+        ],
+      },
+    ],
+  });
+}
+
+describe('SSE gating seam (deletion test)', () => {
+  it('emits the __sse runtime + the sse aggregate when an op streams', () => {
+    const out = emitSingleFile(sseModel());
+    expect(out).toContain('async function* __sse');
+    expect(out).toContain('export const sse =');
+  });
+
+  it('emits NEITHER __sse NOR the sse aggregate when no op streams', () => {
+    const out = emitSingleFile(plainModel());
+    expect(out).not.toContain('async function* __sse');
+    expect(out).not.toContain('export const sse =');
+  });
+});
diff --git a/packages/openapi-typescript/src/emitters/__tests__/sse.test.ts b/packages/openapi-typescript/src/emitters/__tests__/sse.test.ts
new file mode 100644
index 0000000000..a3c821833f
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/__tests__/sse.test.ts
@@ -0,0 +1,125 @@
+import type { ResponseBodyModel, SchemaModel } from '../../ir/model.js';
+import { isSseOp, partitionOps, sseDataKind, sseEventType, sseFragmentName } from '../sse.js';
+import { printNodes } from '../ts.js';
+import { operation } from './fixtures.js';
+
+/** An operation whose success response streams `text/event-stream`. */
+function sseOp(response: Partial<ResponseBodyModel>, name = 'streamMessages') {
+  return operation({
+    name,
+    successResponses: [
+      { contentType: 'text/event-stream', schema: { kind: 'unknown' }, ...response, status: 200 },
+    ],
+  });
+}
+
+describe('isSseOp', () => {
+  it('is true for a success response with the text/event-stream content type', () => {
+    expect(isSseOp(sseOp({}))).toBe(true);
+  });
+
+  it('matches with parameters and is case-insensitive', () => {
+    expect(isSseOp(sseOp({ contentType: 'text/event-stream; charset=utf-8' }))).toBe(true);
+    expect(isSseOp(sseOp({ contentType: 'Text/Event-Stream' }))).toBe(true);
+  });
+
+  it('is false for a plain JSON operation', () => {
+    expect(
+      isSseOp(
+        operation({
+          successResponses: [
+            { contentType: 'application/json', schema: { kind: 'ref', name: 'Pet' }, status: 200 },
+          ],
+        })
+      )
+    ).toBe(false);
+  });
+
+  it('is false for an operation with no responses', () => {
+    expect(isSseOp(operation({}))).toBe(false);
+  });
+});
+
+describe('sseEventType', () => {
+  it('uses the per-item schema when present (a ref → a Message reference)', () => {
+    const out = printNodes([
+      sseEventType(sseOp({ itemSchema: { kind: 'ref', name: 'Message' } }), 'string'),
+    ]);
+    expect(out).toContain('Message');
+  });
+
+  it('falls back to the response schema when it is meaningful', () => {
+    const out = printNodes([
+      sseEventType(sseOp({ schema: { kind: 'ref', name: 'Token' } }), 'string'),
+    ]);
+    expect(out).toContain('Token');
+  });
+
+  it('ignores a typeless `itemSchema` and falls back to the response schema', () => {
+    const out = printNodes([
+      sseEventType(
+        sseOp({ itemSchema: { kind: 'unknown' }, schema: { kind: 'ref', name: 'Token' } }),
+        'string'
+      ),
+    ]);
+    expect(out).toContain('Token');
+  });
+
+  it('falls back to the `string` keyword when no schema is declared', () => {
+    expect(printNodes([sseEventType(sseOp({}), 'string')])).toBe('string');
+  });
+
+  it('falls back to `string` when the op is not an SSE op at all', () => {
+    expect(printNodes([sseEventType(operation({}), 'string')])).toBe('string');
+  });
+});
+
+describe('sseDataKind', () => {
+  it("is 'json' for object/ref/array/record/union/intersection event types", () => {
+    const json: SchemaModel[] = [
+      { kind: 'object', properties: [] },
+      { kind: 'ref', name: 'Message' },
+      { kind: 'array', items: { kind: 'scalar', scalar: 'string' } },
+      { kind: 'record', value: { kind: 'scalar', scalar: 'string' } },
+      { kind: 'union', members: [{ kind: 'ref', name: 'A' }] },
+      { kind: 'intersection', members: [{ kind: 'ref', name: 'A' }] },
+    ];
+    for (const itemSchema of json) expect(sseDataKind(sseOp({ itemSchema }))).toBe('json');
+  });
+
+  it("is 'text' for the string fallback (no schema)", () => {
+    expect(sseDataKind(sseOp({}))).toBe('text');
+  });
+
+  it("is 'text' for a typeless `itemSchema` (no meaningful schema)", () => {
+    expect(sseDataKind(sseOp({ itemSchema: { kind: 'unknown' } }))).toBe('text');
+  });
+
+  it("is 'text' for scalar/literal/enum/null event types", () => {
+    const text: SchemaModel[] = [
+      { kind: 'scalar', scalar: 'string' },
+      { kind: 'literal', value: 'x' },
+      { kind: 'enum', values: ['a'], scalar: 'string' },
+      { kind: 'null' },
+    ];
+    for (const itemSchema of text) expect(sseDataKind(sseOp({ itemSchema }))).toBe('text');
+  });
+});
+
+describe('partitionOps', () => {
+  it('splits ops into regular and sse, preserving order', () => {
+    const a = operation({ name: 'a' });
+    const s1 = sseOp({}, 's1');
+    const b = operation({ name: 'b' });
+    const s2 = sseOp({}, 's2');
+    const { regular, sse } = partitionOps([a, s1, b, s2]);
+    expect(regular.map((o) => o.name)).toEqual(['a', 'b']);
+    expect(sse.map((o) => o.name)).toEqual(['s1', 's2']);
+  });
+});
+
+describe('sseFragmentName', () => {
+  it('prefixes the class name with __sse_', () => {
+    expect(sseFragmentName('MessagesService')).toBe('__sse_MessagesService');
+  });
+});
diff --git a/packages/openapi-typescript/src/emitters/__tests__/swr.test.ts b/packages/openapi-typescript/src/emitters/__tests__/swr.test.ts
new file mode 100644
index 0000000000..0004e0be7e
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/__tests__/swr.test.ts
@@ -0,0 +1,214 @@
+import { renderSwrModule } from '../swr.js';
+import { apiModel, namedSchema, operation, param, SCALAR } from './fixtures.js';
+
+const SDK = './client.js';
+
+function render(ops: Parameters<typeof operation>[0][], argsStyle: 'flat' | 'grouped' = 'grouped') {
+  return renderSwrModule(
+    apiModel({ services: [{ name: 'Default', operations: ops.map(operation) }] }),
+    { sdkModule: SDK, argsStyle }
+  );
+}
+
+describe('renderSwrModule', () => {
+  it('returns empty string when the model has no operations', () => {
+    expect(renderSwrModule(apiModel(), { sdkModule: SDK, argsStyle: 'flat' })).toBe('');
+  });
+
+  it('skips SSE operations (not exported by the sdk) and wraps only the regular ones', () => {
+    const out = render([
+      {
+        name: 'getPet',
+        method: 'get',
+        path: '/pets/{id}',
+        pathParams: [param('id', 'path', true)],
+      },
+      {
+        name: 'streamEvents',
+        method: 'get',
+        path: '/events',
+        successResponses: [{ contentType: 'text/event-stream', schema: SCALAR, status: 200 }],
+      },
+    ]);
+    expect(out).toContain('useGetPet');
+    expect(out).not.toContain('streamEvents');
+  });
+
+  it('skips an op whose <Op>Variables name collides with a schema', () => {
+    const out = renderSwrModule(
+      apiModel({
+        schemas: [namedSchema('GetUserVariables', { kind: 'object', properties: [] })],
+        services: [
+          {
+            name: 'Default',
+            operations: [
+              operation({
+                name: 'getUser',
+                method: 'get',
+                path: '/u/{id}',
+                pathParams: [param('id', 'path', true)],
+              }),
+              operation({ name: 'listUsers', method: 'get' }),
+            ],
+          },
+        ],
+      }),
+      { sdkModule: SDK, argsStyle: 'grouped' }
+    );
+    expect(out).not.toContain('useGetUser');
+    expect(out).toContain('useListUsers');
+  });
+
+  it('returns empty string when every operation is SSE', () => {
+    const out = render([
+      {
+        name: 'streamEvents',
+        method: 'get',
+        path: '/events',
+        successResponses: [{ contentType: 'text/event-stream', schema: SCALAR, status: 200 }],
+      },
+    ]);
+    expect(out).toBe('');
+  });
+
+  describe('query operation (GET) with inputs', () => {
+    const getOp = {
+      name: 'getPet',
+      method: 'get' as const,
+      path: '/pets/{petId}',
+      pathParams: [param('petId', 'path', true)],
+      queryParams: [param('expand', 'query', false)],
+    };
+
+    it('emits a key factory + useSWR hook forwarding (vars, init)', () => {
+      const out = render([getOp]);
+      expect(out).toContain(
+        'export const getPetKey = (vars: GetPetVariables) => ["getPet", vars] as const;'
+      );
+      expect(out).toContain(
+        'export function useGetPet(vars: GetPetVariables, init?: RequestOptions) {'
+      );
+      expect(out).toContain('return useSWR(getPetKey(vars), () => getPet(vars, init));');
+    });
+  });
+
+  describe('no-input query operation', () => {
+    it('drops the vars param; key takes no args', () => {
+      const out = render([{ name: 'listPets', method: 'get', path: '/pets' }]);
+      expect(out).toContain('export const listPetsKey = () => ["listPets"] as const;');
+      expect(out).toContain('export function useListPets(init?: RequestOptions) {');
+      expect(out).toContain('return useSWR(listPetsKey(), () => listPets(init));');
+    });
+  });
+
+  describe('mutation operation (POST) with a body', () => {
+    const postOp = {
+      name: 'createPet',
+      method: 'post' as const,
+      path: '/pets',
+      requestBody: { contentType: 'application/json', schema: SCALAR, required: true },
+    };
+
+    it('emits a useSWRMutation hook with key + (key, { arg }) trigger', () => {
+      const out = render([postOp]);
+      expect(out).toContain('export function useCreatePet() {');
+      expect(out).toContain('return useSWRMutation("createPet", (_key: string, { arg }: {');
+      expect(out).toContain('arg: CreatePetVariables;');
+      expect(out).toContain('}) => createPet(arg));');
+    });
+  });
+
+  describe('no-input mutation operation', () => {
+    it('drops the arg; trigger takes no args', () => {
+      const out = render([{ name: 'ping', method: 'post', path: '/ping' }]);
+      expect(out).toContain('export function usePing() {');
+      expect(out).toContain('return useSWRMutation("ping", () => ping());');
+    });
+  });
+
+  describe('flat forwarding', () => {
+    it('query: spreads vars.<path>, vars.params, then init (URL-template order)', () => {
+      const out = render(
+        [
+          {
+            name: 'getPet',
+            method: 'get',
+            path: '/pets/{petId}',
+            pathParams: [param('petId', 'path', true)],
+            queryParams: [param('expand', 'query', false)],
+          },
+        ],
+        'flat'
+      );
+      expect(out).toContain('() => getPet(vars.petId, vars.params, init)');
+    });
+
+    it('mutation: spreads arg.<path> (URL-template order), then params, body, headers', () => {
+      const out = render(
+        [
+          {
+            name: 'replace',
+            method: 'put',
+            path: '/a/{a}/b/{b}',
+            pathParams: [param('b', 'path', true), param('a', 'path', true)],
+            queryParams: [param('q', 'query', false)],
+            requestBody: { contentType: 'application/json', schema: SCALAR, required: true },
+            headerParams: [param('X-Trace', 'header', false)],
+          },
+        ],
+        'flat'
+      );
+      expect(out).toContain('=> replace(arg.a, arg.b, arg.params, arg.body, arg.headers)');
+    });
+  });
+
+  describe('module header (imports)', () => {
+    it('imports useSWR only when a query op exists, useSWRMutation only when a mutation exists', () => {
+      const queryOnly = render([{ name: 'listPets', method: 'get', path: '/pets' }]);
+      expect(queryOnly).toContain('import useSWR from "swr";');
+      expect(queryOnly).not.toContain('swr/mutation');
+
+      const mutationOnly = render([{ name: 'ping', method: 'post', path: '/ping' }]);
+      expect(mutationOnly).toContain('import useSWRMutation from "swr/mutation";');
+      expect(mutationOnly).not.toContain('import useSWR from "swr";');
+    });
+
+    it('imports used opFns + Variables types + RequestOptions from the sdk module', () => {
+      const out = render([
+        {
+          name: 'getPet',
+          method: 'get',
+          path: '/pets/{petId}',
+          pathParams: [param('petId', 'path', true)],
+        },
+        {
+          name: 'createPet',
+          method: 'post',
+          path: '/pets',
+          requestBody: { contentType: 'application/json', schema: SCALAR, required: true },
+        },
+      ]);
+      expect(out).toContain(
+        'import { createPet, getPet, type CreatePetVariables, type GetPetVariables, type RequestOptions } from "./client.js";'
+      );
+    });
+
+    it('omits RequestOptions when there are only mutations (no query)', () => {
+      const out = render([
+        {
+          name: 'createPet',
+          method: 'post',
+          path: '/pets',
+          requestBody: { contentType: 'application/json', schema: SCALAR, required: true },
+        },
+      ]);
+      expect(out).toContain('import { createPet, type CreatePetVariables } from "./client.js";');
+      expect(out).not.toContain('RequestOptions');
+    });
+
+    it('imports only the opFn for a no-input op (no Variables type)', () => {
+      const out = render([{ name: 'ping', method: 'post', path: '/ping' }]);
+      expect(out).toContain('import { ping } from "./client.js";');
+    });
+  });
+});
diff --git a/packages/openapi-typescript/src/emitters/__tests__/tanstack-query.test.ts b/packages/openapi-typescript/src/emitters/__tests__/tanstack-query.test.ts
new file mode 100644
index 0000000000..9616094b88
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/__tests__/tanstack-query.test.ts
@@ -0,0 +1,282 @@
+import { renderTanstackModule } from '../tanstack-query.js';
+import { apiModel, namedSchema, operation, param, SCALAR } from './fixtures.js';
+
+const SDK = './client.js';
+
+function render(
+  ops: Parameters<typeof operation>[0][],
+  argsStyle: 'flat' | 'grouped',
+  framework: 'react' | 'vue' | 'svelte' | 'solid' = 'react'
+) {
+  return renderTanstackModule(
+    apiModel({ services: [{ name: 'Default', operations: ops.map(operation) }] }),
+    { argsStyle, sdkModule: SDK, framework }
+  );
+}
+
+describe('renderTanstackModule', () => {
+  it('returns empty string when the model has no operations', () => {
+    expect(
+      renderTanstackModule(apiModel(), { argsStyle: 'flat', sdkModule: SDK, framework: 'react' })
+    ).toBe('');
+  });
+
+  it('skips SSE operations (not exported by the sdk) and wraps only the regular ones', () => {
+    const out = render(
+      [
+        {
+          name: 'getPet',
+          method: 'get',
+          path: '/pets/{id}',
+          pathParams: [param('id', 'path', true)],
+        },
+        {
+          name: 'streamEvents',
+          method: 'get',
+          path: '/events',
+          successResponses: [{ contentType: 'text/event-stream', schema: SCALAR, status: 200 }],
+        },
+      ],
+      'grouped'
+    );
+    expect(out).toContain('getPetOptions');
+    // The SSE op is neither imported nor wrapped.
+    expect(out).not.toContain('streamEvents');
+  });
+
+  it('skips an op whose <Op>Variables name collides with a schema (would import the wrong type)', () => {
+    const out = renderTanstackModule(
+      apiModel({
+        schemas: [namedSchema('GetUserVariables', { kind: 'object', properties: [] })],
+        services: [
+          {
+            name: 'Default',
+            operations: [
+              operation({
+                name: 'getUser',
+                method: 'get',
+                path: '/u/{id}',
+                pathParams: [param('id', 'path', true)],
+              }),
+              operation({ name: 'listUsers', method: 'get' }),
+            ].map((o) => o),
+          },
+        ],
+      }),
+      { argsStyle: 'grouped', sdkModule: SDK, framework: 'react' }
+    );
+    // The colliding op is skipped; the non-colliding one is still wrapped.
+    expect(out).not.toContain('getUserOptions');
+    expect(out).toContain('listUsersOptions');
+  });
+
+  it('returns empty string when every operation is SSE', () => {
+    const out = render(
+      [
+        {
+          name: 'streamEvents',
+          method: 'get',
+          path: '/events',
+          successResponses: [{ contentType: 'text/event-stream', schema: SCALAR, status: 200 }],
+        },
+      ],
+      'flat'
+    );
+    expect(out).toBe('');
+  });
+
+  describe('query operation (GET) with path + query params', () => {
+    const getOp = {
+      name: 'getPet',
+      method: 'get' as const,
+      path: '/pets/{petId}',
+      pathParams: [param('petId', 'path', true)],
+      queryParams: [param('expand', 'query', false)],
+    };
+
+    it('emits queryKey + Options factories with grouped forwarding', () => {
+      const out = render([getOp], 'grouped');
+      expect(out).toContain(
+        'export const getPetQueryKey = (vars: GetPetVariables) => ["getPet", vars] as const;'
+      );
+      expect(out).toContain('queryOptions({');
+      expect(out).toContain('queryKey: getPetQueryKey(vars)');
+      expect(out).toContain('queryFn: () => getPet(vars, init)');
+      expect(out).toContain(
+        'export const getPetOptions = (vars: GetPetVariables, init?: RequestOptions) =>'
+      );
+    });
+
+    it('emits flat positional forwarding (path ident, then params, then init)', () => {
+      const out = render([getOp], 'flat');
+      expect(out).toContain('queryFn: () => getPet(vars.petId, vars.params, init)');
+    });
+  });
+
+  describe('mutation operation (POST) with a body', () => {
+    const postOp = {
+      name: 'createPet',
+      method: 'post' as const,
+      path: '/pets',
+      requestBody: { contentType: 'application/json', schema: SCALAR, required: true },
+    };
+
+    it('emits a Mutation factory with mutationKey + mutationFn (grouped)', () => {
+      const out = render([postOp], 'grouped');
+      expect(out).toContain('export const createPetMutation = () => ({');
+      expect(out).toContain('mutationKey: ["createPet"] as const');
+      expect(out).toContain('mutationFn: (vars: CreatePetVariables) => createPet(vars)');
+    });
+
+    it('forwards the body positionally in flat mode (no trailing init)', () => {
+      const out = render([postOp], 'flat');
+      expect(out).toContain('mutationFn: (vars: CreatePetVariables) => createPet(vars.body)');
+    });
+  });
+
+  describe('flat forwarding ordering', () => {
+    it('orders path params (URL-template order), then params, body, headers', () => {
+      const op = {
+        name: 'replace',
+        method: 'put' as const,
+        path: '/a/{a}/b/{b}',
+        pathParams: [param('b', 'path', true), param('a', 'path', true)],
+        queryParams: [param('q', 'query', false)],
+        requestBody: { contentType: 'application/json', schema: SCALAR, required: true },
+        headerParams: [param('X-Trace', 'header', false)],
+      };
+      const out = render([op], 'flat');
+      expect(out).toContain(
+        'mutationFn: (vars: ReplaceVariables) => replace(vars.a, vars.b, vars.params, vars.body, vars.headers)'
+      );
+    });
+  });
+
+  describe('flat forwarding with an undeclared path placeholder', () => {
+    it('skips a `{placeholder}` that has no matching declared path param', () => {
+      const op = {
+        name: 'getThing',
+        method: 'get' as const,
+        path: '/things/{id}/{undeclared}',
+        pathParams: [param('id', 'path', true)],
+      };
+      const out = render([op], 'flat');
+      // Only `id` is forwarded; `{undeclared}` has no param, so it is dropped.
+      expect(out).toContain('queryFn: () => getThing(vars.id, init)');
+    });
+  });
+
+  describe('no-input operations', () => {
+    it('query: no vars param, queryKey without vars, forwards init', () => {
+      const out = render([{ name: 'listPets', method: 'get', path: '/pets' }], 'grouped');
+      expect(out).toContain('export const listPetsQueryKey = () => ["listPets"] as const;');
+      expect(out).toContain('export const listPetsOptions = (init?: RequestOptions) =>');
+      expect(out).toContain('queryKey: listPetsQueryKey()');
+      expect(out).toContain('queryFn: () => listPets(init)');
+    });
+
+    it('mutation: mutationFn takes no vars, calls with no args', () => {
+      const out = render([{ name: 'ping', method: 'post', path: '/ping' }], 'grouped');
+      expect(out).toContain('export const pingMutation = () => ({');
+      expect(out).toContain('mutationFn: () => ping()');
+    });
+
+    it('flat no-input query forwards init too', () => {
+      const out = render([{ name: 'listPets', method: 'get', path: '/pets' }], 'flat');
+      expect(out).toContain('queryFn: () => listPets(init)');
+    });
+  });
+
+  describe('module header (imports)', () => {
+    it('imports queryOptions only when a query op exists', () => {
+      const queryOnly = render([{ name: 'listPets', method: 'get', path: '/pets' }], 'grouped');
+      expect(queryOnly).toContain('import { queryOptions } from "@tanstack/react-query";');
+
+      const mutationOnly = render([{ name: 'ping', method: 'post', path: '/ping' }], 'grouped');
+      expect(mutationOnly).not.toContain('@tanstack/react-query');
+    });
+
+    it('imports used opFns + Variables types + RequestOptions from the sdk module', () => {
+      const out = render(
+        [
+          {
+            name: 'getPet',
+            method: 'get',
+            path: '/pets/{petId}',
+            pathParams: [param('petId', 'path', true)],
+          },
+          {
+            name: 'createPet',
+            method: 'post',
+            path: '/pets',
+            requestBody: { contentType: 'application/json', schema: SCALAR, required: true },
+          },
+        ],
+        'grouped'
+      );
+      expect(out).toContain(
+        'import { createPet, getPet, type CreatePetVariables, type GetPetVariables, type RequestOptions } from "./client.js";'
+      );
+    });
+
+    it('omits RequestOptions when there are only mutations (no query)', () => {
+      const out = render(
+        [
+          {
+            name: 'createPet',
+            method: 'post',
+            path: '/pets',
+            requestBody: { contentType: 'application/json', schema: SCALAR, required: true },
+          },
+        ],
+        'grouped'
+      );
+      expect(out).toContain('import { createPet, type CreatePetVariables } from "./client.js";');
+      expect(out).not.toContain('RequestOptions');
+    });
+
+    it('imports only the opFn for a no-input op (no Variables type)', () => {
+      const out = render([{ name: 'ping', method: 'post', path: '/ping' }], 'grouped');
+      expect(out).toContain('import { ping } from "./client.js";');
+    });
+  });
+
+  describe('queryFramework', () => {
+    const op = [{ name: 'listPets', method: 'get' as const, path: '/pets' }];
+
+    it('defaults to react: imports from @tanstack/react-query', () => {
+      expect(render(op, 'grouped')).toContain(
+        'import { queryOptions } from "@tanstack/react-query";'
+      );
+    });
+
+    it('imports from @tanstack/vue-query when framework is vue', () => {
+      expect(render(op, 'grouped', 'vue')).toContain(
+        'import { queryOptions } from "@tanstack/vue-query";'
+      );
+    });
+
+    it('changes only the import specifier — the rest of the body is byte-identical', () => {
+      const ops = [
+        {
+          name: 'getPet',
+          method: 'get' as const,
+          path: '/pets/{petId}',
+          pathParams: [param('petId', 'path', true)],
+        },
+        {
+          name: 'createPet',
+          method: 'post' as const,
+          path: '/pets',
+          requestBody: { contentType: 'application/json', schema: SCALAR, required: true },
+        },
+      ];
+      const react = render(ops, 'grouped', 'react');
+      const vue = render(ops, 'grouped', 'vue');
+      // Replace each rendering's import line with the other's; the documents must then match,
+      // proving the framework choice touches nothing but the `@tanstack/<framework>-query` string.
+      const importLine = (q: string) => `import { queryOptions } from "@tanstack/${q}-query";`;
+      expect(react.replace(importLine('react'), importLine('vue'))).toBe(vue);
+    });
+  });
+});
diff --git a/packages/openapi-typescript/src/emitters/__tests__/transformers.test.ts b/packages/openapi-typescript/src/emitters/__tests__/transformers.test.ts
new file mode 100644
index 0000000000..26d3693182
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/__tests__/transformers.test.ts
@@ -0,0 +1,904 @@
+import type { ApiModel, NamedSchemaModel } from '../../ir/model.js';
+import { renderTransformersModule } from '../transformers.js';
+
+const base: Omit<ApiModel, 'schemas'> = {
+  title: 'T',
+  version: '1',
+  baseUrl: 'https://x',
+  services: [],
+  securitySchemes: [],
+};
+
+function render(schemas: NamedSchemaModel[]): string {
+  return renderTransformersModule({ ...base, schemas }, { sdkModule: './client.js' });
+}
+
+describe('renderTransformersModule', () => {
+  it("returns '' when no schema has dates", () => {
+    expect(
+      render([
+        {
+          name: 'Plain',
+          schema: {
+            kind: 'object',
+            properties: [
+              { name: 'id', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
+            ],
+          },
+        },
+      ])
+    ).toBe('');
+  });
+
+  it("returns '' for an empty model", () => {
+    expect(render([])).toBe('');
+  });
+
+  it('converts a top-level date-time scalar field, guarded', () => {
+    const out = render([
+      {
+        name: 'Event',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'createdAt',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+              required: true,
+            },
+          ],
+        },
+      },
+    ]);
+    expect(out).toContain('export const transformEvent = (data: Event): Event =>');
+    expect(out).toContain('if (typeof data["createdAt"] === "string")');
+    expect(out).toContain('data["createdAt"] = new Date(data["createdAt"]);');
+    expect(out).toContain('return data;');
+    expect(out).toContain('import type { Event } from "./client.js";');
+  });
+
+  it('converts a `date` (not just date-time) scalar field', () => {
+    const out = render([
+      {
+        name: 'Birthday',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'day',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date' } },
+              required: false,
+            },
+          ],
+        },
+      },
+    ]);
+    expect(out).toContain('data["day"] = new Date(data["day"]);');
+  });
+
+  it('converts an array of date scalars, guarded', () => {
+    const out = render([
+      {
+        name: 'Log',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'timestamps',
+              schema: {
+                kind: 'array',
+                items: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+              },
+              required: true,
+            },
+          ],
+        },
+      },
+    ]);
+    expect(out).toContain('if (Array.isArray(data["timestamps"]))');
+    expect(out).toContain('data["timestamps"] = data["timestamps"].map(v => new Date(v));');
+  });
+
+  it('quotes a non-identifier key', () => {
+    const out = render([
+      {
+        name: 'Trace',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'x-at',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+              required: true,
+            },
+          ],
+        },
+      },
+    ]);
+    expect(out).toContain('if (typeof data["x-at"] === "string")');
+    expect(out).toContain('data["x-at"] = new Date(data["x-at"]);');
+  });
+
+  it('composes via a ref to a date-bearing schema', () => {
+    const out = render([
+      {
+        name: 'Person',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'born',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date' } },
+              required: true,
+            },
+          ],
+        },
+      },
+      {
+        name: 'Pet',
+        schema: {
+          kind: 'object',
+          properties: [{ name: 'owner', schema: { kind: 'ref', name: 'Person' }, required: false }],
+        },
+      },
+    ]);
+    expect(out).toContain('export const transformPerson = (data: Person): Person =>');
+    expect(out).toContain('export const transformPet = (data: Pet): Pet =>');
+    expect(out).toContain('if (data["owner"])');
+    expect(out).toContain('transformPerson(data["owner"]);');
+    expect(out).toContain('import type { Person, Pet } from "./client.js";');
+  });
+
+  it('does NOT emit a transform for a ref to a date-free schema', () => {
+    const out = render([
+      {
+        name: 'Tag',
+        schema: {
+          kind: 'object',
+          properties: [
+            { name: 'label', schema: { kind: 'scalar', scalar: 'string' }, required: true },
+          ],
+        },
+      },
+      {
+        name: 'Post',
+        schema: {
+          kind: 'object',
+          properties: [
+            { name: 'tag', schema: { kind: 'ref', name: 'Tag' }, required: false },
+            {
+              name: 'at',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+              required: true,
+            },
+          ],
+        },
+      },
+    ]);
+    expect(out).not.toContain('transformTag');
+    expect(out).toContain('export const transformPost');
+    expect(out).not.toContain('transformTag(data["tag"])');
+    expect(out).toContain('import type { Post } from "./client.js";');
+  });
+
+  it('composes via an array of refs to a date-bearing schema', () => {
+    const out = render([
+      {
+        name: 'Visit',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'on',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date' } },
+              required: true,
+            },
+          ],
+        },
+      },
+      {
+        name: 'History',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'visits',
+              schema: { kind: 'array', items: { kind: 'ref', name: 'Visit' } },
+              required: true,
+            },
+          ],
+        },
+      },
+    ]);
+    expect(out).toContain('if (Array.isArray(data["visits"]))');
+    expect(out).toContain('data["visits"].forEach(transformVisit);');
+  });
+
+  it('recurses into a nested inline object with a date', () => {
+    const out = render([
+      {
+        name: 'Order',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'meta',
+              required: false,
+              schema: {
+                kind: 'object',
+                properties: [
+                  {
+                    name: 'placedAt',
+                    schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+                    required: true,
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      },
+    ]);
+    expect(out).toContain('if (data["meta"])');
+    expect(out).toContain('if (typeof data["meta"]["placedAt"] === "string")');
+    expect(out).toContain('data["meta"]["placedAt"] = new Date(data["meta"]["placedAt"]);');
+  });
+
+  it('recurses into an array of inline objects with dates', () => {
+    const out = render([
+      {
+        name: 'Bundle',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'items',
+              required: true,
+              schema: {
+                kind: 'array',
+                items: {
+                  kind: 'object',
+                  properties: [
+                    {
+                      name: 'shippedAt',
+                      schema: {
+                        kind: 'scalar',
+                        scalar: 'string',
+                        metadata: { format: 'date-time' },
+                      },
+                      required: true,
+                    },
+                  ],
+                },
+              },
+            },
+          ],
+        },
+      },
+    ]);
+    expect(out).toContain('data["items"].forEach(item =>');
+    expect(out).toContain('if (typeof item["shippedAt"] === "string")');
+    expect(out).toContain('item["shippedAt"] = new Date(item["shippedAt"]);');
+  });
+
+  it('handles a top-level array named schema of date scalars', () => {
+    const out = render([
+      {
+        name: 'Dates',
+        schema: {
+          kind: 'array',
+          items: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+        },
+      },
+    ]);
+    expect(out).toContain('export const transformDates = (data: Dates): Dates =>');
+    expect(out).toContain('if (Array.isArray(data))');
+    expect(out).toContain('data = data.map(v => new Date(v));');
+  });
+
+  it('handles a top-level ref-to-date named schema', () => {
+    const out = render([
+      {
+        name: 'Inner',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'at',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+              required: true,
+            },
+          ],
+        },
+      },
+      {
+        name: 'Alias',
+        schema: { kind: 'ref', name: 'Inner' },
+      },
+    ]);
+    expect(out).toContain('export const transformAlias');
+    expect(out).toContain('transformInner(data)');
+  });
+
+  it('walks union members that bear dates', () => {
+    const out = render([
+      {
+        name: 'A',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'when',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+              required: true,
+            },
+          ],
+        },
+      },
+      {
+        name: 'Holder',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'value',
+              required: true,
+              schema: {
+                kind: 'union',
+                members: [
+                  { kind: 'ref', name: 'A' },
+                  { kind: 'scalar', scalar: 'string' },
+                ],
+              },
+            },
+          ],
+        },
+      },
+    ]);
+    expect(out).toContain('export const transformHolder');
+    // The union member's transform must be guarded by a runtime object-check and
+    // CAST to the member type — `data["value"]` is typed `A | string`, so a bare
+    // `transformA(data["value"])` would fail strict tsc (TS2345). The cast makes
+    // it compile; `transformA`'s own internal string guard keeps it a runtime
+    // no-op when the value is the string member.
+    expect(out).toContain('if (data["value"] && typeof data["value"] === "object")');
+    expect(out).toContain('transformA(data["value"] as A);');
+  });
+
+  it('guards + casts each date-bearing ref in a union of refs', () => {
+    const out = render([
+      {
+        name: 'A',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'when',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+              required: true,
+            },
+          ],
+        },
+      },
+      {
+        name: 'B',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'on',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date' } },
+              required: true,
+            },
+          ],
+        },
+      },
+      {
+        name: 'Holder',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'value',
+              required: true,
+              schema: {
+                kind: 'union',
+                members: [
+                  { kind: 'ref', name: 'A' },
+                  { kind: 'ref', name: 'B' },
+                ],
+              },
+            },
+          ],
+        },
+      },
+    ]);
+    // Both date-bearing members share one object-guard block; each transform is
+    // cast to its member type and is internally string-guarded, so applying the
+    // wrong member to a runtime value is a safe no-op.
+    expect(out).toContain('if (data["value"] && typeof data["value"] === "object")');
+    expect(out).toContain('transformA(data["value"] as A);');
+    expect(out).toContain('transformB(data["value"] as B);');
+  });
+
+  it('keeps the string guard for a date-scalar union member', () => {
+    const out = render([
+      {
+        name: 'H',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'v',
+              required: true,
+              schema: {
+                kind: 'union',
+                members: [
+                  { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+                  { kind: 'scalar', scalar: 'number' },
+                ],
+              },
+            },
+          ],
+        },
+      },
+    ]);
+    // A scalar date member's type is `Date` under --date-type Date, so the
+    // assignment type-checks against the `string` guard — no object-guard needed.
+    expect(out).toContain('if (typeof data["v"] === "string")');
+    expect(out).toContain('data["v"] = new Date(data["v"]);');
+    expect(out).not.toContain('typeof data["v"] === "object"');
+  });
+
+  it('skips a date-free ref member of a union', () => {
+    const out = render([
+      {
+        name: 'Plain',
+        schema: {
+          kind: 'object',
+          properties: [
+            { name: 'id', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
+          ],
+        },
+      },
+      {
+        name: 'A',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'when',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+              required: true,
+            },
+          ],
+        },
+      },
+      {
+        name: 'H',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'v',
+              required: true,
+              schema: {
+                kind: 'union',
+                members: [
+                  { kind: 'ref', name: 'Plain' },
+                  { kind: 'ref', name: 'A' },
+                ],
+              },
+            },
+          ],
+        },
+      },
+    ]);
+    expect(out).toContain('transformA(data["v"] as A);');
+    expect(out).not.toContain('transformPlain');
+  });
+
+  it('guards then recurses into an inline-object union member with a date', () => {
+    const out = render([
+      {
+        name: 'H',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'v',
+              required: true,
+              schema: {
+                kind: 'union',
+                members: [
+                  {
+                    kind: 'object',
+                    properties: [
+                      {
+                        name: 'at',
+                        schema: {
+                          kind: 'scalar',
+                          scalar: 'string',
+                          metadata: { format: 'date-time' },
+                        },
+                        required: true,
+                      },
+                    ],
+                  },
+                  { kind: 'scalar', scalar: 'string' },
+                ],
+              },
+            },
+          ],
+        },
+      },
+    ]);
+    // The object-guard narrows the union to its object member, so the inner
+    // property access + string-guarded assign type-checks.
+    expect(out).toContain('if (data["v"] && typeof data["v"] === "object")');
+    expect(out).toContain('if (typeof data["v"]["at"] === "string")');
+    expect(out).toContain('data["v"]["at"] = new Date(data["v"]["at"]);');
+  });
+
+  it('writes back into a record of date scalars by key', () => {
+    const out = render([
+      {
+        name: 'Calendar',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'days',
+              required: true,
+              schema: {
+                kind: 'record',
+                value: { kind: 'scalar', scalar: 'string', metadata: { format: 'date' } },
+              },
+            },
+          ],
+        },
+      },
+    ]);
+    // Records of date scalars must write back through the slot — a forEach loop
+    // variable can't, so iterate the keys and assign into the record.
+    expect(out).toContain('if (data["days"])');
+    expect(out).toContain('for (const __k of Object.keys(data["days"]))');
+    expect(out).toContain('if (typeof data["days"][__k] === "string")');
+    expect(out).toContain('data["days"][__k] = new Date(data["days"][__k]);');
+  });
+
+  it('does not iterate a record whose values bear no dates', () => {
+    const out = render([
+      {
+        name: 'Mixed',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'tags',
+              required: true,
+              schema: { kind: 'record', value: { kind: 'scalar', scalar: 'string' } },
+            },
+            {
+              name: 'at',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+              required: true,
+            },
+          ],
+        },
+      },
+    ]);
+    expect(out).not.toContain('Object.values(data["tags"])');
+    expect(out).toContain('data["at"] = new Date(data["at"]);');
+  });
+
+  it('walks intersection members that bear dates', () => {
+    const out = render([
+      {
+        name: 'WithDate',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'on',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date' } },
+              required: true,
+            },
+          ],
+        },
+      },
+      {
+        name: 'Combined',
+        schema: {
+          kind: 'intersection',
+          members: [
+            { kind: 'ref', name: 'WithDate' },
+            {
+              kind: 'object',
+              properties: [
+                { name: 'note', schema: { kind: 'scalar', scalar: 'string' }, required: true },
+              ],
+            },
+          ],
+        },
+      },
+    ]);
+    expect(out).toContain('export const transformCombined');
+    expect(out).toContain('transformWithDate(data);');
+  });
+
+  it('omits an array-of-refs to a date-free schema', () => {
+    const out = render([
+      {
+        name: 'Plain',
+        schema: {
+          kind: 'object',
+          properties: [
+            { name: 'id', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
+          ],
+        },
+      },
+      {
+        name: 'Wrapper',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'list',
+              schema: { kind: 'array', items: { kind: 'ref', name: 'Plain' } },
+              required: true,
+            },
+            {
+              name: 'at',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+              required: true,
+            },
+          ],
+        },
+      },
+    ]);
+    expect(out).not.toContain('data["list"].forEach');
+    expect(out).toContain('data["at"] = new Date(data["at"]);');
+  });
+
+  it('iterates nested loop vars for arrays of arrays of dates', () => {
+    const out = render([
+      {
+        name: 'Grid',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'rows',
+              required: true,
+              schema: {
+                kind: 'array',
+                items: {
+                  kind: 'array',
+                  items: {
+                    kind: 'object',
+                    properties: [
+                      {
+                        name: 'at',
+                        schema: {
+                          kind: 'scalar',
+                          scalar: 'string',
+                          metadata: { format: 'date-time' },
+                        },
+                        required: true,
+                      },
+                    ],
+                  },
+                },
+              },
+            },
+          ],
+        },
+      },
+    ]);
+    expect(out).toContain('data["rows"].forEach(item =>');
+    expect(out).toContain('item.forEach(item1 =>');
+    expect(out).toContain('item1["at"] = new Date(item1["at"]);');
+  });
+
+  it('maps-and-reassigns an array of arrays of date scalars', () => {
+    const out = render([
+      {
+        name: 'Matrix',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'rows',
+              required: true,
+              schema: {
+                kind: 'array',
+                items: {
+                  kind: 'array',
+                  items: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+                },
+              },
+            },
+          ],
+        },
+      },
+    ]);
+    // Scalar elements are replace-by-value: reassigning a loop var is lost, so we
+    // map and write back into the slot at every array level.
+    expect(out).toContain('if (Array.isArray(data["rows"]))');
+    expect(out).toContain('data["rows"] = data["rows"].map(row => row.map(v => new Date(v)));');
+  });
+
+  it('maps-and-reassigns a three-level array of date scalars with distinct vars', () => {
+    const out = render([
+      {
+        name: 'Cube',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'c',
+              required: true,
+              schema: {
+                kind: 'array',
+                items: {
+                  kind: 'array',
+                  items: {
+                    kind: 'array',
+                    items: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+                  },
+                },
+              },
+            },
+          ],
+        },
+      },
+    ]);
+    // Each array level gets a distinct map var (`row`, `row2`, `v`) to avoid
+    // shadowing; every level maps-and-reassigns up to the slot.
+    expect(out).toContain(
+      'data["c"] = data["c"].map(row => row.map(row2 => row2.map(v => new Date(v))));'
+    );
+  });
+
+  it('iterates a record of date-bearing objects via Object.values', () => {
+    const out = render([
+      {
+        name: 'M',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'm',
+              required: true,
+              schema: {
+                kind: 'record',
+                value: {
+                  kind: 'object',
+                  properties: [
+                    {
+                      name: 'at',
+                      schema: {
+                        kind: 'scalar',
+                        scalar: 'string',
+                        metadata: { format: 'date-time' },
+                      },
+                      required: true,
+                    },
+                  ],
+                },
+              },
+            },
+          ],
+        },
+      },
+    ]);
+    // Objects mutate in place, so a forEach over the values is enough — no
+    // per-key write-back needed (unlike record-of-scalars).
+    expect(out).toContain('if (data["m"])');
+    expect(out).toContain('Object.values(data["m"]).forEach(item =>');
+    expect(out).toContain('if (typeof item["at"] === "string")');
+    expect(out).toContain('item["at"] = new Date(item["at"]);');
+  });
+
+  it('maps-and-reassigns each slot of a record of arrays of date scalars', () => {
+    const out = render([
+      {
+        name: 'Buckets',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'b',
+              required: true,
+              schema: {
+                kind: 'record',
+                value: {
+                  kind: 'array',
+                  items: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+                },
+              },
+            },
+          ],
+        },
+      },
+    ]);
+    expect(out).toContain('if (data["b"])');
+    expect(out).toContain('for (const __k of Object.keys(data["b"]))');
+    expect(out).toContain('if (Array.isArray(data["b"][__k]))');
+    expect(out).toContain('data["b"][__k] = data["b"][__k].map(v => new Date(v));');
+  });
+
+  it('skips a date-free nested inline object sibling', () => {
+    const out = render([
+      {
+        name: 'Doc',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'meta',
+              required: false,
+              schema: {
+                kind: 'object',
+                properties: [
+                  { name: 'title', schema: { kind: 'scalar', scalar: 'string' }, required: true },
+                ],
+              },
+            },
+            {
+              name: 'at',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+              required: true,
+            },
+          ],
+        },
+      },
+    ]);
+    expect(out).not.toContain('if (data["meta"])');
+    expect(out).toContain('data["at"] = new Date(data["at"]);');
+  });
+
+  it('ignores a ref to a name absent from the model', () => {
+    const out = render([
+      {
+        name: 'Card',
+        schema: {
+          kind: 'object',
+          properties: [
+            { name: 'link', schema: { kind: 'ref', name: 'Missing' }, required: false },
+            {
+              name: 'at',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+              required: true,
+            },
+          ],
+        },
+      },
+    ]);
+    expect(out).not.toContain('data["link"]');
+    expect(out).toContain('data["at"] = new Date(data["at"]);');
+  });
+
+  it('guards ref cycles via a visited set', () => {
+    const out = render([
+      {
+        name: 'Node',
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'at',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+              required: true,
+            },
+            { name: 'next', schema: { kind: 'ref', name: 'Node' }, required: false },
+          ],
+        },
+      },
+    ]);
+    expect(out).toContain('export const transformNode');
+    expect(out).toContain('if (data["next"])');
+    expect(out).toContain('transformNode(data["next"]);');
+  });
+});
diff --git a/packages/openapi-typescript/src/emitters/__tests__/ts.test.ts b/packages/openapi-typescript/src/emitters/__tests__/ts.test.ts
new file mode 100644
index 0000000000..ba88d7b48e
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/__tests__/ts.test.ts
@@ -0,0 +1,123 @@
+import { jsdoc, parseExpression, parseStatements, printNodes, printStatements, ts } from '../ts.js';
+
+describe('emitters/ts foundation', () => {
+  describe('printNodes', () => {
+    it('round-trips an interface declaration', () => {
+      const decl = ts.factory.createInterfaceDeclaration(
+        [ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+        'Foo',
+        undefined,
+        undefined,
+        [
+          ts.factory.createPropertySignature(
+            undefined,
+            'id',
+            undefined,
+            ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)
+          ),
+        ]
+      );
+      expect(printNodes([decl])).toBe('export interface Foo {\n    id: string;\n}');
+    });
+
+    it('round-trips a const declaration', () => {
+      const decl = ts.factory.createVariableStatement(
+        [ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+        ts.factory.createVariableDeclarationList(
+          [
+            ts.factory.createVariableDeclaration(
+              'x',
+              undefined,
+              undefined,
+              ts.factory.createNumericLiteral(1)
+            ),
+          ],
+          ts.NodeFlags.Const
+        )
+      );
+      expect(printNodes([decl])).toBe('export const x = 1;');
+    });
+
+    it('joins multiple nodes with a newline', () => {
+      const lit = (n: number): ts.ExpressionStatement =>
+        ts.factory.createExpressionStatement(ts.factory.createNumericLiteral(n));
+      expect(printNodes([lit(1), lit(2)])).toBe('1;\n2;');
+    });
+  });
+
+  describe('printStatements', () => {
+    const lit = (n: number): ts.ExpressionStatement =>
+      ts.factory.createExpressionStatement(ts.factory.createNumericLiteral(n));
+
+    it('separates top-level declarations with a blank line', () => {
+      expect(printStatements([lit(1), lit(2)])).toBe('1;\n\n2;');
+    });
+
+    it('prints a single node with no trailing blank line', () => {
+      expect(printStatements([lit(1)])).toBe('1;');
+    });
+  });
+
+  describe('parseStatements', () => {
+    it('yields re-printable statements from source', () => {
+      const statements = parseStatements('export const x = 1;');
+      expect(statements).toHaveLength(1);
+      expect(printNodes(statements)).toBe('export const x = 1;');
+    });
+  });
+
+  describe('parseExpression', () => {
+    it('parses a source expression into a re-printable ts.Expression', () => {
+      const expr = parseExpression('new Blob([])');
+      expect(ts.isNewExpression(expr)).toBe(true);
+      expect(printNodes([expr])).toBe('new Blob([])');
+    });
+  });
+
+  describe('jsdoc', () => {
+    it('prints a single-line block comment above the node', () => {
+      const decl = ts.factory.createVariableStatement(
+        undefined,
+        ts.factory.createVariableDeclarationList(
+          [
+            ts.factory.createVariableDeclaration(
+              'y',
+              undefined,
+              undefined,
+              ts.factory.createNull()
+            ),
+          ],
+          ts.NodeFlags.Const
+        )
+      );
+      const out = printNodes([jsdoc(decl, 'A note.')]);
+      expect(out).toBe('/**\n * A note.\n */\nconst y = null;');
+    });
+
+    it('prints a multi-line block comment with one star per line', () => {
+      const decl = ts.factory.createTypeAliasDeclaration(
+        undefined,
+        'T',
+        undefined,
+        ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)
+      );
+      const out = printNodes([jsdoc(decl, 'line one\nline two')]);
+      expect(out).toBe('/**\n * line one\n * line two\n */\ntype T = string;');
+    });
+
+    it('escapes an embedded `*/` so a hostile description cannot break out of the comment', () => {
+      const decl = ts.factory.createTypeAliasDeclaration(
+        undefined,
+        'T',
+        undefined,
+        ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)
+      );
+      const out = printNodes([jsdoc(decl, 'evil */ ;globalThis.PWNED=1; /*')]);
+      // The `*/` is neutralized to `*\/`; no live `*/` survives inside the comment body.
+      expect(out).toContain('evil *\\/ ;globalThis.PWNED=1; /*');
+      expect(out).not.toContain('evil */');
+      // Exactly one comment-closing `*/` (the real one the printer appends).
+      expect(out.match(/\*\//g)).toHaveLength(1);
+    });
+  });
+});
diff --git a/packages/openapi-typescript/src/emitters/__tests__/type-guards.test.ts b/packages/openapi-typescript/src/emitters/__tests__/type-guards.test.ts
new file mode 100644
index 0000000000..9c3da2611b
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/__tests__/type-guards.test.ts
@@ -0,0 +1,616 @@
+import { emitSingleFile } from '../client.js';
+import { apiModel, namedSchema } from './fixtures.js';
+
+describe('discriminated-union type guards (C6.4)', () => {
+  const beverage = namedSchema('Beverage', {
+    kind: 'object',
+    properties: [
+      {
+        name: 'category',
+        schema: { kind: 'literal', value: 'beverage' },
+        required: true,
+      },
+    ],
+  });
+  const dessert = namedSchema('Dessert', {
+    kind: 'object',
+    properties: [
+      {
+        name: 'category',
+        schema: { kind: 'literal', value: 'dessert' },
+        required: true,
+      },
+    ],
+  });
+
+  it('emits is<Member>() guards for an explicit discriminator', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          beverage,
+          dessert,
+          namedSchema('MenuItem', {
+            kind: 'union',
+            members: [
+              { kind: 'ref', name: 'Beverage' },
+              { kind: 'ref', name: 'Dessert' },
+            ],
+            discriminator: {
+              propertyName: 'category',
+              mapping: [
+                { value: 'beverage', schemaName: 'Beverage' },
+                { value: 'dessert', schemaName: 'Dessert' },
+              ],
+            },
+          }),
+        ],
+      })
+    );
+    expect(out).toContain('export function isBeverage(value: MenuItem): value is Beverage {');
+    expect(out).toContain('(value as Record<string, unknown>)["category"] === "beverage"');
+    expect(out).toContain('export function isDessert(value: MenuItem): value is Dessert {');
+    expect(out).toContain('(value as Record<string, unknown>)["category"] === "dessert"');
+  });
+
+  it('skips a discriminator entry whose target is not a named schema', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          beverage,
+          namedSchema('MenuItem', {
+            kind: 'union',
+            members: [{ kind: 'ref', name: 'Beverage' }],
+            discriminator: {
+              propertyName: 'category',
+              mapping: [
+                { value: 'beverage', schemaName: 'Beverage' },
+                { value: 'ghost', schemaName: 'NotAType' },
+              ],
+            },
+          }),
+        ],
+      })
+    );
+    expect(out).toContain('export function isBeverage(');
+    expect(out).not.toContain('isNotAType');
+  });
+
+  it('emits a single guard when two discriminant values map to the same type', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('Pet', { kind: 'object', properties: [] }),
+          namedSchema('Other', { kind: 'object', properties: [] }),
+          namedSchema('Animal', {
+            kind: 'union',
+            members: [
+              { kind: 'ref', name: 'Pet' },
+              { kind: 'ref', name: 'Other' },
+            ],
+            discriminator: {
+              propertyName: 'kind',
+              mapping: [
+                { value: 'dog', schemaName: 'Pet' },
+                { value: 'puppy', schemaName: 'Pet' },
+                { value: 'thing', schemaName: 'Other' },
+              ],
+            },
+          }),
+        ],
+      })
+    );
+    expect(out.match(/export function isPet\(/g)).toHaveLength(1);
+    expect(out).toContain(
+      '(["dog", "puppy"] as readonly unknown[]).includes((value as Record<string, unknown>)["kind"])'
+    );
+  });
+
+  it('synthesizes an implicit discriminator from a shared distinct string const', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          beverage,
+          dessert,
+          namedSchema('MenuItem', {
+            kind: 'union',
+            members: [
+              { kind: 'ref', name: 'Beverage' },
+              { kind: 'ref', name: 'Dessert' },
+            ],
+          }),
+        ],
+      })
+    );
+    expect(out).toContain('export function isBeverage(value: MenuItem): value is Beverage {');
+    expect(out).toContain('(value as Record<string, unknown>)["category"] === "beverage"');
+  });
+
+  it('finds the implicit discriminant through intersection (allOf) members', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('A', {
+            kind: 'intersection',
+            members: [
+              {
+                kind: 'object',
+                properties: [
+                  {
+                    name: 't',
+                    schema: { kind: 'literal', value: 'a' },
+                    required: true,
+                  },
+                ],
+              },
+              { kind: 'ref', name: 'Base' },
+            ],
+          }),
+          namedSchema('B', {
+            kind: 'intersection',
+            members: [
+              {
+                kind: 'object',
+                properties: [
+                  {
+                    name: 't',
+                    schema: { kind: 'literal', value: 'b' },
+                    required: true,
+                  },
+                ],
+              },
+              { kind: 'ref', name: 'Base' },
+            ],
+          }),
+          namedSchema('AB', {
+            kind: 'union',
+            members: [
+              { kind: 'ref', name: 'A' },
+              { kind: 'ref', name: 'B' },
+            ],
+          }),
+        ],
+      })
+    );
+    expect(out).toContain('export function isA(value: AB): value is A {');
+    expect(out).toContain('(value as Record<string, unknown>)["t"] === "a"');
+  });
+
+  it('emits no guards for an undiscriminated union (no shared const)', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('StringOrNumber', {
+            kind: 'union',
+            members: [
+              { kind: 'scalar', scalar: 'string' },
+              { kind: 'scalar', scalar: 'number' },
+            ],
+          }),
+        ],
+      })
+    );
+    expect(out).not.toContain('value is');
+  });
+
+  it('emits no implicit guard when a member is not a ref to a named schema', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          beverage,
+          namedSchema('Mixed', {
+            kind: 'union',
+            members: [
+              { kind: 'ref', name: 'Beverage' },
+              { kind: 'scalar', scalar: 'string' },
+            ],
+          }),
+        ],
+      })
+    );
+    expect(out).not.toContain('value is');
+  });
+
+  it('emits no implicit guard when the shared const values are not distinct', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('X', {
+            kind: 'object',
+            properties: [
+              {
+                name: 'k',
+                schema: { kind: 'literal', value: 'same' },
+                required: true,
+              },
+            ],
+          }),
+          namedSchema('Y', {
+            kind: 'object',
+            properties: [
+              {
+                name: 'k',
+                schema: { kind: 'literal', value: 'same' },
+                required: true,
+              },
+            ],
+          }),
+          namedSchema('XY', {
+            kind: 'union',
+            members: [
+              { kind: 'ref', name: 'X' },
+              { kind: 'ref', name: 'Y' },
+            ],
+          }),
+        ],
+      })
+    );
+    expect(out).not.toContain('value is');
+  });
+
+  it('emits no implicit guard for a single-member union', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          beverage,
+          namedSchema('Solo', {
+            kind: 'union',
+            members: [{ kind: 'ref', name: 'Beverage' }],
+          }),
+        ],
+      })
+    );
+    expect(out).not.toContain('value is');
+  });
+
+  it('emits no implicit guard when a member ref points to an unknown schema', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          beverage,
+          namedSchema('Ghosty', {
+            kind: 'union',
+            members: [
+              { kind: 'ref', name: 'Beverage' },
+              { kind: 'ref', name: 'DoesNotExist' },
+            ],
+          }),
+        ],
+      })
+    );
+    expect(out).not.toContain('value is');
+  });
+
+  it('emits no implicit guard when members pin different property names', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('P', {
+            kind: 'object',
+            properties: [
+              {
+                name: 'a',
+                schema: { kind: 'literal', value: 'x' },
+                required: true,
+              },
+            ],
+          }),
+          namedSchema('Q', {
+            kind: 'object',
+            properties: [
+              {
+                name: 'b',
+                schema: { kind: 'literal', value: 'y' },
+                required: true,
+              },
+            ],
+          }),
+          namedSchema('PQ', {
+            kind: 'union',
+            members: [
+              { kind: 'ref', name: 'P' },
+              { kind: 'ref', name: 'Q' },
+            ],
+          }),
+        ],
+      })
+    );
+    expect(out).not.toContain('value is');
+  });
+
+  it('ignores non-literal properties while detecting the implicit discriminant', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('R1', {
+            kind: 'object',
+            properties: [
+              {
+                name: 'note',
+                schema: { kind: 'scalar', scalar: 'string' },
+                required: false,
+              },
+              {
+                name: 'kind',
+                schema: { kind: 'literal', value: 'one' },
+                required: true,
+              },
+            ],
+          }),
+          namedSchema('R2', {
+            kind: 'object',
+            properties: [
+              {
+                name: 'note',
+                schema: { kind: 'scalar', scalar: 'string' },
+                required: false,
+              },
+              {
+                name: 'kind',
+                schema: { kind: 'literal', value: 'two' },
+                required: true,
+              },
+            ],
+          }),
+          namedSchema('R12', {
+            kind: 'union',
+            members: [
+              { kind: 'ref', name: 'R1' },
+              { kind: 'ref', name: 'R2' },
+            ],
+          }),
+        ],
+      })
+    );
+    expect(out).toContain('export function isR1(value: R12): value is R1 {');
+    expect(out).toContain('(value as Record<string, unknown>)["kind"] === "one"');
+  });
+
+  it('emits guards for a discriminated union nested as array items', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('SuccessItem', {
+            kind: 'object',
+            properties: [{ name: 'status', schema: { kind: 'literal', value: 'ok' }, required: true }],
+          }),
+          namedSchema('ErrorItem', {
+            kind: 'object',
+            properties: [{ name: 'status', schema: { kind: 'literal', value: 'error' }, required: true }],
+          }),
+          // The union is the array's *items*, not a top-level named union.
+          namedSchema('BulkResponse', {
+            kind: 'array',
+            items: {
+              kind: 'union',
+              members: [
+                { kind: 'ref', name: 'SuccessItem' },
+                { kind: 'ref', name: 'ErrorItem' },
+              ],
+              discriminator: {
+                propertyName: 'status',
+                mapping: [
+                  { value: 'ok', schemaName: 'SuccessItem' },
+                  { value: 'error', schemaName: 'ErrorItem' },
+                ],
+              },
+            },
+          }),
+        ],
+      })
+    );
+    // Param is the inline member union; predicate narrows to the named member.
+    expect(out).toContain(
+      'export function isSuccessItem(value: SuccessItem | ErrorItem): value is SuccessItem {'
+    );
+    expect(out).toContain(
+      'export function isErrorItem(value: SuccessItem | ErrorItem): value is ErrorItem {'
+    );
+    expect(out).toContain('(value as Record<string, unknown>)["status"] === "ok"');
+  });
+
+  it('emits guards for a discriminated union nested under a record value', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('Cat', {
+            kind: 'object',
+            properties: [{ name: 'kind', schema: { kind: 'literal', value: 'cat' }, required: true }],
+          }),
+          namedSchema('Dog', {
+            kind: 'object',
+            properties: [{ name: 'kind', schema: { kind: 'literal', value: 'dog' }, required: true }],
+          }),
+          namedSchema('PetMap', {
+            kind: 'record',
+            value: {
+              kind: 'union',
+              members: [
+                { kind: 'ref', name: 'Cat' },
+                { kind: 'ref', name: 'Dog' },
+              ],
+            },
+          }),
+        ],
+      })
+    );
+    expect(out).toContain('export function isCat(value: Cat | Dog): value is Cat {');
+    expect(out).toContain('export function isDog(value: Cat | Dog): value is Dog {');
+  });
+
+  it('emits guards for a discriminated union nested under an object property', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('Cat', {
+            kind: 'object',
+            properties: [{ name: 'kind', schema: { kind: 'literal', value: 'cat' }, required: true }],
+          }),
+          namedSchema('Dog', {
+            kind: 'object',
+            properties: [{ name: 'kind', schema: { kind: 'literal', value: 'dog' }, required: true }],
+          }),
+          namedSchema('Envelope', {
+            kind: 'object',
+            properties: [
+              {
+                name: 'pet',
+                schema: {
+                  kind: 'union',
+                  members: [
+                    { kind: 'ref', name: 'Cat' },
+                    { kind: 'ref', name: 'Dog' },
+                  ],
+                },
+                required: true,
+              },
+            ],
+          }),
+        ],
+      })
+    );
+    // Implicit discriminator (shared distinct `kind` const) on a nested union.
+    expect(out).toContain('export function isCat(value: Cat | Dog): value is Cat {');
+    expect(out).toContain('export function isDog(value: Cat | Dog): value is Dog {');
+  });
+
+  it('emits a guard once when the same nested union appears in two schemas', () => {
+    const item = (name: string, value: string) =>
+      namedSchema(name, {
+        kind: 'object',
+        properties: [{ name: 'status', schema: { kind: 'literal', value }, required: true }],
+      });
+    const arrayOfUnion = (name: string) =>
+      namedSchema(name, {
+        kind: 'array',
+        items: {
+          kind: 'union',
+          members: [
+            { kind: 'ref', name: 'Ok' },
+            { kind: 'ref', name: 'Err' },
+          ],
+          discriminator: {
+            propertyName: 'status',
+            mapping: [
+              { value: 'ok', schemaName: 'Ok' },
+              { value: 'error', schemaName: 'Err' },
+            ],
+          },
+        },
+      });
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [item('Ok', 'ok'), item('Err', 'error'), arrayOfUnion('ListA'), arrayOfUnion('ListB')],
+      })
+    );
+    expect(out.match(/export function isOk\(/g)).toHaveLength(1);
+    expect(out.match(/export function isErr\(/g)).toHaveLength(1);
+  });
+
+  it('prefers the top-level named union param when a member also nests elsewhere', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          beverage,
+          dessert,
+          // Top-level named union processed first → guard param is `MenuItem`.
+          namedSchema('MenuItem', {
+            kind: 'union',
+            members: [
+              { kind: 'ref', name: 'Beverage' },
+              { kind: 'ref', name: 'Dessert' },
+            ],
+            discriminator: {
+              propertyName: 'category',
+              mapping: [
+                { value: 'beverage', schemaName: 'Beverage' },
+                { value: 'dessert', schemaName: 'Dessert' },
+              ],
+            },
+          }),
+          // Same members nested as array items; the dedup keeps the top-level guard.
+          namedSchema('MenuList', {
+            kind: 'array',
+            items: {
+              kind: 'union',
+              members: [
+                { kind: 'ref', name: 'Beverage' },
+                { kind: 'ref', name: 'Dessert' },
+              ],
+              discriminator: {
+                propertyName: 'category',
+                mapping: [
+                  { value: 'beverage', schemaName: 'Beverage' },
+                  { value: 'dessert', schemaName: 'Dessert' },
+                ],
+              },
+            },
+          }),
+        ],
+      })
+    );
+    expect(out.match(/export function isBeverage\(/g)).toHaveLength(1);
+    expect(out).toContain('export function isBeverage(value: MenuItem): value is Beverage {');
+  });
+
+  it('skips a nested union whose members are not all named refs', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          beverage,
+          namedSchema('Wrapper', {
+            kind: 'array',
+            items: {
+              kind: 'union',
+              members: [
+                { kind: 'ref', name: 'Beverage' },
+                { kind: 'scalar', scalar: 'string' },
+              ],
+              discriminator: {
+                propertyName: 'category',
+                mapping: [{ value: 'beverage', schemaName: 'Beverage' }],
+              },
+            },
+          }),
+        ],
+      })
+    );
+    expect(out).not.toContain('value is');
+  });
+
+  it('ignores non-string shared const when detecting implicit discriminators', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('N1', {
+            kind: 'object',
+            properties: [
+              {
+                name: 'v',
+                schema: { kind: 'literal', value: 1 },
+                required: true,
+              },
+            ],
+          }),
+          namedSchema('N2', {
+            kind: 'object',
+            properties: [
+              {
+                name: 'v',
+                schema: { kind: 'literal', value: 2 },
+                required: true,
+              },
+            ],
+          }),
+          namedSchema('N12', {
+            kind: 'union',
+            members: [
+              { kind: 'ref', name: 'N1' },
+              { kind: 'ref', name: 'N2' },
+            ],
+          }),
+        ],
+      })
+    );
+    expect(out).not.toContain('value is');
+  });
+});
diff --git a/packages/openapi-typescript/src/emitters/__tests__/types.test.ts b/packages/openapi-typescript/src/emitters/__tests__/types.test.ts
new file mode 100644
index 0000000000..24d08c598f
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/__tests__/types.test.ts
@@ -0,0 +1,594 @@
+import type { PropertyModel, SchemaModel } from '../../ir/model.js';
+import { emitSingleFile } from '../client.js';
+import { printNodes } from '../ts.js';
+import { renderSchema, schemaToTypeNode, typesStatements } from '../types.js';
+import { SCALAR, apiModel, namedSchema } from './fixtures.js';
+
+describe('renderTypes', () => {
+  it('produces nothing when there are no schemas', () => {
+    const out = emitSingleFile(apiModel({ schemas: [] }));
+    // Two consecutive blank lines would be a sign of an empty types block; check absence.
+    expect(out).not.toContain('export type T');
+  });
+
+  it('emits each named schema with its description', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [namedSchema('Foo', { kind: 'scalar', scalar: 'string' }, 'a foo')],
+      })
+    );
+    expect(out).toContain('/**\n * a foo\n */');
+    expect(out).toContain('export type Foo = string;');
+  });
+
+  it('prefers schema description over the named-schema description', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('Foo', { kind: 'scalar', scalar: 'string', description: 'inner' }, 'outer'),
+        ],
+      })
+    );
+    expect(out).toContain('/**\n * inner\n */');
+    expect(out).not.toContain('outer');
+  });
+
+  it('omits JSDoc when the schema description is whitespace-only', () => {
+    // Exercises the `!text.trim()` short-circuit inside renderJsDoc.
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [namedSchema('Foo', { kind: 'scalar', scalar: 'string' }, '   ')],
+      })
+    );
+    expect(out).not.toContain('/**  ');
+    expect(out).toContain('export type Foo = string;');
+  });
+
+  it('trims leading and trailing blank lines from multi-line schema descriptions', () => {
+    // Exercises both `start++` and `end--` arms of trimLines.
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('Foo', {
+            kind: 'scalar',
+            scalar: 'string',
+            description: '\n\nfirst\nsecond\n\n',
+          }),
+        ],
+      })
+    );
+    expect(out).toContain('/**\n * first\n * second\n */');
+    expect(out).not.toMatch(/\/\*\*\n \*\n/);
+  });
+});
+
+describe('renderSchema (and its branches)', () => {
+  it('renders scalars: string/number/integer/boolean', () => {
+    expect(renderSchema({ kind: 'scalar', scalar: 'string' })).toBe('string');
+    expect(renderSchema({ kind: 'scalar', scalar: 'number' })).toBe('number');
+    expect(renderSchema({ kind: 'scalar', scalar: 'integer' })).toBe('number');
+    expect(renderSchema({ kind: 'scalar', scalar: 'boolean' })).toBe('boolean');
+  });
+
+  it('renders a ref as the bare name', () => {
+    expect(renderSchema({ kind: 'ref', name: 'Foo' })).toBe('Foo');
+  });
+
+  it('renders a binary-format string as Blob (file/upload content)', () => {
+    expect(renderSchema({ kind: 'scalar', scalar: 'string', metadata: { format: 'binary' } })).toBe(
+      'Blob'
+    );
+    // `byte` (base64) stays a string; only `binary` is raw content.
+    expect(renderSchema({ kind: 'scalar', scalar: 'string', metadata: { format: 'byte' } })).toBe(
+      'string'
+    );
+  });
+
+  it('renders string/number/boolean literals correctly', () => {
+    expect(renderSchema({ kind: 'literal', value: 'hi' })).toBe('"hi"');
+    expect(renderSchema({ kind: 'literal', value: 42 })).toBe('42');
+    expect(renderSchema({ kind: 'literal', value: true })).toBe('true');
+    expect(renderSchema({ kind: 'literal', value: false })).toBe('false');
+  });
+
+  it('renders negative number literals (built via a prefix-minus expression)', () => {
+    // TypeScript's factory rejects a bare negative numeric literal — it must be a
+    // unary-minus over a positive literal, which this exercises.
+    expect(renderSchema({ kind: 'literal', value: -5 })).toBe('-5');
+    expect(renderSchema({ kind: 'enum', values: [-1, 2], scalar: 'number' })).toBe('-1 | 2');
+  });
+
+  it('renders single-value enums without parens when wrapped in array (parens=true)', () => {
+    expect(
+      renderSchema({
+        kind: 'array',
+        items: { kind: 'enum', values: ['a'], scalar: 'string' },
+      })
+    ).toBe('"a"[]');
+  });
+
+  it('renders multi-value enums WITH parens when wrapped in array (parens=true)', () => {
+    expect(
+      renderSchema({
+        kind: 'array',
+        items: { kind: 'enum', values: ['a', 'b'], scalar: 'string' },
+      })
+    ).toBe('("a" | "b")[]');
+  });
+
+  it('renders number enums without JSON-quoting them', () => {
+    expect(renderSchema({ kind: 'enum', values: [1, 2, 3], scalar: 'number' })).toBe('1 | 2 | 3');
+  });
+
+  it('renders boolean enums without JSON-quoting them', () => {
+    expect(renderSchema({ kind: 'enum', values: [true, false], scalar: 'boolean' })).toBe(
+      'true | false'
+    );
+  });
+
+  it('renders null and unknown', () => {
+    expect(renderSchema({ kind: 'null' })).toBe('null');
+    expect(renderSchema({ kind: 'unknown' })).toBe('unknown');
+  });
+
+  it('renders array of scalars', () => {
+    expect(renderSchema({ kind: 'array', items: SCALAR })).toBe('string[]');
+  });
+
+  it('parenthesizes unions inside arrays', () => {
+    expect(
+      renderSchema({
+        kind: 'array',
+        items: { kind: 'union', members: [SCALAR, { kind: 'null' }] },
+      })
+    ).toBe('(string | null)[]');
+  });
+
+  it('renders records', () => {
+    expect(renderSchema({ kind: 'record', value: SCALAR })).toBe('Record<string, string>');
+  });
+
+  it('renders empty objects as `{}`', () => {
+    expect(renderSchema({ kind: 'object', properties: [] })).toBe('{}');
+  });
+
+  it('renders required vs optional properties', () => {
+    const props: PropertyModel[] = [
+      { name: 'id', schema: SCALAR, required: true },
+      { name: 'name', schema: SCALAR, required: false },
+    ];
+    const got = renderSchema({ kind: 'object', properties: props });
+    expect(got).toContain('id: string;');
+    expect(got).toContain('name?: string;');
+  });
+
+  it('renders an inline single-line JSDoc above a property with a short description', () => {
+    const got = renderSchema({
+      kind: 'object',
+      properties: [{ name: 'a', schema: SCALAR, required: true, description: 'short' }],
+    });
+    expect(got).toContain('    /**\n     * short\n     */\n    a: string;');
+  });
+
+  it('renders an inline multi-line JSDoc above a property with a long description', () => {
+    const got = renderSchema({
+      kind: 'object',
+      properties: [
+        {
+          name: 'a',
+          schema: SCALAR,
+          required: true,
+          description: 'line1\nline2',
+        },
+      ],
+    });
+    expect(got).toContain('    /**\n     * line1\n     * line2\n     */\n');
+  });
+
+  it('emits a `readonly` modifier on readOnly properties', () => {
+    // readOnly (server-managed) props are marked `readonly` so consumer write-type
+    // utilities (e.g. OmitReadOnly<T>) can strip them; non-readOnly props are plain.
+    const got = renderSchema({
+      kind: 'object',
+      properties: [
+        { name: 'id', schema: SCALAR, required: true, readOnly: true },
+        { name: 'name', schema: SCALAR, required: true },
+      ],
+    });
+    expect(got).toContain('readonly id: string;');
+    expect(got).toMatch(/\n {4}name: string;/);
+    expect(got).not.toContain('readonly name');
+  });
+
+  it('renders an omit schema as Omit<Base, keys>', () => {
+    expect(renderSchema({ kind: 'omit', base: 'Pet', keys: ['id', 'createdAt'] })).toBe(
+      'Omit<Pet, "id" | "createdAt">'
+    );
+  });
+
+  it('renders union and intersection', () => {
+    expect(renderSchema({ kind: 'union', members: [SCALAR, { kind: 'null' }] })).toBe(
+      'string | null'
+    );
+    const inter = renderSchema({
+      kind: 'intersection',
+      members: [
+        { kind: 'ref', name: 'A' },
+        { kind: 'ref', name: 'B' },
+      ],
+    });
+    expect(inter).toBe('A & B');
+  });
+
+  it('quotes property names that contain disallowed characters', () => {
+    const got = renderSchema({
+      kind: 'object',
+      properties: [{ name: 'menu:read', schema: SCALAR, required: true }],
+    });
+    expect(got).toContain('"menu:read": string;');
+  });
+
+  it('quotes property names that are reserved words', () => {
+    const got = renderSchema({
+      kind: 'object',
+      properties: [{ name: 'class', schema: SCALAR, required: true }],
+    });
+    expect(got).toContain('"class": string;');
+  });
+
+  it('renders an inline empty-description JSDoc as nothing', () => {
+    const got = renderSchema({
+      kind: 'object',
+      properties: [{ name: 'a', schema: SCALAR, required: true, description: '   ' }],
+    });
+    // empty description ⇒ no JSDoc and no leading 2-space indent before the prop
+    expect(got).not.toContain('/**');
+    expect(got).toContain('  a: string;');
+  });
+});
+
+describe('JSDoc validation metadata (@minimum / @maxLength / @pattern / @format / @deprecated)', () => {
+  it('renders numeric constraints as JSDoc tags on a named schema', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('Limit', {
+            kind: 'scalar',
+            scalar: 'integer',
+            metadata: { minimum: 1, maximum: 100 },
+          }),
+        ],
+      })
+    );
+    expect(out).toMatch(
+      /\/\*\*[\s\S]*@minimum 1[\s\S]*@maximum 100[\s\S]*\*\/\s*export type Limit = number;/
+    );
+  });
+
+  it('renders string constraints (minLength, maxLength, pattern, format) as JSDoc tags', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('Name', {
+            kind: 'scalar',
+            scalar: 'string',
+            metadata: {
+              minLength: 1,
+              maxLength: 50,
+              pattern: '^[A-Z]+$',
+              format: 'email',
+            },
+          }),
+        ],
+      })
+    );
+    expect(out).toContain('@minLength 1');
+    expect(out).toContain('@maxLength 50');
+    expect(out).toContain('@pattern ^[A-Z]+$');
+    expect(out).toContain('@format email');
+  });
+
+  it('renders array constraints (minItems, maxItems, uniqueItems) as JSDoc tags', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('Tags', {
+            kind: 'array',
+            items: { kind: 'scalar', scalar: 'string' },
+            metadata: { minItems: 1, maxItems: 5, uniqueItems: true },
+          }),
+        ],
+      })
+    );
+    expect(out).toContain('@minItems 1');
+    expect(out).toContain('@maxItems 5');
+    expect(out).toContain('@uniqueItems');
+    // No value after @uniqueItems — it's a presence-only tag.
+    expect(out).not.toContain('@uniqueItems true');
+  });
+
+  it('renders @exclusiveMinimum / @exclusiveMaximum in numeric form', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('Volume', {
+            kind: 'scalar',
+            scalar: 'number',
+            metadata: { exclusiveMinimum: 0, exclusiveMaximum: 1000 },
+          }),
+        ],
+      })
+    );
+    expect(out).toContain('@exclusiveMinimum 0');
+    expect(out).toContain('@exclusiveMaximum 1000');
+  });
+
+  it('renders @deprecated as a presence-only tag', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('Old', {
+            kind: 'scalar',
+            scalar: 'string',
+            metadata: { deprecated: true },
+          }),
+        ],
+      })
+    );
+    expect(out).toContain('@deprecated');
+    expect(out).not.toContain('@deprecated true');
+  });
+
+  it('combines description text and tags in the same JSDoc block', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('Limit', {
+            kind: 'scalar',
+            scalar: 'integer',
+            description: 'Page size.',
+            metadata: { minimum: 1, maximum: 100 },
+          }),
+        ],
+      })
+    );
+    // Description first, then tag lines.
+    expect(out).toMatch(/\*\s*Page size\.\s*\n\s*\*\s*@minimum 1\s*\n\s*\*\s*@maximum 100/);
+  });
+
+  it('renders metadata above inline object properties', () => {
+    const got = renderSchema({
+      kind: 'object',
+      properties: [
+        {
+          name: 'name',
+          required: true,
+          description: 'Display name.',
+          schema: {
+            kind: 'scalar',
+            scalar: 'string',
+            metadata: { minLength: 1, maxLength: 50, pattern: '^[A-Z]+$' },
+          },
+        },
+      ],
+    });
+    // Multi-line JSDoc with description then tags, immediately above the prop line.
+    expect(got).toMatch(/\* Display name\./);
+    expect(got).toMatch(/\* @minLength 1/);
+    expect(got).toMatch(/\* @maxLength 50/);
+    expect(got).toMatch(/\* @pattern \^\[A-Z\]\+\$/);
+    expect(got).toContain('name: string;');
+  });
+
+  it('omits the JSDoc block when there is neither description nor metadata', () => {
+    const got = renderSchema({
+      kind: 'object',
+      properties: [{ name: 'a', schema: SCALAR, required: true }],
+    });
+    expect(got).not.toContain('/**');
+  });
+
+  it('emits a JSDoc block when metadata exists even without a description', () => {
+    const got = renderSchema({
+      kind: 'object',
+      properties: [
+        {
+          name: 'page',
+          required: true,
+          schema: {
+            kind: 'scalar',
+            scalar: 'integer',
+            metadata: { minimum: 1 },
+          },
+        },
+      ],
+    });
+    expect(got).toMatch(/\/\*\*\n {5}\* @minimum 1\n {5}\*\/\n {4}page: number;/);
+  });
+
+  it('escapes `*/` inside pattern strings so it cannot terminate the JSDoc block', () => {
+    // Defensive guard: a regex pattern of `^a*/b$` would otherwise break the comment.
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('Tricky', {
+            kind: 'scalar',
+            scalar: 'string',
+            metadata: { pattern: '^a*/b$' },
+          }),
+        ],
+      })
+    );
+    expect(out).toContain('@pattern ^a*\\/b$');
+    expect(out).not.toContain('@pattern ^a*/b$');
+  });
+
+  it('does not emit a JSDoc block when metadata bag is present but empty', () => {
+    // We never produce `{}` from the builder, but harden the renderer anyway.
+    const got = renderSchema({
+      kind: 'object',
+      properties: [{ name: 'a', schema: { ...SCALAR, metadata: {} }, required: true }],
+    });
+    expect(got).not.toContain('/**');
+  });
+});
+
+describe('dateType knob (string → Date for date formats)', () => {
+  const dateTime = (): SchemaModel => ({
+    kind: 'scalar',
+    scalar: 'string',
+    metadata: { format: 'date-time' },
+  });
+
+  it('emits Date for a date-time string scalar under dateType "Date"', () => {
+    expect(renderSchema(dateTime(), 'Date')).toBe('Date');
+  });
+
+  it('emits Date for a date string scalar under dateType "Date"', () => {
+    expect(
+      renderSchema({ kind: 'scalar', scalar: 'string', metadata: { format: 'date' } }, 'Date')
+    ).toBe('Date');
+  });
+
+  it('keeps string for date-time under dateType "string"', () => {
+    expect(renderSchema(dateTime(), 'string')).toBe('string');
+  });
+
+  it('keeps string for date-time by default (omitted dateType — byte-identical)', () => {
+    expect(renderSchema(dateTime())).toBe('string');
+  });
+
+  it('keeps string for a non-date string format regardless of dateType', () => {
+    const email: SchemaModel = { kind: 'scalar', scalar: 'string', metadata: { format: 'email' } };
+    expect(renderSchema(email, 'Date')).toBe('string');
+  });
+
+  it('leaves non-string scalars unaffected under dateType "Date"', () => {
+    expect(renderSchema({ kind: 'scalar', scalar: 'integer' }, 'Date')).toBe('number');
+  });
+
+  it('threads Date into nested object properties and arrays under "Date"', () => {
+    const out = renderSchema(
+      {
+        kind: 'object',
+        properties: [
+          { name: 'createdAt', schema: dateTime(), required: true },
+          { name: 'days', schema: { kind: 'array', items: dateTime() }, required: false },
+        ],
+      },
+      'Date'
+    );
+    expect(out).toContain('createdAt: Date;');
+    expect(out).toContain('days?: Date[];');
+  });
+
+  it('emits Date in the named-schema alias body under emitOptions dateType "Date"', () => {
+    const out = emitSingleFile(apiModel({ schemas: [namedSchema('Created', dateTime())] }), {
+      dateType: 'Date',
+    });
+    expect(out).toContain('export type Created = Date;');
+  });
+
+  it('leaves the named-schema alias as string by default', () => {
+    const out = emitSingleFile(apiModel({ schemas: [namedSchema('Created', dateTime())] }));
+    expect(out).toContain('export type Created = string;');
+  });
+
+  it('defaults schemaToTypeNode dateType to string (called with one arg)', () => {
+    expect(printNodes([schemaToTypeNode(dateTime())])).toBe('string');
+  });
+
+  it('defaults typesStatements dateType to string (called without it)', () => {
+    const out = printNodes(typesStatements([namedSchema('Created', dateTime())], 'union'));
+    expect(out).toContain('export type Created = string;');
+  });
+});
+
+describe('enum style — const-object companion (C6.2)', () => {
+  const orderStatus = namedSchema('OrderStatus', {
+    kind: 'enum',
+    scalar: 'string',
+    values: ['placed', 'completed'],
+  });
+
+  it('emits a const-object companion for named string enums by default', () => {
+    const out = emitSingleFile(apiModel({ schemas: [orderStatus] }));
+    expect(out).toContain('export type OrderStatus = "placed" | "completed";');
+    expect(out).toContain('export const OrderStatus = {');
+    expect(out).toContain('placed: "placed",');
+    expect(out).toContain('completed: "completed"');
+    expect(out).toContain('} as const;');
+  });
+
+  it('emits only the union type when enumStyle is "union"', () => {
+    const out = emitSingleFile(apiModel({ schemas: [orderStatus] }), {
+      enumStyle: 'union',
+    });
+    expect(out).toContain('export type OrderStatus = "placed" | "completed";');
+    expect(out).not.toContain('export const OrderStatus');
+  });
+
+  it('does not emit a const object for integer enums', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('Code', {
+            kind: 'enum',
+            scalar: 'integer',
+            values: [1, 2],
+          }),
+        ],
+      })
+    );
+    expect(out).toContain('export type Code = 1 | 2;');
+    expect(out).not.toContain('export const Code');
+  });
+
+  it('does not emit a const object for boolean enums', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('Flag', {
+            kind: 'enum',
+            scalar: 'boolean',
+            values: [true, false],
+          }),
+        ],
+      })
+    );
+    expect(out).not.toContain('export const Flag');
+  });
+
+  it('skips the const object when any value is not a valid identifier', () => {
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('Scope', {
+            kind: 'enum',
+            scalar: 'string',
+            values: ['menu:read', 'menuWrite'],
+          }),
+        ],
+      })
+    );
+    expect(out).toContain('export type Scope = "menu:read" | "menuWrite";');
+    expect(out).not.toContain('export const Scope');
+  });
+
+  it('skips the const object for a string-scalar enum that contains a non-string value', () => {
+    // scalarForEnumValues can return 'string' for a mixed enum; the const-object
+    // path must still bail when a value isn't actually a string.
+    const out = emitSingleFile(
+      apiModel({
+        schemas: [
+          namedSchema('Mixed', {
+            kind: 'enum',
+            scalar: 'string',
+            values: ['a', 1],
+          }),
+        ],
+      })
+    );
+    expect(out).not.toContain('export const Mixed');
+  });
+});
diff --git a/packages/openapi-typescript/src/emitters/__tests__/zod.test.ts b/packages/openapi-typescript/src/emitters/__tests__/zod.test.ts
new file mode 100644
index 0000000000..fac2a290e4
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/__tests__/zod.test.ts
@@ -0,0 +1,277 @@
+import type { NamedSchemaModel, SchemaModel } from '../../ir/model.js';
+import { printStatements } from '../ts.js';
+import { renderZodModule, schemaToZodExpression, zodModuleStatements } from '../zod.js';
+
+/** Print a single expression by wrapping it in a throwaway const. */
+function expr(schema: SchemaModel): string {
+  return renderZodModule([{ name: 'X', schema }])
+    .split('= ')[1]
+    .replace(/;$/, '');
+}
+
+describe('schemaToZodExpression — scalars', () => {
+  it('string → z.string()', () => {
+    expect(expr({ kind: 'scalar', scalar: 'string' })).toBe('z.string()');
+  });
+
+  it('number → z.number()', () => {
+    expect(expr({ kind: 'scalar', scalar: 'number' })).toBe('z.number()');
+  });
+
+  it('boolean → z.boolean()', () => {
+    expect(expr({ kind: 'scalar', scalar: 'boolean' })).toBe('z.boolean()');
+  });
+
+  it('integer → z.number().int()', () => {
+    expect(expr({ kind: 'scalar', scalar: 'integer' })).toBe('z.number().int()');
+  });
+
+  it('binary-format string → z.instanceof(Blob) (matches the Blob TS type)', () => {
+    expect(expr({ kind: 'scalar', scalar: 'string', metadata: { format: 'binary' } })).toBe(
+      'z.instanceof(Blob)'
+    );
+  });
+});
+
+describe('schemaToZodExpression — object', () => {
+  it('emits required and optional properties', () => {
+    const out = expr({
+      kind: 'object',
+      properties: [
+        { name: 'id', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
+        { name: 'name', schema: { kind: 'scalar', scalar: 'string' }, required: false },
+      ],
+    });
+    expect(out).toContain('z.object({');
+    expect(out).toContain('id: z.number().int()');
+    expect(out).toContain('name: z.string().optional()');
+  });
+
+  it('quotes non-identifier keys', () => {
+    const out = expr({
+      kind: 'object',
+      properties: [
+        { name: 'x-trace', schema: { kind: 'scalar', scalar: 'string' }, required: true },
+      ],
+    });
+    expect(out).toContain('"x-trace": z.string()');
+  });
+
+  it('emits an empty object literal for no properties', () => {
+    expect(expr({ kind: 'object', properties: [] })).toBe('z.object({})');
+  });
+});
+
+describe('schemaToZodExpression — composites', () => {
+  it('array → z.array(items)', () => {
+    expect(expr({ kind: 'array', items: { kind: 'scalar', scalar: 'string' } })).toBe(
+      'z.array(z.string())'
+    );
+  });
+
+  it('record → z.record(z.string(), value)', () => {
+    expect(expr({ kind: 'record', value: { kind: 'scalar', scalar: 'number' } })).toBe(
+      'z.record(z.string(), z.number())'
+    );
+  });
+
+  it('ref → z.lazy(() => <Name>Schema)', () => {
+    expect(expr({ kind: 'ref', name: 'pet' })).toBe('z.lazy(() => PetSchema)');
+  });
+
+  it('omit → <Base>Schema.omit({ k: true })', () => {
+    expect(expr({ kind: 'omit', base: 'pet', keys: ['id', 'x-trace'] })).toBe(
+      'PetSchema.omit({ id: true, "x-trace": true })'
+    );
+  });
+});
+
+describe('schemaToZodExpression — literals and enums', () => {
+  it('string literal → z.literal("a")', () => {
+    expect(expr({ kind: 'literal', value: 'a' })).toBe('z.literal("a")');
+  });
+
+  it('number literal → z.literal(1)', () => {
+    expect(expr({ kind: 'literal', value: 1 })).toBe('z.literal(1)');
+  });
+
+  it('negative number literal uses a prefix-unary minus', () => {
+    expect(expr({ kind: 'literal', value: -2 })).toBe('z.literal(-2)');
+  });
+
+  it('boolean literal → z.literal(true)', () => {
+    expect(expr({ kind: 'literal', value: true })).toBe('z.literal(true)');
+    expect(expr({ kind: 'literal', value: false })).toBe('z.literal(false)');
+  });
+
+  it('all-string enum → z.enum([…])', () => {
+    expect(expr({ kind: 'enum', scalar: 'string', values: ['a', 'b'] })).toBe('z.enum(["a", "b"])');
+  });
+
+  it('mixed/number enum → z.union of literals', () => {
+    expect(expr({ kind: 'enum', scalar: 'number', values: [1, 2] })).toBe(
+      'z.union([z.literal(1), z.literal(2)])'
+    );
+  });
+});
+
+describe('schemaToZodExpression — unions and intersections', () => {
+  it('multi-member union → z.union([…])', () => {
+    expect(
+      expr({
+        kind: 'union',
+        members: [
+          { kind: 'scalar', scalar: 'string' },
+          { kind: 'scalar', scalar: 'number' },
+        ],
+      })
+    ).toBe('z.union([z.string(), z.number()])');
+  });
+
+  it('single-member union collapses to the member', () => {
+    expect(expr({ kind: 'union', members: [{ kind: 'scalar', scalar: 'boolean' }] })).toBe(
+      'z.boolean()'
+    );
+  });
+
+  it('intersection chains .and', () => {
+    expect(
+      expr({
+        kind: 'intersection',
+        members: [
+          { kind: 'ref', name: 'a' },
+          { kind: 'ref', name: 'b' },
+          { kind: 'ref', name: 'c' },
+        ],
+      })
+    ).toBe('z.lazy(() => ASchema).and(z.lazy(() => BSchema)).and(z.lazy(() => CSchema))');
+  });
+});
+
+describe('schemaToZodExpression — null and unknown', () => {
+  it('null → z.null()', () => {
+    expect(expr({ kind: 'null' })).toBe('z.null()');
+  });
+
+  it('unknown → z.unknown()', () => {
+    expect(expr({ kind: 'unknown' })).toBe('z.unknown()');
+  });
+});
+
+describe('schemaToZodExpression — refinements', () => {
+  it('string min/max/pattern', () => {
+    expect(
+      expr({
+        kind: 'scalar',
+        scalar: 'string',
+        metadata: { minLength: 1, maxLength: 5, pattern: '^a.+$' },
+      })
+    ).toBe('z.string().min(1).max(5).regex(new RegExp("^a.+$"))');
+  });
+
+  it('number bounds and exclusive bounds', () => {
+    expect(
+      expr({
+        kind: 'scalar',
+        scalar: 'number',
+        metadata: { minimum: 0, maximum: 10, exclusiveMinimum: 1, exclusiveMaximum: 9 },
+      })
+    ).toBe('z.number().min(0).max(10).gt(1).lt(9)');
+  });
+
+  it('integer keeps .int() before bounds', () => {
+    expect(expr({ kind: 'scalar', scalar: 'integer', metadata: { minimum: -5, maximum: 5 } })).toBe(
+      'z.number().int().min(-5).max(5)'
+    );
+  });
+
+  it('array min/max items', () => {
+    expect(
+      expr({
+        kind: 'array',
+        items: { kind: 'scalar', scalar: 'string' },
+        metadata: { minItems: 1, maxItems: 3 },
+      })
+    ).toBe('z.array(z.string()).min(1).max(3)');
+  });
+
+  it('ignores metadata on kinds without a stable refinement (e.g. boolean)', () => {
+    expect(expr({ kind: 'scalar', scalar: 'boolean', metadata: { minimum: 1 } })).toBe(
+      'z.boolean()'
+    );
+  });
+
+  it('emits only the string refinements that are set (others skipped)', () => {
+    expect(expr({ kind: 'scalar', scalar: 'string', metadata: { maxLength: 5 } })).toBe(
+      'z.string().max(5)'
+    );
+  });
+
+  it('emits only the number refinements that are set (others skipped)', () => {
+    expect(expr({ kind: 'scalar', scalar: 'number', metadata: { maximum: 9 } })).toBe(
+      'z.number().max(9)'
+    );
+    expect(expr({ kind: 'scalar', scalar: 'number', metadata: { exclusiveMaximum: 9 } })).toBe(
+      'z.number().lt(9)'
+    );
+  });
+
+  it('emits only the array refinements that are set (others skipped)', () => {
+    expect(
+      expr({
+        kind: 'array',
+        items: { kind: 'scalar', scalar: 'string' },
+        metadata: { maxItems: 3 },
+      })
+    ).toBe('z.array(z.string()).max(3)');
+    expect(
+      expr({
+        kind: 'array',
+        items: { kind: 'scalar', scalar: 'string' },
+        metadata: { minItems: 1 },
+      })
+    ).toBe('z.array(z.string()).min(1)');
+  });
+
+  it('an empty metadata object adds no refinements', () => {
+    expect(expr({ kind: 'scalar', scalar: 'string', metadata: {} })).toBe('z.string()');
+  });
+});
+
+describe('renderZodModule', () => {
+  it('returns empty string when there are no schemas', () => {
+    expect(renderZodModule([])).toBe('');
+  });
+
+  it('emits the z import and one export const per schema', () => {
+    const schemas: NamedSchemaModel[] = [
+      {
+        name: 'Pet',
+        schema: {
+          kind: 'object',
+          properties: [
+            { name: 'id', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
+            { name: 'tag', schema: { kind: 'scalar', scalar: 'string' }, required: false },
+          ],
+        },
+      },
+    ];
+    const out = renderZodModule(schemas);
+    expect(out).toContain('import { z } from "zod";');
+    expect(out).toContain('export const PetSchema = z.object({');
+  });
+
+  it('zodModuleStatements + printStatements matches renderZodModule', () => {
+    const schemas: NamedSchemaModel[] = [
+      { name: 'Foo', schema: { kind: 'scalar', scalar: 'string' } },
+    ];
+    expect(printStatements(zodModuleStatements(schemas))).toBe(renderZodModule(schemas));
+  });
+});
+
+describe('schemaToZodExpression — direct export', () => {
+  it('is callable directly and returns an expression node', () => {
+    const node = schemaToZodExpression({ kind: 'scalar', scalar: 'string' });
+    expect(printStatements([node])).toBe('z.string()');
+  });
+});
diff --git a/packages/openapi-typescript/src/emitters/auth.ts b/packages/openapi-typescript/src/emitters/auth.ts
new file mode 100644
index 0000000000..687afdbb48
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/auth.ts
@@ -0,0 +1,755 @@
+import type { SecuritySchemeModel } from '../ir/model.js';
+import { pascalCase } from './support.js';
+import { constStatement, jsdoc, letStatement, printStatements, ts } from './ts.js';
+
+const { factory } = ts;
+
+/** A scheme whose credential resolves through `__resolve` (bearer or any apiKey). */
+function isResolvable(s: SecuritySchemeModel): boolean {
+  return s.kind === 'bearer' || s.kind.startsWith('apiKey');
+}
+
+/**
+ * Emit the credential-injection layer: module-scoped credential slots, the
+ * `set*` helpers that update them, and (when an operation is authed) the async
+ * `__auth(schemes)` that turns the current slots into the request `headers` and
+ * `query` for the schemes an operation accepts.
+ *
+ * - All `bearer`-kind schemes share one `__bearerToken` slot and one
+ *   `setBearer()` helper (`Authorization: Bearer <token>`).
+ * - All `basic`-kind schemes share one `__basicAuth` slot (the pre-encoded
+ *   base64 `user:pass`) and one `setBasicAuth()` helper.
+ * - Each apiKey scheme (header / query / cookie) gets its own slot + setter. The
+ *   setter is named `setApiKey` when there's exactly one apiKey scheme of any
+ *   `in`, else `setApiKey<Key>`.
+ * - Bearer / apiKey credentials are `TokenProvider`s (a value or a possibly-async
+ *   function), resolved per request via `__resolve`. `TokenProvider` is emitted
+ *   only when such a scheme exists (a basic-only client never references it).
+ * - `__resolve` / `__auth` are only emitted when at least one operation is
+ *   actually authenticated; setters are always emitted when schemes exist so
+ *   callers can wire credentials even for not-yet-used schemes.
+ *
+ * Returns `''` when the document declares no injectable schemes.
+ */
+export function renderAuth(
+  schemes: SecuritySchemeModel[],
+  anyOperationAuthed: boolean,
+  exportHelpers: boolean
+): string {
+  return printStatements(authStatements(schemes, anyOperationAuthed, exportHelpers));
+}
+
+/** The credential-injection layer (slots, setters, `__resolve`/`__auth`) as nodes. */
+export function authStatements(
+  schemes: SecuritySchemeModel[],
+  anyOperationAuthed: boolean,
+  exportHelpers: boolean
+): ts.Statement[] {
+  if (schemes.length === 0) return [];
+
+  const hasBearer = schemes.some((s) => s.kind === 'bearer');
+  const hasBasic = schemes.some((s) => s.kind === 'basic');
+  const hasTokenScheme = schemes.some(isResolvable);
+  const apiKeySchemes = schemes.filter(
+    (
+      s
+    ): s is Extract<
+      SecuritySchemeModel,
+      { kind: 'apiKeyHeader' | 'apiKeyQuery' | 'apiKeyCookie' }
+    > => s.kind.startsWith('apiKey')
+  );
+  const soleApiKey = apiKeySchemes.length === 1;
+
+  const nodes: ts.Statement[] = [];
+
+  if (hasTokenScheme) nodes.push(tokenProviderType());
+  nodes.push(authCredentialsType(hasBearer, hasBasic, apiKeySchemes.length > 0));
+  if (hasBearer) nodes.push(...bearerBlock());
+  if (hasBasic) nodes.push(...basicBlock());
+  for (const scheme of apiKeySchemes) {
+    nodes.push(...apiKeyBlock(scheme.key, apiKeySetterName(scheme.key, soleApiKey)));
+  }
+
+  if (anyOperationAuthed) {
+    if (hasTokenScheme) nodes.push(resolveFn());
+    nodes.push(authFn(schemes, exportHelpers));
+  } else {
+    // No operation is authed, so nothing reads the credential slots; the setters
+    // above only write them. Under `noUnusedLocals` a write-only `let` trips
+    // TS6133, so reference each declared slot in a `void` no-op to keep the
+    // emitted file compiling. Setters stay public (callers may wire credentials
+    // for not-yet-used schemes), and `authSetterNames` stays consistent. Every
+    // scheme kind contributes exactly one slot, so with `schemes.length > 0`
+    // this list is always non-empty.
+    const slots: string[] = [];
+    if (hasBearer) slots.push('__bearerToken');
+    if (hasBasic) slots.push('__basicAuth');
+    for (const scheme of apiKeySchemes) slots.push(apiKeySlot(scheme.key));
+    for (const slot of slots) nodes.push(voidNoOp(slot));
+  }
+
+  return nodes;
+}
+
+const tokenProviderType_ = 'TokenProvider';
+
+/** `TokenProvider | null` — the type of every resolvable credential slot. */
+function tokenProviderOrNull(): ts.TypeNode {
+  return factory.createUnionTypeNode([
+    factory.createTypeReferenceNode(tokenProviderType_),
+    factory.createLiteralTypeNode(factory.createNull()),
+  ]);
+}
+
+/** `export type TokenProvider = string | (() => string | Promise<string>);` */
+function tokenProviderType(): ts.Statement {
+  const returns = factory.createUnionTypeNode([
+    factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+    factory.createTypeReferenceNode('Promise', [
+      factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+    ]),
+  ]);
+  const fnType = factory.createParenthesizedType(
+    factory.createFunctionTypeNode(undefined, [], returns)
+  );
+  return jsdoc(
+    factory.createTypeAliasDeclaration(
+      [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+      tokenProviderType_,
+      undefined,
+      factory.createUnionTypeNode([
+        factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+        fnType,
+      ])
+    ),
+    'A credential value, or a (possibly async) function that returns one per request.'
+  );
+}
+
+/**
+ * `export type AuthCredentials = { … }` — the per-instance credential shape for
+ * `ClientConfig.auth`, with one field per scheme kind the client actually declares.
+ */
+function authCredentialsType(
+  hasBearer: boolean,
+  hasBasic: boolean,
+  hasApiKey: boolean
+): ts.Statement {
+  const opt = () => factory.createToken(ts.SyntaxKind.QuestionToken);
+  const str = () => factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
+  const members: ts.TypeElement[] = [];
+  if (hasBearer) {
+    members.push(
+      factory.createPropertySignature(
+        undefined,
+        'bearer',
+        opt(),
+        factory.createTypeReferenceNode(tokenProviderType_)
+      )
+    );
+  }
+  if (hasBasic) {
+    members.push(
+      factory.createPropertySignature(
+        undefined,
+        'basic',
+        opt(),
+        factory.createTypeLiteralNode([
+          factory.createPropertySignature(undefined, 'username', undefined, str()),
+          factory.createPropertySignature(undefined, 'password', undefined, str()),
+        ])
+      )
+    );
+  }
+  if (hasApiKey) {
+    members.push(
+      factory.createPropertySignature(
+        undefined,
+        'apiKey',
+        opt(),
+        factory.createTypeReferenceNode('Record', [
+          str(),
+          factory.createTypeReferenceNode(tokenProviderType_),
+        ])
+      )
+    );
+  }
+  return jsdoc(
+    factory.createTypeAliasDeclaration(
+      [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+      'AuthCredentials',
+      undefined,
+      factory.createTypeLiteralNode(members)
+    ),
+    'Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global\n' +
+      '`set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back\n' +
+      'to the global slots.'
+  );
+}
+
+/** `let <name>: <type> = null;` */
+function nullableSlot(name: string, type: ts.TypeNode): ts.Statement {
+  return letStatement(name, factory.createNull(), type);
+}
+
+/** The shared `__bearerToken` slot + `setBearer` setter. */
+function bearerBlock(): ts.Statement[] {
+  const setter = factory.createFunctionDeclaration(
+    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+    undefined,
+    'setBearer',
+    undefined,
+    [
+      factory.createParameterDeclaration(
+        undefined,
+        undefined,
+        'token',
+        undefined,
+        tokenProviderOrNull()
+      ),
+    ],
+    factory.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword),
+    factory.createBlock(
+      [
+        factory.createExpressionStatement(
+          factory.createBinaryExpression(
+            factory.createIdentifier('__bearerToken'),
+            factory.createToken(ts.SyntaxKind.EqualsToken),
+            factory.createIdentifier('token')
+          )
+        ),
+      ],
+      true
+    )
+  );
+  return [
+    nullableSlot('__bearerToken', tokenProviderOrNull()),
+    jsdoc(
+      setter,
+      'Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`\n' +
+        'on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a\n' +
+        '(possibly async) function resolved per request.'
+    ),
+  ];
+}
+
+/** The shared `__basicAuth` slot + `setBasicAuth` setter. */
+function basicBlock(): ts.Statement[] {
+  // `btoa(`${username}:${password}`)`
+  const encode = factory.createCallExpression(factory.createIdentifier('btoa'), undefined, [
+    factory.createTemplateExpression(factory.createTemplateHead(''), [
+      factory.createTemplateSpan(
+        factory.createIdentifier('username'),
+        factory.createTemplateMiddle(':')
+      ),
+      factory.createTemplateSpan(
+        factory.createIdentifier('password'),
+        factory.createTemplateTail('')
+      ),
+    ]),
+  ]);
+  const setter = factory.createFunctionDeclaration(
+    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+    undefined,
+    'setBasicAuth',
+    undefined,
+    [
+      factory.createParameterDeclaration(
+        undefined,
+        undefined,
+        'username',
+        undefined,
+        factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)
+      ),
+      factory.createParameterDeclaration(
+        undefined,
+        undefined,
+        'password',
+        undefined,
+        factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)
+      ),
+    ],
+    factory.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword),
+    factory.createBlock(
+      [
+        factory.createExpressionStatement(
+          factory.createBinaryExpression(
+            factory.createIdentifier('__basicAuth'),
+            factory.createToken(ts.SyntaxKind.EqualsToken),
+            encode
+          )
+        ),
+      ],
+      true
+    )
+  );
+  return [
+    nullableSlot(
+      '__basicAuth',
+      factory.createUnionTypeNode([
+        factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+        factory.createLiteralTypeNode(factory.createNull()),
+      ])
+    ),
+    jsdoc(setter, 'Set HTTP Basic credentials sent as `Authorization: Basic <base64>`.'),
+  ];
+}
+
+/** A per-apiKey scheme slot + its setter. */
+function apiKeyBlock(key: string, setterName: string): ts.Statement[] {
+  const slot = apiKeySlot(key);
+  const setter = factory.createFunctionDeclaration(
+    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+    undefined,
+    setterName,
+    undefined,
+    [
+      factory.createParameterDeclaration(
+        undefined,
+        undefined,
+        'key',
+        undefined,
+        tokenProviderOrNull()
+      ),
+    ],
+    factory.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword),
+    factory.createBlock(
+      [
+        factory.createExpressionStatement(
+          factory.createBinaryExpression(
+            factory.createIdentifier(slot),
+            factory.createToken(ts.SyntaxKind.EqualsToken),
+            factory.createIdentifier('key')
+          )
+        ),
+      ],
+      true
+    )
+  );
+  return [
+    nullableSlot(slot, tokenProviderOrNull()),
+    jsdoc(
+      setter,
+      `Set (or clear, with \`null\`) the credential for the \`${key}\` API-key scheme. Accepts a\n` +
+        'string or a (possibly async) function resolved per request.'
+    ),
+  ];
+}
+
+/**
+ * `async function __resolve(slot: TokenProvider | null): Promise<string | null> {
+ *    if (slot === null) return null;
+ *    return typeof slot === 'function' ? slot() : slot;
+ *  }`
+ */
+function resolveFn(): ts.Statement {
+  const slotRef = factory.createIdentifier('slot');
+  const body = factory.createBlock(
+    [
+      factory.createIfStatement(
+        factory.createBinaryExpression(
+          slotRef,
+          factory.createToken(ts.SyntaxKind.EqualsEqualsEqualsToken),
+          factory.createNull()
+        ),
+        factory.createReturnStatement(factory.createNull())
+      ),
+      factory.createReturnStatement(
+        factory.createConditionalExpression(
+          factory.createBinaryExpression(
+            factory.createTypeOfExpression(slotRef),
+            factory.createToken(ts.SyntaxKind.EqualsEqualsEqualsToken),
+            factory.createStringLiteral('function')
+          ),
+          factory.createToken(ts.SyntaxKind.QuestionToken),
+          factory.createCallExpression(slotRef, undefined, []),
+          factory.createToken(ts.SyntaxKind.ColonToken),
+          slotRef
+        )
+      ),
+    ],
+    true
+  );
+  return jsdoc(
+    factory.createFunctionDeclaration(
+      [factory.createModifier(ts.SyntaxKind.AsyncKeyword)],
+      undefined,
+      '__resolve',
+      undefined,
+      [
+        factory.createParameterDeclaration(
+          undefined,
+          undefined,
+          'slot',
+          undefined,
+          tokenProviderOrNull()
+        ),
+      ],
+      factory.createTypeReferenceNode('Promise', [
+        factory.createUnionTypeNode([
+          factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+          factory.createLiteralTypeNode(factory.createNull()),
+        ]),
+      ]),
+      body
+    ),
+    'Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.'
+  );
+}
+
+/** `const v = await __resolve(<source>);` — the per-case credential resolve. */
+function resolveConst(source: ts.Expression): ts.Statement {
+  return constStatement(
+    'v',
+    factory.createAwaitExpression(
+      factory.createCallExpression(factory.createIdentifier('__resolve'), undefined, [source])
+    )
+  );
+}
+
+/** `config.auth?.<prop>` — optional access into the per-instance credentials. */
+function configAuth(prop: string): ts.Expression {
+  return factory.createPropertyAccessChain(
+    factory.createPropertyAccessExpression(factory.createIdentifier('config'), 'auth'),
+    factory.createToken(ts.SyntaxKind.QuestionDotToken),
+    prop
+  );
+}
+
+/** `config.auth?.apiKey?.["<key>"]` — the per-instance apiKey credential for a scheme. */
+function configApiKey(key: string): ts.Expression {
+  return factory.createElementAccessChain(
+    factory.createPropertyAccessChain(
+      factory.createPropertyAccessExpression(factory.createIdentifier('config'), 'auth'),
+      factory.createToken(ts.SyntaxKind.QuestionDotToken),
+      'apiKey'
+    ),
+    factory.createToken(ts.SyntaxKind.QuestionDotToken),
+    factory.createStringLiteral(key)
+  );
+}
+
+/** `<perInstance> ?? <globalSlot>` — prefer the config's credential, fall back to the module slot. */
+function preferConfig(perInstance: ts.Expression, globalSlot: string): ts.Expression {
+  return factory.createBinaryExpression(
+    perInstance,
+    factory.createToken(ts.SyntaxKind.QuestionQuestionToken),
+    factory.createIdentifier(globalSlot)
+  );
+}
+
+/** `<target>[<key>] = <value>;` (string-literal element access). */
+function assignElement(target: string, key: string, value: ts.Expression): ts.Statement {
+  return factory.createExpressionStatement(
+    factory.createBinaryExpression(
+      factory.createElementAccessExpression(
+        factory.createIdentifier(target),
+        factory.createStringLiteral(key)
+      ),
+      factory.createToken(ts.SyntaxKind.EqualsToken),
+      value
+    )
+  );
+}
+
+/** `if (v !== null) <then>` — guard a resolved credential before injecting it. */
+function ifVResolved(then: ts.Statement): ts.Statement {
+  return factory.createIfStatement(
+    factory.createBinaryExpression(
+      factory.createIdentifier('v'),
+      factory.createToken(ts.SyntaxKind.ExclamationEqualsEqualsToken),
+      factory.createNull()
+    ),
+    then
+  );
+}
+
+/** The per-scheme `case "<key>":` clause that injects that scheme's credential. */
+function authCase(scheme: SecuritySchemeModel): ts.CaseClause {
+  const key = factory.createStringLiteral(scheme.key);
+  const breakStmt = factory.createBreakStatement();
+
+  if (scheme.kind === 'bearer') {
+    // `const v = await __resolve(__bearerToken); if (v !== null) headers['Authorization'] = `Bearer ${v}`;`
+    const bearerValue = factory.createTemplateExpression(factory.createTemplateHead('Bearer '), [
+      factory.createTemplateSpan(factory.createIdentifier('v'), factory.createTemplateTail('')),
+    ]);
+    return factory.createCaseClause(key, [
+      factory.createBlock(
+        [
+          resolveConst(preferConfig(configAuth('bearer'), '__bearerToken')),
+          ifVResolved(assignElement('headers', 'Authorization', bearerValue)),
+          breakStmt,
+        ],
+        true
+      ),
+    ]);
+  }
+
+  if (scheme.kind === 'basic') {
+    // Prefer per-instance `config.auth.basic` ({ username, password }, encoded here)
+    // over the module-global pre-encoded `__basicAuth`:
+    //   const b = config.auth?.basic;
+    //   const basic = b ? btoa(`${b.username}:${b.password}`) : __basicAuth;
+    //   if (basic !== null) headers['Authorization'] = `Basic ${basic}`;
+    const bDecl = constStatement('b', configAuth('basic'));
+    const encodeB = factory.createCallExpression(factory.createIdentifier('btoa'), undefined, [
+      factory.createTemplateExpression(factory.createTemplateHead(''), [
+        factory.createTemplateSpan(
+          factory.createPropertyAccessExpression(factory.createIdentifier('b'), 'username'),
+          factory.createTemplateMiddle(':')
+        ),
+        factory.createTemplateSpan(
+          factory.createPropertyAccessExpression(factory.createIdentifier('b'), 'password'),
+          factory.createTemplateTail('')
+        ),
+      ]),
+    ]);
+    const basicDecl = constStatement(
+      'basic',
+      factory.createConditionalExpression(
+        factory.createIdentifier('b'),
+        factory.createToken(ts.SyntaxKind.QuestionToken),
+        encodeB,
+        factory.createToken(ts.SyntaxKind.ColonToken),
+        factory.createIdentifier('__basicAuth')
+      )
+    );
+    const basicValue = factory.createTemplateExpression(factory.createTemplateHead('Basic '), [
+      factory.createTemplateSpan(factory.createIdentifier('basic'), factory.createTemplateTail('')),
+    ]);
+    return factory.createCaseClause(key, [
+      factory.createBlock(
+        [
+          bDecl,
+          basicDecl,
+          factory.createIfStatement(
+            factory.createBinaryExpression(
+              factory.createIdentifier('basic'),
+              factory.createToken(ts.SyntaxKind.ExclamationEqualsEqualsToken),
+              factory.createNull()
+            ),
+            assignElement('headers', 'Authorization', basicValue)
+          ),
+          breakStmt,
+        ],
+        true
+      ),
+    ]);
+  }
+
+  const slot = apiKeySlot(scheme.key);
+  const v = factory.createIdentifier('v');
+
+  if (scheme.kind === 'apiKeyHeader') {
+    return factory.createCaseClause(key, [
+      factory.createBlock(
+        [
+          resolveConst(preferConfig(configApiKey(scheme.key), slot)),
+          ifVResolved(assignElement('headers', scheme.headerName, v)),
+          breakStmt,
+        ],
+        true
+      ),
+    ]);
+  }
+
+  if (scheme.kind === 'apiKeyQuery') {
+    return factory.createCaseClause(key, [
+      factory.createBlock(
+        [
+          resolveConst(preferConfig(configApiKey(scheme.key), slot)),
+          ifVResolved(assignElement('query', scheme.paramName, v)),
+          breakStmt,
+        ],
+        true
+      ),
+    ]);
+  }
+
+  // apiKeyCookie: `cookies.push(<JSON-string of name+'='> + v)`. The name is a
+  // string literal concatenated with the runtime value — never interpolated into
+  // a backtick template, which a cookieName containing a backtick or `${` could
+  // break out of.
+  const push = factory.createExpressionStatement(
+    factory.createCallExpression(
+      factory.createPropertyAccessExpression(factory.createIdentifier('cookies'), 'push'),
+      undefined,
+      [
+        factory.createBinaryExpression(
+          factory.createStringLiteral(scheme.cookieName + '='),
+          factory.createToken(ts.SyntaxKind.PlusToken),
+          v
+        ),
+      ]
+    )
+  );
+  return factory.createCaseClause(key, [
+    factory.createBlock(
+      [resolveConst(preferConfig(configApiKey(scheme.key), slot)), ifVResolved(push), breakStmt],
+      true
+    ),
+  ]);
+}
+
+/** The async `__auth(schemes)` that builds request headers/query from the slots. */
+function authFn(schemes: SecuritySchemeModel[], exportHelpers: boolean): ts.Statement {
+  const recordStringString = factory.createTypeReferenceNode('Record', [
+    factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+    factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+  ]);
+
+  const declare = (name: string, type: ts.TypeNode, init: ts.Expression): ts.Statement =>
+    constStatement(name, init, type);
+
+  const loop = factory.createForOfStatement(
+    undefined,
+    factory.createVariableDeclarationList(
+      [factory.createVariableDeclaration('scheme')],
+      ts.NodeFlags.Const
+    ),
+    factory.createIdentifier('schemes'),
+    factory.createBlock(
+      [
+        factory.createSwitchStatement(
+          factory.createIdentifier('scheme'),
+          factory.createCaseBlock(schemes.map(authCase))
+        ),
+      ],
+      true
+    )
+  );
+
+  // `if (cookies.length > 0) headers['Cookie'] = cookies.join('; ');`
+  const cookieJoin = factory.createIfStatement(
+    factory.createBinaryExpression(
+      factory.createPropertyAccessExpression(factory.createIdentifier('cookies'), 'length'),
+      factory.createToken(ts.SyntaxKind.GreaterThanToken),
+      factory.createNumericLiteral('0')
+    ),
+    assignElement(
+      'headers',
+      'Cookie',
+      factory.createCallExpression(
+        factory.createPropertyAccessExpression(factory.createIdentifier('cookies'), 'join'),
+        undefined,
+        [factory.createStringLiteral('; ')]
+      )
+    )
+  );
+
+  const ret = factory.createReturnStatement(
+    factory.createObjectLiteralExpression(
+      [
+        factory.createShorthandPropertyAssignment('headers'),
+        factory.createShorthandPropertyAssignment('query'),
+      ],
+      false
+    )
+  );
+
+  const returnType = factory.createTypeReferenceNode('Promise', [
+    factory.createTypeLiteralNode([
+      factory.createPropertySignature(undefined, 'headers', undefined, recordStringString),
+      factory.createPropertySignature(undefined, 'query', undefined, recordStringString),
+    ]),
+  ]);
+
+  const modifiers: ts.ModifierLike[] = [];
+  if (exportHelpers) modifiers.push(factory.createModifier(ts.SyntaxKind.ExportKeyword));
+  modifiers.push(factory.createModifier(ts.SyntaxKind.AsyncKeyword));
+
+  return jsdoc(
+    factory.createFunctionDeclaration(
+      modifiers,
+      undefined,
+      '__auth',
+      undefined,
+      [
+        factory.createParameterDeclaration(
+          undefined,
+          undefined,
+          'schemes',
+          undefined,
+          factory.createArrayTypeNode(factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword))
+        ),
+        factory.createParameterDeclaration(
+          undefined,
+          undefined,
+          'config',
+          undefined,
+          factory.createTypeReferenceNode('ClientConfig')
+        ),
+      ],
+      returnType,
+      factory.createBlock(
+        [
+          declare('headers', recordStringString, factory.createObjectLiteralExpression([], false)),
+          declare('query', recordStringString, factory.createObjectLiteralExpression([], false)),
+          declare(
+            'cookies',
+            factory.createArrayTypeNode(factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)),
+            factory.createArrayLiteralExpression([], false)
+          ),
+          loop,
+          cookieJoin,
+          ret,
+        ],
+        true
+      )
+    ),
+    'Build the auth `headers` and `query` for an operation from the currently-set credentials.\n' +
+      'Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers\n' +
+      'can always override by passing their own `init.headers`.'
+  );
+}
+
+/** `void <slot>;` — keep a write-only slot from tripping `noUnusedLocals`. */
+function voidNoOp(slot: string): ts.Statement {
+  return factory.createExpressionStatement(
+    factory.createVoidExpression(factory.createIdentifier(slot))
+  );
+}
+
+/** Module-scoped variable name backing an apiKey scheme's current value. */
+function apiKeySlot(key: string): string {
+  return `__apiKey_${key.replace(/[^A-Za-z0-9]/g, '_')}`;
+}
+
+/**
+ * Public setter name for an apiKey scheme: `setApiKey` when it's the only apiKey
+ * scheme (of any `in`), else `setApiKey<Key>` to disambiguate.
+ */
+function apiKeySetterName(key: string, sole: boolean): string {
+  return sole ? 'setApiKey' : `setApiKey${pascalCase(key)}`;
+}
+
+/**
+ * The public type names `renderAuth` exports for a set of schemes — `TokenProvider`
+ * when any bearer/apiKey scheme exists, else none. Multi-file writers re-export
+ * these from the entry module's type barrel.
+ */
+export function authTypeNames(schemes: SecuritySchemeModel[]): string[] {
+  if (schemes.length === 0) return [];
+  const names: string[] = [];
+  if (schemes.some(isResolvable)) names.push('TokenProvider');
+  names.push('AuthCredentials');
+  return names;
+}
+
+/**
+ * The public credential-setter names `renderAuth` exports for a set of schemes,
+ * in emission order (`setBearer`, then `setBasicAuth`, then each apiKey setter).
+ * Multi-file writers re-export these from the entry module so callers still get
+ * one import.
+ */
+export function authSetterNames(schemes: SecuritySchemeModel[]): string[] {
+  const names: string[] = [];
+  if (schemes.some((s) => s.kind === 'bearer')) names.push('setBearer');
+  if (schemes.some((s) => s.kind === 'basic')) names.push('setBasicAuth');
+  const apiKeySchemes = schemes.filter((s) => s.kind.startsWith('apiKey'));
+  for (const scheme of apiKeySchemes) {
+    names.push(apiKeySetterName(scheme.key, apiKeySchemes.length === 1));
+  }
+  return names;
+}
diff --git a/packages/openapi-typescript/src/emitters/client.ts b/packages/openapi-typescript/src/emitters/client.ts
new file mode 100644
index 0000000000..0cb92a23be
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/client.ts
@@ -0,0 +1,459 @@
+import type { ApiModel, OperationModel, SecuritySchemeModel } from '../ir/model.js';
+import { collectOperationRefs } from '../ir/refs.js';
+import { authSetterNames, authStatements, authTypeNames } from './auth.js';
+import {
+  type ArgsStyle,
+  type Facade,
+  isTypedMultipart,
+  operationsBlockStatements,
+  operationsMetaStatements,
+  serviceClassName,
+} from './operations.js';
+import { PUBLIC_RUNTIME_TYPES, runtimeStatements } from './runtime.js';
+import { isSseOp, sseFragmentName } from './sse.js';
+import { splitLines } from './support.js';
+import { escapeJsDoc, printNodes, printStatements, ts } from './ts.js';
+import { typeGuardStatements } from './type-guards.js';
+import { type DateType, type EnumStyle, typesStatements } from './types.js';
+
+// The public option vocabulary and the writer-facing utilities are re-exported
+// from this composition module, so writers and the package barrel import the
+// emitter surface from one place — the carved-out structural emitters stay
+// internal to `emitters/`.
+export { serviceClassName } from './operations.js';
+export type { ArgsStyle, Facade } from './operations.js';
+
+const { factory } = ts;
+
+/** The generated-by banner prepended to every emitted module. */
+export const HEADER = `// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Source: OpenAPI document. Re-run \`redocly generate-client\` to update.`;
+
+/** The security-scheme keys whose credential is injected as a URL query param. */
+function queryAuthKeysFor(schemes: SecuritySchemeModel[]): Set<string> {
+  return new Set(schemes.filter((s) => s.kind === 'apiKeyQuery').map((s) => s.key));
+}
+
+export type EmitOptions = {
+  /**
+   * Override the BASE URL inlined into the emitted runtime. When omitted, the
+   * value is derived from `servers[0].url` in the source OpenAPI document.
+   */
+  baseUrl?: string;
+  /**
+   * How named string enums are emitted:
+   * - `'union'`: only the string-literal union type (`type X = "a" | "b"`).
+   * - `'const-object'` (default): the union type *and* a sibling
+   *   `export const X = { a: "a", b: "b" } as const;` so callers can reference
+   *   the values at runtime (`X.a`).
+   */
+  enumStyle?: EnumStyle;
+  /** Developer-facing operation shape. Defaults to `'functions'`. */
+  facade?: Facade;
+  /**
+   * How operation inputs are passed to each function/method. Defaults to
+   * `'flat'`; `'grouped'` bundles inputs into a single `args` object.
+   */
+  argsStyle?: ArgsStyle;
+  /**
+   * Class name for the `service-class` facade in single/split layouts. Ignored by
+   * the `functions` facade and by per-tag service classes. Defaults to `'Client'`.
+   */
+  name?: string;
+  /** Error-handling shape of the generated client. Defaults to `'throw'`. */
+  errorMode?: 'throw' | 'result';
+  /**
+   * How `format: date-time`/`date` string fields are typed. `'string'` (default)
+   * keeps the ISO wire shape; `'Date'` emits a `Date` reference. Opt-in — pair with
+   * the `transformers` generator so the runtime value matches the type.
+   */
+  dateType?: DateType;
+  /**
+   * TanStack Query adapter the generated module imports from
+   * (`@tanstack/${queryFramework}-query`). Defaults to `'react'`; the emitted body
+   * is byte-identical across frameworks — only the import specifier changes.
+   */
+  queryFramework?: 'react' | 'vue' | 'svelte' | 'solid';
+  /**
+   * How the `mock` generator produces data. `'baked'` (default) inlines deterministic
+   * literals (zero-dep, contract-faithful); `'faker'` emits `@faker-js/faker` calls for
+   * realistic data — reproducible when `mockSeed` is set. Only the mock module is affected.
+   */
+  mockData?: 'baked' | 'faker';
+  /** Seed for faker-mode mocks: emits a top-level `faker.seed(<n>)` so runs reproduce. */
+  mockSeed?: number;
+};
+
+/**
+ * The independent code fragments that make up a generated client — an *internal*
+ * breakdown, each a list of `ts.Statement`s. `emitSingleFile` concatenates them
+ * into one file and prints once; `emitModules` composes them into the shared
+ * modules writers consume. Never exposed to writers, so the fragment set can
+ * change without touching them.
+ */
+type ClientFragments = {
+  title: string;
+  types: ts.Statement[];
+  typeGuards: ts.Statement[];
+  /**
+   * The `OPERATIONS` metadata map (+ `OperationId` / `OperationMetadata` types).
+   * Pure data with no runtime or type dependencies, so multi-file writers place it
+   * in the shared schemas module alongside the model types.
+   */
+  operationsMeta: ts.Statement[];
+  runtime: ts.Statement[];
+  auth: ts.Statement[];
+  operations: ts.Statement[];
+};
+
+function renderFragments(
+  model: ApiModel,
+  options: EmitOptions,
+  exportHelpers: boolean
+): ClientFragments {
+  const baseUrl = options.baseUrl ?? model.baseUrl;
+  const enumStyle: EnumStyle = options.enumStyle ?? 'const-object';
+  const errorMode = options.errorMode ?? 'throw';
+  const dateType: DateType = options.dateType ?? 'string';
+  const needsHeaderHelper = model.services.some((s) =>
+    s.operations.some((op) => op.headerParams.length > 0)
+  );
+  const needsAuthHelper = model.services.some((s) =>
+    s.operations.some((op) => op.security.length > 0)
+  );
+  const allOps = model.services.flatMap((s) => s.operations);
+  const needsSse = allOps.some(isSseOp);
+  // The `__toFormData` runtime helper is emitted only when some operation has a typed
+  // multipart body (object schema) that the call site serializes.
+  const needsMultipart = allOps.some((op) => op.requestBody && isTypedMultipart(op.requestBody));
+  // ClientConfig gains an `auth?: AuthCredentials` field (per-instance credentials)
+  // whenever the client has injectable security schemes — the type the auth emitter
+  // produces. Gated so non-auth clients are byte-identical.
+  const authConfig = model.securitySchemes.length > 0;
+  return {
+    title: renderTitleComment(model),
+    types: typesStatements(model.schemas, enumStyle, dateType),
+    typeGuards: typeGuardStatements(model.schemas),
+    operationsMeta: operationsMetaStatements(allOps),
+    runtime: runtimeStatements(
+      baseUrl,
+      needsHeaderHelper,
+      exportHelpers,
+      errorMode,
+      needsSse,
+      authConfig,
+      needsMultipart
+    ),
+    auth: authStatements(model.securitySchemes, needsAuthHelper, exportHelpers),
+    operations: operationsBlockStatements(allOps, {
+      facade: options.facade ?? 'functions',
+      className: options.name ?? 'Client',
+      argsStyle: options.argsStyle ?? 'flat',
+      errorMode,
+      dateType,
+      queryAuthKeys: queryAuthKeysFor(model.securitySchemes),
+      schemaNames: new Set(model.schemas.map((s) => s.name)),
+    }),
+  };
+}
+
+export function emitSingleFile(model: ApiModel, options: EmitOptions = {}): string {
+  const f = renderFragments(model, options, false);
+  return banner([
+    HEADER,
+    f.title,
+    printStatements([
+      ...f.types,
+      ...f.typeGuards,
+      ...f.operationsMeta,
+      ...f.runtime,
+      ...f.auth,
+      ...f.operations,
+    ]),
+  ]);
+}
+
+/**
+ * Assemble file content from a header banner and a printed body: the leading
+ * `// Generated by …` comment and the `/** title *​/` block are structural
+ * banners (not part of the printed AST), prepended with blank-line separation.
+ * Trailing newline mirrors a hand-authored file.
+ */
+function banner(sections: string[]): string {
+  return sections.filter((s) => s.length > 0).join('\n\n') + '\n';
+}
+
+/**
+ * The writer-facing view of an emitted client. The shared-module contents are
+ * eager strings; the per-file wiring (`renderEndpoints`, `endpointImports`,
+ * `publicReexport`) are methods because they depend on the writer's chosen file
+ * names (`stem`, `prefix`) and operation grouping. `emitSingleFile` is the
+ * single-file counterpart that needs none of this.
+ */
+export type ClientModules = {
+  /** The generated-by header comment, prepended to every emitted file. */
+  header: string;
+  /** Shared http module: runtime + auth state + public setters. */
+  http: string;
+  /** Shared schemas module: model types + type guards + operation metadata. */
+  schemas: string;
+  /** Whether the schemas module exports anything (else its file + re-export are skipped). */
+  hasSchemas: boolean;
+  /** Every operation rendered together (the `split` entry file's endpoints). */
+  operations: string;
+  /** Render a subset of operations as their own block, for per-tag layouts. */
+  renderEndpoints(ops: OperationModel[], className: string): string;
+  /**
+   * The import header an endpoints file needs: the schema types it references and
+   * the runtime helpers it uses. `prefix` is the relative path back to the shared
+   * modules (`./` beside them, `../` one folder deeper, as in `tags-split`).
+   */
+  endpointImports(ops: OperationModel[], stem: string, prefix?: string): string;
+  /** Re-export the public runtime surface (values + config types) from the http module. */
+  publicReexport(stem: string): string;
+  /**
+   * The entry-barrel `export const sse = { ...frag }` merging per-tag SSE fragments
+   * (functions facade). Empty string when none.
+   */
+  sseBarrel(groups: { tagStem: string; moduleSpec: string; ops: OperationModel[] }[]): string;
+};
+
+/**
+ * Build the multi-file view of a client. The operation-facing runtime helpers are
+ * `export`ed (endpoints import them from the shared http module); `facade` and
+ * `argsStyle` are captured here so writers needn't thread them through.
+ */
+export function emitModules(model: ApiModel, options: EmitOptions = {}): ClientModules {
+  const f = renderFragments(model, options, true);
+  const facade = options.facade ?? 'functions';
+  const argsStyle = options.argsStyle ?? 'flat';
+  const errorMode = options.errorMode ?? 'throw';
+  const dateType: DateType = options.dateType ?? 'string';
+  const queryAuthKeys = queryAuthKeysFor(model.securitySchemes);
+  const schemaNames = new Set(model.schemas.map((s) => s.name));
+  const hasSse = model.services.flatMap((s) => s.operations).some(isSseOp);
+  return {
+    header: HEADER,
+    http: httpModuleContent(f),
+    schemas: schemasModuleContent(f),
+    hasSchemas: hasSchemas(f),
+    operations: printStatements(f.operations),
+    renderEndpoints: (ops, className) =>
+      printStatements(
+        operationsBlockStatements(ops, {
+          facade,
+          className,
+          argsStyle,
+          errorMode,
+          dateType,
+          queryAuthKeys,
+          schemaNames,
+          // Per-tag SSE aggregates carry the class-derived name so the barrel can
+          // re-merge them without collisions.
+          sseExportName: sseFragmentName(className),
+        })
+      ),
+    endpointImports: (ops, stem, prefix) =>
+      printNodes(endpointImportNodes(ops, stem, facade, errorMode, prefix)),
+    publicReexport: (stem) =>
+      printNodes(publicReexportNodes(stem, model.securitySchemes, options.errorMode, hasSse)),
+    sseBarrel: (groups) => {
+      if (facade !== 'functions') return '';
+      const withSse = groups.filter((g) => g.ops.some(isSseOp));
+      if (withSse.length === 0) return '';
+      // `serviceClassName` is applied exactly once (on the raw tag stem) here and in
+      // `renderEndpoints`, so the producer fragment and this import agree.
+      const frags = withSse.map((g) => sseFragmentName(serviceClassName(g.tagStem)));
+      const imports = withSse
+        .map((g, i) => `import { ${frags[i]} } from '${g.moduleSpec}';`)
+        .join('\n');
+      const spread = frags.map((f) => `...${f}`).join(', ');
+      return `${imports}\nexport const sse = { ${spread} };`;
+    },
+  };
+}
+
+/**
+ * The relative-import basename for emitting `from './<stem>.<kind>.js'`. The `.js`
+ * extension is required for `node16`/`nodenext` module resolution and accepted by
+ * bundler resolution, so generated imports stay portable. Writers also use this to
+ * wire the barrel's cross-module re-exports.
+ */
+export function moduleSpecifier(stem: string, kind: 'schemas' | 'http', prefix = './'): string {
+  return `${prefix}${stem}.${kind}.js`;
+}
+
+/** The shared http module's content: runtime + auth state + public setters. */
+function httpModuleContent(f: ClientFragments): string {
+  return banner([HEADER, printStatements([...f.runtime, ...f.auth])]);
+}
+
+/** The shared schemas module's content: model types + type guards + operation metadata. */
+function schemasModuleContent(f: ClientFragments): string {
+  return banner([HEADER, printStatements([...f.types, ...f.typeGuards, ...f.operationsMeta])]);
+}
+
+/** True when the schemas module actually exports anything. */
+function hasSchemas(f: ClientFragments): boolean {
+  return f.types.length > 0 || f.typeGuards.length > 0 || f.operationsMeta.length > 0;
+}
+
+/** The named types a set of operations references, sorted for deterministic imports. */
+function typeNamesFor(ops: OperationModel[], errorMode: 'throw' | 'result'): string[] {
+  const refs = new Set<string>();
+  for (const op of ops) {
+    for (const ref of collectOperationRefs(op, errorMode)) refs.add(ref);
+  }
+  return [...refs].sort();
+}
+
+/** The runtime helpers a set of operations imports from the http module. */
+function helperNamesFor(ops: OperationModel[], errorMode: 'throw' | 'result'): string[] {
+  const helpers: string[] = [];
+  // `__buildUrl` is used by both SSE and regular ops; the request terminal
+  // (`__requestResult` in result mode, `__request` in throw mode) only by regular
+  // ops, and `__sse` only by SSE ops — guard each so an SSE-only or regular-only
+  // file never imports a helper it doesn't reference (`noUnusedLocals`).
+  if (ops.length > 0) helpers.push('__buildUrl');
+  if (ops.some((op) => !isSseOp(op)))
+    helpers.push(errorMode === 'result' ? '__requestResult' : '__request');
+  if (ops.some(isSseOp)) helpers.push('__sse');
+  if (ops.some((op) => op.security.length > 0)) helpers.push('__auth');
+  if (ops.some((op) => op.headerParams.length > 0)) helpers.push('__headers');
+  // A typed multipart body's call site serializes it via `__toFormData` (see operations.ts).
+  if (ops.some((op) => op.requestBody && isTypedMultipart(op.requestBody))) {
+    helpers.push('__toFormData');
+  }
+  return helpers.sort();
+}
+
+/**
+ * The import declarations an endpoints file needs: referenced types + used helpers.
+ *
+ * The `facade` decides how the config is reached: the functions facade imports the
+ * global `__config` value; the service-class facade imports the `ClientConfig` type
+ * for its constructor (each instance carries its own config).
+ */
+function endpointImportNodes(
+  ops: OperationModel[],
+  stem: string,
+  facade: Facade,
+  errorMode: 'throw' | 'result',
+  prefix = './'
+): ts.ImportDeclaration[] {
+  const typeNames = typeNamesFor(ops, errorMode);
+  const httpValues = helperNamesFor(ops, errorMode);
+  if (facade === 'functions') httpValues.push('__config');
+  httpValues.sort();
+  // The class constructor needs the `ClientConfig` *type*; pull it from the http
+  // module via an inline `type` modifier so the value/type imports stay one
+  // declaration. Every listed type must be referenced by this file's emitted code,
+  // else `noUnusedLocals` trips: `RequestOptions` is only the per-call init of a
+  // regular op (SSE ops take `SseOptions`); `Result<…>` is only named by a
+  // regular op in result mode; `ServerSentEvent`/`SseOptions` only by an SSE op.
+  const hasRegular = ops.some((op) => !isSseOp(op));
+  const hasSse = ops.some(isSseOp);
+  const httpTypeNames = [
+    // The class constructor needs `ClientConfig`; its `use()` method needs `Middleware`.
+    ...(facade === 'service-class' ? ['ClientConfig', 'Middleware'] : []),
+    ...(hasRegular ? ['RequestOptions'] : []),
+    ...(errorMode === 'result' && hasRegular ? ['Result'] : []),
+    ...(hasSse ? ['ServerSentEvent', 'SseOptions'] : []),
+  ];
+
+  const decls: ts.ImportDeclaration[] = [];
+  if (typeNames.length > 0) {
+    decls.push(importDeclaration(true, typeNames, moduleSpecifier(stem, 'schemas', prefix)));
+  }
+  // Always non-empty: every facade reaches the http module — the functions facade
+  // for `__config`, the service-class facade for the `ClientConfig` type. Inline
+  // `type` modifiers keep value and type imports in one declaration.
+  decls.push(
+    importDeclaration(
+      false,
+      [
+        ...httpValues.map((name) => ({ name })),
+        ...httpTypeNames.map((name) => ({ name, typeOnly: true })),
+      ],
+      moduleSpecifier(stem, 'http', prefix)
+    )
+  );
+  return decls;
+}
+
+/**
+ * Re-export the public runtime surface from the http module: the values
+ * (`ApiError`, `setBaseUrl`, `configure`, auth setters) and the config types
+ * (`PUBLIC_RUNTIME_TYPES` — `ClientConfig`, `RequestContext`, `RequestOptions`,
+ * and the retry types) so callers get the whole surface from the entry.
+ */
+function publicReexportNodes(
+  stem: string,
+  schemes: SecuritySchemeModel[],
+  errorMode: 'throw' | 'result' | undefined,
+  hasSse: boolean
+): ts.ExportDeclaration[] {
+  const values = ['ApiError', 'configure', 'setBaseUrl', ...authSetterNames(schemes)].sort();
+  const types = [
+    ...PUBLIC_RUNTIME_TYPES,
+    ...authTypeNames(schemes),
+    ...(errorMode === 'result' ? ['Result'] : []),
+    // `ServerSentEvent`/`SseOptions` are conditionally re-exported (not in
+    // PUBLIC_RUNTIME_TYPES) so a non-SSE client's barrel stays free of them.
+    ...(hasSse ? ['ServerSentEvent', 'SseOptions'] : []),
+  ].sort();
+  const spec = moduleSpecifier(stem, 'http');
+  return [exportDeclaration(false, values, spec), exportDeclaration(true, types, spec)];
+}
+
+/** `import [type] { <a>, type <b>, … } from '<spec>';` */
+function importDeclaration(
+  typeOnly: boolean,
+  names: readonly (string | { name: string; typeOnly?: boolean })[],
+  spec: string
+): ts.ImportDeclaration {
+  const specifiers = names.map((n) => {
+    const { name, typeOnly: inline } = typeof n === 'string' ? { name: n, typeOnly: false } : n;
+    return factory.createImportSpecifier(
+      inline ?? false,
+      undefined,
+      factory.createIdentifier(name)
+    );
+  });
+  return factory.createImportDeclaration(
+    undefined,
+    // Boolean overload (not the phase-modifier `SyntaxKind.TypeKeyword` overload, which
+    // only exists in TS 5.9+): runtime-stable across our `>=5.5` peer range. The TS6387
+    // deprecation hint on TS 6.x is harmless — emitted output is byte-identical.
+    factory.createImportClause(typeOnly, undefined, factory.createNamedImports(specifiers)),
+    factory.createStringLiteral(spec)
+  );
+}
+
+/** `export [type] { <a>, <b>, … } from '<spec>';` */
+function exportDeclaration(typeOnly: boolean, names: string[], spec: string): ts.ExportDeclaration {
+  return factory.createExportDeclaration(
+    undefined,
+    typeOnly,
+    factory.createNamedExports(
+      names.map((name) =>
+        factory.createExportSpecifier(false, undefined, factory.createIdentifier(name))
+      )
+    ),
+    factory.createStringLiteral(spec)
+  );
+}
+
+function renderTitleComment(model: ApiModel): string {
+  // This banner is a raw string (it does not flow through `jsdoc()`), so escape
+  // `*/` here too — `info.title`/`info.description` are attacker-controllable and
+  // would otherwise close the comment and inject code at the top of every file.
+  const lines = [`/**`, ` * ${escapeJsDoc(`${model.title} (v${model.version})`)}`];
+  if (model.description) {
+    for (const line of splitLines(escapeJsDoc(model.description))) {
+      lines.push(` * ${line}`);
+    }
+  }
+  lines.push(' */');
+  return lines.join('\n');
+}
diff --git a/packages/openapi-typescript/src/emitters/faker.ts b/packages/openapi-typescript/src/emitters/faker.ts
new file mode 100644
index 0000000000..a05b0f7731
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/faker.ts
@@ -0,0 +1,272 @@
+// Builds the body expression for a faker-mode mock factory: a tree of
+// `@faker-js/faker` call expressions that produce realistic — and, with a seed,
+// reproducible — data. Structurally mirrors `emitters/sample.ts`'s `walk` (same
+// recursion + same visited-set cycle guard), but returns a `ts.Expression` of
+// faker calls instead of a baked value. Nested refs are INLINED under the same
+// cycle guard (never `create<Ref>()` calls), so a cyclic schema terminates with
+// `null` at the cycle instead of recursing forever at runtime — exactly like the
+// baked path. The factory signatures are identical to the baked mode's, so a
+// consumer can flip `mockData` without touching call sites; `@faker-js/faker`
+// becomes their dev-dep while the real client stays dependency-free.
+
+import type { NamedSchemaModel, ScalarKind, SchemaMetadata, SchemaModel } from '../ir/model.js';
+import { safeIdent } from './identifier.js';
+import { constArray, ts } from './ts.js';
+
+const { factory } = ts;
+
+type DateType = 'string' | 'Date';
+
+/** The faker-call expression for an IR schema. Refs resolve against `schemas`;
+ *  recursion is cut with a visited-set (`null` at the cycle). `dateType` mirrors
+ *  the sdk's `--date-type`: under `'Date'`, date fields stay `faker.date.recent()`
+ *  (a `Date`); otherwise they are stringified to match the `string`-typed sdk. */
+export function fakerExpression(
+  schema: SchemaModel,
+  schemas: NamedSchemaModel[],
+  opts: { dateType?: DateType } = {}
+): ts.Expression {
+  const byName = new Map(schemas.map((s) => [s.name, s.schema]));
+  const expr = walk(schema, byName, new Set(), opts.dateType ?? 'string');
+  // A `CYCLE` that reaches the root has no container to absorb it (e.g. a
+  // self-referential union); fall back to null.
+  return expr === CYCLE ? factory.createNull() : expr;
+}
+
+/**
+ * Sentinel returned by `walk` when a `$ref` re-enters a name already on the stack.
+ * Containers turn it into the type-correct empty value for their position — an array
+ * to `[]`, a record to `{}`, an optional property to omission — mirroring `emitters/sample.ts`
+ * so a recursive schema yields a faker tree that still satisfies its non-nullable type.
+ * Only a required, non-container self-reference (an uninhabitable schema) degrades to null.
+ */
+const CYCLE = Symbol('cycle');
+
+type WalkResult = ts.Expression | typeof CYCLE;
+
+function walk(
+  schema: SchemaModel,
+  byName: Map<string, SchemaModel>,
+  visiting: Set<string>,
+  dateType: DateType
+): WalkResult {
+  switch (schema.kind) {
+    case 'scalar':
+      return scalarExpr(schema.scalar, schema.metadata, dateType);
+    case 'array': {
+      // A cyclic item type collapses the array to `[]` — itself a valid `T[]`.
+      const item = walk(schema.items, byName, visiting, dateType);
+      return item === CYCLE ? factory.createArrayLiteralExpression([], false) : multiple(item);
+    }
+    case 'object':
+      return objectExpr(
+        schema.properties.flatMap((p): Array<[string, ts.Expression]> => {
+          const value = walk(p.schema, byName, visiting, dateType);
+          // A cyclic optional property is omitted; a cyclic required property is
+          // uninhabitable, so null is the only stand-in.
+          if (value === CYCLE) return p.required ? [[p.name, factory.createNull()]] : [];
+          return [[p.name, value]];
+        })
+      );
+    case 'record': {
+      const value = walk(schema.value, byName, visiting, dateType);
+      return value === CYCLE
+        ? factory.createObjectLiteralExpression([], false)
+        : objectExpr([['key', value]]);
+    }
+    case 'enum':
+      return call('faker.helpers.arrayElement', [constArray(schema.values.map(literal))]);
+    case 'literal':
+      return literal(schema.value);
+    case 'union': {
+      // First non-cyclic member; if every member cycles, propagate `CYCLE`.
+      for (const member of schema.members) {
+        const value = walk(member, byName, visiting, dateType);
+        if (value !== CYCLE) return value;
+      }
+      return schema.members.length > 0 ? CYCLE : factory.createNull();
+    }
+    case 'intersection':
+      return factory.createObjectLiteralExpression(
+        schema.members.flatMap((m) => {
+          const part = walk(m, byName, visiting, dateType);
+          return part !== CYCLE && ts.isObjectLiteralExpression(part) ? assignments(part) : [];
+        }),
+        true
+      );
+    case 'omit':
+      return omitExpr(schema.base, schema.keys, byName, visiting, dateType);
+    case 'ref': {
+      if (visiting.has(schema.name)) return CYCLE;
+      const target = byName.get(schema.name);
+      if (!target) return factory.createNull();
+      visiting.add(schema.name);
+      const result = walk(target, byName, visiting, dateType);
+      visiting.delete(schema.name);
+      return result;
+    }
+    case 'null':
+    case 'unknown':
+      return factory.createNull();
+  }
+}
+
+/** The faker call for a scalar, keyed by kind then `format`. A binary field has no
+ *  faker generator (its type is `Blob`), so it emits `new Blob([])` — the same
+ *  type-demanded expression the baked path uses, taking precedence over any example. */
+function scalarExpr(
+  scalar: ScalarKind,
+  meta: SchemaMetadata | undefined,
+  dateType: DateType
+): ts.Expression {
+  if (meta?.format === 'binary') return newBlob();
+  if (scalar === 'boolean') return call('faker.datatype.boolean', []);
+  if (scalar === 'integer') return call('faker.number.int', boundsArg(meta));
+  if (scalar === 'number') return call('faker.number.float', boundsArg(meta));
+  switch (meta?.format) {
+    case 'email':
+      return call('faker.internet.email', []);
+    case 'uuid':
+      return call('faker.string.uuid', []);
+    case 'uri':
+    case 'url':
+      return call('faker.internet.url', []);
+    case 'hostname':
+      return call('faker.internet.domainName', []);
+    case 'ipv4':
+      return call('faker.internet.ipv4', []);
+    case 'date-time':
+      return dateExpr(dateType, false);
+    case 'date':
+      return dateExpr(dateType, true);
+    default:
+      return call('faker.lorem.word', []);
+  }
+}
+
+/** `faker.date.recent()` (under `dateType: 'Date'`); else its ISO string, sliced to
+ *  `YYYY-MM-DD` for a `date` so the wire shape matches the `string`-typed field. */
+function dateExpr(dateType: DateType, dateOnly: boolean): ts.Expression {
+  const recent = call('faker.date.recent', []);
+  if (dateType === 'Date') return recent;
+  const iso = call(member(recent, 'toISOString'), []);
+  if (!dateOnly) return iso;
+  return call(member(iso, 'slice'), [
+    factory.createNumericLiteral(0),
+    factory.createNumericLiteral(10),
+  ]);
+}
+
+/** `{ min, max }` arg list for a bounded numeric, or no args when neither bound is set. */
+function boundsArg(meta: SchemaMetadata | undefined): ts.Expression[] {
+  const props: ts.PropertyAssignment[] = [];
+  if (meta?.minimum !== undefined) {
+    props.push(factory.createPropertyAssignment('min', numeric(meta.minimum)));
+  }
+  if (meta?.maximum !== undefined) {
+    props.push(factory.createPropertyAssignment('max', numeric(meta.maximum)));
+  }
+  return props.length > 0 ? [factory.createObjectLiteralExpression(props, false)] : [];
+}
+
+/** `faker.helpers.multiple(() => <item>, { count: 1 })` — one element keeps output small. */
+function multiple(item: ts.Expression): ts.Expression {
+  const fn = factory.createArrowFunction(
+    undefined,
+    undefined,
+    [],
+    undefined,
+    factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
+    item
+  );
+  const count = factory.createObjectLiteralExpression(
+    [factory.createPropertyAssignment('count', factory.createNumericLiteral(1))],
+    false
+  );
+  return call('faker.helpers.multiple', [fn, count]);
+}
+
+/** An `omit`: the base named schema's faker expr minus the dropped keys. Resolves the
+ *  base via the schema set (cycle-guarded); a non-object base passes through unchanged. */
+function omitExpr(
+  base: string,
+  keys: string[],
+  byName: Map<string, SchemaModel>,
+  visiting: Set<string>,
+  dateType: DateType
+): WalkResult {
+  const target = byName.get(base);
+  if (!target) return factory.createNull();
+  const expr = walk(target, byName, visiting, dateType);
+  // A cyclic or non-object base passes through unchanged (a container/root absorbs `CYCLE`).
+  if (expr === CYCLE || !ts.isObjectLiteralExpression(expr)) return expr;
+  const drop = new Set(keys.map(safeIdent));
+  return factory.createObjectLiteralExpression(
+    assignments(expr).filter((a) => !drop.has(propKey(a))),
+    true
+  );
+}
+
+/** An object literal from `[key, expr]` entries; keys are quoted when not bare identifiers. */
+function objectExpr(entries: Array<[string, ts.Expression]>): ts.Expression {
+  return factory.createObjectLiteralExpression(
+    entries.map(([key, value]) => {
+      const safe = safeIdent(key);
+      const name = safe === key ? factory.createIdentifier(key) : factory.createStringLiteral(key);
+      return factory.createPropertyAssignment(name, value);
+    }),
+    true
+  );
+}
+
+/** The property assignments of an object literal (the spread/intersection merge unit). */
+function assignments(object: ts.ObjectLiteralExpression): ts.PropertyAssignment[] {
+  return object.properties.filter((p): p is ts.PropertyAssignment => ts.isPropertyAssignment(p));
+}
+
+/** The printed key text of a property assignment (matching `safeIdent`'s quoting). */
+function propKey(a: ts.PropertyAssignment): string {
+  return ts.isStringLiteral(a.name) ? safeIdent(a.name.text) : (a.name as ts.Identifier).text;
+}
+
+/** `new Blob([])` — the type-correct stand-in for a `format: binary` field. */
+function newBlob(): ts.Expression {
+  return factory.createNewExpression(factory.createIdentifier('Blob'), undefined, [
+    factory.createArrayLiteralExpression([], false),
+  ]);
+}
+
+/** A call expression from a dotted callee name (`faker.number.int`) or a built node. */
+function call(callee: string | ts.Expression, args: ts.Expression[]): ts.CallExpression {
+  const target = typeof callee === 'string' ? dotted(callee) : callee;
+  return factory.createCallExpression(target, undefined, args);
+}
+
+/** Turn `a.b.c` into nested property access on an identifier. */
+function dotted(path: string): ts.Expression {
+  const [head, ...rest] = path.split('.');
+  return rest.reduce<ts.Expression>(
+    (acc, name) => member(acc, name),
+    factory.createIdentifier(head)
+  );
+}
+
+function member(target: ts.Expression, name: string): ts.PropertyAccessExpression {
+  return factory.createPropertyAccessExpression(target, name);
+}
+
+/** A primitive literal value as a TS expression (negatives as a unary minus). */
+function literal(value: string | number | boolean): ts.Expression {
+  if (typeof value === 'string') return factory.createStringLiteral(value);
+  if (typeof value === 'boolean') return value ? factory.createTrue() : factory.createFalse();
+  return numeric(value);
+}
+
+function numeric(value: number): ts.Expression {
+  return value < 0
+    ? factory.createPrefixUnaryExpression(
+        ts.SyntaxKind.MinusToken,
+        factory.createNumericLiteral(-value)
+      )
+    : factory.createNumericLiteral(value);
+}
diff --git a/packages/openapi-typescript/src/emitters/identifier.ts b/packages/openapi-typescript/src/emitters/identifier.ts
new file mode 100644
index 0000000000..956129d3e1
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/identifier.ts
@@ -0,0 +1,98 @@
+// Identifier sanitization — mapping OpenAPI names (which may contain `-`, `.`,
+// spaces, or be reserved words) onto valid TypeScript identifiers. Pure string
+// logic with no dependency on the IR or other emitters.
+
+/** Matches a string that is already a valid JS identifier (ignoring reserved words). */
+const IDENT_RE = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
+
+const TS_RESERVED = new Set([
+  'break',
+  'case',
+  'catch',
+  'class',
+  'const',
+  'continue',
+  'debugger',
+  'default',
+  'delete',
+  'do',
+  'else',
+  'enum',
+  'export',
+  'extends',
+  'false',
+  'finally',
+  'for',
+  'function',
+  'if',
+  'import',
+  'in',
+  'instanceof',
+  'new',
+  'null',
+  'return',
+  'super',
+  'switch',
+  'this',
+  'throw',
+  'true',
+  'try',
+  'typeof',
+  'var',
+  'void',
+  'while',
+  'with',
+  'yield',
+]);
+
+/** True when `name` matches the JS identifier grammar (reserved words still pass). */
+export function isIdentifier(name: string): boolean {
+  return IDENT_RE.test(name);
+}
+
+/** True when `name` is a valid JS identifier AND not a reserved word — safe as a binding name. */
+export function isSafeIdentifier(name: string): boolean {
+  return IDENT_RE.test(name) && !TS_RESERVED.has(name);
+}
+
+/**
+ * Coerce an arbitrary spec-supplied name into a valid, non-reserved JS identifier
+ * (no uniqueness guarantee — see `uniqueIdent`). Non-identifier characters become
+ * `_`; an empty result, a leading digit, or a reserved word is prefixed with `_`.
+ * This is the security boundary for any name that lands in a declaration slot —
+ * `ts.factory.createIdentifier` prints its text verbatim, so an unsanitized name
+ * like `foo(){};evil()` would emit as executable code.
+ */
+export function sanitizeIdentifier(name: string): string {
+  let base = name.replace(/[^A-Za-z0-9_$]/g, '_');
+  if (base === '' || /^[0-9]/.test(base) || TS_RESERVED.has(base)) base = `_${base}`;
+  return base;
+}
+
+/**
+ * Render `name` as an object key or property name: bare when it is a valid,
+ * non-reserved identifier, quoted otherwise. Safe only where quoting is legal
+ * (object keys, property signatures) — not for binding names; use `uniqueIdent`
+ * there.
+ */
+export function safeIdent(name: string): string {
+  if (IDENT_RE.test(name) && !TS_RESERVED.has(name)) {
+    return name;
+  }
+  return JSON.stringify(name);
+}
+
+/**
+ * `sanitizeIdentifier(name)` made unique within `used` (which it mutates):
+ * collisions get a `_2`, `_3`, … suffix. Used wherever a name lands in a binding
+ * slot that — unlike an object key — cannot be quoted (function/type/parameter
+ * names), so `safeIdent`'s quote-on-failure fallback would not compile.
+ */
+export function uniqueIdent(name: string, used: Set<string>): string {
+  const base = sanitizeIdentifier(name);
+  let ident = base;
+  let n = 2;
+  while (used.has(ident)) ident = `${base}_${n++}`;
+  used.add(ident);
+  return ident;
+}
diff --git a/packages/openapi-typescript/src/emitters/jsdoc.ts b/packages/openapi-typescript/src/emitters/jsdoc.ts
new file mode 100644
index 0000000000..0a866f0563
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/jsdoc.ts
@@ -0,0 +1,80 @@
+import type { SchemaMetadata } from '../ir/model.js';
+import { splitLines } from './support.js';
+
+/**
+ * The JSDoc body for a description + metadata as a single `\n`-joined string,
+ * or `undefined` when there's nothing to document. The AST emitters feed this
+ * to `ts.ts`'s `jsdoc` helper (which owns the `*`-prefixing and indentation),
+ * so this returns only the raw body — no comment delimiters, no padding.
+ */
+export function jsdocText(text: string | undefined, metadata?: SchemaMetadata): string | undefined {
+  const lines = jsdocLines(text, metadata);
+  return lines.length === 0 ? undefined : lines.join('\n');
+}
+
+/**
+ * Build the body of a JSDoc block from a description and an optional metadata
+ * bag. Description lines come first (trimmed of leading/trailing blanks); then
+ * the metadata tag lines in a stable, source-driven order.
+ *
+ * Returns `[]` when there's nothing to render — callers use the empty result
+ * to skip emitting any JSDoc at all.
+ */
+function jsdocLines(text: string | undefined, metadata: SchemaMetadata | undefined): string[] {
+  const lines: string[] = [];
+  if (text && text.trim()) {
+    lines.push(...trimLines(splitLines(text)));
+  }
+  if (metadata) {
+    lines.push(...formatMetadata(metadata));
+  }
+  return lines;
+}
+
+/**
+ * Project a SchemaMetadata bag into JSDoc tag lines.
+ *
+ * Order matches the (near-)spec order so generated output is deterministic and
+ * diff-stable. `pattern` is escaped so an embedded `*​/` cannot terminate the
+ * surrounding JSDoc block.
+ */
+function formatMetadata(metadata: SchemaMetadata): string[] {
+  const lines: string[] = [];
+  const push = (tag: string, value?: number | string | boolean): void => {
+    if (value === undefined) {
+      lines.push(`@${tag}`);
+    } else {
+      lines.push(`@${tag} ${value}`);
+    }
+  };
+  if (metadata.minimum !== undefined) push('minimum', metadata.minimum);
+  if (metadata.maximum !== undefined) push('maximum', metadata.maximum);
+  if (metadata.exclusiveMinimum !== undefined) push('exclusiveMinimum', metadata.exclusiveMinimum);
+  if (metadata.exclusiveMaximum !== undefined) push('exclusiveMaximum', metadata.exclusiveMaximum);
+  if (metadata.minLength !== undefined) push('minLength', metadata.minLength);
+  if (metadata.maxLength !== undefined) push('maxLength', metadata.maxLength);
+  if (metadata.pattern !== undefined) push('pattern', escapeForJsDoc(metadata.pattern));
+  if (metadata.minItems !== undefined) push('minItems', metadata.minItems);
+  if (metadata.maxItems !== undefined) push('maxItems', metadata.maxItems);
+  if (metadata.uniqueItems === true) push('uniqueItems');
+  if (metadata.format !== undefined) push('format', metadata.format);
+  if (metadata.deprecated === true) push('deprecated');
+  return lines;
+}
+
+/**
+ * Escape any sequence that would prematurely close a JSDoc block. Currently we
+ * only need to handle `*​/` — newlines are stripped further upstream because
+ * spec-supplied strings (`pattern`, `format`) are single-line by construction.
+ */
+function escapeForJsDoc(value: string): string {
+  return value.replace(/\*\//g, '*\\/');
+}
+
+function trimLines(lines: string[]): string[] {
+  let start = 0;
+  let end = lines.length;
+  while (start < end && lines[start] === '') start++;
+  while (end > start && lines[end - 1] === '') end--;
+  return lines.slice(start, end);
+}
diff --git a/packages/openapi-typescript/src/emitters/mock.ts b/packages/openapi-typescript/src/emitters/mock.ts
new file mode 100644
index 0000000000..4ea97d48d5
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/mock.ts
@@ -0,0 +1,433 @@
+// Emits a `*.mocks.ts` module: a `create<Schema>(overrides?)` data factory per
+// named schema, an `<op>Handler(override?)` MSW request handler per operation
+// (its primary success response), and an aggregated `handlers` array. Response
+// data is baked at codegen time via the sampler (`sampleValue`) and printed as
+// TypeScript literals through `ts.factory`, so the generated module depends only
+// on `msw` — the real client stays zero-dependency.
+
+import type {
+  ApiModel,
+  NamedSchemaModel,
+  OperationModel,
+  ResponseBodyModel,
+  SchemaModel,
+} from '../ir/model.js';
+import { sampleValue, SampleExpression } from './sample.js';
+import { allOperations } from '../writers/util.js';
+import { fakerExpression } from './faker.js';
+import { safeIdent } from './identifier.js';
+import { pascalCase } from './support.js';
+import { parseExpression, printStatements, ts } from './ts.js';
+import type { DateType } from './types.js';
+
+const { factory } = ts;
+
+export type MockOptions = {
+  /** Import specifier for the sdk entry the schema types live in. */
+  sdkModule: string;
+  /** Must match the sdk's `--date-type`: under `'Date'` the sampler bakes date
+   *  fields as `new Date(...)` so the mock data matches the `Date`-typed sdk. */
+  dateType?: DateType;
+  /**
+   * How factory/handler bodies produce data. `'baked'` (default) inlines deterministic
+   * literals from the sampler (zero-dep, contract-faithful). `'faker'` emits
+   * `@faker-js/faker` calls for realistic data — reproducible when `mockSeed` is set —
+   * making `@faker-js/faker` the consumer's dev-dep. Factory signatures are identical
+   * across modes, so a consumer can flip this without changing call sites.
+   */
+  mockData?: 'baked' | 'faker';
+  /** When set in `'faker'` mode, emit a top-level `faker.seed(<n>);` so runs reproduce. */
+  mockSeed?: number;
+};
+
+/** The body expression for `schema` under the active data mode: a baked literal tree
+ *  (`'baked'`) or a tree of `@faker-js/faker` calls (`'faker'`). Both honor `dateType`
+ *  and the binary/Blob type demand; the faker path inlines refs with the same cycle
+ *  guard as the baked sampler, so neither recurses forever on a cyclic schema. */
+function bodyExpression(schema: SchemaModel, model: ApiModel, opts: MockOptions): ts.Expression {
+  return opts.mockData === 'faker'
+    ? fakerExpression(schema, model.schemas, { dateType: opts.dateType })
+    : literal(sampleValue(schema, model.schemas, { dateType: opts.dateType }));
+}
+
+/** Render the full `*.mocks.ts` source. `''` when the model has no operations. */
+export function renderMockModule(model: ApiModel, opts: MockOptions): string {
+  const operations = allOperations(model.services);
+  if (operations.length === 0) return '';
+  const factories = model.schemas.map((s) => factoryFor(s, model, opts));
+  const handlers = operations.flatMap((op) => [
+    handlerFor(op, model, opts),
+    ...(op.errorResponses.length > 0 ? [errorHandlerFor(op, model, opts)] : []),
+  ]);
+  const typeImport = schemaTypeImport(model, opts);
+  // Faker mode imports `faker` (the consumer's dev-dep) and, with a seed, pins it once
+  // at module top so every run reproduces. Baked mode emits neither (stays zero-dep).
+  const fakerImport = opts.mockData === 'faker' ? "import { faker } from '@faker-js/faker';\n" : '';
+  const seed =
+    opts.mockData === 'faker' && opts.mockSeed !== undefined ? [seedStatement(opts.mockSeed)] : [];
+  return `import { http, HttpResponse } from 'msw';\n${fakerImport}\n${printStatements([
+    ...typeImport,
+    ...seed,
+    ...factories,
+    ...handlers,
+    handlersArray(operations),
+  ])}`;
+}
+
+/** `faker.seed(<n>);` — pins faker's PRNG so a seeded faker-mode module reproduces. */
+function seedStatement(seed: number): ts.Statement {
+  return factory.createExpressionStatement(
+    factory.createCallExpression(
+      factory.createPropertyAccessExpression(factory.createIdentifier('faker'), 'seed'),
+      undefined,
+      [factory.createNumericLiteral(seed)]
+    )
+  );
+}
+
+/**
+ * `import type { A, B, … } from '<sdkModule>';` — the named-schema types the factories
+ * reference (`create<Pascal>` returns/accepts `<Pascal>`). Sorted for stable output.
+ * Empty when the model has no named schemas (so no type import is emitted). Importing
+ * the schema types also shadows globals of the same name (e.g. an `Error` schema) so the
+ * factory return types resolve to the generated type, not `globalThis.Error`.
+ */
+function schemaTypeImport(model: ApiModel, opts: MockOptions): ts.Statement[] {
+  if (model.schemas.length === 0) return [];
+  const names = model.schemas.map((s) => pascalCase(s.name)).sort();
+  return [
+    factory.createImportDeclaration(
+      undefined,
+      factory.createImportClause(
+        true,
+        undefined,
+        factory.createNamedImports(
+          names.map((name) =>
+            factory.createImportSpecifier(false, undefined, factory.createIdentifier(name))
+          )
+        )
+      ),
+      factory.createStringLiteral(opts.sdkModule)
+    ),
+  ];
+}
+
+/** `export function create<Pascal>(overrides?: Partial<Pascal>): Pascal { return { …sampled, ...overrides }; }`. */
+function factoryFor(named: NamedSchemaModel, model: ApiModel, opts: MockOptions): ts.Statement {
+  const pascal = pascalCase(named.name);
+  const sampled = bodyExpression(named.schema, model, opts);
+  const typeRef = factory.createTypeReferenceNode(pascal);
+  // Spreading `Partial<Union>` (the override type of a union schema) distributes into
+  // `Partial<A> | Partial<B>`, which widens any discriminant property (e.g. `category`)
+  // and defeats narrowing — TS can no longer place the literal in a single union member.
+  // The sampled object is already a complete, correct member, so re-assert the type.
+  const body =
+    named.schema.kind === 'union'
+      ? factory.createAsExpression(spreadOverrides(sampled, 'overrides'), typeRef)
+      : spreadOverrides(sampled, 'overrides');
+  return factory.createFunctionDeclaration(
+    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+    undefined,
+    `create${pascal}`,
+    undefined,
+    [
+      factory.createParameterDeclaration(
+        undefined,
+        undefined,
+        'overrides',
+        factory.createToken(ts.SyntaxKind.QuestionToken),
+        factory.createTypeReferenceNode('Partial', [typeRef])
+      ),
+    ],
+    typeRef,
+    factory.createBlock([factory.createReturnStatement(body)], true)
+  );
+}
+
+/** `export const <op>Handler = (override?: <OverrideType>) => http.<method>('<path>', () => <response>);`. */
+function handlerFor(op: OperationModel, model: ApiModel, opts: MockOptions): ts.Statement {
+  const arrow = factory.createArrowFunction(
+    undefined,
+    undefined,
+    [
+      factory.createParameterDeclaration(
+        undefined,
+        undefined,
+        'override',
+        factory.createToken(ts.SyntaxKind.QuestionToken),
+        overrideType(op)
+      ),
+    ],
+    undefined,
+    factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
+    handlerCall(op, model, opts)
+  );
+  return factory.createVariableStatement(
+    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+    factory.createVariableDeclarationList(
+      [factory.createVariableDeclaration(`${op.name}Handler`, undefined, undefined, arrow)],
+      ts.NodeFlags.Const
+    )
+  );
+}
+
+/**
+ * `export const <op>ErrorHandler = (status: <StatusUnion>, body?: <BodyType>) =>
+ *    http.<method>("<mswPath>", () => HttpResponse.json(body ?? <bakedSample>, { status }));`
+ *
+ * Opt-in (not added to `handlers`): `server.use(getPetErrorHandler(404))` overrides the
+ * happy path with an error. `<StatusUnion>` is the declared error statuses as literals
+ * (plus `number` when a `default` error is present, so any status is allowed). The baked
+ * fallback samples the FIRST error response's schema.
+ */
+function errorHandlerFor(op: OperationModel, model: ApiModel, opts: MockOptions): ts.Statement {
+  const first = op.errorResponses[0];
+  const baked = bodyExpression(first.schema, model, opts);
+  const body = factory.createBinaryExpression(
+    factory.createIdentifier('body'),
+    factory.createToken(ts.SyntaxKind.QuestionQuestionToken),
+    baked
+  );
+  const resolver = factory.createArrowFunction(
+    undefined,
+    undefined,
+    [],
+    undefined,
+    factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
+    factory.createCallExpression(
+      factory.createPropertyAccessExpression(factory.createIdentifier('HttpResponse'), 'json'),
+      undefined,
+      [
+        body,
+        factory.createObjectLiteralExpression(
+          [factory.createShorthandPropertyAssignment('status')],
+          false
+        ),
+      ]
+    )
+  );
+  const call = factory.createCallExpression(
+    factory.createPropertyAccessExpression(factory.createIdentifier('http'), op.method),
+    undefined,
+    [factory.createStringLiteral(mswPath(op.path)), resolver]
+  );
+  const arrow = factory.createArrowFunction(
+    undefined,
+    undefined,
+    [
+      factory.createParameterDeclaration(
+        undefined,
+        undefined,
+        'status',
+        undefined,
+        errorStatusType(op)
+      ),
+      factory.createParameterDeclaration(
+        undefined,
+        undefined,
+        'body',
+        factory.createToken(ts.SyntaxKind.QuestionToken),
+        errorBodyType(op)
+      ),
+    ],
+    undefined,
+    factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
+    call
+  );
+  return factory.createVariableStatement(
+    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+    factory.createVariableDeclarationList(
+      [factory.createVariableDeclaration(`${op.name}ErrorHandler`, undefined, undefined, arrow)],
+      ts.NodeFlags.Const
+    )
+  );
+}
+
+/**
+ * A union of the op's declared numeric error statuses (as literals); `number` is used in place
+ * of a literal whenever a `default` error is present, so any status is accepted. De-duped, since
+ * a multi-media-type error contributes the same status more than once.
+ */
+function errorStatusType(op: OperationModel): ts.TypeNode {
+  const codes = [
+    ...new Set(
+      op.errorResponses.filter((r) => r.status !== 'default').map((r) => r.status as number)
+    ),
+  ];
+  const members: ts.TypeNode[] = codes.map((c) =>
+    factory.createLiteralTypeNode(factory.createNumericLiteral(c))
+  );
+  // A `default` error means any status is valid, so widen the union with `number`.
+  if (op.errorResponses.some((r) => r.status === 'default')) {
+    members.push(factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword));
+  }
+  return members.length === 1 ? members[0] : factory.createUnionTypeNode(members);
+}
+
+/**
+ * The `body?` type: the union of the error responses' body types — `ref` bodies map to their
+ * named type, anything else to `unknown` (matching how the success handler types its override
+ * loosely). De-duped by printed name.
+ */
+function errorBodyType(op: OperationModel): ts.TypeNode {
+  const names = new Set<string>();
+  let hasUnknown = false;
+  for (const r of op.errorResponses) {
+    if (r.schema.kind === 'ref') names.add(pascalCase(r.schema.name));
+    else hasUnknown = true;
+  }
+  const members: ts.TypeNode[] = [...names].map((n) => factory.createTypeReferenceNode(n));
+  if (hasUnknown || members.length === 0) {
+    members.push(factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword));
+  }
+  return members.length === 1 ? members[0] : factory.createUnionTypeNode(members);
+}
+
+/**
+ * The static type of a handler's `override?` parameter, matching how the response uses it.
+ * A `ref` success body forwards `override` to `create<Schema>(override)` (whose parameter is
+ * `Partial<Schema>`), so the override is `Partial<Schema>`. Otherwise `override` is either spread
+ * into an inline object literal or unused, so `Record<string, unknown>` types it without error.
+ */
+function overrideType(op: OperationModel): ts.TypeNode {
+  const success = op.successResponses[0];
+  if (success?.schema.kind === 'ref') {
+    return factory.createTypeReferenceNode('Partial', [
+      factory.createTypeReferenceNode(pascalCase(success.schema.name)),
+    ]);
+  }
+  return factory.createTypeReferenceNode('Record', [
+    factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+    factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword),
+  ]);
+}
+
+/** `http.<method>('<mswPath>', () => <responseExpr>)`. */
+function handlerCall(op: OperationModel, model: ApiModel, opts: MockOptions): ts.Expression {
+  const resolver = factory.createArrowFunction(
+    undefined,
+    undefined,
+    [],
+    undefined,
+    factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
+    responseExpression(op, model, opts)
+  );
+  return factory.createCallExpression(
+    factory.createPropertyAccessExpression(factory.createIdentifier('http'), op.method),
+    undefined,
+    [factory.createStringLiteral(mswPath(op.path)), resolver]
+  );
+}
+
+/**
+ * The handler's response. A primary success body becomes `HttpResponse.json(…)`:
+ * a `ref` body calls its named `create<Schema>(override)` factory; an inline body
+ * is sampled and printed in place with `...override` spread in. A success with no
+ * usable body (an `unknown` schema, or no success response at all) becomes a
+ * body-less `new HttpResponse(null, { status })`. The status is the success
+ * response's declared code, or 200 when it's `default`/absent.
+ */
+function responseExpression(op: OperationModel, model: ApiModel, opts: MockOptions): ts.Expression {
+  const success = op.successResponses[0];
+  const status = statusCode(success?.status);
+  if (!success || success.schema.kind === 'unknown') return emptyResponse(status);
+  const data =
+    success.schema.kind === 'ref'
+      ? factory.createCallExpression(
+          factory.createIdentifier(`create${pascalCase(success.schema.name)}`),
+          undefined,
+          [factory.createIdentifier('override')]
+        )
+      : spreadOverrides(bodyExpression(success.schema, model, opts), 'override');
+  // `HttpResponse.json(x)` already defaults to 200, so only pass `{ status }` when it differs.
+  const args = status === 200 ? [data] : [data, statusInit(status)];
+  return factory.createCallExpression(
+    factory.createPropertyAccessExpression(factory.createIdentifier('HttpResponse'), 'json'),
+    undefined,
+    args
+  );
+}
+
+/** Numeric status for a response, mapping `default`/absent to 200. */
+function statusCode(status: ResponseBodyModel['status'] | undefined): number {
+  return typeof status === 'number' ? status : 200;
+}
+
+/** `{ status: <n> }`. */
+function statusInit(status: number): ts.Expression {
+  return factory.createObjectLiteralExpression(
+    [factory.createPropertyAssignment('status', factory.createNumericLiteral(status))],
+    false
+  );
+}
+
+/** `new HttpResponse(null, { status: <n> })`. */
+function emptyResponse(status: number): ts.Expression {
+  return factory.createNewExpression(factory.createIdentifier('HttpResponse'), undefined, [
+    factory.createNull(),
+    statusInit(status),
+  ]);
+}
+
+/** `export const handlers = [<op>Handler(), …];`. */
+function handlersArray(operations: OperationModel[]): ts.Statement {
+  const elements = operations.map((op) =>
+    factory.createCallExpression(factory.createIdentifier(`${op.name}Handler`), undefined, [])
+  );
+  return factory.createVariableStatement(
+    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+    factory.createVariableDeclarationList(
+      [
+        factory.createVariableDeclaration(
+          'handlers',
+          undefined,
+          undefined,
+          factory.createArrayLiteralExpression(elements, false)
+        ),
+      ],
+      ts.NodeFlags.Const
+    )
+  );
+}
+
+/** Spread `<spreadName>` into an object literal; non-object values pass through unchanged. */
+function spreadOverrides(value: ts.Expression, spreadName: string): ts.Expression {
+  if (!ts.isObjectLiteralExpression(value)) return value;
+  return factory.createObjectLiteralExpression(
+    [...value.properties, factory.createSpreadAssignment(factory.createIdentifier(spreadName))],
+    true
+  );
+}
+
+/** `/pets/{petId}` → `*​/pets/:petId` — MSW path with a wildcard origin and `:param` segments. */
+function mswPath(path: string): string {
+  return `*${path.replace(/\{([^}]+)\}/g, ':$1')}`;
+}
+
+/** Recursively print a sampled JS value as a TypeScript literal expression. */
+function literal(value: unknown): ts.Expression {
+  if (value instanceof SampleExpression) return parseExpression(value.code);
+  if (value === null) return factory.createNull();
+  if (typeof value === 'string') return factory.createStringLiteral(value);
+  if (typeof value === 'boolean') return value ? factory.createTrue() : factory.createFalse();
+  if (typeof value === 'number') {
+    return value < 0
+      ? factory.createPrefixUnaryExpression(
+          ts.SyntaxKind.MinusToken,
+          factory.createNumericLiteral(-value)
+        )
+      : factory.createNumericLiteral(value);
+  }
+  if (Array.isArray(value)) {
+    return factory.createArrayLiteralExpression(value.map(literal), true);
+  }
+  const entries = Object.entries(value as Record<string, unknown>);
+  return factory.createObjectLiteralExpression(
+    entries.map(([key, v]) => {
+      const safe = safeIdent(key);
+      const name = safe === key ? factory.createIdentifier(key) : factory.createStringLiteral(key);
+      return factory.createPropertyAssignment(name, literal(v));
+    }),
+    true
+  );
+}
diff --git a/packages/openapi-typescript/src/emitters/operation-aliases.ts b/packages/openapi-typescript/src/emitters/operation-aliases.ts
new file mode 100644
index 0000000000..2f08fce6de
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/operation-aliases.ts
@@ -0,0 +1,246 @@
+// The `<Op>*` derived type-alias builders (`<Op>Result`/`Error`/`Params`/`Body`/`Headers`/`Variables`).
+// Split out of operations.ts: this is the cohesive cluster the sdk emits so callers can name
+// intermediate values. Reuses the shared type builders (operation-types.ts) and the block-wide
+// `EmitContext` (a type-only import from operations.ts — erased, so there is no runtime cycle).
+
+import type { OperationModel, ParamModel } from '../ir/model.js';
+import { jsdocText } from './jsdoc.js';
+import { operationSignature } from './operation-signature.js';
+import { bodyTypeNode, paramsTypeLiteral } from './operation-types.js';
+import type { EmitContext } from './operations.js';
+import { pascalCase } from './support.js';
+import { jsdoc, ts } from './ts.js';
+import { schemaToTypeNode } from './types.js';
+
+const { factory } = ts;
+
+/**
+ * Emit derived type aliases for an operation so callers can name intermediate
+ * values without re-deriving via `Awaited<ReturnType<...>>` plumbing.
+ *
+ * `*Result` is always emitted (even for `void`). The others are conditional on
+ * the operation actually having the corresponding inputs — emitting empty
+ * `*Params = {}` or `*Body = unknown` aliases would just be noise.
+ */
+export function renderOperationAliases(
+  op: OperationModel,
+  responseType: ts.TypeNode,
+  orderedPathParams: ParamModel[],
+  pathParamIdent: Map<string, string>,
+  errorAlias: string,
+  errorMembers: ts.TypeNode[],
+  ctx: EmitContext,
+  // SSE ops have no one-shot response, so they omit `*Result`/`*Error` and keep only the input
+  // aliases. (Previously done by a `.slice(1)` on the result; an explicit flag is collision-safe.)
+  emitResultAndError = true
+): ts.Statement[] {
+  const { dateType, schemaNames } = ctx;
+  const name = pascalCase(op.name);
+  const aliases: ts.Statement[] = [];
+
+  // Every derived alias is suppressed when its name collides with an exported schema (a
+  // duplicate `export type` is a TS2300 error). References to a suppressed alias inline the
+  // underlying type instead — see `renderOperationParts` (Result/Error) and `renderVariablesAlias`
+  // / the grouped signature (Params/Body/Headers/Variables).
+
+  // Emit `export type <Op>Result = …` unless its name collides with an exported schema. Two
+  // cases collide: self-referential (operation `search` returning schema `SearchResult` →
+  // `export type SearchResult = SearchResult;`, circular) and plain (operation `login` returning
+  // some other type while a `LoginResult` schema also exists). In both, call sites reference the
+  // response type directly (`renderOperationParts`), so the alias is redundant.
+  const resultName = `${name}Result`;
+  if (emitResultAndError && !schemaNames.has(resultName)) {
+    aliases.push(exportType(resultName, responseType));
+  }
+
+  // Result mode only, and only when the operation declares error responses: the typed `error`.
+  if (emitResultAndError && errorAlias && !schemaNames.has(errorAlias)) {
+    aliases.push(
+      exportType(
+        errorAlias,
+        errorMembers.length === 1 ? errorMembers[0] : factory.createUnionTypeNode(errorMembers)
+      )
+    );
+  }
+
+  if (op.queryParams.length > 0 && !schemaNames.has(`${name}Params`)) {
+    // Reuse the params type-literal builder so the alias body picks up per-prop
+    // JSDoc automatically — no second renderer to keep in sync.
+    aliases.push(exportType(`${name}Params`, paramsTypeLiteral(op.queryParams, dateType)));
+  }
+
+  if (op.requestBody && !schemaNames.has(`${name}Body`)) {
+    // Use the same content-type → TS-type mapping as the function signature, so
+    // `<Op>Body` matches the second-positional arg of the function exactly.
+    aliases.push(exportType(`${name}Body`, bodyTypeNode(op.requestBody, dateType)));
+  }
+
+  if (op.headerParams.length > 0 && !schemaNames.has(`${name}Headers`)) {
+    aliases.push(exportType(`${name}Headers`, paramsTypeLiteral(op.headerParams, dateType)));
+  }
+
+  if (!schemaNames.has(`${name}Variables`)) {
+    const variables = renderVariablesAlias(op, name, orderedPathParams, pathParamIdent, ctx);
+    if (variables) aliases.push(variables);
+  }
+
+  return aliases;
+}
+
+/**
+ * An SSE op's input aliases (`*Params` / `*Body` / `*Headers` / `*Variables`) — but NOT
+ * `*Result`/`*Error`, which describe a one-shot response an event stream has no equivalent of.
+ * Passes the real `schemaNames` so the input aliases still get collision suppression, and sets
+ * `emitResultAndError = false` to omit the result/error pair.
+ */
+export function sseAliases(
+  op: OperationModel,
+  orderedPathParams: ParamModel[],
+  pathParamIdent: Map<string, string>,
+  ctx: EmitContext
+): ts.Statement[] {
+  return renderOperationAliases(
+    op,
+    factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword),
+    orderedPathParams,
+    pathParamIdent,
+    '',
+    [],
+    ctx,
+    false
+  );
+}
+
+/** `export type <name> = <type>;` */
+function exportType(name: string, type: ts.TypeNode): ts.TypeAliasDeclaration {
+  return factory.createTypeAliasDeclaration(
+    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+    name,
+    undefined,
+    type
+  );
+}
+
+/**
+ * Combined inputs alias — a single object that bundles every positional input
+ * the operation function accepts. The seam React Query / SWR wrappers use:
+ *
+ *   useMutation({ mutationFn: (vars: UpdateOrderVariables) => updateOrder(vars.orderId, vars.params, vars.body) })
+ *
+ * Conventions:
+ * - Property order: path params (URL-template order), then `params`, then `body`,
+ *   then `headers`. Mirrors the function's positional argument order.
+ * - Path-param props carry the same JSDoc (description + schema metadata) the
+ *   function declaration omits.
+ * - `params?` is optional iff the function signature defaults to `= {}` (all query
+ *   params optional). Same rule for `body?` / `headers?`.
+ * - References `<Op>Params` / `<Op>Body` / `<Op>Headers` when those aliases were
+ *   also emitted, so the aliases stay in sync without duplicating their bodies.
+ *
+ * Returns `undefined` for operations with no inputs at all.
+ */
+function renderVariablesAlias(
+  op: OperationModel,
+  name: string,
+  orderedPathParams: ParamModel[],
+  pathParamIdent: Map<string, string>,
+  ctx: EmitContext
+): ts.TypeAliasDeclaration | undefined {
+  if (!hasInputs(op)) return undefined;
+  return exportType(
+    name + 'Variables',
+    variablesTypeLiteral(op, name, orderedPathParams, pathParamIdent, ctx)
+  );
+}
+
+/** Whether an operation accepts any input (path/query/body/header). */
+function hasInputs(op: OperationModel): boolean {
+  return (
+    operationSignature(op).pathParams.length > 0 ||
+    op.queryParams.length > 0 ||
+    Boolean(op.requestBody) ||
+    op.headerParams.length > 0
+  );
+}
+
+/**
+ * The `<Op>Variables` object type literal (the body of the alias, reused inline by the grouped
+ * signature when the alias name itself collides). Each `params`/`body`/`headers` property
+ * references its `<Op>X` alias, or inlines the type when that alias name collides with a schema
+ * (so a suppressed alias is never referenced).
+ */
+export function variablesTypeLiteral(
+  op: OperationModel,
+  name: string,
+  orderedPathParams: ParamModel[],
+  pathParamIdent: Map<string, string>,
+  ctx: EmitContext
+): ts.TypeNode {
+  const { dateType, schemaNames } = ctx;
+  const props: ts.PropertySignature[] = [];
+
+  for (const p of orderedPathParams) {
+    // Same safe identifier the function uses, so a wrapper can map
+    // `vars.<ident>` straight onto the positional argument.
+    const sig = factory.createPropertySignature(
+      undefined,
+      pathParamIdent.get(p.name)!,
+      undefined,
+      schemaToTypeNode(p.schema, dateType)
+    );
+    const doc = jsdocText(p.description, p.schema.metadata);
+    props.push(doc === undefined ? sig : jsdoc(sig, doc));
+  }
+
+  if (op.queryParams.length > 0) {
+    props.push(
+      inputProp(
+        'params',
+        `${name}Params`,
+        () => paramsTypeLiteral(op.queryParams, dateType),
+        op.queryParams.some((p) => p.required),
+        schemaNames
+      )
+    );
+  }
+  if (op.requestBody) {
+    props.push(
+      inputProp(
+        'body',
+        `${name}Body`,
+        () => bodyTypeNode(op.requestBody!, dateType),
+        op.requestBody.required,
+        schemaNames
+      )
+    );
+  }
+  if (op.headerParams.length > 0) {
+    props.push(
+      inputProp(
+        'headers',
+        `${name}Headers`,
+        () => paramsTypeLiteral(op.headerParams, dateType),
+        op.headerParams.some((p) => p.required),
+        schemaNames
+      )
+    );
+  }
+
+  return factory.createTypeLiteralNode(props);
+}
+
+/** A `<key>(?): <Alias>` property, or an inline-typed one when `<Alias>` collides with a schema. */
+function inputProp(
+  key: string,
+  alias: string,
+  inlineType: () => ts.TypeNode,
+  required: boolean,
+  schemaNames: Set<string>
+): ts.PropertySignature {
+  return factory.createPropertySignature(
+    undefined,
+    key,
+    required ? undefined : factory.createToken(ts.SyntaxKind.QuestionToken),
+    schemaNames.has(alias) ? inlineType() : factory.createTypeReferenceNode(alias)
+  );
+}
diff --git a/packages/openapi-typescript/src/emitters/operation-signature.ts b/packages/openapi-typescript/src/emitters/operation-signature.ts
new file mode 100644
index 0000000000..54b45e36c2
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/operation-signature.ts
@@ -0,0 +1,57 @@
+// The shared calling-convention description for an operation. Both the sdk (which
+// emits each operation's parameter list) and the wrapper generators (tanstack-query,
+// and any future framework adapter, which emit the forwarding call) derive their
+// argument *order*, slot presence, and `<Op>Variables` naming from this one source —
+// so a flat-mode signature and its call site can never drift. Previously each side
+// recomputed this independently, kept in sync only by a "matching exactly" comment.
+
+import type { OperationModel, ParamModel } from '../ir/model.js';
+import { uniqueIdent } from './identifier.js';
+import { pascalCase } from './support.js';
+
+/** A path parameter paired with the unique JS identifier used for it in flat mode. */
+export type SignaturePathParam = { param: ParamModel; ident: string };
+
+export type OperationSignature = {
+  /** Path params in URL-template order, each with its unique JS identifier. */
+  pathParams: SignaturePathParam[];
+  /** Slot presence, in the order flat-mode arguments follow the path params. */
+  hasQuery: boolean;
+  hasBody: boolean;
+  hasHeaders: boolean;
+  /** Any input at all — i.e. a `<Op>Variables` type exists for the operation. */
+  hasInputs: boolean;
+  /** Grouped mode: whether `vars` is required (else it defaults to `= {}`). */
+  varsRequired: boolean;
+  /** The `<Op>Variables` type-alias name. */
+  variablesTypeName: string;
+};
+
+/** Compute the calling-convention description for `op`. Pure; no AST. */
+export function operationSignature(op: OperationModel): OperationSignature {
+  const byName = new Map(op.pathParams.map((p) => [p.name, p] as const));
+  const ordered: ParamModel[] = [];
+  for (const match of op.path.matchAll(/\{([^}]+)\}/g)) {
+    const p = byName.get(match[1]);
+    if (p) ordered.push(p);
+  }
+  const used = new Set<string>();
+  const pathParams = ordered.map((param) => ({ param, ident: uniqueIdent(param.name, used) }));
+
+  const hasQuery = op.queryParams.length > 0;
+  const hasBody = Boolean(op.requestBody);
+  const hasHeaders = op.headerParams.length > 0;
+  return {
+    pathParams,
+    hasQuery,
+    hasBody,
+    hasHeaders,
+    hasInputs: pathParams.length > 0 || hasQuery || hasBody || hasHeaders,
+    varsRequired:
+      pathParams.length > 0 ||
+      op.queryParams.some((p) => p.required) ||
+      (op.requestBody?.required ?? false) ||
+      op.headerParams.some((p) => p.required),
+    variablesTypeName: `${pascalCase(op.name)}Variables`,
+  };
+}
diff --git a/packages/openapi-typescript/src/emitters/operation-types.ts b/packages/openapi-typescript/src/emitters/operation-types.ts
new file mode 100644
index 0000000000..0d43a3bc90
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/operation-types.ts
@@ -0,0 +1,151 @@
+// TypeScript type/parameter builders shared by the operation emitter and the operation-alias
+// builders: turn an operation's params / body / responses into `ts` type and parameter nodes.
+// Leaf module — depends only on the IR types and the codegen foundation, never back on operations.ts.
+
+import type { ParamModel, RequestBodyModel, ResponseBodyModel } from '../ir/model.js';
+import { safeIdent } from './identifier.js';
+import { jsdocText } from './jsdoc.js';
+import { jsdoc, printNodes, ts } from './ts.js';
+import { type DateType, schemaToTypeNode } from './types.js';
+
+const { factory } = ts;
+
+/** A `<name>: <type>` parameter, defaulting to `= {}` when `withDefault`. */
+export function simpleParam(
+  name: string,
+  type: ts.TypeNode,
+  withDefault: boolean
+): ts.ParameterDeclaration {
+  return factory.createParameterDeclaration(
+    undefined,
+    undefined,
+    name,
+    undefined,
+    type,
+    withDefault ? factory.createObjectLiteralExpression([], false) : undefined
+  );
+}
+
+/**
+ * A `<slot>: { … }` argument bundling `params` into one object, each property
+ * carrying its own JSDoc (description + metadata). Defaults to `= {}` when every
+ * property is optional. Shared by the query `params` and the operation `headers`
+ * slots, which have the identical layout.
+ */
+export function renderParamsObjectArg(
+  slot: string,
+  params: ParamModel[],
+  dateType: DateType
+): ts.ParameterDeclaration {
+  return simpleParam(slot, paramsTypeLiteral(params, dateType), !params.some((p) => p.required));
+}
+
+/** The `{ … }` type literal for a params object (query or headers), with per-prop JSDoc. */
+export function paramsTypeLiteral(params: ParamModel[], dateType: DateType): ts.TypeLiteralNode {
+  return factory.createTypeLiteralNode(
+    params.map((p) => {
+      const sig = factory.createPropertySignature(
+        undefined,
+        propertyKey(safeIdent(p.name)),
+        p.required ? undefined : factory.createToken(ts.SyntaxKind.QuestionToken),
+        schemaToTypeNode(p.schema, dateType)
+      );
+      const doc = jsdocText(p.description, p.schema.metadata);
+      return doc === undefined ? sig : jsdoc(sig, doc);
+    })
+  );
+}
+
+/** A bare identifier key when valid, a quoted string-literal key otherwise. */
+export function propertyKey(safe: string): ts.PropertyName {
+  return safe.startsWith('"')
+    ? factory.createStringLiteral(JSON.parse(safe) as string)
+    : factory.createIdentifier(safe);
+}
+
+/** The request-body TS type: special wrapper types per content-type, else the schema. */
+/**
+ * A multipart body whose schema is a concrete object — the case worth typing. Such a body
+ * is emitted as its object shape (binary fields → `Blob`) and serialized to `FormData` at
+ * the call site (`__toFormData`). Multipart bodies with a non-object schema can't be typed
+ * field-by-field, so they keep the raw `FormData` escape hatch.
+ */
+export function isTypedMultipart(rb: RequestBodyModel): boolean {
+  return rb.contentType === 'multipart/form-data' && rb.schema.kind === 'object';
+}
+
+export function bodyTypeNode(rb: RequestBodyModel, dateType: DateType): ts.TypeNode {
+  if (isTypedMultipart(rb)) return schemaToTypeNode(rb.schema, dateType);
+  switch (rb.contentType) {
+    case 'multipart/form-data':
+      return factory.createTypeReferenceNode('FormData');
+    case 'application/x-www-form-urlencoded':
+      return factory.createTypeReferenceNode('URLSearchParams');
+    case 'application/octet-stream':
+      return factory.createUnionTypeNode([
+        factory.createTypeReferenceNode('Blob'),
+        factory.createTypeReferenceNode('ArrayBuffer'),
+      ]);
+    default:
+      return schemaToTypeNode(rb.schema, dateType);
+  }
+}
+
+/** The deduped error-response body type nodes (by printed form), or `[]` when none. */
+export function errorTypeNodes(responses: ResponseBodyModel[], dateType: DateType): ts.TypeNode[] {
+  const seen = new Set<string>();
+  const nodes: ts.TypeNode[] = [];
+  for (const r of responses) {
+    const node = schemaToTypeNode(r.schema, dateType);
+    const key = printNodes([node]);
+    if (seen.has(key)) continue;
+    seen.add(key);
+    nodes.push(node);
+  }
+  return nodes;
+}
+
+export function computeResponse(
+  responses: ResponseBodyModel[],
+  dateType: DateType
+): {
+  responseType: ts.TypeNode;
+  responseKind: 'json' | 'blob' | 'text' | 'void';
+} {
+  if (responses.length === 0)
+    return {
+      responseType: factory.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword),
+      responseKind: 'void',
+    };
+
+  // Prefer JSON; fall back to other content types.
+  const jsonResponse = responses.find((r) => r.contentType.toLowerCase().includes('json'));
+  if (jsonResponse) {
+    return { responseType: schemaToTypeNode(jsonResponse.schema, dateType), responseKind: 'json' };
+  }
+  // No JSON — handle binary/text gracefully.
+  const nodes: ts.TypeNode[] = [];
+  const seen = new Set<string>();
+  let hasBinary = false;
+  let hasText = false;
+  for (const r of responses) {
+    let node: ts.TypeNode;
+    if (r.contentType.startsWith('image/') || r.contentType === 'application/octet-stream') {
+      node = factory.createTypeReferenceNode('Blob');
+      hasBinary = true;
+    } else if (r.contentType.startsWith('text/')) {
+      node = factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
+      hasText = true;
+    } else {
+      node = schemaToTypeNode(r.schema, dateType);
+    }
+    const key = printNodes([node]);
+    if (seen.has(key)) continue;
+    seen.add(key);
+    nodes.push(node);
+  }
+  // `nodes` is guaranteed non-empty here: each iteration above always builds one.
+  const responseType = nodes.length === 1 ? nodes[0] : factory.createUnionTypeNode(nodes);
+  const responseKind: 'blob' | 'text' | 'json' = hasBinary ? 'blob' : hasText ? 'text' : 'json';
+  return { responseType, responseKind };
+}
diff --git a/packages/openapi-typescript/src/emitters/operations.ts b/packages/openapi-typescript/src/emitters/operations.ts
new file mode 100644
index 0000000000..858e553107
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/operations.ts
@@ -0,0 +1,998 @@
+import type { OperationModel, ParamModel } from '../ir/model.js';
+import { safeIdent } from './identifier.js';
+import { renderOperationAliases, sseAliases, variablesTypeLiteral } from './operation-aliases.js';
+import { operationSignature } from './operation-signature.js';
+import {
+  bodyTypeNode,
+  computeResponse,
+  errorTypeNodes,
+  isTypedMultipart,
+  propertyKey,
+  renderParamsObjectArg,
+  simpleParam,
+} from './operation-types.js';
+import { isSseOp, partitionOps, sseDataKind, sseEventType } from './sse.js';
+import { pascalCase, splitLines } from './support.js';
+import { jsdoc, printStatements, ts } from './ts.js';
+import { type DateType, schemaToTypeNode } from './types.js';
+
+// `isTypedMultipart` lives in operation-types now; re-export it so existing importers
+// (client.ts) keep resolving it from operations.ts.
+export { isTypedMultipart };
+
+const { factory } = ts;
+
+/**
+ * The developer-facing API shape emitted for the operations.
+ * - `'functions'` (default): standalone `export async function`s.
+ * - `'service-class'`: the operations grouped as methods of a class.
+ */
+export type Facade = 'functions' | 'service-class';
+
+/** Error-handling shape of the generated client: throw on non-2xx, or return a result union. */
+export type ErrorMode = 'throw' | 'result';
+
+/**
+ * How an operation's inputs are passed to the generated function/method.
+ * - `'flat'` (default): path params spread as positional args, then the
+ *   `params`/`body`/`headers` slots.
+ * - `'grouped'`: a single `args: <Op>Variables` object bundling every input
+ *   (path params, `params`, `body`, `headers`). The per-call `init:
+ *   RequestOptions` stays a separate trailing argument in both styles.
+ */
+export type ArgsStyle = 'flat' | 'grouped';
+
+/**
+ * Emit `OPERATIONS`: a static map from operationId to the operation's HTTP
+ * `method` and `path` template (with `{param}` placeholders intact), plus the
+ * `OperationId` / `OperationMetadata` types.
+ *
+ * This is the one stable, runtime-readable handle on an operation's identity that
+ * survives bundling and minification — function and method names can be mangled,
+ * but these string literals cannot. Consumers use it to build cache/query keys,
+ * tracing span names, and logging labels without re-deriving them from each call
+ * site (and without fragile `fn.toString()` parsing).
+ *
+ * Facade- and output-mode-independent: the same map is emitted for both facades
+ * and lives in the shared schemas module in multi-file layouts. Returns `''` when
+ * the document declares no operations.
+ */
+export function renderOperationsMeta(ops: OperationModel[]): string {
+  return printStatements(operationsMetaStatements(ops));
+}
+
+/** The `OPERATIONS` map + `OperationId`/`OperationMetadata` types as nodes (empty when no ops). */
+export function operationsMetaStatements(ops: OperationModel[]): ts.Statement[] {
+  if (ops.length === 0) return [];
+
+  const entries = ops.map((op) =>
+    factory.createPropertyAssignment(
+      propertyKey(safeIdent(op.name)),
+      factory.createObjectLiteralExpression(
+        [
+          factory.createPropertyAssignment(
+            'method',
+            factory.createStringLiteral(op.method.toUpperCase())
+          ),
+          factory.createPropertyAssignment('path', factory.createStringLiteral(op.path)),
+        ],
+        false
+      )
+    )
+  );
+
+  const operations = jsdoc(
+    factory.createVariableStatement(
+      [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+      factory.createVariableDeclarationList(
+        [
+          factory.createVariableDeclaration(
+            'OPERATIONS',
+            undefined,
+            undefined,
+            factory.createAsExpression(
+              factory.createObjectLiteralExpression(entries, true),
+              factory.createTypeReferenceNode('const')
+            )
+          ),
+        ],
+        ts.NodeFlags.Const
+      )
+    ),
+    'Static metadata for every operation, keyed by operationId: the HTTP `method`\n' +
+      'and the `path` template (with `{param}` placeholders intact). Minification-safe\n' +
+      '— useful for building cache/query keys, tracing span names, and request logging\n' +
+      'without re-deriving them at each call site.'
+  );
+
+  const operationId = jsdoc(
+    factory.createTypeAliasDeclaration(
+      [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+      'OperationId',
+      undefined,
+      factory.createTypeOperatorNode(
+        ts.SyntaxKind.KeyOfKeyword,
+        factory.createTypeQueryNode(factory.createIdentifier('OPERATIONS'))
+      )
+    ),
+    'The operationId of any operation in this client.'
+  );
+
+  const operationMetadata = jsdoc(
+    factory.createTypeAliasDeclaration(
+      [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+      'OperationMetadata',
+      undefined,
+      factory.createTypeLiteralNode([readonlyStringProp('method'), readonlyStringProp('path')])
+    ),
+    'Static metadata describing one operation: its HTTP method and path template.'
+  );
+
+  return [operations, operationId, operationMetadata];
+}
+
+/** A `readonly <name>: string` property signature for the `OperationMetadata` type. */
+function readonlyStringProp(name: string): ts.PropertySignature {
+  return factory.createPropertySignature(
+    [factory.createModifier(ts.SyntaxKind.ReadonlyKeyword)],
+    name,
+    undefined,
+    factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)
+  );
+}
+
+/**
+ * Render a block of operations in the chosen facade shape. This is the facade
+ * seam: the `functions` adapter emits standalone `export async function`s; the
+ * `service-class` adapter groups the same operations as methods of `className`.
+ * Both reuse the identical runtime — only the developer-facing wrapper differs.
+ */
+export type OperationsBlockOptions = {
+  facade: Facade;
+  className: string;
+  argsStyle?: ArgsStyle;
+  errorMode?: 'throw' | 'result';
+  /**
+   * How `date-time`/`date` string fields are typed in param/body/response types.
+   * Defaults to `'string'`; `'Date'` keeps operation types in sync with the schemas.
+   */
+  dateType?: DateType;
+  /** Security-scheme keys whose credential is sent as a URL query param. */
+  queryAuthKeys?: Set<string>;
+  /**
+   * Names of every exported schema. A `<Op>Result` alias whose name is in this set is
+   * suppressed (the underlying response type is used inline instead) so it can't collide
+   * with the schema's `export type` — a duplicate-identifier compile error otherwise.
+   */
+  schemaNames?: Set<string>;
+  /**
+   * The exported aggregate name bundling this block's SSE async generators
+   * (functions facade). Defaults to `'sse'`; multi-file modes override it to keep
+   * per-tag SSE bundles from colliding.
+   */
+  sseExportName?: string;
+};
+
+/**
+ * The block-wide emit configuration every operation in a block shares. Bundling it
+ * into one value keeps it out of the positional parameter lists of the operation
+ * emitters (which would otherwise thread the same five arguments through every layer,
+ * inviting transposition bugs). Per-call structural data (response type, ordered path
+ * params, …) stays an explicit argument; only this cross-cutting config travels as `ctx`.
+ */
+export type EmitContext = {
+  argsStyle: ArgsStyle;
+  errorMode: 'throw' | 'result';
+  dateType: DateType;
+  /** Security-scheme keys whose credential is sent as a URL query param. */
+  queryAuthKeys: Set<string>;
+  /** Names of every exported schema, used for `<Op>*` alias collision suppression. */
+  schemaNames: Set<string>;
+};
+
+export function renderOperationsBlock(
+  ops: OperationModel[],
+  options: OperationsBlockOptions
+): string {
+  return printStatements(operationsBlockStatements(ops, options));
+}
+
+/** A block of operations (functions or a service class) as nodes. */
+export function operationsBlockStatements(
+  ops: OperationModel[],
+  options: OperationsBlockOptions
+): ts.Statement[] {
+  const ctx: EmitContext = {
+    argsStyle: options.argsStyle ?? 'flat',
+    errorMode: options.errorMode ?? 'throw',
+    dateType: options.dateType ?? 'string',
+    queryAuthKeys: options.queryAuthKeys ?? new Set<string>(),
+    schemaNames: options.schemaNames ?? new Set<string>(),
+  };
+  const sseExportName = options.sseExportName ?? 'sse';
+  if (options.facade === 'service-class')
+    return serviceClassStatements(ops, options.className, ctx);
+
+  const { regular, sse } = partitionOps(ops);
+  const nodes: ts.Statement[] = [];
+  for (const op of regular) {
+    const { aliases, fn } = renderFunction(op, ctx);
+    nodes.push(...aliases, fn);
+  }
+  // SSE ops are module-private async generators reached through the `sse`
+  // aggregate (a stable namespace that survives output-mode partitioning),
+  // never exported individually.
+  for (const op of sse) {
+    const { aliases, fn } = renderSseFunction(op, ctx);
+    nodes.push(...aliases, fn);
+  }
+  if (sse.length > 0) nodes.push(sseAggregate(sseExportName, sse));
+  return nodes;
+}
+
+/** Functions facade: a module-private `async function* <op>` for an SSE operation. */
+function renderSseFunction(
+  op: OperationModel,
+  ctx: EmitContext
+): { aliases: ts.Statement[]; fn: ts.FunctionDeclaration } {
+  const parts = renderOperationParts(op, '__config', ctx);
+  const fn = withDoc(
+    factory.createFunctionDeclaration(
+      [factory.createModifier(ts.SyntaxKind.AsyncKeyword)],
+      factory.createToken(ts.SyntaxKind.AsteriskToken),
+      op.name,
+      undefined,
+      parts.params,
+      parts.returnType,
+      factory.createBlock(parts.body, true)
+    ),
+    parts.doc
+  );
+  return { aliases: parts.aliases, fn };
+}
+
+/** `export const <name> = { <op>, … };` — the namespace bundling a block's SSE generators. */
+function sseAggregate(name: string, sse: OperationModel[]): ts.Statement {
+  return factory.createVariableStatement(
+    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+    factory.createVariableDeclarationList(
+      [
+        factory.createVariableDeclaration(
+          name,
+          undefined,
+          undefined,
+          factory.createObjectLiteralExpression(
+            sse.map((op) => factory.createShorthandPropertyAssignment(op.name)),
+            false
+          )
+        ),
+      ],
+      ts.NodeFlags.Const
+    )
+  );
+}
+
+/**
+ * The conventional class name for a tag's service in `tags`/`tags-split` modes.
+ * Tag stems can contain `-`/`_`/spaces, so each segment is PascalCased and joined
+ * into a valid identifier; a leading digit is prefixed with `_`.
+ */
+export function serviceClassName(label: string): string {
+  const pascal = label
+    .split(/[^A-Za-z0-9]+/)
+    .filter(Boolean)
+    .map((segment) => segment[0].toUpperCase() + segment.slice(1))
+    .join('');
+  const name = `${pascal || 'Default'}Service`;
+  return /^[0-9]/.test(name) ? `_${name}` : name;
+}
+
+/** Functions facade: one standalone `export async function` per operation. */
+function renderFunction(
+  op: OperationModel,
+  ctx: EmitContext
+): { aliases: ts.Statement[]; fn: ts.FunctionDeclaration } {
+  const parts = renderOperationParts(op, '__config', ctx);
+  const fn = withDoc(
+    factory.createFunctionDeclaration(
+      [
+        factory.createModifier(ts.SyntaxKind.ExportKeyword),
+        factory.createModifier(ts.SyntaxKind.AsyncKeyword),
+      ],
+      undefined,
+      op.name,
+      undefined,
+      parts.params,
+      parts.returnType,
+      factory.createBlock(parts.body, true)
+    ),
+    parts.doc
+  );
+  return { aliases: parts.aliases, fn };
+}
+
+/**
+ * `use(...middleware): this` — appends interceptors to this instance's
+ * `config.middleware`, mirroring the functions facade's `use()`. Returns `this`
+ * for chaining. Reassigns (rather than pushes) so a caller-provided `middleware`
+ * array isn't mutated and can't leak across instances. (`config` is `readonly`,
+ * but reassigning its `middleware` field — not `config` itself — is allowed.)
+ */
+function serviceUseMethod(): ts.ClassElement {
+  // this.config.middleware = [...(this.config.middleware ?? []), ...middleware];
+  const target = factory.createPropertyAccessExpression(
+    factory.createPropertyAccessExpression(factory.createThis(), 'config'),
+    'middleware'
+  );
+  const assign = factory.createExpressionStatement(
+    factory.createAssignment(
+      target,
+      factory.createArrayLiteralExpression(
+        [
+          factory.createSpreadElement(
+            factory.createBinaryExpression(
+              target,
+              factory.createToken(ts.SyntaxKind.QuestionQuestionToken),
+              factory.createArrayLiteralExpression([], false)
+            )
+          ),
+          factory.createSpreadElement(factory.createIdentifier('middleware')),
+        ],
+        false
+      )
+    )
+  );
+  return jsdoc(
+    factory.createMethodDeclaration(
+      undefined,
+      undefined,
+      'use',
+      undefined,
+      undefined,
+      [
+        factory.createParameterDeclaration(
+          undefined,
+          factory.createToken(ts.SyntaxKind.DotDotDotToken),
+          'middleware',
+          undefined,
+          factory.createArrayTypeNode(factory.createTypeReferenceNode('Middleware'))
+        ),
+      ],
+      factory.createThisTypeNode(),
+      factory.createBlock([assign, factory.createReturnStatement(factory.createThis())], true)
+    ),
+    'Register interceptors on this instance (see `ClientConfig.middleware`). Returns `this`.'
+  );
+}
+
+/**
+ * Service-class facade: one class named `className` whose methods are `ops`.
+ * Operation type aliases (`<Op>Result`, …) can't live inside a class body, so
+ * they're hoisted to module level ahead of the class; each method is the same
+ * signature + body as the function form.
+ *
+ * The class takes an optional `ClientConfig` and stores it; methods thread
+ * `this.config` to the runtime, so each instance is independently configured.
+ * With no config it falls back to the global `BASE` + auth (back-compat).
+ */
+function serviceClassStatements(
+  ops: OperationModel[],
+  className: string,
+  ctx: EmitContext
+): ts.Statement[] {
+  const aliases: ts.Statement[] = [];
+  const members: ts.ClassElement[] = [
+    factory.createConstructorDeclaration(
+      undefined,
+      [
+        factory.createParameterDeclaration(
+          [
+            factory.createModifier(ts.SyntaxKind.PrivateKeyword),
+            factory.createModifier(ts.SyntaxKind.ReadonlyKeyword),
+          ],
+          undefined,
+          'config',
+          undefined,
+          factory.createTypeReferenceNode('ClientConfig'),
+          factory.createObjectLiteralExpression([], false)
+        ),
+      ],
+      factory.createBlock([], false)
+    ),
+    serviceUseMethod(),
+  ];
+
+  const { regular, sse } = partitionOps(ops);
+  for (const op of regular) {
+    const parts = renderOperationParts(op, 'this.config', ctx);
+    aliases.push(...parts.aliases);
+    members.push(
+      withDoc(
+        factory.createMethodDeclaration(
+          [factory.createModifier(ts.SyntaxKind.AsyncKeyword)],
+          undefined,
+          op.name,
+          undefined,
+          undefined,
+          parts.params,
+          parts.returnType,
+          factory.createBlock(parts.body, true)
+        ),
+        parts.doc
+      )
+    );
+  }
+
+  // SSE ops are private async generators, reached through the `readonly sse`
+  // field of bound generators below — the public, namespace-style handle.
+  for (const op of sse) {
+    const parts = renderOperationParts(op, 'this.config', ctx);
+    aliases.push(...parts.aliases);
+    members.push(
+      withDoc(
+        factory.createMethodDeclaration(
+          [
+            factory.createModifier(ts.SyntaxKind.PrivateKeyword),
+            factory.createModifier(ts.SyntaxKind.AsyncKeyword),
+          ],
+          factory.createToken(ts.SyntaxKind.AsteriskToken),
+          op.name,
+          undefined,
+          undefined,
+          parts.params,
+          parts.returnType,
+          factory.createBlock(parts.body, true)
+        ),
+        parts.doc
+      )
+    );
+  }
+  if (sse.length > 0) members.push(sseFieldDeclaration(sse));
+
+  const cls = factory.createClassDeclaration(
+    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+    className,
+    undefined,
+    undefined,
+    members
+  );
+
+  return [...aliases, cls];
+}
+
+/**
+ * `readonly sse = { <op>: this.<op>.bind(this), … };` — the namespace field
+ * exposing a class's private SSE generators, each `this`-bound so callers can
+ * destructure them off the instance without losing their receiver.
+ */
+function sseFieldDeclaration(sse: OperationModel[]): ts.ClassElement {
+  return factory.createPropertyDeclaration(
+    [factory.createModifier(ts.SyntaxKind.ReadonlyKeyword)],
+    'sse',
+    undefined,
+    undefined,
+    factory.createObjectLiteralExpression(
+      sse.map((op) =>
+        factory.createPropertyAssignment(
+          op.name,
+          factory.createCallExpression(
+            factory.createPropertyAccessExpression(
+              factory.createPropertyAccessExpression(factory.createThis(), op.name),
+              'bind'
+            ),
+            undefined,
+            [factory.createThis()]
+          )
+        )
+      ),
+      false
+    )
+  );
+}
+
+/**
+ * Decompose an operation into the parts both facades assemble: the module-level
+ * type `aliases`, the `doc` comment text, the `params` list, the `returnType`,
+ * and the `body` statements (`return __request<R>(…)`, possibly preceded by the
+ * `const __a = await __auth(...)` auth prefix).
+ *
+ * `configRef` is the `ClientConfig` expression each request threads: the functions
+ * facade passes the global `__config`; service-class methods pass `this.config`.
+ */
+function renderOperationParts(
+  op: OperationModel,
+  configRef: string,
+  ctx: EmitContext
+): {
+  aliases: ts.Statement[];
+  doc: string | undefined;
+  params: ts.ParameterDeclaration[];
+  returnType: ts.TypeNode;
+  body: ts.Statement[];
+} {
+  const { argsStyle, errorMode, dateType, queryAuthKeys, schemaNames } = ctx;
+  const groupedMode = argsStyle === 'grouped';
+  const result = errorMode === 'result';
+  const authed = op.security.length > 0;
+  const hasQueryAuth = authed && op.security.some((k) => queryAuthKeys.has(k));
+  const { orderedPathParams, pathParamIdent } = orderPathParams(op);
+  const { responseType, responseKind } = computeResponse(op.successResponses, dateType);
+
+  const params = renderArgList(op, orderedPathParams, pathParamIdent, ctx);
+  const urlExpr = renderUrlExpr(op, configRef, groupedMode, pathParamIdent, hasQueryAuth);
+  const initExpr = renderInitExpr(op, groupedMode, authed);
+  const requestArgs = renderRequestArgs(
+    op,
+    configRef,
+    urlExpr,
+    initExpr,
+    groupedMode,
+    responseKind
+  );
+
+  // In result mode the operation returns `Result<<Op>Result, <Op>Error | unknown>`
+  // and calls `__requestResult`. The `*Error` alias is emitted only when the
+  // operation declares error responses; otherwise the error is `unknown` inline.
+  const errorMembers = result ? errorTypeNodes(op.errorResponses, dateType) : [];
+  const errorAlias = errorMembers.length > 0 ? `${pascalCase(op.name)}Error` : '';
+  // Like `<Op>Result`, suppress the `<Op>Error` alias when its name collides with a schema
+  // (`renderOperationAliases` skips it); the `Result<…>` error arg then references the inline
+  // error type rather than the absent alias.
+  const errorTypeArg: ts.TypeNode =
+    errorMembers.length === 0
+      ? factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword)
+      : schemaNames.has(errorAlias)
+        ? errorMembers.length === 1
+          ? errorMembers[0]
+          : factory.createUnionTypeNode(errorMembers)
+        : factory.createTypeReferenceNode(errorAlias);
+
+  const aliases = renderOperationAliases(
+    op,
+    responseType,
+    orderedPathParams,
+    pathParamIdent,
+    errorAlias,
+    errorMembers,
+    ctx
+  );
+
+  // Authed ops resolve their (possibly async) credentials once, up front, then
+  // spread `__a.headers` / merge `__a.query` at the call site.
+  const body: ts.Statement[] = [];
+  if (authed) body.push(authPrefixStatement(op.security, configRef));
+
+  // SSE ops are async generators: instead of `return __request(...)` they
+  // `yield* __sse<Event>(config, url, init, dataKind)`, and expose
+  // `AsyncGenerator<ServerSentEvent<Event>>` (no `*Result` alias).
+  if (isSseOp(op)) {
+    const eventType = sseEventType(op, dateType);
+    const returnType = factory.createTypeReferenceNode('AsyncGenerator', [
+      factory.createTypeReferenceNode('ServerSentEvent', [eventType]),
+    ]);
+    body.push(
+      factory.createExpressionStatement(
+        factory.createYieldExpression(
+          factory.createToken(ts.SyntaxKind.AsteriskToken),
+          factory.createCallExpression(
+            factory.createIdentifier('__sse'),
+            [eventType],
+            [configExpr(configRef), urlExpr, initExpr, factory.createStringLiteral(sseDataKind(op))]
+          )
+        )
+      )
+    );
+    return {
+      aliases: sseAliases(op, orderedPathParams, pathParamIdent, ctx),
+      doc: renderOperationDoc(op),
+      params,
+      returnType,
+      body,
+    };
+  }
+
+  const resultName = `${pascalCase(op.name)}Result`;
+  // When `<Op>Result` would collide with an exported schema, the alias is suppressed
+  // (see `renderOperationAliases`), so reference the underlying response type directly
+  // instead of the (now non-existent) alias — otherwise the name resolves to the schema.
+  const resultRef = schemaNames.has(resultName)
+    ? responseType
+    : factory.createTypeReferenceNode(resultName);
+  let returnType: ts.TypeNode;
+  let call: ts.Expression;
+  if (result) {
+    returnType = factory.createTypeReferenceNode('Promise', [
+      factory.createTypeReferenceNode('Result', [resultRef, errorTypeArg]),
+    ]);
+    call = factory.createCallExpression(
+      factory.createIdentifier('__requestResult'),
+      [resultRef, errorTypeArg],
+      requestArgs
+    );
+  } else {
+    returnType = factory.createTypeReferenceNode('Promise', [responseType]);
+    call = factory.createCallExpression(
+      factory.createIdentifier('__request'),
+      [responseType],
+      requestArgs
+    );
+  }
+  body.push(factory.createReturnStatement(call));
+
+  return { aliases, doc: renderOperationDoc(op), params, returnType, body };
+}
+
+/** `const __a = await __auth([...security], <config>);` — the up-front credential resolve. */
+function authPrefixStatement(security: string[], configRef: string): ts.Statement {
+  return factory.createVariableStatement(
+    undefined,
+    factory.createVariableDeclarationList(
+      [
+        factory.createVariableDeclaration(
+          '__a',
+          undefined,
+          undefined,
+          factory.createAwaitExpression(
+            factory.createCallExpression(factory.createIdentifier('__auth'), undefined, [
+              factory.createArrayLiteralExpression(
+                security.map((k) => factory.createStringLiteral(k)),
+                false
+              ),
+              configExpr(configRef),
+            ])
+          )
+        ),
+      ],
+      ts.NodeFlags.Const
+    )
+  );
+}
+
+/**
+ * Path params in URL-template order, each mapped to a safe, collision-free JS
+ * identifier. Template names are matched liberally (`{pet-id}`, not `\w+`) since
+ * OpenAPI names aren't constrained to identifiers; the safe ident serves as both
+ * the function argument and the URL substitution (a parameter, unlike an object
+ * key, cannot be quoted) and keys the `<Op>Variables` alias.
+ */
+function orderPathParams(op: OperationModel): {
+  orderedPathParams: ParamModel[];
+  pathParamIdent: Map<string, string>;
+} {
+  const { pathParams } = operationSignature(op);
+  return {
+    orderedPathParams: pathParams.map((p) => p.param),
+    pathParamIdent: new Map(pathParams.map((p) => [p.param.name, p.ident])),
+  };
+}
+
+/**
+ * The function/method parameter list. `flat` spreads path params then the
+ * `params`/`body`/`headers` slots; `grouped` bundles every input into one
+ * `vars: <Op>Variables` (optional `= {}` only when every field is). Both modes end
+ * with the trailing `init: RequestOptions`.
+ */
+function renderArgList(
+  op: OperationModel,
+  orderedPathParams: ParamModel[],
+  pathParamIdent: Map<string, string>,
+  ctx: EmitContext
+): ts.ParameterDeclaration[] {
+  const { dateType, schemaNames } = ctx;
+  const groupedMode = ctx.argsStyle === 'grouped';
+  const args: ts.ParameterDeclaration[] = [];
+  if (groupedMode) {
+    const sig = operationSignature(op);
+    if (sig.hasInputs) {
+      // Reference `<Op>Variables`, or inline its object type when that alias name collides
+      // with a schema (the alias is then suppressed — see `renderOperationAliases`).
+      const varsType = schemaNames.has(sig.variablesTypeName)
+        ? variablesTypeLiteral(op, pascalCase(op.name), orderedPathParams, pathParamIdent, ctx)
+        : factory.createTypeReferenceNode(sig.variablesTypeName);
+      args.push(simpleParam('vars', varsType, !sig.varsRequired));
+    }
+  } else {
+    for (const p of orderedPathParams) {
+      args.push(
+        simpleParam(pathParamIdent.get(p.name)!, schemaToTypeNode(p.schema, dateType), false)
+      );
+    }
+    if (op.queryParams.length > 0)
+      args.push(renderParamsObjectArg('params', op.queryParams, dateType));
+    if (op.requestBody) {
+      const type = bodyTypeNode(op.requestBody, dateType);
+      args.push(
+        factory.createParameterDeclaration(
+          undefined,
+          undefined,
+          'body',
+          op.requestBody.required ? undefined : factory.createToken(ts.SyntaxKind.QuestionToken),
+          type
+        )
+      );
+    }
+    // Operation header params are explicit, typed inputs; security-scheme headers
+    // are injected globally (in `renderInitExpr`) and live underneath them.
+    if (op.headerParams.length > 0)
+      args.push(renderParamsObjectArg('headers', op.headerParams, dateType));
+  }
+  // SSE ops take per-stream `SseOptions` (reconnect knobs); everyone else the
+  // standard per-call `RequestOptions`.
+  args.push(
+    simpleParam(
+      'init',
+      factory.createTypeReferenceNode(isSseOp(op) ? 'SseOptions' : 'RequestOptions'),
+      true
+    )
+  );
+  return args;
+}
+
+/**
+ * The `__buildUrl(config, \`/path\`, params?)` expression. Path params are
+ * substituted via `encodeURIComponent`; a `{name}` with no matching declared param
+ * is left literal (substituting it would reference an undeclared variable).
+ */
+function renderUrlExpr(
+  op: OperationModel,
+  configRef: string,
+  groupedMode: boolean,
+  pathParamIdent: Map<string, string>,
+  hasQueryAuth: boolean
+): ts.Expression {
+  const pathExpr = pathTemplate(op.path, groupedMode, pathParamIdent);
+  const args: ts.Expression[] = [configExpr(configRef), pathExpr];
+
+  const queryRef = factory.createPropertyAccessExpression(
+    groupedMode ? factory.createIdentifier('vars') : factory.createIdentifier('params'),
+    'params'
+  );
+  const plainQueryRef = groupedMode ? queryRef : factory.createIdentifier('params');
+  const authQuery = factory.createSpreadAssignment(
+    factory.createPropertyAccessExpression(factory.createIdentifier('__a'), 'query')
+  );
+
+  if (op.queryParams.length === 0) {
+    // Query-auth with no regular query params still needs to inject `__a.query`.
+    if (hasQueryAuth) args.push(factory.createObjectLiteralExpression([authQuery], false));
+  } else if (hasQueryAuth) {
+    args.push(
+      factory.createObjectLiteralExpression(
+        [factory.createSpreadAssignment(plainQueryRef), authQuery],
+        false
+      )
+    );
+  } else {
+    args.push(plainQueryRef);
+  }
+
+  // A 4th `styles` spec is emitted only for non-default query params, so
+  // default operations stay byte-identical (no 4th arg, the runtime's default
+  // serialization path runs). A styled query param is definitionally a query
+  // param, so the 3rd (query) arg above is always present here.
+  const styles = stylesLiteral(op.queryParams);
+  if (styles) args.push(styles);
+
+  return factory.createCallExpression(factory.createIdentifier('__buildUrl'), undefined, args);
+}
+
+/**
+ * The per-param query-serialization `styles` object literal for `__buildUrl`,
+ * containing entries ONLY for non-default params, or `undefined` when every
+ * query param is at the OpenAPI default (`form` + `explode: true`).
+ *
+ * A param is non-default when ANY of: `style` is set and ≠ `form`, OR
+ * `explode === false`, OR `allowReserved === true`. Keyed by the wire param
+ * name (a StringLiteral, since names may contain non-identifier chars); the
+ * value carries the resolved `style`/`explode` and `allowReserved` only when set.
+ */
+function stylesLiteral(queryParams: ParamModel[]): ts.ObjectLiteralExpression | undefined {
+  const entries: ts.PropertyAssignment[] = [];
+  for (const p of queryParams) {
+    const styled = (p.style !== undefined && p.style !== 'form') || p.explode === false;
+    if (!styled && !p.allowReserved) continue;
+    const props: ts.PropertyAssignment[] = [
+      factory.createPropertyAssignment('style', factory.createStringLiteral(p.style ?? 'form')),
+      factory.createPropertyAssignment(
+        'explode',
+        (p.explode ?? true) ? factory.createTrue() : factory.createFalse()
+      ),
+    ];
+    if (p.allowReserved)
+      props.push(factory.createPropertyAssignment('allowReserved', factory.createTrue()));
+    entries.push(
+      factory.createPropertyAssignment(
+        factory.createStringLiteral(p.name),
+        factory.createObjectLiteralExpression(props, false)
+      )
+    );
+  }
+  return entries.length > 0 ? factory.createObjectLiteralExpression(entries, false) : undefined;
+}
+
+/**
+ * The path template literal with `{name}` placeholders substituted by
+ * `${encodeURIComponent(String(<ident>))}`. A placeholder with no declared param
+ * is left literal. No placeholders ⇒ a no-substitution template literal.
+ */
+function pathTemplate(
+  path: string,
+  groupedMode: boolean,
+  pathParamIdent: Map<string, string>
+): ts.TemplateLiteral {
+  // Split the path on declared `{name}` placeholders into literal chunks and
+  // substitution expressions. An undeclared placeholder stays in the literal text.
+  const literals: string[] = [];
+  const exprs: ts.Expression[] = [];
+  let buffer = '';
+  let last = 0;
+  for (const match of path.matchAll(/\{([^}]+)\}/g)) {
+    const ident = pathParamIdent.get(match[1]);
+    if (!ident) continue;
+    buffer += path.slice(last, match.index);
+    literals.push(buffer);
+    buffer = '';
+    last = match.index! + match[0].length;
+    const ref = groupedMode
+      ? factory.createPropertyAccessExpression(factory.createIdentifier('vars'), ident)
+      : factory.createIdentifier(ident);
+    exprs.push(
+      factory.createCallExpression(factory.createIdentifier('encodeURIComponent'), undefined, [
+        factory.createCallExpression(factory.createIdentifier('String'), undefined, [ref]),
+      ])
+    );
+  }
+  buffer += path.slice(last);
+
+  if (exprs.length === 0) return factory.createNoSubstitutionTemplateLiteral(buffer);
+
+  const head = factory.createTemplateHead(literals[0]);
+  const spans = exprs.map((expr, i) =>
+    factory.createTemplateSpan(
+      expr,
+      i === exprs.length - 1
+        ? factory.createTemplateTail(buffer)
+        : factory.createTemplateMiddle(literals[i + 1])
+    )
+  );
+  return factory.createTemplateExpression(head, spans);
+}
+
+/**
+ * The `RequestInit` literal: method + caller `init`, plus a merged `headers`
+ * object when the operation injects auth or declares header params. Header
+ * precedence, lowest → highest (later spreads win): injected auth (`__a.headers`,
+ * resolved by the up-front `const __a = await __auth(...)`) → explicit
+ * header-param values → caller `init.headers`. So an explicit header overrides
+ * auto-injected auth, and the caller always overrides both.
+ */
+function renderInitExpr(op: OperationModel, groupedMode: boolean, authed: boolean): ts.Expression {
+  const method = op.method.toUpperCase();
+  const baseProps: ts.ObjectLiteralElementLike[] = [
+    factory.createPropertyAssignment('method', factory.createStringLiteral(method)),
+    factory.createSpreadAssignment(factory.createIdentifier('init')),
+  ];
+
+  const headerSources: ts.ObjectLiteralElementLike[] = [];
+  if (authed) {
+    headerSources.push(
+      factory.createSpreadAssignment(
+        factory.createPropertyAccessExpression(factory.createIdentifier('__a'), 'headers')
+      )
+    );
+  }
+  if (op.headerParams.length > 0) {
+    headerSources.push(factory.createSpreadAssignment(headersHelperCall(op, groupedMode)));
+  }
+  if (headerSources.length === 0) {
+    return factory.createObjectLiteralExpression(baseProps, false);
+  }
+  // `...(init.headers as Record<string, string> | undefined)` — caller wins.
+  headerSources.push(
+    factory.createSpreadAssignment(
+      factory.createAsExpression(
+        factory.createPropertyAccessExpression(factory.createIdentifier('init'), 'headers'),
+        factory.createUnionTypeNode([
+          factory.createTypeReferenceNode('Record', [
+            factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+            factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+          ]),
+          factory.createKeywordTypeNode(ts.SyntaxKind.UndefinedKeyword),
+        ])
+      )
+    )
+  );
+  return factory.createObjectLiteralExpression(
+    [
+      ...baseProps,
+      factory.createPropertyAssignment(
+        'headers',
+        factory.createObjectLiteralExpression(headerSources, false)
+      ),
+    ],
+    false
+  );
+}
+
+/** `__headers(<headersRef>)` for the explicit header-param slot. */
+function headersHelperCall(op: OperationModel, groupedMode: boolean): ts.Expression {
+  // Optional headers may be absent on `vars`, so they fall back to `{}`.
+  let headersRef: ts.Expression;
+  if (groupedMode) {
+    const varsHeaders = factory.createPropertyAccessExpression(
+      factory.createIdentifier('vars'),
+      'headers'
+    );
+    headersRef = op.headerParams.some((p) => p.required)
+      ? varsHeaders
+      : factory.createBinaryExpression(
+          varsHeaders,
+          factory.createToken(ts.SyntaxKind.QuestionQuestionToken),
+          factory.createObjectLiteralExpression([], false)
+        );
+  } else {
+    headersRef = factory.createIdentifier('headers');
+  }
+  return factory.createCallExpression(factory.createIdentifier('__headers'), undefined, [
+    headersRef,
+  ]);
+}
+
+/**
+ * The positional arguments to `__request<T>(…)`: config, url, init, then an
+ * optional body and an explicit response-kind. A non-json response with no body
+ * still passes `undefined` as the body placeholder so the kind lands in the right
+ * position.
+ */
+function renderRequestArgs(
+  op: OperationModel,
+  configRef: string,
+  urlExpr: ts.Expression,
+  initExpr: ts.Expression,
+  groupedMode: boolean,
+  responseKind: 'json' | 'blob' | 'text' | 'void'
+): ts.Expression[] {
+  const args: ts.Expression[] = [configExpr(configRef), urlExpr, initExpr];
+  if (op.requestBody) {
+    const bodyExpr = groupedMode
+      ? factory.createPropertyAccessExpression(factory.createIdentifier('vars'), 'body')
+      : factory.createIdentifier('body');
+    // A typed multipart body is a plain object; serialize it to FormData on the way out.
+    args.push(
+      isTypedMultipart(op.requestBody)
+        ? factory.createCallExpression(factory.createIdentifier('__toFormData'), undefined, [
+            bodyExpr,
+          ])
+        : bodyExpr
+    );
+  } else if (responseKind !== 'json') {
+    args.push(factory.createIdentifier('undefined'));
+  }
+  if (responseKind !== 'json') args.push(factory.createStringLiteral(responseKind));
+  return args;
+}
+
+/** The `ClientConfig` expression threaded into the runtime: `__config` or `this.config`. */
+function configExpr(configRef: string): ts.Expression {
+  return configRef === 'this.config'
+    ? factory.createPropertyAccessExpression(factory.createThis(), 'config')
+    : factory.createIdentifier(configRef);
+}
+
+/** The operation's JSDoc body: summary, then a blank line and the description. */
+function renderOperationDoc(op: OperationModel): string | undefined {
+  const docLines: string[] = [];
+  if (op.summary) docLines.push(op.summary);
+  if (op.description) {
+    if (op.summary) docLines.push('');
+    for (const line of splitLines(op.description)) docLines.push(line);
+  }
+  while (docLines.length > 0 && docLines[docLines.length - 1] === '') docLines.pop();
+  return docLines.length > 0 ? docLines.join('\n') : undefined;
+}
+
+/** Attach an operation/param JSDoc block to a node, when there is one. */
+function withDoc<T extends ts.Node>(node: T, doc: string | undefined): T {
+  return doc === undefined ? node : jsdoc(node, doc);
+}
+
diff --git a/packages/openapi-typescript/src/emitters/runtime.ts b/packages/openapi-typescript/src/emitters/runtime.ts
new file mode 100644
index 0000000000..be19d7c0f3
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/runtime.ts
@@ -0,0 +1,716 @@
+/**
+ * The static runtime inlined verbatim into every generated client: the config /
+ * extension contract, the error type, the URL/query builder, the fetch wrapper,
+ * and the optional header normalizer.
+ *
+ * Three things vary by call: the inlined `BASE` value; whether `__headers` is
+ * emitted (only when some operation declares header params, so `noUnusedLocals`
+ * consumers don't trip over dead code); and whether the operation-facing helpers
+ * (`__buildUrl` / `__request` / `__headers` / `__config`) are `export`ed — they
+ * are in multi-file modes, module-private in single-file.
+ */
+/**
+ * The public `export type`s the runtime/http module exposes. Multi-file writers
+ * re-export exactly these from the entry barrel so a consumer gets the whole
+ * config surface from one import (and the same names resolve in single-file
+ * output, where the types live inline). Kept here, beside the template that emits
+ * them, so the list and the emitted `export type`s stay in lockstep — add a
+ * public type to the template below and add its name here.
+ */
+export const PUBLIC_RUNTIME_TYPES = [
+  'ClientConfig',
+  'Middleware',
+  'ParseAs',
+  'RequestContext',
+  'RequestOptions',
+  'RetryConfig',
+  'RetryContext',
+  'RetryStrategy',
+] as const;
+
+import { printStatements, parseStatements, type ts } from './ts.js';
+
+export function renderRuntime(
+  baseUrl: string,
+  needsHeaderHelper: boolean,
+  exportHelpers: boolean,
+  errorMode: 'throw' | 'result' = 'throw',
+  needsSse: boolean = false,
+  authConfig: boolean = false,
+  needsMultipart: boolean = false
+): string {
+  return printStatements(
+    runtimeStatements(
+      baseUrl,
+      needsHeaderHelper,
+      exportHelpers,
+      errorMode,
+      needsSse,
+      authConfig,
+      needsMultipart
+    )
+  );
+}
+
+/**
+ * The runtime as parsed `ts.Statement[]` — the same hand-authored reference
+ * source, embedded via `parseStatements` so the composition (Task 6) can fold it
+ * into the single-file / module statement lists. `renderRuntime` prints these.
+ */
+export function runtimeStatements(
+  baseUrl: string,
+  needsHeaderHelper: boolean,
+  exportHelpers: boolean,
+  errorMode: 'throw' | 'result' = 'throw',
+  needsSse: boolean = false,
+  authConfig: boolean = false,
+  needsMultipart: boolean = false
+): ts.Statement[] {
+  return parseStatements(
+    runtimeSource(
+      baseUrl,
+      needsHeaderHelper,
+      exportHelpers,
+      errorMode,
+      needsSse,
+      authConfig,
+      needsMultipart
+    )
+  );
+}
+
+function runtimeSource(
+  baseUrl: string,
+  needsHeaderHelper: boolean,
+  exportHelpers: boolean,
+  errorMode: 'throw' | 'result',
+  needsSse: boolean,
+  authConfig: boolean,
+  needsMultipart: boolean
+): string {
+  const base = JSON.stringify(baseUrl);
+  const ex = exportHelpers ? 'export ' : '';
+  const multipartBlock = needsMultipart
+    ? `
+
+/**
+ * Serialize a plain object into \`FormData\` for a \`multipart/form-data\` body. \`Blob\`/\`File\`
+ * and strings pass through; arrays append one field per item; other objects are JSON-encoded;
+ * everything else is stringified. \`undefined\` / \`null\` entries are skipped.
+ */
+${ex}function __toFormData(body: Record<string, unknown>): FormData {
+  const fd = new FormData();
+  const append = (key: string, value: unknown): void => {
+    if (value === undefined || value === null) return;
+    if (value instanceof Blob || typeof value === 'string') fd.append(key, value);
+    else if (value instanceof Date) fd.append(key, value.toISOString());
+    else if (typeof value === 'object') fd.append(key, JSON.stringify(value));
+    else fd.append(key, String(value));
+  };
+  for (const [key, value] of Object.entries(body)) {
+    if (Array.isArray(value)) for (const item of value) append(key, item);
+    else append(key, value);
+  }
+  return fd;
+}`
+    : '';
+  const headerHelper = needsHeaderHelper
+    ? `
+
+/**
+ * Normalize an operation's header-parameter object into a plain string record,
+ * dropping any \`undefined\` / \`null\` entries (optional headers the caller omitted)
+ * and stringifying the rest. Mirrors __buildUrl's handling of query values.
+ */
+${ex}function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(values)) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}`
+    : '';
+  const sseBlock = needsSse
+    ? `
+
+/** A single decoded Server-Sent Event. \`data\` is the parsed payload (\`T\`). */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Per-call options for an SSE stream. \`reconnect\` defaults to true (auto-reconnect). */
+export type SseOptions = RequestInit & {
+  /** Opt out of automatic reconnection; the iterator then ends/throws on the first stream end/error. */
+  reconnect?: boolean;
+  /** Override the base reconnect backoff in ms. The server's \`retry:\` value still takes precedence. */
+  reconnectDelay?: number;
+};
+
+${ex}async function* __sse<T>(
+  config: ClientConfig,
+  url: string,
+  init: SseOptions,
+  dataKind: 'json' | 'text' = 'text'
+): AsyncGenerator<ServerSentEvent<T>> {
+  const { reconnect = true, reconnectDelay, ...rest } = init;
+  const signal = rest.signal ?? undefined;
+  const headers: Record<string, string> = {
+    Accept: 'text/event-stream',
+    ...(rest.headers as Record<string, string> | undefined),
+  };
+  let lastEventId: string | undefined;
+  let serverRetry: number | undefined;
+  let failures = 0;
+  while (true) {
+    if (signal?.aborted) return;
+    const sendHeaders = lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
+    let response: Response;
+    try {
+      ({ response } = await __send(config, url, { ...rest, method: rest.method ?? 'GET', headers: sendHeaders }));
+    } catch (error) {
+      if (signal?.aborted) return;
+      throw error;
+    }
+    if (!response.ok) {
+      const errorBody = await readError(response);
+      throw new ApiError(url, response.status, response.statusText, errorBody);
+    }
+    failures = 0;
+    try {
+      const body = response.body;
+      if (!body) return;
+      const reader = body.getReader();
+      const decoder = new TextDecoder();
+      let buffer = '';
+      try {
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) break;
+          buffer += decoder.decode(value, { stream: true });
+          let index: number;
+          while ((index = buffer.search(/\\r\\n\\r\\n|\\n\\n|\\r\\r/)) !== -1) {
+            const raw = buffer.slice(0, index);
+            buffer = buffer.slice(index + buffer.slice(index).match(/^(\\r\\n\\r\\n|\\n\\n|\\r\\r)/)![0].length);
+            const event = __parseSseFrame(raw, dataKind);
+            if (event) {
+              if (event.id !== undefined) lastEventId = event.id;
+              if (event.retry !== undefined) serverRetry = event.retry;
+              yield event as ServerSentEvent<T>;
+            }
+          }
+          // Bound memory: a server that never sends a frame delimiter would otherwise
+          // grow \`buffer\` without limit. 1 MiB is far above any real SSE frame.
+          if (buffer.length > 1048576) {
+            throw new Error('SSE frame exceeded 1048576 characters without a delimiter');
+          }
+        }
+      } finally {
+        await reader.cancel().catch(() => undefined);
+      }
+    } catch (error) {
+      if (signal?.aborted) return;
+      if (!reconnect) throw error;
+    }
+    if (!reconnect || signal?.aborted) return;
+    failures++;
+    const base = serverRetry ?? reconnectDelay ?? 1000;
+    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);
+    try {
+      await __sleep(Math.random() * delay, signal);
+    } catch (error) {
+      if (signal?.aborted) return;
+      throw error;
+    }
+  }
+}
+
+/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */
+function __parseSseFrame(raw: string, dataKind: 'json' | 'text'): ServerSentEvent<unknown> | undefined {
+  let event: string | undefined;
+  const dataLines: string[] = [];
+  let id: string | undefined;
+  let retry: number | undefined;
+  let sawField = false;
+  for (const line of raw.split(/\\r\\n|\\n|\\r/)) {
+    if (line === '' || line.startsWith(':')) continue;
+    const colon = line.indexOf(':');
+    const field = colon === -1 ? line : line.slice(0, colon);
+    let val = colon === -1 ? '' : line.slice(colon + 1);
+    if (val.startsWith(' ')) val = val.slice(1);
+    sawField = true;
+    if (field === 'event') event = val;
+    else if (field === 'data') dataLines.push(val);
+    else if (field === 'id') id = val;
+    else if (field === 'retry') { const n = Number(val); if (!Number.isNaN(n)) retry = n; }
+  }
+  if (!sawField) return undefined;
+  const dataText = dataLines.join('\\n');
+  const data = dataKind === 'json' && dataText !== '' ? JSON.parse(dataText) : dataText;
+  return { event, data, id, retry };
+}`
+    : '';
+  const terminal =
+    errorMode === 'result'
+      ? `/**
+ * The discriminated result returned by every operation under \`errorMode: 'result'\`.
+ * On success \`error\` is \`undefined\`; on a non-2xx response \`data\` is \`undefined\` and
+ * \`error\` is the typed response body. \`response\` is always the raw \`Response\` (use
+ * \`response.status\` for the HTTP code). Transport/abort failures still throw.
+ */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+${ex}async function __requestResult<TData, TError>(
+  config: ClientConfig,
+  url: string,
+  init: RequestOptions,
+  body?: unknown,
+  responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'
+): Promise<Result<TData, TError>> {
+  const { parseAs, ...sendInit } = init;
+  const { response } = await __send(config, url, sendInit, body);
+  if (!response.ok) {
+    const error = (await readError(response)) as TError;
+    return { data: undefined, error, response };
+  }
+  const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
+  const data = (await __parse(response, kind)) as TData;
+  return { data, error: undefined, response };
+}`
+      : `${ex}async function __request<T>(
+  config: ClientConfig,
+  url: string,
+  init: RequestOptions,
+  body?: unknown,
+  responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'
+): Promise<T> {
+  const { parseAs, ...sendInit } = init;
+  const { response, context } = await __send(config, url, sendInit, body);
+  if (!response.ok) {
+    const errorBody = await readError(response);
+    let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of __middleware(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiError, context);
+    }
+    throw error;
+  }
+  const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
+  return (await __parse(response, kind)) as T;
+}`;
+  // Per-instance credentials field on ClientConfig, emitted only when the client has
+  // injectable security schemes (so the `AuthCredentials` type exists). Lets each
+  // service-class instance carry its own credentials instead of sharing the module
+  // globals — see ADR-0007.
+  const authField = authConfig
+    ? `
+  /**
+   * Per-instance auth credentials. When set, they override the module-global
+   * \`set*\` helpers for requests made through this config (each scheme falls back
+   * to its global slot when omitted here). Only the schemes an operation declares
+   * in its \`security\` are ever sent.
+   */
+  auth?: AuthCredentials;`
+    : '';
+  return `let BASE = ${base};
+
+/** The mutable request context handed to \`onRequest\` (mutate \`url\`/\`method\`/\`headers\`). */
+export type RequestContext = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+};
+
+/**
+ * Configuration and extension hooks for a client. Supplied per-instance via
+ * \`new <Client>(config)\` (service-class facade) or globally via \`configure(config)\`
+ * (functions facade).
+ */
+export type ClientConfig = {
+  /** Base URL for this client; overrides the inlined default and \`setBaseUrl()\`. */
+  baseUrl?: string;
+  /** Extra headers merged into every request; a function is invoked per request. */
+  headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+  /** Transport used to issue requests. Defaults to the global \`fetch\`. */
+  fetch?: typeof fetch;
+  /** Mutate the request (\`url\` / \`method\` / \`headers\`) before it is sent. */
+  onRequest?: (ctx: RequestContext) => void | Promise<void>;
+  /** Observe — or replace, by returning a \`Response\` — the response before parsing. */
+  onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+  /**
+   * Map a failed request's \`ApiError\` into a custom error to throw instead (throw mode only).
+   * Synchronous, kept so for backward compatibility; \`Middleware.onError\` additionally allows async.
+   */
+  onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
+  /**
+   * Composable interceptors run around every request, alongside the single
+   * \`onRequest\`/\`onResponse\`/\`onError\` hooks above (which act as one implicit, first
+   * middleware). \`onRequest\` runs in array order; \`onResponse\` in reverse — an onion, so
+   * the last-registered middleware wraps closest to the network. Register more at runtime
+   * with \`use()\` (functions facade) or \`<Client>.use()\` (service-class facade).
+   */
+  middleware?: Middleware[];
+  /** Retry policy for transient failures. Omitted ⇒ no retries (\`retries\` defaults to 0). */
+  retry?: RetryConfig;${authField}
+};
+
+/**
+ * A request interceptor; every field is optional, so a middleware can hook any subset of
+ * the lifecycle. \`onRequest\` may mutate the request \`ctx\` (\`url\`/\`method\`/\`headers\`);
+ * \`onResponse\` may return a replacement \`Response\`; \`onError\` (throw mode only) maps the
+ * failure into the error to throw, threaded through each middleware in turn.
+ */
+export type Middleware = {
+  onRequest?: (ctx: RequestContext) => void | Promise<void>;
+  onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+  // \`globalThis.Error\` (not bare \`Error\`) so a spec schema named \`Error\` can't shadow it.
+  onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/** Context handed to \`retryOn\` for the attempt that just failed. */
+export type RetryContext = {
+  /** 1-based number of the attempt that just failed. */
+  attempt: number;
+  /** The request that was attempted. */
+  request: RequestContext;
+  /** Present when the server returned a (non-ok) response. */
+  response?: Response;
+  /** Present when the transport threw (network error, DNS, connection reset). */
+  error?: unknown;
+};
+
+/** Retry policy; all fields optional with sensible defaults. */
+export type RetryConfig = {
+  /** Number of *extra* attempts after the first. Default 0 (opt-in). */
+  retries?: number;
+  /** Base delay in milliseconds. Default 1000. */
+  retryDelay?: number;
+  /** Backoff shape. Default 'exponential'. */
+  retryStrategy?: RetryStrategy;
+  /** Apply full jitter over the computed delay. Default true. */
+  jitter?: boolean;
+  /**
+   * Decide whether to retry a failed attempt. Default: retry only idempotent
+   * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
+   * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
+   */
+  retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
+};
+
+/**
+ * How the response body is read. \`'auto'\` negotiates from the content type (the
+ * generated default); \`'stream'\` returns the raw \`ReadableStream\` (\`response.body\`).
+ */
+export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
+
+/**
+ * The trailing per-operation argument: standard \`RequestInit\` plus an optional
+ * per-call retry override and a \`parseAs\` escape hatch.
+ *
+ * \`parseAs\` forces how the response body is read; overrides the inferred kind.
+ * \`'stream'\` returns the raw \`ReadableStream\` (\`response.body\`). This is a runtime
+ * override — the static return type is unchanged.
+ */
+export type RequestOptions = RequestInit & { retry?: Partial<RetryConfig>; parseAs?: ParseAs };
+
+/**
+ * Override the base URL used by every generated operation. Useful when the
+ * runtime environment differs from the value declared in \`servers[0].url\`
+ * (e.g. dev / staging / prod toggles in a single-page app).
+ *
+ * Mutates a module-scoped binding shared by the functions facade. For multiple
+ * bases at once, use the service-class facade with \`new Client({ baseUrl })\`.
+ */
+export function setBaseUrl(url: string): void {
+  BASE = url;
+}
+
+/** The global config used by the functions facade (see \`configure\`). */
+${ex}const __config: ClientConfig = {};
+
+/**
+ * Merge \`config\` into the global configuration used by the functions facade —
+ * set a custom \`fetch\`, default \`headers\`, or \`onRequest\`/\`onResponse\`/\`onError\`
+ * hooks once for every free function. The service-class facade configures per
+ * instance instead (\`new Client(config)\`).
+ */
+export function configure(config: ClientConfig): void {
+  Object.assign(__config, config);
+}
+
+/**
+ * Append interceptors to the functions facade's global middleware chain (see
+ * \`ClientConfig.middleware\`). The service-class facade registers per instance via
+ * \`<Client>.use(...)\` instead.
+ */
+export function use(...middleware: Middleware[]): void {
+  // Reassign (don't push) so a caller-provided \`middleware\` array isn't mutated.
+  __config.middleware = [...(__config.middleware ?? []), ...middleware];
+}
+
+/**
+ * The effective middleware chain for a request: the single \`onRequest\`/\`onResponse\`/
+ * \`onError\` config hooks as one implicit first middleware, then \`config.middleware\`.
+ */
+function __middleware(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(\`Request failed with status \${status}\`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+type QueryPrimitive = string | number | boolean;
+type QueryValue =
+  | QueryPrimitive
+  | null
+  | undefined
+  | Array<QueryPrimitive>
+  | Record<string, unknown>;
+
+/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (\`form\`, \`explode: true\`). */
+type QueryStyle = {
+  style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Percent-encode \`value\` but leave the RFC-3986 reserved set
+ * (\`:/?#[]@!$&'()*+,;=\`) un-escaped, for query params declaring \`allowReserved\`.
+ */
+function __encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+${ex}function __buildUrl(
+  config: ClientConfig,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  const url = (config.baseUrl ?? BASE).replace(/\\/+$/, '') + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (typeof value === 'object') {
+        // Object-valued query params use \`deepObject\` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(\`\${key}[\${subKey}]\`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(\`\${key}=\${__encodeReserved(v)}\`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. \`%20\` (not \`+\`) is the literal space delimiter.
+        const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
+        raw.push(\`\${encodeURIComponent(key)}=\${items.map(enc).join(delim)}\`);
+      }
+    } else if (typeof value === 'object') {
+      // \`deepObject\` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(\`\${key}[\${subKey}]=\${__encodeReserved(String(subValue))}\`);
+          else params.append(\`\${key}[\${subKey}]\`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(\`\${key}=\${__encodeReserved(String(value))}\`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? \`\${url}?\${qs}\` : url;
+}
+
+${ex}async function __send(
+  config: ClientConfig,
+  url: string,
+  init: RequestOptions,
+  body?: unknown
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  let payload: BodyInit | undefined;
+  if (body !== undefined) {
+    const isBinary =
+      body instanceof Blob ||
+      body instanceof ArrayBuffer ||
+      ArrayBuffer.isView(body as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
+    const isURLSearchParams = body instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
+      payload = body as BodyInit;
+    } else {
+      payload = JSON.stringify(body);
+      if (!('Content-Type' in headers) && !('content-type' in headers)) {
+        headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+  const middleware = __middleware(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? __defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw __abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
+        await __sleep(__retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+${ex}async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+${terminal}
+
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+function __defaultRetryOn(ctx: RetryContext): boolean {
+  if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(__abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(__abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+function __abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}${sseBlock}${headerHelper}${multipartBlock}`;
+}
diff --git a/packages/openapi-typescript/src/emitters/sample.ts b/packages/openapi-typescript/src/emitters/sample.ts
new file mode 100644
index 0000000000..caf69a2eea
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/sample.ts
@@ -0,0 +1,172 @@
+import { isPlainObject } from '@redocly/openapi-core';
+
+import type { NamedSchemaModel, ScalarKind, SchemaMetadata, SchemaModel } from '../ir/model.js';
+import type { DateType } from './types.js';
+
+/** A sampled value the emitter must print as a raw TS expression rather than a JSON
+ *  literal — e.g. a `format: binary` field, whose generated type is `Blob`. The `code`
+ *  strings are generator-authored constants (never spec-derived), so emitting them
+ *  verbatim is safe. */
+export class SampleExpression {
+  constructor(readonly code: string) {}
+}
+
+/** Options for `sampleValue`. `dateType` mirrors the type emitter's `--date-type`
+ *  knob: when `'Date'`, date/date-time fields are typed `Date` (not `string`), so
+ *  the sample must be a `new Date(...)` expression to match. Defaults to `'string'`. */
+export type SampleOptions = { dateType?: DateType };
+
+/**
+ * Turn an IR schema into a single deterministic JS value for baked mocks. Prefers
+ * a spec `example`, then `default`, then a type/format-aware synthesized value —
+ * EXCEPT for type-demanding fields (binary, or date/date-time under `dateType: 'Date'`)
+ * whose generated type is not a JSON literal: those emit a fixed raw expression that
+ * matches the type, regardless of any example/default (see `typeDemandedExpression`).
+ * Refs resolve against `schemas`; recursion is cut with a visited-set so cyclic
+ * schemas terminate (`null` at the cycle) instead of looping forever.
+ */
+export function sampleValue(
+  schema: SchemaModel,
+  schemas: NamedSchemaModel[],
+  opts: SampleOptions = {}
+): unknown {
+  const byName = new Map(schemas.map((s) => [s.name, s.schema]));
+  const value = walk(schema, byName, new Set(), opts.dateType ?? 'string');
+  // A `CYCLE` that propagates all the way to the root has no container to absorb it
+  // into a valid empty value (e.g. a self-referential union); fall back to null.
+  return value === CYCLE ? null : value;
+}
+
+/**
+ * Sentinel returned by `walk` when a `$ref` re-enters a name already on the stack.
+ * Containers turn it into the type-correct empty value for their position — an array
+ * to `[]`, a record to `{}`, an optional property to omission — so a recursive schema
+ * yields data that still satisfies its (non-nullable) generated type. Only a required,
+ * non-container self-reference (a genuinely uninhabitable schema) degrades to null.
+ */
+const CYCLE = Symbol('cycle');
+
+/**
+ * The expression a field MUST sample to because its generated type is not a JSON
+ * literal — so it takes precedence over any spec `example`/`default` (baking those
+ * would not type-check). The returned `code` is a generator-authored CONSTANT and
+ * is NEVER interpolated from spec data: it flows verbatim into `parseExpression`,
+ * so feeding a spec example string in here would be an injection vector. `undefined`
+ * when the field has no type demand (the normal example/default/synthesis path applies).
+ */
+function typeDemandedExpression(
+  schema: SchemaModel,
+  dateType: DateType
+): SampleExpression | undefined {
+  if (schema.kind !== 'scalar') return undefined;
+  const format = schema.metadata?.format;
+  if (format === 'binary') return new SampleExpression('new Blob([])');
+  if (dateType === 'Date') {
+    if (format === 'date-time') return new SampleExpression('new Date("2024-01-01T00:00:00Z")');
+    if (format === 'date') return new SampleExpression('new Date("2024-01-01")');
+  }
+  return undefined;
+}
+
+function walk(
+  schema: SchemaModel,
+  byName: Map<string, SchemaModel>,
+  visiting: Set<string>,
+  dateType: DateType
+): unknown {
+  const demanded = typeDemandedExpression(schema, dateType);
+  if (demanded) return demanded;
+
+  const meta = schema.metadata;
+  if (meta?.example !== undefined) return meta.example;
+  if (meta?.default !== undefined) return meta.default;
+
+  switch (schema.kind) {
+    case 'scalar':
+      return scalarSample(schema.scalar, meta);
+    case 'array': {
+      // A cyclic item type collapses the array to `[]` — itself a valid `T[]`.
+      const item = walk(schema.items, byName, visiting, dateType);
+      return item === CYCLE ? [] : [item];
+    }
+    case 'object':
+      return Object.fromEntries(
+        schema.properties.flatMap((p) => {
+          const value = walk(p.schema, byName, visiting, dateType);
+          // A cyclic optional property is omitted (a null would not satisfy `T | undefined`);
+          // a cyclic required property is uninhabitable, so null is the only stand-in.
+          if (value === CYCLE) return p.required ? [[p.name, null]] : [];
+          return [[p.name, value]];
+        })
+      );
+    case 'record': {
+      const value = walk(schema.value, byName, visiting, dateType);
+      return value === CYCLE ? {} : { key: value };
+    }
+    case 'enum':
+      return schema.values[0];
+    case 'literal':
+      return schema.value;
+    case 'union': {
+      // Pick the first member that is not itself a cycle; if every member cycles the
+      // union is uninhabitable, so propagate `CYCLE` for a container/root to absorb.
+      for (const member of schema.members) {
+        const value = walk(member, byName, visiting, dateType);
+        if (value !== CYCLE) return value;
+      }
+      return schema.members.length > 0 ? CYCLE : null;
+    }
+    case 'intersection':
+      return schema.members.reduce<Record<string, unknown>>((acc, m) => {
+        const part = walk(m, byName, visiting, dateType);
+        return isPlainObject(part) ? Object.assign(acc, part) : acc;
+      }, {});
+    case 'omit': {
+      // base is a named schema reference (string), resolve it then drop the listed keys
+      const target = byName.get(schema.base);
+      if (!target) return null;
+      const base = walk(target, byName, visiting, dateType);
+      if (isPlainObject(base)) {
+        const copy = { ...(base as Record<string, unknown>) };
+        for (const key of schema.keys) delete copy[key];
+        return copy;
+      }
+      return base;
+    }
+    case 'ref': {
+      if (visiting.has(schema.name)) return CYCLE;
+      const target = byName.get(schema.name);
+      if (!target) return null;
+      visiting.add(schema.name);
+      const result = walk(target, byName, visiting, dateType);
+      visiting.delete(schema.name);
+      return result;
+    }
+    case 'null':
+    case 'unknown':
+      return null;
+  }
+}
+
+function scalarSample(scalar: ScalarKind, meta: SchemaMetadata | undefined): unknown {
+  if (scalar === 'boolean') return true;
+  if (scalar === 'integer' || scalar === 'number') return 0;
+  // Type-demanding formats (binary, and date/date-time under `dateType: 'Date'`) are
+  // handled earlier in `walk` via `typeDemandedExpression`; here the date formats fall
+  // through to the ISO-string path (the `dateType: 'string'` types them as `string`).
+  switch (meta?.format) {
+    case 'email':
+      return 'user@example.com';
+    case 'uuid':
+      return '00000000-0000-4000-8000-000000000000';
+    case 'date-time':
+      return '2024-01-01T00:00:00Z';
+    case 'date':
+      return '2024-01-01';
+    case 'uri':
+    case 'url':
+      return 'https://example.com';
+    default:
+      return 'string';
+  }
+}
diff --git a/packages/openapi-typescript/src/emitters/sse.ts b/packages/openapi-typescript/src/emitters/sse.ts
new file mode 100644
index 0000000000..6bc2322a1f
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/sse.ts
@@ -0,0 +1,67 @@
+import type { OperationModel, ResponseBodyModel, SchemaModel } from '../ir/model.js';
+import { ts } from './ts.js';
+import { type DateType, schemaToTypeNode } from './types.js';
+
+const { factory } = ts;
+
+/** The media type that marks an operation as a Server-Sent Events stream. */
+const SSE_CONTENT_TYPE = 'text/event-stream';
+
+/** The event-stream success response of an operation, if it declares one. */
+function sseResponse(op: OperationModel): ResponseBodyModel | undefined {
+  return op.successResponses.find(
+    (r) => r.contentType.split(';')[0].trim().toLowerCase() === SSE_CONTENT_TYPE
+  );
+}
+
+/** Whether an operation streams Server-Sent Events. */
+export function isSseOp(op: OperationModel): boolean {
+  return sseResponse(op) !== undefined;
+}
+
+/** Split operations into the regular set and the SSE set, preserving order. */
+export function partitionOps(ops: OperationModel[]): {
+  regular: OperationModel[];
+  sse: OperationModel[];
+} {
+  const regular: OperationModel[] = [];
+  const sse: OperationModel[] = [];
+  for (const op of ops) (isSseOp(op) ? sse : regular).push(op);
+  return { regular, sse };
+}
+
+/** The per-event schema: `itemSchema` → the response `schema` → undefined (typeless slots skipped). */
+function eventSchema(op: OperationModel): SchemaModel | undefined {
+  const r = sseResponse(op);
+  if (!r) return undefined;
+  if (r.itemSchema && r.itemSchema.kind !== 'unknown') return r.itemSchema;
+  if (r.schema.kind !== 'unknown') return r.schema;
+  return undefined;
+}
+
+/** The TS type of a streamed event payload (`string` when no schema is declared). */
+export function sseEventType(op: OperationModel, dateType: DateType): ts.TypeNode {
+  const schema = eventSchema(op);
+  return schema
+    ? schemaToTypeNode(schema, dateType)
+    : factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
+}
+
+/** Whether the streamed `data:` payload should be `JSON.parse`d (`'json'`) or passed raw (`'text'`). */
+export function sseDataKind(op: OperationModel): 'json' | 'text' {
+  const schema = eventSchema(op);
+  if (!schema) return 'text';
+  return schema.kind === 'object' ||
+    schema.kind === 'ref' ||
+    schema.kind === 'array' ||
+    schema.kind === 'record' ||
+    schema.kind === 'union' ||
+    schema.kind === 'intersection'
+    ? 'json'
+    : 'text';
+}
+
+/** The barrel fragment export name carrying a tag/class's SSE members (functions facade, multi-file). */
+export function sseFragmentName(className: string): string {
+  return `__sse_${className}`;
+}
diff --git a/packages/openapi-typescript/src/emitters/support.ts b/packages/openapi-typescript/src/emitters/support.ts
new file mode 100644
index 0000000000..95df1a1d44
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/support.ts
@@ -0,0 +1,29 @@
+// Low-level text helpers shared by the structural emitters (types, operations,
+// auth) and the composition layer. Private to `emitters/` — never reached by
+// writers, which see only the `ClientModules` seam.
+
+/** Join non-empty code sections with blank lines and a trailing newline. */
+export function joinSections(sections: string[]): string {
+  return sections.filter((s) => s.length > 0).join('\n\n') + '\n';
+}
+
+/**
+ * Upper-case the first character of an operation name. We don't normalize the
+ * rest because almost every spec uses camelCase or PascalCase, and names that
+ * contain digits or `_` are passed through unchanged — the user named them that
+ * way for a reason.
+ *
+ * `op.name` reaches here already sanitized into a non-empty, valid TS identifier
+ * by the IR builder (see `ir/sanitize-identifiers.ts`), so no empty-string or
+ * unsafe-character guard is needed.
+ */
+export function pascalCase(name: string): string {
+  return name[0].toUpperCase() + name.slice(1);
+}
+
+export function splitLines(text: string): string[] {
+  return text
+    .replace(/\r\n/g, '\n')
+    .split('\n')
+    .map((line) => line.trimEnd());
+}
diff --git a/packages/openapi-typescript/src/emitters/swr.ts b/packages/openapi-typescript/src/emitters/swr.ts
new file mode 100644
index 0000000000..0ff8faee17
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/swr.ts
@@ -0,0 +1,215 @@
+// Emits an idiomatic SWR module wrapping the sdk operation functions. Per query
+// operation (GET/HEAD) a `<op>Key(vars)` tuple factory + a `use<Op>(vars, init?)`
+// hook returning `useSWR(key, fetcher)`; per mutation (everything else) a
+// `use<Op>()` hook returning `useSWRMutation(key, (key, { arg }) => <op>(arg))`.
+// The fetcher forwards args per the configured args style (grouped `<op>(vars, init)`
+// or flat `<op>(vars.petId, …, init)`) via the shared `operationSignature`, so the
+// call type-checks against the generated sdk.
+// `swr`/`swr/mutation` are the consumer's peer; the sdk stays dependency-free.
+// AST-native via `ts.factory`.
+
+import type { ApiModel, OperationModel } from '../ir/model.js';
+import { operationSignature } from './operation-signature.js';
+import { pascalCase } from './support.js';
+import {
+  arrow,
+  constArray,
+  exportConstStatement as exportConst,
+  printStatements,
+  ts,
+} from './ts.js';
+import {
+  hasInputs,
+  initParam,
+  isQuery,
+  variablesName,
+  varsParam,
+  wrappableOperations,
+} from './wrapper-support.js';
+
+const { factory } = ts;
+
+export type SwrOptions = {
+  /** Import specifier for the sdk entry the operation functions/types live in. */
+  sdkModule: string;
+  /** How the sdk function takes its inputs — must match the generated client. */
+  argsStyle: 'flat' | 'grouped';
+};
+
+/** Render the full SWR module source. `''` when there are no wrappable operations. */
+export function renderSwrModule(model: ApiModel, opts: SwrOptions): string {
+  const ops = wrappableOperations(model, 'swr');
+  if (ops.length === 0) return '';
+  return printStatements(swrStatements(ops, opts));
+}
+
+/** The SWR module statements: the import header followed by per-op hooks. */
+function swrStatements(ops: OperationModel[], opts: SwrOptions): ts.Statement[] {
+  const hasQuery = ops.some(isQuery);
+  const hasMutation = ops.some((op) => !isQuery(op));
+  const statements: ts.Statement[] = [];
+  for (const op of ops) {
+    statements.push(...(isQuery(op) ? queryStatements(op, opts) : [mutationStatement(op, opts)]));
+  }
+  return [...importHeader(ops, opts, hasQuery, hasMutation), ...statements];
+}
+
+/** An exported `function use<Op>(<params>) { <body> }` declaration. */
+function exportHook(
+  op: OperationModel,
+  params: ts.ParameterDeclaration[],
+  ret: ts.Expression
+): ts.Statement {
+  const name = `use${pascalCase(op.name)}`;
+  return factory.createFunctionDeclaration(
+    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+    undefined,
+    name,
+    undefined,
+    params,
+    undefined,
+    factory.createBlock([factory.createReturnStatement(ret)], true)
+  );
+}
+
+/**
+ * The forwarding call to the sdk operation function. Argument order comes from the
+ * shared `operationSignature`, so it lines up with the sdk's parameter list. `grouped`
+ * passes the source object (when inputs); `flat` spreads `<src>.<pathIdent>` (URL-template
+ * order), then `<src>.params`/`.body`/`.headers` for the slots the op has. `init` is
+ * appended last for queries (the sdk function's trailing `RequestOptions`).
+ */
+function sdkCall(
+  op: OperationModel,
+  opts: SwrOptions,
+  src: string,
+  withInit: boolean
+): ts.Expression {
+  const sig = operationSignature(op);
+  const source = factory.createIdentifier(src);
+  const args: ts.Expression[] = [];
+
+  if (opts.argsStyle === 'grouped') {
+    if (sig.hasInputs) args.push(source);
+  } else {
+    for (const { ident } of sig.pathParams) {
+      args.push(factory.createPropertyAccessExpression(source, ident));
+    }
+    if (sig.hasQuery) args.push(factory.createPropertyAccessExpression(source, 'params'));
+    if (sig.hasBody) args.push(factory.createPropertyAccessExpression(source, 'body'));
+    if (sig.hasHeaders) args.push(factory.createPropertyAccessExpression(source, 'headers'));
+  }
+  if (withInit) args.push(factory.createIdentifier('init'));
+
+  return factory.createCallExpression(factory.createIdentifier(op.name), undefined, args);
+}
+
+/** A query op's `<op>Key` factory + `use<Op>` hook calling `useSWR`. */
+function queryStatements(op: OperationModel, opts: SwrOptions): ts.Statement[] {
+  const inputs = hasInputs(op);
+  const keyId = factory.createStringLiteral(op.name);
+  const keyParams = inputs ? [varsParam(op)] : [];
+  const keyElements = inputs ? [keyId, factory.createIdentifier('vars')] : [keyId];
+  const key = exportConst(`${op.name}Key`, arrow(keyParams, constArray(keyElements)));
+
+  const keyCall = factory.createCallExpression(
+    factory.createIdentifier(`${op.name}Key`),
+    undefined,
+    inputs ? [factory.createIdentifier('vars')] : []
+  );
+  const useSwr = factory.createCallExpression(factory.createIdentifier('useSWR'), undefined, [
+    keyCall,
+    arrow([], sdkCall(op, opts, 'vars', true)),
+  ]);
+
+  const params = inputs ? [varsParam(op), initParam()] : [initParam()];
+  return [key, exportHook(op, params, useSwr)];
+}
+
+/** A mutation op's `use<Op>` hook calling `useSWRMutation`. */
+function mutationStatement(op: OperationModel, opts: SwrOptions): ts.Statement {
+  const inputs = hasInputs(op);
+  const key = factory.createStringLiteral(op.name);
+
+  // `(_key: string, { arg }: { arg: <Op>Variables }) => <op>(…arg)` when the op has inputs;
+  // a no-arg `() => <op>()` when it has none (`arg` would be unused).
+  const trigger = inputs ? triggerWithArg(op, opts) : arrow([], sdkCall(op, opts, 'arg', false));
+  const useSwrMutation = factory.createCallExpression(
+    factory.createIdentifier('useSWRMutation'),
+    undefined,
+    [key, trigger]
+  );
+  return exportHook(op, [], useSwrMutation);
+}
+
+/** `(_key: string, { arg }: { arg: <Op>Variables }) => <op>(…arg)`. */
+function triggerWithArg(op: OperationModel, opts: SwrOptions): ts.ArrowFunction {
+  const keyParam = factory.createParameterDeclaration(
+    undefined,
+    undefined,
+    '_key',
+    undefined,
+    factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)
+  );
+  const argParam = factory.createParameterDeclaration(
+    undefined,
+    undefined,
+    factory.createObjectBindingPattern([factory.createBindingElement(undefined, undefined, 'arg')]),
+    undefined,
+    factory.createTypeLiteralNode([
+      factory.createPropertySignature(
+        undefined,
+        'arg',
+        undefined,
+        factory.createTypeReferenceNode(variablesName(op))
+      ),
+    ])
+  );
+  return arrow([keyParam, argParam], sdkCall(op, opts, 'arg', false));
+}
+
+/**
+ * The import header: `useSWR` from `swr` (when any query op), `useSWRMutation` from
+ * `swr/mutation` (when any mutation op), and the wrapped opFns + referenced
+ * `<Op>Variables` types + `RequestOptions` (when any query) from the sdk module.
+ * Value specifiers then `type` specifiers, each group sorted.
+ */
+function importHeader(
+  ops: OperationModel[],
+  opts: SwrOptions,
+  hasQuery: boolean,
+  hasMutation: boolean
+): ts.Statement[] {
+  const imports: ts.Statement[] = [];
+  if (hasQuery) imports.push(defaultImport('useSWR', 'swr'));
+  if (hasMutation) imports.push(defaultImport('useSWRMutation', 'swr/mutation'));
+
+  const values = ops.map((op) => op.name).sort();
+  const types = ops.filter(hasInputs).map(variablesName).sort();
+  if (hasQuery) types.push('RequestOptions');
+
+  const specifiers = [
+    ...values.map((name) =>
+      factory.createImportSpecifier(false, undefined, factory.createIdentifier(name))
+    ),
+    ...types.map((name) =>
+      factory.createImportSpecifier(true, undefined, factory.createIdentifier(name))
+    ),
+  ];
+  const sdkImport = factory.createImportDeclaration(
+    undefined,
+    factory.createImportClause(false, undefined, factory.createNamedImports(specifiers)),
+    factory.createStringLiteral(opts.sdkModule)
+  );
+  imports.push(sdkImport);
+  return imports;
+}
+
+/** `import <name> from "<module>";` (default import). */
+function defaultImport(name: string, module: string): ts.Statement {
+  return factory.createImportDeclaration(
+    undefined,
+    factory.createImportClause(false, factory.createIdentifier(name), undefined),
+    factory.createStringLiteral(module)
+  );
+}
diff --git a/packages/openapi-typescript/src/emitters/tanstack-query.ts b/packages/openapi-typescript/src/emitters/tanstack-query.ts
new file mode 100644
index 0000000000..79b54f4279
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/tanstack-query.ts
@@ -0,0 +1,178 @@
+// Emits an idiomatic TanStack Query v5 (React) module wrapping the sdk operation
+// functions. Per query operation (GET/HEAD) a `<op>QueryKey(vars)` +
+// `<op>Options(vars, init?)` (`queryOptions({ queryKey, queryFn })`); per mutation
+// (everything else) a `<op>Mutation()` (`{ mutationKey, mutationFn }`). Each
+// factory forwards to the sdk function per the configured args style — grouped
+// (`getPet(vars, init)`) or flat (`getPet(vars.petId, vars.params, …, init)`),
+// matching `operations.ts` positional order so the call type-checks against the
+// generated sdk. AST-native via `ts.factory`.
+
+import type { ApiModel, OperationModel } from '../ir/model.js';
+import { operationSignature } from './operation-signature.js';
+import {
+  arrow,
+  constArray,
+  exportConstStatement as exportConst,
+  printStatements,
+  ts,
+} from './ts.js';
+import {
+  hasInputs,
+  initParam,
+  isQuery,
+  variablesName,
+  varsParam,
+  wrappableOperations,
+} from './wrapper-support.js';
+
+const { factory } = ts;
+
+export type TanstackOptions = {
+  argsStyle: 'flat' | 'grouped';
+  /** Import specifier for the sdk entry the operation functions/types live in. */
+  sdkModule: string;
+  /** TanStack adapter to import `queryOptions` from (`@tanstack/${framework}-query`). */
+  framework: 'react' | 'vue' | 'svelte' | 'solid';
+};
+
+/** Render the full TanStack Query module source. `''` when there are no wrappable operations. */
+export function renderTanstackModule(model: ApiModel, opts: TanstackOptions): string {
+  const ops = wrappableOperations(model, 'tanstack-query');
+  if (ops.length === 0) return '';
+  return printStatements(tanstackStatements(ops, opts));
+}
+
+/** The TanStack module statements: the import header followed by per-op factories. */
+function tanstackStatements(ops: OperationModel[], opts: TanstackOptions): ts.Statement[] {
+  const hasQuery = ops.some(isQuery);
+  const statements: ts.Statement[] = [];
+  for (const op of ops) {
+    statements.push(...(isQuery(op) ? queryStatements(op, opts) : [mutationStatement(op, opts)]));
+  }
+  return [...importHeader(ops, opts, hasQuery), ...statements];
+}
+
+/**
+ * The forwarding call to the sdk operation function. Argument order comes from the
+ * shared `operationSignature`, so it lines up with the sdk's parameter list by
+ * construction. `grouped` passes `vars` (when inputs) then `init` (query only); `flat`
+ * spreads `vars.<pathIdent>` (URL-template order), then `vars.params` / `vars.body` /
+ * `vars.headers` for the slots the op has, then `init` (query only).
+ */
+function sdkCall(op: OperationModel, opts: TanstackOptions, query: boolean): ts.Expression {
+  const sig = operationSignature(op);
+  const vars = factory.createIdentifier('vars');
+  const init = factory.createIdentifier('init');
+  const args: ts.Expression[] = [];
+
+  if (opts.argsStyle === 'grouped') {
+    if (sig.hasInputs) args.push(vars);
+  } else {
+    for (const { ident } of sig.pathParams) {
+      args.push(factory.createPropertyAccessExpression(vars, ident));
+    }
+    if (sig.hasQuery) args.push(factory.createPropertyAccessExpression(vars, 'params'));
+    if (sig.hasBody) args.push(factory.createPropertyAccessExpression(vars, 'body'));
+    if (sig.hasHeaders) args.push(factory.createPropertyAccessExpression(vars, 'headers'));
+  }
+  if (query) args.push(init);
+
+  return factory.createCallExpression(factory.createIdentifier(op.name), undefined, args);
+}
+
+/** A query op's `<op>QueryKey` + `<op>Options` statements. */
+function queryStatements(op: OperationModel, opts: TanstackOptions): ts.Statement[] {
+  const inputs = hasInputs(op);
+  const keyId = factory.createStringLiteral(op.name);
+  const keyParams = inputs ? [varsParam(op)] : [];
+  const keyElements = inputs ? [keyId, factory.createIdentifier('vars')] : [keyId];
+
+  const queryKey = exportConst(`${op.name}QueryKey`, arrow(keyParams, constArray(keyElements)));
+
+  const keyCall = factory.createCallExpression(
+    factory.createIdentifier(`${op.name}QueryKey`),
+    undefined,
+    inputs ? [factory.createIdentifier('vars')] : []
+  );
+  const queryOptionsCall = factory.createCallExpression(
+    factory.createIdentifier('queryOptions'),
+    undefined,
+    [
+      factory.createObjectLiteralExpression(
+        [
+          factory.createPropertyAssignment('queryKey', keyCall),
+          factory.createPropertyAssignment('queryFn', arrow([], sdkCall(op, opts, true))),
+        ],
+        true
+      ),
+    ]
+  );
+  const optionsParams = inputs ? [varsParam(op), initParam()] : [initParam()];
+  const options = exportConst(`${op.name}Options`, arrow(optionsParams, queryOptionsCall));
+
+  return [queryKey, options];
+}
+
+/** A mutation op's `<op>Mutation` statement. */
+function mutationStatement(op: OperationModel, opts: TanstackOptions): ts.Statement {
+  const inputs = hasInputs(op);
+  const mutationFn = arrow(inputs ? [varsParam(op)] : [], sdkCall(op, opts, false));
+
+  const obj = factory.createObjectLiteralExpression(
+    [
+      factory.createPropertyAssignment(
+        'mutationKey',
+        constArray([factory.createStringLiteral(op.name)])
+      ),
+      factory.createPropertyAssignment('mutationFn', mutationFn),
+    ],
+    true
+  );
+
+  // Wrap in parens so the arrow body is an object literal, not a block.
+  return exportConst(`${op.name}Mutation`, arrow([], factory.createParenthesizedExpression(obj)));
+}
+
+/**
+ * The import header: `queryOptions` from `@tanstack/${framework}-query` (when any
+ * query op), and the wrapped opFns + referenced `<Op>Variables` types + `RequestOptions`
+ * (when any query) from the sdk module. Value specifiers then `type` specifiers,
+ * each group sorted.
+ */
+function importHeader(
+  ops: OperationModel[],
+  opts: TanstackOptions,
+  hasQuery: boolean
+): ts.Statement[] {
+  const tanstack = factory.createImportDeclaration(
+    undefined,
+    factory.createImportClause(
+      false,
+      undefined,
+      factory.createNamedImports([
+        factory.createImportSpecifier(false, undefined, factory.createIdentifier('queryOptions')),
+      ])
+    ),
+    factory.createStringLiteral(`@tanstack/${opts.framework}-query`)
+  );
+
+  const values = ops.map((op) => op.name).sort();
+  const types = ops.filter(hasInputs).map(variablesName).sort();
+  if (hasQuery) types.push('RequestOptions');
+
+  const specifiers = [
+    ...values.map((name) =>
+      factory.createImportSpecifier(false, undefined, factory.createIdentifier(name))
+    ),
+    ...types.map((name) =>
+      factory.createImportSpecifier(true, undefined, factory.createIdentifier(name))
+    ),
+  ];
+  const sdkImport = factory.createImportDeclaration(
+    undefined,
+    factory.createImportClause(false, undefined, factory.createNamedImports(specifiers)),
+    factory.createStringLiteral(opts.sdkModule)
+  );
+
+  return hasQuery ? [tanstack, sdkImport] : [sdkImport];
+}
diff --git a/packages/openapi-typescript/src/emitters/transformers.ts b/packages/openapi-typescript/src/emitters/transformers.ts
new file mode 100644
index 0000000000..63d1d9df99
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/transformers.ts
@@ -0,0 +1,465 @@
+// Emits standalone Date-transformer functions from the IR. For each named
+// schema that (recursively) carries a `format: date-time`/`date` string field,
+// emits `export const transform<Name> = (data: <Name>): <Name> => { … };` that
+// walks the value and rewrites those wire ISO strings to `new Date(...)` in
+// place, so the runtime value matches the sdk's `--date-type Date` types.
+//
+// Pairs with the sdk generated under `dateType: 'Date'`; the client itself
+// stays zero-dep (Date is standard). Transformers compose across refs:
+// `transformPet` calls `transformPerson(data["owner"])` when `Pet.owner` is a
+// `Person` that has dates.
+
+import type { ApiModel, NamedSchemaModel, SchemaModel } from '../ir/model.js';
+import { safeIdent } from './identifier.js';
+import { pascalCase } from './support.js';
+import { arrow, exportConstStatement, printStatements, ts } from './ts.js';
+
+const { factory } = ts;
+
+/** `transform<Name>` — the function bound to a named schema. */
+function transformName(name: string): string {
+  return `transform${pascalCase(name)}`;
+}
+
+/** A scalar string with a `date-time`/`date` format — the leaf we convert. */
+function isDateScalar(schema: SchemaModel): boolean {
+  return (
+    schema.kind === 'scalar' &&
+    schema.scalar === 'string' &&
+    (schema.metadata?.format === 'date-time' || schema.metadata?.format === 'date')
+  );
+}
+
+/**
+ * Whether a schema contains a date leaf, following refs. `seen` guards ref
+ * cycles (a self-referential schema would otherwise recurse forever); a ref
+ * back into the visited set carries no *new* dates from here.
+ */
+function hasDates(
+  schema: SchemaModel,
+  byName: Map<string, SchemaModel>,
+  seen: Set<string>
+): boolean {
+  if (isDateScalar(schema)) return true;
+  switch (schema.kind) {
+    case 'array':
+      return hasDates(schema.items, byName, seen);
+    case 'record':
+      return hasDates(schema.value, byName, seen);
+    case 'object':
+      return schema.properties.some((p) => hasDates(p.schema, byName, seen));
+    case 'union':
+    case 'intersection':
+      return schema.members.some((m) => hasDates(m, byName, seen));
+    case 'ref': {
+      const target = byName.get(schema.name);
+      return target !== undefined && !seen.has(schema.name)
+        ? hasDates(target, byName, new Set(seen).add(schema.name))
+        : false;
+    }
+    default:
+      return false;
+  }
+}
+
+/** `<target>["key"]` — bracket access, robust for any (incl. non-identifier) key. */
+function index(target: ts.Expression, key: string): ts.ElementAccessExpression {
+  return factory.createElementAccessExpression(target, factory.createStringLiteral(key));
+}
+
+/** `new Date(<arg>)`. */
+function newDate(arg: ts.Expression): ts.Expression {
+  return factory.createNewExpression(factory.createIdentifier('Date'), undefined, [arg]);
+}
+
+/** `typeof <expr> === "string"`. */
+function isStringGuard(expr: ts.Expression): ts.Expression {
+  return factory.createBinaryExpression(
+    factory.createTypeOfExpression(expr),
+    factory.createToken(ts.SyntaxKind.EqualsEqualsEqualsToken),
+    factory.createStringLiteral('string')
+  );
+}
+
+/** `Array.isArray(<expr>)`. */
+function isArrayGuard(expr: ts.Expression): ts.Expression {
+  return factory.createCallExpression(
+    factory.createPropertyAccessExpression(factory.createIdentifier('Array'), 'isArray'),
+    undefined,
+    [expr]
+  );
+}
+
+/** `<expr> && typeof <expr> === "object"` — truthy and a (non-null) object. */
+function isObjectGuard(expr: ts.Expression): ts.Expression {
+  return factory.createBinaryExpression(
+    expr,
+    factory.createToken(ts.SyntaxKind.AmpersandAmpersandToken),
+    factory.createBinaryExpression(
+      factory.createTypeOfExpression(expr),
+      factory.createToken(ts.SyntaxKind.EqualsEqualsEqualsToken),
+      factory.createStringLiteral('object')
+    )
+  );
+}
+
+/** `<expr> as <Type>` — a type assertion, to satisfy a union-narrowing transform. */
+function asType(expr: ts.Expression, typeName: string): ts.Expression {
+  return factory.createAsExpression(expr, factory.createTypeReferenceNode(pascalCase(typeName)));
+}
+
+/** `if (<cond>) <then>;`. */
+function ifThen(cond: ts.Expression, then: ts.Statement): ts.Statement {
+  return factory.createIfStatement(cond, then);
+}
+
+function exprStatement(expr: ts.Expression): ts.Statement {
+  return factory.createExpressionStatement(expr);
+}
+
+/** `<target> = <value>;`. */
+function assign(target: ts.Expression, value: ts.Expression): ts.Statement {
+  return exprStatement(
+    factory.createBinaryExpression(target, factory.createToken(ts.SyntaxKind.EqualsToken), value)
+  );
+}
+
+/** `<recv>.<method>(<args>)`. */
+function method(recv: ts.Expression, name: string, args: ts.Expression[]): ts.Expression {
+  return factory.createCallExpression(
+    factory.createPropertyAccessExpression(recv, name),
+    undefined,
+    args
+  );
+}
+
+function param(name: string): ts.ParameterDeclaration {
+  return factory.createParameterDeclaration(undefined, undefined, name);
+}
+
+/** Next nested loop variable: `item`, `item2`, `item3`, … (avoids shadowing). */
+function nextItemVar(current: string): string {
+  if (current === 'data') return 'item';
+  return `item${Number(current.slice('item'.length)) + 1}`;
+}
+
+/**
+ * Conversion statements that, given the runtime value at `target` typed by
+ * `schema`, rewrite date leaves in place. Each branch self-gates by returning
+ * `[]` when nothing under it carries a date, so callers need no pre-check.
+ * `seen` follows refs and guards cycles; `itemVar` names nested loop variables.
+ *
+ * Covers the shapes a date can hide in: date scalars, arrays of them, refs to
+ * date-bearing schemas (composed via `transform<Ref>`), arrays of such refs,
+ * records, nested inline objects, and the date-bearing members of a
+ * union/intersection.
+ */
+function convert(
+  target: ts.Expression,
+  schema: SchemaModel,
+  byName: Map<string, SchemaModel>,
+  seen: Set<string>,
+  itemVar: string
+): ts.Statement[] {
+  if (isDateScalar(schema)) {
+    return [ifThen(isStringGuard(target), assign(target, newDate(target)))];
+  }
+  switch (schema.kind) {
+    case 'ref':
+      return convertRef(target, schema.name, byName, seen);
+    case 'object': {
+      const stmts: ts.Statement[] = [];
+      for (const p of schema.properties) {
+        stmts.push(...convertProperty(index(target, p.name), p.schema, byName, seen, itemVar));
+      }
+      return stmts;
+    }
+    case 'array':
+      return convertArray(target, schema.items, byName, seen, itemVar);
+    case 'record':
+      return convertCollection(target, schema.value, byName, seen, itemVar, true);
+    case 'intersection': {
+      // An intersection value satisfies *every* member type, so each member's
+      // transform applies directly to `target` with no narrowing needed.
+      const stmts: ts.Statement[] = [];
+      for (const m of schema.members) stmts.push(...convert(target, m, byName, seen, itemVar));
+      return stmts;
+    }
+    case 'union':
+      return convertUnion(target, schema.members, byName, seen, itemVar);
+    default:
+      return [];
+  }
+}
+
+/**
+ * A union position. A runtime value inhabits exactly one member, so we apply
+ * every date-bearing member's conversion to the same `target` and let the
+ * unmatched members' runtime guards no-op.
+ *
+ * Type-safety is the catch: `target` is typed as the whole union, so an
+ * object/ref member's `transform<Ref>(target)` would fail `--date-type Date`
+ * strict-tsc (TS2345). We therefore gate the object-shaped members behind a
+ * single `typeof target === "object"` check and CAST `target` to each member's
+ * type — the cast makes it compile, the cast target's own internal string
+ * guards make a wrong-member application a safe runtime no-op. Scalar date
+ * members keep their `typeof === "string"` guard (their type is `Date` under
+ * `--date-type Date`, so the assignment type-checks).
+ */
+function convertUnion(
+  target: ts.Expression,
+  members: SchemaModel[],
+  byName: Map<string, SchemaModel>,
+  seen: Set<string>,
+  itemVar: string
+): ts.Statement[] {
+  const stmts: ts.Statement[] = [];
+  const objectGuarded: ts.Statement[] = [];
+  for (const m of members) {
+    if (isDateScalar(m)) {
+      stmts.push(...convert(target, m, byName, seen, itemVar));
+    } else if (m.kind === 'ref') {
+      if (!hasDates(m, byName, seen)) continue;
+      objectGuarded.push(
+        exprStatement(
+          factory.createCallExpression(factory.createIdentifier(transformName(m.name)), undefined, [
+            asType(target, m.name),
+          ])
+        )
+      );
+    } else {
+      // Object/array/record members: recurse under the shared object guard.
+      objectGuarded.push(...convert(target, m, byName, seen, itemVar));
+    }
+  }
+  if (objectGuarded.length > 0) {
+    stmts.push(ifThen(isObjectGuard(target), factory.createBlock(objectGuarded, true)));
+  }
+  return stmts;
+}
+
+/**
+ * A ref position: `if (<target>) transform<Ref>(<target>);`, emitted only when
+ * the ref target carries dates (so the sibling transform exists).
+ */
+function convertRef(
+  target: ts.Expression,
+  name: string,
+  byName: Map<string, SchemaModel>,
+  seen: Set<string>
+): ts.Statement[] {
+  if (!hasDates({ kind: 'ref', name }, byName, seen)) return [];
+  const call = factory.createCallExpression(
+    factory.createIdentifier(transformName(name)),
+    undefined,
+    [target]
+  );
+  return [ifThen(target, exprStatement(call))];
+}
+
+/**
+ * A property position: a nested inline object guards presence and recurses
+ * inside a block; everything else (scalars, refs, arrays, …) delegates to
+ * `convert`, which guards itself.
+ */
+function convertProperty(
+  target: ts.Expression,
+  schema: SchemaModel,
+  byName: Map<string, SchemaModel>,
+  seen: Set<string>,
+  itemVar: string
+): ts.Statement[] {
+  if (schema.kind === 'ref') return convertRef(target, schema.name, byName, seen);
+  if (schema.kind === 'object') {
+    const inner = convert(target, schema, byName, seen, itemVar);
+    return inner.length === 0 ? [] : [ifThen(target, factory.createBlock(inner, true))];
+  }
+  return convert(target, schema, byName, seen, itemVar);
+}
+
+/**
+ * A "replace-by-value" element is one a transform must overwrite wholesale
+ * rather than mutate in place: a date scalar (`new Date(v)`) or an array of
+ * such elements (`v.map(...)`). Returns the expression that yields the replaced
+ * value for the element bound to `value`, or `null` when the element instead
+ * mutates in place (object/ref/record). Recurses for arrays-of-arrays.
+ *
+ * Reassigning a loop *variable* is a no-op, so date scalars (and arrays of
+ * them) can only be converted by reassigning their container slot — an array
+ * via `slot = slot.map(...)`, a record via per-key assignment. This builds the
+ * per-element value for those write-backs.
+ */
+function replacer(value: ts.Expression, element: SchemaModel, depth = 0): ts.Expression | null {
+  if (isDateScalar(element)) return newDate(value);
+  if (element.kind === 'array') {
+    // Map var for the level below: `v` over the scalar leaf, else `row`, `row2`,
+    // … per array level — distinct names by depth avoid shadowing. Yields
+    // `.map((v) => new Date(v))` and `.map((row) => row.map((v) => new Date(v)))`.
+    const varName = element.items.kind === 'array' ? rowVar(depth + 1) : 'v';
+    const inner = replacer(factory.createIdentifier(varName), element.items, depth + 1);
+    if (inner === null) return null;
+    return method(value, 'map', [arrow([param(varName)], inner)]);
+  }
+  return null;
+}
+
+/** Array map-var name by depth: `row`, `row2`, `row3`, … (avoids shadowing). */
+function rowVar(depth: number): string {
+  return depth <= 1 ? 'row' : `row${depth}`;
+}
+
+/** Conversions for `target` being an array whose elements are typed by `items`. */
+function convertArray(
+  target: ts.Expression,
+  items: SchemaModel,
+  byName: Map<string, SchemaModel>,
+  seen: Set<string>,
+  itemVar: string
+): ts.Statement[] {
+  // Date scalars / arrays-of-date-scalars are replace-by-value: map over the
+  // array and reassign the slot (reassigning a loop var would be lost).
+  const varName = items.kind === 'array' ? rowVar(1) : 'v';
+  const mapped = replacer(factory.createIdentifier(varName), items, 1);
+  if (mapped !== null) {
+    // `if (Array.isArray(t)) t = t.map((v) => new Date(v));`  (or nested `row`)
+    return [
+      ifThen(
+        isArrayGuard(target),
+        assign(target, method(target, 'map', [arrow([param(varName)], mapped)]))
+      ),
+    ];
+  }
+  if (items.kind === 'ref') {
+    if (!hasDates(items, byName, seen)) return [];
+    // `if (Array.isArray(t)) t.forEach(transformRef);`
+    const forEach = method(target, 'forEach', [
+      factory.createIdentifier(transformName(items.name)),
+    ]);
+    return [ifThen(isArrayGuard(target), exprStatement(forEach))];
+  }
+  return convertCollection(target, items, byName, seen, itemVar, false);
+}
+
+/**
+ * Iterate a collection (array or record) of mutate-in-place elements (objects,
+ * refs, records) and recurse with a fresh loop variable. Arrays iterate the
+ * value directly; records iterate `Object.values(...)`. `[]` when the element
+ * bears no dates.
+ *
+ * Replace-by-value elements (date scalars) never reach the array path here —
+ * `convertArray` handles them via map-and-reassign. A *record* of date scalars
+ * does land here: a `forEach` loop variable can't write back, so we iterate the
+ * keys and assign back into the record (`rec[k] = new Date(rec[k])`).
+ */
+function convertCollection(
+  target: ts.Expression,
+  element: SchemaModel,
+  byName: Map<string, SchemaModel>,
+  seen: Set<string>,
+  itemVar: string,
+  isRecord: boolean
+): ts.Statement[] {
+  if (isRecord) {
+    // Replace-by-value elements (date scalars, arrays of them) can't be written
+    // through a `forEach` loop var, so iterate the keys and assign back into the
+    // record slot. Date scalars are string-guarded; nested arrays array-guarded.
+    const slot = factory.createElementAccessExpression(target, factory.createIdentifier('__k'));
+    const replaced = replacer(slot, element);
+    if (replaced !== null) {
+      const guard = isDateScalar(element) ? isStringGuard(slot) : isArrayGuard(slot);
+      return [ifThen(target, keyLoop(target, ifThen(guard, assign(slot, replaced))))];
+    }
+  }
+  const next = nextItemVar(itemVar);
+  const body = convert(factory.createIdentifier(next), element, byName, seen, next);
+  if (body.length === 0) return [];
+  const iterable = isRecord
+    ? method(factory.createIdentifier('Object'), 'values', [target])
+    : target;
+  const forEach = method(iterable, 'forEach', [
+    arrow([param(next)], factory.createBlock(body, true)),
+  ]);
+  return [ifThen(isRecord ? target : isArrayGuard(target), exprStatement(forEach))];
+}
+
+/** `for (const __k of Object.keys(<target>)) <body>`. */
+function keyLoop(target: ts.Expression, body: ts.Statement): ts.Statement {
+  return factory.createForOfStatement(
+    undefined,
+    factory.createVariableDeclarationList(
+      [factory.createVariableDeclaration('__k')],
+      ts.NodeFlags.Const
+    ),
+    method(factory.createIdentifier('Object'), 'keys', [target]),
+    body
+  );
+}
+
+/** `export const transform<Name> = (data: <Name>): <Name> => { … };`. */
+function transformStatement(
+  named: NamedSchemaModel,
+  byName: Map<string, SchemaModel>
+): ts.Statement {
+  const typeName = pascalCase(named.name);
+  const data = factory.createIdentifier('data');
+  const body =
+    named.schema.kind === 'ref'
+      ? convertRef(data, named.schema.name, byName, new Set())
+      : convert(data, named.schema, byName, new Set(), 'data');
+  const fn = arrow(
+    [
+      factory.createParameterDeclaration(
+        undefined,
+        undefined,
+        'data',
+        undefined,
+        factory.createTypeReferenceNode(typeName)
+      ),
+    ],
+    factory.createBlock([...body, factory.createReturnStatement(data)], true)
+  );
+  const typed = factory.createArrowFunction(
+    fn.modifiers,
+    fn.typeParameters,
+    fn.parameters,
+    factory.createTypeReferenceNode(typeName),
+    fn.equalsGreaterThanToken,
+    fn.body
+  );
+  return exportConstStatement(transformName(named.name), typed);
+}
+
+/** `import type { <Name>, … } from "<module>";`. */
+function typeImport(names: string[], module: string): ts.Statement {
+  return factory.createImportDeclaration(
+    undefined,
+    factory.createImportClause(
+      true,
+      undefined,
+      factory.createNamedImports(
+        names.map((n) =>
+          factory.createImportSpecifier(false, undefined, factory.createIdentifier(safeIdent(n)))
+        )
+      )
+    ),
+    factory.createStringLiteral(module)
+  );
+}
+
+/**
+ * Render the transformers module. Emits one `transform<Name>` per named schema
+ * that carries a date field; `''` when none do. `opts.sdkModule` is the import
+ * specifier the schema TYPES are pulled from (the transformers call each other
+ * as siblings, so only the types need importing).
+ */
+export function renderTransformersModule(model: ApiModel, opts: { sdkModule: string }): string {
+  const byName = new Map(model.schemas.map((s) => [s.name, s.schema]));
+  const dated = model.schemas.filter((s) => hasDates(s.schema, byName, new Set()));
+  if (dated.length === 0) return '';
+  const types = dated.map((s) => pascalCase(s.name));
+  const statements = [
+    typeImport(types, opts.sdkModule),
+    ...dated.map((s) => transformStatement(s, byName)),
+  ];
+  return printStatements(statements);
+}
diff --git a/packages/openapi-typescript/src/emitters/ts.ts b/packages/openapi-typescript/src/emitters/ts.ts
new file mode 100644
index 0000000000..2bd28b1426
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/ts.ts
@@ -0,0 +1,147 @@
+// Foundation for AST-based code emission: a shared TypeScript printer plus
+// `ts.factory` ergonomics. Emitters build `ts.Node`s and print them through
+// `printNodes`; hand-authored reference TypeScript is embedded via
+// `parseStatements`. The compiler (`ts`) is re-exported so emitters import the
+// factory from one place.
+
+import ts from 'typescript';
+
+export { ts };
+
+const printer = ts.createPrinter({
+  newLine: ts.NewLineKind.LineFeed,
+  removeComments: false,
+});
+
+const blankFile = ts.createSourceFile('', '', ts.ScriptTarget.Latest, false, ts.ScriptKind.TS);
+
+/** Print a list of nodes to source, tight (one per line) — for import/export groups and single nodes. */
+export function printNodes(nodes: readonly ts.Node[]): string {
+  return nodes.map(printOne).join('\n');
+}
+
+/** Print top-level declarations separated by one blank line, for readable declaration bodies. */
+export function printStatements(nodes: readonly ts.Node[]): string {
+  return nodes.map(printOne).join('\n\n');
+}
+
+function printOne(node: ts.Node): string {
+  return printer.printNode(ts.EmitHint.Unspecified, node, sourceFileOf(node));
+}
+
+// Synthesized (`ts.factory`) nodes have no parent chain — print them against the
+// shared blank file. Parsed nodes (from `parseStatements`, built with parent
+// nodes set) must print against their own source so literal token text survives.
+function sourceFileOf(node: ts.Node): ts.SourceFile {
+  let current: ts.Node | undefined = node;
+  while (current) {
+    if (ts.isSourceFile(current)) return current;
+    current = current.parent;
+  }
+  return blankFile;
+}
+
+/** Parse a source string into its top-level statements (for embedding hand-authored code). */
+export function parseStatements(source: string): ts.Statement[] {
+  return [
+    ...ts.createSourceFile('__embed.ts', source, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS)
+      .statements,
+  ];
+}
+
+/** Parse a single source expression into a ts.Expression (for emitting generator-authored
+ *  expressions like `new Blob([])` that aren't plain data literals). */
+export function parseExpression(source: string): ts.Expression {
+  const stmt = ts.createSourceFile(
+    '__expr.ts',
+    `(${source});`,
+    ts.ScriptTarget.Latest,
+    true,
+    ts.ScriptKind.TS
+  ).statements[0];
+  const parenthesized = (stmt as ts.ExpressionStatement).expression as ts.ParenthesizedExpression;
+  return parenthesized.expression;
+}
+
+/**
+ * Attach a block JSDoc leading comment to `node` so it prints as a `/** … *​/`
+ * block above the node. Multi-line `text` becomes `*`-prefixed lines.
+ */
+export function jsdoc<T extends ts.Node>(node: T, text: string): T {
+  // Neutralize any embedded `*/` here, at the single choke point every JSDoc block
+  // flows through: a spec-supplied description/summary/title containing `*/` would
+  // otherwise close the comment early and turn the rest into live code (injection).
+  const body = `*\n${escapeJsDoc(text)
+    .split('\n')
+    .map((line) => ` * ${line}`.replace(/ +$/, ''))
+    .join('\n')}\n `;
+  return ts.addSyntheticLeadingComment(node, ts.SyntaxKind.MultiLineCommentTrivia, body, true);
+}
+
+/** Backslash-escape any comment-closing star-slash so it cannot terminate a block comment. */
+export function escapeJsDoc(text: string): string {
+  return text.replace(/\*\//g, '*\\/');
+}
+
+const { factory } = ts;
+
+/**
+ * Shared `ts.factory` builders for the handful of node shapes every emitter was
+ * re-implementing locally (variable statements, arrow functions, `as const`
+ * arrays). Centralizing them keeps emitters terse and their output identical.
+ */
+
+/** A `const`/`let` variable statement: `[export] const|let <name>[: type] = <init>;`. */
+function variableStatement(
+  flag: ts.NodeFlags.Const | ts.NodeFlags.Let,
+  name: string,
+  init: ts.Expression,
+  opts: { type?: ts.TypeNode; export?: boolean }
+): ts.Statement {
+  return factory.createVariableStatement(
+    opts.export ? [factory.createModifier(ts.SyntaxKind.ExportKeyword)] : undefined,
+    factory.createVariableDeclarationList(
+      [factory.createVariableDeclaration(name, undefined, opts.type, init)],
+      flag
+    )
+  );
+}
+
+/** `const <name>[: type] = <init>;` */
+export function constStatement(
+  name: string,
+  init: ts.Expression,
+  type?: ts.TypeNode
+): ts.Statement {
+  return variableStatement(ts.NodeFlags.Const, name, init, { type });
+}
+
+/** `export const <name> = <init>;` */
+export function exportConstStatement(name: string, init: ts.Expression): ts.Statement {
+  return variableStatement(ts.NodeFlags.Const, name, init, { export: true });
+}
+
+/** `let <name>[: type] = <init>;` */
+export function letStatement(name: string, init: ts.Expression, type?: ts.TypeNode): ts.Statement {
+  return variableStatement(ts.NodeFlags.Let, name, init, { type });
+}
+
+/** An arrow function `(<params>) => <body>` (no explicit return type). */
+export function arrow(params: ts.ParameterDeclaration[], body: ts.ConciseBody): ts.ArrowFunction {
+  return factory.createArrowFunction(
+    undefined,
+    undefined,
+    params,
+    undefined,
+    factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
+    body
+  );
+}
+
+/** `[<elements…>] as const`. */
+export function constArray(elements: ts.Expression[]): ts.Expression {
+  return factory.createAsExpression(
+    factory.createArrayLiteralExpression(elements, false),
+    factory.createTypeReferenceNode('const')
+  );
+}
diff --git a/packages/openapi-typescript/src/emitters/type-guards.ts b/packages/openapi-typescript/src/emitters/type-guards.ts
new file mode 100644
index 0000000000..c23fdf376c
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/type-guards.ts
@@ -0,0 +1,250 @@
+import type { DiscriminatorModel, NamedSchemaModel, SchemaModel } from '../ir/model.js';
+import { jsdoc, ts } from './ts.js';
+
+/**
+ * A discriminated union we can emit guards for, found while walking the schema
+ * tree. `makeParamType` builds the guard's `value` parameter type — the named
+ * union for a top-level union (`MenuItem`), or the inline member union for one
+ * nested inside another schema (`SuccessItem | ErrorItem`). `label` is the same,
+ * rendered for the JSDoc line. A thunk (not a cached node) avoids reusing one
+ * `ts.TypeNode` across the several guard declarations a site produces.
+ */
+type UnionSite = {
+  union: Extract<SchemaModel, { kind: 'union' }>;
+  label: string;
+  makeParamType: () => ts.TypeNode;
+};
+
+/**
+ * Emit `is<Member>(value): value is <Member>` type guards for every discriminated
+ * union with a usable discriminator — whether it is a top-level named schema
+ * (`MenuItem = A | B`) or nested inside one (e.g. the `items` of an array, the
+ * value of a property). Two discriminator sources:
+ *
+ * - Explicit: the union carries a `discriminator` (built from the spec).
+ * - Implicit: no discriminator, but every member is a ref to a named schema and
+ *   they all constrain one shared property to a distinct string `const`.
+ *
+ * Nested unions only qualify when every member is a ref to a named schema, so the
+ * `value` parameter is a clean union of exported types. Guard names are globally
+ * deduped (`is<Member>`), keeping the first in document order — so a top-level
+ * union wins its nicer `value: <UnionName>` parameter over a nested re-occurrence.
+ * Undiscriminated unions are skipped — TypeScript can't soundly narrow them.
+ */
+/** The type-guard function declarations as nodes (empty when no union narrows). */
+export function typeGuardStatements(schemas: NamedSchemaModel[]): ts.FunctionDeclaration[] {
+  const byName = new Map(schemas.map((s) => [s.name, s.schema] as const));
+  const nodes: ts.FunctionDeclaration[] = [];
+  const emitted = new Set<string>();
+
+  for (const named of schemas) {
+    for (const site of collectUnionSites(named)) {
+      const discriminator = site.union.discriminator ?? detectImplicitDiscriminator(site.union, byName);
+      if (!discriminator) continue;
+
+      // Group discriminant values by target schema so two mapping keys pointing at
+      // the same type produce one guard (a duplicate `is<Name>` would not compile).
+      const valuesByTarget = new Map<string, string[]>();
+      for (const entry of discriminator.mapping) {
+        if (!byName.has(entry.schemaName)) continue;
+        const existing = valuesByTarget.get(entry.schemaName);
+        if (existing) existing.push(entry.value);
+        else valuesByTarget.set(entry.schemaName, [entry.value]);
+      }
+
+      for (const [schemaName, values] of valuesByTarget) {
+        const guardName = `is${schemaName}`;
+        if (emitted.has(guardName)) continue;
+        emitted.add(guardName);
+        nodes.push(
+          buildTypeGuard(site.makeParamType(), site.label, discriminator.propertyName, schemaName, values)
+        );
+      }
+    }
+  }
+
+  return nodes;
+}
+
+const { factory } = ts;
+
+/**
+ * The discriminated-union sites reachable from a named schema, in a stable order:
+ * the schema itself (when it is a union), then any nested unions found by walking
+ * its tree. A top-level union keeps its name as the guard parameter; nested unions
+ * use their inline member union.
+ */
+function collectUnionSites(named: NamedSchemaModel): UnionSite[] {
+  const sites: UnionSite[] = [];
+  const root = named.schema;
+  if (root.kind === 'union') {
+    sites.push({
+      union: root,
+      label: named.name,
+      makeParamType: () => factory.createTypeReferenceNode(named.name),
+    });
+    for (const member of root.members) collectNestedSites(member, sites);
+  } else {
+    collectNestedSites(root, sites);
+  }
+  return sites;
+}
+
+/** Walk a schema subtree, recording each nested all-named-ref union as a site. */
+function collectNestedSites(schema: SchemaModel, sites: UnionSite[]): void {
+  switch (schema.kind) {
+    case 'union': {
+      const names = schema.members.map((m) => (m.kind === 'ref' ? m.name : undefined));
+      if (names.every((n): n is string => n !== undefined)) {
+        sites.push({
+          union: schema,
+          label: names.join(' | '),
+          makeParamType: () =>
+            factory.createUnionTypeNode(names.map((n) => factory.createTypeReferenceNode(n))),
+        });
+      }
+      for (const member of schema.members) collectNestedSites(member, sites);
+      break;
+    }
+    case 'array':
+      collectNestedSites(schema.items, sites);
+      break;
+    case 'record':
+      collectNestedSites(schema.value, sites);
+      break;
+    case 'object':
+      for (const prop of schema.properties) collectNestedSites(prop.schema, sites);
+      break;
+    case 'intersection':
+      for (const member of schema.members) collectNestedSites(member, sites);
+      break;
+    // scalar / literal / enum / ref / null / unknown / omit have no nested unions.
+  }
+}
+
+/** `(value as Record<string, unknown>)[<prop>]` — the narrowed property access. */
+function propertyAccess(propertyName: string): ts.Expression {
+  const recordType = factory.createTypeReferenceNode('Record', [
+    factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+    factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword),
+  ]);
+  return factory.createElementAccessExpression(
+    factory.createAsExpression(factory.createIdentifier('value'), recordType),
+    factory.createStringLiteral(propertyName)
+  );
+}
+
+function buildTypeGuard(
+  paramType: ts.TypeNode,
+  unionLabel: string,
+  propertyName: string,
+  schemaName: string,
+  values: string[]
+): ts.FunctionDeclaration {
+  const access = propertyAccess(propertyName);
+  const check =
+    values.length === 1
+      ? factory.createBinaryExpression(
+          access,
+          factory.createToken(ts.SyntaxKind.EqualsEqualsEqualsToken),
+          factory.createStringLiteral(values[0])
+        )
+      : // `([...values] as readonly unknown[]).includes(<access>)`
+        factory.createCallExpression(
+          factory.createPropertyAccessExpression(
+            factory.createParenthesizedExpression(
+              factory.createAsExpression(
+                factory.createArrayLiteralExpression(
+                  values.map((v) => factory.createStringLiteral(v))
+                ),
+                factory.createTypeOperatorNode(
+                  ts.SyntaxKind.ReadonlyKeyword,
+                  factory.createArrayTypeNode(
+                    factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword)
+                  )
+                )
+              )
+            ),
+            'includes'
+          ),
+          undefined,
+          [access]
+        );
+
+  const fn = factory.createFunctionDeclaration(
+    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+    undefined,
+    `is${schemaName}`,
+    undefined,
+    [
+      factory.createParameterDeclaration(undefined, undefined, 'value', undefined, paramType),
+    ],
+    factory.createTypePredicateNode(
+      undefined,
+      'value',
+      factory.createTypeReferenceNode(schemaName)
+    ),
+    factory.createBlock([factory.createReturnStatement(check)], true)
+  );
+
+  return jsdoc(
+    fn,
+    `Narrow a \`${unionLabel}\` to \`${schemaName}\` via its \`${propertyName}\` discriminant.`
+  );
+}
+
+/**
+ * Detect an implicit discriminator: every member is a ref to a named schema,
+ * and they all pin one shared property to a distinct string literal. Returns
+ * `undefined` if no such property exists (so the union is left without guards).
+ */
+function detectImplicitDiscriminator(
+  union: Extract<SchemaModel, { kind: 'union' }>,
+  byName: Map<string, SchemaModel>
+): DiscriminatorModel | undefined {
+  const memberNames: string[] = [];
+  for (const member of union.members) {
+    if (member.kind !== 'ref') return undefined;
+    const target = byName.get(member.name);
+    if (!target) return undefined;
+    memberNames.push(member.name);
+  }
+  if (memberNames.length < 2) return undefined;
+
+  const literalsPerMember = memberNames.map((name) => literalPropsOf(byName.get(name)!));
+
+  for (const propName of Object.keys(literalsPerMember[0])) {
+    if (!literalsPerMember.every((props) => propName in props)) continue;
+    const values = literalsPerMember.map((props) => props[propName]);
+    if (!values.every((v): v is string => typeof v === 'string')) continue;
+    if (new Set(values).size !== values.length) continue;
+    return {
+      propertyName: propName,
+      mapping: memberNames.map((name, i) => ({
+        value: values[i] as string,
+        schemaName: name,
+      })),
+    };
+  }
+  return undefined;
+}
+
+/**
+ * Collect a schema's literal-valued properties (name → const value), descending
+ * through `intersection` members (the shape `allOf` produces). Only inline
+ * object/intersection members are inspected; nested refs are not resolved.
+ */
+function literalPropsOf(schema: SchemaModel): Record<string, string | number | boolean> {
+  const out: Record<string, string | number | boolean> = {};
+  const collect = (s: SchemaModel): void => {
+    if (s.kind === 'object') {
+      for (const prop of s.properties) {
+        if (prop.schema.kind === 'literal') out[prop.name] = prop.schema.value;
+      }
+    } else if (s.kind === 'intersection') {
+      for (const member of s.members) collect(member);
+    }
+  };
+  collect(schema);
+  return out;
+}
diff --git a/packages/openapi-typescript/src/emitters/types.ts b/packages/openapi-typescript/src/emitters/types.ts
new file mode 100644
index 0000000000..486716c3be
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/types.ts
@@ -0,0 +1,222 @@
+import type {
+  NamedSchemaModel,
+  PropertyModel,
+  ScalarKind,
+  SchemaMetadata,
+  SchemaModel,
+} from '../ir/model.js';
+import { isIdentifier, safeIdent } from './identifier.js';
+import { jsdocText } from './jsdoc.js';
+import { jsdoc, printNodes, ts } from './ts.js';
+
+const { factory } = ts;
+
+/**
+ * How named string enums are emitted:
+ * - `'union'`: only the string-literal union type (`type X = "a" | "b"`).
+ * - `'const-object'`: the union type *and* a sibling
+ *   `export const X = { a: "a", b: "b" } as const;` so callers can reference
+ *   the values at runtime (`X.a`).
+ */
+export type EnumStyle = 'union' | 'const-object';
+
+/**
+ * How `format: date-time`/`date` string fields are typed:
+ * - `'string'` (default): the wire shape — an ISO string.
+ * - `'Date'`: a `Date` reference. Opt-in; pair with the `transformers` generator
+ *   so the runtime value matches (the client stays zero-dep — `Date` is standard).
+ */
+export type DateType = 'string' | 'Date';
+
+/** The model type aliases (and const-object enum companions) as nodes. */
+export function typesStatements(
+  schemas: NamedSchemaModel[],
+  enumStyle: EnumStyle,
+  dateType: DateType = 'string'
+): ts.Statement[] {
+  const nodes: ts.Statement[] = [];
+  for (const s of schemas) {
+    nodes.push(
+      jsdocOn(
+        factory.createTypeAliasDeclaration(
+          [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+          s.name,
+          undefined,
+          schemaToTypeNode(s.schema, dateType)
+        ),
+        s.schema.description ?? s.description,
+        s.schema.metadata
+      )
+    );
+    if (enumStyle === 'const-object') {
+      const constObject = enumConstObject(s);
+      if (constObject) nodes.push(constObject);
+    }
+  }
+  return nodes;
+}
+
+/**
+ * For a named **string** enum, build a runtime companion
+ * `export const X = { a: "a", … } as const;` that cohabits with the same-named
+ * type (TypeScript allows a type and value to share an identifier). This lets
+ * callers reference values at runtime (`X.a`) instead of retyping literals.
+ *
+ * Returns `undefined` (so only the type union is emitted) when:
+ * - the schema isn't a string enum (integer/boolean enums gain nothing), or
+ * - any value isn't a valid JS identifier (e.g. `"menu:read"`) — we don't emit
+ *   a half-usable object with quoted keys.
+ */
+function enumConstObject(named: NamedSchemaModel): ts.VariableStatement | undefined {
+  const schema = named.schema;
+  if (schema.kind !== 'enum' || schema.scalar !== 'string') return undefined;
+  if (!schema.values.every((v) => typeof v === 'string' && isIdentifier(v))) return undefined;
+
+  const object = factory.createObjectLiteralExpression(
+    schema.values.map((v) =>
+      factory.createPropertyAssignment(v as string, factory.createStringLiteral(v as string))
+    ),
+    true
+  );
+  return factory.createVariableStatement(
+    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+    factory.createVariableDeclarationList(
+      [
+        factory.createVariableDeclaration(
+          named.name,
+          undefined,
+          undefined,
+          factory.createAsExpression(object, factory.createTypeReferenceNode('const'))
+        ),
+      ],
+      ts.NodeFlags.Const
+    )
+  );
+}
+
+export function renderSchema(schema: SchemaModel, dateType: DateType = 'string'): string {
+  return printNodes([schemaToTypeNode(schema, dateType)]);
+}
+
+/** Build the TypeScript type node for an IR schema. */
+export function schemaToTypeNode(schema: SchemaModel, dateType: DateType = 'string'): ts.TypeNode {
+  switch (schema.kind) {
+    case 'scalar':
+      return scalarTypeNode(schema.scalar, schema.metadata, dateType);
+    case 'ref':
+      return factory.createTypeReferenceNode(schema.name);
+    case 'literal':
+      return factory.createLiteralTypeNode(literalExpression(schema.value));
+    case 'enum': {
+      const members = schema.values.map((v) => factory.createLiteralTypeNode(literalExpression(v)));
+      // A single-value enum is just that literal — wrapping it in a one-member
+      // union would make the printer parenthesize it inside `T[]` (`("a")[]`).
+      return members.length === 1 ? members[0] : factory.createUnionTypeNode(members);
+    }
+    case 'null':
+      return factory.createLiteralTypeNode(factory.createNull());
+    case 'unknown':
+      return factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
+    case 'array':
+      // The printer parenthesizes union/intersection element types itself
+      // (`(string | null)[]`), so just hand it the element node.
+      return factory.createArrayTypeNode(schemaToTypeNode(schema.items, dateType));
+    case 'record':
+      return factory.createTypeReferenceNode('Record', [
+        factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+        schemaToTypeNode(schema.value, dateType),
+      ]);
+    case 'object':
+      return factory.createTypeLiteralNode(
+        schema.properties.map((p) => propertySignature(p, dateType))
+      );
+    case 'union':
+      return factory.createUnionTypeNode(schema.members.map((m) => schemaToTypeNode(m, dateType)));
+    case 'intersection':
+      return factory.createIntersectionTypeNode(
+        schema.members.map((m) => schemaToTypeNode(m, dateType))
+      );
+    case 'omit':
+      return factory.createTypeReferenceNode('Omit', [
+        factory.createTypeReferenceNode(schema.base),
+        factory.createUnionTypeNode(
+          schema.keys.map((k) => factory.createLiteralTypeNode(factory.createStringLiteral(k)))
+        ),
+      ]);
+  }
+}
+
+function propertySignature(p: PropertyModel, dateType: DateType): ts.PropertySignature {
+  // `readOnly` (server-managed) props get the `readonly` modifier so consumer
+  // write-type utilities (OmitReadOnly<T>) can strip them and assignment is
+  // flagged. Request-body types already drop these via `Omit` in the IR.
+  const modifiers = p.readOnly
+    ? [factory.createModifier(ts.SyntaxKind.ReadonlyKeyword)]
+    : undefined;
+  const sig = factory.createPropertySignature(
+    modifiers,
+    propertyName(p.name),
+    p.required ? undefined : factory.createToken(ts.SyntaxKind.QuestionToken),
+    schemaToTypeNode(p.schema, dateType)
+  );
+  return jsdocOn(sig, p.description, p.schema.metadata);
+}
+
+/** A property name: a bare identifier when valid, a quoted string literal otherwise. */
+function propertyName(name: string): ts.PropertyName {
+  const safe = safeIdent(name);
+  return safe === name ? factory.createIdentifier(name) : factory.createStringLiteral(name);
+}
+
+function literalExpression(
+  value: string | number | boolean
+): ts.LiteralExpression | ts.BooleanLiteral | ts.PrefixUnaryExpression {
+  if (typeof value === 'string') return factory.createStringLiteral(value);
+  if (typeof value === 'boolean') return value ? factory.createTrue() : factory.createFalse();
+  return value < 0
+    ? factory.createPrefixUnaryExpression(
+        ts.SyntaxKind.MinusToken,
+        factory.createNumericLiteral(-value)
+      )
+    : factory.createNumericLiteral(value);
+}
+
+function scalarTypeNode(
+  kind: ScalarKind,
+  metadata: SchemaMetadata | undefined,
+  dateType: DateType
+): ts.TypeNode {
+  switch (kind) {
+    case 'string':
+      // `format: binary` is raw byte content (file uploads / octet-stream), not text —
+      // surface it as `Blob` (the web standard; a `File` is assignable to it). `byte`
+      // (base64) stays a `string`.
+      if (metadata?.format === 'binary') {
+        return factory.createTypeReferenceNode('Blob');
+      }
+      // Opt-in: a `date-time`/`date` string surfaces as `Date` under `dateType:
+      // 'Date'`; everything else (and the default) stays the `string` keyword.
+      if (
+        dateType === 'Date' &&
+        (metadata?.format === 'date-time' || metadata?.format === 'date')
+      ) {
+        return factory.createTypeReferenceNode('Date');
+      }
+      return factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
+    case 'number':
+    case 'integer':
+      return factory.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword);
+    case 'boolean':
+      return factory.createKeywordTypeNode(ts.SyntaxKind.BooleanKeyword);
+  }
+}
+
+/** Attach a JSDoc block (description + metadata tags) to `node`, if any. */
+function jsdocOn<T extends ts.Node>(
+  node: T,
+  text: string | undefined,
+  metadata?: SchemaMetadata
+): T {
+  const body = jsdocText(text, metadata);
+  return body === undefined ? node : jsdoc(node, body);
+}
diff --git a/packages/openapi-typescript/src/emitters/wrapper-support.ts b/packages/openapi-typescript/src/emitters/wrapper-support.ts
new file mode 100644
index 0000000000..d29108eaac
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/wrapper-support.ts
@@ -0,0 +1,91 @@
+// Shared support for the data-fetching wrapper generators (`swr`, `tanstack-query`).
+// Both wrap the sdk's exported operation functions, so they agree on which operations
+// are wrappable and on the `vars`/`init` parameter shape. Keeping that agreement in one
+// place stops the two emitters from drifting (and makes a third adapter cheap). The
+// per-operation factory/hook bodies stay in each emitter — only the cross-cutting
+// calling-convention pieces live here.
+
+import { logger } from '@redocly/openapi-core';
+
+import type { ApiModel, OperationModel } from '../ir/model.js';
+import { operationSignature } from './operation-signature.js';
+import { isSseOp } from './sse.js';
+import { ts } from './ts.js';
+
+const { factory } = ts;
+
+/**
+ * The operations a wrapper generator can wrap, with skips reported to the user under
+ * `label` (the generator name). Two kinds are dropped:
+ *
+ * - **SSE operations** — the sdk emits these as a private `sse.*` async-iterator surface,
+ *   not exported request/response functions, so there is nothing to wrap.
+ * - **`<Op>Variables` name collisions** — a wrapper types its inputs as the sdk's
+ *   `<Op>Variables`; when that name collides with a schema the sdk suppresses the alias,
+ *   so the import would resolve to the schema (a wrong/broken type). The sdk function still
+ *   works; renaming the schema or the operation restores the wrapper.
+ */
+export function wrappableOperations(model: ApiModel, label: string): OperationModel[] {
+  const all = model.services.flatMap((s) => s.operations);
+  const sse = all.filter(isSseOp);
+  if (sse.length > 0) {
+    logger.warn(
+      `generate-client: ${label} skipped ${sse.length} server-sent-events operation(s) — consume them via the sdk \`sse.*\` surface: ${sse
+        .map((op) => op.name)
+        .join(', ')}.\n`
+    );
+  }
+  const schemaNames = new Set(model.schemas.map((s) => s.name));
+  const clashing = all.filter((op) => !isSseOp(op) && collides(op, schemaNames));
+  if (clashing.length > 0) {
+    logger.warn(
+      `generate-client: ${label} skipped ${clashing.length} operation(s) whose variables type name collides with a schema — rename the schema or the operation: ${clashing
+        .map((op) => op.name)
+        .join(', ')}.\n`
+    );
+  }
+  return all.filter((op) => !isSseOp(op) && !collides(op, schemaNames));
+}
+
+/** Whether the operation's `<Op>Variables` type name collides with a named schema. */
+function collides(op: OperationModel, schemaNames: Set<string>): boolean {
+  const sig = operationSignature(op);
+  return sig.hasInputs && schemaNames.has(sig.variablesTypeName);
+}
+
+/** Query operations are the safe, cacheable methods. Everything else is a mutation. */
+export function isQuery(op: OperationModel): boolean {
+  return op.method === 'get' || op.method === 'head';
+}
+
+/** Whether the operation has any inputs — i.e. a `<Op>Variables` type exists in the sdk. */
+export function hasInputs(op: OperationModel): boolean {
+  return operationSignature(op).hasInputs;
+}
+
+/** The operation's `<Op>Variables` type name (the sdk's grouped-input alias). */
+export function variablesName(op: OperationModel): string {
+  return operationSignature(op).variablesTypeName;
+}
+
+/** A `vars: <Op>Variables` parameter. */
+export function varsParam(op: OperationModel): ts.ParameterDeclaration {
+  return factory.createParameterDeclaration(
+    undefined,
+    undefined,
+    'vars',
+    undefined,
+    factory.createTypeReferenceNode(variablesName(op))
+  );
+}
+
+/** An `init?: RequestOptions` parameter. */
+export function initParam(): ts.ParameterDeclaration {
+  return factory.createParameterDeclaration(
+    undefined,
+    undefined,
+    'init',
+    factory.createToken(ts.SyntaxKind.QuestionToken),
+    factory.createTypeReferenceNode('RequestOptions')
+  );
+}
diff --git a/packages/openapi-typescript/src/emitters/zod.ts b/packages/openapi-typescript/src/emitters/zod.ts
new file mode 100644
index 0000000000..dcd2a710a1
--- /dev/null
+++ b/packages/openapi-typescript/src/emitters/zod.ts
@@ -0,0 +1,268 @@
+// Emits Zod schemas from the IR. Each named schema becomes an
+// `export const <Name>Schema = z.<…>;` built with `ts.factory`, mirroring the
+// type emitter (`types.ts`) but targeting runtime validators instead of types.
+//
+// Only the refinement methods stable across zod 3.23 and 4 are emitted
+// (`.min/.max/.int/.gt/.lt/.regex`); format helpers (`.email/.uuid/.url`) diverge
+// between major versions and are deferred. Refs become `z.lazy(() => …Schema)`,
+// which sidesteps declaration ordering and recursion uniformly.
+
+import type {
+  NamedSchemaModel,
+  PropertyModel,
+  ScalarKind,
+  SchemaMetadata,
+  SchemaModel,
+} from '../ir/model.js';
+import { safeIdent } from './identifier.js';
+import { pascalCase } from './support.js';
+import { printStatements, ts } from './ts.js';
+
+const { factory } = ts;
+
+/** `<Name>Schema` — the const identifier a named schema is bound to. */
+function schemaConstName(name: string): string {
+  return `${pascalCase(name)}Schema`;
+}
+
+/** `z` member access: `z.<method>`. */
+function zMember(method: string): ts.Expression {
+  return factory.createPropertyAccessExpression(factory.createIdentifier('z'), method);
+}
+
+/** `z.<method>(...args)`. */
+function zCall(method: string, args: ts.Expression[] = []): ts.CallExpression {
+  return factory.createCallExpression(zMember(method), undefined, args);
+}
+
+/** `<expr>.<method>(...args)` — chains a refinement onto a base expression. */
+function chain(expr: ts.Expression, method: string, args: ts.Expression[] = []): ts.CallExpression {
+  return factory.createCallExpression(
+    factory.createPropertyAccessExpression(expr, method),
+    undefined,
+    args
+  );
+}
+
+function numberLiteral(value: number): ts.Expression {
+  return value < 0
+    ? factory.createPrefixUnaryExpression(
+        ts.SyntaxKind.MinusToken,
+        factory.createNumericLiteral(-value)
+      )
+    : factory.createNumericLiteral(value);
+}
+
+function literalExpression(value: string | number | boolean): ts.Expression {
+  if (typeof value === 'string') return factory.createStringLiteral(value);
+  if (typeof value === 'boolean') return value ? factory.createTrue() : factory.createFalse();
+  return numberLiteral(value);
+}
+
+/** Map an IR schema to the Zod expression that validates it. */
+export function schemaToZodExpression(schema: SchemaModel): ts.Expression {
+  return withRefinements(baseExpression(schema), schema);
+}
+
+function baseExpression(schema: SchemaModel): ts.Expression {
+  switch (schema.kind) {
+    case 'scalar':
+      return scalarExpression(schema.scalar, schema.metadata);
+    case 'object':
+      return objectExpression(schema.properties);
+    case 'array':
+      return zCall('array', [schemaToZodExpression(schema.items)]);
+    case 'record':
+      return zCall('record', [zCall('string'), schemaToZodExpression(schema.value)]);
+    case 'ref':
+      return lazyRef(schema.name);
+    case 'literal':
+      return zCall('literal', [literalExpression(schema.value)]);
+    case 'enum':
+      return enumExpression(schema.values);
+    case 'union':
+      return unionExpression(schema.members);
+    case 'intersection':
+      return intersectionExpression(schema.members);
+    case 'null':
+      return zCall('null');
+    case 'unknown':
+      return zCall('unknown');
+    case 'omit':
+      return omitExpression(schema.base, schema.keys);
+  }
+}
+
+function scalarExpression(scalar: ScalarKind, metadata?: SchemaMetadata): ts.Expression {
+  switch (scalar) {
+    case 'string':
+      // `format: binary` is typed as `Blob` (see types.ts); validate it as one so the zod
+      // schema agrees with the generated type instead of expecting a string.
+      if (metadata?.format === 'binary') {
+        return zCall('instanceof', [factory.createIdentifier('Blob')]);
+      }
+      return zCall('string');
+    case 'integer':
+      return chain(zCall('number'), 'int');
+    case 'number':
+      return zCall('number');
+    case 'boolean':
+      return zCall('boolean');
+  }
+}
+
+/** `z.object({ <key>: <expr>(.optional() when !required), … })`. */
+function objectExpression(properties: PropertyModel[]): ts.Expression {
+  const props = properties.map((p) => {
+    const value = p.required
+      ? schemaToZodExpression(p.schema)
+      : chain(schemaToZodExpression(p.schema), 'optional');
+    const safe = safeIdent(p.name);
+    const key =
+      safe === p.name ? factory.createIdentifier(p.name) : factory.createStringLiteral(p.name);
+    return factory.createPropertyAssignment(key, value);
+  });
+  return zCall('object', [factory.createObjectLiteralExpression(props, props.length > 0)]);
+}
+
+/** `z.lazy(() => <Name>Schema)` — defers reference resolution to call time. */
+function lazyRef(name: string): ts.Expression {
+  const arrow = factory.createArrowFunction(
+    undefined,
+    undefined,
+    [],
+    undefined,
+    factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
+    factory.createIdentifier(schemaConstName(name))
+  );
+  return zCall('lazy', [arrow]);
+}
+
+/** All-string values → `z.enum([…])`; otherwise → a union of literals. */
+function enumExpression(values: Array<string | number | boolean>): ts.Expression {
+  if (values.every((v) => typeof v === 'string')) {
+    return zCall('enum', [
+      factory.createArrayLiteralExpression(
+        values.map((v) => factory.createStringLiteral(v as string)),
+        false
+      ),
+    ]);
+  }
+  return zCall('union', [
+    factory.createArrayLiteralExpression(
+      values.map((v) => zCall('literal', [literalExpression(v)])),
+      false
+    ),
+  ]);
+}
+
+/** `z.union([…])`; a single member collapses to that member's expression. */
+function unionExpression(members: SchemaModel[]): ts.Expression {
+  const exprs = members.map(schemaToZodExpression);
+  if (exprs.length === 1) return exprs[0];
+  return zCall('union', [factory.createArrayLiteralExpression(exprs, false)]);
+}
+
+/** `a.and(b).and(c)` — left-folds `.and` over the members. */
+function intersectionExpression(members: SchemaModel[]): ts.Expression {
+  const exprs = members.map(schemaToZodExpression);
+  return exprs.reduce((acc, next) => chain(acc, 'and', [next]));
+}
+
+/** `<Base>Schema.omit({ k1: true, … })`. */
+function omitExpression(base: string, keys: string[]): ts.Expression {
+  const mask = factory.createObjectLiteralExpression(
+    keys.map((k) => {
+      const safe = safeIdent(k);
+      const key = safe === k ? factory.createIdentifier(k) : factory.createStringLiteral(k);
+      return factory.createPropertyAssignment(key, factory.createTrue());
+    }),
+    false
+  );
+  return chain(factory.createIdentifier(schemaConstName(base)), 'omit', [mask]);
+}
+
+/**
+ * Chain the stable-subset metadata refinements onto `expr`. Order: numeric/length
+ * bounds, then `.regex` (the `.int()` for integers is already on the base).
+ * `.optional()` is NOT applied here — optionality is a property-level concern
+ * handled in `objectExpression`, so a top-level schema is never spuriously optional.
+ */
+function withRefinements(expr: ts.Expression, schema: SchemaModel): ts.Expression {
+  const m = schema.metadata;
+  if (!m) return expr;
+  let out = expr;
+  if (schema.kind === 'scalar' && schema.scalar === 'string') {
+    if (m.minLength !== undefined) out = chain(out, 'min', [numberLiteral(m.minLength)]);
+    if (m.maxLength !== undefined) out = chain(out, 'max', [numberLiteral(m.maxLength)]);
+    if (m.pattern !== undefined) out = chain(out, 'regex', [regexExpression(m.pattern)]);
+  }
+  if (schema.kind === 'scalar' && (schema.scalar === 'number' || schema.scalar === 'integer')) {
+    out = numericRefinements(out, m);
+  }
+  if (schema.kind === 'array') {
+    if (m.minItems !== undefined) out = chain(out, 'min', [numberLiteral(m.minItems)]);
+    if (m.maxItems !== undefined) out = chain(out, 'max', [numberLiteral(m.maxItems)]);
+  }
+  return out;
+}
+
+function numericRefinements(expr: ts.Expression, m: SchemaMetadata): ts.Expression {
+  let out = expr;
+  if (m.minimum !== undefined) out = chain(out, 'min', [numberLiteral(m.minimum)]);
+  if (m.maximum !== undefined) out = chain(out, 'max', [numberLiteral(m.maximum)]);
+  if (m.exclusiveMinimum !== undefined) out = chain(out, 'gt', [numberLiteral(m.exclusiveMinimum)]);
+  if (m.exclusiveMaximum !== undefined) out = chain(out, 'lt', [numberLiteral(m.exclusiveMaximum)]);
+  return out;
+}
+
+/** `new RegExp("<pattern>")` — robust across printers regardless of pattern content. */
+function regexExpression(pattern: string): ts.Expression {
+  return factory.createNewExpression(factory.createIdentifier('RegExp'), undefined, [
+    factory.createStringLiteral(pattern),
+  ]);
+}
+
+/** `export const <Name>Schema = <expr>;` for one named schema. */
+function schemaConstStatement(named: NamedSchemaModel): ts.Statement {
+  return factory.createVariableStatement(
+    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+    factory.createVariableDeclarationList(
+      [
+        factory.createVariableDeclaration(
+          schemaConstName(named.name),
+          undefined,
+          undefined,
+          schemaToZodExpression(named.schema)
+        ),
+      ],
+      ts.NodeFlags.Const
+    )
+  );
+}
+
+/** `import { z } from 'zod';` */
+function zodImport(): ts.Statement {
+  return factory.createImportDeclaration(
+    undefined,
+    factory.createImportClause(
+      false,
+      undefined,
+      factory.createNamedImports([
+        factory.createImportSpecifier(false, undefined, factory.createIdentifier('z')),
+      ])
+    ),
+    factory.createStringLiteral('zod')
+  );
+}
+
+/** The zod module statements: the `z` import followed by one const per schema. */
+export function zodModuleStatements(schemas: NamedSchemaModel[]): ts.Statement[] {
+  return [zodImport(), ...schemas.map(schemaConstStatement)];
+}
+
+/** Render the full zod module source. `''` when there are no schemas. */
+export function renderZodModule(schemas: NamedSchemaModel[]): string {
+  if (schemas.length === 0) return '';
+  return printStatements(zodModuleStatements(schemas));
+}
diff --git a/packages/openapi-typescript/src/errors.ts b/packages/openapi-typescript/src/errors.ts
new file mode 100644
index 0000000000..4c400665d2
--- /dev/null
+++ b/packages/openapi-typescript/src/errors.ts
@@ -0,0 +1,6 @@
+export class NotSupportedError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'NotSupportedError';
+  }
+}
diff --git a/packages/openapi-typescript/src/generators/__tests__/fixtures/empty-plugin.ts b/packages/openapi-typescript/src/generators/__tests__/fixtures/empty-plugin.ts
new file mode 100644
index 0000000000..073f10ce1e
--- /dev/null
+++ b/packages/openapi-typescript/src/generators/__tests__/fixtures/empty-plugin.ts
@@ -0,0 +1,2 @@
+// A module that exports no generator — exercises the "must export a generator" guard.
+export const unrelated = 42;
diff --git a/packages/openapi-typescript/src/generators/__tests__/fixtures/route-map-plugin.ts b/packages/openapi-typescript/src/generators/__tests__/fixtures/route-map-plugin.ts
new file mode 100644
index 0000000000..1591f760c7
--- /dev/null
+++ b/packages/openapi-typescript/src/generators/__tests__/fixtures/route-map-plugin.ts
@@ -0,0 +1,21 @@
+// A minimal custom-generator fixture loaded by specifier in resolve.test.ts and the plugin e2e.
+import type { CustomGenerator } from '../../types.js';
+
+const generator: CustomGenerator = {
+  name: 'route-map',
+  requires: ['sdk'],
+  run({ model, outputPath }) {
+    const routes = model.services
+      .flatMap((s) => s.operations)
+      .map((op) => `  ${op.name}: '${op.method.toUpperCase()} ${op.path}',`)
+      .join('\n');
+    return [
+      {
+        path: outputPath.replace(/\.ts$/, '.routes.ts'),
+        content: `export const routes = {\n${routes}\n} as const;\n`,
+      },
+    ];
+  },
+};
+
+export default generator;
diff --git a/packages/openapi-typescript/src/generators/__tests__/index.test.ts b/packages/openapi-typescript/src/generators/__tests__/index.test.ts
new file mode 100644
index 0000000000..b3082079b5
--- /dev/null
+++ b/packages/openapi-typescript/src/generators/__tests__/index.test.ts
@@ -0,0 +1,117 @@
+import { NotSupportedError } from '../../errors.js';
+import { getGenerator, validateGenerators } from '../index.js';
+import { sdkGenerator } from '../sdk.js';
+import { zodGenerator } from '../zod.js';
+
+describe('getGenerator', () => {
+  it('returns the sdk generator descriptor', () => {
+    expect(getGenerator('sdk').run).toBe(sdkGenerator);
+  });
+
+  it('returns the zod generator descriptor', () => {
+    expect(getGenerator('zod').run).toBe(zodGenerator);
+  });
+
+  it('throws NotSupportedError for an unknown generator name', () => {
+    expect(() => getGenerator('nope' as never)).toThrow(NotSupportedError);
+  });
+});
+
+describe('validateGenerators', () => {
+  it('accepts sdk alone', () => {
+    expect(() => validateGenerators(['sdk'], {})).not.toThrow();
+  });
+
+  it('accepts zod alone — it requires nothing', () => {
+    expect(() => validateGenerators(['zod'], {})).not.toThrow();
+  });
+
+  it('accepts sdk + tanstack-query with the default facade/error-mode', () => {
+    expect(() => validateGenerators(['sdk', 'tanstack-query'], {})).not.toThrow();
+  });
+
+  it('rejects tanstack-query without sdk, naming the fix', () => {
+    expect(() => validateGenerators(['tanstack-query'], {})).toThrow(
+      /requires the "sdk" generator.*--generators sdk,tanstack-query/
+    );
+  });
+
+  it('rejects transformers without sdk', () => {
+    expect(() => validateGenerators(['transformers'], {})).toThrow(/requires the "sdk" generator/);
+  });
+
+  it('rejects transformers without --date-type Date (would assign Date to string fields)', () => {
+    expect(() => validateGenerators(['sdk', 'transformers'], {})).toThrow(
+      /requires --date-type Date .*got "string"/
+    );
+  });
+
+  it('accepts sdk + transformers with --date-type Date', () => {
+    expect(() => validateGenerators(['sdk', 'transformers'], { dateType: 'Date' })).not.toThrow();
+  });
+
+  it('rejects tanstack-query with the service-class facade', () => {
+    expect(() =>
+      validateGenerators(['sdk', 'tanstack-query'], { facade: 'service-class' })
+    ).toThrow(/does not support --facade "service-class".*functions/);
+  });
+
+  it('rejects tanstack-query with result error mode', () => {
+    expect(() => validateGenerators(['sdk', 'tanstack-query'], { errorMode: 'result' })).toThrow(
+      /does not support --error-mode "result".*throw/
+    );
+  });
+
+  it('allows the service-class facade for sdk (unconstrained)', () => {
+    expect(() => validateGenerators(['sdk'], { facade: 'service-class' })).not.toThrow();
+  });
+
+  it('throws NotSupportedError for an unknown generator name', () => {
+    expect(() => validateGenerators(['nope' as never], {})).toThrow(NotSupportedError);
+  });
+});
+
+describe('swr generator', () => {
+  it('is registered and requires sdk', () => {
+    const descriptor = getGenerator('swr');
+    expect(descriptor.run).toBeDefined();
+    expect(descriptor.requires).toContain('sdk');
+  });
+
+  it('rejects swr without sdk, naming the fix', () => {
+    expect(() => validateGenerators(['swr'], {})).toThrow(
+      /requires the "sdk" generator.*--generators sdk,swr/
+    );
+  });
+
+  it('accepts sdk + swr with the default facade/error-mode', () => {
+    expect(() => validateGenerators(['sdk', 'swr'], {})).not.toThrow();
+  });
+
+  it('rejects swr with the service-class facade', () => {
+    expect(() => validateGenerators(['sdk', 'swr'], { facade: 'service-class' })).toThrow(
+      /does not support --facade "service-class".*functions/
+    );
+  });
+
+  it('rejects swr with result error mode', () => {
+    expect(() => validateGenerators(['sdk', 'swr'], { errorMode: 'result' })).toThrow(
+      /does not support --error-mode "result".*throw/
+    );
+  });
+});
+
+describe('mock generator', () => {
+  it('is registered and requires sdk', () => {
+    const descriptor = getGenerator('mock');
+    expect(descriptor.requires).toContain('sdk');
+  });
+
+  it('validateGenerators rejects mock without sdk', () => {
+    expect(() => validateGenerators(['mock'], {})).toThrow(/requires the "sdk" generator/);
+  });
+
+  it('validateGenerators accepts sdk + mock', () => {
+    expect(() => validateGenerators(['sdk', 'mock'], {})).not.toThrow();
+  });
+});
diff --git a/packages/openapi-typescript/src/generators/__tests__/mock.test.ts b/packages/openapi-typescript/src/generators/__tests__/mock.test.ts
new file mode 100644
index 0000000000..865c19d249
--- /dev/null
+++ b/packages/openapi-typescript/src/generators/__tests__/mock.test.ts
@@ -0,0 +1,28 @@
+import { apiModel, operation } from '../../emitters/__tests__/fixtures.js';
+import { mockGenerator } from '../mock.js';
+
+describe('mockGenerator', () => {
+  it('returns [] for a model with no operations', () => {
+    const result = mockGenerator({
+      model: apiModel(),
+      outputPath: '/out/client.ts',
+      outputMode: 'single',
+      emit: {},
+    });
+    expect(result).toEqual([]);
+  });
+
+  it('returns a single mocks file when the model has operations', () => {
+    const model = apiModel({ services: [{ name: 'Default', operations: [operation()] }] });
+    const result = mockGenerator({
+      model,
+      outputPath: '/out/client.ts',
+      outputMode: 'single',
+      emit: {},
+    });
+    expect(result).toHaveLength(1);
+    expect(result[0].path).toBe('/out/client.mocks.ts');
+    expect(result[0].content).toContain('Generated by @redocly/openapi-typescript');
+    expect(result[0].content).toContain("import { http, HttpResponse } from 'msw'");
+  });
+});
diff --git a/packages/openapi-typescript/src/generators/__tests__/resolve.test.ts b/packages/openapi-typescript/src/generators/__tests__/resolve.test.ts
new file mode 100644
index 0000000000..c8d6aa5388
--- /dev/null
+++ b/packages/openapi-typescript/src/generators/__tests__/resolve.test.ts
@@ -0,0 +1,84 @@
+import { fileURLToPath } from 'node:url';
+import { dirname, join } from 'node:path';
+
+import type { CustomGenerator } from '../types.js';
+import { resolveGenerators } from '../resolve.js';
+
+const fixtures = join(dirname(fileURLToPath(import.meta.url)), 'fixtures');
+
+const noopRun = () => [];
+
+describe('resolveGenerators', () => {
+  it('passes built-in names through unchanged', async () => {
+    const { selected, registry } = await resolveGenerators(['sdk', 'zod']);
+    expect(selected).toEqual(['sdk', 'zod']);
+    expect(registry.has('sdk')).toBe(true);
+    expect(registry.has('zod')).toBe(true);
+  });
+
+  it('registers an inline custom generator and selects it by name', async () => {
+    const custom: CustomGenerator = { name: 'route-map', run: noopRun };
+    const { selected, registry } = await resolveGenerators(['sdk', 'route-map'], {
+      customGenerators: [custom],
+    });
+    expect(selected).toEqual(['sdk', 'route-map']);
+    expect(registry.get('route-map')?.run).toBe(noopRun);
+  });
+
+  it('registers an inline custom that is available (for requires) but not selected', async () => {
+    const custom: CustomGenerator = { name: 'extra', run: noopRun };
+    const { selected, registry } = await resolveGenerators(['sdk'], { customGenerators: [custom] });
+    expect(selected).toEqual(['sdk']);
+    expect(registry.has('extra')).toBe(true);
+  });
+
+  it('rejects a custom generator whose name collides with a built-in', async () => {
+    const custom: CustomGenerator = { name: 'sdk', run: noopRun };
+    await expect(resolveGenerators(['sdk'], { customGenerators: [custom] })).rejects.toThrow(
+      /collides/
+    );
+  });
+
+  it('rejects two custom generators with the same name', async () => {
+    const a: CustomGenerator = { name: 'dup', run: noopRun };
+    const b: CustomGenerator = { name: 'dup', run: noopRun };
+    await expect(resolveGenerators(['dup'], { customGenerators: [a, b] })).rejects.toThrow(
+      /collides/
+    );
+  });
+
+  it('rejects an invalid inline custom generator (missing run)', async () => {
+    const bad = { name: 'broken' } as unknown as CustomGenerator;
+    await expect(resolveGenerators(['broken'], { customGenerators: [bad] })).rejects.toThrow(
+      /Invalid custom generator/
+    );
+  });
+
+  it('loads a generator from a relative path specifier and selects its declared name', async () => {
+    const { selected, registry } = await resolveGenerators(['sdk', './route-map-plugin.ts'], {
+      configDir: fixtures,
+    });
+    expect(selected).toEqual(['sdk', 'route-map']);
+    expect(registry.has('route-map')).toBe(true);
+  });
+
+  it('throws an actionable error when a specifier cannot be loaded', async () => {
+    await expect(resolveGenerators(['./does-not-exist.ts'], { configDir: fixtures })).rejects.toThrow(
+      /Could not load generator "\.\/does-not-exist\.ts"/
+    );
+  });
+
+  it('treats a non-built-in entry with no configDir as a package specifier (resolved from cwd)', async () => {
+    // A bare specifier that does not resolve surfaces the load error; this also exercises the
+    // package-name (non-path) branch and the default `configDir = cwd`.
+    await expect(resolveGenerators(['@redocly/not-a-real-generator-pkg'])).rejects.toThrow(
+      /Could not load generator "@redocly\/not-a-real-generator-pkg"/
+    );
+  });
+
+  it('throws when a loaded module does not export a generator', async () => {
+    await expect(
+      resolveGenerators(['./empty-plugin.ts'], { configDir: fixtures })
+    ).rejects.toThrow(/must export a generator/);
+  });
+});
diff --git a/packages/openapi-typescript/src/generators/__tests__/sdk.test.ts b/packages/openapi-typescript/src/generators/__tests__/sdk.test.ts
new file mode 100644
index 0000000000..1b04636a26
--- /dev/null
+++ b/packages/openapi-typescript/src/generators/__tests__/sdk.test.ts
@@ -0,0 +1,52 @@
+import type { ApiModel } from '../../ir/model.js';
+import { getWriter } from '../../writers/index.js';
+import { sdkGenerator } from '../sdk.js';
+
+function apiModel(): ApiModel {
+  return {
+    title: 'T',
+    version: '1.0.0',
+    baseUrl: 'https://api.example.com',
+    services: [
+      {
+        name: 'Default',
+        operations: [
+          {
+            name: 'op',
+            method: 'get',
+            path: '/p',
+            pathParams: [],
+            queryParams: [],
+            headerParams: [],
+            successResponses: [],
+            errorResponses: [],
+            security: [],
+            tags: [],
+          },
+        ],
+      },
+    ],
+    schemas: [],
+    securitySchemes: [],
+  };
+}
+
+describe('sdkGenerator', () => {
+  it('produces byte-identical output to the writer it wraps (single mode)', () => {
+    const model = apiModel();
+    const input = { model, outputPath: '/out/api.ts', outputMode: 'single' as const, emit: {} };
+    const viaGenerator = sdkGenerator(input);
+    const viaWriter = getWriter('single')({ model, outputPath: '/out/api.ts', emit: {} });
+    expect(viaGenerator).toEqual(viaWriter);
+  });
+
+  it('honors the output mode (split produces multiple files)', () => {
+    const files = sdkGenerator({
+      model: apiModel(),
+      outputPath: '/out/api.ts',
+      outputMode: 'split',
+      emit: {},
+    });
+    expect(files.length).toBeGreaterThan(1);
+  });
+});
diff --git a/packages/openapi-typescript/src/generators/__tests__/swr.test.ts b/packages/openapi-typescript/src/generators/__tests__/swr.test.ts
new file mode 100644
index 0000000000..295a9722b4
--- /dev/null
+++ b/packages/openapi-typescript/src/generators/__tests__/swr.test.ts
@@ -0,0 +1,46 @@
+import { apiModel, operation } from '../../emitters/__tests__/fixtures.js';
+import { getGenerator } from '../index.js';
+import { swrGenerator } from '../swr.js';
+
+const SERVICES = [
+  {
+    name: 'Default',
+    operations: [
+      operation({ name: 'getPet', method: 'get', path: '/pet' }),
+      operation({ name: 'createPet', method: 'post', path: '/pet' }),
+    ],
+  },
+];
+
+describe('swrGenerator', () => {
+  it('emits one <stem>.swr.ts file beside the client with the header + hooks', () => {
+    const files = swrGenerator({
+      model: apiModel({ services: SERVICES }),
+      outputPath: '/tmp/out/client.ts',
+      outputMode: 'single',
+      emit: {},
+    });
+    expect(files).toHaveLength(1);
+    expect(files[0].path).toBe('/tmp/out/client.swr.ts');
+    expect(files[0].content).toContain('// Generated by @redocly/openapi-typescript');
+    expect(files[0].content).toContain('import useSWR from "swr"');
+    expect(files[0].content).toContain('import useSWRMutation from "swr/mutation"');
+    expect(files[0].content).toContain('export function useGetPet');
+    expect(files[0].content).toContain('export function useCreatePet');
+    expect(files[0].content).toContain('from "./client.js"');
+  });
+
+  it('emits nothing when the model has no operations', () => {
+    const files = swrGenerator({
+      model: apiModel({ services: [{ name: 'Default', operations: [] }] }),
+      outputPath: '/tmp/out/client.ts',
+      outputMode: 'single',
+      emit: {},
+    });
+    expect(files).toEqual([]);
+  });
+
+  it('is registered under "swr"', () => {
+    expect(getGenerator('swr').run).toBe(swrGenerator);
+  });
+});
diff --git a/packages/openapi-typescript/src/generators/__tests__/tanstack-query.test.ts b/packages/openapi-typescript/src/generators/__tests__/tanstack-query.test.ts
new file mode 100644
index 0000000000..8c7774e0e2
--- /dev/null
+++ b/packages/openapi-typescript/src/generators/__tests__/tanstack-query.test.ts
@@ -0,0 +1,55 @@
+import { apiModel, operation } from '../../emitters/__tests__/fixtures.js';
+import { getGenerator } from '../index.js';
+import { tanstackQueryGenerator } from '../tanstack-query.js';
+
+const SERVICES = [
+  {
+    name: 'Default',
+    operations: [
+      operation({ name: 'getPet', method: 'get', path: '/pet' }),
+      operation({ name: 'createPet', method: 'post', path: '/pet' }),
+    ],
+  },
+];
+
+describe('tanstackQueryGenerator', () => {
+  it('emits one <stem>.tanstack.ts file beside the client with the header + factories', () => {
+    const files = tanstackQueryGenerator({
+      model: apiModel({ services: SERVICES }),
+      outputPath: '/tmp/out/client.ts',
+      outputMode: 'single',
+      emit: {},
+    });
+    expect(files).toHaveLength(1);
+    expect(files[0].path).toBe('/tmp/out/client.tanstack.ts');
+    expect(files[0].content).toContain('// Generated by @redocly/openapi-typescript');
+    expect(files[0].content).toContain('import { queryOptions } from "@tanstack/react-query"');
+    expect(files[0].content).toContain('export const getPetOptions');
+    expect(files[0].content).toContain('export const createPetMutation');
+    expect(files[0].content).toContain('from "./client.js"');
+  });
+
+  it('emits nothing when the model has no operations', () => {
+    const files = tanstackQueryGenerator({
+      model: apiModel({ services: [{ name: 'Default', operations: [] }] }),
+      outputPath: '/tmp/out/client.ts',
+      outputMode: 'single',
+      emit: {},
+    });
+    expect(files).toEqual([]);
+  });
+
+  it('passes queryFramework through to the import specifier', () => {
+    const files = tanstackQueryGenerator({
+      model: apiModel({ services: SERVICES }),
+      outputPath: '/tmp/out/client.ts',
+      outputMode: 'single',
+      emit: { queryFramework: 'svelte' },
+    });
+    expect(files[0].content).toContain('import { queryOptions } from "@tanstack/svelte-query"');
+  });
+
+  it('is registered under "tanstack-query"', () => {
+    expect(getGenerator('tanstack-query').run).toBe(tanstackQueryGenerator);
+  });
+});
diff --git a/packages/openapi-typescript/src/generators/__tests__/transformers.test.ts b/packages/openapi-typescript/src/generators/__tests__/transformers.test.ts
new file mode 100644
index 0000000000..28fa3cae32
--- /dev/null
+++ b/packages/openapi-typescript/src/generators/__tests__/transformers.test.ts
@@ -0,0 +1,51 @@
+import { apiModel, namedSchema } from '../../emitters/__tests__/fixtures.js';
+import { getGenerator } from '../index.js';
+import { transformersGenerator } from '../transformers.js';
+
+const EVENT = namedSchema('Event', {
+  kind: 'object',
+  properties: [
+    {
+      name: 'createdAt',
+      schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
+      required: true,
+    },
+  ],
+});
+
+const PLAIN = namedSchema('Plain', {
+  kind: 'object',
+  properties: [{ name: 'id', schema: { kind: 'scalar', scalar: 'string' }, required: true }],
+});
+
+describe('transformersGenerator', () => {
+  it('emits one <stem>.transformers.ts beside the client with header + type import + transformer', () => {
+    const files = transformersGenerator({
+      model: apiModel({ schemas: [EVENT] }),
+      outputPath: '/tmp/out/client.ts',
+      outputMode: 'single',
+      emit: {},
+    });
+    expect(files).toHaveLength(1);
+    expect(files[0].path).toBe('/tmp/out/client.transformers.ts');
+    expect(files[0].content).toContain('// Generated by @redocly/openapi-typescript');
+    expect(files[0].content).toContain('import type {');
+    expect(files[0].content).toContain('from "./client.js"');
+    expect(files[0].content).toContain('export const transformEvent');
+    expect(files[0].content).toContain('new Date(');
+  });
+
+  it('emits nothing when no schema carries a date field', () => {
+    const files = transformersGenerator({
+      model: apiModel({ schemas: [PLAIN] }),
+      outputPath: '/tmp/out/client.ts',
+      outputMode: 'single',
+      emit: {},
+    });
+    expect(files).toEqual([]);
+  });
+
+  it('is registered under "transformers"', () => {
+    expect(getGenerator('transformers').run).toBe(transformersGenerator);
+  });
+});
diff --git a/packages/openapi-typescript/src/generators/__tests__/zod.test.ts b/packages/openapi-typescript/src/generators/__tests__/zod.test.ts
new file mode 100644
index 0000000000..683ed5a888
--- /dev/null
+++ b/packages/openapi-typescript/src/generators/__tests__/zod.test.ts
@@ -0,0 +1,33 @@
+import { apiModel, namedSchema } from '../../emitters/__tests__/fixtures.js';
+import { zodGenerator } from '../zod.js';
+
+const PET = namedSchema('Pet', {
+  kind: 'object',
+  properties: [{ name: 'id', schema: { kind: 'scalar', scalar: 'string' }, required: true }],
+});
+
+describe('zodGenerator', () => {
+  it('emits one <stem>.zod.ts file beside the client with the header + schemas', () => {
+    const files = zodGenerator({
+      model: apiModel({ schemas: [PET] }),
+      outputPath: '/tmp/out/client.ts',
+      outputMode: 'single',
+      emit: {},
+    });
+    expect(files).toHaveLength(1);
+    expect(files[0].path).toBe('/tmp/out/client.zod.ts');
+    expect(files[0].content).toContain('// Generated by @redocly/openapi-typescript');
+    expect(files[0].content).toContain('import { z } from "zod"');
+    expect(files[0].content).toContain('export const PetSchema = z.object(');
+  });
+
+  it('emits nothing when the model has no schemas', () => {
+    const files = zodGenerator({
+      model: apiModel({ schemas: [] }),
+      outputPath: '/tmp/out/client.ts',
+      outputMode: 'single',
+      emit: {},
+    });
+    expect(files).toEqual([]);
+  });
+});
diff --git a/packages/openapi-typescript/src/generators/index.ts b/packages/openapi-typescript/src/generators/index.ts
new file mode 100644
index 0000000000..4c90d438b4
--- /dev/null
+++ b/packages/openapi-typescript/src/generators/index.ts
@@ -0,0 +1,104 @@
+import type { EmitOptions } from '../emitters/client.js';
+import { NotSupportedError } from '../errors.js';
+import { mockGenerator } from './mock.js';
+import { sdkGenerator } from './sdk.js';
+import { swrGenerator } from './swr.js';
+import { tanstackQueryGenerator } from './tanstack-query.js';
+import { transformersGenerator } from './transformers.js';
+import type { GeneratorDescriptor, GeneratorName } from './types.js';
+import { zodGenerator } from './zod.js';
+
+export type {
+  CustomGenerator,
+  Generator,
+  GeneratorDescriptor,
+  GeneratorInput,
+  GeneratorName,
+} from './types.js';
+
+const GENERATORS: Record<GeneratorName, GeneratorDescriptor> = {
+  // sdk is the base client; zod emits a standalone schema module importing nothing from it.
+  sdk: { run: sdkGenerator },
+  zod: { run: zodGenerator },
+  // transformers import the schema *types* from the sdk entry module (so sdk must run) and
+  // assign `Date` values to those fields, which only type-checks when the sdk types dates as `Date`.
+  transformers: { run: transformersGenerator, requires: ['sdk'], dateTypes: ['Date'] },
+  // tanstack-query wraps the sdk's exported, throw-mode, free operation functions.
+  'tanstack-query': {
+    run: tanstackQueryGenerator,
+    requires: ['sdk'],
+    facades: ['functions'],
+    errorModes: ['throw'],
+  },
+  // swr wraps the sdk's exported, throw-mode, free operation functions as SWR hooks.
+  swr: {
+    run: swrGenerator,
+    requires: ['sdk'],
+    facades: ['functions'],
+    errorModes: ['throw'],
+  },
+  // mock emits a standalone MSW handlers/factories module referencing the sdk's types.
+  mock: { run: mockGenerator, requires: ['sdk'] },
+};
+
+/** Select a first-party generator by name. Mirrors `getWriter(outputMode)`. */
+export function getGenerator(name: GeneratorName): GeneratorDescriptor {
+  const generator = GENERATORS[name];
+  if (!generator) {
+    throw new NotSupportedError(`Unknown generator: ${name}`);
+  }
+  return generator;
+}
+
+/**
+ * A fresh registry of the built-in generators keyed by name. The plugin resolver seeds from this
+ * and adds custom generators to the copy, so mutating the result never affects the built-in table.
+ */
+export function builtinGenerators(): Map<string, GeneratorDescriptor> {
+  return new Map(Object.entries(GENERATORS));
+}
+
+/**
+ * Validate a generator selection against every selected generator's declared
+ * contract, throwing the first violation with an actionable message. Runs before
+ * any file is produced so an incompatible combination never reaches the printer.
+ */
+export function validateGenerators(
+  names: string[],
+  emit: EmitOptions,
+  registry: Map<string, GeneratorDescriptor> = builtinGenerators()
+): void {
+  const selected = new Set(names);
+  const facade = emit.facade ?? 'functions';
+  const errorMode = emit.errorMode ?? 'throw';
+  const dateType = emit.dateType ?? 'string';
+  for (const name of names) {
+    const descriptor = registry.get(name);
+    if (!descriptor) {
+      throw new NotSupportedError(`Unknown generator: ${name}`);
+    }
+    for (const required of descriptor.requires ?? []) {
+      if (!selected.has(required)) {
+        const fixed = [...new Set([required, ...names])].join(',');
+        throw new NotSupportedError(
+          `The "${name}" generator requires the "${required}" generator. Add it, e.g. --generators ${fixed}.`
+        );
+      }
+    }
+    if (descriptor.facades && !descriptor.facades.includes(facade)) {
+      throw new NotSupportedError(
+        `The "${name}" generator does not support --facade "${facade}" (supported: ${descriptor.facades.join(', ')}).`
+      );
+    }
+    if (descriptor.errorModes && !descriptor.errorModes.includes(errorMode)) {
+      throw new NotSupportedError(
+        `The "${name}" generator does not support --error-mode "${errorMode}" (supported: ${descriptor.errorModes.join(', ')}).`
+      );
+    }
+    if (descriptor.dateTypes && !descriptor.dateTypes.includes(dateType)) {
+      throw new NotSupportedError(
+        `The "${name}" generator requires --date-type ${descriptor.dateTypes.join(' or ')} (got "${dateType}") so the runtime values match the generated types.`
+      );
+    }
+  }
+}
diff --git a/packages/openapi-typescript/src/generators/mock.ts b/packages/openapi-typescript/src/generators/mock.ts
new file mode 100644
index 0000000000..591c2bd891
--- /dev/null
+++ b/packages/openapi-typescript/src/generators/mock.ts
@@ -0,0 +1,24 @@
+import { join } from 'node:path';
+
+import { HEADER } from '../emitters/client.js';
+import { renderMockModule } from '../emitters/mock.js';
+import { anchor } from '../writers/util.js';
+import type { Generator } from './types.js';
+
+/**
+ * The mock generator: a standalone `<stem>.mocks.ts` module of MSW handlers and
+ * data factories baked from the spec. Imports `msw` (the consumer's dev-dep); the
+ * sdk client stays dependency-free. Output-mode-agnostic in v1 — one module beside
+ * the client. Emits nothing when there are no operations.
+ */
+export const mockGenerator: Generator = ({ model, outputPath, emit }) => {
+  const { dir, stem } = anchor(outputPath);
+  const content = renderMockModule(model, {
+    sdkModule: `./${stem}.js`,
+    dateType: emit.dateType,
+    mockData: emit.mockData,
+    mockSeed: emit.mockSeed,
+  });
+  if (content === '') return [];
+  return [{ path: join(dir, `${stem}.mocks.ts`), content: `${HEADER}\n\n${content}` }];
+};
diff --git a/packages/openapi-typescript/src/generators/resolve.ts b/packages/openapi-typescript/src/generators/resolve.ts
new file mode 100644
index 0000000000..1abfba9e31
--- /dev/null
+++ b/packages/openapi-typescript/src/generators/resolve.ts
@@ -0,0 +1,100 @@
+// Resolves a `generators` selection (a mix of built-in names, inline custom generators, and import
+// specifiers) into a registry keyed by name plus the ordered list of names to run. This is the only
+// async, side-effecting step in the generator pipeline: a specifier that is neither a built-in nor an
+// already-registered custom name is dynamically `import()`ed (mirroring how config files load), its
+// default (or `generator`) export validated, and registered under its declared name. Built-ins are
+// seeded fresh per call (see `builtinGenerators`), so registration never mutates the built-in table.
+
+import { isAbsolute, resolve as resolvePath } from 'node:path';
+import { pathToFileURL } from 'node:url';
+
+import { isPlainObject } from '@redocly/openapi-core';
+
+import { NotSupportedError } from '../errors.js';
+import { builtinGenerators } from './index.js';
+import type { CustomGenerator, GeneratorDescriptor } from './types.js';
+
+export type ResolvedGenerators = {
+  /** Generator names to run, in selection order. */
+  selected: string[];
+  /** Every available generator (built-ins + registered customs) keyed by name. */
+  registry: Map<string, GeneratorDescriptor>;
+};
+
+export type ResolveOptions = {
+  /** Inline custom generators (from a `defineConfig` file) registered before resolution. */
+  customGenerators?: CustomGenerator[];
+  /** Directory relative-path specifiers resolve against (the config's location). Defaults to cwd. */
+  configDir?: string;
+};
+
+/**
+ * Build the run list + registry for a `generators` selection. Each entry is, in order of preference,
+ * a built-in name, an already-registered custom name, or an import specifier (path or package).
+ */
+export async function resolveGenerators(
+  entries: string[],
+  options: ResolveOptions = {}
+): Promise<ResolvedGenerators> {
+  const registry = builtinGenerators();
+  for (const custom of options.customGenerators ?? []) register(registry, custom);
+
+  const selected: string[] = [];
+  for (const entry of entries) {
+    if (registry.has(entry)) {
+      selected.push(entry);
+      continue;
+    }
+    const custom = await importGenerator(entry, options.configDir ?? process.cwd());
+    register(registry, custom);
+    selected.push(custom.name);
+  }
+  return { selected, registry };
+}
+
+/** Validate a custom generator and add it under its name, rejecting collisions. */
+function register(registry: Map<string, GeneratorDescriptor>, custom: CustomGenerator): void {
+  if (
+    !isPlainObject(custom) ||
+    typeof custom.name !== 'string' ||
+    custom.name === '' ||
+    typeof custom.run !== 'function'
+  ) {
+    throw new NotSupportedError(
+      'Invalid custom generator: expected an object with a non-empty string `name` and a `run` function (build one with `defineGenerator`).'
+    );
+  }
+  if (registry.has(custom.name)) {
+    throw new NotSupportedError(
+      `Generator name "${custom.name}" collides with an existing generator. Rename the custom generator.`
+    );
+  }
+  registry.set(custom.name, {
+    run: custom.run,
+    requires: custom.requires,
+    facades: custom.facades,
+    errorModes: custom.errorModes,
+    dateTypes: custom.dateTypes,
+  });
+}
+
+/** Dynamically import a generator from a path (resolved against `configDir`) or package specifier. */
+async function importGenerator(specifier: string, configDir: string): Promise<CustomGenerator> {
+  const isPath = specifier.startsWith('.') || isAbsolute(specifier);
+  const target = isPath ? pathToFileURL(resolvePath(configDir, specifier)).href : specifier;
+  let module: Record<string, unknown>;
+  try {
+    module = (await import(target)) as Record<string, unknown>;
+  } catch (cause) {
+    throw new NotSupportedError(
+      `Could not load generator "${specifier}": ${(cause as Error).message}`
+    );
+  }
+  const generator = module.default ?? module.generator;
+  if (generator === undefined) {
+    throw new NotSupportedError(
+      `Generator module "${specifier}" must export a generator (a default export or a \`generator\` export built with \`defineGenerator\`).`
+    );
+  }
+  return generator as CustomGenerator;
+}
diff --git a/packages/openapi-typescript/src/generators/sdk.ts b/packages/openapi-typescript/src/generators/sdk.ts
new file mode 100644
index 0000000000..1500a21b97
--- /dev/null
+++ b/packages/openapi-typescript/src/generators/sdk.ts
@@ -0,0 +1,11 @@
+import { getWriter } from '../writers/index.js';
+import type { Generator } from './types.js';
+
+/**
+ * The default generator: the full typed client (model types + runtime + endpoints).
+ * Delegates to the output-mode writer, so its bytes are identical to the pre-registry
+ * pipeline. Other generators (zod, framework hooks) emit *additional* files alongside.
+ */
+export const sdkGenerator: Generator = ({ model, outputPath, outputMode, emit }) => {
+  return getWriter(outputMode)({ model, outputPath, emit });
+};
diff --git a/packages/openapi-typescript/src/generators/swr.ts b/packages/openapi-typescript/src/generators/swr.ts
new file mode 100644
index 0000000000..3f40b6f794
--- /dev/null
+++ b/packages/openapi-typescript/src/generators/swr.ts
@@ -0,0 +1,28 @@
+import { join } from 'node:path';
+
+import { HEADER } from '../emitters/client.js';
+import { renderSwrModule } from '../emitters/swr.js';
+import { anchor } from '../writers/util.js';
+import type { Generator } from './types.js';
+
+/**
+ * The swr generator: a standalone `<stem>.swr.ts` module of SWR hooks wrapping the
+ * sdk operation functions — `<op>Key` + `use<Op>` (`useSWR`) per query (GET/HEAD),
+ * `use<Op>` (`useSWRMutation`) per mutation. It imports the operation functions +
+ * their `<Op>Variables` types from the sdk entry (`./<stem>.js`), so it requires the
+ * `sdk` generator and targets its throw-mode functions facade. `swr`/`swr/mutation`
+ * are the consumer's peer; the sdk client stays dependency-free.
+ *
+ * Output-mode-agnostic: `./<stem>.js` resolves to the single-file client or the
+ * multi-file barrel at the output anchor either way. Emits nothing when there are
+ * no operations.
+ */
+export const swrGenerator: Generator = ({ model, outputPath, emit }) => {
+  const { dir, stem } = anchor(outputPath);
+  const content = renderSwrModule(model, {
+    argsStyle: emit.argsStyle ?? 'flat',
+    sdkModule: `./${stem}.js`,
+  });
+  if (content === '') return [];
+  return [{ path: join(dir, `${stem}.swr.ts`), content: `${HEADER}\n\n${content}` }];
+};
diff --git a/packages/openapi-typescript/src/generators/tanstack-query.ts b/packages/openapi-typescript/src/generators/tanstack-query.ts
new file mode 100644
index 0000000000..bc1a6af622
--- /dev/null
+++ b/packages/openapi-typescript/src/generators/tanstack-query.ts
@@ -0,0 +1,31 @@
+import { join } from 'node:path';
+
+import { HEADER } from '../emitters/client.js';
+import { renderTanstackModule } from '../emitters/tanstack-query.js';
+import { anchor } from '../writers/util.js';
+import type { Generator } from './types.js';
+
+/**
+ * The tanstack-query generator: a standalone `<stem>.tanstack.ts` module of
+ * TanStack Query v5 factories that wrap the sdk operation functions —
+ * `<op>QueryKey`/`<op>Options` per query (GET/HEAD), `<op>Mutation` per mutation.
+ * It imports the operation functions + their `<Op>Variables` types from the sdk
+ * entry (`./<stem>.js`), so it requires the `sdk` generator and targets its
+ * throw-mode functions facade. The framework-agnostic `queryOptions` helper is
+ * imported from `@tanstack/${queryFramework}-query` (`react` default; the body is
+ * byte-identical across frameworks — `@tanstack/<framework>-query` is the consumer's peer).
+ *
+ * Output-mode-agnostic: `./<stem>.js` resolves to the single-file client or the
+ * multi-file barrel at the output anchor either way. Emits nothing when there are
+ * no operations.
+ */
+export const tanstackQueryGenerator: Generator = ({ model, outputPath, emit }) => {
+  const { dir, stem } = anchor(outputPath);
+  const content = renderTanstackModule(model, {
+    argsStyle: emit.argsStyle ?? 'flat',
+    sdkModule: `./${stem}.js`,
+    framework: emit.queryFramework ?? 'react',
+  });
+  if (content === '') return [];
+  return [{ path: join(dir, `${stem}.tanstack.ts`), content: `${HEADER}\n\n${content}` }];
+};
diff --git a/packages/openapi-typescript/src/generators/transformers.ts b/packages/openapi-typescript/src/generators/transformers.ts
new file mode 100644
index 0000000000..108603dafa
--- /dev/null
+++ b/packages/openapi-typescript/src/generators/transformers.ts
@@ -0,0 +1,29 @@
+import { join } from 'node:path';
+
+import { HEADER } from '../emitters/client.js';
+import { renderTransformersModule } from '../emitters/transformers.js';
+import { anchor } from '../writers/util.js';
+import type { Generator } from './types.js';
+
+/**
+ * The transformers generator: a standalone `<stem>.transformers.ts` module of
+ * `transform<Name>(data: <Name>): <Name>` functions, one per IR named schema
+ * that (recursively) carries a `date-time`/`date` field. Each walks the value
+ * and rewrites wire ISO strings to `new Date(...)` in place, so the runtime
+ * value matches the sdk's `--date-type Date` types — pair the two.
+ *
+ * Standalone — the consumer pipes responses through it
+ * (`transformPet(await getPet(id))`); the sdk client itself stays zero-dep
+ * (Date is a web standard). The transformers import only the schema TYPES from
+ * the sdk entry (`./<stem>.js`) and call each other as siblings.
+ *
+ * Output-mode-agnostic: it reads only `model.schemas` and emits a single module
+ * beside the client regardless of how the sdk partitions its files. Emits
+ * nothing when no schema has a date field (nothing to transform).
+ */
+export const transformersGenerator: Generator = ({ model, outputPath }) => {
+  const { dir, stem } = anchor(outputPath);
+  const content = renderTransformersModule(model, { sdkModule: `./${stem}.js` });
+  if (content === '') return [];
+  return [{ path: join(dir, `${stem}.transformers.ts`), content: `${HEADER}\n\n${content}` }];
+};
diff --git a/packages/openapi-typescript/src/generators/types.ts b/packages/openapi-typescript/src/generators/types.ts
new file mode 100644
index 0000000000..ba063bb192
--- /dev/null
+++ b/packages/openapi-typescript/src/generators/types.ts
@@ -0,0 +1,60 @@
+// packages/openapi-typescript/src/generators/types.ts
+import type { EmitOptions } from '../emitters/client.js';
+import type { ErrorMode, Facade } from '../emitters/operations.js';
+import type { DateType } from '../emitters/types.js';
+import type { ApiModel } from '../ir/model.js';
+import type { GeneratedFile, OutputMode } from '../writers/types.js';
+
+/** The first-party generators the registry knows. Extends as P5 lands (react-query, …). */
+export type GeneratorName = 'sdk' | 'zod' | 'tanstack-query' | 'swr' | 'transformers' | 'mock';
+
+/** Everything a generator needs to produce its files. */
+export type GeneratorInput = {
+  model: ApiModel;
+  /** The `--output` anchor path. */
+  outputPath: string;
+  /** File partitioning the generator should honor. */
+  outputMode: OutputMode;
+  /** Emit options (baseUrl/enumStyle/facade/argsStyle/name). */
+  emit: EmitOptions;
+};
+
+/**
+ * A Generator turns the IR + options into a set of files. This is the seam new
+ * capabilities (zod, framework hooks) plug into — each is a deep module behind a
+ * name in the registry. First-party only in P1; no public plugin API yet.
+ */
+export type Generator = (input: GeneratorInput) => GeneratedFile[];
+
+/**
+ * A generator plus its declared compatibility contract. `validateGenerators`
+ * checks these *before* anything is emitted, so an incompatible selection fails
+ * fast with an actionable message instead of producing a client that won't compile.
+ *
+ * - `requires`: other generators that must also be selected (e.g. `tanstack-query`
+ *   imports the sdk's operation functions, so it requires `sdk`).
+ * - `facades` / `errorModes` / `dateTypes`: the subset this generator supports;
+ *   `undefined` means "all". (`tanstack-query` wraps free throw-mode functions, so it
+ *   supports only the `functions` facade in `throw` mode; `transformers` only type-checks
+ *   when the sdk types date fields as `Date`, so it supports only `dateType: 'Date'`.)
+ */
+export type GeneratorDescriptor = {
+  run: Generator;
+  // `string[]` (not `GeneratorName[]`) so a custom generator may require a built-in or another
+  // custom generator by name; built-in descriptors still type-check (their names are strings).
+  requires?: string[];
+  facades?: Facade[];
+  errorModes?: ErrorMode[];
+  dateTypes?: DateType[];
+};
+
+/**
+ * A user-authored generator (the public, experimental plugin contract): a `GeneratorDescriptor`
+ * plus a unique `name` used to select it in `generators`, to satisfy other generators' `requires`,
+ * and to detect collisions. Authors build one via `defineGenerator` from the
+ * `@redocly/openapi-typescript/plugin` entry; the resolver registers it under `name`.
+ */
+export type CustomGenerator = GeneratorDescriptor & {
+  /** Unique name, used in `generators` selection, `requires`, and collision detection. */
+  name: string;
+};
diff --git a/packages/openapi-typescript/src/generators/zod.ts b/packages/openapi-typescript/src/generators/zod.ts
new file mode 100644
index 0000000000..60e77a9ac9
--- /dev/null
+++ b/packages/openapi-typescript/src/generators/zod.ts
@@ -0,0 +1,23 @@
+import { join } from 'node:path';
+
+import { HEADER } from '../emitters/client.js';
+import { renderZodModule } from '../emitters/zod.js';
+import { anchor } from '../writers/util.js';
+import type { Generator } from './types.js';
+
+/**
+ * The zod generator: a standalone `<stem>.zod.ts` module of Zod schemas (one
+ * `export const <Name>Schema` per IR named schema), validated by the consumer
+ * (`PetSchema.parse(data)`; `z.infer` derives the type). The sdk client stays
+ * dependency-free — zod is the consumer's peer.
+ *
+ * Phase 1 is output-mode-agnostic: it reads only `model.schemas` and emits a
+ * single module beside the client regardless of how the sdk partitions its files.
+ * Emits nothing when there are no schemas.
+ */
+export const zodGenerator: Generator = ({ model, outputPath }) => {
+  const content = renderZodModule(model.schemas);
+  if (content === '') return [];
+  const { dir, stem } = anchor(outputPath);
+  return [{ path: join(dir, `${stem}.zod.ts`), content: `${HEADER}\n\n${content}` }];
+};
diff --git a/packages/openapi-typescript/src/index.ts b/packages/openapi-typescript/src/index.ts
new file mode 100644
index 0000000000..5958506e6c
--- /dev/null
+++ b/packages/openapi-typescript/src/index.ts
@@ -0,0 +1,124 @@
+import { mkdir, writeFile } from 'node:fs/promises';
+import { dirname, resolve } from 'node:path';
+
+import type { EmitOptions } from './emitters/client.js';
+import { builtinGenerators, validateGenerators } from './generators/index.js';
+import { resolveGenerators } from './generators/resolve.js';
+import type { GeneratorDescriptor } from './generators/types.js';
+import { buildApiModel } from './ir/build.js';
+import type { ApiModel } from './ir/model.js';
+import { normalizeSwagger2 } from './ir/normalize-swagger2.js';
+import { loadSpec } from './loader.js';
+import type { GenerateClientOptions, GenerateClientResult } from './types.js';
+import type { GeneratedFile, OutputMode } from './writers/types.js';
+
+export { NotSupportedError } from './errors.js';
+export { defineConfig } from './config.js';
+export type { Config } from './config.js';
+export type { Generator, GeneratorInput, GeneratorName } from './generators/index.js';
+export type {
+  ApiModel,
+  NamedSchemaModel,
+  OperationModel,
+  ParamModel,
+  PropertyModel,
+  RequestBodyModel,
+  ResponseBodyModel,
+  ScalarKind,
+  SchemaModel,
+  ServiceModel,
+} from './ir/model.js';
+export type { GenerateClientOptions, GenerateClientResult, LoadResult } from './types.js';
+export type { GeneratedFile, OutputMode } from './writers/index.js';
+export type { ArgsStyle, Facade } from './emitters/client.js';
+
+/**
+ * Validate the generator selection (see `validateGenerators`), then run each
+ * configured generator against the IR and concatenate their files. Throws on a
+ * duplicate output path so two generators can't silently clobber each other.
+ */
+export function collectGeneratedFiles(
+  model: ApiModel,
+  options: {
+    outputPath: string;
+    outputMode: OutputMode;
+    emit: EmitOptions;
+    generators: string[];
+    /** The resolved registry (built-ins + custom). Defaults to the built-ins. */
+    registry?: Map<string, GeneratorDescriptor>;
+  }
+): GeneratedFile[] {
+  const registry = options.registry ?? builtinGenerators();
+  // Fail fast on an incompatible selection (missing prerequisite, unsupported
+  // facade/error-mode) before producing any file.
+  validateGenerators(options.generators, options.emit, registry);
+  const files: GeneratedFile[] = [];
+  const seen = new Set<string>();
+  for (const name of options.generators) {
+    const generator = registry.get(name)!;
+    for (const file of generator.run({
+      model,
+      outputPath: options.outputPath,
+      outputMode: options.outputMode,
+      emit: options.emit,
+    })) {
+      if (seen.has(file.path)) {
+        throw new Error(`Generator conflict: ${file.path} already emitted by an earlier generator`);
+      }
+      seen.add(file.path);
+      files.push(file);
+    }
+  }
+  return files;
+}
+
+export async function generateClient(
+  options: GenerateClientOptions
+): Promise<GenerateClientResult> {
+  const outputPath = resolve(options.output);
+  const { document, version } = await loadSpec(options.input, options.config);
+  const normalized =
+    version === 'oas2'
+      ? normalizeSwagger2(document as unknown as Record<string, unknown>)
+      : document;
+  const model = buildApiModel(normalized);
+
+  // Resolve the selection into a registry: built-in names pass through, inline `customGenerators`
+  // register, and any other entry is imported as a plugin specifier (path/package).
+  const { selected, registry } = await resolveGenerators(options.generators ?? ['sdk'], {
+    customGenerators: options.customGenerators,
+    configDir: options.configDir,
+  });
+
+  const files = collectGeneratedFiles(model, {
+    outputPath,
+    outputMode: options.outputMode ?? 'single',
+    emit: {
+      baseUrl: options.baseUrl,
+      enumStyle: options.enumStyle,
+      facade: options.facade,
+      argsStyle: options.argsStyle,
+      name: options.name,
+      errorMode: options.errorMode,
+      dateType: options.dateType,
+      queryFramework: options.queryFramework,
+      mockData: options.mockData,
+      mockSeed: options.mockSeed,
+    },
+    generators: selected,
+    registry,
+  });
+
+  const written: GenerateClientResult['files'] = [];
+  for (const file of files) {
+    await mkdir(dirname(file.path), { recursive: true });
+    await writeFile(file.path, file.content, 'utf-8');
+    written.push({ path: file.path, bytes: Buffer.byteLength(file.content, 'utf-8') });
+  }
+
+  return {
+    outputPath,
+    bytes: written.reduce((sum, file) => sum + file.bytes, 0),
+    files: written,
+  };
+}
diff --git a/packages/openapi-typescript/src/ir/__tests__/build.test.ts b/packages/openapi-typescript/src/ir/__tests__/build.test.ts
new file mode 100644
index 0000000000..d98f583158
--- /dev/null
+++ b/packages/openapi-typescript/src/ir/__tests__/build.test.ts
@@ -0,0 +1,2047 @@
+import type { Oas3Definition, Oas3Schema } from '@redocly/openapi-core';
+
+import { NotSupportedError } from '../../errors.js';
+import { buildApiModel } from '../build.js';
+import type { OperationModel, SchemaModel } from '../model.js';
+
+/**
+ * Build a minimal Oas3Definition wrapper so each test only declares the part it
+ * cares about. Cast through `unknown` so callers may pass partial fixtures.
+ */
+function doc(partial: Partial<Oas3Definition>): Oas3Definition {
+  return {
+    openapi: '3.0.3',
+    info: { title: 'Test', version: '1.0.0' },
+    paths: {},
+    ...partial,
+  } as Oas3Definition;
+}
+
+/** Convenience: invoke buildApiModel and return the first named schema. */
+function buildSchemaOnly(schema: Oas3Schema): SchemaModel {
+  const model = buildApiModel(
+    doc({ components: { schemas: { X: schema as Oas3Schema } } } as Partial<Oas3Definition>)
+  );
+  return model.schemas[0].schema;
+}
+
+/** Convenience: invoke buildApiModel and return the only operation. */
+function buildOpOnly(input: Partial<Oas3Definition>): OperationModel {
+  const model = buildApiModel(doc(input));
+  return model.services[0].operations[0];
+}
+
+describe('buildApiModel — operationId fallback naming', () => {
+  function opsOf(paths: Record<string, unknown>): OperationModel[] {
+    return buildApiModel(doc({ paths } as Partial<Oas3Definition>)).services[0].operations;
+  }
+  const res = { '200': { description: 'ok' } };
+
+  it('synthesizes <method><PascalSegments> when operationId is absent', () => {
+    expect(opsOf({ '/pets': { get: { responses: res } } })[0].name).toBe('getPets');
+  });
+
+  it('includes path-param segments (so collection vs item stay distinct)', () => {
+    expect(opsOf({ '/pets/{petId}': { get: { responses: res } } })[0].name).toBe('getPetsPetId');
+  });
+
+  it('splits non-identifier characters in a segment into words', () => {
+    expect(opsOf({ '/pets/{pet-id}': { get: { responses: res } } })[0].name).toBe('getPetsPetId');
+  });
+
+  it('falls back to just the method for the root path', () => {
+    expect(opsOf({ '/': { get: { responses: res } } })[0].name).toBe('get');
+  });
+
+  it('keeps a declared operationId (it wins over synthesis)', () => {
+    expect(opsOf({ '/pets': { get: { operationId: 'listPets', responses: res } } })[0].name).toBe(
+      'listPets'
+    );
+  });
+
+  it('uniquifies a synthesized name that collides with a declared operationId', () => {
+    const names = opsOf({
+      '/pets': { get: { responses: res }, post: { operationId: 'getPets', responses: res } },
+    })
+      .map((o) => o.name)
+      .sort();
+    expect(names).toEqual(['getPets', 'getPets2']);
+  });
+});
+
+describe('buildApiModel — top-level metadata', () => {
+  it('reads title/version/description/baseUrl from info & servers', () => {
+    const model = buildApiModel(
+      doc({
+        info: { title: 'My API', version: '2.0.0', description: 'docs here' },
+        servers: [{ url: 'https://api.example.com' }, { url: 'https://api.backup.com' }],
+      })
+    );
+    expect(model.title).toBe('My API');
+    expect(model.version).toBe('2.0.0');
+    expect(model.description).toBe('docs here');
+    expect(model.baseUrl).toBe('https://api.example.com');
+  });
+
+  it('falls back to defaults when info/servers are missing', () => {
+    const model = buildApiModel({ openapi: '3.0.3', paths: {} } as Oas3Definition);
+    expect(model.title).toBe('Api');
+    expect(model.version).toBe('0.0.0');
+    expect(model.description).toBeUndefined();
+    expect(model.baseUrl).toBe('');
+  });
+
+  it('emits an empty schemas array when components.schemas is absent', () => {
+    const model = buildApiModel(doc({}));
+    expect(model.schemas).toEqual([]);
+  });
+
+  it('tolerates documents that have no `paths` field at all', () => {
+    const model = buildApiModel({
+      openapi: '3.0.3',
+      info: { title: 't', version: '1' },
+    } as Oas3Definition);
+    expect(model.services[0].operations).toEqual([]);
+  });
+});
+
+describe('buildNamedSchemas', () => {
+  it('builds inline schemas with their description', () => {
+    const model = buildApiModel(
+      doc({
+        components: {
+          schemas: {
+            Foo: { type: 'string', description: 'a foo' } as Oas3Schema,
+          },
+        },
+      } as Partial<Oas3Definition>)
+    );
+    expect(model.schemas[0]).toEqual({
+      name: 'Foo',
+      schema: { kind: 'scalar', scalar: 'string', description: 'a foo' },
+      description: 'a foo',
+    });
+  });
+
+  it('forwards a $ref-only schema entry to its target', () => {
+    const model = buildApiModel(
+      doc({
+        components: {
+          schemas: {
+            Target: { type: 'string', description: 'target desc' } as Oas3Schema,
+            Alias: { $ref: '#/components/schemas/Target' } as unknown as Oas3Schema,
+          },
+        },
+      } as Partial<Oas3Definition>)
+    );
+    const alias = model.schemas.find((s) => s.name === 'Alias');
+    expect(alias?.schema).toMatchObject({ kind: 'scalar', scalar: 'string' });
+    expect(alias?.description).toBe('target desc');
+  });
+});
+
+describe('buildServices — paths & methods', () => {
+  it('skips falsy path items', () => {
+    const model = buildApiModel(
+      doc({ paths: { '/skip': null as unknown as never } } as Partial<Oas3Definition>)
+    );
+    expect(model.services[0].operations).toEqual([]);
+  });
+
+  it('dereferences $ref path items', () => {
+    const model = buildApiModel(
+      doc({
+        paths: {
+          '/proxy': { $ref: '#/x-stash/pathA' } as unknown as never,
+        },
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        ...({ 'x-stash': { pathA: { get: { operationId: 'opA', responses: {} } } } } as any),
+      })
+    );
+    expect(model.services[0].operations[0].name).toBe('opA');
+  });
+
+  it('iterates every HTTP method that is present', () => {
+    const make = (id: string) => ({ operationId: id, responses: {} });
+    const model = buildApiModel(
+      doc({
+        paths: {
+          '/m': {
+            get: make('g'),
+            post: make('po'),
+            put: make('pu'),
+            delete: make('d'),
+            patch: make('pa'),
+            head: make('h'),
+            options: make('o'),
+          } as never,
+        },
+      })
+    );
+    expect(model.services[0].operations.map((op) => op.method)).toEqual([
+      'get',
+      'post',
+      'put',
+      'delete',
+      'patch',
+      'head',
+      'options',
+    ]);
+  });
+
+  it('propagates path-level parameters and lets operation-level params override them', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/users/{id}': {
+          parameters: [
+            { name: 'id', in: 'path', required: true, schema: { type: 'string' } },
+            { name: 'verbose', in: 'query', schema: { type: 'boolean' } },
+          ] as never,
+          get: {
+            operationId: 'getUser',
+            parameters: [
+              { name: 'id', in: 'path', required: true, schema: { type: 'integer' } },
+            ] as never,
+            responses: {},
+          },
+        } as never,
+      },
+    });
+    expect(op.pathParams.find((p) => p.name === 'id')?.schema).toEqual({
+      kind: 'scalar',
+      scalar: 'integer',
+    });
+    expect(op.queryParams.find((p) => p.name === 'verbose')).toBeTruthy();
+  });
+});
+
+describe('buildOperation — tags', () => {
+  it('carries the operation tags through to the model', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/pets': {
+          get: { operationId: 'listPets', tags: ['pets', 'public'], responses: {} },
+        } as never,
+      },
+    });
+    expect(op.tags).toEqual(['pets', 'public']);
+  });
+
+  it('defaults to an empty tags array when the operation declares none', () => {
+    const op = buildOpOnly({
+      paths: { '/health': { get: { operationId: 'health', responses: {} } } as never },
+    });
+    expect(op.tags).toEqual([]);
+  });
+});
+
+describe('buildOperation — param paths', () => {
+  it('splits parameters by their `in` location', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/x/{p}': {
+          get: {
+            operationId: 'op',
+            parameters: [
+              { name: 'p', in: 'path', required: true, schema: { type: 'string' } },
+              { name: 'q', in: 'query', schema: { type: 'string' } },
+              { name: 'X-Tok', in: 'header', schema: { type: 'string' } },
+              { name: 'c', in: 'cookie', schema: { type: 'string' } },
+            ] as never,
+            responses: {},
+          },
+        } as never,
+      },
+    });
+    expect(op.pathParams.map((p) => p.name)).toEqual(['p']);
+    expect(op.queryParams.map((p) => p.name)).toEqual(['q']);
+    expect(op.headerParams.map((p) => p.name)).toEqual(['X-Tok']);
+  });
+
+  it('resolves a $ref requestBody', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/x': {
+          post: {
+            operationId: 'create',
+            requestBody: { $ref: '#/components/requestBodies/CreateBody' } as never,
+            responses: {},
+          },
+        } as never,
+      },
+      components: {
+        requestBodies: {
+          CreateBody: {
+            required: true,
+            content: { 'application/json': { schema: { type: 'string' } } },
+          },
+        },
+      } as never,
+    });
+    expect(op.requestBody?.contentType).toBe('application/json');
+    expect(op.requestBody?.required).toBe(true);
+  });
+
+  it('omits requestBody when the operation has none', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/x': { get: { operationId: 'op', responses: {} } } as never,
+      },
+    });
+    expect(op.requestBody).toBeUndefined();
+  });
+});
+
+describe('buildParameter', () => {
+  it('throws when `in` is missing', () => {
+    expect(() =>
+      buildApiModel(
+        doc({
+          paths: {
+            '/x': {
+              get: {
+                operationId: 'op',
+                parameters: [{ name: 'p', schema: { type: 'string' } }] as never,
+                responses: {},
+              },
+            } as never,
+          },
+        })
+      )
+    ).toThrow(/missing "in"/);
+  });
+
+  it('throws for an unsupported `in` value', () => {
+    expect(() =>
+      buildApiModel(
+        doc({
+          paths: {
+            '/x': {
+              get: {
+                operationId: 'op',
+                parameters: [{ name: 'p', in: 'body', schema: { type: 'string' } }] as never,
+                responses: {},
+              },
+            } as never,
+          },
+        })
+      )
+    ).toThrow(/Unsupported parameter location/);
+  });
+
+  it('produces an unknown schema when none is declared', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/x/{p}': {
+          get: {
+            operationId: 'op',
+            parameters: [{ name: 'p', in: 'path', required: true }] as never,
+            responses: {},
+          },
+        } as never,
+      },
+    });
+    expect(op.pathParams[0].schema).toEqual({ kind: 'unknown' });
+  });
+
+  it('preserves $ref-typed parameter schemas', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/x': {
+          get: {
+            operationId: 'op',
+            parameters: [
+              { name: 'q', in: 'query', schema: { $ref: '#/components/schemas/Id' } as never },
+            ] as never,
+            responses: {},
+          },
+        } as never,
+      },
+      components: { schemas: { Id: { type: 'string' } } as never },
+    });
+    expect(op.queryParams[0].schema).toEqual({ kind: 'ref', name: 'Id' });
+  });
+
+  it('passes through description and required', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/x': {
+          get: {
+            operationId: 'op',
+            parameters: [
+              {
+                name: 'q',
+                in: 'query',
+                required: true,
+                description: 'desc',
+                schema: { type: 'string' },
+              },
+            ] as never,
+            responses: {},
+          },
+        } as never,
+      },
+    });
+    expect(op.queryParams[0]).toMatchObject({ description: 'desc', required: true });
+  });
+
+  it('captures style/explode on a query param', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/x': {
+          get: {
+            operationId: 'op',
+            parameters: [
+              {
+                name: 'tags',
+                in: 'query',
+                style: 'pipeDelimited',
+                explode: false,
+                schema: { type: 'array', items: { type: 'string' } },
+              },
+            ] as never,
+            responses: {},
+          },
+        } as never,
+      },
+    });
+    expect(op.queryParams[0]).toMatchObject({ style: 'pipeDelimited', explode: false });
+  });
+
+  it('captures allowReserved on a query param', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/x': {
+          get: {
+            operationId: 'op',
+            parameters: [
+              { name: 'q', in: 'query', allowReserved: true, schema: { type: 'string' } },
+            ] as never,
+            responses: {},
+          },
+        } as never,
+      },
+    });
+    expect(op.queryParams[0].allowReserved).toBe(true);
+  });
+
+  it('leaves style/explode/allowReserved undefined on a plain query param', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/x': {
+          get: {
+            operationId: 'op',
+            parameters: [{ name: 'q', in: 'query', schema: { type: 'string' } }] as never,
+            responses: {},
+          },
+        } as never,
+      },
+    });
+    expect(op.queryParams[0].style).toBeUndefined();
+    expect(op.queryParams[0].explode).toBeUndefined();
+    expect(op.queryParams[0].allowReserved).toBeUndefined();
+  });
+
+  it('ignores an unknown style string (leaves style undefined)', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/x': {
+          get: {
+            operationId: 'op',
+            parameters: [
+              { name: 'q', in: 'query', style: 'matrix', schema: { type: 'string' } },
+            ] as never,
+            responses: {},
+          },
+        } as never,
+      },
+    });
+    expect(op.queryParams[0].style).toBeUndefined();
+  });
+
+  it('does not set style/explode/allowReserved on non-query params', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/x/{p}': {
+          get: {
+            operationId: 'op',
+            parameters: [
+              {
+                name: 'p',
+                in: 'path',
+                required: true,
+                style: 'pipeDelimited',
+                explode: false,
+                allowReserved: true,
+                schema: { type: 'string' },
+              },
+              {
+                name: 'X-Tok',
+                in: 'header',
+                style: 'pipeDelimited',
+                explode: false,
+                schema: { type: 'string' },
+              },
+            ] as never,
+            responses: {},
+          },
+        } as never,
+      },
+    });
+    const p = op.pathParams[0];
+    const h = op.headerParams[0];
+    expect(p.style).toBeUndefined();
+    expect(p.explode).toBeUndefined();
+    expect(p.allowReserved).toBeUndefined();
+    expect(h.style).toBeUndefined();
+    expect(h.explode).toBeUndefined();
+    expect(h.allowReserved).toBeUndefined();
+  });
+});
+
+describe('buildRequestBody', () => {
+  const makeOp = (content: Record<string, unknown>, required = false): Partial<Oas3Definition> => ({
+    paths: {
+      '/x': {
+        post: {
+          operationId: 'op',
+          requestBody: { content, required } as never,
+          responses: {},
+        },
+      } as never,
+    },
+  });
+
+  it('returns undefined when there is no content at all', () => {
+    const op = buildOpOnly(makeOp({}));
+    expect(op.requestBody).toBeUndefined();
+  });
+
+  it('returns undefined when the requestBody has no `content` field whatsoever', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/x': {
+          post: {
+            operationId: 'op',
+            requestBody: { required: true } as never,
+            responses: {},
+          },
+        } as never,
+      },
+    });
+    expect(op.requestBody).toBeUndefined();
+  });
+
+  it('prefers application/json when multiple media types are offered', () => {
+    const op = buildOpOnly(
+      makeOp({
+        'application/xml': { schema: { type: 'string' } },
+        'application/json': { schema: { type: 'number' } },
+      })
+    );
+    expect(op.requestBody?.contentType).toBe('application/json');
+  });
+
+  it('prefers merge-patch+json when JSON is not present', () => {
+    const op = buildOpOnly(
+      makeOp({
+        'application/xml': { schema: { type: 'string' } },
+        'application/merge-patch+json': { schema: { type: 'number' } },
+      })
+    );
+    expect(op.requestBody?.contentType).toBe('application/merge-patch+json');
+  });
+
+  it('falls back to x-www-form-urlencoded', () => {
+    const op = buildOpOnly(
+      makeOp({
+        'application/xml': { schema: { type: 'string' } },
+        'application/x-www-form-urlencoded': { schema: { type: 'object' } },
+      })
+    );
+    expect(op.requestBody?.contentType).toBe('application/x-www-form-urlencoded');
+  });
+
+  it('falls back to multipart/form-data', () => {
+    const op = buildOpOnly(
+      makeOp({
+        'application/xml': { schema: { type: 'string' } },
+        'multipart/form-data': { schema: { type: 'object' } },
+      })
+    );
+    expect(op.requestBody?.contentType).toBe('multipart/form-data');
+  });
+
+  it('falls back to the first available media type when no known one matches', () => {
+    const op = buildOpOnly(
+      makeOp({
+        'application/xml': { schema: { type: 'string' } },
+      })
+    );
+    expect(op.requestBody?.contentType).toBe('application/xml');
+  });
+
+  it('reads schema $ref into a ref node', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/x': {
+          post: {
+            operationId: 'op',
+            requestBody: {
+              content: {
+                'application/json': { schema: { $ref: '#/components/schemas/X' } as never },
+              },
+            } as never,
+            responses: {},
+          },
+        } as never,
+      },
+      components: { schemas: { X: { type: 'string' } } as never },
+    });
+    expect(op.requestBody?.schema).toEqual({ kind: 'ref', name: 'X' });
+  });
+
+  it('produces an unknown schema when none is declared', () => {
+    const op = buildOpOnly(
+      makeOp({
+        'application/json': {},
+      })
+    );
+    expect(op.requestBody?.schema).toEqual({ kind: 'unknown' });
+  });
+
+  it('emits the inline schema when one is declared', () => {
+    const op = buildOpOnly(makeOp({ 'application/json': { schema: { type: 'string' } } }, true));
+    expect(op.requestBody?.schema).toEqual({ kind: 'scalar', scalar: 'string' });
+    expect(op.requestBody?.required).toBe(true);
+  });
+});
+
+describe('buildSuccessResponses', () => {
+  const opWithResponses = (responses: Record<string, unknown>): Partial<Oas3Definition> => ({
+    paths: {
+      '/x': {
+        get: { operationId: 'op', responses: responses as never },
+      } as never,
+    },
+  });
+
+  it('returns [] when responses is empty', () => {
+    expect(buildOpOnly(opWithResponses({})).successResponses).toEqual([]);
+  });
+
+  it('returns [] when the operation has no `responses` field at all', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/x': { get: { operationId: 'op' } as never } as never,
+      },
+    });
+    expect(op.successResponses).toEqual([]);
+  });
+
+  it('uses `default` when no 2xx response exists', () => {
+    const op = buildOpOnly(
+      opWithResponses({
+        default: { content: { 'application/json': { schema: { type: 'string' } } } },
+      })
+    );
+    expect(op.successResponses[0].contentType).toBe('application/json');
+    expect(op.successResponses[0].status).toBe('default');
+  });
+
+  it('sets status to the numeric 2xx code', () => {
+    const op = buildOpOnly(
+      opWithResponses({
+        '201': { content: { 'application/json': { schema: { type: 'string' } } } },
+      })
+    );
+    expect(op.successResponses[0].status).toBe(201);
+  });
+
+  it('returns [] when neither 2xx nor default exist', () => {
+    expect(
+      buildOpOnly(
+        opWithResponses({
+          '404': { content: { 'application/json': { schema: { type: 'string' } } } },
+        })
+      ).successResponses
+    ).toEqual([]);
+  });
+
+  it('returns [] when the response object is missing/null', () => {
+    expect(buildOpOnly(opWithResponses({ '200': null })).successResponses).toEqual([]);
+  });
+
+  it('returns [] when the response has no content (204-style)', () => {
+    expect(
+      buildOpOnly(opWithResponses({ '204': { description: 'No content' } })).successResponses
+    ).toEqual([]);
+  });
+
+  it('dereferences a $ref response', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/x': {
+          get: {
+            operationId: 'op',
+            responses: { '200': { $ref: '#/components/responses/Ok' } } as never,
+          },
+        } as never,
+      },
+      components: {
+        responses: {
+          Ok: { content: { 'application/json': { schema: { type: 'string' } } } },
+        } as never,
+      },
+    });
+    expect(op.successResponses[0].schema).toEqual({ kind: 'scalar', scalar: 'string' });
+  });
+
+  it('emits unknown for response media without a schema', () => {
+    const op = buildOpOnly(opWithResponses({ '200': { content: { 'application/json': {} } } }));
+    expect(op.successResponses[0].schema).toEqual({ kind: 'unknown' });
+  });
+
+  it('emits ref for response media whose schema is a $ref', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/x': {
+          get: {
+            operationId: 'op',
+            responses: {
+              '200': {
+                content: {
+                  'application/json': { schema: { $ref: '#/components/schemas/X' } as never },
+                },
+              },
+            } as never,
+          },
+        } as never,
+      },
+      components: { schemas: { X: { type: 'string' } } as never },
+    });
+    expect(op.successResponses[0].schema).toEqual({ kind: 'ref', name: 'X' });
+  });
+
+  it('captures itemSchema on a text/event-stream success response', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/messages': {
+          get: {
+            operationId: 'streamMessages',
+            responses: {
+              '200': {
+                description: 'ok',
+                content: {
+                  'text/event-stream': {
+                    itemSchema: { $ref: '#/components/schemas/Message' },
+                  } as never,
+                },
+              },
+            } as never,
+          },
+        } as never,
+      },
+      components: {
+        schemas: { Message: { type: 'object', properties: { text: { type: 'string' } } } } as never,
+      },
+    });
+    expect(op.successResponses[0].itemSchema).toEqual({ kind: 'ref', name: 'Message' });
+  });
+
+  it('leaves itemSchema undefined for an ordinary JSON response', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/x': {
+          get: {
+            operationId: 'op',
+            responses: {
+              '200': { content: { 'application/json': { schema: { type: 'string' } } } },
+            } as never,
+          },
+        } as never,
+      },
+    });
+    expect(op.successResponses[0].itemSchema).toBeUndefined();
+  });
+});
+
+describe('buildErrorResponses', () => {
+  const opWithResponses = (responses: Record<string, unknown>): Partial<Oas3Definition> => ({
+    paths: {
+      '/x': {
+        get: { operationId: 'op', responses: responses as never },
+      } as never,
+    },
+  });
+
+  it('captures 4xx and 5xx responses, leaving successResponses for the 2xx', () => {
+    const op = buildOpOnly(
+      opWithResponses({
+        '200': { content: { 'application/json': { schema: { type: 'string' } } } },
+        '404': { content: { 'application/json': { schema: { type: 'number' } } } },
+        '500': { content: { 'application/json': { schema: { type: 'boolean' } } } },
+      })
+    );
+    expect(op.errorResponses).toEqual([
+      {
+        contentType: 'application/json',
+        schema: { kind: 'scalar', scalar: 'number' },
+        status: 404,
+      },
+      {
+        contentType: 'application/json',
+        schema: { kind: 'scalar', scalar: 'boolean' },
+        status: 500,
+      },
+    ]);
+    expect(op.successResponses).toEqual([
+      {
+        contentType: 'application/json',
+        schema: { kind: 'scalar', scalar: 'string' },
+        status: 200,
+      },
+    ]);
+  });
+
+  it('treats `default` as an error when a 2xx success also exists', () => {
+    const op = buildOpOnly(
+      opWithResponses({
+        '200': { content: { 'application/json': { schema: { type: 'string' } } } },
+        default: { content: { 'application/json': { schema: { type: 'number' } } } },
+      })
+    );
+    expect(op.errorResponses).toEqual([
+      {
+        contentType: 'application/json',
+        schema: { kind: 'scalar', scalar: 'number' },
+        status: 'default',
+      },
+    ]);
+    expect(op.successResponses).toEqual([
+      {
+        contentType: 'application/json',
+        schema: { kind: 'scalar', scalar: 'string' },
+        status: 200,
+      },
+    ]);
+  });
+
+  it('does not treat `default` as an error when no 2xx exists (success consumes it)', () => {
+    const op = buildOpOnly(
+      opWithResponses({
+        default: { content: { 'application/json': { schema: { type: 'number' } } } },
+      })
+    );
+    expect(op.successResponses).toEqual([
+      {
+        contentType: 'application/json',
+        schema: { kind: 'scalar', scalar: 'number' },
+        status: 'default',
+      },
+    ]);
+    expect(op.errorResponses).toEqual([]);
+  });
+
+  it('returns [] when there are no error responses', () => {
+    const op = buildOpOnly(
+      opWithResponses({
+        '200': { content: { 'application/json': { schema: { type: 'string' } } } },
+      })
+    );
+    expect(op.errorResponses).toEqual([]);
+  });
+
+  it('emits one entry per content type on a 4xx with multiple media types', () => {
+    const op = buildOpOnly(
+      opWithResponses({
+        '200': { content: { 'application/json': { schema: { type: 'string' } } } },
+        '400': {
+          content: {
+            'application/json': { schema: { type: 'number' } },
+            'text/plain': { schema: { type: 'string' } },
+          },
+        },
+      })
+    );
+    expect(op.errorResponses).toEqual([
+      {
+        contentType: 'application/json',
+        schema: { kind: 'scalar', scalar: 'number' },
+        status: 400,
+      },
+      { contentType: 'text/plain', schema: { kind: 'scalar', scalar: 'string' }, status: 400 },
+    ]);
+  });
+
+  it('skips a missing/null error response and one without content', () => {
+    const op = buildOpOnly(
+      opWithResponses({
+        '200': { content: { 'application/json': { schema: { type: 'string' } } } },
+        '404': null,
+        '500': { description: 'no content' },
+      })
+    );
+    expect(op.errorResponses).toEqual([]);
+  });
+
+  it('dereferences a $ref error response', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/x': {
+          get: {
+            operationId: 'op',
+            responses: {
+              '200': { content: { 'application/json': { schema: { type: 'string' } } } },
+              '404': { $ref: '#/components/responses/NotFound' },
+            } as never,
+          },
+        } as never,
+      },
+      components: {
+        responses: {
+          NotFound: {
+            content: { 'application/json': { schema: { $ref: '#/components/schemas/Err' } } },
+          },
+        } as never,
+      },
+    });
+    expect(op.errorResponses).toEqual([
+      { contentType: 'application/json', schema: { kind: 'ref', name: 'Err' }, status: 404 },
+    ]);
+  });
+
+  it('sets numeric error statuses (404, 422) and `default` correctly', () => {
+    const op = buildOpOnly(
+      opWithResponses({
+        '200': { content: { 'application/json': { schema: { type: 'string' } } } },
+        '404': { content: { 'application/json': { schema: { type: 'string' } } } },
+        '422': { content: { 'application/json': { schema: { type: 'string' } } } },
+        default: { content: { 'application/json': { schema: { type: 'string' } } } },
+      })
+    );
+    expect(op.errorResponses.map((r) => r.status)).toEqual([404, 422, 'default']);
+  });
+});
+
+describe('buildSchema — every schema kind', () => {
+  it('renders oneOf as a union (preserving members with $ref)', () => {
+    const got = buildSchemaOnly({
+      oneOf: [{ $ref: '#/components/schemas/A' } as never, { type: 'number' }],
+    } as Oas3Schema);
+    expect(got).toEqual({
+      kind: 'union',
+      members: [
+        { kind: 'ref', name: 'A' },
+        { kind: 'scalar', scalar: 'number' },
+      ],
+    });
+  });
+
+  it('renders anyOf as a union too', () => {
+    const got = buildSchemaOnly({ anyOf: [{ type: 'string' }, { type: 'number' }] } as Oas3Schema);
+    expect(got.kind).toBe('union');
+  });
+
+  it('renders allOf as intersection when there are 2+ members', () => {
+    const got = buildSchemaOnly({
+      allOf: [{ type: 'string' }, { $ref: '#/components/schemas/B' } as never],
+    } as Oas3Schema);
+    expect(got).toEqual({
+      kind: 'intersection',
+      members: [
+        { kind: 'scalar', scalar: 'string' },
+        { kind: 'ref', name: 'B' },
+      ],
+    });
+  });
+
+  it('flattens allOf with a single member, using its own description if present', () => {
+    const got = buildSchemaOnly({
+      description: 'outer desc',
+      allOf: [{ type: 'string', description: 'inner' }],
+    } as Oas3Schema);
+    expect(got).toEqual({ kind: 'scalar', scalar: 'string', description: 'inner' });
+  });
+
+  it('flattens allOf with a single member, inheriting the outer description if member has none', () => {
+    const got = buildSchemaOnly({
+      description: 'outer desc',
+      allOf: [{ type: 'string' }],
+    } as Oas3Schema);
+    expect(got).toEqual({ kind: 'scalar', scalar: 'string', description: 'outer desc' });
+  });
+
+  it("folds a schema's own properties into its allOf intersection (keeps the discriminant)", () => {
+    // `allOf` does not replace sibling `properties`; the own object (here the
+    // `kind` discriminant) must be intersected with the allOf members, not dropped.
+    const got = buildSchemaOnly({
+      type: 'object',
+      properties: { kind: { type: 'string', const: 'A' } },
+      allOf: [{ $ref: '#/components/schemas/Base' } as never],
+    } as Oas3Schema);
+    expect(got).toEqual({
+      kind: 'intersection',
+      members: [
+        {
+          kind: 'object',
+          properties: [{ name: 'kind', schema: { kind: 'literal', value: 'A' }, required: false }],
+        },
+        { kind: 'ref', name: 'Base' },
+      ],
+    });
+  });
+
+  it('renders a single `type: "null"` schema as null', () => {
+    expect(buildSchemaOnly({ type: 'null' } as never)).toEqual({ kind: 'null' });
+  });
+
+  it('handles OpenAPI 3.1 array-of-types nullable as union (string | null)', () => {
+    const got = buildSchemaOnly({ type: ['string', 'null'] as never } as Oas3Schema);
+    expect(got).toEqual({
+      kind: 'union',
+      members: [{ kind: 'scalar', scalar: 'string' }, { kind: 'null' }],
+    });
+  });
+
+  it('reduces a single-element array of types to just that type', () => {
+    const got = buildSchemaOnly({ type: ['string'] as never } as Oas3Schema);
+    expect(got).toEqual({ kind: 'scalar', scalar: 'string' });
+  });
+
+  it('handles array-of-types union without null', () => {
+    const got = buildSchemaOnly({ type: ['string', 'number'] as never } as Oas3Schema);
+    expect(got.kind).toBe('union');
+  });
+
+  it('handles OpenAPI 3.0 nullable: true', () => {
+    const got = buildSchemaOnly({ type: 'string', nullable: true } as unknown as Oas3Schema);
+    expect(got).toEqual({
+      kind: 'union',
+      members: [{ kind: 'scalar', scalar: 'string' }, { kind: 'null' }],
+    });
+  });
+
+  it('renders const string as literal', () => {
+    expect(buildSchemaOnly({ const: 'hello' } as unknown as Oas3Schema)).toEqual({
+      kind: 'literal',
+      value: 'hello',
+    });
+  });
+
+  it('renders const number as literal', () => {
+    expect(buildSchemaOnly({ const: 42 } as unknown as Oas3Schema)).toEqual({
+      kind: 'literal',
+      value: 42,
+    });
+  });
+
+  it('renders const boolean as literal', () => {
+    expect(buildSchemaOnly({ const: true } as unknown as Oas3Schema)).toEqual({
+      kind: 'literal',
+      value: true,
+    });
+  });
+
+  it('throws NotSupportedError for unsupported const value types (objects)', () => {
+    expect(() => buildSchemaOnly({ const: { a: 1 } } as unknown as Oas3Schema)).toThrow(
+      NotSupportedError
+    );
+  });
+
+  it('renders enum strings with scalar=string', () => {
+    expect(buildSchemaOnly({ enum: ['a', 'b'] } as Oas3Schema)).toEqual({
+      kind: 'enum',
+      values: ['a', 'b'],
+      scalar: 'string',
+    });
+  });
+
+  it('renders enum numbers with scalar=number', () => {
+    expect(buildSchemaOnly({ enum: [1, 2] } as Oas3Schema)).toEqual({
+      kind: 'enum',
+      values: [1, 2],
+      scalar: 'number',
+    });
+  });
+
+  it('widens boolean enums to a plain boolean scalar (see #4)', () => {
+    expect(buildSchemaOnly({ enum: [true, false] } as Oas3Schema)).toEqual({
+      kind: 'scalar',
+      scalar: 'boolean',
+    });
+  });
+
+  it('renders mixed-type enums with the fallback scalar=string', () => {
+    const got = buildSchemaOnly({ enum: ['a', 1] } as Oas3Schema);
+    expect(got).toMatchObject({ kind: 'enum', scalar: 'string' });
+  });
+
+  it('throws NotSupportedError for enum entries with unsupported types', () => {
+    expect(() => buildSchemaOnly({ enum: [{ a: 1 }] } as Oas3Schema)).toThrow(NotSupportedError);
+  });
+
+  it('renders array with inline items', () => {
+    expect(buildSchemaOnly({ type: 'array', items: { type: 'string' } } as Oas3Schema)).toEqual({
+      kind: 'array',
+      items: { kind: 'scalar', scalar: 'string' },
+    });
+  });
+
+  it('renders array with $ref items', () => {
+    expect(
+      buildSchemaOnly({
+        type: 'array',
+        items: { $ref: '#/components/schemas/Y' } as never,
+      } as Oas3Schema)
+    ).toEqual({ kind: 'array', items: { kind: 'ref', name: 'Y' } });
+  });
+
+  it('renders array with missing items as array of unknown', () => {
+    expect(buildSchemaOnly({ type: 'array' } as Oas3Schema)).toEqual({
+      kind: 'array',
+      items: { kind: 'unknown' },
+    });
+  });
+
+  it('renders array with boolean items as array of unknown', () => {
+    expect(
+      buildSchemaOnly({ type: 'array', items: true as unknown as Oas3Schema } as Oas3Schema)
+    ).toEqual({ kind: 'array', items: { kind: 'unknown' } });
+  });
+
+  it('renders object with properties', () => {
+    const got = buildSchemaOnly({
+      type: 'object',
+      required: ['id'],
+      properties: {
+        id: { type: 'string' },
+        name: { type: 'string', description: 'opt' },
+      },
+    } as Oas3Schema);
+    expect(got).toEqual({
+      kind: 'object',
+      properties: [
+        { name: 'id', schema: { kind: 'scalar', scalar: 'string' }, required: true },
+        {
+          name: 'name',
+          schema: { kind: 'scalar', scalar: 'string', description: 'opt' },
+          required: false,
+          description: 'opt',
+        },
+      ],
+    });
+  });
+
+  it('renders record (additionalProperties: true) as kind record/unknown', () => {
+    expect(
+      buildSchemaOnly({ type: 'object', additionalProperties: true } as unknown as Oas3Schema)
+    ).toEqual({ kind: 'record', value: { kind: 'unknown' } });
+  });
+
+  it('renders record with $ref-valued additionalProperties', () => {
+    expect(
+      buildSchemaOnly({
+        type: 'object',
+        additionalProperties: { $ref: '#/components/schemas/Z' } as never,
+      } as Oas3Schema)
+    ).toEqual({ kind: 'record', value: { kind: 'ref', name: 'Z' } });
+  });
+
+  it('renders record with inline-valued additionalProperties', () => {
+    expect(
+      buildSchemaOnly({
+        type: 'object',
+        additionalProperties: { type: 'number' },
+      } as Oas3Schema)
+    ).toEqual({ kind: 'record', value: { kind: 'scalar', scalar: 'number' } });
+  });
+
+  it('treats a schema with `properties` (no type) as object', () => {
+    const got = buildSchemaOnly({
+      properties: { a: { type: 'string' } },
+    } as Oas3Schema);
+    expect(got.kind).toBe('object');
+  });
+
+  it('treats a schema with only `additionalProperties` (no type, no props) as record', () => {
+    const got = buildSchemaOnly({
+      additionalProperties: { type: 'string' },
+    } as Oas3Schema);
+    expect(got.kind).toBe('record');
+  });
+
+  it('renders a property-less object (no additionalProperties) as a free-form record of unknown', () => {
+    // OpenAPI defaults absent `additionalProperties` to allowed, so `type: object`
+    // with no declared properties is free-form: `{ [key: string]: unknown }`, not
+    // `{}` — the latter forbids member access on the emitted type.
+    expect(buildSchemaOnly({ type: 'object' } as Oas3Schema)).toEqual({
+      kind: 'record',
+      value: { kind: 'unknown' },
+    });
+  });
+
+  it('keeps a property-less object with `additionalProperties: false` as a closed empty object', () => {
+    // Explicitly closed — no arbitrary keys allowed — so it stays `{}` (kind object).
+    expect(
+      buildSchemaOnly({ type: 'object', additionalProperties: false } as unknown as Oas3Schema)
+    ).toEqual({ kind: 'object', properties: [] });
+  });
+
+  it('captures `readOnly: true` on object properties', () => {
+    expect(
+      buildSchemaOnly({
+        type: 'object',
+        properties: {
+          id: { type: 'string', readOnly: true },
+          name: { type: 'string' },
+        },
+      } as unknown as Oas3Schema)
+    ).toEqual({
+      kind: 'object',
+      properties: [
+        {
+          name: 'id',
+          schema: { kind: 'scalar', scalar: 'string' },
+          required: false,
+          readOnly: true,
+        },
+        { name: 'name', schema: { kind: 'scalar', scalar: 'string' }, required: false },
+      ],
+    });
+  });
+
+  it('renders scalar string/number/integer/boolean', () => {
+    expect(buildSchemaOnly({ type: 'string' } as Oas3Schema)).toEqual({
+      kind: 'scalar',
+      scalar: 'string',
+    });
+    expect(buildSchemaOnly({ type: 'number' } as Oas3Schema)).toEqual({
+      kind: 'scalar',
+      scalar: 'number',
+    });
+    expect(buildSchemaOnly({ type: 'integer' } as Oas3Schema)).toEqual({
+      kind: 'scalar',
+      scalar: 'integer',
+    });
+    expect(buildSchemaOnly({ type: 'boolean' } as Oas3Schema)).toEqual({
+      kind: 'scalar',
+      scalar: 'boolean',
+    });
+  });
+
+  it('falls back to unknown for sparsely-typed schemas (no type/props/enum/etc)', () => {
+    expect(buildSchemaOnly({ description: 'mystery' } as Oas3Schema)).toEqual({
+      kind: 'unknown',
+      description: 'mystery',
+    });
+  });
+
+  it('passes through descriptions for arrays/objects/records', () => {
+    expect(
+      buildSchemaOnly({
+        type: 'array',
+        items: { type: 'string' },
+        description: 'list',
+      } as Oas3Schema)
+    ).toMatchObject({ description: 'list' });
+  });
+});
+
+describe('buildProperties', () => {
+  it('marks $ref properties without a description', () => {
+    const got = buildSchemaOnly({
+      type: 'object',
+      properties: { ref: { $ref: '#/components/schemas/X' } as never },
+    } as Oas3Schema);
+    expect(got).toMatchObject({
+      kind: 'object',
+      properties: [{ name: 'ref', schema: { kind: 'ref', name: 'X' }, required: false }],
+    });
+  });
+});
+
+describe('resolveRef (via $ref edge cases)', () => {
+  it('rejects external $refs', () => {
+    expect(() =>
+      buildApiModel(
+        doc({
+          paths: {
+            '/x': { $ref: 'https://example.com/api.yaml' } as never,
+          },
+        })
+      )
+    ).toThrow(/External \$ref not supported/);
+  });
+
+  it('rejects refs that pass through a non-object segment', () => {
+    expect(() =>
+      buildApiModel(
+        doc({
+          paths: {
+            '/x': { $ref: '#/info/title/something' } as never,
+          },
+        })
+      )
+    ).toThrow(/Cannot resolve \$ref/);
+  });
+
+  it('rejects refs that resolve to undefined after walking through a non-object', () => {
+    expect(() =>
+      buildApiModel(
+        doc({
+          paths: {
+            '/x': { $ref: '#/components/schemas/Missing' } as never,
+          },
+        })
+      )
+    ).toThrow(/Cannot resolve \$ref/);
+  });
+
+  it('rejects refs whose last segment misses (current becomes undefined at the tail)', () => {
+    // `/info/nonexistent`: every prefix exists (info is an object), but the final lookup
+    // misses, exercising the `current === undefined` guard rather than the in-loop one.
+    expect(() =>
+      buildApiModel(
+        doc({
+          paths: {
+            '/x': { $ref: '#/info/nonexistent' } as never,
+          },
+        })
+      )
+    ).toThrow(/Cannot resolve \$ref/);
+  });
+
+  it('handles JSON-pointer escapes (~0, ~1)', () => {
+    const model = buildApiModel(
+      doc({
+        paths: {
+          '/x': { $ref: '#/x-stash/a~1b/c~0d' } as never,
+        },
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        ...({
+          'x-stash': {
+            'a/b': { 'c~d': { get: { operationId: 'esc', responses: {} } } },
+          },
+        } as any),
+      })
+    );
+    expect(model.services[0].operations[0].name).toBe('esc');
+  });
+
+  it('refName returns the input as-is when the ref has no slash', () => {
+    const got = buildSchemaOnly({
+      oneOf: [{ $ref: 'NoSlash' } as never],
+    } as Oas3Schema);
+    expect(got).toEqual({
+      kind: 'union',
+      members: [{ kind: 'ref', name: 'NoSlash' }],
+    });
+  });
+});
+
+describe('extractMetadata — validation keywords', () => {
+  it('lifts numeric constraints into metadata', () => {
+    const got = buildSchemaOnly({ type: 'integer', minimum: 1, maximum: 100 } as Oas3Schema);
+    expect(got).toEqual({
+      kind: 'scalar',
+      scalar: 'integer',
+      metadata: { minimum: 1, maximum: 100 },
+    });
+  });
+
+  it('lifts string constraints (minLength, maxLength, pattern, format) into metadata', () => {
+    const got = buildSchemaOnly({
+      type: 'string',
+      minLength: 1,
+      maxLength: 50,
+      pattern: '^[a-z]+$',
+      format: 'email',
+    } as Oas3Schema);
+    expect(got).toEqual({
+      kind: 'scalar',
+      scalar: 'string',
+      metadata: {
+        minLength: 1,
+        maxLength: 50,
+        pattern: '^[a-z]+$',
+        format: 'email',
+      },
+    });
+  });
+
+  it('lifts array constraints (minItems, maxItems, uniqueItems) into metadata', () => {
+    const got = buildSchemaOnly({
+      type: 'array',
+      items: { type: 'string' },
+      minItems: 1,
+      maxItems: 10,
+      uniqueItems: true,
+    } as Oas3Schema);
+    expect(got).toMatchObject({
+      kind: 'array',
+      metadata: { minItems: 1, maxItems: 10, uniqueItems: true },
+    });
+  });
+
+  it('lifts deprecated: true into metadata', () => {
+    const got = buildSchemaOnly({ type: 'string', deprecated: true } as Oas3Schema);
+    expect(got).toEqual({
+      kind: 'scalar',
+      scalar: 'string',
+      metadata: { deprecated: true },
+    });
+  });
+
+  it('omits the metadata field entirely when no validation keys are present', () => {
+    // Strict-equality guard: ensures we don't ratchet every schema with an empty `metadata: {}`.
+    const got = buildSchemaOnly({ type: 'string' } as Oas3Schema);
+    expect(got).toEqual({ kind: 'scalar', scalar: 'string' });
+    expect(got).not.toHaveProperty('metadata');
+  });
+
+  it('omits `deprecated` when it is explicitly false', () => {
+    // A `deprecated: false` carries no information and would just clutter JSDoc.
+    const got = buildSchemaOnly({ type: 'string', deprecated: false } as Oas3Schema);
+    expect(got).not.toHaveProperty('metadata');
+  });
+
+  it('omits `uniqueItems` when it is explicitly false', () => {
+    // Default is false; only `true` is interesting.
+    const got = buildSchemaOnly({
+      type: 'array',
+      items: { type: 'string' },
+      uniqueItems: false,
+    } as Oas3Schema);
+    expect(got).not.toHaveProperty('metadata');
+  });
+
+  it('passes through numeric exclusiveMinimum / exclusiveMaximum (OAS 3.1 form)', () => {
+    const got = buildSchemaOnly({
+      type: 'integer',
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      exclusiveMinimum: 0 as any,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      exclusiveMaximum: 600 as any,
+    } as Oas3Schema);
+    expect(got).toEqual({
+      kind: 'scalar',
+      scalar: 'integer',
+      metadata: { exclusiveMinimum: 0, exclusiveMaximum: 600 },
+    });
+  });
+
+  it('normalizes OAS 3.0 boolean exclusiveMinimum=true + minimum=X to numeric exclusiveMinimum=X', () => {
+    const got = buildSchemaOnly({
+      type: 'integer',
+      minimum: 0,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      exclusiveMinimum: true as any,
+    } as Oas3Schema);
+    expect(got).toEqual({
+      kind: 'scalar',
+      scalar: 'integer',
+      metadata: { exclusiveMinimum: 0 },
+    });
+  });
+
+  it('normalizes OAS 3.0 boolean exclusiveMaximum=true + maximum=X to numeric exclusiveMaximum=X', () => {
+    const got = buildSchemaOnly({
+      type: 'integer',
+      maximum: 100,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      exclusiveMaximum: true as any,
+    } as Oas3Schema);
+    expect(got).toEqual({
+      kind: 'scalar',
+      scalar: 'integer',
+      metadata: { exclusiveMaximum: 100 },
+    });
+  });
+
+  it('drops boolean exclusiveMinimum=false (3.0 form, no-op)', () => {
+    const got = buildSchemaOnly({
+      type: 'integer',
+      minimum: 5,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      exclusiveMinimum: false as any,
+    } as Oas3Schema);
+    expect(got).toEqual({
+      kind: 'scalar',
+      scalar: 'integer',
+      metadata: { minimum: 5 },
+    });
+  });
+
+  it('lifts metadata on inline object properties', () => {
+    const got = buildSchemaOnly({
+      type: 'object',
+      properties: {
+        name: { type: 'string', minLength: 1, maxLength: 50 } as Oas3Schema,
+      },
+    } as Oas3Schema);
+    expect(got).toMatchObject({
+      kind: 'object',
+      properties: [
+        {
+          name: 'name',
+          schema: {
+            kind: 'scalar',
+            scalar: 'string',
+            metadata: { minLength: 1, maxLength: 50 },
+          },
+        },
+      ],
+    });
+  });
+
+  it('folds a Parameter Object-level `deprecated: true` into its schema metadata', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/x': {
+          get: {
+            operationId: 'op',
+            parameters: [
+              {
+                name: 'q',
+                in: 'query',
+                deprecated: true,
+                schema: { type: 'string', maxLength: 10 },
+              },
+            ] as never,
+            responses: {},
+          },
+        } as never,
+      },
+    });
+    expect(op.queryParams[0].schema).toMatchObject({
+      kind: 'scalar',
+      scalar: 'string',
+      metadata: { maxLength: 10, deprecated: true },
+    });
+  });
+
+  it("preserves the wrapper schema's metadata when a single-member allOf collapses", () => {
+    // Exercises mergeMetadata(wrapper, undefined) — the inner has no metadata of
+    // its own, so the wrapper's constraints must survive the collapse.
+    const got = buildSchemaOnly({
+      allOf: [{ type: 'string' } as Oas3Schema],
+      minLength: 5,
+    } as Oas3Schema);
+    expect(got).toEqual({
+      kind: 'scalar',
+      scalar: 'string',
+      metadata: { minLength: 5 },
+    });
+  });
+
+  it("preserves the inner schema's metadata when the wrapper has none in a single-member allOf", () => {
+    // Exercises mergeMetadata(undefined, inner).
+    const got = buildSchemaOnly({
+      allOf: [{ type: 'string', minLength: 3 } as Oas3Schema],
+    } as Oas3Schema);
+    expect(got).toEqual({
+      kind: 'scalar',
+      scalar: 'string',
+      metadata: { minLength: 3 },
+    });
+  });
+
+  it('folds a Parameter Object-level `deprecated: true` into a $ref schema metadata', () => {
+    // When the parameter's schema is a $ref, we still need somewhere to attach
+    // the param-level deprecation. The ref carries it in its own metadata so the
+    // emitter can render it at the param's call-site context.
+    const op = buildOpOnly({
+      components: {
+        schemas: { Limit: { type: 'integer', minimum: 1 } as Oas3Schema },
+      } as never,
+      paths: {
+        '/x': {
+          get: {
+            operationId: 'op',
+            parameters: [
+              {
+                name: 'limit',
+                in: 'query',
+                deprecated: true,
+                schema: { $ref: '#/components/schemas/Limit' },
+              },
+            ] as never,
+            responses: {},
+          },
+        } as never,
+      },
+    });
+    expect(op.queryParams[0].schema).toEqual({
+      kind: 'ref',
+      name: 'Limit',
+      metadata: { deprecated: true },
+    });
+  });
+});
+
+describe('buildApiModel — enum with null (OAS 3.1)', () => {
+  it('models a standalone enum containing null as <enum> | null', () => {
+    const schema = buildSchemaOnly({ enum: ['a', 'b', null] } as never);
+    expect(schema).toEqual({
+      kind: 'union',
+      members: [{ kind: 'enum', values: ['a', 'b'], scalar: 'string' }, { kind: 'null' }],
+    });
+  });
+
+  it('models an enum of only null as the null type', () => {
+    const schema = buildSchemaOnly({ enum: [null] } as never);
+    expect(schema).toEqual({ kind: 'null' });
+  });
+
+  it('does not double null when type:[string,null] and enum both carry null', () => {
+    const schema = buildSchemaOnly({
+      type: ['string', 'null'],
+      enum: ['RUNNING', 'COMPLETED', null],
+    } as never);
+    expect(schema).toEqual({
+      kind: 'union',
+      members: [
+        { kind: 'enum', values: ['RUNNING', 'COMPLETED'], scalar: 'string' },
+        { kind: 'null' },
+      ],
+    });
+  });
+
+  it('keeps a plain enum (no null) as a bare enum', () => {
+    const schema = buildSchemaOnly({ type: 'string', enum: ['a', 'b'] } as never);
+    expect(schema).toEqual({ kind: 'enum', values: ['a', 'b'], scalar: 'string' });
+  });
+
+  it('drops an all-null enum under type:[string,null], leaving string | null', () => {
+    const schema = buildSchemaOnly({ type: ['string', 'null'], enum: [null] } as never);
+    expect(schema).toEqual({
+      kind: 'union',
+      members: [{ kind: 'scalar', scalar: 'string' }, { kind: 'null' }],
+    });
+  });
+});
+
+describe('buildApiModel — discriminated unions (C6.4)', () => {
+  it('captures an explicit discriminator with mapping on a oneOf union', () => {
+    const schema = buildSchemaOnly({
+      oneOf: [{ $ref: '#/components/schemas/Beverage' }, { $ref: '#/components/schemas/Dessert' }],
+      discriminator: {
+        propertyName: 'category',
+        mapping: {
+          beverage: '#/components/schemas/Beverage',
+          dessert: '#/components/schemas/Dessert',
+        },
+      },
+    } as never);
+    expect(schema).toMatchObject({
+      kind: 'union',
+      discriminator: {
+        propertyName: 'category',
+        mapping: [
+          { value: 'beverage', schemaName: 'Beverage' },
+          { value: 'dessert', schemaName: 'Dessert' },
+        ],
+      },
+    });
+  });
+
+  it('derives mapping entries from $ref member names when no explicit mapping is given', () => {
+    const schema = buildSchemaOnly({
+      oneOf: [{ $ref: '#/components/schemas/Cat' }, { $ref: '#/components/schemas/Dog' }],
+      discriminator: { propertyName: 'petType' },
+    } as never);
+    expect(schema).toMatchObject({
+      kind: 'union',
+      discriminator: {
+        propertyName: 'petType',
+        mapping: [
+          { value: 'Cat', schemaName: 'Cat' },
+          { value: 'Dog', schemaName: 'Dog' },
+        ],
+      },
+    });
+  });
+
+  it('leaves the union without a discriminator when none is declared', () => {
+    const schema = buildSchemaOnly({
+      oneOf: [{ type: 'string' }, { type: 'number' }],
+    } as never);
+    expect(schema.kind).toBe('union');
+    expect((schema as { discriminator?: unknown }).discriminator).toBeUndefined();
+  });
+
+  it('drops a redundant `unknown` member from a union and collapses to the lone real type', () => {
+    // `oneOf: [Ref, {}]` would emit `Ref | unknown`, which collapses to `unknown`
+    // in TS and destroys the type. The empty branch is dropped, leaving `Ref`.
+    expect(
+      buildSchemaOnly({ oneOf: [{ $ref: '#/components/schemas/User' }, {}] } as never)
+    ).toEqual({ kind: 'ref', name: 'User' });
+  });
+
+  it('keeps real members and drops only the unknown one', () => {
+    expect(
+      buildSchemaOnly({ oneOf: [{ type: 'string' }, { type: 'number' }, {}] } as never)
+    ).toEqual({
+      kind: 'union',
+      members: [
+        { kind: 'scalar', scalar: 'string' },
+        { kind: 'scalar', scalar: 'number' },
+      ],
+    });
+  });
+
+  it('collapses a union of only unknown members to unknown', () => {
+    expect(buildSchemaOnly({ oneOf: [{}, {}] } as never)).toEqual({ kind: 'unknown' });
+  });
+
+  it('ignores a discriminator with no propertyName', () => {
+    const schema = buildSchemaOnly({
+      oneOf: [{ $ref: '#/components/schemas/Cat' }],
+      discriminator: { mapping: { cat: '#/components/schemas/Cat' } },
+    } as never);
+    expect((schema as { discriminator?: unknown }).discriminator).toBeUndefined();
+  });
+
+  it('ignores a discriminator that yields no named targets (inline members, no mapping)', () => {
+    const schema = buildSchemaOnly({
+      oneOf: [{ type: 'object' }, { type: 'object' }],
+      discriminator: { propertyName: 'kind' },
+    } as never);
+    expect((schema as { discriminator?: unknown }).discriminator).toBeUndefined();
+  });
+});
+
+describe('buildApiModel — request body readOnly stripping', () => {
+  function postBody(schemas: Record<string, unknown>, bodySchema: unknown): OperationModel {
+    return buildOpOnly({
+      components: { schemas } as never,
+      paths: {
+        '/things': {
+          post: {
+            operationId: 'createThing',
+            requestBody: {
+              required: true,
+              content: { 'application/json': { schema: bodySchema } },
+            },
+            responses: { '201': { description: 'ok' } },
+          },
+        },
+      },
+    } as Partial<Oas3Definition>);
+  }
+
+  it('drops readOnly props from a $ref request body via Omit', () => {
+    const op = postBody(
+      {
+        Pet: {
+          type: 'object',
+          required: ['id', 'name'],
+          properties: {
+            id: { type: 'string', readOnly: true },
+            name: { type: 'string' },
+            createdAt: { type: 'string', readOnly: true },
+          },
+        },
+      },
+      { $ref: '#/components/schemas/Pet' }
+    );
+    expect(op.requestBody?.schema).toEqual({
+      kind: 'omit',
+      base: 'Pet',
+      keys: ['id', 'createdAt'],
+    });
+  });
+
+  it('collects readOnly keys through allOf members (deduped)', () => {
+    const op = postBody(
+      {
+        Base: { type: 'object', properties: { id: { type: 'string', readOnly: true } } },
+        CredentialPost: {
+          allOf: [
+            { $ref: '#/components/schemas/Base' },
+            { type: 'object', required: ['name'], properties: { name: { type: 'string' } } },
+          ],
+        },
+      },
+      { $ref: '#/components/schemas/CredentialPost' }
+    );
+    expect(op.requestBody?.schema).toEqual({
+      kind: 'omit',
+      base: 'CredentialPost',
+      keys: ['id'],
+    });
+  });
+
+  it('filters readOnly props from an inline-object request body', () => {
+    const op = postBody(
+      {},
+      {
+        type: 'object',
+        required: ['name'],
+        properties: {
+          id: { type: 'string', readOnly: true },
+          name: { type: 'string' },
+        },
+      }
+    );
+    const body = op.requestBody?.schema as { kind: string; properties: Array<{ name: string }> };
+    expect(body.kind).toBe('object');
+    expect(body.properties.map((p) => p.name)).toEqual(['name']);
+  });
+
+  it('leaves a request body unchanged when the schema has no readOnly props', () => {
+    const op = postBody(
+      { Plain: { type: 'object', properties: { name: { type: 'string' } } } },
+      { $ref: '#/components/schemas/Plain' }
+    );
+    expect(op.requestBody?.schema).toEqual({ kind: 'ref', name: 'Plain' });
+  });
+
+  it('leaves an inline-object body unchanged when it has no readOnly props', () => {
+    const op = postBody(
+      {},
+      { type: 'object', required: ['name'], properties: { name: { type: 'string' } } }
+    );
+    const body = op.requestBody?.schema as { kind: string; properties: Array<{ name: string }> };
+    expect(body.kind).toBe('object');
+    expect(body.properties.map((p) => p.name)).toEqual(['name']);
+  });
+
+  it('leaves a non-object, non-ref body (array) unchanged', () => {
+    const op = postBody({}, { type: 'array', items: { type: 'string' } });
+    expect(op.requestBody?.schema).toEqual({
+      kind: 'array',
+      items: { kind: 'scalar', scalar: 'string' },
+    });
+  });
+
+  it('handles a self-referential allOf without looping (visited guard)', () => {
+    const op = postBody(
+      {
+        Node: {
+          allOf: [
+            { type: 'object', properties: { id: { type: 'string', readOnly: true } } },
+            { $ref: '#/components/schemas/Node' },
+          ],
+        },
+      },
+      { $ref: '#/components/schemas/Node' }
+    );
+    expect(op.requestBody?.schema).toEqual({ kind: 'omit', base: 'Node', keys: ['id'] });
+  });
+
+  it('leaves a $ref body unchanged when the base schema is absent', () => {
+    const op = postBody({}, { $ref: '#/components/schemas/Ghost' });
+    expect(op.requestBody?.schema).toEqual({ kind: 'ref', name: 'Ghost' });
+  });
+});
+
+describe('buildApiModel — security (C6.6)', () => {
+  function withSchemes(
+    schemes: Record<string, unknown>,
+    opSecurity?: unknown
+  ): Partial<Oas3Definition> {
+    return {
+      components: { securitySchemes: schemes } as never,
+      security: undefined,
+      paths: {
+        '/x': {
+          get: {
+            operationId: 'op',
+            ...(opSecurity !== undefined ? { security: opSecurity } : {}),
+            responses: {},
+          },
+        } as never,
+      },
+    };
+  }
+
+  it('returns an empty securitySchemes array when none are declared', () => {
+    const model = buildApiModel(doc({}));
+    expect(model.securitySchemes).toEqual([]);
+  });
+
+  it('models oauth2 / openIdConnect / http-bearer as bearer schemes', () => {
+    const model = buildApiModel(
+      doc(
+        withSchemes({
+          OAuth2: { type: 'oauth2', flows: {} },
+          Oidc: { type: 'openIdConnect', openIdConnectUrl: 'https://x/.well-known' },
+          BearerHttp: { type: 'http', scheme: 'Bearer' },
+        })
+      )
+    );
+    expect(model.securitySchemes).toEqual([
+      { kind: 'bearer', key: 'OAuth2' },
+      { kind: 'bearer', key: 'Oidc' },
+      { kind: 'bearer', key: 'BearerHttp' },
+    ]);
+  });
+
+  it('models apiKey-in-header schemes with their header name', () => {
+    const model = buildApiModel(
+      doc(withSchemes({ ApiKey: { type: 'apiKey', in: 'header', name: 'X-API-Key' } }))
+    );
+    expect(model.securitySchemes).toEqual([
+      { kind: 'apiKeyHeader', key: 'ApiKey', headerName: 'X-API-Key' },
+    ]);
+  });
+
+  it('models http-basic as a basic scheme', () => {
+    const model = buildApiModel(doc(withSchemes({ Basic: { type: 'http', scheme: 'basic' } })));
+    expect(model.securitySchemes).toEqual([{ kind: 'basic', key: 'Basic' }]);
+  });
+
+  it('models apiKey-in-query schemes with their param name', () => {
+    const model = buildApiModel(
+      doc(withSchemes({ QueryKey: { type: 'apiKey', in: 'query', name: 'api_key' } }))
+    );
+    expect(model.securitySchemes).toEqual([
+      { kind: 'apiKeyQuery', key: 'QueryKey', paramName: 'api_key' },
+    ]);
+  });
+
+  it('models apiKey-in-cookie schemes with their cookie name', () => {
+    const model = buildApiModel(
+      doc(withSchemes({ CookieKey: { type: 'apiKey', in: 'cookie', name: 'sid' } }))
+    );
+    expect(model.securitySchemes).toEqual([
+      { kind: 'apiKeyCookie', key: 'CookieKey', cookieName: 'sid' },
+    ]);
+  });
+
+  it('skips non-injectable schemes (http without scheme, mutualTLS)', () => {
+    const model = buildApiModel(
+      doc(
+        withSchemes({
+          HttpNoScheme: { type: 'http' },
+          Mtls: { type: 'mutualTLS' },
+        })
+      )
+    );
+    expect(model.securitySchemes).toEqual([]);
+  });
+
+  it('resolves a security $ref in components.securitySchemes', () => {
+    const model = buildApiModel(
+      doc({
+        components: {
+          securitySchemes: {
+            Ref: { $ref: '#/components/x/Real' },
+          },
+          x: { Real: { type: 'http', scheme: 'bearer' } },
+        } as never,
+        paths: {},
+      })
+    );
+    expect(model.securitySchemes).toEqual([{ kind: 'bearer', key: 'Ref' }]);
+  });
+
+  it('resolves operation security to the injectable scheme keys', () => {
+    const op = buildOpOnly(
+      withSchemes({ OAuth2: { type: 'oauth2', flows: {} } }, [{ OAuth2: ['orders:read'] }])
+    );
+    expect(op.security).toEqual(['OAuth2']);
+  });
+
+  it('treats security: [] as an explicit opt-out (no auth)', () => {
+    const op = buildOpOnly(withSchemes({ OAuth2: { type: 'oauth2', flows: {} } }, []));
+    expect(op.security).toEqual([]);
+  });
+
+  it('falls back to the document-level security default when the operation has none', () => {
+    const model = buildApiModel(
+      doc({
+        components: { securitySchemes: { OAuth2: { type: 'oauth2', flows: {} } } } as never,
+        security: [{ OAuth2: [] }] as never,
+        paths: {
+          '/x': { get: { operationId: 'op', responses: {} } } as never,
+        },
+      })
+    );
+    expect(model.services[0].operations[0].security).toEqual(['OAuth2']);
+  });
+
+  it('dedupes scheme keys across OR-alternatives and drops non-injectable ones', () => {
+    const op = buildOpOnly(
+      withSchemes(
+        {
+          OAuth2: { type: 'oauth2', flows: {} },
+          ApiKey: { type: 'apiKey', in: 'header', name: 'X-API-Key' },
+          NoScheme: { type: 'http' },
+        },
+        [{ OAuth2: [] }, { OAuth2: [], ApiKey: [] }, { NoScheme: [] }]
+      )
+    );
+    expect(op.security).toEqual(['OAuth2', 'ApiKey']);
+  });
+
+  it('returns no security when the operation references only non-injectable schemes', () => {
+    const op = buildOpOnly(withSchemes({ NoScheme: { type: 'http' } }, [{ NoScheme: [] }]));
+    expect(op.security).toEqual([]);
+  });
+});
+
+describe('extractMetadata — example/default', () => {
+  it('captures `example` and `default` on a scalar schema', () => {
+    const got = buildSchemaOnly({ type: 'string', example: 'Ada', default: 'Anon' } as never);
+    expect(got).toMatchObject({ kind: 'scalar', scalar: 'string' });
+    expect(got.metadata?.example).toBe('Ada');
+    expect(got.metadata?.default).toBe('Anon');
+  });
+
+  it('prefers `examples[0]` (OAS 3.1) when `example` is absent', () => {
+    const got = buildSchemaOnly({ type: 'string', examples: ['Grace', 'Lin'] } as never);
+    expect(got.metadata?.example).toBe('Grace');
+  });
+
+  it('captures only `default` when no example or examples are present', () => {
+    const got = buildSchemaOnly({ type: 'string', default: 'fallback' } as never);
+    expect(got.metadata?.default).toBe('fallback');
+    expect(got.metadata?.example).toBeUndefined();
+  });
+});
+
+describe('buildSchema — boolean enum widening (#4)', () => {
+  it('widens a single-value boolean enum to `boolean` (no over-narrowing to a literal)', () => {
+    expect(buildSchemaOnly({ type: 'boolean', enum: [false] } as Oas3Schema)).toMatchObject({
+      kind: 'scalar',
+      scalar: 'boolean',
+    });
+  });
+
+  it('widens a full boolean enum to `boolean`', () => {
+    expect(buildSchemaOnly({ type: 'boolean', enum: [true, false] } as Oas3Schema)).toMatchObject({
+      kind: 'scalar',
+      scalar: 'boolean',
+    });
+  });
+
+  it('preserves a nullable boolean enum as `boolean | null`', () => {
+    const m = buildSchemaOnly({
+      type: ['boolean', 'null'],
+      enum: [false, null],
+    } as unknown as Oas3Schema);
+    expect(m.kind).toBe('union');
+    const members = (m as Extract<SchemaModel, { kind: 'union' }>).members;
+    expect(members).toContainEqual({ kind: 'scalar', scalar: 'boolean' });
+    expect(members).toContainEqual({ kind: 'null' });
+  });
+
+  it('leaves string enums as enums (literals stay meaningful there)', () => {
+    expect(buildSchemaOnly({ type: 'string', enum: ['a', 'b'] } as Oas3Schema)).toMatchObject({
+      kind: 'enum',
+      scalar: 'string',
+    });
+  });
+
+  it('leaves a boolean const as the literal (an explicit single-value constraint)', () => {
+    expect(
+      buildSchemaOnly({ type: 'boolean', const: false } as unknown as Oas3Schema)
+    ).toMatchObject({
+      kind: 'literal',
+      value: false,
+    });
+  });
+});
diff --git a/packages/openapi-typescript/src/ir/__tests__/normalize-swagger2.test.ts b/packages/openapi-typescript/src/ir/__tests__/normalize-swagger2.test.ts
new file mode 100644
index 0000000000..ef86f3f345
--- /dev/null
+++ b/packages/openapi-typescript/src/ir/__tests__/normalize-swagger2.test.ts
@@ -0,0 +1,331 @@
+import { normalizeSwagger2 } from '../normalize-swagger2.js';
+
+function s2(extra: Record<string, unknown>): Record<string, unknown> {
+  return { swagger: '2.0', info: { title: 'T', version: '1' }, paths: {}, ...extra };
+}
+
+describe('normalizeSwagger2 — scaffold', () => {
+  it('builds servers[0].url from schemes + host + basePath', () => {
+    const out = normalizeSwagger2(
+      s2({ schemes: ['https'], host: 'api.example.com', basePath: '/v1' }) as never
+    );
+    expect(out.servers).toEqual([{ url: 'https://api.example.com/v1' }]);
+  });
+
+  it('defaults scheme to https and tolerates missing host/basePath', () => {
+    const out = normalizeSwagger2(s2({ host: 'api.example.com' }) as never);
+    expect(out.servers).toEqual([{ url: 'https://api.example.com' }]);
+  });
+
+  it('maps definitions to components.schemas and rewrites #/definitions refs', () => {
+    const out = normalizeSwagger2(
+      s2({
+        definitions: {
+          Pet: { type: 'object', properties: { owner: { $ref: '#/definitions/Owner' } } },
+          Owner: { type: 'object', properties: { name: { type: 'string' } } },
+        },
+      }) as never
+    );
+    expect((out.components as { schemas: Record<string, unknown> }).schemas.Owner).toBeDefined();
+    const pet = (
+      out.components as { schemas: Record<string, { properties: { owner: { $ref: string } } }> }
+    ).schemas.Pet;
+    expect(pet.properties.owner.$ref).toBe('#/components/schemas/Owner');
+  });
+
+  it('maps securityDefinitions: basic→http/basic, apiKey passes through, oauth2 flow→flows', () => {
+    const out = normalizeSwagger2(
+      s2({
+        securityDefinitions: {
+          Basic: { type: 'basic' },
+          ApiKey: { type: 'apiKey', name: 'X-Key', in: 'header' },
+          OAuth: {
+            type: 'oauth2',
+            flow: 'accessCode',
+            authorizationUrl: 'https://a',
+            tokenUrl: 'https://t',
+            scopes: { read: 'r' },
+          },
+        },
+      }) as never
+    );
+    const ss = (out.components as { securitySchemes: Record<string, Record<string, unknown>> })
+      .securitySchemes;
+    expect(ss.Basic).toEqual({ type: 'http', scheme: 'basic' });
+    expect(ss.ApiKey).toEqual({ type: 'apiKey', name: 'X-Key', in: 'header' });
+    expect(ss.OAuth.type).toBe('oauth2');
+    expect((ss.OAuth.flows as Record<string, unknown>).authorizationCode).toBeDefined();
+  });
+
+  it('sets openapi: 3.0.3 and drops swagger/host/basePath/schemes/definitions/securityDefinitions', () => {
+    const out = normalizeSwagger2(
+      s2({ host: 'h', definitions: {}, securityDefinitions: {} }) as never
+    ) as unknown as Record<string, unknown>;
+    expect(out.openapi).toBe('3.0.3');
+    expect(out.swagger).toBeUndefined();
+    expect(out.host).toBeUndefined();
+    expect(out.definitions).toBeUndefined();
+    expect(out.securityDefinitions).toBeUndefined();
+  });
+});
+
+describe('normalizeSwagger2 — scaffold (extra coverage)', () => {
+  it('omits servers when host is absent', () => {
+    const out = normalizeSwagger2(s2({}) as never) as unknown as Record<string, unknown>;
+    expect(out.servers).toBeUndefined();
+  });
+
+  it('maps top-level parameters to components.parameters', () => {
+    const sharedParam = { name: 'id', in: 'path', required: true, type: 'integer' };
+    const out = normalizeSwagger2(s2({ parameters: { PetId: sharedParam } }) as never);
+    expect((out.components as { parameters: Record<string, unknown> }).parameters).toEqual({
+      PetId: sharedParam,
+    });
+  });
+
+  it('maps top-level responses to components.responses via normalizeResponses', () => {
+    const out = normalizeSwagger2(
+      s2({
+        responses: { NotFound: { description: 'not found' } },
+        produces: ['application/json'],
+      }) as never
+    );
+    // No schema on the response → passes through unchanged
+    expect((out.components as { responses: Record<string, unknown> }).responses).toEqual({
+      NotFound: { description: 'not found' },
+    });
+  });
+
+  it('falls through to default in mapSecurityScheme for unknown types', () => {
+    const out = normalizeSwagger2(
+      s2({ securityDefinitions: { Bearer: { type: 'http', scheme: 'bearer' } } }) as never
+    );
+    const ss = (out.components as { securitySchemes: Record<string, Record<string, unknown>> })
+      .securitySchemes;
+    // Unknown type → returned as-is
+    expect(ss.Bearer).toEqual({ type: 'http', scheme: 'bearer' });
+  });
+
+  it('maps oauth2 implicit flow by its original name', () => {
+    const out = normalizeSwagger2(
+      s2({
+        securityDefinitions: {
+          Implicit: {
+            type: 'oauth2',
+            flow: 'implicit',
+            authorizationUrl: 'https://a',
+            scopes: { read: 'r' },
+          },
+        },
+      }) as never
+    );
+    const ss = (out.components as { securitySchemes: Record<string, Record<string, unknown>> })
+      .securitySchemes;
+    expect((ss.Implicit.flows as Record<string, unknown>).implicit).toBeDefined();
+  });
+
+  it('maps oauth2 application flow to clientCredentials', () => {
+    const out = normalizeSwagger2(
+      s2({
+        securityDefinitions: {
+          AppFlow: {
+            type: 'oauth2',
+            flow: 'application',
+            tokenUrl: 'https://t',
+            scopes: { write: 'w' },
+          },
+        },
+      }) as never
+    );
+    const ss = (out.components as { securitySchemes: Record<string, Record<string, unknown>> })
+      .securitySchemes;
+    expect((ss.AppFlow.flows as Record<string, unknown>).clientCredentials).toBeDefined();
+  });
+
+  it('passes non-HTTP-method keys in path items through unchanged', () => {
+    const sharedParams = [{ name: 'id', in: 'path', required: true, type: 'integer' }];
+    const out = normalizeSwagger2(
+      s2({
+        paths: {
+          '/pets/{id}': {
+            parameters: sharedParams,
+            get: { operationId: 'getPet', parameters: [], responses: {} },
+          },
+        },
+      }) as never
+    );
+    const item = (out.paths as Record<string, Record<string, unknown>>)['/pets/{id}'];
+    expect(item.parameters).toEqual(sharedParams);
+  });
+});
+
+describe('normalizeSwagger2 — operations', () => {
+  function op(
+    operation: Record<string, unknown>,
+    rootConsumes?: string[],
+    rootProduces?: string[]
+  ) {
+    const out = normalizeSwagger2({
+      swagger: '2.0',
+      info: { title: 'T', version: '1' },
+      ...(rootConsumes ? { consumes: rootConsumes } : {}),
+      ...(rootProduces ? { produces: rootProduces } : {}),
+      paths: { '/x': { post: operation } },
+    } as never);
+    return (out.paths as Record<string, Record<string, Record<string, unknown>>>)['/x'].post;
+  }
+
+  it('wraps a non-body param inline type into `schema`', () => {
+    const post = op({
+      operationId: 'a',
+      parameters: [{ name: 'q', in: 'query', required: true, type: 'string' }],
+      responses: {},
+    });
+    expect((post.parameters as Array<Record<string, unknown>>)[0]).toEqual({
+      name: 'q',
+      in: 'query',
+      required: true,
+      schema: { type: 'string' },
+    });
+  });
+
+  it('converts an in:body param to requestBody using consumes[0]', () => {
+    const post = op({
+      operationId: 'a',
+      consumes: ['application/json'],
+      parameters: [
+        { name: 'b', in: 'body', required: true, schema: { $ref: '#/components/schemas/Pet' } },
+      ],
+      responses: {},
+    });
+    expect(post.requestBody).toEqual({
+      required: true,
+      content: { 'application/json': { schema: { $ref: '#/components/schemas/Pet' } } },
+    });
+    expect((post.parameters as unknown[]).length).toBe(0);
+  });
+
+  it('aggregates in:formData params into a urlencoded object requestBody', () => {
+    const post = op({
+      operationId: 'a',
+      consumes: ['application/x-www-form-urlencoded'],
+      parameters: [
+        { name: 'f1', in: 'formData', required: true, type: 'string' },
+        { name: 'f2', in: 'formData', type: 'integer' },
+      ],
+      responses: {},
+    });
+    expect(post.requestBody).toEqual({
+      required: true,
+      content: {
+        'application/x-www-form-urlencoded': {
+          schema: {
+            type: 'object',
+            required: ['f1'],
+            properties: { f1: { type: 'string' }, f2: { type: 'integer' } },
+          },
+        },
+      },
+    });
+  });
+
+  it('falls back to application/json when consumes is absent (root or op)', () => {
+    const post = op({
+      operationId: 'a',
+      parameters: [{ name: 'b', in: 'body', required: true, schema: { type: 'object' } }],
+      responses: {},
+    });
+    expect(
+      (post.requestBody as { content: Record<string, unknown> }).content['application/json']
+    ).toBeDefined();
+  });
+
+  it('wraps response.schema into content using produces[0] (root fallback)', () => {
+    const post = op(
+      {
+        operationId: 'a',
+        parameters: [],
+        responses: { '200': { description: 'ok', schema: { $ref: '#/components/schemas/Pet' } } },
+      },
+      undefined,
+      ['application/json']
+    );
+    expect(post.responses).toEqual({
+      '200': {
+        description: 'ok',
+        content: { 'application/json': { schema: { $ref: '#/components/schemas/Pet' } } },
+      },
+    });
+  });
+
+  it('leaves a response without a schema untouched (no content)', () => {
+    const post = op({
+      operationId: 'a',
+      parameters: [],
+      responses: { '204': { description: 'no content' } },
+    });
+    expect(post.responses).toEqual({ '204': { description: 'no content' } });
+  });
+
+  it('handles an operation with no responses field', () => {
+    const post = op({ operationId: 'a', parameters: [] });
+    expect(post.responses).toBeUndefined();
+  });
+
+  it('uses multipart/form-data when declared in consumes for formData params', () => {
+    const post = op({
+      operationId: 'a',
+      consumes: ['multipart/form-data'],
+      parameters: [{ name: 'file', in: 'formData', required: true, type: 'string' }],
+      responses: {},
+    });
+    expect(
+      (post.requestBody as { content: Record<string, unknown> }).content['multipart/form-data']
+    ).toBeDefined();
+  });
+
+  it('uses application/x-www-form-urlencoded when consumes is absent for formData params', () => {
+    const post = op({
+      operationId: 'a',
+      parameters: [{ name: 'f1', in: 'formData', type: 'string' }],
+      responses: {},
+    });
+    expect(
+      (post.requestBody as { content: Record<string, unknown> }).content[
+        'application/x-www-form-urlencoded'
+      ]
+    ).toBeDefined();
+  });
+
+  it('handles operation with no parameters field (undefined fallback)', () => {
+    const post = op({ operationId: 'a', responses: {} });
+    expect(post.parameters).toEqual([]);
+  });
+});
+
+describe('normalizeSwagger2 — edge cases', () => {
+  it('handles doc with no paths field (undefined fallback)', () => {
+    const doc = { swagger: '2.0', info: { title: 'T', version: '1' } };
+    const out = normalizeSwagger2(doc as never) as unknown as Record<string, unknown>;
+    expect(out.paths).toEqual({});
+  });
+
+  it('uses https when schemes array is empty', () => {
+    const out = normalizeSwagger2(s2({ schemes: [], host: 'api.example.com' }) as never);
+    expect(out.servers).toEqual([{ url: 'https://api.example.com' }]);
+  });
+
+  it('maps oauth2 with no scopes to empty object', () => {
+    const out = normalizeSwagger2(
+      s2({
+        securityDefinitions: {
+          OAuth: { type: 'oauth2', flow: 'implicit', authorizationUrl: 'https://a' },
+        },
+      }) as never
+    );
+    const ss = (out.components as { securitySchemes: Record<string, Record<string, unknown>> })
+      .securitySchemes;
+    const flows = ss.OAuth.flows as Record<string, Record<string, unknown>>;
+    expect(flows.implicit.scopes).toEqual({});
+  });
+});
diff --git a/packages/openapi-typescript/src/ir/__tests__/refs.test.ts b/packages/openapi-typescript/src/ir/__tests__/refs.test.ts
new file mode 100644
index 0000000000..9adb6a1162
--- /dev/null
+++ b/packages/openapi-typescript/src/ir/__tests__/refs.test.ts
@@ -0,0 +1,138 @@
+import type { OperationModel, SchemaModel } from '../model.js';
+import { collectOperationRefs, collectSchemaRefs } from '../refs.js';
+
+const ref = (name: string): SchemaModel => ({ kind: 'ref', name });
+
+function operation(overrides: Partial<OperationModel> = {}): OperationModel {
+  return {
+    name: 'op',
+    method: 'get',
+    path: '/p',
+    pathParams: [],
+    queryParams: [],
+    headerParams: [],
+    successResponses: [],
+    errorResponses: [],
+    security: [],
+    tags: [],
+    ...overrides,
+  };
+}
+
+describe('collectSchemaRefs', () => {
+  it('collects a direct ref', () => {
+    expect([...collectSchemaRefs(ref('Pet'))]).toEqual(['Pet']);
+  });
+
+  it('collects the base of an omit schema', () => {
+    expect([...collectSchemaRefs({ kind: 'omit', base: 'Pet', keys: ['id'] })]).toEqual(['Pet']);
+  });
+
+  it('returns nothing for scalar / literal / enum / null / unknown', () => {
+    expect([...collectSchemaRefs({ kind: 'scalar', scalar: 'string' })]).toEqual([]);
+    expect([...collectSchemaRefs({ kind: 'literal', value: 'a' })]).toEqual([]);
+    expect([...collectSchemaRefs({ kind: 'enum', values: ['a', 'b'], scalar: 'string' })]).toEqual(
+      []
+    );
+    expect([...collectSchemaRefs({ kind: 'null' })]).toEqual([]);
+    expect([...collectSchemaRefs({ kind: 'unknown' })]).toEqual([]);
+  });
+
+  it('recurses into array items', () => {
+    expect([...collectSchemaRefs({ kind: 'array', items: ref('Pet') })]).toEqual(['Pet']);
+  });
+
+  it('recurses into record values', () => {
+    expect([...collectSchemaRefs({ kind: 'record', value: ref('Pet') })]).toEqual(['Pet']);
+  });
+
+  it('recurses into object properties', () => {
+    const schema: SchemaModel = {
+      kind: 'object',
+      properties: [
+        { name: 'pet', schema: ref('Pet'), required: true },
+        { name: 'owner', schema: ref('Owner'), required: false },
+        { name: 'count', schema: { kind: 'scalar', scalar: 'integer' }, required: false },
+      ],
+    };
+    expect([...collectSchemaRefs(schema)]).toEqual(['Pet', 'Owner']);
+  });
+
+  it('recurses into union members', () => {
+    const schema: SchemaModel = { kind: 'union', members: [ref('Cat'), ref('Dog')] };
+    expect([...collectSchemaRefs(schema)]).toEqual(['Cat', 'Dog']);
+  });
+
+  it('recurses into intersection members', () => {
+    const schema: SchemaModel = { kind: 'intersection', members: [ref('A'), ref('B')] };
+    expect([...collectSchemaRefs(schema)]).toEqual(['A', 'B']);
+  });
+
+  it('dedupes a ref that appears more than once', () => {
+    const schema: SchemaModel = {
+      kind: 'array',
+      items: { kind: 'union', members: [ref('Pet'), ref('Pet')] },
+    };
+    expect([...collectSchemaRefs(schema)]).toEqual(['Pet']);
+  });
+
+  it('accumulates into a caller-provided set', () => {
+    const into = new Set<string>(['Existing']);
+    collectSchemaRefs(ref('Pet'), into);
+    expect([...into]).toEqual(['Existing', 'Pet']);
+  });
+});
+
+describe('collectOperationRefs', () => {
+  it('gathers refs across path/query/header params, body, and responses', () => {
+    const op = operation({
+      pathParams: [{ name: 'id', in: 'path', required: true, schema: ref('PetId') }],
+      queryParams: [{ name: 'filter', in: 'query', required: false, schema: ref('PetFilter') }],
+      headerParams: [{ name: 'x', in: 'header', required: false, schema: ref('TraceId') }],
+      requestBody: { contentType: 'application/json', schema: ref('PetInput'), required: true },
+      successResponses: [
+        {
+          contentType: 'application/json',
+          schema: { kind: 'array', items: ref('Pet') },
+          status: 200,
+        },
+      ],
+    });
+    expect([...collectOperationRefs(op)]).toEqual([
+      'PetId',
+      'PetFilter',
+      'TraceId',
+      'PetInput',
+      'Pet',
+    ]);
+  });
+
+  it('walks error responses for referenced types only in result mode', () => {
+    const op = operation({
+      errorResponses: [{ contentType: 'application/json', schema: ref('ApiErr'), status: 200 }],
+    });
+    // Result mode emits the `<Op>Error` union that names the body, so it must import it.
+    expect([...collectOperationRefs(op, 'result')]).toContain('ApiErr');
+    // Throw mode never names the error body — importing it would trip `noUnusedLocals`.
+    expect([...collectOperationRefs(op)]).not.toContain('ApiErr');
+    expect([...collectOperationRefs(op, 'throw')]).not.toContain('ApiErr');
+  });
+
+  it('returns an empty set for an operation with no referenced types', () => {
+    expect([...collectOperationRefs(operation())]).toEqual([]);
+  });
+
+  it('includes itemSchema refs from success responses', () => {
+    const op = operation({
+      successResponses: [
+        {
+          contentType: 'text/event-stream',
+          status: 200,
+          schema: { kind: 'unknown' },
+          itemSchema: ref('Message'),
+        },
+      ],
+    });
+    expect([...collectOperationRefs(op)]).toContain('Message');
+  });
+});
diff --git a/packages/openapi-typescript/src/ir/__tests__/sanitize-identifiers.test.ts b/packages/openapi-typescript/src/ir/__tests__/sanitize-identifiers.test.ts
new file mode 100644
index 0000000000..4c5ad0602c
--- /dev/null
+++ b/packages/openapi-typescript/src/ir/__tests__/sanitize-identifiers.test.ts
@@ -0,0 +1,212 @@
+import type { ApiModel, OperationModel, SchemaModel } from '../model.js';
+import { assertSafeIdentifiers, sanitizeIdentifiers } from '../sanitize-identifiers.js';
+
+function model(schemas: ApiModel['schemas'], operations: OperationModel[] = []): ApiModel {
+  return {
+    title: 'T',
+    version: '1',
+    baseUrl: '',
+    services: [{ name: 'Default', operations }],
+    schemas,
+    securitySchemes: [],
+  };
+}
+
+function op(partial: Partial<OperationModel>): OperationModel {
+  return {
+    name: 'op',
+    method: 'get',
+    path: '/',
+    pathParams: [],
+    queryParams: [],
+    headerParams: [],
+    successResponses: [],
+    errorResponses: [],
+    tags: [],
+    security: [],
+    ...partial,
+  };
+}
+
+const ref = (name: string): SchemaModel => ({ kind: 'ref', name });
+
+describe('sanitizeIdentifiers', () => {
+  it('renames a non-identifier schema name and rewrites refs that target it', () => {
+    const m = model([
+      { name: 'Bad.Name', schema: { kind: 'object', properties: [] } },
+      {
+        name: 'Holder',
+        schema: {
+          kind: 'object',
+          properties: [{ name: 'x', schema: ref('Bad.Name'), required: true }],
+        },
+      },
+    ]);
+    sanitizeIdentifiers(m);
+    expect(m.schemas[0].name).toBe('Bad_Name');
+    const holder = m.schemas[1].schema as Extract<SchemaModel, { kind: 'object' }>;
+    expect(holder.properties[0].schema).toEqual(ref('Bad_Name'));
+  });
+
+  it('leaves valid identifier names untouched', () => {
+    const m = model(
+      [{ name: 'Pet', schema: { kind: 'scalar', scalar: 'string' } }],
+      [op({ name: 'getPet' })]
+    );
+    sanitizeIdentifiers(m);
+    expect(m.schemas[0].name).toBe('Pet');
+    expect(m.services[0].operations[0].name).toBe('getPet');
+  });
+
+  it('rewrites refs through array, record, union (with and without discriminator), and intersection', () => {
+    const m = model([
+      { name: 'A.B', schema: { kind: 'object', properties: [] } },
+      { name: 'Arr', schema: { kind: 'array', items: ref('A.B') } },
+      { name: 'Rec', schema: { kind: 'record', value: ref('A.B') } },
+      {
+        name: 'Uni',
+        schema: {
+          kind: 'union',
+          members: [ref('A.B'), { kind: 'scalar', scalar: 'string' }],
+          discriminator: { propertyName: 'k', mapping: [{ value: 'a', schemaName: 'A.B' }] },
+        },
+      },
+      { name: 'Plain', schema: { kind: 'union', members: [ref('A.B'), { kind: 'null' }] } },
+      { name: 'Inter', schema: { kind: 'intersection', members: [ref('A.B')] } },
+    ]);
+    sanitizeIdentifiers(m);
+    expect((m.schemas[1].schema as Extract<SchemaModel, { kind: 'array' }>).items).toEqual(
+      ref('A_B')
+    );
+    expect((m.schemas[2].schema as Extract<SchemaModel, { kind: 'record' }>).value).toEqual(
+      ref('A_B')
+    );
+    const uni = m.schemas[3].schema as Extract<SchemaModel, { kind: 'union' }>;
+    expect(uni.members[0]).toEqual(ref('A_B'));
+    expect(uni.discriminator?.mapping[0].schemaName).toBe('A_B');
+    expect(
+      (m.schemas[5].schema as Extract<SchemaModel, { kind: 'intersection' }>).members[0]
+    ).toEqual(ref('A_B'));
+  });
+
+  it('rewrites an `omit` base that targets a renamed schema', () => {
+    const m = model([
+      { name: 'Bad.Name', schema: { kind: 'object', properties: [] } },
+      { name: 'Body', schema: { kind: 'omit', base: 'Bad.Name', keys: ['id'] } },
+    ]);
+    sanitizeIdentifiers(m);
+    expect((m.schemas[1].schema as Extract<SchemaModel, { kind: 'omit' }>).base).toBe('Bad_Name');
+  });
+
+  it('sanitizes a dangling ref whose target has no declaration', () => {
+    const m = model([{ name: 'Holder', schema: { kind: 'array', items: ref('Un.known') } }]);
+    sanitizeIdentifiers(m);
+    expect((m.schemas[0].schema as Extract<SchemaModel, { kind: 'array' }>).items).toEqual(
+      ref('Un_known')
+    );
+  });
+
+  it('uniquifies schema names that sanitize to the same identifier, refs following each', () => {
+    const m = model([
+      { name: 'A.B', schema: { kind: 'object', properties: [] } },
+      { name: 'A-B', schema: { kind: 'object', properties: [] } },
+      {
+        name: 'Holder',
+        schema: {
+          kind: 'object',
+          properties: [
+            { name: 'x', schema: ref('A.B'), required: true },
+            { name: 'y', schema: ref('A-B'), required: true },
+          ],
+        },
+      },
+    ]);
+    sanitizeIdentifiers(m);
+    expect(m.schemas[0].name).toBe('A_B');
+    expect(m.schemas[1].name).toBe('A_B_2');
+    const holder = m.schemas[2].schema as Extract<SchemaModel, { kind: 'object' }>;
+    expect(holder.properties[0].schema).toEqual(ref('A_B'));
+    expect(holder.properties[1].schema).toEqual(ref('A_B_2'));
+  });
+
+  it('renames a non-identifier security-scheme key and rewrites operation.security to match', () => {
+    const m = model([], [op({ name: 'getX', security: ['k(){};evil', 'clean'] })]);
+    m.securitySchemes = [
+      { kind: 'apiKeyHeader', key: 'k(){};evil', headerName: 'X-Api-Key' },
+      { kind: 'apiKeyHeader', key: 'clean', headerName: 'X-Other' },
+    ];
+    sanitizeIdentifiers(m);
+    expect(m.securitySchemes[0].key).toBe('k_____evil');
+    expect(m.securitySchemes[1].key).toBe('clean');
+    // The operation's security list follows the rename so the runtime literals match.
+    expect(m.services[0].operations[0].security).toEqual(['k_____evil', 'clean']);
+  });
+
+  it('sanitizes an operation.security entry with no matching scheme', () => {
+    const m = model([], [op({ name: 'getX', security: ['gone.key'] })]);
+    sanitizeIdentifiers(m);
+    expect(m.services[0].operations[0].security).toEqual(['gone_key']);
+  });
+
+  it('renames operations and rewrites refs in every operation slot', () => {
+    const m = model(
+      [{ name: 'A.B', schema: { kind: 'object', properties: [] } }],
+      [
+        op({
+          name: 'do-thing',
+          pathParams: [{ name: 'id', in: 'path', schema: ref('A.B'), required: true }],
+          queryParams: [{ name: 'q', in: 'query', schema: ref('A.B'), required: false }],
+          headerParams: [{ name: 'h', in: 'header', schema: ref('A.B'), required: false }],
+          requestBody: { contentType: 'application/json', schema: ref('A.B'), required: true },
+          successResponses: [
+            {
+              contentType: 'application/json',
+              schema: ref('A.B'),
+              itemSchema: ref('A.B'),
+              status: 200,
+            },
+          ],
+          errorResponses: [{ contentType: 'application/json', schema: ref('A.B'), status: 200 }],
+        }),
+      ]
+    );
+    sanitizeIdentifiers(m);
+    const o = m.services[0].operations[0];
+    expect(o.name).toBe('do_thing');
+    expect(o.pathParams[0].schema).toEqual(ref('A_B'));
+    expect(o.queryParams[0].schema).toEqual(ref('A_B'));
+    expect(o.headerParams[0].schema).toEqual(ref('A_B'));
+    expect(o.requestBody?.schema).toEqual(ref('A_B'));
+    expect(o.successResponses[0].schema).toEqual(ref('A_B'));
+    expect(o.successResponses[0].itemSchema).toEqual(ref('A_B'));
+    expect(o.errorResponses[0].schema).toEqual(ref('A_B'));
+  });
+});
+
+describe('assertSafeIdentifiers', () => {
+  it('passes for a fully sanitized model', () => {
+    const m = model(
+      [{ name: 'Pet', schema: { kind: 'object', properties: [] } }],
+      [op({ name: 'getPet' })]
+    );
+    expect(() => assertSafeIdentifiers(m)).not.toThrow();
+  });
+
+  it('throws when a schema name is not a safe identifier', () => {
+    const m = model([{ name: 'Bad.Name', schema: { kind: 'object', properties: [] } }]);
+    expect(() => assertSafeIdentifiers(m)).toThrow(/schema name .* is not a safe identifier/);
+  });
+
+  it('throws when an operation name is not a safe identifier', () => {
+    const m = model([], [op({ name: 'bad-op' })]);
+    expect(() => assertSafeIdentifiers(m)).toThrow(/operation name .* is not a safe identifier/);
+  });
+
+  it('throws when a security-scheme key is not a safe identifier', () => {
+    const m = model([]);
+    m.securitySchemes = [{ kind: 'apiKeyHeader', key: 'bad.key', headerName: 'X' }];
+    expect(() => assertSafeIdentifiers(m)).toThrow(
+      /security scheme name .* is not a safe identifier/
+    );
+  });
+});
diff --git a/packages/openapi-typescript/src/ir/build.ts b/packages/openapi-typescript/src/ir/build.ts
new file mode 100644
index 0000000000..b30be15091
--- /dev/null
+++ b/packages/openapi-typescript/src/ir/build.ts
@@ -0,0 +1,908 @@
+import {
+  isPlainObject,
+  type Oas3Definition,
+  type Oas3MediaType,
+  type Oas3Operation,
+  type Oas3Parameter,
+  type Oas3PathItem,
+  type Oas3Schema,
+  type Oas3_1Schema,
+} from '@redocly/openapi-core';
+
+type Oas3ResponseShape = {
+  content?: Record<string, Oas3MediaType>;
+  description?: string;
+};
+
+import { NotSupportedError } from '../errors.js';
+import type {
+  ApiModel,
+  DiscriminatorModel,
+  NamedSchemaModel,
+  OperationModel,
+  ParamModel,
+  PropertyModel,
+  RequestBodyModel,
+  ResponseBodyModel,
+  ScalarKind,
+  SchemaMetadata,
+  SchemaModel,
+  SecuritySchemeModel,
+  ServiceModel,
+} from './model.js';
+import { assertSafeIdentifiers, sanitizeIdentifiers } from './sanitize-identifiers.js';
+
+type Oas3SecurityScheme = {
+  type?: string;
+  scheme?: string;
+  name?: string;
+  in?: string;
+};
+
+type SecurityRequirement = Record<string, string[]>;
+
+const HTTP_METHODS = ['get', 'post', 'put', 'delete', 'patch', 'head', 'options'] as const;
+type HttpMethod = (typeof HTTP_METHODS)[number];
+
+type Referenced<T> = T | { $ref: string };
+
+function isRef<T>(value: Referenced<T> | undefined | null): value is { $ref: string } {
+  return isPlainObject(value) && '$ref' in value;
+}
+
+function resolveRef<T>(doc: Oas3Definition, ref: string): T {
+  if (!ref.startsWith('#/')) {
+    throw new NotSupportedError(`External $ref not supported in PoC: ${ref}`);
+  }
+  const segments = ref
+    .slice(2)
+    .split('/')
+    .map((s) => s.replace(/~1/g, '/').replace(/~0/g, '~'));
+  let current: unknown = doc;
+  for (const segment of segments) {
+    if (!isPlainObject(current) && !Array.isArray(current)) {
+      throw new NotSupportedError(`Cannot resolve $ref: ${ref}`);
+    }
+    current = (current as Record<string, unknown>)[segment];
+  }
+  if (current === undefined) {
+    throw new NotSupportedError(`Cannot resolve $ref: ${ref}`);
+  }
+  return current as T;
+}
+
+function deref<T>(doc: Oas3Definition, value: Referenced<T>): T {
+  if (isRef(value)) {
+    return resolveRef<T>(doc, value.$ref);
+  }
+  return value;
+}
+
+function refName(ref: string): string {
+  const idx = ref.lastIndexOf('/');
+  return idx >= 0 ? ref.slice(idx + 1) : ref;
+}
+
+/**
+ * Lift validation / annotation keywords off an OAS Schema Object into our
+ * neutral SchemaMetadata bag.
+ *
+ * Normalizes OAS 3.0 boolean `exclusiveMinimum` / `exclusiveMaximum` into the
+ * OAS 3.1 numeric form so downstream consumers (the emitter, in particular)
+ * have exactly one shape to handle.
+ *
+ * Returns `undefined` when nothing of interest is present. This keeps the IR
+ * uncluttered: schemas without constraints simply have no `metadata` field at
+ * all rather than an empty object, which also keeps strict-equality tests
+ * stable.
+ */
+function extractMetadata(schema: Oas3Schema): SchemaMetadata | undefined {
+  // We index into the schema with looser typing than the official @redocly types
+  // because OAS 3.1 keywords (numeric `exclusiveMinimum/Maximum`) aren't in the
+  // 3.0-focused type, and `format`/`deprecated` live in a few different places.
+  const s = schema as Record<string, unknown>;
+  const out: SchemaMetadata = {};
+
+  if (typeof s.minimum === 'number') out.minimum = s.minimum;
+  if (typeof s.maximum === 'number') out.maximum = s.maximum;
+
+  // OAS 3.0: exclusiveMinimum/Maximum are booleans paired with minimum/maximum.
+  // OAS 3.1: they are numbers and stand alone.
+  // We always emit the 3.1 numeric form. When the 3.0 boolean form is used,
+  // hoist the paired bound up and drop the inclusive form.
+  if (typeof s.exclusiveMinimum === 'number') {
+    out.exclusiveMinimum = s.exclusiveMinimum;
+  } else if (s.exclusiveMinimum === true && typeof s.minimum === 'number') {
+    out.exclusiveMinimum = s.minimum;
+    delete out.minimum;
+  }
+  if (typeof s.exclusiveMaximum === 'number') {
+    out.exclusiveMaximum = s.exclusiveMaximum;
+  } else if (s.exclusiveMaximum === true && typeof s.maximum === 'number') {
+    out.exclusiveMaximum = s.maximum;
+    delete out.maximum;
+  }
+
+  if (typeof s.minLength === 'number') out.minLength = s.minLength;
+  if (typeof s.maxLength === 'number') out.maxLength = s.maxLength;
+  if (typeof s.pattern === 'string') out.pattern = s.pattern;
+
+  if (typeof s.minItems === 'number') out.minItems = s.minItems;
+  if (typeof s.maxItems === 'number') out.maxItems = s.maxItems;
+  // `uniqueItems` defaults to false; only the affirmative case carries info.
+  if (s.uniqueItems === true) out.uniqueItems = true;
+
+  if (typeof s.format === 'string') out.format = s.format;
+  // Same idea as uniqueItems — explicit `false` is the default; don't emit it.
+  if (s.deprecated === true) out.deprecated = true;
+
+  if (s.example !== undefined) {
+    out.example = s.example;
+  } else if (Array.isArray(s.examples) && s.examples.length > 0) {
+    out.example = s.examples[0];
+  }
+  if (s.default !== undefined) out.default = s.default;
+
+  return Object.keys(out).length > 0 ? out : undefined;
+}
+
+/**
+ * Build discriminator metadata for a `oneOf` / `anyOf` union, when the schema
+ * declares an explicit `discriminator`. With an explicit `mapping`, each entry
+ * pairs the discriminant value with its target schema name. Without a mapping,
+ * the OpenAPI spec says the discriminant value equals the referenced schema's
+ * name, so we derive entries from the `$ref` members.
+ *
+ * Returns `undefined` when there's no usable discriminator (no `discriminator`
+ * block, or one that yields no named targets) — the emitter then skips guards.
+ */
+function buildDiscriminator(
+  schema: Oas3Schema,
+  members: Array<Referenced<Oas3Schema>>
+): DiscriminatorModel | undefined {
+  const disc = (
+    schema as { discriminator?: { propertyName?: string; mapping?: Record<string, string> } }
+  ).discriminator;
+  if (!disc || typeof disc.propertyName !== 'string') return undefined;
+
+  const mapping: DiscriminatorModel['mapping'] = [];
+  if (disc.mapping) {
+    for (const [value, target] of Object.entries(disc.mapping)) {
+      mapping.push({ value, schemaName: refName(target) });
+    }
+  } else {
+    for (const member of members) {
+      if (isRef(member)) {
+        const name = refName(member.$ref);
+        mapping.push({ value: name, schemaName: name });
+      }
+    }
+  }
+  if (mapping.length === 0) return undefined;
+  return { propertyName: disc.propertyName, mapping };
+}
+
+/** Attach metadata to a freshly-built SchemaModel (no-op when undefined). */
+function withMetadata<T extends SchemaModel>(model: T, metadata: SchemaMetadata | undefined): T {
+  if (!metadata) return model;
+  return { ...model, metadata };
+}
+
+/** Merge two metadata bags; right wins on conflicts. Returns undefined when both are empty. */
+function mergeMetadata(
+  a: SchemaMetadata | undefined,
+  b: SchemaMetadata | undefined
+): SchemaMetadata | undefined {
+  if (!a) return b;
+  if (!b) return a;
+  return { ...a, ...b };
+}
+
+export function buildApiModel(doc: Oas3Definition): ApiModel {
+  const title = doc.info?.title ?? 'Api';
+  const version = doc.info?.version ?? '0.0.0';
+  const description = doc.info?.description;
+  const baseUrl = doc.servers?.[0]?.url ?? '';
+
+  const schemas = buildNamedSchemas(doc);
+  const securitySchemes = buildSecuritySchemes(doc);
+  const services = buildServices(doc, securitySchemes);
+
+  const model: ApiModel = {
+    title,
+    version,
+    description,
+    baseUrl,
+    services,
+    schemas,
+    securitySchemes,
+  };
+  // Sanitize names into safe identifiers (and rewrite refs to match) BEFORE any later
+  // pass derives names from them — `stripReadOnly` builds `omit` targets from schema
+  // names, so it must see the sanitized ones.
+  sanitizeIdentifiers(model);
+  stripReadOnlyFromRequestBodies(services, schemas);
+  // Hard gate: no unsafe name may reach the printer (see sanitize-identifiers.ts).
+  assertSafeIdentifiers(model);
+
+  return model;
+}
+
+/**
+ * Drop `readOnly` (server-managed) properties from every request body, in place.
+ * OpenAPI says readOnly properties must not be sent in requests, so a create/update
+ * body should not demand `id`/`createdAt`/etc. A body that `$ref`s a named schema
+ * becomes `Omit<Name, …readOnly>` (keeping the named type); an inline object has
+ * its readOnly properties filtered out. Response types are untouched.
+ */
+function stripReadOnlyFromRequestBodies(
+  services: ApiModel['services'],
+  schemas: NamedSchemaModel[]
+): void {
+  const byName = new Map(schemas.map((s) => [s.name, s.schema] as const));
+  for (const service of services) {
+    for (const op of service.operations) {
+      if (op.requestBody) op.requestBody.schema = stripReadOnly(op.requestBody.schema, byName);
+    }
+  }
+}
+
+/**
+ * Remove `unknown` members from a union's member list. `T | unknown` is just
+ * `unknown` in TypeScript, so a typeless/empty `oneOf`/`anyOf` branch would erase
+ * the real members. When every member is `unknown`, the union is itself `unknown`.
+ */
+function dropRedundantUnknown(members: SchemaModel[]): SchemaModel[] {
+  const real = members.filter((m) => m.kind !== 'unknown');
+  return real.length > 0 ? real : [{ kind: 'unknown' }];
+}
+
+function stripReadOnly(schema: SchemaModel, byName: Map<string, SchemaModel>): SchemaModel {
+  if (schema.kind === 'ref') {
+    const keys = collectReadOnlyKeys(schema, byName, new Set());
+    return keys.length > 0 ? { kind: 'omit', base: schema.name, keys } : schema;
+  }
+  if (schema.kind === 'object') {
+    const kept = schema.properties.filter((p) => !p.readOnly);
+    return kept.length === schema.properties.length ? schema : { ...schema, properties: kept };
+  }
+  return schema;
+}
+
+/**
+ * The readOnly top-level property names of a schema, descending through `$ref`s
+ * and `allOf` (intersection) members — the shape entity schemas compose with. A
+ * `visited` set guards against recursive refs. Order-preserving and deduped.
+ */
+function collectReadOnlyKeys(
+  schema: SchemaModel,
+  byName: Map<string, SchemaModel>,
+  visited: Set<string>
+): string[] {
+  const keys: string[] = [];
+  const visit = (s: SchemaModel): void => {
+    if (s.kind === 'ref') {
+      if (visited.has(s.name)) return;
+      visited.add(s.name);
+      const target = byName.get(s.name);
+      if (target) visit(target);
+    } else if (s.kind === 'object') {
+      for (const p of s.properties) if (p.readOnly && !keys.includes(p.name)) keys.push(p.name);
+    } else if (s.kind === 'intersection') {
+      for (const member of s.members) visit(member);
+    }
+  };
+  visit(schema);
+  return keys;
+}
+
+/**
+ * Collect the security schemes the client can apply on the wire, keyed by their
+ * `components.securitySchemes` name. Bearer (`http`+`bearer`/oauth2/openIdConnect),
+ * HTTP Basic, and apiKey in header/query/cookie are all injectable. `mutualTLS`
+ * (and an `http` scheme that is neither bearer nor basic) is skipped — operations
+ * that reference only those will simply carry no auth.
+ */
+function buildSecuritySchemes(doc: Oas3Definition): SecuritySchemeModel[] {
+  const schemes = doc.components?.securitySchemes;
+  if (!schemes) return [];
+
+  const result: SecuritySchemeModel[] = [];
+  for (const [key, raw] of Object.entries(schemes)) {
+    const scheme = deref<Oas3SecurityScheme>(doc, raw as Referenced<Oas3SecurityScheme>);
+    const type = scheme.type;
+    if (type === 'oauth2' || type === 'openIdConnect') {
+      result.push({ kind: 'bearer', key });
+    } else if (type === 'http' && (scheme.scheme ?? '').toLowerCase() === 'bearer') {
+      result.push({ kind: 'bearer', key });
+    } else if (type === 'http' && (scheme.scheme ?? '').toLowerCase() === 'basic') {
+      result.push({ kind: 'basic', key });
+    } else if (type === 'apiKey' && scheme.in === 'header' && typeof scheme.name === 'string') {
+      result.push({ kind: 'apiKeyHeader', key, headerName: scheme.name });
+    } else if (type === 'apiKey' && scheme.in === 'query' && typeof scheme.name === 'string') {
+      result.push({ kind: 'apiKeyQuery', key, paramName: scheme.name });
+    } else if (type === 'apiKey' && scheme.in === 'cookie' && typeof scheme.name === 'string') {
+      result.push({ kind: 'apiKeyCookie', key, cookieName: scheme.name });
+    }
+    // Everything else (http schemes other than bearer/basic, mutualTLS) is not
+    // injectable by the generated client — intentionally skipped.
+  }
+  return result;
+}
+
+/**
+ * Resolve the effective security for one operation into the set of scheme keys
+ * the client should inject. The operation's own `security` overrides the
+ * document default; `security: []` opts out entirely. We flatten across the
+ * OR-alternatives (each requirement object) into a deduped union, then drop any
+ * scheme the client can't inject so the emitter never references an unknown key.
+ */
+function resolveOperationSecurity(
+  operation: Oas3Operation,
+  doc: Oas3Definition,
+  injectable: Set<string>
+): string[] {
+  const requirements =
+    (operation as { security?: SecurityRequirement[] }).security ??
+    (doc as { security?: SecurityRequirement[] }).security;
+  if (!requirements) return [];
+
+  const keys: string[] = [];
+  const seen = new Set<string>();
+  for (const requirement of requirements) {
+    for (const key of Object.keys(requirement)) {
+      if (injectable.has(key) && !seen.has(key)) {
+        seen.add(key);
+        keys.push(key);
+      }
+    }
+  }
+  return keys;
+}
+
+function buildNamedSchemas(doc: Oas3Definition): NamedSchemaModel[] {
+  const namedSchemas = doc.components?.schemas;
+  if (!namedSchemas) return [];
+
+  return Object.entries(namedSchemas).map(([name, schema]) => {
+    if (isRef(schema)) {
+      // A top-level entry that is a $ref forwards to another component.
+      const target = resolveRef<Oas3Schema>(doc, schema.$ref);
+      return {
+        name,
+        schema: buildSchema(target, `components.schemas.${name}`, doc),
+        description: target.description,
+      };
+    }
+    const built = buildSchema(schema as Oas3Schema, `components.schemas.${name}`, doc);
+    return { name, schema: built, description: schema.description };
+  });
+}
+
+function buildServices(
+  doc: Oas3Definition,
+  securitySchemes: SecuritySchemeModel[]
+): ServiceModel[] {
+  const injectable = new Set(securitySchemes.map((s) => s.key));
+
+  type Entry = {
+    method: HttpMethod;
+    path: string;
+    operation: Oas3Operation;
+    pathLevelParams: ParamModel[];
+  };
+  const entries: Entry[] = [];
+  const usedNames = new Set<string>();
+  for (const [path, pathItemRaw] of Object.entries(doc.paths ?? {})) {
+    if (!pathItemRaw) continue;
+    const pathItem = deref<Oas3PathItem>(doc, pathItemRaw);
+
+    const pathLevelParams = (pathItem.parameters ?? []).map((p) =>
+      buildParameter(deref<Oas3Parameter>(doc, p), `paths.${path}.parameters`, doc)
+    );
+
+    for (const method of HTTP_METHODS) {
+      const operation = (pathItem as Oas3PathItem)[method];
+      if (!operation) continue;
+      entries.push({ method, path, operation, pathLevelParams });
+      // Reserve every declared operationId up front so a synthesized fallback name
+      // never collides with one — declared ids always win.
+      if (operation.operationId) usedNames.add(operation.operationId);
+    }
+  }
+
+  const operations = entries.map((entry) => {
+    const name =
+      entry.operation.operationId ??
+      takeUniqueName(fallbackOperationName(entry.method, entry.path), usedNames);
+    return buildOperation(
+      entry.method,
+      entry.path,
+      entry.operation,
+      name,
+      entry.pathLevelParams,
+      doc,
+      injectable
+    );
+  });
+  return [{ name: 'Default', operations }];
+}
+
+/**
+ * Synthesize an operation name from method + path when the spec omits `operationId`:
+ * `<method><PascalCasedPathSegments>` (braces stripped; each segment split on
+ * non-identifier chars). Path-param segments are kept so a collection (`GET /pets`)
+ * and an item (`GET /pets/{id}`) stay distinct. Always a valid identifier — the
+ * lowercase `method` prefix guarantees a letter start.
+ */
+function fallbackOperationName(method: string, path: string): string {
+  const segments = path
+    .split('/')
+    .filter(Boolean)
+    .map((segment) => pascalSegment(segment.replace(/[{}]/g, '')));
+  return `${method}${segments.join('')}`;
+}
+
+function pascalSegment(segment: string): string {
+  return segment
+    .split(/[^A-Za-z0-9]+/)
+    .filter(Boolean)
+    .map((word) => word[0].toUpperCase() + word.slice(1))
+    .join('');
+}
+
+/** Return `base`, or `base2`/`base3`/… if already taken; records the result in `used`. */
+function takeUniqueName(base: string, used: Set<string>): string {
+  let name = base;
+  let suffix = 2;
+  while (used.has(name)) name = `${base}${suffix++}`;
+  used.add(name);
+  return name;
+}
+
+function buildOperation(
+  method: HttpMethod,
+  path: string,
+  operation: Oas3Operation,
+  name: string,
+  pathLevelParams: ParamModel[],
+  doc: Oas3Definition,
+  injectable: Set<string>
+): OperationModel {
+  const operationParams = (operation.parameters ?? []).map((p) =>
+    buildParameter(deref<Oas3Parameter>(doc, p), `paths.${path}.${method}.parameters`, doc)
+  );
+
+  // Operation-level parameters override path-level ones (by name + in).
+  const seen = new Set<string>();
+  const allParams: ParamModel[] = [];
+  for (const p of operationParams) {
+    seen.add(`${p.in}:${p.name}`);
+    allParams.push(p);
+  }
+  for (const p of pathLevelParams) {
+    if (!seen.has(`${p.in}:${p.name}`)) {
+      allParams.push(p);
+    }
+  }
+
+  const pathParams = allParams.filter((p) => p.in === 'path');
+  const queryParams = allParams.filter((p) => p.in === 'query');
+  const headerParams = allParams.filter((p) => p.in === 'header');
+
+  const requestBody = operation.requestBody
+    ? buildRequestBody(deref(doc, operation.requestBody), `${method} ${path}`, doc)
+    : undefined;
+
+  const successResponses = buildSuccessResponses(operation, path, doc);
+  const errorResponses = buildErrorResponses(operation, path, doc);
+  const security = resolveOperationSecurity(operation, doc, injectable);
+
+  return {
+    name,
+    method,
+    path,
+    summary: operation.summary,
+    description: operation.description,
+    pathParams,
+    queryParams,
+    headerParams,
+    requestBody,
+    successResponses,
+    errorResponses,
+    security,
+    tags: Array.isArray(operation.tags) ? operation.tags.filter((t) => typeof t === 'string') : [],
+  };
+}
+
+function buildParameter(param: Oas3Parameter, location: string, doc: Oas3Definition): ParamModel {
+  if (!param.in) {
+    throw new NotSupportedError(`Parameter ${param.name} at ${location} is missing "in"`);
+  }
+  if (!['path', 'query', 'header', 'cookie'].includes(param.in)) {
+    throw new NotSupportedError(
+      `Unsupported parameter location "${param.in}" for ${param.name} at ${location}`
+    );
+  }
+  let schema = schemaFromSlot(param.schema, `${location}.${param.name}`, doc);
+
+  // OpenAPI lets `deprecated: true` live on the Parameter Object itself, not
+  // just on its schema. Fold it into the schema's metadata so the emitter has
+  // a single source of truth when rendering tags around this param.
+  if ((param as { deprecated?: boolean }).deprecated === true) {
+    schema = {
+      ...schema,
+      metadata: mergeMetadata(schema.metadata, { deprecated: true }),
+    };
+  }
+
+  const model: ParamModel = {
+    name: param.name,
+    in: param.in as ParamModel['in'],
+    schema,
+    required: Boolean(param.required),
+    description: param.description,
+  };
+
+  // Query-serialization hints (OpenAPI `style`/`explode`/`allowReserved`) live on the
+  // Parameter Object and aren't in the @redocly types — read them loosely, like
+  // `deprecated`. Only set them for query params, and only when present (absence ⇒
+  // the defaults, so the IR stays clean and downstream takes the default path).
+  if (model.in === 'query') {
+    const p = param as { style?: string; explode?: boolean; allowReserved?: boolean };
+    if (
+      p.style === 'form' ||
+      p.style === 'spaceDelimited' ||
+      p.style === 'pipeDelimited' ||
+      p.style === 'deepObject'
+    ) {
+      model.style = p.style;
+    }
+    if (typeof p.explode === 'boolean') model.explode = p.explode;
+    if (typeof p.allowReserved === 'boolean') model.allowReserved = p.allowReserved;
+  }
+
+  return model;
+}
+
+function buildRequestBody(
+  rb: { content?: Record<string, Oas3MediaType>; required?: boolean; description?: string },
+  location: string,
+  doc: Oas3Definition
+): RequestBodyModel | undefined {
+  const content = rb.content ?? {};
+  // Prefer JSON; fall back to first available.
+  const preferred =
+    content['application/json'] ??
+    content['application/merge-patch+json'] ??
+    content['application/x-www-form-urlencoded'] ??
+    content['multipart/form-data'] ??
+    Object.values(content)[0];
+  if (!preferred) return undefined;
+  // `preferred` is one of the values we sampled out of `content`, so its key must exist there.
+  const contentType = Object.keys(content).find((k) => content[k] === preferred)!;
+
+  const schema = schemaFromSlot(preferred.schema, `${location}.requestBody`, doc);
+  return {
+    contentType,
+    schema,
+    required: Boolean(rb.required),
+    description: rb.description,
+  };
+}
+
+function buildSuccessResponses(
+  operation: Oas3Operation,
+  path: string,
+  doc: Oas3Definition
+): ResponseBodyModel[] {
+  const responses = operation.responses ?? {};
+  const successCodes = Object.keys(responses).filter((code) => /^2\d\d$/.test(code));
+  if (successCodes.length === 0) {
+    if (responses['default']) successCodes.push('default');
+  }
+  // Pick the first success response.
+  const code = successCodes[0];
+  if (!code) return [];
+  const responseRaw = responses[code];
+  if (!responseRaw) return [];
+  const response = deref<Oas3ResponseShape>(doc, responseRaw);
+  const content = response.content;
+  if (!content) return [];
+
+  const status = code === 'default' ? 'default' : Number(code);
+  const result: ResponseBodyModel[] = [];
+  for (const [contentType, media] of Object.entries(content)) {
+    const schema = schemaFromSlot(
+      media.schema,
+      `paths.${path}.response.${code}.${contentType}`,
+      doc
+    );
+    const itemSlot = media.itemSchema;
+    const item =
+      itemSlot !== undefined
+        ? schemaFromSlot(itemSlot, `paths.${path}.response.${code}.${contentType}.itemSchema`, doc)
+        : undefined;
+    result.push(
+      item === undefined
+        ? { contentType, schema, status }
+        : { contentType, schema, status, itemSchema: item }
+    );
+  }
+  return result;
+}
+
+function buildErrorResponses(
+  operation: Oas3Operation,
+  path: string,
+  doc: Oas3Definition
+): ResponseBodyModel[] {
+  const responses = operation.responses ?? {};
+  const codes = Object.keys(responses).filter((code) => /^[45]\d\d$/.test(code));
+  // `default` is an error only when a 2xx success exists; otherwise
+  // `buildSuccessResponses` already consumes it as the success response.
+  const hasSuccess = Object.keys(responses).some((code) => /^2\d\d$/.test(code));
+  if (hasSuccess && responses['default']) codes.push('default');
+
+  const result: ResponseBodyModel[] = [];
+  for (const code of codes) {
+    const responseRaw = responses[code];
+    if (!responseRaw) continue;
+    const response = deref<Oas3ResponseShape>(doc, responseRaw);
+    const content = response.content;
+    if (!content) continue;
+    const status = code === 'default' ? 'default' : Number(code);
+    for (const [contentType, media] of Object.entries(content)) {
+      const schema = schemaFromSlot(
+        media.schema,
+        `paths.${path}.response.${code}.${contentType}`,
+        doc
+      );
+      result.push({ contentType, schema, status });
+    }
+  }
+  return result;
+}
+
+/**
+ * Decode a "schema slot" — the referenced-or-inline-or-absent schema position
+ * that recurs all over an OpenAPI document (`parameter.schema`, `media.schema`,
+ * property values, array `items`, `additionalProperties`) — into a SchemaModel.
+ *
+ * - absent (`undefined`) or a boolean JSON-Schema → `unknown` (we don't model
+ *   boolean schemas; this collapses the "missing schema" fallbacks too).
+ * - a `$ref` → a `ref` node carrying the target's local name (the IR keeps
+ *   refs un-resolved so named schemas map back to exported types).
+ * - an inline schema → recurse via `buildSchema`.
+ */
+function schemaFromSlot(
+  slot: Referenced<Oas3Schema | Oas3_1Schema> | boolean | undefined,
+  location: string,
+  doc: Oas3Definition
+): SchemaModel {
+  if (slot === undefined || typeof slot === 'boolean') return { kind: 'unknown' };
+  if (isRef(slot)) return { kind: 'ref', name: refName(slot.$ref) };
+  return buildSchema(slot as Oas3Schema, location, doc);
+}
+
+function buildSchema(schema: Oas3Schema, location: string, doc: Oas3Definition): SchemaModel {
+  // Note: every caller checks `isRef(schema)` before invoking this function, so a top-level
+  // `{$ref: ...}` never reaches here — see `buildNamedSchemas`, `buildParameter`, etc.
+  const metadata = extractMetadata(schema);
+
+  const oneOfish = schema.oneOf ?? schema.anyOf;
+  if (oneOfish) {
+    const allMembers = oneOfish.map((sub, idx) =>
+      isRef(sub)
+        ? ({ kind: 'ref', name: refName(sub.$ref) } as SchemaModel)
+        : buildSchema(sub as Oas3Schema, `${location}.[${idx}]`, doc)
+    );
+    // Drop `unknown` members (typeless/empty branches): `T | unknown` collapses to
+    // `unknown` in TS, erasing the real members. When only one real member remains,
+    // the union degenerates to it.
+    const members = dropRedundantUnknown(allMembers);
+    // Collapse to the lone member only when dropping `unknown` branches reduced the
+    // union to one — an originally single-member union is left as-is.
+    if (members.length === 1 && members.length < allMembers.length) {
+      const inner = members[0];
+      return {
+        ...inner,
+        description: inner.description ?? schema.description,
+        metadata: mergeMetadata(metadata, inner.metadata),
+      };
+    }
+    const discriminator = buildDiscriminator(schema, oneOfish);
+    return withMetadata(
+      { kind: 'union', members, discriminator, description: schema.description },
+      metadata
+    );
+  }
+
+  if (schema.allOf) {
+    const members = schema.allOf.map((sub, idx) =>
+      isRef(sub)
+        ? ({ kind: 'ref', name: refName(sub.$ref) } as SchemaModel)
+        : buildSchema(sub as Oas3Schema, `${location}.allOf[${idx}]`, doc)
+    );
+    // `allOf` does not replace sibling `properties`: a schema may declare its own
+    // object shape (often a `const` discriminant) alongside `allOf`. Fold that own
+    // object into the intersection so those properties aren't dropped.
+    const ownProperties = buildProperties(schema, location, doc);
+    if (ownProperties.length > 0) {
+      members.unshift({ kind: 'object', properties: ownProperties });
+    }
+    if (members.length === 1) {
+      // Single-member allOf collapses to its target. Preserve the wrapper's
+      // description/metadata only when the inner doesn't already have them.
+      const inner = members[0];
+      return {
+        ...inner,
+        description: inner.description ?? schema.description,
+        metadata: mergeMetadata(metadata, inner.metadata),
+      };
+    }
+    return withMetadata(
+      { kind: 'intersection', members, description: schema.description },
+      metadata
+    );
+  }
+
+  // OpenAPI 3.1 style nullable: `type: ['string', 'null']`.
+  const rawType = (schema as { type?: string | string[] }).type;
+  if (Array.isArray(rawType)) {
+    const nonNull = rawType.filter((t) => t !== 'null');
+    const hasNull = rawType.includes('null');
+    const baseMembers = nonNull.map((t) => {
+      // Strip `null` out of any `enum` before recursing: the array-type null is
+      // the single source of nullability here, so the enum branch must not add a
+      // second `null` member (and an enum of only `null` would otherwise throw).
+      const sub = { ...schema, type: t } as Oas3Schema & { enum?: unknown[] };
+      if (Array.isArray(sub.enum)) {
+        const filtered = sub.enum.filter((v) => v !== null);
+        sub.enum = filtered.length > 0 ? filtered : undefined;
+      }
+      return buildSchema(sub as Oas3Schema, location, doc);
+    });
+    if (hasNull) baseMembers.push({ kind: 'null' });
+    if (baseMembers.length === 1) {
+      return baseMembers[0];
+    }
+    return withMetadata(
+      { kind: 'union', members: baseMembers, description: schema.description },
+      metadata
+    );
+  }
+
+  // OpenAPI 3.0 nullable.
+  if ((schema as { nullable?: boolean }).nullable) {
+    const base = buildSchema(
+      { ...(schema as object), nullable: undefined } as Oas3Schema,
+      location,
+      doc
+    );
+    return {
+      kind: 'union',
+      members: [base, { kind: 'null' }],
+      description: schema.description,
+    };
+  }
+
+  if ((schema as { const?: unknown }).const !== undefined) {
+    const value = (schema as { const: unknown }).const;
+    if (typeof value !== 'string' && typeof value !== 'number' && typeof value !== 'boolean') {
+      throw new NotSupportedError(
+        `Unsupported const value at ${location}: ${JSON.stringify(value)}`
+      );
+    }
+    return withMetadata({ kind: 'literal', value, description: schema.description }, metadata);
+  }
+
+  if (schema.enum) {
+    // OAS 3.1 allows `null` among enum values. Model it as `<enum> | null` and
+    // keep the enum itself null-free so scalar inference stays simple.
+    const rawValues = schema.enum as unknown[];
+    const nonNullValues = rawValues.filter((v) => v !== null) as Array<string | number | boolean>;
+    const enumHasNull = nonNullValues.length !== rawValues.length;
+    if (nonNullValues.length === 0) {
+      return withMetadata({ kind: 'null', description: schema.description }, metadata);
+    }
+    const scalar = scalarForEnumValues(nonNullValues, location);
+    // A boolean `enum` conveys no useful narrowing: `[true, false]` is just `boolean`, and a
+    // single-value `[false]`/`[true]` is a spec quirk, not an intended literal type. Widen to
+    // `boolean` so a normal boolean field never becomes a literal. (`const: false` stays a
+    // literal — that's an explicit, deliberate single-value constraint, handled above.)
+    const base: SchemaModel =
+      scalar === 'boolean'
+        ? { kind: 'scalar', scalar: 'boolean', description: schema.description }
+        : { kind: 'enum', values: nonNullValues, scalar, description: schema.description };
+    if (enumHasNull) {
+      return withMetadata(
+        { kind: 'union', members: [base, { kind: 'null' }], description: schema.description },
+        metadata
+      );
+    }
+    return withMetadata(base, metadata);
+  }
+
+  const type = rawType;
+
+  if (type === 'null') {
+    // OAS 3.1 single null type — a value that is always `null` (e.g. a field a
+    // variant pins to null). Without this it would fall through to `unknown`.
+    return withMetadata({ kind: 'null', description: schema.description }, metadata);
+  }
+
+  if (type === 'array') {
+    const itemsRaw = (schema as { items?: Referenced<Oas3Schema> | boolean }).items;
+    const items = schemaFromSlot(itemsRaw, `${location}.items`, doc);
+    return withMetadata({ kind: 'array', items, description: schema.description }, metadata);
+  }
+
+  if (type === 'object' || schema.properties || schema.additionalProperties) {
+    const properties = buildProperties(schema, location, doc);
+    const additional = (
+      schema as { additionalProperties?: boolean | Oas3Schema | { $ref: string } }
+    ).additionalProperties;
+
+    if (properties.length === 0 && additional !== false) {
+      // A property-less object accepts arbitrary keys: OpenAPI defaults absent
+      // `additionalProperties` to allowed. Emit a record — of the declared
+      // additionalProperties schema, or `unknown` when it's absent/`true` — rather
+      // than `{}`, which in TS forbids member access. An explicit
+      // `additionalProperties: false` is closed and stays an empty object.
+      const value = schemaFromSlot(additional, `${location}.additionalProperties`, doc);
+      return withMetadata({ kind: 'record', value, description: schema.description }, metadata);
+    }
+
+    return withMetadata({ kind: 'object', properties, description: schema.description }, metadata);
+  }
+
+  if (type === 'string' || type === 'number' || type === 'integer' || type === 'boolean') {
+    return withMetadata(
+      { kind: 'scalar', scalar: type, description: schema.description },
+      metadata
+    );
+  }
+
+  // No usable type information — fall back to `unknown` instead of erroring,
+  // so generation still succeeds for sparsely-typed schemas.
+  return withMetadata({ kind: 'unknown', description: schema.description }, metadata);
+}
+
+function scalarForEnumValues(values: unknown[], location: string): ScalarKind {
+  let hasStr = false;
+  let hasNum = false;
+  let hasBool = false;
+  for (const v of values) {
+    if (typeof v === 'string') hasStr = true;
+    else if (typeof v === 'number') hasNum = true;
+    else if (typeof v === 'boolean') hasBool = true;
+    else
+      throw new NotSupportedError(
+        `Unsupported enum value type at ${location}: ${JSON.stringify(v)}`
+      );
+  }
+  if (hasStr && !hasNum && !hasBool) return 'string';
+  if (hasNum && !hasStr && !hasBool) return 'number';
+  if (hasBool && !hasStr && !hasNum) return 'boolean';
+  return 'string';
+}
+
+function buildProperties(
+  schema: Oas3Schema,
+  location: string,
+  doc: Oas3Definition
+): PropertyModel[] {
+  const props = schema.properties ?? {};
+  const required = new Set(schema.required ?? []);
+  return Object.entries(props).map(([name, sub]) => {
+    const readOnly = !isRef(sub) && (sub as { readOnly?: boolean }).readOnly === true;
+    return {
+      name,
+      schema: schemaFromSlot(sub, `${location}.${name}`, doc),
+      required: required.has(name),
+      description: (sub as { description?: string }).description,
+      ...(readOnly ? { readOnly: true } : {}),
+    };
+  });
+}
diff --git a/packages/openapi-typescript/src/ir/model.ts b/packages/openapi-typescript/src/ir/model.ts
new file mode 100644
index 0000000000..24adbd0658
--- /dev/null
+++ b/packages/openapi-typescript/src/ir/model.ts
@@ -0,0 +1,229 @@
+export type ScalarKind = 'string' | 'number' | 'boolean' | 'integer';
+
+/**
+ * Validation / annotation metadata pulled straight from an OpenAPI Schema Object.
+ *
+ * The renderer projects these into JSDoc tags (`@minimum 1`, `@pattern ...`, …).
+ * We deliberately do NOT enforce which keys are valid on which kind (e.g.
+ * `minLength` on a number is technically nonsense) — the spec is authoritative
+ * and the renderer just emits whatever is set. This keeps the IR cheap and lets
+ * us add new tags without ratcheting the type system.
+ *
+ * `exclusiveMinimum` / `exclusiveMaximum` are always normalized to the OAS 3.1
+ * numeric form by the builder, even when the source uses the OAS 3.0 boolean
+ * form. This means the emitter has exactly one shape to handle.
+ */
+export type SchemaMetadata = {
+  minimum?: number;
+  maximum?: number;
+  exclusiveMinimum?: number;
+  exclusiveMaximum?: number;
+  minLength?: number;
+  maxLength?: number;
+  pattern?: string;
+  minItems?: number;
+  maxItems?: number;
+  uniqueItems?: boolean;
+  format?: string;
+  deprecated?: boolean;
+  /** A representative value for the schema, used by the mock sampler. From the
+   * source `example` field, or the first entry of `examples` (OAS 3.1 array form). */
+  example?: unknown;
+  /** The schema's `default` value, used as a sampler fallback when no example exists. */
+  default?: unknown;
+};
+
+/**
+ * Discriminator metadata for a union, used to emit `is<Member>()` type guards.
+ *
+ * `propertyName` is the discriminating property. Each `mapping` entry pairs the
+ * discriminant string `value` with the `schemaName` (a named, top-level schema)
+ * that value selects. We only retain entries that point at named schemas, since
+ * a guard must narrow to an exported type.
+ *
+ * The builder fills this from an explicit `discriminator` (with or without an
+ * explicit `mapping`); the emitter may additionally synthesize one for an
+ * *implicit* discriminator (every member constrains a shared property to a
+ * distinct `const`).
+ */
+export type DiscriminatorModel = {
+  propertyName: string;
+  mapping: Array<{ value: string; schemaName: string }>;
+};
+
+export type SchemaModel =
+  | { kind: 'scalar'; scalar: ScalarKind; description?: string; metadata?: SchemaMetadata }
+  | { kind: 'array'; items: SchemaModel; description?: string; metadata?: SchemaMetadata }
+  | { kind: 'object'; properties: PropertyModel[]; description?: string; metadata?: SchemaMetadata }
+  | { kind: 'record'; value: SchemaModel; description?: string; metadata?: SchemaMetadata }
+  | { kind: 'ref'; name: string; description?: string; metadata?: SchemaMetadata }
+  | {
+      kind: 'literal';
+      value: string | number | boolean;
+      description?: string;
+      metadata?: SchemaMetadata;
+    }
+  | {
+      kind: 'enum';
+      values: Array<string | number | boolean>;
+      scalar: ScalarKind;
+      description?: string;
+      metadata?: SchemaMetadata;
+    }
+  | {
+      kind: 'union';
+      members: SchemaModel[];
+      discriminator?: DiscriminatorModel;
+      description?: string;
+      metadata?: SchemaMetadata;
+    }
+  | {
+      kind: 'intersection';
+      members: SchemaModel[];
+      description?: string;
+      metadata?: SchemaMetadata;
+    }
+  | { kind: 'null'; description?: string; metadata?: SchemaMetadata }
+  | { kind: 'unknown'; description?: string; metadata?: SchemaMetadata }
+  /**
+   * `Omit<base, "k1" | "k2">` — a named schema with some keys removed. Built only
+   * for request bodies, where `readOnly` (server-managed) properties must not be
+   * sent. `base` is a named schema (an emitted type); `keys` are the readOnly
+   * property names dropped from it.
+   */
+  | {
+      kind: 'omit';
+      base: string;
+      keys: string[];
+      description?: string;
+      metadata?: SchemaMetadata;
+    };
+
+export type PropertyModel = {
+  name: string;
+  schema: SchemaModel;
+  required: boolean;
+  description?: string;
+  /** `readOnly: true` in the spec — server-managed; dropped from request bodies. */
+  readOnly?: boolean;
+};
+
+export type ParamModel = {
+  name: string;
+  in: 'path' | 'query' | 'header' | 'cookie';
+  schema: SchemaModel;
+  required: boolean;
+  description?: string;
+  /**
+   * OpenAPI query-serialization hints, only meaningful for query params (path/header
+   * params ignore them). Absent ⇒ the OpenAPI defaults (`form`, `explode: true`); the
+   * builder leaves them `undefined` rather than synthesizing defaults, so downstream
+   * takes the default serialization path.
+   */
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+export type RequestBodyModel = {
+  contentType: string;
+  schema: SchemaModel;
+  required: boolean;
+  description?: string;
+};
+
+export type ResponseBodyModel = {
+  contentType: string;
+  schema: SchemaModel;
+  /**
+   * The HTTP status code this response body is declared under (`200`, `404`, …),
+   * or `'default'` for the OpenAPI `default` response.
+   */
+  status: number | 'default';
+  /**
+   * The per-item payload schema for a streaming/sequential media type (OpenAPI
+   * 3.2 `itemSchema`, e.g. on `text/event-stream`). Absent for ordinary bodies.
+   */
+  itemSchema?: SchemaModel;
+};
+
+/**
+ * A security scheme the generated client knows how to apply. Only the schemes
+ * we can actually inject on the wire are modeled:
+ *
+ * - `bearer` — `http`+`bearer`, `oauth2`, or `openIdConnect`. All of these end
+ *   up as an `Authorization: Bearer <token>` header, so they share one
+ *   `setBearer()` setter and one token slot.
+ * - `basic` — `http`+`basic`. Injected as an `Authorization: Basic <base64>`
+ *   header via the shared `setBasicAuth()` setter.
+ * - `apiKeyHeader` — `apiKey` in `header`. Each gets its own setter + slot keyed
+ *   by `key`, and injects its own `headerName`.
+ * - `apiKeyQuery` — `apiKey` in `query`. Injected as a URL query parameter named
+ *   `paramName`.
+ * - `apiKeyCookie` — `apiKey` in `cookie`. Injected into a combined `Cookie`
+ *   header under `cookieName`.
+ *
+ * `mutualTLS` (and an `http` scheme other than bearer/basic) is not injectable
+ * by the client and is skipped by the builder; an operation referencing only
+ * such schemes simply carries no auth.
+ */
+export type SecuritySchemeModel =
+  | { kind: 'bearer'; key: string }
+  | { kind: 'basic'; key: string }
+  | { kind: 'apiKeyHeader'; key: string; headerName: string }
+  | { kind: 'apiKeyQuery'; key: string; paramName: string }
+  | { kind: 'apiKeyCookie'; key: string; cookieName: string };
+
+export type OperationModel = {
+  name: string;
+  method: 'get' | 'post' | 'put' | 'delete' | 'patch' | 'head' | 'options';
+  path: string;
+  summary?: string;
+  description?: string;
+  pathParams: ParamModel[];
+  queryParams: ParamModel[];
+  headerParams: ParamModel[];
+  requestBody?: RequestBodyModel;
+  successResponses: ResponseBodyModel[];
+  /**
+   * The operation's declared error responses (4xx/5xx, plus `default` when a 2xx
+   * success also exists). Empty when none are declared. Consumed only by
+   * `errorMode: 'result'` output, where they type the `error` of the result shape.
+   */
+  errorResponses: ResponseBodyModel[];
+  /**
+   * The operation's OpenAPI `tags`, in declared order (empty when none). Used by
+   * multi-file output modes to group operations into per-tag files; ignored by
+   * the default single-file output.
+   */
+  tags: string[];
+  /**
+   * Effective security for this operation, as security-scheme keys (resolving
+   * the operation's own `security` over the document default, and filtered to
+   * schemes the client can actually inject). An empty array means "send no
+   * credentials" — either the operation opted out via `security: []` or no
+   * applicable scheme exists.
+   */
+  security: string[];
+};
+
+export type ServiceModel = {
+  name: string;
+  operations: OperationModel[];
+};
+
+export type NamedSchemaModel = {
+  name: string;
+  schema: SchemaModel;
+  description?: string;
+};
+
+export type ApiModel = {
+  title: string;
+  version: string;
+  description?: string;
+  baseUrl: string;
+  services: ServiceModel[];
+  schemas: NamedSchemaModel[];
+  securitySchemes: SecuritySchemeModel[];
+};
diff --git a/packages/openapi-typescript/src/ir/normalize-swagger2.ts b/packages/openapi-typescript/src/ir/normalize-swagger2.ts
new file mode 100644
index 0000000000..a7fcc18663
--- /dev/null
+++ b/packages/openapi-typescript/src/ir/normalize-swagger2.ts
@@ -0,0 +1,240 @@
+import { isPlainObject, type Oas3Definition } from '@redocly/openapi-core';
+
+/**
+ * Convert a Swagger 2.0 document into the OpenAPI 3.x shape the IR builder expects.
+ * All 2.0-specific quirks live here so `buildApiModel` stays 3.x-only. Operations
+ * are normalized too (body/formData → requestBody, inline param types → `schema`,
+ * `responses[].schema` + `produces` → `responses[].content`). Every `#/definitions`,
+ * `#/parameters`, `#/responses` `$ref` is rewritten to its `#/components/...` home.
+ */
+export function normalizeSwagger2(doc: Record<string, unknown>): Oas3Definition {
+  const rewritten = rewriteRefs(doc) as Record<string, unknown>;
+
+  const out: Record<string, unknown> = { ...rewritten };
+  delete out.swagger;
+  delete out.host;
+  delete out.basePath;
+  delete out.schemes;
+  delete out.definitions;
+  delete out.securityDefinitions;
+  delete out.consumes;
+  delete out.produces;
+  delete out.parameters;
+  delete out.responses;
+
+  out.openapi = '3.0.3';
+
+  const servers = buildServers(rewritten);
+  if (servers) out.servers = servers;
+
+  out.components = buildComponents(rewritten);
+
+  out.paths = normalizePaths(
+    (rewritten.paths as Record<string, unknown>) ?? {},
+    (rewritten.consumes as string[] | undefined) ?? undefined,
+    (rewritten.produces as string[] | undefined) ?? undefined
+  );
+
+  return out as unknown as Oas3Definition;
+}
+
+function buildServers(doc: Record<string, unknown>): Array<{ url: string }> | undefined {
+  const host = doc.host as string | undefined;
+  const basePath = (doc.basePath as string | undefined) ?? '';
+  const scheme = ((doc.schemes as string[] | undefined) ?? ['https'])[0] ?? 'https';
+  if (!host) return undefined;
+  return [{ url: `${scheme}://${host}${basePath}` }];
+}
+
+function buildComponents(doc: Record<string, unknown>): Record<string, unknown> {
+  const components: Record<string, unknown> = {};
+  if (doc.definitions) components.schemas = doc.definitions;
+  if (doc.parameters) components.parameters = doc.parameters;
+  if (doc.responses)
+    components.responses = normalizeResponses(doc.responses as Record<string, unknown>, undefined);
+  const securityDefinitions = doc.securityDefinitions as
+    | Record<string, Record<string, unknown>>
+    | undefined;
+  if (securityDefinitions) {
+    const securitySchemes: Record<string, unknown> = {};
+    for (const [key, scheme] of Object.entries(securityDefinitions)) {
+      securitySchemes[key] = mapSecurityScheme(scheme);
+    }
+    components.securitySchemes = securitySchemes;
+  }
+  return components;
+}
+
+function mapSecurityScheme(scheme: Record<string, unknown>): Record<string, unknown> {
+  switch (scheme.type) {
+    case 'basic':
+      return { type: 'http', scheme: 'basic' };
+    case 'apiKey':
+      return { type: 'apiKey', name: scheme.name, in: scheme.in };
+    case 'oauth2': {
+      const flowName =
+        scheme.flow === 'accessCode'
+          ? 'authorizationCode'
+          : scheme.flow === 'application'
+            ? 'clientCredentials'
+            : (scheme.flow as string);
+      const flow: Record<string, unknown> = { scopes: scheme.scopes ?? {} };
+      if (scheme.authorizationUrl) flow.authorizationUrl = scheme.authorizationUrl;
+      if (scheme.tokenUrl) flow.tokenUrl = scheme.tokenUrl;
+      return { type: 'oauth2', flows: { [flowName]: flow } };
+    }
+    default:
+      return scheme;
+  }
+}
+
+/** Deep-clone `node`, rewriting Swagger-2 local `$ref` pointers to their 3.x homes. */
+function rewriteRefs(node: unknown): unknown {
+  if (Array.isArray(node)) return node.map(rewriteRefs);
+  if (isPlainObject(node)) {
+    const out: Record<string, unknown> = {};
+    for (const [key, value] of Object.entries(node as Record<string, unknown>)) {
+      if (key === '$ref' && typeof value === 'string') {
+        out.$ref = value
+          .replace('#/definitions/', '#/components/schemas/')
+          .replace('#/parameters/', '#/components/parameters/')
+          .replace('#/responses/', '#/components/responses/');
+      } else {
+        out[key] = rewriteRefs(value);
+      }
+    }
+    return out;
+  }
+  return node;
+}
+
+const DEFAULT_CONSUMES = 'application/json';
+const DEFAULT_PRODUCES = 'application/json';
+const NON_SCHEMA_PARAM_KEYS = new Set([
+  'name',
+  'in',
+  'required',
+  'description',
+  'deprecated',
+  'allowEmptyValue',
+  'collectionFormat',
+]);
+
+function normalizePaths(
+  paths: Record<string, unknown>,
+  rootConsumes?: string[],
+  rootProduces?: string[]
+): Record<string, unknown> {
+  const out: Record<string, unknown> = {};
+  for (const [path, itemRaw] of Object.entries(paths)) {
+    const item = itemRaw as Record<string, unknown>;
+    const newItem: Record<string, unknown> = {};
+    for (const [key, value] of Object.entries(item)) {
+      if (!isHttpMethod(key)) {
+        newItem[key] = value;
+        continue;
+      }
+      newItem[key] = normalizeOperation(
+        value as Record<string, unknown>,
+        rootConsumes,
+        rootProduces
+      );
+    }
+    out[path] = newItem;
+  }
+  return out;
+}
+
+function isHttpMethod(key: string): boolean {
+  return ['get', 'put', 'post', 'delete', 'options', 'head', 'patch'].includes(key.toLowerCase());
+}
+
+function normalizeOperation(
+  operation: Record<string, unknown>,
+  rootConsumes?: string[],
+  rootProduces?: string[]
+): Record<string, unknown> {
+  const consumes = (operation.consumes as string[] | undefined) ?? rootConsumes;
+  const produces = (operation.produces as string[] | undefined) ?? rootProduces;
+  const params = (operation.parameters as Array<Record<string, unknown>> | undefined) ?? [];
+
+  const bodyParam = params.find((p) => p.in === 'body');
+  const formDataParams = params.filter((p) => p.in === 'formData');
+  const otherParams = params
+    .filter((p) => p.in !== 'body' && p.in !== 'formData')
+    .map(normalizeParameter);
+
+  const out: Record<string, unknown> = { ...operation, parameters: otherParams };
+  delete out.consumes;
+  delete out.produces;
+
+  const contentType = consumes?.[0] ?? DEFAULT_CONSUMES;
+  if (bodyParam) {
+    out.requestBody = {
+      required: Boolean(bodyParam.required),
+      content: { [contentType]: { schema: bodyParam.schema } },
+    };
+  } else if (formDataParams.length > 0) {
+    const properties: Record<string, unknown> = {};
+    const required: string[] = [];
+    for (const p of formDataParams) {
+      properties[p.name as string] = paramSchema(p);
+      if (p.required) required.push(p.name as string);
+    }
+    const schema: Record<string, unknown> = { type: 'object', properties };
+    if (required.length > 0) schema.required = required;
+    // form-urlencoded unless a multipart consumes is declared.
+    const formType =
+      consumes?.find((c) => c === 'multipart/form-data') ??
+      consumes?.[0] ??
+      'application/x-www-form-urlencoded';
+    out.requestBody = {
+      required: required.length > 0,
+      content: { [formType]: { schema } },
+    };
+  }
+
+  if (operation.responses) {
+    out.responses = normalizeResponses(operation.responses as Record<string, unknown>, produces);
+  }
+  return out;
+}
+
+/** A Swagger-2 simple parameter carries its schema inline; OAS3 nests it under `schema`. */
+function normalizeParameter(param: Record<string, unknown>): Record<string, unknown> {
+  const base: Record<string, unknown> = {};
+  const schema: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(param)) {
+    if (NON_SCHEMA_PARAM_KEYS.has(key)) base[key] = value;
+    else schema[key] = value;
+  }
+  base.schema = schema;
+  return base;
+}
+
+/** The schema half of a formData/simple param (everything except the param-level keys). */
+function paramSchema(param: Record<string, unknown>): Record<string, unknown> {
+  const schema: Record<string, unknown> = {};
+  for (const [key, value] of Object.entries(param)) {
+    if (!NON_SCHEMA_PARAM_KEYS.has(key)) schema[key] = value;
+  }
+  return schema;
+}
+
+function normalizeResponses(
+  responses: Record<string, unknown>,
+  produces?: string[]
+): Record<string, unknown> {
+  const contentType = produces?.[0] ?? DEFAULT_PRODUCES;
+  const out: Record<string, unknown> = {};
+  for (const [code, responseRaw] of Object.entries(responses)) {
+    const response = responseRaw as Record<string, unknown>;
+    if (response.schema === undefined) {
+      out[code] = response;
+      continue;
+    }
+    const { schema, ...rest } = response;
+    out[code] = { ...rest, content: { [contentType]: { schema } } };
+  }
+  return out;
+}
diff --git a/packages/openapi-typescript/src/ir/refs.ts b/packages/openapi-typescript/src/ir/refs.ts
new file mode 100644
index 0000000000..4dbca0e21e
--- /dev/null
+++ b/packages/openapi-typescript/src/ir/refs.ts
@@ -0,0 +1,66 @@
+import type { OperationModel, SchemaModel } from './model.js';
+
+/**
+ * Collect the names of every top-level (named) schema a `SchemaModel` references,
+ * recursing through the structural kinds (array items, record values, object
+ * properties, union/intersection members) down to each `ref`.
+ *
+ * Used by multi-file output writers to emit a precise
+ * `import type { … } from './…schemas'` header — only the names actually
+ * referenced, so the emitted file type-checks cleanly under `noUnusedLocals`.
+ *
+ * Insertion order is preserved (and deduped) so import lists are deterministic.
+ * Scalars, literals, enums, `null`, and `unknown` reference nothing.
+ */
+export function collectSchemaRefs(schema: SchemaModel, into: Set<string> = new Set()): Set<string> {
+  switch (schema.kind) {
+    case 'ref':
+      into.add(schema.name);
+      break;
+    case 'omit':
+      // `Omit<Base, …>` still references the named base type.
+      into.add(schema.base);
+      break;
+    case 'array':
+      collectSchemaRefs(schema.items, into);
+      break;
+    case 'record':
+      collectSchemaRefs(schema.value, into);
+      break;
+    case 'object':
+      for (const property of schema.properties) collectSchemaRefs(property.schema, into);
+      break;
+    case 'union':
+    case 'intersection':
+      for (const member of schema.members) collectSchemaRefs(member, into);
+      break;
+  }
+  return into;
+}
+
+/**
+ * Collect every named schema referenced by an operation's signature: its path,
+ * query, and header params, its request body, and its success responses. Error
+ * responses are walked only under `errorMode: 'result'`, since that is the only
+ * mode that emits the `<Op>Error` union that references them — in `throw` mode the
+ * error bodies are never named, so importing them would trip `noUnusedLocals`.
+ * This is exactly the set of type imports an endpoints file needs from the schemas
+ * module.
+ */
+export function collectOperationRefs(
+  op: OperationModel,
+  errorMode: 'throw' | 'result' = 'throw'
+): Set<string> {
+  const into = new Set<string>();
+  for (const param of op.pathParams) collectSchemaRefs(param.schema, into);
+  for (const param of op.queryParams) collectSchemaRefs(param.schema, into);
+  for (const param of op.headerParams) collectSchemaRefs(param.schema, into);
+  if (op.requestBody) collectSchemaRefs(op.requestBody.schema, into);
+  for (const response of op.successResponses) {
+    collectSchemaRefs(response.schema, into);
+    if (response.itemSchema) collectSchemaRefs(response.itemSchema, into);
+  }
+  if (errorMode === 'result')
+    for (const response of op.errorResponses) collectSchemaRefs(response.schema, into);
+  return into;
+}
diff --git a/packages/openapi-typescript/src/ir/sanitize-identifiers.ts b/packages/openapi-typescript/src/ir/sanitize-identifiers.ts
new file mode 100644
index 0000000000..d5c2bb50a1
--- /dev/null
+++ b/packages/openapi-typescript/src/ir/sanitize-identifiers.ts
@@ -0,0 +1,155 @@
+import { logger } from '@redocly/openapi-core';
+
+import { isSafeIdentifier, uniqueIdent } from '../emitters/identifier.js';
+import type { ApiModel, OperationModel, SchemaModel } from './model.js';
+
+/**
+ * Coerce every document-derived name that lands in a TypeScript *declaration*
+ * slot — schema type names, operation (function) names — into a valid, unique JS
+ * identifier, and rewrite every reference to a renamed schema to match.
+ *
+ * This is a security boundary, not a nicety. `ts.factory.createIdentifier` prints
+ * its text verbatim with no validation, so a spec name like
+ * `foo(){};globalThis.x=1;export async function bar` would emit as executable
+ * top-level code in every consumer of the generated client. Sanitizing here, once,
+ * means no raw name reaches the printer regardless of which emitter consumes it.
+ *
+ * Valid identifiers pass through unchanged, so well-formed specs are byte-for-byte
+ * unaffected; only `-`/`.`/space/reserved-word/hostile names are rewritten (with a
+ * warning). `assertSafeIdentifiers` is the belt-and-suspenders gate that fails the
+ * build if any name still slips through — it should never fire after this pass.
+ */
+export function sanitizeIdentifiers(model: ApiModel): void {
+  // Schema names share TypeScript's *type* namespace; operation names its *value*
+  // namespace. Keep separate `used` sets so a function and a type may share a name.
+  const schemaNames = new Set<string>();
+  const renamed = new Map<string, string>();
+  for (const schema of model.schemas) {
+    const safe = uniqueIdent(schema.name, schemaNames);
+    if (safe !== schema.name) {
+      renamed.set(schema.name, safe);
+      warnRename('schema', schema.name, safe);
+      schema.name = safe;
+    }
+  }
+
+  // Security-scheme keys feed the apiKey setter name (`setApiKey<Key>`, built with a
+  // first-char-only pascalCase) and the runtime's security-matching string literals.
+  // Sanitize so the setter is a valid identifier, then rewrite each operation's
+  // `security` list with the same map so the literals still match.
+  const schemeKeys = new Set<string>();
+  const renamedKeys = new Map<string, string>();
+  for (const scheme of model.securitySchemes) {
+    const safe = uniqueIdent(scheme.key, schemeKeys);
+    if (safe !== scheme.key) {
+      renamedKeys.set(scheme.key, safe);
+      warnRename('security scheme', scheme.key, safe);
+      scheme.key = safe;
+    }
+  }
+
+  // A reference to a renamed schema/scheme must follow it; an unknown/dangling name is
+  // still sanitized standalone so it can never carry an injection payload.
+  const fixRef = (name: string): string => renamed.get(name) ?? sanitizeRef(name);
+  const fixKey = (key: string): string => renamedKeys.get(key) ?? sanitizeRef(key);
+  for (const schema of model.schemas) rewriteRefs(schema.schema, fixRef);
+
+  const operationNames = new Set<string>();
+  for (const service of model.services) {
+    for (const op of service.operations) {
+      const safe = uniqueIdent(op.name, operationNames);
+      if (safe !== op.name) {
+        warnRename('operation', op.name, safe);
+        op.name = safe;
+      }
+      rewriteOperationRefs(op, fixRef);
+      op.security = op.security.map(fixKey);
+    }
+  }
+}
+
+/**
+ * Throw if any declaration name is still not a safe identifier — a generator bug, not
+ * bad input.
+ *
+ * This gates the three names that land *directly* in a binding slot from the model:
+ * schema names, security-scheme keys, and operation names. Identifiers an emitter
+ * *derives* from these — path-parameter binding names (`uniqueIdent`), enum
+ * const-object keys (`isIdentifier`-gated), and tag-derived service-class names
+ * (`serviceClassName`) — are sanitized at their point of use, not here, so they stay
+ * safe even though this gate does not re-check them.
+ */
+export function assertSafeIdentifiers(model: ApiModel): void {
+  for (const schema of model.schemas) {
+    if (!isSafeIdentifier(schema.name)) throw unsafe('schema', schema.name);
+  }
+  for (const scheme of model.securitySchemes) {
+    // The key drives `setApiKey<Key>`, so it must be a safe identifier.
+    if (!isSafeIdentifier(scheme.key)) throw unsafe('security scheme', scheme.key);
+  }
+  for (const service of model.services) {
+    for (const op of service.operations) {
+      if (!isSafeIdentifier(op.name)) throw unsafe('operation', op.name);
+    }
+  }
+}
+
+function unsafe(kind: string, name: string): Error {
+  return new Error(
+    `Internal error: ${kind} name ${JSON.stringify(name)} is not a safe identifier after sanitization.`
+  );
+}
+
+/** Sanitize a ref/`omit` target that has no matching declaration (rare: a dangling $ref). */
+function sanitizeRef(name: string): string {
+  // No uniqueness context here; a throwaway set yields a pure, deterministic sanitize.
+  return uniqueIdent(name, new Set());
+}
+
+function warnRename(kind: string, from: string, to: string): void {
+  logger.warn(
+    `generate-client: ${kind} name ${JSON.stringify(from)} is not a valid TypeScript identifier; using ${JSON.stringify(to)}.\n`
+  );
+}
+
+/** Rewrite `ref`/`omit`/discriminator targets in a schema subtree via `fixRef` (mutates). */
+function rewriteRefs(schema: SchemaModel, fixRef: (name: string) => string): void {
+  switch (schema.kind) {
+    case 'ref':
+      schema.name = fixRef(schema.name);
+      break;
+    case 'omit':
+      schema.base = fixRef(schema.base);
+      break;
+    case 'array':
+      rewriteRefs(schema.items, fixRef);
+      break;
+    case 'record':
+      rewriteRefs(schema.value, fixRef);
+      break;
+    case 'object':
+      for (const prop of schema.properties) rewriteRefs(prop.schema, fixRef);
+      break;
+    case 'union':
+      for (const member of schema.members) rewriteRefs(member, fixRef);
+      if (schema.discriminator) {
+        for (const entry of schema.discriminator.mapping) entry.schemaName = fixRef(entry.schemaName);
+      }
+      break;
+    case 'intersection':
+      for (const member of schema.members) rewriteRefs(member, fixRef);
+      break;
+    // scalar / literal / enum / null / unknown carry no schema references.
+  }
+}
+
+function rewriteOperationRefs(op: OperationModel, fixRef: (name: string) => string): void {
+  for (const p of op.pathParams) rewriteRefs(p.schema, fixRef);
+  for (const p of op.queryParams) rewriteRefs(p.schema, fixRef);
+  for (const p of op.headerParams) rewriteRefs(p.schema, fixRef);
+  if (op.requestBody) rewriteRefs(op.requestBody.schema, fixRef);
+  for (const r of [...op.successResponses, ...op.errorResponses]) {
+    rewriteRefs(r.schema, fixRef);
+    if (r.itemSchema) rewriteRefs(r.itemSchema, fixRef);
+  }
+}
diff --git a/packages/openapi-typescript/src/loader.ts b/packages/openapi-typescript/src/loader.ts
new file mode 100644
index 0000000000..65566ed61f
--- /dev/null
+++ b/packages/openapi-typescript/src/loader.ts
@@ -0,0 +1,25 @@
+import {
+  bundle,
+  createConfig,
+  detectSpec,
+  type Config,
+  type Oas3Definition,
+} from '@redocly/openapi-core';
+
+import type { LoadResult } from './types.js';
+
+export async function loadSpec(ref: string, config?: Config): Promise<LoadResult> {
+  const cfg = config ?? (await createConfig({}));
+  // We do NOT pass `dereference: true` — the IR builder needs `$ref` preserved so it can map
+  // response/parameter schemas back to named `components.schemas` entries.
+  // Validation (shape, OpenAPI version) is delegated to `bundle()`, which throws clear messages.
+  const result = await bundle({ ref, config: cfg });
+  const parsed = result.bundle.parsed;
+  return {
+    document: parsed as unknown as Oas3Definition,
+    version: detectSpec(parsed),
+    // The entry plus every external `$ref` target the resolver read (absolute fs paths;
+    // remote refs appear as URLs).
+    fileDependencies: result.fileDependencies,
+  };
+}
diff --git a/packages/openapi-typescript/src/plugin.ts b/packages/openapi-typescript/src/plugin.ts
new file mode 100644
index 0000000000..664a1b1100
--- /dev/null
+++ b/packages/openapi-typescript/src/plugin.ts
@@ -0,0 +1,79 @@
+// Public entry for authoring custom generators — the EXPERIMENTAL plugin API.
+//
+// ⚠️ Experimental: this surface (the IR types and the codegen toolkit re-exported here) may change
+// between minor versions until it is stabilized. Pin your version if you depend on it.
+//
+// A custom generator is `(GeneratorInput) => GeneratedFile[]` plus a `name`; select it in
+// `generators` by name (inline via `customGenerators`) or by import specifier (path/package). It
+// receives the same spec-agnostic IR (`model`) the built-in generators consume, and may use the same
+// TypeScript-emitting toolkit re-exported below, so a plugin is a first-class peer of `sdk`/`zod`/…
+// The generated client stays dependency-free: a plugin's output is its own file(s), and its runtime
+// libraries are peers of the consumer's app, never of the client.
+//
+//   // my-generator.ts
+//   import { defineGenerator, ts, printStatements } from '@redocly/openapi-typescript/plugin';
+//   export default defineGenerator({
+//     name: 'route-map',
+//     requires: ['sdk'],
+//     run({ model, outputPath }) {
+//       const routes = model.services.flatMap((s) => s.operations)
+//         .map((op) => `  ${op.name}: '${op.method.toUpperCase()} ${op.path}',`).join('\n');
+//       return [{ path: outputPath.replace(/\.ts$/, '.routes.ts'),
+//                 content: `export const routes = {\n${routes}\n} as const;\n` }];
+//     },
+//   });
+
+import type { CustomGenerator } from './generators/types.js';
+
+/**
+ * Identity helper for authoring a custom generator with full type inference and one validation
+ * choke-point. `export default defineGenerator({ name, run, … })`. Returns its argument unchanged.
+ *
+ * @experimental The plugin API may change between minor versions until stabilized.
+ */
+export function defineGenerator(generator: CustomGenerator): CustomGenerator {
+  return generator;
+}
+
+// --- The authoring contract + the data a generator receives -----------------------------------
+export type {
+  CustomGenerator,
+  Generator,
+  GeneratorInput,
+  GeneratorName,
+} from './generators/types.js';
+export type { GeneratedFile, OutputMode } from './writers/types.js';
+export type { ArgsStyle, ErrorMode, Facade } from './emitters/operations.js';
+export type { DateType } from './emitters/types.js';
+
+// --- The intermediate representation (the `model` a generator walks) ---------------------------
+export type {
+  ApiModel,
+  NamedSchemaModel,
+  OperationModel,
+  ParamModel,
+  PropertyModel,
+  RequestBodyModel,
+  ResponseBodyModel,
+  ScalarKind,
+  SchemaMetadata,
+  SchemaModel,
+  ServiceModel,
+} from './ir/model.js';
+
+// --- Codegen toolkit: build TypeScript the same way the built-in generators do -----------------
+export {
+  arrow,
+  constArray,
+  exportConstStatement,
+  jsdoc,
+  parseStatements,
+  printNodes,
+  printStatements,
+  ts,
+} from './emitters/ts.js';
+export { operationSignature } from './emitters/operation-signature.js';
+export type { OperationSignature } from './emitters/operation-signature.js';
+export { schemaToTypeNode } from './emitters/types.js';
+export { pascalCase } from './emitters/support.js';
+export { safeIdent } from './emitters/identifier.js';
diff --git a/packages/openapi-typescript/src/types.ts b/packages/openapi-typescript/src/types.ts
new file mode 100644
index 0000000000..f494841e1c
--- /dev/null
+++ b/packages/openapi-typescript/src/types.ts
@@ -0,0 +1,116 @@
+import type { Config as RedoclyConfig, Oas3Definition, detectSpec } from '@redocly/openapi-core';
+
+import type { ArgsStyle, Facade } from './emitters/client.js';
+import type { CustomGenerator } from './generators/types.js';
+import type { OutputMode } from './writers/types.js';
+
+export type GenerateClientOptions = {
+  input: string;
+  output: string;
+  /** Resolved Redocly config for spec loading. */
+  config?: RedoclyConfig;
+  /**
+   * How the generated client is partitioned across files. Defaults to `single`
+   * (one self-contained file).
+   */
+  outputMode?: OutputMode;
+  /**
+   * Developer-facing operation shape: `'functions'` (default) emits standalone
+   * async functions; `'service-class'` groups operations as class methods.
+   */
+  facade?: Facade;
+  /**
+   * How operation inputs are passed to each generated function/method:
+   * `'flat'` (default) spreads path params as positional args followed by
+   * `params`/`body`/`headers` slots; `'grouped'` bundles every input into a single
+   * `args` object. The per-call `init` argument stays separate in both styles.
+   */
+  argsStyle?: ArgsStyle;
+  /**
+   * Class name for the `service-class` facade in single/split layouts (ignored
+   * by `functions` and by per-tag service classes). Defaults to `'Client'`.
+   */
+  name?: string;
+  /**
+   * Override the BASE URL inlined into the generated runtime. When omitted,
+   * the value is derived from `servers[0].url` in the source OpenAPI document.
+   * Validation (e.g. `new URL(value)`) is the caller's responsibility — the
+   * CLI handler validates before calling.
+   */
+  baseUrl?: string;
+  /**
+   * How named string enums are emitted. `'const-object'` (default) emits a
+   * runtime `as const` companion object alongside the union type; `'union'`
+   * emits only the string-literal union.
+   */
+  enumStyle?: 'union' | 'const-object';
+  /**
+   * Error-handling shape of the generated client. `'throw'` (default) throws
+   * `ApiError` on non-2xx responses; `'result'` returns a discriminated
+   * `{ data, error, response }` whose `error` is typed from the spec's 4xx/5xx
+   * response bodies.
+   */
+  errorMode?: 'throw' | 'result';
+  /**
+   * How `format: date-time`/`date` string fields are typed. `'string'` (default)
+   * keeps the ISO wire shape; `'Date'` emits a `Date` reference. Opt-in — pair with
+   * the `transformers` generator so the runtime value matches the type. The
+   * generated client stays zero-dep (`Date` is a web standard).
+   */
+  dateType?: 'string' | 'Date';
+  /**
+   * TanStack Query adapter the `tanstack-query` generator imports from
+   * (`@tanstack/${queryFramework}-query`). Defaults to `'react'`; only the import
+   * specifier changes — the emitted factory module is byte-identical across frameworks.
+   */
+  queryFramework?: 'react' | 'vue' | 'svelte' | 'solid';
+  /**
+   * How the `mock` generator produces data. `'baked'` (default) inlines deterministic
+   * literals (zero-dep, contract-faithful); `'faker'` emits `@faker-js/faker` calls for
+   * realistic data — making `@faker-js/faker` the consumer's dev-dep. Factory signatures
+   * are identical across modes, so a consumer can flip this without changing call sites.
+   */
+  mockData?: 'baked' | 'faker';
+  /**
+   * Seed for faker-mode mocks. When set, the mock module emits a top-level
+   * `faker.seed(<n>)` so generated data is reproducible across runs. Ignored in baked mode.
+   */
+  mockSeed?: number;
+  /**
+   * Generators to run, in order. Defaults to `['sdk']`. Each entry is a built-in name
+   * (`sdk`/`zod`/`tanstack-query`/`swr`/`transformers`/`mock`), the `name` of an inline
+   * `customGenerators` entry, or an import specifier (a path or package) for a custom generator.
+   */
+  generators?: string[];
+  /**
+   * Inline custom generators (the experimental plugin API), registered before resolution so they
+   * can be selected in `generators` by `name`. Authored with `defineGenerator` from
+   * `@redocly/openapi-typescript/plugin`. Path/package specifiers in `generators` don't need this.
+   */
+  customGenerators?: CustomGenerator[];
+  /**
+   * Directory that relative-path generator specifiers resolve against (typically the config file's
+   * location). Defaults to the current working directory.
+   */
+  configDir?: string;
+};
+
+export type GenerateClientResult = {
+  /** The `--output` anchor path (the entry file in multi-file modes). */
+  outputPath: string;
+  /** Total bytes written across every generated file. */
+  bytes: number;
+  /** Every file written to disk (single-element in `single` mode). */
+  files: Array<{ path: string; bytes: number }>;
+};
+
+export type LoadResult = {
+  document: Oas3Definition;
+  /** The detected input spec version (e.g. 'oas2', 'oas3_0', 'oas3_1', 'oas3_2'). */
+  version: ReturnType<typeof detectSpec>;
+  /**
+   * Every source that contributed to the bundle — the entry document plus all external `$ref`
+   * targets, as absolute filesystem paths (remote `$ref`s appear as `http(s)://` URLs).
+   */
+  fileDependencies: Set<string>;
+};
diff --git a/packages/openapi-typescript/src/writers/__tests__/group-by-tag.test.ts b/packages/openapi-typescript/src/writers/__tests__/group-by-tag.test.ts
new file mode 100644
index 0000000000..a016d2ad8c
--- /dev/null
+++ b/packages/openapi-typescript/src/writers/__tests__/group-by-tag.test.ts
@@ -0,0 +1,74 @@
+import type { ApiModel, OperationModel } from '../../ir/model.js';
+import { groupByTag, sanitizeTagStem } from '../group-by-tag.js';
+
+function op(name: string, tags: string[] = []): OperationModel {
+  return {
+    name,
+    method: 'get',
+    path: `/${name}`,
+    pathParams: [],
+    queryParams: [],
+    headerParams: [],
+    successResponses: [],
+    errorResponses: [],
+    security: [],
+    tags,
+  };
+}
+
+function model(ops: OperationModel[]): ApiModel {
+  return {
+    title: 'T',
+    version: '1.0.0',
+    baseUrl: '',
+    services: [{ name: 'Default', operations: ops }],
+    schemas: [],
+    securitySchemes: [],
+  };
+}
+
+describe('sanitizeTagStem', () => {
+  it('keeps safe characters and replaces the rest with dashes', () => {
+    expect(sanitizeTagStem('Pets')).toBe('Pets');
+    expect(sanitizeTagStem('Pet Store')).toBe('Pet-Store');
+    expect(sanitizeTagStem('pets/v2')).toBe('pets-v2');
+    expect(sanitizeTagStem('a.b.c')).toBe('a-b-c');
+  });
+
+  it('collapses repeats and trims edge dashes', () => {
+    expect(sanitizeTagStem('  **weird**  ')).toBe('weird');
+  });
+
+  it('falls back to `tag` when nothing survives', () => {
+    expect(sanitizeTagStem('***')).toBe('tag');
+  });
+});
+
+describe('groupByTag', () => {
+  it('assigns each operation to its first tag, in first-seen order', () => {
+    const groups = groupByTag(
+      model([op('a', ['pets', 'public']), op('b', ['orders']), op('c', ['pets'])]),
+      'client'
+    );
+    expect(groups.map((g) => g.stem)).toEqual(['pets', 'orders']);
+    expect(groups[0].operations.map((o) => o.name)).toEqual(['a', 'c']);
+    expect(groups[1].operations.map((o) => o.name)).toEqual(['b']);
+  });
+
+  it('routes untagged operations to the `default` group', () => {
+    const groups = groupByTag(model([op('health')]), 'client');
+    expect(groups).toHaveLength(1);
+    expect(groups[0].stem).toBe('default');
+    expect(groups[0].operations.map((o) => o.name)).toEqual(['health']);
+  });
+
+  it('de-duplicates stems that collide after sanitization', () => {
+    const groups = groupByTag(model([op('a', ['Pet Store']), op('b', ['Pet/Store'])]), 'client');
+    expect(groups.map((g) => g.stem)).toEqual(['Pet-Store', 'Pet-Store-2']);
+  });
+
+  it('reserves the anchor stem so a tag cannot overwrite the entry file', () => {
+    const groups = groupByTag(model([op('a', ['client'])]), 'client');
+    expect(groups[0].stem).toBe('client-2');
+  });
+});
diff --git a/packages/openapi-typescript/src/writers/__tests__/index.test.ts b/packages/openapi-typescript/src/writers/__tests__/index.test.ts
new file mode 100644
index 0000000000..67b70a4864
--- /dev/null
+++ b/packages/openapi-typescript/src/writers/__tests__/index.test.ts
@@ -0,0 +1,65 @@
+import type { ApiModel } from '../../ir/model.js';
+import { getWriter } from '../index.js';
+import { singleFileWriter } from '../single-file-writer.js';
+import { splitWriter } from '../split-writer.js';
+import { tagsSplitWriter } from '../tags-split-writer.js';
+import { tagsWriter } from '../tags-writer.js';
+
+const model: ApiModel = {
+  title: 'Tiny',
+  version: '1.0.0',
+  baseUrl: 'https://api.example.com',
+  services: [
+    {
+      name: 'Default',
+      operations: [
+        {
+          name: 'ping',
+          method: 'get',
+          path: '/ping',
+          pathParams: [],
+          queryParams: [],
+          headerParams: [],
+          successResponses: [],
+          errorResponses: [],
+          security: [],
+          tags: [],
+        },
+      ],
+    },
+  ],
+  schemas: [],
+  securitySchemes: [],
+};
+
+describe('getWriter', () => {
+  it('returns the single-file writer for the `single` mode', () => {
+    expect(getWriter('single')).toBe(singleFileWriter);
+  });
+
+  it('returns the split writer for the `split` mode', () => {
+    expect(getWriter('split')).toBe(splitWriter);
+  });
+
+  it('returns the tags writer for the `tags` mode', () => {
+    expect(getWriter('tags')).toBe(tagsWriter);
+  });
+
+  it('returns the tags-split writer for the `tags-split` mode', () => {
+    expect(getWriter('tags-split')).toBe(tagsSplitWriter);
+  });
+});
+
+describe('singleFileWriter', () => {
+  it('produces exactly one file at the output path containing the client', () => {
+    const files = singleFileWriter({
+      model,
+      outputPath: '/out/api.ts',
+      emit: {},
+    });
+    expect(files).toHaveLength(1);
+    expect(files[0].path).toBe('/out/api.ts');
+    expect(files[0].content).toContain('export async function ping(');
+    expect(files[0].content).toContain('// Generated by @redocly/openapi-typescript');
+  });
+});
diff --git a/packages/openapi-typescript/src/writers/__tests__/split-writer.test.ts b/packages/openapi-typescript/src/writers/__tests__/split-writer.test.ts
new file mode 100644
index 0000000000..0b33ccb8b9
--- /dev/null
+++ b/packages/openapi-typescript/src/writers/__tests__/split-writer.test.ts
@@ -0,0 +1,268 @@
+import type { ApiModel, OperationModel } from '../../ir/model.js';
+import { splitWriter } from '../split-writer.js';
+
+function operation(overrides: Partial<OperationModel> = {}): OperationModel {
+  return {
+    name: 'op',
+    method: 'get',
+    path: '/p',
+    pathParams: [],
+    queryParams: [],
+    headerParams: [],
+    successResponses: [],
+    errorResponses: [],
+    security: [],
+    tags: [],
+    ...overrides,
+  };
+}
+
+function model(overrides: Partial<ApiModel> = {}): ApiModel {
+  return {
+    title: 'Tiny',
+    version: '1.0.0',
+    baseUrl: 'https://api.example.com',
+    services: [{ name: 'Default', operations: [] }],
+    schemas: [],
+    securitySchemes: [],
+    ...overrides,
+  };
+}
+
+function run(m: ApiModel) {
+  const files = splitWriter({
+    model: m,
+    outputPath: '/out/client.ts',
+    emit: {},
+  });
+  const byName = (suffix: string) => files.find((f) => f.path.endsWith(suffix))!;
+  return {
+    files,
+    http: byName('client.http.ts'),
+    schemas: byName('client.schemas.ts'),
+    entry: byName('/out/client.ts'),
+  };
+}
+
+describe('splitWriter — file set & paths', () => {
+  it('emits exactly http, schemas, and the entry file', () => {
+    const { files } = run(model());
+    expect(files.map((f) => f.path).sort()).toEqual([
+      '/out/client.http.ts',
+      '/out/client.schemas.ts',
+      '/out/client.ts',
+    ]);
+  });
+});
+
+describe('splitWriter — http module', () => {
+  it('exports the operation-facing runtime helpers and public setters', () => {
+    const { http } = run(
+      model({
+        services: [{ name: 'Default', operations: [operation()] }],
+      })
+    );
+    expect(http.content).toContain('export function setBaseUrl(');
+    expect(http.content).toContain('export class ApiError');
+    expect(http.content).toContain('export function __buildUrl(');
+    expect(http.content).toContain('export async function __request<T>(');
+  });
+});
+
+describe('splitWriter — schemas module', () => {
+  it('contains the model types and nothing runtime-related', () => {
+    const { schemas } = run(
+      model({
+        schemas: [
+          {
+            name: 'Pet',
+            schema: {
+              kind: 'object',
+              properties: [
+                {
+                  name: 'id',
+                  schema: { kind: 'scalar', scalar: 'integer' },
+                  required: true,
+                },
+              ],
+            },
+          },
+        ],
+      })
+    );
+    expect(schemas.content).toContain('export type Pet');
+    expect(schemas.content).not.toContain('__request');
+  });
+});
+
+describe('splitWriter — entry imports & re-exports', () => {
+  it('imports only the referenced types and the helpers actually used', () => {
+    const { entry } = run(
+      model({
+        schemas: [{ name: 'Pet', schema: { kind: 'object', properties: [] } }],
+        services: [
+          {
+            name: 'Default',
+            operations: [
+              operation({
+                name: 'getPet',
+                successResponses: [
+                  {
+                    contentType: 'application/json',
+                    status: 200,
+                    schema: { kind: 'ref', name: 'Pet' },
+                  },
+                ],
+              }),
+            ],
+          },
+        ],
+      })
+    );
+    expect(entry.content).toContain('import type { Pet } from "./client.schemas.js";');
+    // Functions facade pulls the global __config alongside the runtime helpers.
+    expect(entry.content).toContain(
+      'import { __buildUrl, __config, __request, type RequestOptions } from "./client.http.js";'
+    );
+    expect(entry.content).toContain("export * from './client.schemas.js';");
+    expect(entry.content).toContain(
+      'export { ApiError, configure, setBaseUrl } from "./client.http.js";'
+    );
+    expect(entry.content).toContain(
+      'export type { ClientConfig, Middleware, ParseAs, RequestContext, RequestOptions, RetryConfig, RetryContext, RetryStrategy } from "./client.http.js";'
+    );
+    expect(entry.content).toContain('export async function getPet(');
+    // No auth/header helpers used by this operation.
+    expect(entry.content).not.toContain('__auth');
+    expect(entry.content).not.toContain('__headers');
+  });
+
+  it('imports __auth and __headers when operations need them, and re-exports auth setters', () => {
+    const { entry, http } = run(
+      model({
+        securitySchemes: [{ kind: 'bearer', key: 'oauth' }],
+        services: [
+          {
+            name: 'Default',
+            operations: [
+              operation({
+                name: 'secure',
+                security: ['oauth'],
+                headerParams: [
+                  {
+                    name: 'X-Trace',
+                    in: 'header',
+                    schema: { kind: 'scalar', scalar: 'string' },
+                    required: false,
+                  },
+                ],
+              }),
+            ],
+          },
+        ],
+      })
+    );
+    expect(entry.content).toContain(
+      'import { __auth, __buildUrl, __config, __headers, __request, type RequestOptions } from "./client.http.js";'
+    );
+    expect(entry.content).toContain(
+      'export { ApiError, configure, setBaseUrl, setBearer } from "./client.http.js";'
+    );
+    expect(http.content).toContain('export async function __auth(');
+    expect(http.content).toContain('export function setBearer(');
+  });
+
+  it('endpoint file imports RequestOptions and the entry re-exports it', () => {
+    const { entry, http } = run(
+      model({ services: [{ name: 'Default', operations: [operation()] }] })
+    );
+    // endpoints reference RequestOptions in signatures → must import the type
+    expect(entry.content).toContain('type RequestOptions');
+    // and the public surface re-exports it from the http module
+    expect(http.content).toContain('export type RequestOptions');
+  });
+
+  it('omits the schemas re-export entirely when there are no schemas and no operations', () => {
+    const { entry } = run(model());
+    expect(entry.content).not.toContain('.schemas.js');
+    expect(entry.content).toContain(
+      'export { ApiError, configure, setBaseUrl } from "./client.http.js";'
+    );
+  });
+
+  it('keeps the OPERATIONS map in the schemas module (and re-exports it) even without named types', () => {
+    const { schemas, entry } = run(
+      model({
+        services: [
+          {
+            name: 'Default',
+            operations: [operation({ name: 'ping', path: '/ping' })],
+          },
+        ],
+      })
+    );
+    // No named schemas, but the metadata map still belongs in the schemas module…
+    expect(schemas.content).toContain('export const OPERATIONS = {');
+    expect(schemas.content).toContain('ping: { method: "GET", path: "/ping" }');
+    expect(schemas.content).not.toContain('export type Pet');
+    // …so the barrel re-exports it, while the endpoint file imports no named types.
+    expect(entry.content).toContain("export * from './client.schemas.js';");
+    expect(entry.content).not.toContain('import type {');
+  });
+});
+
+describe('splitWriter — SSE', () => {
+  it('emits the sse aggregate in the entry file for an SSE op', () => {
+    const { entry } = run(
+      model({
+        schemas: [{ name: 'Message', schema: { kind: 'object', properties: [] } }],
+        services: [
+          {
+            name: 'Default',
+            operations: [
+              operation({
+                name: 'streamMessages',
+                path: '/stream',
+                successResponses: [
+                  {
+                    contentType: 'text/event-stream',
+                    status: 200,
+                    schema: { kind: 'unknown' },
+                    itemSchema: { kind: 'ref', name: 'Message' },
+                  },
+                ],
+              }),
+            ],
+          },
+        ],
+      })
+    );
+    expect(entry.content).toContain('export const sse = {');
+    expect(entry.content).toContain('async function* streamMessages(');
+  });
+});
+
+describe('splitWriter — service-class facade', () => {
+  it('puts the Client class in the entry (with the chosen name) instead of functions', () => {
+    const files = splitWriter({
+      model: model({
+        services: [{ name: 'Default', operations: [operation({ name: 'ping' })] }],
+      }),
+      outputPath: '/out/client.ts',
+      emit: { facade: 'service-class', name: 'CafeClient' },
+    });
+    const entry = files.find((f) => f.path.endsWith('/out/client.ts'))!;
+    expect(entry.content).toContain('export class CafeClient {');
+    expect(entry.content).toMatch(/\basync ping\(/);
+    expect(entry.content).not.toContain('export async function');
+    // The class constructor imports the ClientConfig type, not the global __config.
+    expect(entry.content).toContain(
+      'type ClientConfig, type Middleware, type RequestOptions } from "./client.http.js";'
+    );
+    expect(entry.content).not.toContain('__config');
+    // The shared http/schemas modules are unchanged by the facade choice.
+    expect(files.find((f) => f.path.endsWith('client.http.ts'))!.content).toContain(
+      'export async function __request<T>('
+    );
+  });
+});
diff --git a/packages/openapi-typescript/src/writers/__tests__/tags-split-writer.test.ts b/packages/openapi-typescript/src/writers/__tests__/tags-split-writer.test.ts
new file mode 100644
index 0000000000..d5ef77ac01
--- /dev/null
+++ b/packages/openapi-typescript/src/writers/__tests__/tags-split-writer.test.ts
@@ -0,0 +1,148 @@
+import type { ApiModel, OperationModel } from '../../ir/model.js';
+import { tagsSplitWriter } from '../tags-split-writer.js';
+
+function operation(overrides: Partial<OperationModel> = {}): OperationModel {
+  return {
+    name: 'op',
+    method: 'get',
+    path: '/p',
+    pathParams: [],
+    queryParams: [],
+    headerParams: [],
+    successResponses: [],
+    errorResponses: [],
+    security: [],
+    tags: [],
+    ...overrides,
+  };
+}
+
+function model(overrides: Partial<ApiModel> = {}): ApiModel {
+  return {
+    title: 'T',
+    version: '1.0.0',
+    baseUrl: 'https://api.example.com',
+    services: [{ name: 'Default', operations: [] }],
+    schemas: [],
+    securitySchemes: [],
+    ...overrides,
+  };
+}
+
+function run(m: ApiModel) {
+  const files = tagsSplitWriter({ model: m, outputPath: '/out/client.ts', emit: {} });
+  const find = (suffix: string) => files.find((f) => f.path.endsWith(suffix));
+  return { files, paths: files.map((f) => f.path), find };
+}
+
+describe('tagsSplitWriter', () => {
+  it('puts each tag in its own folder, with shared modules at the root', () => {
+    const { paths } = run(
+      model({
+        services: [
+          {
+            name: 'Default',
+            operations: [
+              operation({ name: 'listPets', path: '/pets', tags: ['pets'] }),
+              operation({ name: 'health', path: '/health' }),
+            ],
+          },
+        ],
+      })
+    );
+    expect(paths.sort()).toEqual([
+      '/out/client.http.ts',
+      '/out/client.schemas.ts',
+      '/out/client.ts',
+      '/out/default/client.ts',
+      '/out/pets/client.ts',
+    ]);
+  });
+
+  it('imports shared modules one level up from inside a tag folder', () => {
+    const { find } = run(
+      model({
+        schemas: [{ name: 'Pet', schema: { kind: 'object', properties: [] } }],
+        services: [
+          {
+            name: 'Default',
+            operations: [
+              operation({
+                name: 'getPet',
+                path: '/pets',
+                tags: ['pets'],
+                successResponses: [
+                  {
+                    contentType: 'application/json',
+                    schema: { kind: 'ref', name: 'Pet' },
+                    status: 200,
+                  },
+                ],
+              }),
+            ],
+          },
+        ],
+      })
+    );
+    const pets = find('/out/pets/client.ts')!;
+    expect(pets.content).toContain('import type { Pet } from "../client.schemas.js";');
+    expect(pets.content).toContain(
+      'import { __buildUrl, __config, __request, type RequestOptions } from "../client.http.js";'
+    );
+    expect(pets.content).toContain('export async function getPet(');
+  });
+
+  it('merges per-tag SSE fragments into the barrel using nested folder specifiers', () => {
+    const { find } = run(
+      model({
+        schemas: [{ name: 'Message', schema: { kind: 'object', properties: [] } }],
+        services: [
+          {
+            name: 'Default',
+            operations: [
+              operation({
+                name: 'streamPets',
+                path: '/pets/stream',
+                tags: ['pets'],
+                successResponses: [
+                  {
+                    contentType: 'text/event-stream',
+                    status: 200,
+                    schema: { kind: 'unknown' },
+                    itemSchema: { kind: 'ref', name: 'Message' },
+                  },
+                ],
+              }),
+            ],
+          },
+        ],
+      })
+    );
+    expect(find('/out/pets/client.ts')!.content).toContain('export const __sse_PetsService = {');
+    const entry = find('/out/client.ts')!.content;
+    expect(entry).toContain("import { __sse_PetsService } from './pets/client.js';");
+    expect(entry).toContain('export const sse = { ...__sse_PetsService };');
+  });
+
+  it('barrel re-exports each tag folder file plus shared schemas and setters', () => {
+    const { find } = run(
+      model({
+        securitySchemes: [{ kind: 'bearer', key: 'oauth' }],
+        services: [
+          {
+            name: 'Default',
+            operations: [operation({ name: 'listPets', path: '/pets', tags: ['pets'] })],
+          },
+        ],
+      })
+    );
+    const entry = find('/out/client.ts')!;
+    expect(entry.content).toContain(
+      'export { ApiError, configure, setBaseUrl, setBearer } from "./client.http.js";'
+    );
+    expect(entry.content).toContain(
+      'export type { AuthCredentials, ClientConfig, Middleware, ParseAs, RequestContext, RequestOptions, RetryConfig, RetryContext, RetryStrategy, TokenProvider } from "./client.http.js";'
+    );
+    expect(entry.content).toContain("export * from './pets/client.js';");
+  });
+});
diff --git a/packages/openapi-typescript/src/writers/__tests__/tags-writer.test.ts b/packages/openapi-typescript/src/writers/__tests__/tags-writer.test.ts
new file mode 100644
index 0000000000..afb8e1b7ed
--- /dev/null
+++ b/packages/openapi-typescript/src/writers/__tests__/tags-writer.test.ts
@@ -0,0 +1,245 @@
+import type { ApiModel, OperationModel } from '../../ir/model.js';
+import { tagsWriter } from '../tags-writer.js';
+
+function operation(overrides: Partial<OperationModel> = {}): OperationModel {
+  return {
+    name: 'op',
+    method: 'get',
+    path: '/p',
+    pathParams: [],
+    queryParams: [],
+    headerParams: [],
+    successResponses: [],
+    errorResponses: [],
+    security: [],
+    tags: [],
+    ...overrides,
+  };
+}
+
+function model(overrides: Partial<ApiModel> = {}): ApiModel {
+  return {
+    title: 'T',
+    version: '1.0.0',
+    baseUrl: 'https://api.example.com',
+    services: [{ name: 'Default', operations: [] }],
+    schemas: [],
+    securitySchemes: [],
+    ...overrides,
+  };
+}
+
+function run(m: ApiModel) {
+  const files = tagsWriter({
+    model: m,
+    outputPath: '/out/client.ts',
+    emit: {},
+  });
+  const find = (suffix: string) => files.find((f) => f.path.endsWith(suffix));
+  return { files, paths: files.map((f) => f.path), find };
+}
+
+describe('tagsWriter', () => {
+  it('emits shared http + schemas, one file per tag, and the barrel entry', () => {
+    const { paths } = run(
+      model({
+        services: [
+          {
+            name: 'Default',
+            operations: [
+              operation({ name: 'listPets', path: '/pets', tags: ['pets'] }),
+              operation({
+                name: 'listOrders',
+                path: '/orders',
+                tags: ['orders'],
+              }),
+              operation({ name: 'health', path: '/health' }),
+            ],
+          },
+        ],
+      })
+    );
+    expect(paths.sort()).toEqual([
+      '/out/client.http.ts',
+      '/out/client.schemas.ts',
+      '/out/client.ts',
+      '/out/default.ts',
+      '/out/orders.ts',
+      '/out/pets.ts',
+    ]);
+  });
+
+  it('places each operation in its first tag file and imports its own helpers', () => {
+    const { find } = run(
+      model({
+        securitySchemes: [{ kind: 'bearer', key: 'oauth' }],
+        services: [
+          {
+            name: 'Default',
+            operations: [
+              operation({ name: 'listPets', path: '/pets', tags: ['pets'] }),
+              operation({
+                name: 'createPet',
+                path: '/pets',
+                method: 'post',
+                tags: ['pets'],
+                security: ['oauth'],
+              }),
+              operation({
+                name: 'listOrders',
+                path: '/orders',
+                tags: ['orders'],
+              }),
+            ],
+          },
+        ],
+      })
+    );
+    const pets = find('pets.ts')!;
+    expect(pets.content).toContain('export async function listPets(');
+    expect(pets.content).toContain('export async function createPet(');
+    // pets has an authed op → it imports __auth; orders does not.
+    expect(pets.content).toContain(
+      'import { __auth, __buildUrl, __config, __request, type RequestOptions } from "./client.http.js";'
+    );
+    const orders = find('orders.ts')!;
+    expect(orders.content).toContain('export async function listOrders(');
+    expect(orders.content).not.toContain('__auth');
+  });
+
+  it('service-class facade emits one <Tag>Service class per tag file', () => {
+    const files = tagsWriter({
+      model: model({
+        services: [
+          {
+            name: 'Default',
+            operations: [
+              operation({ name: 'listPets', path: '/pets', tags: ['pets'] }),
+              operation({
+                name: 'listOrders',
+                path: '/orders',
+                tags: ['orders'],
+              }),
+              operation({ name: 'health', path: '/health' }),
+            ],
+          },
+        ],
+      }),
+      outputPath: '/out/client.ts',
+      emit: { facade: 'service-class' },
+    });
+    const find = (suffix: string) => files.find((f) => f.path.endsWith(suffix))!;
+    expect(find('pets.ts').content).toContain('export class PetsService {');
+    expect(find('orders.ts').content).toContain('export class OrdersService {');
+    // Untagged operations land in a DefaultService.
+    expect(find('default.ts').content).toContain('export class DefaultService {');
+    expect(find('pets.ts').content).not.toContain('export async function');
+    // The class constructor needs the ClientConfig type from the http module.
+    expect(find('pets.ts').content).toContain(
+      'type ClientConfig, type Middleware, type RequestOptions } from "./client.http.js";'
+    );
+    expect(find('pets.ts').content).not.toContain('__config');
+  });
+
+  it('barrel re-exports every tag file plus schemas and the public http surface', () => {
+    const { find } = run(
+      model({
+        schemas: [{ name: 'Pet', schema: { kind: 'object', properties: [] } }],
+        securitySchemes: [{ kind: 'bearer', key: 'oauth' }],
+        services: [
+          {
+            name: 'Default',
+            operations: [operation({ name: 'listPets', path: '/pets', tags: ['pets'] })],
+          },
+        ],
+      })
+    );
+    const entry = find('/out/client.ts')!;
+    expect(entry.content).toContain("export * from './client.schemas.js';");
+    expect(entry.content).toContain(
+      'export { ApiError, configure, setBaseUrl, setBearer } from "./client.http.js";'
+    );
+    expect(entry.content).toContain(
+      'export type { AuthCredentials, ClientConfig, Middleware, ParseAs, RequestContext, RequestOptions, RetryConfig, RetryContext, RetryStrategy, TokenProvider } from "./client.http.js";'
+    );
+    expect(entry.content).toContain("export * from './pets.js';");
+  });
+
+  it('merges per-tag SSE fragments into the barrel; each tag file exports its own fragment', () => {
+    const sseOp = (name: string, tag: string) =>
+      operation({
+        name,
+        path: `/${tag}/stream`,
+        tags: [tag],
+        successResponses: [
+          {
+            contentType: 'text/event-stream',
+            status: 200,
+            schema: { kind: 'unknown' },
+            itemSchema: { kind: 'ref', name: 'Message' },
+          },
+        ],
+      });
+    const { find } = run(
+      model({
+        schemas: [{ name: 'Message', schema: { kind: 'object', properties: [] } }],
+        services: [
+          {
+            name: 'Default',
+            operations: [sseOp('streamPets', 'pets'), sseOp('streamOrders', 'orders')],
+          },
+        ],
+      })
+    );
+    // Each tag file exposes its own `__sse_<Class>` fragment.
+    expect(find('pets.ts')!.content).toContain('export const __sse_PetsService = {');
+    expect(find('orders.ts')!.content).toContain('export const __sse_OrdersService = {');
+    // The barrel imports the fragments and merges them into the public `sse`.
+    const entry = find('/out/client.ts')!.content;
+    expect(entry).toContain('export const sse = { ...__sse_PetsService, ...__sse_OrdersService };');
+    expect(entry).toContain("import { __sse_PetsService } from './pets.js';");
+  });
+
+  it('service-class facade emits no sse barrel (per-tag classes carry their own .sse)', () => {
+    const files = tagsWriter({
+      model: model({
+        schemas: [{ name: 'Message', schema: { kind: 'object', properties: [] } }],
+        services: [
+          {
+            name: 'Default',
+            operations: [
+              operation({
+                name: 'streamPets',
+                path: '/pets/stream',
+                tags: ['pets'],
+                successResponses: [
+                  {
+                    contentType: 'text/event-stream',
+                    status: 200,
+                    schema: { kind: 'unknown' },
+                    itemSchema: { kind: 'ref', name: 'Message' },
+                  },
+                ],
+              }),
+            ],
+          },
+        ],
+      }),
+      outputPath: '/out/client.ts',
+      emit: { facade: 'service-class' },
+    });
+    const entry = files.find((f) => f.path.endsWith('/out/client.ts'))!;
+    expect(entry.content).not.toContain('export const sse =');
+  });
+
+  it('omits the schemas re-export when there are no schemas and no operations', () => {
+    // No operations ⇒ no OPERATIONS map either, so the schemas module is empty and
+    // the barrel skips its re-export (exercises the `hasSchemas === false` path).
+    const { find } = run(model());
+    const entry = find('/out/client.ts')!;
+    expect(entry.content).not.toContain("export * from './client.schemas.js';");
+    expect(entry.content).toContain(
+      'export { ApiError, configure, setBaseUrl } from "./client.http.js";'
+    );
+  });
+});
diff --git a/packages/openapi-typescript/src/writers/group-by-tag.ts b/packages/openapi-typescript/src/writers/group-by-tag.ts
new file mode 100644
index 0000000000..e59d120e85
--- /dev/null
+++ b/packages/openapi-typescript/src/writers/group-by-tag.ts
@@ -0,0 +1,60 @@
+import type { ApiModel, OperationModel } from '../ir/model.js';
+
+export type TagGroup = {
+  /** The safe file stem for this group (without extension). */
+  stem: string;
+  operations: OperationModel[];
+};
+
+/**
+ * Sanitize a tag into a file stem: keep alphanumerics, `_`, and `-`; replace any
+ * other character (spaces, slashes, dots) with `-`; collapse repeats; trim edge
+ * dashes. Dots are intentionally dropped so a tag can never collide with the
+ * `.http`/`.schemas` sibling files. Falls back to `tag` if nothing survives.
+ */
+export function sanitizeTagStem(tag: string): string {
+  const stem = tag
+    .replace(/[^A-Za-z0-9_-]/g, '-')
+    .replace(/-+/g, '-')
+    .replace(/^-|-$/g, '');
+  return stem.length > 0 ? stem : 'tag';
+}
+
+/**
+ * Group a model's operations into per-file buckets for `tags` / `tags-split`
+ * output, using **first-tag assignment**: each operation lands in exactly one
+ * group (its first tag, or `default` when untagged). Buckets are returned in
+ * first-seen order for deterministic file ordering.
+ *
+ * Stems are sanitized and de-duplicated (a `-2`, `-3`, … suffix on collision),
+ * and the `--output` anchor stem is reserved so a tag can't overwrite the entry
+ * or shared files.
+ */
+export function groupByTag(model: ApiModel, anchorStem: string): TagGroup[] {
+  const order: string[] = [];
+  const buckets = new Map<string, OperationModel[]>();
+  for (const service of model.services) {
+    for (const op of service.operations) {
+      const key = op.tags[0] ?? '';
+      let bucket = buckets.get(key);
+      if (!bucket) {
+        bucket = [];
+        buckets.set(key, bucket);
+        order.push(key);
+      }
+      bucket.push(op);
+    }
+  }
+
+  const used = new Set<string>([anchorStem]);
+  const groups: TagGroup[] = [];
+  for (const key of order) {
+    const base = key === '' ? 'default' : sanitizeTagStem(key);
+    let stem = base;
+    let n = 2;
+    while (used.has(stem)) stem = `${base}-${n++}`;
+    used.add(stem);
+    groups.push({ stem, operations: buckets.get(key)! });
+  }
+  return groups;
+}
diff --git a/packages/openapi-typescript/src/writers/index.ts b/packages/openapi-typescript/src/writers/index.ts
new file mode 100644
index 0000000000..f7c55ef16d
--- /dev/null
+++ b/packages/openapi-typescript/src/writers/index.ts
@@ -0,0 +1,19 @@
+import { singleFileWriter } from './single-file-writer.js';
+import { splitWriter } from './split-writer.js';
+import { tagsSplitWriter } from './tags-split-writer.js';
+import { tagsWriter } from './tags-writer.js';
+import type { OutputMode, Writer } from './types.js';
+
+export type { GeneratedFile, OutputMode, Writer, WriterInput } from './types.js';
+
+const WRITERS: Record<OutputMode, Writer> = {
+  single: singleFileWriter,
+  split: splitWriter,
+  tags: tagsWriter,
+  'tags-split': tagsSplitWriter,
+};
+
+/** Select the writer for an output mode. */
+export function getWriter(mode: OutputMode): Writer {
+  return WRITERS[mode];
+}
diff --git a/packages/openapi-typescript/src/writers/single-file-writer.ts b/packages/openapi-typescript/src/writers/single-file-writer.ts
new file mode 100644
index 0000000000..f75e1762db
--- /dev/null
+++ b/packages/openapi-typescript/src/writers/single-file-writer.ts
@@ -0,0 +1,11 @@
+import { emitSingleFile } from '../emitters/client.js';
+import type { Writer } from './types.js';
+
+/**
+ * The default writer: the whole client in one file at the `--output` path.
+ * Delegates straight to `emitSingleFile`, so its output is unchanged from before
+ * the writer seam existed.
+ */
+export const singleFileWriter: Writer = ({ model, outputPath, emit }) => {
+  return [{ path: outputPath, content: emitSingleFile(model, emit) }];
+};
diff --git a/packages/openapi-typescript/src/writers/split-writer.ts b/packages/openapi-typescript/src/writers/split-writer.ts
new file mode 100644
index 0000000000..b162edb4ba
--- /dev/null
+++ b/packages/openapi-typescript/src/writers/split-writer.ts
@@ -0,0 +1,40 @@
+import { join } from 'node:path';
+
+import { emitModules, moduleSpecifier } from '../emitters/client.js';
+import { joinSections } from '../emitters/support.js';
+import type { Writer } from './types.js';
+import { allOperations, anchor } from './util.js';
+
+/**
+ * `split` mode: three sibling files derived from the `--output` anchor.
+ *
+ *   <stem>.http.ts     shared runtime + auth state + public setters
+ *   <stem>.schemas.ts  model types, enums, const-objects, and type guards
+ *   <stem>.ts          endpoints + the entry that re-exports the public surface
+ *
+ * The endpoints file imports exactly the types it references (from the schemas
+ * module) and exactly the runtime helpers it uses (from the http module), so each
+ * file type-checks cleanly under `noUnusedLocals`.
+ */
+export const splitWriter: Writer = ({ model, outputPath, emit }) => {
+  const { dir, stem } = anchor(outputPath);
+  const m = emitModules(model, emit);
+  const ops = allOperations(model.services);
+
+  const reexports: string[] = [];
+  if (m.hasSchemas) reexports.push(`export * from '${moduleSpecifier(stem, 'schemas')}';`);
+  reexports.push(m.publicReexport(stem));
+
+  const entryContent = joinSections([
+    m.header,
+    m.endpointImports(ops, stem),
+    reexports.join('\n'),
+    m.operations,
+  ]);
+
+  return [
+    { path: join(dir, `${stem}.http.ts`), content: m.http },
+    { path: join(dir, `${stem}.schemas.ts`), content: m.schemas },
+    { path: outputPath, content: entryContent },
+  ];
+};
diff --git a/packages/openapi-typescript/src/writers/tagged.ts b/packages/openapi-typescript/src/writers/tagged.ts
new file mode 100644
index 0000000000..411bc2230f
--- /dev/null
+++ b/packages/openapi-typescript/src/writers/tagged.ts
@@ -0,0 +1,68 @@
+import { join } from 'node:path';
+
+import { emitModules, moduleSpecifier, serviceClassName } from '../emitters/client.js';
+import { joinSections } from '../emitters/support.js';
+import { groupByTag } from './group-by-tag.js';
+import type { GeneratedFile, WriterInput } from './types.js';
+import { anchor } from './util.js';
+
+/**
+ * Shared builder for the two tag-based layouts:
+ *
+ * - `nested = false` → `tags` mode: one `<tag>.ts` per tag beside the shared
+ *   `<stem>.http.ts` / `<stem>.schemas.ts`.
+ * - `nested = true` → `tags-split` mode: a `<tag>/<stem>.ts` folder per tag, with
+ *   the shared modules still at the root.
+ *
+ * Both share the root http + schemas modules and a `<stem>.ts` barrel entry that
+ * re-exports everything; only the per-tag file paths and their relative imports
+ * differ. Operations are grouped first-tag-wins; untagged → `default`.
+ */
+export function buildTaggedClient(
+  { model, outputPath, emit }: WriterInput,
+  nested: boolean
+): GeneratedFile[] {
+  const { dir, stem } = anchor(outputPath);
+  const m = emitModules(model, emit);
+  const groups = groupByTag(model, stem);
+  const importPrefix = nested ? '../' : './';
+
+  const files: GeneratedFile[] = [
+    { path: join(dir, `${stem}.http.ts`), content: m.http },
+    { path: join(dir, `${stem}.schemas.ts`), content: m.schemas },
+  ];
+
+  for (const group of groups) {
+    const operations = m.renderEndpoints(group.operations, serviceClassName(group.stem));
+    const path = nested ? join(dir, group.stem, `${stem}.ts`) : join(dir, `${group.stem}.ts`);
+    files.push({
+      path,
+      content: joinSections([
+        m.header,
+        m.endpointImports(group.operations, stem, importPrefix),
+        operations,
+      ]),
+    });
+  }
+
+  const reexports: string[] = [];
+  if (m.hasSchemas) reexports.push(`export * from '${moduleSpecifier(stem, 'schemas')}';`);
+  reexports.push(m.publicReexport(stem));
+  for (const group of groups) {
+    const spec = nested ? `./${group.stem}/${stem}.js` : `./${group.stem}.js`;
+    reexports.push(`export * from '${spec}';`);
+  }
+  // Functions facade: per-tag SSE aggregates aren't `export *`-reachable (they're
+  // named `__sse_<Class>`), so merge them into a single barrel-level `sse`.
+  const sseBarrel = m.sseBarrel(
+    groups.map((group) => ({
+      tagStem: group.stem,
+      moduleSpec: nested ? `./${group.stem}/${stem}.js` : `./${group.stem}.js`,
+      ops: group.operations,
+    }))
+  );
+  if (sseBarrel) reexports.push(sseBarrel);
+  files.push({ path: outputPath, content: joinSections([m.header, reexports.join('\n')]) });
+
+  return files;
+}
diff --git a/packages/openapi-typescript/src/writers/tags-split-writer.ts b/packages/openapi-typescript/src/writers/tags-split-writer.ts
new file mode 100644
index 0000000000..2d6e7e94ff
--- /dev/null
+++ b/packages/openapi-typescript/src/writers/tags-split-writer.ts
@@ -0,0 +1,10 @@
+import { buildTaggedClient } from './tagged.js';
+import type { Writer } from './types.js';
+
+/**
+ * `tags-split` mode: a `<tag>/<stem>.ts` folder per OpenAPI tag (untagged →
+ * `default/<stem>.ts`), with the shared `<stem>.http.ts` and `<stem>.schemas.ts`
+ * at the root and a `<stem>.ts` barrel entry. Schemas stay shared at the root
+ * (they are not partitioned per tag).
+ */
+export const tagsSplitWriter: Writer = (input) => buildTaggedClient(input, true);
diff --git a/packages/openapi-typescript/src/writers/tags-writer.ts b/packages/openapi-typescript/src/writers/tags-writer.ts
new file mode 100644
index 0000000000..bb8f5b16b7
--- /dev/null
+++ b/packages/openapi-typescript/src/writers/tags-writer.ts
@@ -0,0 +1,9 @@
+import { buildTaggedClient } from './tagged.js';
+import type { Writer } from './types.js';
+
+/**
+ * `tags` mode: shared `<stem>.http.ts` + `<stem>.schemas.ts`, one `<tag>.ts`
+ * endpoints file per OpenAPI tag (untagged → `default.ts`), and a `<stem>.ts`
+ * barrel that re-exports every tag file, the schemas, and the public setters.
+ */
+export const tagsWriter: Writer = (input) => buildTaggedClient(input, false);
diff --git a/packages/openapi-typescript/src/writers/types.ts b/packages/openapi-typescript/src/writers/types.ts
new file mode 100644
index 0000000000..56206195f1
--- /dev/null
+++ b/packages/openapi-typescript/src/writers/types.ts
@@ -0,0 +1,32 @@
+import type { EmitOptions } from '../emitters/client.js';
+import type { ApiModel } from '../ir/model.js';
+
+/**
+ * How the generated client is partitioned across files.
+ *
+ * - `single` (default): one self-contained file.
+ * - `split`: endpoints, schemas, and the shared HTTP runtime in sibling files.
+ * - `tags`: one endpoints file per OpenAPI tag; shared schemas + runtime.
+ * - `tags-split`: a folder per tag; shared schemas + runtime at the root.
+ */
+export type OutputMode = 'single' | 'split' | 'tags' | 'tags-split';
+
+/** A single file the generator will write to disk. */
+export type GeneratedFile = { path: string; content: string };
+
+export type WriterInput = {
+  model: ApiModel;
+  /**
+   * The `--output` anchor path (ends in `.ts`). Multi-file writers derive sibling
+   * and per-tag-folder paths from its directory and base name (stem).
+   */
+  outputPath: string;
+  emit: EmitOptions;
+};
+
+/**
+ * A Writer turns the IR + emit options into the set of files to write. This is
+ * the one seam output modes vary at; the emitter (which renders code) stays
+ * mode-agnostic. Future Phase D facades (functions, framework hooks) plug in here.
+ */
+export type Writer = (input: WriterInput) => GeneratedFile[];
diff --git a/packages/openapi-typescript/src/writers/util.ts b/packages/openapi-typescript/src/writers/util.ts
new file mode 100644
index 0000000000..0afd0d9f0f
--- /dev/null
+++ b/packages/openapi-typescript/src/writers/util.ts
@@ -0,0 +1,19 @@
+import { parse } from 'node:path';
+
+import type { OperationModel } from '../ir/model.js';
+
+/**
+ * Derive the directory and base name (stem, without `.ts`) from the `--output`
+ * anchor path. Multi-file writers build sibling/per-tag paths from these.
+ */
+export function anchor(outputPath: string): { dir: string; stem: string } {
+  const { dir, name } = parse(outputPath);
+  return { dir, stem: name };
+}
+
+/** All operations across the model's services, flattened. */
+export function allOperations(
+  operationsByService: { operations: OperationModel[] }[]
+): OperationModel[] {
+  return operationsByService.flatMap((service) => service.operations);
+}
diff --git a/packages/openapi-typescript/tsconfig.json b/packages/openapi-typescript/tsconfig.json
new file mode 100644
index 0000000000..17a936f1cd
--- /dev/null
+++ b/packages/openapi-typescript/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "lib",
+    "strict": true
+  },
+  "references": [{ "path": "../core" }],
+  "include": ["src/**/*.ts"],
+  "exclude": ["lib", "**/__tests__", "**/*.test.ts"]
+}
diff --git a/tests/e2e/examples.test.ts b/tests/e2e/examples.test.ts
new file mode 100644
index 0000000000..d049c18a86
--- /dev/null
+++ b/tests/e2e/examples.test.ts
@@ -0,0 +1,80 @@
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, readdirSync, readFileSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const tsx = join(repoRoot, 'node_modules/.bin/tsx');
+const examplesDir = join(repoRoot, 'packages/openapi-typescript/examples');
+
+const EXAMPLES = [
+  'fetch-functions',
+  'service-class',
+  'zod',
+  'mock',
+  'tanstack-query',
+  'programmatic',
+];
+
+/**
+ * Regenerate an example's client into `outFile`. A `redocly.yaml` example uses the CLI
+ * (auto-discovering its `x-openapi-typescript` block); the programmatic example runs its
+ * `generate.ts` with `OUT` redirecting the output.
+ */
+function regenerate(
+  exampleDir: string,
+  outFile: string
+): { status: number | null; stderr: string } {
+  if (existsSync(join(exampleDir, 'redocly.yaml'))) {
+    return spawnSync('node', [cli, 'generate-client', '--output', outFile], {
+      cwd: exampleDir,
+      encoding: 'utf-8',
+    });
+  }
+  return spawnSync(tsx, [join(exampleDir, 'generate.ts')], {
+    cwd: exampleDir,
+    encoding: 'utf-8',
+    env: { ...process.env, OUT: outFile },
+  });
+}
+
+/** All files (relative paths) under a dir, recursively. */
+function listFiles(dir: string, base = dir): string[] {
+  const out: string[] = [];
+  for (const entry of readdirSync(dir, { withFileTypes: true })) {
+    const full = join(dir, entry.name);
+    if (entry.isDirectory()) out.push(...listFiles(full, base));
+    else out.push(full.slice(base.length + 1));
+  }
+  return out;
+}
+
+describe('examples are in sync with the generator', () => {
+  for (const name of EXAMPLES) {
+    it(`${name}: committed src/api matches a fresh local generation`, () => {
+      const exampleDir = join(examplesDir, name);
+      const committed = join(exampleDir, 'src/api');
+      const tmp = mkdtempSync(join(tmpdir(), `ex-${name}-`));
+      try {
+        // Regenerate to a temp dir so the committed client isn't touched.
+        const res = regenerate(exampleDir, join(tmp, 'client.ts'));
+        expect(res.status, res.stderr).toBe(0);
+
+        const committedFiles = listFiles(committed).sort();
+        const freshFiles = listFiles(tmp).sort();
+        expect(freshFiles, `file set differs for ${name}`).toEqual(committedFiles);
+        for (const rel of committedFiles) {
+          expect(
+            readFileSync(join(tmp, rel), 'utf-8'),
+            `${name}/src/api/${rel} is stale — run \`npm run examples:regen -w @redocly/openapi-typescript\``
+          ).toBe(readFileSync(join(committed, rel), 'utf-8'));
+        }
+      } finally {
+        rmSync(tmp, { recursive: true, force: true });
+      }
+    }, 60_000);
+  }
+});
diff --git a/tests/e2e/generate-client/args-grouped.test.ts b/tests/e2e/generate-client/args-grouped.test.ts
new file mode 100644
index 0000000000..b7c428ef8e
--- /dev/null
+++ b/tests/e2e/generate-client/args-grouped.test.ts
@@ -0,0 +1,85 @@
+/**
+ * E2E for `--args-style grouped`: every operation takes a single `vars:
+ * <Op>Variables` object bundling its inputs (path params, query `params`, `body`,
+ * header `headers`) instead of positional arguments, while the per-call request
+ * `init` stays a separate trailing argument.
+ *
+ * The generated single file must compile under strict `tsc` with
+ * `--noUnusedLocals`, which proves the `vars.*` member references line up with
+ * the `<Op>Variables` aliases. Uses cafe.yaml because it exercises path params,
+ * query params, request bodies, header params, and auth together.
+ */
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
+const fixture = join(__dirname, 'fixtures/cafe.yaml');
+
+describe('generate-client end-to-end (--args-style grouped)', () => {
+  let workDir = '';
+  let entry = '';
+
+  beforeAll(() => {
+    workDir = mkdtempSync(join(tmpdir(), 'args-grouped-client-'));
+    entry = join(workDir, 'client.ts');
+  });
+
+  afterAll(() => {
+    if (workDir && existsSync(workDir)) {
+      rmSync(workDir, { recursive: true, force: true });
+    }
+  });
+
+  test('emits a single `vars` object per operation with the inputs as members', () => {
+    const result = spawnSync(
+      'node',
+      [cliEntry, 'generate-client', fixture, '--output', entry, '--args-style', 'grouped'],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(result.status, `generate-client stderr:\n${result.stderr}`).toBe(0);
+    expect(existsSync(entry)).toBe(true);
+
+    const src = readFileSync(entry, 'utf-8');
+
+    // getOrderById has a single `orderId` path param: grouped mode bundles it into
+    // a required `vars: GetOrderByIdVariables` and reads it back as `vars.orderId`.
+    expect(src).toContain('export async function getOrderById(vars: GetOrderByIdVariables,');
+    expect(src).toContain('${encodeURIComponent(String(vars.orderId))}');
+
+    // The per-call `init` stays a separate trailing argument (not folded into vars).
+    expect(src).toContain('init: RequestOptions = {})');
+
+    // No positional `orderId: string` argument leaks through in grouped mode.
+    expect(src).not.toContain('getOrderById(orderId: string');
+  }, 90_000);
+
+  test('the grouped-style client type-checks under strict mode with no unused locals', () => {
+    expect(existsSync(entry), 'generation test must run first').toBe(true);
+
+    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+    const tsc = spawnSync(
+      tscBin,
+      [
+        '--noEmit',
+        '--strict',
+        '--noUnusedLocals',
+        '--target',
+        'ES2020',
+        '--module',
+        'esnext',
+        '--moduleResolution',
+        'bundler',
+        '--lib',
+        'ES2020,DOM',
+        entry,
+      ],
+      { encoding: 'utf-8', cwd: workDir }
+    );
+    expect(tsc.status, `tsc errors:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+  }, 90_000);
+});
diff --git a/tests/e2e/generate-client/auth.test.ts b/tests/e2e/generate-client/auth.test.ts
new file mode 100644
index 0000000000..3a043c2007
--- /dev/null
+++ b/tests/e2e/generate-client/auth.test.ts
@@ -0,0 +1,171 @@
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+const fixture = join(__dirname, 'fixtures', 'auth.yaml');
+
+const STRICT_TSCONFIG = {
+  compilerOptions: {
+    module: 'node16',
+    moduleResolution: 'node16',
+    target: 'es2022',
+    lib: ['ES2022', 'DOM'],
+    strict: true,
+    noEmit: true,
+    skipLibCheck: true,
+    types: [],
+  },
+};
+
+/** Generate a single-file client and assert strict `tsc` accepts it. */
+function generateSingleFile(): string {
+  const dir = mkdtempSync(join(tmpdir(), 'ots-auth-'));
+  const out = join(dir, 'client.ts');
+  const res = spawnSync('node', [cli, 'generate-client', fixture, '--output', out], {
+    encoding: 'utf-8',
+    cwd: repoRoot,
+  });
+  expect(res.status, res.stderr).toBe(0);
+  expect(existsSync(out)).toBe(true);
+  const generated = readFileSync(out, 'utf-8');
+  writeFileSync(
+    join(dir, 'tsconfig.json'),
+    JSON.stringify({ ...STRICT_TSCONFIG, include: ['client.ts'] }),
+    'utf-8'
+  );
+  const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
+  expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+  rmSync(dir, { recursive: true, force: true });
+  return generated;
+}
+
+describe('generate-client auth breadth (auth.yaml)', () => {
+  it('emits all five injectable scheme kinds and strict-tsc accepts the single-file client', () => {
+    const generated = generateSingleFile();
+
+    // Token machinery for the resolvable (bearer + apiKey) schemes.
+    expect(generated).toContain('export type TokenProvider');
+    expect(generated).toContain('async function __auth');
+    expect(generated).toContain('async function __resolve');
+
+    // One setter per scheme kind. Three apiKey schemes (none sole) → keyed names.
+    expect(generated).toContain('export function setBearer(token: TokenProvider | null)');
+    expect(generated).toContain('export function setBasicAuth(username: string, password: string)');
+    expect(generated).toContain('export function setApiKeyQueryKey(key: TokenProvider | null)'); // query
+    expect(generated).toContain('export function setApiKeyHeaderKey(key: TokenProvider | null)'); // header
+    expect(generated).toContain('export function setApiKeyCookieKey(key: TokenProvider | null)'); // cookie
+    expect(generated).toContain('__basicAuth = btoa(`${username}:${password}`)');
+
+    // Per-kind injection inside __auth — each prefers per-instance config.auth, then the global slot.
+    expect(generated).toContain('headers["Authorization"] = `Bearer ${v}`');
+    expect(generated).toContain('const basic = b ? btoa(`${b.username}:${b.password}`) : __basicAuth;');
+    expect(generated).toContain('headers["Authorization"] = `Basic ${basic}`');
+    expect(generated).toContain('query["api_key"] = v'); // apiKeyQuery
+    expect(generated).toContain('cookies.push("sid=" + v)'); // apiKeyCookie
+    expect(generated).toContain('headers["X-Key"] = v'); // apiKeyHeader
+
+    // Per-instance credentials type + ClientConfig field.
+    expect(generated).toContain('export type AuthCredentials = {');
+    expect(generated).toContain('auth?: AuthCredentials;');
+
+    // Authed operations resolve credentials at the call site (threading the config).
+    expect(generated).toContain('const __a = await __auth(["Bearer"], __config);');
+    expect(generated).toContain('const __a = await __auth(["HeaderKey"], __config);'); // header-kind awaits too
+    expect(generated).toContain('...__a.headers');
+    // Query-auth merges into the URL query object.
+    expect(generated).toContain('{ ...params, ...__a.query }');
+  }, 60_000);
+
+  it('strict-tsc accepts the tags-split multi-file client (guards multi-file auth)', () => {
+    // Multi-file modes derive their folder from a `.ts` entry path, so --output
+    // must still point at a file; the generator fans out the tree around it.
+    const dir = mkdtempSync(join(tmpdir(), 'ots-auth-split-'));
+    const res = spawnSync(
+      'node',
+      [
+        cli,
+        'generate-client',
+        fixture,
+        '--output',
+        join(dir, 'client.ts'),
+        '--output-mode',
+        'tags-split',
+      ],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(res.status, res.stderr).toBe(0);
+    writeFileSync(
+      join(dir, 'tsconfig.json'),
+      JSON.stringify({ ...STRICT_TSCONFIG, include: ['**/*.ts'] }),
+      'utf-8'
+    );
+    const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
+    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  // Behavioral check on a real wire. The cafe mock-server harness is bound to
+  // cafe.yaml and heavy to clone, so we drive the generated client against a tiny
+  // throwaway http server instead — enough to prove (a) an async `setBearer`
+  // token function resolves through `await __auth` onto the `Authorization`
+  // header and (b) a query-key scheme lands `api_key=` in the request URL.
+  it('async setBearer resolves onto Authorization and query-key lands in the URL', () => {
+    // The driver owns its own throwaway http server (and binds BASE to it at
+    // runtime via setBaseUrl), so a single `spawnSync` runs the whole behavioral
+    // probe — the server can't be starved by the test process's blocking spawn.
+    const dir = mkdtempSync(join(tmpdir(), 'ots-auth-run-'));
+    const out = join(dir, 'client.ts');
+    const gen = spawnSync('node', [cli, 'generate-client', fixture, '--output', out], {
+      encoding: 'utf-8',
+      cwd: repoRoot,
+    });
+    expect(gen.status, gen.stderr).toBe(0);
+
+    const driver = join(dir, 'driver.ts');
+    writeFileSync(
+      driver,
+      `import * as http from 'node:http';
+import { getBearer, getQuery, setBaseUrl, setBearer, setApiKeyQueryKey } from './client.js';
+
+const captured: Array<{ url: string; auth?: string }> = [];
+const server = http.createServer((req, res) => {
+  captured.push({ url: req.url ?? '', auth: req.headers['authorization'] as string | undefined });
+  res.writeHead(200, { 'Content-Type': 'application/json' });
+  res.end(JSON.stringify({ id: 'x' }));
+});
+
+async function main() {
+  await new Promise<void>((r) => server.listen(0, '127.0.0.1', r));
+  const port = (server.address() as { port: number }).port;
+  setBaseUrl('http://127.0.0.1:' + port);
+  setBearer(async () => 'tok');
+  await getBearer();
+  setApiKeyQueryKey('secret-key');
+  await getQuery({ limit: 5 });
+  await new Promise<void>((r) => server.close(() => r()));
+  process.stdout.write(JSON.stringify(captured));
+}
+main().then(() => process.exit(0)).catch((e) => { console.error(e); process.exit(1); });
+`,
+      'utf-8'
+    );
+    const run = spawnSync('npx', ['tsx', driver], { encoding: 'utf-8', cwd: repoRoot });
+    expect(run.status, `driver failed:\nstdout:\n${run.stdout}\nstderr:\n${run.stderr}`).toBe(0);
+    const captured = JSON.parse(run.stdout.trim()) as Array<{ url: string; auth?: string }>;
+    rmSync(dir, { recursive: true, force: true });
+
+    const bearerReq = captured.find((c) => c.url.startsWith('/bearer'));
+    expect(bearerReq, JSON.stringify(captured)).toBeDefined();
+    expect(bearerReq!.auth).toBe('Bearer tok');
+
+    const queryReq = captured.find((c) => c.url.startsWith('/query'));
+    expect(queryReq, JSON.stringify(captured)).toBeDefined();
+    expect(queryReq!.url).toContain('api_key=secret-key');
+  }, 90_000);
+});
diff --git a/tests/e2e/generate-client/base-consumer/index-cancel.ts b/tests/e2e/generate-client/base-consumer/index-cancel.ts
new file mode 100644
index 0000000000..f011811716
--- /dev/null
+++ b/tests/e2e/generate-client/base-consumer/index-cancel.ts
@@ -0,0 +1,22 @@
+import { getSlowPet } from './api.js';
+
+async function main(): Promise<void> {
+  const controller = new AbortController();
+  const promise = getSlowPet(1, { signal: controller.signal });
+  setTimeout(() => controller.abort(), 100);
+  try {
+    await promise;
+    process.stdout.write('NOT_CANCELLED\n');
+  } catch (error) {
+    if (error instanceof Error) {
+      process.stdout.write(`CANCELLED:${error.name}\n`);
+      return;
+    }
+    process.stdout.write(`CANCELLED:UNKNOWN\n`);
+  }
+}
+
+main().catch((error) => {
+  process.stderr.write(`UNHANDLED: ${error instanceof Error ? error.message : String(error)}\n`);
+  process.exit(1);
+});
diff --git a/tests/e2e/generate-client/base-consumer/index.ts b/tests/e2e/generate-client/base-consumer/index.ts
new file mode 100644
index 0000000000..08f9b3b2df
--- /dev/null
+++ b/tests/e2e/generate-client/base-consumer/index.ts
@@ -0,0 +1,23 @@
+import { createPet, getPetById, listPets } from './api.js';
+
+async function main(): Promise<void> {
+  const pet = await getPetById(1);
+
+  // deepObject query param: the object is serialized as filter[name]=…&filter[status]=…
+  const filtered = await listPets({ filter: { name: 'rex', status: 'available' } });
+
+  // Bucket C: the create body is `Omit<Pet, "id">`, so the readOnly server-assigned
+  // `id` is neither required nor accepted — this call compiles without it.
+  const created = await createPet({ name: 'rex', status: 'available' });
+
+  // Bucket B: `metadata` is a free-form record (`{ [key: string]: unknown }`), so an
+  // arbitrary key is accessible. Were it emitted as `{}`, this line would not compile.
+  const note = pet.metadata?.['note'] ?? null;
+
+  process.stdout.write(JSON.stringify({ pet, filtered, created, note }) + '\n');
+}
+
+main().catch((error) => {
+  process.stderr.write(`UNHANDLED: ${error instanceof Error ? error.message : String(error)}\n`);
+  process.exit(1);
+});
diff --git a/tests/e2e/generate-client/base-consumer/package.json b/tests/e2e/generate-client/base-consumer/package.json
new file mode 100644
index 0000000000..ff38f8cb36
--- /dev/null
+++ b/tests/e2e/generate-client/base-consumer/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "base-consumer",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module"
+}
diff --git a/tests/e2e/generate-client/base-consumer/redocly-mock-server.d.ts b/tests/e2e/generate-client/base-consumer/redocly-mock-server.d.ts
new file mode 100644
index 0000000000..d38248043a
--- /dev/null
+++ b/tests/e2e/generate-client/base-consumer/redocly-mock-server.d.ts
@@ -0,0 +1,33 @@
+// Ambient declarations for @redocly/mock-server.
+// The published package ships only a bundled dist/bin.js with no .d.ts files,
+// so we describe just the subset of the public API the test harness uses.
+
+declare module '@redocly/mock-server' {
+  export interface MockServerRequest {
+    readonly path: string;
+    readonly method: string;
+    readonly query?: string;
+    readonly headers: Record<string, string>;
+    getBody(): Promise<Buffer | undefined>;
+  }
+
+  export interface MockServerResponse {
+    statusCode: number;
+    headers?: Record<string, string>;
+    body?: Buffer;
+  }
+
+  export type MockServerRequestHandler = (
+    request: MockServerRequest
+  ) => Promise<MockServerResponse>;
+
+  export interface MockServerUserConfig {
+    strictExamples?: boolean;
+    errorIfForcedExampleNotFound?: boolean;
+  }
+
+  export function createMockServer(
+    definitionInput: string | Record<string, unknown>,
+    userConfig?: MockServerUserConfig
+  ): Promise<MockServerRequestHandler>;
+}
diff --git a/tests/e2e/generate-client/base-consumer/server.ts b/tests/e2e/generate-client/base-consumer/server.ts
new file mode 100644
index 0000000000..d41f9349e6
--- /dev/null
+++ b/tests/e2e/generate-client/base-consumer/server.ts
@@ -0,0 +1,120 @@
+import {
+  createMockServer,
+  type MockServerRequest,
+  type MockServerRequestHandler,
+} from '@redocly/mock-server';
+import * as http from 'node:http';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+type LogEntry = { method: string; url: string };
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const SPEC_PATH = join(__dirname, '..', 'fixtures', 'base.yaml');
+const PORT = Number.parseInt(process.env.BASE_SERVER_PORT ?? '3102', 10);
+
+const requestLog: LogEntry[] = [];
+
+async function readBody(req: http.IncomingMessage): Promise<Buffer | undefined> {
+  const chunks: Buffer[] = [];
+  for await (const chunk of req) {
+    chunks.push(chunk as Buffer);
+  }
+  return chunks.length > 0 ? Buffer.concat(chunks) : undefined;
+}
+
+function toMockRequest(req: http.IncomingMessage, body: Buffer | undefined): MockServerRequest {
+  const { pathname, search } = new URL(req.url ?? '/', 'http://localhost');
+  const headers: Record<string, string> = {};
+  for (const [name, value] of Object.entries(req.headers)) {
+    if (typeof value === 'string') {
+      headers[name.toLowerCase()] = value;
+    } else if (Array.isArray(value)) {
+      headers[name.toLowerCase()] = value.join(',');
+    }
+  }
+  return {
+    path: pathname,
+    method: req.method ?? 'GET',
+    query: search !== '' ? search : undefined,
+    headers,
+    getBody: () => Promise.resolve(body),
+  };
+}
+
+let handler: MockServerRequestHandler;
+
+const server = http.createServer(async (req, res) => {
+  const method = req.method ?? 'GET';
+  const url = req.url ?? '';
+
+  if (url === '/__test__/ready') {
+    res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' });
+    res.end('ready');
+    return;
+  }
+  if (url === '/__test__/log') {
+    res.writeHead(200, { 'Content-Type': 'application/json; charset=utf-8' });
+    res.end(JSON.stringify(requestLog));
+    return;
+  }
+
+  requestLog.push({ method, url });
+
+  const { pathname } = new URL(url, 'http://localhost');
+
+  // The cancellation operation needs a response slow enough to abort mid-flight.
+  // mock-server replies instantly, so this path is held open here instead of
+  // being delegated to it.
+  if (method === 'GET' && /^\/pets\/\d+\/cancel-test$/.test(pathname)) {
+    let aborted = false;
+    req.on('close', () => {
+      aborted = true;
+    });
+    const timer = setTimeout(() => {
+      if (aborted) return;
+      res.writeHead(200, { 'Content-Type': 'application/json; charset=utf-8' });
+      res.end(JSON.stringify({ id: 1, name: 'Slow', status: 'available' }));
+    }, 30_000);
+    res.on('close', () => clearTimeout(timer));
+    return;
+  }
+
+  const body = await readBody(req);
+  try {
+    const response = await handler(toMockRequest(req, body));
+    res.writeHead(response.statusCode, response.headers ?? {});
+    res.end(response.body);
+  } catch (error) {
+    res.writeHead(500, { 'Content-Type': 'application/json; charset=utf-8' });
+    res.end(
+      JSON.stringify({
+        error: 'mock-server failed',
+        message: error instanceof Error ? error.message : String(error),
+      })
+    );
+  }
+});
+
+async function main(): Promise<void> {
+  handler = await createMockServer(SPEC_PATH);
+  server.listen(PORT, () => {
+    process.stdout.write(`READY ${PORT}\n`);
+  });
+}
+
+const shutdown = (): void => {
+  server.close(() => {
+    process.exit(0);
+  });
+};
+
+process.on('SIGTERM', shutdown);
+process.on('SIGINT', shutdown);
+
+main().catch((error) => {
+  process.stderr.write(
+    `base mock server failed to start: ${error instanceof Error ? (error.stack ?? error.message) : String(error)}\n`
+  );
+  process.exit(1);
+});
diff --git a/tests/e2e/generate-client/base-consumer/tsconfig.json b/tests/e2e/generate-client/base-consumer/tsconfig.json
new file mode 100644
index 0000000000..1b3492b511
--- /dev/null
+++ b/tests/e2e/generate-client/base-consumer/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "module": "node16",
+    "moduleResolution": "node16",
+    "target": "es2022",
+    "lib": ["ES2022", "DOM"],
+    "strict": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "types": ["node"]
+  },
+  "include": ["./**/*.ts"]
+}
diff --git a/tests/e2e/generate-client/base.test.ts b/tests/e2e/generate-client/base.test.ts
new file mode 100644
index 0000000000..1cb17d0faa
--- /dev/null
+++ b/tests/e2e/generate-client/base.test.ts
@@ -0,0 +1,184 @@
+import { spawn, spawnSync, type ChildProcess } from 'node:child_process';
+import { existsSync, readFileSync, rmSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const indexEntryPoint = join(repoRoot, 'packages/cli/lib/index.js');
+const fixture = join(__dirname, 'fixtures/base.yaml');
+const consumerDir = join(__dirname, 'base-consumer');
+const generatedFile = join(consumerDir, 'api.ts');
+const serverScript = join(consumerDir, 'server.ts');
+const indexScript = join(consumerDir, 'index.ts');
+const cancelScript = join(consumerDir, 'index-cancel.ts');
+
+const SERVER_PORT = 3102;
+const SERVER_BASE = `http://127.0.0.1:${SERVER_PORT}`;
+
+async function waitForServerReady(timeoutMs: number): Promise<void> {
+  const deadline = Date.now() + timeoutMs;
+  let lastError: unknown;
+  while (Date.now() < deadline) {
+    try {
+      const response = await fetch(`${SERVER_BASE}/__test__/ready`);
+      if (response.ok) return;
+    } catch (error) {
+      lastError = error;
+    }
+    await new Promise((r) => setTimeout(r, 100));
+  }
+  throw new Error(
+    `Base server did not become ready within ${timeoutMs}ms: ${
+      lastError instanceof Error ? lastError.message : String(lastError)
+    }`
+  );
+}
+
+function killServer(server: ChildProcess): Promise<void> {
+  return new Promise((resolveFn) => {
+    if (!server.pid || server.exitCode !== null) {
+      resolveFn();
+      return;
+    }
+    const onExit = (): void => resolveFn();
+    server.once('exit', onExit);
+    server.kill('SIGTERM');
+    setTimeout(() => {
+      server.removeListener('exit', onExit);
+      if (server.exitCode === null) {
+        server.kill('SIGKILL');
+      }
+      resolveFn();
+    }, 2_000);
+  });
+}
+
+describe('generate-client base consumer (single-file output)', () => {
+  let serverProcess: ChildProcess | undefined;
+
+  beforeAll(async () => {
+    if (existsSync(generatedFile)) {
+      rmSync(generatedFile, { force: true });
+    }
+
+    serverProcess = spawn('npx', ['tsx', serverScript], {
+      cwd: consumerDir,
+      env: { ...process.env, BASE_SERVER_PORT: String(SERVER_PORT) },
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+
+    serverProcess.stderr?.on('data', (chunk: Buffer) => {
+      process.stderr.write(`[base-server stderr] ${chunk.toString()}`);
+    });
+
+    await waitForServerReady(15_000);
+  }, 30_000);
+
+  afterAll(async () => {
+    if (serverProcess) {
+      await killServer(serverProcess);
+    }
+  });
+
+  test('end-to-end: generate single file, type-check, run, assert real call', async () => {
+    const generateResult = spawnSync(
+      'node',
+      [indexEntryPoint, 'generate-client', fixture, '--output', generatedFile],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(generateResult.status, `generate-client stderr:\n${generateResult.stderr}`).toBe(0);
+
+    expect(existsSync(generatedFile)).toBe(true);
+    const generated = readFileSync(generatedFile, 'utf-8');
+    expect(generated).toContain('export type Pet');
+    expect(generated).toContain('export class ApiError');
+    expect(generated).toContain('export async function getPetById');
+    expect(generated).toContain('export async function getSlowPet');
+    expect(generated).toContain('export async function listPets');
+    // BASE is emitted as a mutable binding so setBaseUrl() can override it.
+    expect(generated).toContain('let BASE = "http://localhost:3102"');
+    // An OAS 3.1 enum that includes null renders as a nullable union.
+    expect(generated).toMatch(/status\?:\s*\("available" \| "pending" \| "sold"\) \| null;/);
+    // A free-form object (`type: object`, no properties) renders as a record, not `{}`.
+    expect(generated).toMatch(/metadata\?:\s*Record<string, unknown>;/);
+    // readOnly `id` is dropped from the create body via Omit (the response Pet keeps it).
+    expect(generated).toContain('export type CreatePetBody = Omit<Pet, "id">;');
+    // The readOnly `id` carries the `readonly` modifier on the model (for OmitReadOnly<T>).
+    expect(generated).toMatch(/readonly id\?: number;/);
+    // A oneOf with an empty branch keeps the real type — no `| unknown` collapse.
+    expect(generated).toMatch(/owner\?:\s*string;/);
+    expect(generated).not.toContain('| unknown');
+    // OAS 3.1 single null type renders as `null`, not `unknown`.
+    expect(generated).toMatch(/deletedAt\?:\s*null;/);
+    // A discriminated union nested as array items emits guards narrowing the members.
+    expect(generated).toContain(
+      'export function isPetBulkSuccessItem(value: PetBulkSuccessItem | PetBulkErrorItem): value is PetBulkSuccessItem {'
+    );
+    expect(generated).toContain(
+      'export function isPetBulkErrorItem(value: PetBulkSuccessItem | PetBulkErrorItem): value is PetBulkErrorItem {'
+    );
+    // A schema with its own properties AND allOf keeps the own discriminant.
+    expect(generated).toContain('export type ExtendedPet =');
+    expect(generated).toMatch(/kind:\s*"extended";/);
+    expect(generated).toContain('} & Pet;');
+
+    const typecheckResult = spawnSync('npx', ['tsc', '--noEmit', '-p', consumerDir], {
+      encoding: 'utf-8',
+      cwd: repoRoot,
+    });
+    expect(
+      typecheckResult.status,
+      `tsc --noEmit failed:\nstdout:\n${typecheckResult.stdout}\nstderr:\n${typecheckResult.stderr}`
+    ).toBe(0);
+
+    const runResult = spawnSync('npx', ['tsx', indexScript], {
+      encoding: 'utf-8',
+      cwd: consumerDir,
+    });
+    expect(
+      runResult.status,
+      `consumer stdout:\n${runResult.stdout}\nstderr:\n${runResult.stderr}`
+    ).toBe(0);
+    const parsed = JSON.parse(runResult.stdout.trim()) as {
+      pet: { id: number; name: string };
+      filtered: Array<{ id: number; name: string }>;
+      created: { name: string };
+    };
+    expect(typeof parsed.pet.id).toBe('number');
+    expect(typeof parsed.pet.name).toBe('string');
+    expect(Array.isArray(parsed.filtered)).toBe(true);
+    // Bucket C round-trip: createPet ran with a body that omits the readOnly `id`.
+    expect(typeof parsed.created.name).toBe('string');
+
+    const logResponse = await fetch(`${SERVER_BASE}/__test__/log`);
+    const log = (await logResponse.json()) as Array<{ method: string; url: string }>;
+    expect(log).toContainEqual({ method: 'GET', url: '/pets/1' });
+    expect(log).toContainEqual({ method: 'POST', url: '/pets' });
+    expect(
+      log.some(
+        (e) =>
+          e.method === 'GET' &&
+          e.url.startsWith('/pets?') &&
+          e.url.includes('filter%5Bname%5D=rex') &&
+          e.url.includes('filter%5Bstatus%5D=available')
+      ),
+      `deepObject query not found in log:\n${JSON.stringify(log, null, 2)}`
+    ).toBe(true);
+  }, 60_000);
+
+  test('cancel: AbortController aborts the underlying request', async () => {
+    expect(existsSync(generatedFile), 'previous test must have produced api.ts').toBe(true);
+
+    const cancelResult = spawnSync('npx', ['tsx', cancelScript], {
+      encoding: 'utf-8',
+      cwd: consumerDir,
+      timeout: 15_000,
+    });
+    expect(
+      cancelResult.status,
+      `cancel stdout:\n${cancelResult.stdout}\nstderr:\n${cancelResult.stderr}`
+    ).toBe(0);
+    expect(cancelResult.stdout.trim()).toBe('CANCELLED:AbortError');
+  }, 30_000);
+});
diff --git a/tests/e2e/generate-client/cafe-consumer/index-setbaseurl.ts b/tests/e2e/generate-client/cafe-consumer/index-setbaseurl.ts
new file mode 100644
index 0000000000..107454ba1c
--- /dev/null
+++ b/tests/e2e/generate-client/cafe-consumer/index-setbaseurl.ts
@@ -0,0 +1,57 @@
+import { listMenuItems, setBaseUrl } from './api.js';
+
+type StepResult = { kind: 'ok'; name: string } | { kind: 'err'; name: string; error: string };
+
+function requireEnv(name: string): string {
+  const value = process.env[name];
+  if (!value) {
+    process.stderr.write(`${name} env var required for the setBaseUrl mid-flight test\n`);
+    process.exit(1);
+  }
+  return value;
+}
+
+const liveBase = requireEnv('CAFE_BASE');
+
+// Port 1 is reserved/unassigned — any connect attempt fails fast (ECONNREFUSED / ENOTFOUND).
+// We use it as the "obviously unreachable" base to prove BASE actually moved.
+const UNREACHABLE = 'http://127.0.0.1:1';
+
+async function step(name: string, run: () => Promise<unknown>): Promise<StepResult> {
+  try {
+    await run();
+    return { kind: 'ok', name };
+  } catch (error) {
+    return {
+      kind: 'err',
+      name,
+      error: error instanceof Error ? `${error.name}: ${error.message}` : String(error),
+    };
+  }
+}
+
+async function main(): Promise<void> {
+  const results: StepResult[] = [];
+
+  // 1) Baseline: the file was generated with --base-url ${CAFE_BASE}, so the first
+  //    call should succeed against the mock server.
+  results.push(await step('initial-call-against-mock', () => listMenuItems({ limit: 1 })));
+
+  // 2) Flip BASE to an unreachable host. The same operation should now fail to connect.
+  //    This is the proof that setBaseUrl() actually mutated the module-scoped binding.
+  setBaseUrl(UNREACHABLE);
+  results.push(
+    await step('call-after-setBaseUrl-to-unreachable', () => listMenuItems({ limit: 1 }))
+  );
+
+  // 3) Flip BASE back to the live mock and confirm the binding restored cleanly.
+  setBaseUrl(liveBase);
+  results.push(await step('call-after-setBaseUrl-restored', () => listMenuItems({ limit: 1 })));
+
+  process.stdout.write(JSON.stringify(results, null, 2) + '\n');
+}
+
+main().catch((error) => {
+  process.stderr.write(`UNHANDLED: ${error instanceof Error ? error.message : String(error)}\n`);
+  process.exit(1);
+});
diff --git a/tests/e2e/generate-client/cafe-consumer/index.ts b/tests/e2e/generate-client/cafe-consumer/index.ts
new file mode 100644
index 0000000000..e5a0ad2b7e
--- /dev/null
+++ b/tests/e2e/generate-client/cafe-consumer/index.ts
@@ -0,0 +1,187 @@
+import {
+  ApiError,
+  createOrder,
+  deleteMenuItem,
+  deleteOrder,
+  getMenuItemPhoto,
+  getOrderById,
+  getRevenue,
+  listMenuItems,
+  listOrderItems,
+  listOrders,
+  registerOAuth2Client,
+  setApiKey,
+  setBearer,
+  updateOrder,
+  createMenuItem,
+  isBeverage,
+  isDessert,
+  OrderStatus,
+} from './api.js';
+
+type StepResult =
+  | { kind: 'ok'; name: string; data: unknown }
+  | { kind: 'err'; name: string; error: string };
+
+async function step(name: string, run: () => Promise<unknown>): Promise<StepResult> {
+  try {
+    const data = await run();
+    return { kind: 'ok', name, data };
+  } catch (error) {
+    return {
+      kind: 'err',
+      name,
+      error: error instanceof Error ? `${error.name}: ${error.message}` : String(error),
+    };
+  }
+}
+
+async function main(): Promise<void> {
+  const results: StepResult[] = [];
+
+  // Set credentials once. Every OAuth2/bearer operation now sends
+  // `Authorization: Bearer <token>`, and every ApiKey operation sends the
+  // `X-API-Key` header. Operations declared `security: []` send neither.
+  setBearer('test-bearer-token');
+  setApiKey('test-api-key');
+
+  results.push(
+    await step('listMenuItems', () =>
+      listMenuItems({ after: 'cursor1', limit: 5, sort: '-name', search: 'coffee' })
+    )
+  );
+
+  results.push(
+    await step('createMenuItem', () => {
+      const form = new FormData();
+      form.append('name', 'Latte');
+      form.append('price', '400');
+      form.append('category', 'beverage');
+      form.append('volume', '250');
+      form.append('containsCaffeine', 'true');
+      return createMenuItem(form);
+    })
+  );
+
+  results.push(
+    await step('deleteMenuItem', () => deleteMenuItem('prd_01h1s5z6vf2mm1mz3hevnn9va7'))
+  );
+
+  results.push(
+    await step('getMenuItemPhoto', async () => {
+      const result = await getMenuItemPhoto('prd_01h1s5z6vf2mm1mz3hevnn9va7', {
+        photoSize: 'medium',
+      });
+      if (result instanceof Blob) {
+        return { kind: 'blob', size: result.size, type: result.type };
+      }
+      return { kind: 'text', value: result };
+    })
+  );
+
+  results.push(await step('listOrders', () => listOrders({ filter: 'status:placed', limit: 5 })));
+
+  results.push(
+    await step('createOrder', () =>
+      createOrder({
+        customerName: 'Ada Lovelace',
+        orderItems: [{ menuItemId: 'prd_01h1s5z6vf2mm1mz3hevnn9va7', quantity: 2 }],
+      })
+    )
+  );
+
+  results.push(
+    await step('getOrderById', () =>
+      getOrderById('ord_01h1s5z6vf2mm1mz3hevnn9va7', {
+        'X-Request-Id': '11111111-2222-3333-4444-555555555555',
+      })
+    )
+  );
+
+  results.push(
+    await step('updateOrder', () =>
+      updateOrder('ord_01h1s5z6vf2mm1mz3hevnn9va7', { status: OrderStatus.completed })
+    )
+  );
+
+  results.push(await step('deleteOrder', () => deleteOrder('ord_01h1s5z6vf2mm1mz3hevnn9va7')));
+
+  results.push(
+    await step('listOrderItems', () =>
+      listOrderItems({ filter: 'orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7' })
+    )
+  );
+
+  results.push(
+    await step('getRevenue', () => getRevenue({ startDate: '2026-01-01', endDate: '2026-01-31' }))
+  );
+
+  results.push(
+    await step('registerOAuth2Client', () =>
+      registerOAuth2Client({
+        name: 'demo-client',
+        scopes: ['menu:read', 'orders:read'],
+        grantTypes: ['client_credentials'],
+      })
+    )
+  );
+
+  // Narrow a MenuItem from a real server response with the discriminated-union
+  // type guards and confirm they agree with the raw discriminant.
+  results.push(
+    await step('menuItemGuards', async () => {
+      const list = await listMenuItems({});
+      const item = list.items[0];
+      const category = (item as { category?: string }).category;
+      const beverage = isBeverage(item);
+      const dessert = isDessert(item);
+      return {
+        category,
+        isBeverage: beverage,
+        isDessert: dessert,
+        // Guards must agree with the actual discriminant, and exactly one holds.
+        agree: beverage === (category === 'beverage') && dessert === (category === 'dessert'),
+        exclusive: beverage !== dessert,
+      };
+    })
+  );
+
+  // Negative: error path returns ApiError.
+  results.push(
+    await step('error-path', async () => {
+      try {
+        await fetch('http://127.0.0.1:0/'); // Trigger fetch failure type.
+      } catch {
+        /* no-op */
+      }
+      try {
+        // Hit /__test__/boom by reaching through the generated runtime indirectly:
+        // we don't have a generated function for it, so we use the public ApiError shape via a raw fetch.
+        const response = await fetch(
+          `${process.env.CAFE_BASE ?? 'http://127.0.0.1:3101'}/__test__/boom`
+        );
+        if (!response.ok) {
+          throw new ApiError(
+            response.url,
+            response.status,
+            response.statusText,
+            await response.json()
+          );
+        }
+        return { unreachable: true };
+      } catch (error) {
+        if (error instanceof ApiError) {
+          return { apiError: true, status: error.status, statusText: error.statusText };
+        }
+        throw error;
+      }
+    })
+  );
+
+  process.stdout.write(JSON.stringify(results, null, 2) + '\n');
+}
+
+main().catch((error) => {
+  process.stderr.write(`UNHANDLED: ${error instanceof Error ? error.message : String(error)}\n`);
+  process.exit(1);
+});
diff --git a/tests/e2e/generate-client/cafe-consumer/package.json b/tests/e2e/generate-client/cafe-consumer/package.json
new file mode 100644
index 0000000000..469a68d40e
--- /dev/null
+++ b/tests/e2e/generate-client/cafe-consumer/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "cafe-consumer",
+  "private": true,
+  "type": "module"
+}
diff --git a/tests/e2e/generate-client/cafe-consumer/redocly-mock-server.d.ts b/tests/e2e/generate-client/cafe-consumer/redocly-mock-server.d.ts
new file mode 100644
index 0000000000..d38248043a
--- /dev/null
+++ b/tests/e2e/generate-client/cafe-consumer/redocly-mock-server.d.ts
@@ -0,0 +1,33 @@
+// Ambient declarations for @redocly/mock-server.
+// The published package ships only a bundled dist/bin.js with no .d.ts files,
+// so we describe just the subset of the public API the test harness uses.
+
+declare module '@redocly/mock-server' {
+  export interface MockServerRequest {
+    readonly path: string;
+    readonly method: string;
+    readonly query?: string;
+    readonly headers: Record<string, string>;
+    getBody(): Promise<Buffer | undefined>;
+  }
+
+  export interface MockServerResponse {
+    statusCode: number;
+    headers?: Record<string, string>;
+    body?: Buffer;
+  }
+
+  export type MockServerRequestHandler = (
+    request: MockServerRequest
+  ) => Promise<MockServerResponse>;
+
+  export interface MockServerUserConfig {
+    strictExamples?: boolean;
+    errorIfForcedExampleNotFound?: boolean;
+  }
+
+  export function createMockServer(
+    definitionInput: string | Record<string, unknown>,
+    userConfig?: MockServerUserConfig
+  ): Promise<MockServerRequestHandler>;
+}
diff --git a/tests/e2e/generate-client/cafe-consumer/server.ts b/tests/e2e/generate-client/cafe-consumer/server.ts
new file mode 100644
index 0000000000..b663c02275
--- /dev/null
+++ b/tests/e2e/generate-client/cafe-consumer/server.ts
@@ -0,0 +1,154 @@
+import {
+  createMockServer,
+  type MockServerRequest,
+  type MockServerRequestHandler,
+} from '@redocly/mock-server';
+import * as http from 'node:http';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+type LogEntry = {
+  method: string;
+  url: string;
+  contentType: string | undefined;
+  body: string;
+  headers: Record<string, string>;
+};
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const SPEC_PATH = join(__dirname, '..', 'fixtures', 'cafe.yaml');
+const PORT = Number.parseInt(process.env.CAFE_SERVER_PORT ?? '3101', 10);
+
+const requestLog: LogEntry[] = [];
+
+async function readBody(req: http.IncomingMessage): Promise<Buffer | undefined> {
+  const chunks: Buffer[] = [];
+  for await (const chunk of req) {
+    chunks.push(chunk as Buffer);
+  }
+  return chunks.length > 0 ? Buffer.concat(chunks) : undefined;
+}
+
+// @redocly/mock-server's request shape is decoupled from Node's `http` types,
+// so we adapt the IncomingMessage to the small interface the mock handler expects.
+// We also inject benign auth headers when missing: cafe.yaml has OAuth2 and ApiKey
+// requirements on most operations, but the generated client doesn't ship credentials
+// in tests. Mock-server's auth checks are presence-only, so a dummy bearer/api-key
+// is enough to satisfy them without changing what the consumer actually sends.
+function toMockRequest(req: http.IncomingMessage, body: Buffer | undefined): MockServerRequest {
+  const { pathname, search } = new URL(req.url ?? '/', 'http://localhost');
+  const headers: Record<string, string> = {};
+  for (const [name, value] of Object.entries(req.headers)) {
+    if (typeof value === 'string') {
+      headers[name.toLowerCase()] = value;
+    } else if (Array.isArray(value)) {
+      headers[name.toLowerCase()] = value.join(',');
+    }
+  }
+  if (!headers['authorization']) {
+    headers['authorization'] = 'Bearer test-token';
+  }
+  if (!headers['x-api-key']) {
+    headers['x-api-key'] = 'test-key';
+  }
+  // POST /menu is multipart/form-data with a typed schema (number, boolean), but
+  // FormData transmits everything as strings, so mock-server's body validation rejects
+  // the request. We force a 201 example response, which the test contract already covers
+  // by asserting on the (logged) multipart payload the consumer sent.
+  if (pathname === '/menu' && (req.method ?? 'GET').toUpperCase() === 'POST') {
+    headers['x-redocly-response-status'] = '201';
+  }
+  return {
+    path: pathname,
+    method: req.method ?? 'GET',
+    query: search !== '' ? search : undefined,
+    headers,
+    getBody: () => Promise.resolve(body),
+  };
+}
+
+let handler: MockServerRequestHandler;
+
+const server = http.createServer(async (req, res) => {
+  const method = req.method ?? 'GET';
+  const url = req.url ?? '';
+
+  // Test-only utility endpoints. These bypass the mock server entirely so the
+  // test harness can probe readiness, inspect the request log, and exercise
+  // the generated ApiError path without relying on spec semantics.
+  if (url === '/__test__/ready') {
+    res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' });
+    res.end('ready');
+    return;
+  }
+  if (url === '/__test__/log') {
+    res.writeHead(200, { 'Content-Type': 'application/json; charset=utf-8' });
+    res.end(JSON.stringify(requestLog));
+    return;
+  }
+  if (url === '/__test__/log/clear' && method === 'POST') {
+    requestLog.length = 0;
+    res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' });
+    res.end('cleared');
+    return;
+  }
+  if (url === '/__test__/boom' && method === 'GET') {
+    res.writeHead(500, { 'Content-Type': 'application/problem+json; charset=utf-8' });
+    res.end(JSON.stringify({ type: 'about:blank', title: 'Boom', status: 500 }));
+    return;
+  }
+
+  const body = await readBody(req);
+  const loggedHeaders: Record<string, string> = {};
+  for (const [name, value] of Object.entries(req.headers)) {
+    if (typeof value === 'string') {
+      loggedHeaders[name.toLowerCase()] = value;
+    } else if (Array.isArray(value)) {
+      loggedHeaders[name.toLowerCase()] = value.join(',');
+    }
+  }
+  requestLog.push({
+    method,
+    url,
+    contentType: req.headers['content-type'],
+    body: body ? body.toString('utf8') : '',
+    headers: loggedHeaders,
+  });
+
+  try {
+    const response = await handler(toMockRequest(req, body));
+    res.writeHead(response.statusCode, response.headers ?? {});
+    res.end(response.body);
+  } catch (error) {
+    res.writeHead(500, { 'Content-Type': 'application/json; charset=utf-8' });
+    res.end(
+      JSON.stringify({
+        error: 'mock-server failed',
+        message: error instanceof Error ? error.message : String(error),
+      })
+    );
+  }
+});
+
+async function main(): Promise<void> {
+  handler = await createMockServer(SPEC_PATH);
+  server.listen(PORT, () => {
+    process.stdout.write(`READY ${PORT}\n`);
+  });
+}
+
+const shutdown = (): void => {
+  server.close(() => {
+    process.exit(0);
+  });
+};
+
+process.on('SIGTERM', shutdown);
+process.on('SIGINT', shutdown);
+
+main().catch((error) => {
+  process.stderr.write(
+    `cafe mock server failed to start: ${error instanceof Error ? (error.stack ?? error.message) : String(error)}\n`
+  );
+  process.exit(1);
+});
diff --git a/tests/e2e/generate-client/cafe-consumer/tsconfig.json b/tests/e2e/generate-client/cafe-consumer/tsconfig.json
new file mode 100644
index 0000000000..1b3492b511
--- /dev/null
+++ b/tests/e2e/generate-client/cafe-consumer/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "module": "node16",
+    "moduleResolution": "node16",
+    "target": "es2022",
+    "lib": ["ES2022", "DOM"],
+    "strict": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "types": ["node"]
+  },
+  "include": ["./**/*.ts"]
+}
diff --git a/tests/e2e/generate-client/cafe.snapshot.ts b/tests/e2e/generate-client/cafe.snapshot.ts
new file mode 100644
index 0000000000..dcb4900f7c
--- /dev/null
+++ b/tests/e2e/generate-client/cafe.snapshot.ts
@@ -0,0 +1,1513 @@
+// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Redocly Cafe (v1.0.0)
+ * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+ * Create API credentials and try it yourself in a realistic OpenAPI workflow.
+ * 
+ */
+
+export type Page = {
+    /**
+     * Use with the `after` query parameter to load the next page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    endCursor: string | null;
+    /**
+     * Use with the `before` query parameter to load the previous page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    startCursor: string | null;
+    /**
+     * Indicates if there is a next page with items.
+     */
+    hasNextPage: boolean;
+    /**
+     * Indicates if there is a previous page with items.
+     */
+    hasPrevPage: boolean;
+    /**
+     * Value showing how many items are in the page limit.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit: number;
+    /**
+     * Count of items across all pages.
+     * @minimum 0
+     */
+    total: number;
+};
+
+export type MenuBaseItem = {
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt: string;
+    /**
+     * Menu item ID. Unique identifier prefixed with `prd_`.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    readonly id: string;
+    /**
+     * Entity name.
+     */
+    readonly object: "menuItem";
+    /**
+     * Menu item name.
+     * @minLength 1
+     * @maxLength 50
+     */
+    name: string;
+    /**
+     * Price in cents.
+     * @minimum 0
+     */
+    price: number;
+    /**
+     * Photo of the menu item. Must be a PNG image and less than 1MB.
+     * @format binary
+     */
+    photo?: Blob | null;
+    /**
+     * Photo URL of the menu item.
+     * @format uri
+     */
+    readonly photoUrl?: string;
+    photoTextDescription?: string | null;
+};
+
+export type Beverage = {
+    /**
+     * Menu item category.
+     */
+    category: "beverage";
+    /**
+     * Size of the beverage in milliliters.
+     * @exclusiveMinimum 0
+     */
+    volume: number;
+    /**
+     * Indicates if the beverage contains caffeine.
+     */
+    containsCaffeine: boolean;
+} & MenuBaseItem;
+
+export type Dessert = {
+    /**
+     * Menu item category.
+     */
+    category: "dessert";
+    /**
+     * Amount of calories.
+     * @exclusiveMinimum 0
+     */
+    calories: number;
+} & MenuBaseItem;
+
+export type MenuItem = Beverage | Dessert;
+
+export type MenuItemList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: MenuItem[];
+};
+
+export type Error = {
+    /**
+     * URI reference that identifies the problem type.
+     * @format uri-reference
+     */
+    type: string;
+    /**
+     * Short summary of the problem type.
+     */
+    title: string;
+    /**
+     * HTTP status code generated by the origin server for this occurrence of the problem.
+     * @minimum 100
+     * @exclusiveMaximum 600
+     * @format int32
+     */
+    status: number;
+    /**
+     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+     * May be used to locate the root of this problem in the source code.
+     * @format uri-reference
+     */
+    instance?: string;
+    /**
+     * Additional error details.
+     */
+    details?: Record<string, unknown>;
+};
+
+/**
+ * Order status.
+ */
+export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
+
+export const OrderStatus = {
+    placed: "placed",
+    preparing: "preparing",
+    completed: "completed",
+    canceled: "canceled"
+} as const;
+
+export type Order = {
+    /**
+     * Order ID. Unique identifier prefixed with `ord_`.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     * @format ulid
+     */
+    readonly id?: string;
+    /**
+     * Entity name.
+     */
+    readonly object?: "order";
+    /**
+     * Name of the customer who placed the order.
+     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+     * @minLength 1
+     * @maxLength 100
+     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+     */
+    customerName: string;
+    readonly status?: OrderStatus;
+    /**
+     * Total order price in cents.
+     * @minimum 0
+     */
+    readonly totalPrice?: number;
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt?: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt?: string;
+    /**
+     * List of items to include in the order.
+     * @minItems 1
+     */
+    orderItems: {
+        /**
+         * ID of the menu item to add to the order.
+         * @format ulid
+         */
+        menuItemId: string;
+        /**
+         * Quantity of the menu item.
+         * @minimum 1
+         */
+        quantity: number;
+        /**
+         * Discount amount in cents (absolute value).
+         * @minimum 0
+         */
+        discount?: number;
+        /**
+         * Optional comment for the order item (e.g., "No sugar").
+         * @maxLength 500
+         */
+        comment?: string;
+    }[];
+};
+
+export type OrderList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: Order[];
+};
+
+export type OrderItem = {
+    /**
+     * ID of the menu item to add to the order.
+     */
+    menuItemId: string;
+    /**
+     * Menu item that is part of the order.
+     */
+    readonly menuItem?: MenuItem;
+    /**
+     * Quantity of the menu item.
+     * @minimum 1
+     */
+    quantity: number;
+    /**
+     * Discount amount in cents (absolute value).
+     * @minimum 0
+     */
+    discount?: number;
+    /**
+     * Optional comment for the order item (e.g., "No sugar").
+     * @maxLength 500
+     */
+    comment?: string;
+};
+
+/**
+ * Revenue statistics for a given date range.
+ */
+export type RevenueStatistics = {
+    /**
+     * Total revenue in cents from completed orders.
+     * @minimum 0
+     * @format float
+     */
+    revenue: number;
+    /**
+     * Average order amount in cents (calculated from completed orders only).
+     * @minimum 0
+     * @format float
+     */
+    averageOrderAmount: number;
+    /**
+     * Total number of orders (all statuses) in the date range.
+     * @minimum 0
+     */
+    totalOrders: number;
+    /**
+     * Number of placed orders.
+     * @minimum 0
+     */
+    placedOrders: number;
+    /**
+     * Number of preparing orders.
+     * @minimum 0
+     */
+    preparingOrders: number;
+    /**
+     * Number of completed orders.
+     * @minimum 0
+     */
+    completedOrders: number;
+    /**
+     * Number of canceled orders.
+     * @minimum 0
+     */
+    canceledOrders: number;
+    /**
+     * Start date of the revenue calculation period.
+     * @format date
+     */
+    startDate: string;
+    /**
+     * End date of the revenue calculation period.
+     * @format date
+     */
+    endDate: string;
+};
+
+export type RegisterClientObject = {
+    /**
+     * Client name.
+     */
+    name: string;
+    /**
+     * List of redirect URIs (optional, defaults to empty array).
+     */
+    redirectUris?: string[];
+    /**
+     * List of scopes.
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types.
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+/**
+ * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+ */
+export type OAuth2Client = {
+    /**
+     * Client identifier issued by the authorization server.
+     */
+    clientId: string;
+    /**
+     * Client secret issued by the authorization server.
+     */
+    clientSecret: string;
+    /**
+     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+     * @format int64
+     */
+    clientIdIssuedAt: number;
+    /**
+     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+     * @format int64
+     */
+    clientSecretExpiresAt: number;
+    /**
+     * Client name (registered metadata).
+     */
+    name?: string;
+    /**
+     * List of redirect URIs (registered metadata).
+     */
+    redirectUris?: string[];
+    /**
+     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
+     * @format uri
+     */
+    registrationClientUri: string;
+    /**
+     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+     */
+    registrationAccessToken: string;
+    /**
+     * List of scopes (registered metadata).
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types (registered metadata).
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+export type OrderNotification = {
+    /**
+     * Unique order identifier.
+     */
+    orderId: string;
+    orderStatus: OrderStatus;
+    /**
+     * When the event occurred.
+     * @format date-time
+     */
+    timestamp: string;
+};
+
+/**
+ * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
+ */
+export function isBeverage(value: MenuItem): value is Beverage {
+    return (value as Record<string, unknown>)["category"] === "beverage";
+}
+
+/**
+ * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
+ */
+export function isDessert(value: MenuItem): value is Dessert {
+    return (value as Record<string, unknown>)["category"] === "dessert";
+}
+
+/**
+ * Static metadata for every operation, keyed by operationId: the HTTP `method`
+ * and the `path` template (with `{param}` placeholders intact). Minification-safe
+ * — useful for building cache/query keys, tracing span names, and request logging
+ * without re-deriving them at each call site.
+ */
+export const OPERATIONS = {
+    listMenuItems: { method: "GET", path: "/menu" },
+    createMenuItem: { method: "POST", path: "/menu" },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
+    listOrders: { method: "GET", path: "/orders" },
+    createOrder: { method: "POST", path: "/orders" },
+    getOrderById: { method: "GET", path: "/orders/{orderId}" },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
+    listOrderItems: { method: "GET", path: "/order-items" },
+    getRevenue: { method: "GET", path: "/revenue" },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
+} as const;
+
+/**
+ * The operationId of any operation in this client.
+ */
+export type OperationId = keyof typeof OPERATIONS;
+
+/**
+ * Static metadata describing one operation: its HTTP method and path template.
+ */
+export type OperationMetadata = {
+    readonly method: string;
+    readonly path: string;
+};
+
+let BASE = "https://cafe.cloud.redocly.com";
+
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+export type RequestContext = {
+    url: string;
+    method: string;
+    headers: Record<string, string>;
+    body?: unknown;
+};
+
+/**
+ * Configuration and extension hooks for a client. Supplied per-instance via
+ * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
+ * (functions facade).
+ */
+export type ClientConfig = {
+    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    baseUrl?: string;
+    /** Extra headers merged into every request; a function is invoked per request. */
+    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+    /** Transport used to issue requests. Defaults to the global `fetch`. */
+    fetch?: typeof fetch;
+    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    /** Observe — or replace, by returning a `Response` — the response before parsing. */
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    /**
+     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
+     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
+     */
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
+    /**
+     * Composable interceptors run around every request, alongside the single
+     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
+     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
+     * the last-registered middleware wraps closest to the network. Register more at runtime
+     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
+     */
+    middleware?: Middleware[];
+    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
+    retry?: RetryConfig;
+    /**
+     * Per-instance auth credentials. When set, they override the module-global
+     * `set*` helpers for requests made through this config (each scheme falls back
+     * to its global slot when omitted here). Only the schemes an operation declares
+     * in its `security` are ever sent.
+     */
+    auth?: AuthCredentials;
+};
+
+/**
+ * A request interceptor; every field is optional, so a middleware can hook any subset of
+ * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
+ * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
+ * failure into the error to throw, threaded through each middleware in turn.
+ */
+export type Middleware = {
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/** Context handed to `retryOn` for the attempt that just failed. */
+export type RetryContext = {
+    /** 1-based number of the attempt that just failed. */
+    attempt: number;
+    /** The request that was attempted. */
+    request: RequestContext;
+    /** Present when the server returned a (non-ok) response. */
+    response?: Response;
+    /** Present when the transport threw (network error, DNS, connection reset). */
+    error?: unknown;
+};
+
+/** Retry policy; all fields optional with sensible defaults. */
+export type RetryConfig = {
+    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
+    retries?: number;
+    /** Base delay in milliseconds. Default 1000. */
+    retryDelay?: number;
+    /** Backoff shape. Default 'exponential'. */
+    retryStrategy?: RetryStrategy;
+    /** Apply full jitter over the computed delay. Default true. */
+    jitter?: boolean;
+    /**
+     * Decide whether to retry a failed attempt. Default: retry only idempotent
+     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
+     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
+     */
+    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
+};
+
+/**
+ * How the response body is read. `'auto'` negotiates from the content type (the
+ * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
+ */
+export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
+
+/**
+ * The trailing per-operation argument: standard `RequestInit` plus an optional
+ * per-call retry override and a `parseAs` escape hatch.
+ *
+ * `parseAs` forces how the response body is read; overrides the inferred kind.
+ * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
+ * override — the static return type is unchanged.
+ */
+export type RequestOptions = RequestInit & {
+    retry?: Partial<RetryConfig>;
+    parseAs?: ParseAs;
+};
+
+/**
+ * Override the base URL used by every generated operation. Useful when the
+ * runtime environment differs from the value declared in `servers[0].url`
+ * (e.g. dev / staging / prod toggles in a single-page app).
+ *
+ * Mutates a module-scoped binding shared by the functions facade. For multiple
+ * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ */
+export function setBaseUrl(url: string): void {
+    BASE = url;
+}
+
+/** The global config used by the functions facade (see `configure`). */
+const __config: ClientConfig = {};
+
+/**
+ * Merge `config` into the global configuration used by the functions facade —
+ * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
+ * hooks once for every free function. The service-class facade configures per
+ * instance instead (`new Client(config)`).
+ */
+export function configure(config: ClientConfig): void {
+    Object.assign(__config, config);
+}
+
+/**
+ * Append interceptors to the functions facade's global middleware chain (see
+ * `ClientConfig.middleware`). The service-class facade registers per instance via
+ * `<Client>.use(...)` instead.
+ */
+export function use(...middleware: Middleware[]): void {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    __config.middleware = [...(__config.middleware ?? []), ...middleware];
+}
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function __middleware(config: ClientConfig): Middleware[] {
+    const single = config.onRequest || config.onResponse || config.onError
+        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+        : [];
+    return [...single, ...(config.middleware ?? [])];
+}
+
+export class ApiError extends Error {
+    public readonly url: string;
+    public readonly status: number;
+    public readonly statusText: string;
+    public readonly body: unknown;
+    constructor(url: string, status: number, statusText: string, body: unknown) {
+        super(`Request failed with status ${status}`);
+        this.name = 'ApiError';
+        this.url = url;
+        this.status = status;
+        this.statusText = statusText;
+        this.body = body;
+    }
+}
+
+type QueryPrimitive = string | number | boolean;
+
+type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
+
+/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
+type QueryStyle = {
+    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+    explode: boolean;
+    allowReserved?: boolean;
+};
+
+/**
+ * Percent-encode `value` but leave the RFC-3986 reserved set
+ * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
+ */
+function __encodeReserved(value: string): string {
+    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
+}
+
+function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
+    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    if (!query)
+        return url;
+    const params = new URLSearchParams();
+    const raw: string[] = [];
+    for (const [key, value] of Object.entries(query)) {
+        if (value === undefined || value === null)
+            continue;
+        const spec = styles?.[key];
+        if (!spec) {
+            if (Array.isArray(value)) {
+                for (const v of value) {
+                    if (v !== undefined && v !== null)
+                        params.append(key, String(v));
+                }
+            }
+            else if (typeof value === 'object') {
+                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+                for (const [subKey, subValue] of Object.entries(value)) {
+                    if (subValue !== undefined && subValue !== null) {
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                    }
+                }
+            }
+            else {
+                params.append(key, String(value));
+            }
+            continue;
+        }
+        if (Array.isArray(value)) {
+            const items = value.filter((v) => v !== undefined && v !== null).map(String);
+            if (spec.style === 'form' && spec.explode) {
+                for (const v of items) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}=${__encodeReserved(v)}`);
+                    else
+                        params.append(key, v);
+                }
+            }
+            else {
+                // Delimited styles put the LITERAL delimiter on the wire; only the
+                // values are encoded. `%20` (not `+`) is the literal space delimiter.
+                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
+                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+            }
+        }
+        else if (typeof value === 'object') {
+            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+            for (const [subKey, subValue] of Object.entries(value)) {
+                if (subValue !== undefined && subValue !== null) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
+                    else
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                }
+            }
+        }
+        else if (spec.allowReserved) {
+            raw.push(`${key}=${__encodeReserved(String(value))}`);
+        }
+        else {
+            params.append(key, String(value));
+        }
+    }
+    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+    return qs ? `${url}?${qs}` : url;
+}
+
+async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+    response: Response;
+    context: RequestContext;
+}> {
+    const { retry: callRetry, ...fetchInit } = init;
+    const retry: RetryConfig = { ...config.retry, ...callRetry };
+    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+    const headers: Record<string, string> = {
+        Accept: 'application/json',
+        ...extra,
+        ...(fetchInit.headers as Record<string, string> | undefined),
+    };
+    let payload: BodyInit | undefined;
+    if (body !== undefined) {
+        const isBinary = body instanceof Blob ||
+            body instanceof ArrayBuffer ||
+            ArrayBuffer.isView(body as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
+        const isURLSearchParams = body instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
+            payload = body as BodyInit;
+        }
+        else {
+            payload = JSON.stringify(body);
+            if (!('Content-Type' in headers) && !('content-type' in headers)) {
+                headers['Content-Type'] = 'application/json';
+            }
+        }
+    }
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    const doFetch = config.fetch ?? fetch;
+    const maxAttempts = 1 + (retry.retries ?? 0);
+    const retryOn = retry.retryOn ?? __defaultRetryOn;
+    const signal = fetchInit.signal ?? undefined;
+    let attempt = 0;
+    while (true) {
+        attempt++;
+        if (signal?.aborted)
+            throw __abortError(signal);
+        let response: Response;
+        try {
+            response = await doFetch(context.url, {
+                ...fetchInit,
+                method: context.method,
+                headers: context.headers,
+                body: payload,
+            });
+        }
+        catch (error) {
+            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
+                await __sleep(__retryDelay(retry, attempt, null), signal);
+                continue;
+            }
+            throw error;
+        }
+        // Reverse order: the last-registered middleware wraps closest to the network (onion).
+        for (let i = middleware.length - 1; i >= 0; i--) {
+            const onResponse = middleware[i].onResponse;
+            if (onResponse) {
+                const replaced = await onResponse(response, context);
+                if (replaced)
+                    response = replaced;
+            }
+        }
+        if (!response.ok &&
+            attempt < maxAttempts &&
+            !signal?.aborted &&
+            (await retryOn({ attempt, request: context, response }))) {
+            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            continue;
+        }
+        return { response, context };
+    }
+}
+
+async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+    if (kind === 'void' || response.status === 204)
+        return undefined;
+    if (kind === 'stream')
+        return response.body;
+    if (kind === 'blob')
+        return response.blob();
+    if (kind === 'arrayBuffer')
+        return response.arrayBuffer();
+    if (kind === 'formData')
+        return response.formData();
+    if (kind === 'text')
+        return response.text();
+    if (kind === 'json')
+        return response.json();
+    // 'auto' — negotiate from the response's content type.
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json'))
+        return response.json();
+    if (contentType.startsWith('text/'))
+        return response.text();
+    return response.blob();
+}
+
+async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+    const { parseAs, ...sendInit } = init;
+    const { response, context } = await __send(config, url, sendInit, body);
+    if (!response.ok) {
+        const errorBody = await readError(response);
+        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
+        // Thread the error through each middleware's onError in turn (each may replace it).
+        for (const mw of __middleware(config)) {
+            if (mw.onError)
+                error = await mw.onError(error as ApiError, context);
+        }
+        throw error;
+    }
+    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
+    return (await __parse(response, kind)) as T;
+}
+
+async function readError(response: Response): Promise<unknown> {
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json')) {
+        return response.json().catch(() => undefined);
+    }
+    return response.text().catch(() => undefined);
+}
+
+const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+
+const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+function __defaultRetryOn(ctx: RetryContext): boolean {
+    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
+        return false;
+    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+    if (retryAfter) {
+        const seconds = Number(retryAfter);
+        if (!Number.isNaN(seconds))
+            return seconds * 1000;
+        const when = Date.parse(retryAfter);
+        if (!Number.isNaN(when))
+            return Math.max(0, when - Date.now());
+    }
+    const base = retry.retryDelay ?? 1000;
+    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+    return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
+    return new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject(__abortError(signal));
+            return;
+        }
+        const onAbort = () => {
+            clearTimeout(timer);
+            reject(__abortError(signal as AbortSignal));
+        };
+        const timer = setTimeout(() => {
+            if (signal)
+                signal.removeEventListener('abort', onAbort);
+            resolve();
+        }, ms);
+        if (signal)
+            signal.addEventListener('abort', onAbort, { once: true });
+    });
+}
+
+function __abortError(signal: AbortSignal): globalThis.Error {
+    const reason = (signal as {
+        reason?: unknown;
+    }).reason;
+    if (reason instanceof Error)
+        return reason;
+    return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * Normalize an operation's header-parameter object into a plain string record,
+ * dropping any `undefined` / `null` entries (optional headers the caller omitted)
+ * and stringifying the rest. Mirrors __buildUrl's handling of query values.
+ */
+function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
+    const out: Record<string, string> = {};
+    for (const [key, value] of Object.entries(values)) {
+        if (value !== undefined && value !== null)
+            out[key] = String(value);
+    }
+    return out;
+}
+
+/**
+ * A credential value, or a (possibly async) function that returns one per request.
+ */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/**
+ * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
+ * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
+ * to the global slots.
+ */
+export type AuthCredentials = {
+    bearer?: TokenProvider;
+    apiKey?: Record<string, TokenProvider>;
+};
+
+let __bearerToken: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
+ * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
+ * (possibly async) function resolved per request.
+ */
+export function setBearer(token: TokenProvider | null): void {
+    __bearerToken = token;
+}
+
+let __apiKey_ApiKey: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
+ * string or a (possibly async) function resolved per request.
+ */
+export function setApiKey(key: TokenProvider | null): void {
+    __apiKey_ApiKey = key;
+}
+
+/**
+ * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
+ */
+async function __resolve(slot: TokenProvider | null): Promise<string | null> {
+    if (slot === null)
+        return null;
+    return typeof slot === "function" ? slot() : slot;
+}
+
+/**
+ * Build the auth `headers` and `query` for an operation from the currently-set credentials.
+ * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
+ * can always override by passing their own `init.headers`.
+ */
+async function __auth(schemes: string[], config: ClientConfig): Promise<{
+    headers: Record<string, string>;
+    query: Record<string, string>;
+}> {
+    const headers: Record<string, string> = {};
+    const query: Record<string, string> = {};
+    const cookies: string[] = [];
+    for (const scheme of schemes) {
+        switch (scheme) {
+            case "OAuth2": {
+                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
+                if (v !== null)
+                    headers["Authorization"] = `Bearer ${v}`;
+                break;
+            }
+            case "ApiKey": {
+                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
+                if (v !== null)
+                    headers["X-API-Key"] = v;
+                break;
+            }
+        }
+    }
+    if (cookies.length > 0)
+        headers["Cookie"] = cookies.join("; ");
+    return { headers, query };
+}
+
+export type ListMenuItemsResult = MenuItemList;
+
+export type ListMenuItemsParams = {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+};
+
+export type ListMenuItemsVariables = {
+    params?: ListMenuItemsParams;
+};
+
+/**
+ * List all menu items
+ *
+ * Retrieve a collection of menu items with optional filtering and pagination.
+ */
+export async function listMenuItems(params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
+    return __request<MenuItemList>(__config, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
+}
+
+export type CreateMenuItemResult = MenuItem;
+
+export type CreateMenuItemBody = FormData;
+
+export type CreateMenuItemVariables = {
+    body: CreateMenuItemBody;
+};
+
+/**
+ * Create menu item
+ *
+ * Create a new menu item.
+ */
+export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<MenuItem>(__config, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type DeleteMenuItemResult = void;
+
+export type DeleteMenuItemVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+};
+
+/**
+ * Delete a menu item
+ *
+ * Delete an existing menu item.
+ */
+export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type GetMenuItemPhotoResult = Blob | string;
+
+export type GetMenuItemPhotoParams = {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+};
+
+export type GetMenuItemPhotoVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+    params?: GetMenuItemPhotoParams;
+};
+
+/**
+ * Retrieve a menu item photo
+ *
+ * Retrieve the product photo image for a specific menu item.
+ */
+export async function getMenuItemPhoto(menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}): Promise<Blob | string> {
+    return __request<Blob | string>(__config, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+}
+
+export type ListOrdersResult = OrderList;
+
+export type ListOrdersParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+};
+
+export type ListOrdersVariables = {
+    params?: ListOrdersParams;
+};
+
+/**
+ * List all orders
+ *
+ * Retrieve a collection of orders with optional filtering and pagination.
+ */
+export async function listOrders(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderList> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderList>(__config, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+/**
+ * Create order
+ *
+ * Create a new order.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    headers?: GetOrderByIdHeaders;
+};
+
+/**
+ * Retrieve an order
+ *
+ * Retrieve a single order by its ID.
+ */
+export async function getOrderById(orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+}
+
+export type DeleteOrderResult = void;
+
+export type DeleteOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+};
+
+/**
+ * Delete an order
+ *
+ * Delete the order.
+ * To keep the order history, the order should be canceled instead of deleted.
+ */
+export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type UpdateOrderResult = Order;
+
+export type UpdateOrderBody = {
+    status: OrderStatus;
+};
+
+export type UpdateOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    body?: UpdateOrderBody;
+};
+
+/**
+ * Partially update an order
+ *
+ * Update an existing order status.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function updateOrder(orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type ListOrderItemsResult = OrderItem[];
+
+export type ListOrderItemsParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+};
+
+export type ListOrderItemsVariables = {
+    params?: ListOrderItemsParams;
+};
+
+/**
+ * List all order items with menu item details
+ *
+ * Returns an array of order items for a specific order.
+ * Use the `filter` parameter to filter by order ID.
+ */
+export async function listOrderItems(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderItem[]>(__config, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+/**
+ * Get revenue statistics
+ *
+ * Retrieve revenue statistics for a configurable date range.
+ * Returns revenue, order counts, average order amount, and other useful statistics.
+ */
+export async function getRevenue(params: {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
+    const __a = await __auth(["ApiKey"], __config);
+    return __request<RevenueStatistics>(__config, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Create OAuth2 client
+ *
+ * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+ * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
+ *   `redirectUris` must be provided (per RFC 7591 Section 2).
+ * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+ * Returns the registered client information per RFC 7591, including:
+ * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+ */
+export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
+    return __request<OAuth2Client>(__config, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+}
diff --git a/tests/e2e/generate-client/cafe.test.ts b/tests/e2e/generate-client/cafe.test.ts
new file mode 100644
index 0000000000..2260e5a14a
--- /dev/null
+++ b/tests/e2e/generate-client/cafe.test.ts
@@ -0,0 +1,406 @@
+import { spawn, spawnSync, type ChildProcess } from 'node:child_process';
+import { existsSync, readFileSync, rmSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
+const fixture = join(__dirname, 'fixtures/cafe.yaml');
+const consumerDir = join(__dirname, 'cafe-consumer');
+const generatedFile = join(consumerDir, 'api.ts');
+const serverScript = join(consumerDir, 'server.ts');
+const indexScript = join(consumerDir, 'index.ts');
+const setBaseUrlScript = join(consumerDir, 'index-setbaseurl.ts');
+
+const SERVER_PORT = 3101;
+const SERVER_BASE = `http://127.0.0.1:${SERVER_PORT}`;
+
+async function waitForServerReady(timeoutMs: number): Promise<void> {
+  const deadline = Date.now() + timeoutMs;
+  let lastError: unknown;
+  while (Date.now() < deadline) {
+    try {
+      const response = await fetch(`${SERVER_BASE}/__test__/ready`);
+      if (response.ok) return;
+    } catch (error) {
+      lastError = error;
+    }
+    await new Promise((r) => setTimeout(r, 100));
+  }
+  throw new Error(
+    `Cafe mock server did not become ready within ${timeoutMs}ms: ${
+      lastError instanceof Error ? lastError.message : String(lastError)
+    }`
+  );
+}
+
+function killServer(server: ChildProcess): Promise<void> {
+  return new Promise((resolveFn) => {
+    if (!server.pid || server.exitCode !== null) {
+      resolveFn();
+      return;
+    }
+    const onExit = (): void => resolveFn();
+    server.once('exit', onExit);
+    server.kill('SIGTERM');
+    setTimeout(() => {
+      server.removeListener('exit', onExit);
+      if (server.exitCode === null) {
+        server.kill('SIGKILL');
+      }
+      resolveFn();
+    }, 2_000);
+  });
+}
+
+type LogEntry = {
+  method: string;
+  url: string;
+  contentType: string | undefined;
+  body: string;
+  headers: Record<string, string>;
+};
+type StepResult =
+  | { kind: 'ok'; name: string; data: unknown }
+  | { kind: 'err'; name: string; error: string };
+
+const snapshotFile = join(__dirname, 'cafe.snapshot.ts');
+
+describe('generate-client end-to-end (cafe.yaml)', () => {
+  let serverProcess: ChildProcess | undefined;
+  let results: StepResult[] = [];
+  let log: LogEntry[] = [];
+  /** Raw generator output — what the CLI emits from cafe.yaml without any overrides. */
+  let rawGenerated = '';
+  /** Generator output the consumer imports — same source, but BASE pinned at the mock via --base-url. */
+  let generated = '';
+
+  beforeAll(async () => {
+    if (existsSync(generatedFile)) {
+      rmSync(generatedFile, { force: true });
+    }
+
+    serverProcess = spawn('npx', ['tsx', serverScript], {
+      cwd: consumerDir,
+      env: { ...process.env, CAFE_SERVER_PORT: String(SERVER_PORT) },
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+
+    serverProcess.stderr?.on('data', (chunk: Buffer) => {
+      process.stderr.write(`[cafe-server stderr] ${chunk.toString()}`);
+    });
+
+    await waitForServerReady(15_000);
+
+    // First pass: capture the *canonical* output (spec-derived BASE) for the file snapshot.
+    // We don't keep this on disk — the consumer needs the mock-targeted variant.
+    const snapshotGen = spawnSync(
+      'node',
+      [cliEntry, 'generate-client', fixture, '--output', generatedFile],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    if (snapshotGen.status !== 0) {
+      throw new Error(`generate-client (snapshot pass) failed:\n${snapshotGen.stderr}`);
+    }
+    rawGenerated = readFileSync(generatedFile, 'utf-8');
+
+    // Second pass: regenerate with --base-url so the consumer's import targets the mock.
+    // This is the file the consumer actually loads — and replaces the old string-replace hack.
+    const consumerGen = spawnSync(
+      'node',
+      [cliEntry, 'generate-client', fixture, '--output', generatedFile, '--base-url', SERVER_BASE],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    if (consumerGen.status !== 0) {
+      throw new Error(`generate-client (consumer pass) failed:\n${consumerGen.stderr}`);
+    }
+    generated = readFileSync(generatedFile, 'utf-8');
+    if (!generated.includes(`let BASE = "${SERVER_BASE}"`)) {
+      throw new Error(`--base-url was not honoured; expected \`let BASE = "${SERVER_BASE}"\``);
+    }
+
+    // Type-check the consumer.
+    const tsc = spawnSync('npx', ['tsc', '--noEmit', '-p', consumerDir], {
+      encoding: 'utf-8',
+      cwd: repoRoot,
+    });
+    if (tsc.status !== 0) {
+      throw new Error(`tsc --noEmit failed:\nstdout:\n${tsc.stdout}\nstderr:\n${tsc.stderr}`);
+    }
+
+    // Run consumer.
+    const run = spawnSync('npx', ['tsx', indexScript], {
+      encoding: 'utf-8',
+      cwd: consumerDir,
+      env: { ...process.env, CAFE_BASE: SERVER_BASE },
+    });
+    if (run.status !== 0) {
+      throw new Error(`consumer failed:\nstdout:\n${run.stdout}\nstderr:\n${run.stderr}`);
+    }
+    results = JSON.parse(run.stdout.trim()) as StepResult[];
+
+    const logResponse = await fetch(`${SERVER_BASE}/__test__/log`);
+    log = (await logResponse.json()) as LogEntry[];
+  }, 120_000);
+
+  afterAll(async () => {
+    if (serverProcess) await killServer(serverProcess);
+  });
+
+  test('generated file matches the committed snapshot (cafe.snapshot.ts)', async () => {
+    // Full-file guard against accidental emitter regressions. The PR diff against this
+    // snapshot is the single most informative signal when the IR builder or emitter changes.
+    // After an intentional emitter change, regenerate with: `npm run e2e -- -u`.
+    await expect(rawGenerated).toMatchFileSnapshot(snapshotFile);
+  });
+
+  test('generated file contains expected named types', () => {
+    expect(generated).toContain('export type MenuItem = Beverage | Dessert;');
+    expect(generated).toContain('export type Beverage = {');
+    expect(generated).toContain('} & MenuBaseItem;');
+    expect(generated).toContain(
+      'export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";'
+    );
+    expect(generated).toContain('export type MenuItemList = {');
+    expect(generated).toContain('export type OrderList = {');
+    expect(generated).toContain('export type RevenueStatistics = {');
+    expect(generated).toContain('export type OAuth2Client = {');
+  });
+
+  test('generated file declares one function per operation', () => {
+    const expected = [
+      'listMenuItems',
+      'createMenuItem',
+      'deleteMenuItem',
+      'getMenuItemPhoto',
+      'listOrders',
+      'createOrder',
+      'getOrderById',
+      'updateOrder',
+      'deleteOrder',
+      'listOrderItems',
+      'getRevenue',
+      'registerOAuth2Client',
+    ];
+    for (const name of expected) {
+      expect(generated).toContain(`export async function ${name}`);
+    }
+  });
+
+  test('exports an OPERATIONS metadata map keyed by operationId (method + path template)', () => {
+    expect(generated).toContain('export const OPERATIONS = {');
+    expect(generated).toContain('} as const;');
+    expect(generated).toContain('export type OperationId = keyof typeof OPERATIONS;');
+    expect(generated).toMatch(
+      /export type OperationMetadata = \{\s*readonly method: string;\s*readonly path: string;\s*\};/
+    );
+    // A path-param operation keeps its `{param}` template and uppercased method.
+    expect(generated).toContain('getOrderById: { method: "GET", path: "/orders/{orderId}" }');
+    expect(generated).toContain('updateOrder: { method: "PATCH", path: "/orders/{orderId}" }');
+    expect(generated).toContain('createOrder: { method: "POST", path: "/orders" }');
+  });
+
+  test('generated file uses ergonomic signatures (positional path params + params object + body)', () => {
+    expect(generated).toContain('export async function deleteMenuItem(menuItemId: string,');
+    expect(generated).toContain('export async function getMenuItemPhoto(menuItemId: string,');
+    expect(generated).toContain('export async function updateOrder(orderId: string,');
+    expect(generated).toContain('export async function listMenuItems(params:');
+    // readOnly fields are dropped from the create body (Bucket C).
+    expect(generated).toContain(
+      'export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">,'
+    );
+    expect(generated).toContain('export async function createMenuItem(body: FormData,');
+  });
+
+  // Named string enums get a runtime const-object companion by default, which the
+  // consumer uses (`OrderStatus.completed`) when updating an order.
+  test('emits a const-object companion for the OrderStatus string enum', () => {
+    expect(generated).toContain('export type OrderStatus =');
+    expect(generated).toContain('export const OrderStatus = {');
+    expect(generated).toContain('  completed: "completed",');
+    expect(generated).toContain('} as const;');
+  });
+
+  test('every consumer step succeeds', () => {
+    const failures = results.filter((r) => r.kind === 'err');
+    expect(failures, JSON.stringify(failures, null, 2)).toEqual([]);
+  });
+
+  test('listMenuItems serialises the query string with after/limit/sort/search', () => {
+    const entry = log.find((e) => e.method === 'GET' && e.url.startsWith('/menu?'));
+    expect(entry).toBeDefined();
+    expect(entry!.url).toContain('after=cursor1');
+    expect(entry!.url).toContain('limit=5');
+    expect(entry!.url).toContain('sort=-name');
+    expect(entry!.url).toContain('search=coffee');
+  });
+
+  test('createMenuItem POSTs multipart/form-data with the provided FormData', () => {
+    const entry = log.find((e) => e.method === 'POST' && e.url === '/menu');
+    expect(entry).toBeDefined();
+    expect(entry!.contentType).toMatch(/^multipart\/form-data; boundary=/);
+    expect(entry!.body).toContain('name="name"');
+    expect(entry!.body).toContain('Latte');
+  });
+
+  test('deleteMenuItem sends DELETE on the path-templated URL', () => {
+    const entry = log.find(
+      (e) => e.method === 'DELETE' && e.url === '/menu/prd_01h1s5z6vf2mm1mz3hevnn9va7'
+    );
+    expect(entry).toBeDefined();
+  });
+
+  test('getMenuItemPhoto reads a binary response as Blob', () => {
+    const photoStep = results.find((r) => r.name === 'getMenuItemPhoto');
+    expect(photoStep?.kind).toBe('ok');
+    if (photoStep?.kind === 'ok') {
+      // The mock server generates the body from the OpenAPI spec. The exact size
+      // and MIME depend on sampler internals (mock-server's supported-media-type
+      // allowlist may pick text/plain over image/png), so we assert only on the
+      // contract that matters here: the binary path returns a non-empty Blob.
+      const data = photoStep.data as {
+        kind: string;
+        size: number;
+        type: string;
+      };
+      expect(data.kind).toBe('blob');
+      expect(data.size).toBeGreaterThan(0);
+    }
+  });
+
+  test('createOrder POSTs JSON body with Content-Type: application/json', () => {
+    const entry = log.find((e) => e.method === 'POST' && e.url === '/orders');
+    expect(entry).toBeDefined();
+    expect(entry!.contentType).toMatch(/^application\/json/);
+    const parsed = JSON.parse(entry!.body) as { customerName: string };
+    expect(parsed.customerName).toBe('Ada Lovelace');
+  });
+
+  test('updateOrder PATCHes the URL and forwards the JSON body', () => {
+    const entry = log.find(
+      (e) => e.method === 'PATCH' && e.url === '/orders/ord_01h1s5z6vf2mm1mz3hevnn9va7'
+    );
+    expect(entry).toBeDefined();
+    const parsed = JSON.parse(entry!.body) as { status: string };
+    expect(parsed.status).toBe('completed');
+  });
+
+  // getOrderById declares an optional `X-Request-Id` header param; the consumer
+  // supplies it, and it must reach the server as a real request header.
+  test('getOrderById sends the X-Request-Id operation header parameter', () => {
+    const entry = log.find(
+      (e) => e.method === 'GET' && e.url === '/orders/ord_01h1s5z6vf2mm1mz3hevnn9va7'
+    );
+    expect(entry).toBeDefined();
+    expect(entry!.headers['x-request-id']).toBe('11111111-2222-3333-4444-555555555555');
+  });
+
+  // The consumer calls setBearer()/setApiKey() once; every OAuth2 operation must
+  // then carry the bearer header, every ApiKey operation the X-API-Key header,
+  // and `security: []` operations neither.
+  test('setBearer() injects Authorization on OAuth2 operations (getOrderById)', () => {
+    const entry = log.find(
+      (e) => e.method === 'GET' && e.url === '/orders/ord_01h1s5z6vf2mm1mz3hevnn9va7'
+    );
+    expect(entry).toBeDefined();
+    expect(entry!.headers['authorization']).toBe('Bearer test-bearer-token');
+  });
+
+  test('setApiKey() injects X-API-Key on ApiKey operations (getRevenue)', () => {
+    const entry = log.find((e) => e.method === 'GET' && e.url.startsWith('/revenue'));
+    expect(entry).toBeDefined();
+    expect(entry!.headers['x-api-key']).toBe('test-api-key');
+  });
+
+  test('operations declared security: [] send no credentials (listMenuItems)', () => {
+    const entry = log.find((e) => e.method === 'GET' && e.url.startsWith('/menu?'));
+    expect(entry).toBeDefined();
+    expect(entry!.headers['authorization']).toBeUndefined();
+    expect(entry!.headers['x-api-key']).toBeUndefined();
+  });
+
+  // The discriminated-union type guards must agree with the raw `category`
+  // discriminant and be mutually exclusive.
+  test('isBeverage/isDessert narrow a MenuItem from the server response', () => {
+    const step = results.find((r) => r.name === 'menuItemGuards');
+    expect(step?.kind).toBe('ok');
+    if (step?.kind === 'ok') {
+      const data = step.data as {
+        category: string;
+        isBeverage: boolean;
+        isDessert: boolean;
+        agree: boolean;
+        exclusive: boolean;
+      };
+      expect(data.agree).toBe(true);
+      expect(data.exclusive).toBe(true);
+    }
+  });
+
+  test('204 No Content paths return void (deleteOrder)', () => {
+    const step = results.find((r) => r.name === 'deleteOrder');
+    expect(step?.kind).toBe('ok');
+    if (step?.kind === 'ok') expect(step.data).toBeUndefined();
+  });
+
+  test('listOrderItems serialises query filter and returns an array', () => {
+    const entry = log.find((e) => e.method === 'GET' && e.url.startsWith('/order-items'));
+    expect(entry).toBeDefined();
+    expect(entry!.url).toContain('filter=orderId%3Aord_01h1s5z6vf2mm1mz3hevnn9va7');
+    const step = results.find((r) => r.name === 'listOrderItems');
+    expect(step?.kind).toBe('ok');
+    if (step?.kind === 'ok') expect(Array.isArray(step.data)).toBe(true);
+  });
+
+  test('getRevenue serialises ISO date strings as query params', () => {
+    const entry = log.find((e) => e.method === 'GET' && e.url.startsWith('/revenue?'));
+    expect(entry).toBeDefined();
+    expect(entry!.url).toContain('startDate=2026-01-01');
+    expect(entry!.url).toContain('endDate=2026-01-31');
+  });
+
+  test('registerOAuth2Client posts JSON arrays correctly', () => {
+    const entry = log.find((e) => e.method === 'POST' && e.url === '/oauth2/register');
+    expect(entry).toBeDefined();
+    const parsed = JSON.parse(entry!.body) as {
+      scopes: string[];
+      grantTypes: string[];
+      name: string;
+    };
+    expect(parsed.name).toBe('demo-client');
+    expect(parsed.scopes).toEqual(['menu:read', 'orders:read']);
+    expect(parsed.grantTypes).toEqual(['client_credentials']);
+  });
+
+  test('ApiError is thrown for non-2xx responses with parsed JSON body', () => {
+    const step = results.find((r) => r.name === 'error-path');
+    expect(step?.kind).toBe('ok');
+    if (step?.kind === 'ok') {
+      expect(step.data).toEqual({
+        apiError: true,
+        status: 500,
+        statusText: 'Internal Server Error',
+      });
+    }
+  });
+
+  // `setBaseUrl()` is exercised mid-flight: the first call hits the mock, the
+  // second (after flipping to an unreachable host) fails to connect, and the
+  // third (after restoring) succeeds again.
+  test('setBaseUrl() switches the BASE binding for subsequent operations', () => {
+    const run = spawnSync('npx', ['tsx', setBaseUrlScript], {
+      encoding: 'utf-8',
+      cwd: consumerDir,
+      env: { ...process.env, CAFE_BASE: SERVER_BASE },
+    });
+    expect(run.status, `setBaseUrl consumer stderr:\n${run.stderr}`).toBe(0);
+    const steps = JSON.parse(run.stdout.trim()) as Array<
+      { kind: 'ok'; name: string } | { kind: 'err'; name: string; error: string }
+    >;
+    expect(steps.find((s) => s.name === 'initial-call-against-mock')?.kind).toBe('ok');
+    const flipped = steps.find((s) => s.name === 'call-after-setBaseUrl-to-unreachable');
+    expect(flipped?.kind).toBe('err');
+    expect(steps.find((s) => s.name === 'call-after-setBaseUrl-restored')?.kind).toBe('ok');
+  });
+});
diff --git a/tests/e2e/generate-client/config-file.test.ts b/tests/e2e/generate-client/config-file.test.ts
new file mode 100644
index 0000000000..cee1d1ef16
--- /dev/null
+++ b/tests/e2e/generate-client/config-file.test.ts
@@ -0,0 +1,56 @@
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const fixture = join(__dirname, 'fixtures/base.yaml');
+
+describe('generate-client config file', () => {
+  let dir = '';
+  beforeAll(() => {
+    dir = mkdtempSync(join(tmpdir(), 'ots-cfgfile-'));
+  });
+  afterAll(() => rmSync(dir, { recursive: true, force: true }));
+
+  it('reads input/output from a .mjs config file', () => {
+    const out = join(dir, 'client.ts');
+    const cfg = join(dir, 'gen.config.mjs');
+    writeFileSync(
+      cfg,
+      `export default { input: ${JSON.stringify(fixture)}, output: ${JSON.stringify(out)} };\n`,
+      'utf-8'
+    );
+    const res = spawnSync('node', [cli, 'generate-client', '--config-file', cfg], {
+      encoding: 'utf-8',
+      cwd: repoRoot,
+    });
+    expect(res.status, res.stderr).toBe(0);
+    expect(existsSync(out)).toBe(true);
+    expect(readFileSync(out, 'utf-8')).toContain('export async function getPetById');
+  }, 30_000);
+
+  it('honors a config-file value for a CLI-defaulted option (no flag clobbering)', () => {
+    // `outputMode: 'split'` from the file must produce multiple files even though no
+    // `--output-mode` flag is passed — i.e. the CLI must NOT inject a default that
+    // overrides the config file. Single mode would emit just the one anchor file.
+    const out = join(dir, 'split/client.ts');
+    const cfg = join(dir, 'split.config.mjs');
+    writeFileSync(
+      cfg,
+      `export default { input: ${JSON.stringify(fixture)}, output: ${JSON.stringify(out)}, outputMode: 'split' };\n`,
+      'utf-8'
+    );
+    const res = spawnSync('node', [cli, 'generate-client', '--config-file', cfg], {
+      encoding: 'utf-8',
+      cwd: repoRoot,
+    });
+    expect(res.status, res.stderr).toBe(0);
+    // split mode emits sibling .http.ts and .schemas.ts next to the entry.
+    expect(existsSync(join(dir, 'split/client.http.ts'))).toBe(true);
+    expect(existsSync(join(dir, 'split/client.schemas.ts'))).toBe(true);
+  }, 30_000);
+});
diff --git a/tests/e2e/generate-client/error-mode.test.ts b/tests/e2e/generate-client/error-mode.test.ts
new file mode 100644
index 0000000000..0d0d5f28dd
--- /dev/null
+++ b/tests/e2e/generate-client/error-mode.test.ts
@@ -0,0 +1,150 @@
+// e2e for `--error-mode result`: the result-shape / typed-errors client.
+//
+// We assert on the generated source (string checks) and strict-tsc the output
+// (single-file and the whole tags-split dir) — this is the same lightweight
+// harness used by spec-versions.test.ts. We deliberately do NOT spin up the
+// mock-server behavioral harness (base.test.ts / cafe.test.ts), which needs a
+// dedicated consumer dir with server.ts/index.ts: strict tsc over the
+// discriminated `Result<TData, TError>` already proves the typed `error` flows
+// through, and the behavioral retry/abort path is shared (`__send`) and covered
+// by the existing throw-mode base e2e. The tags-split case guards the Task-4
+// fix that multi-file modes call `__requestResult` (not `__request`).
+import { spawnSync } from 'node:child_process';
+import {
+  existsSync,
+  mkdtempSync,
+  readdirSync,
+  readFileSync,
+  rmSync,
+  statSync,
+  writeFileSync,
+} from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+
+const TSCONFIG = {
+  compilerOptions: {
+    module: 'node16',
+    moduleResolution: 'node16',
+    target: 'es2022',
+    lib: ['ES2022', 'DOM'],
+    strict: true,
+    noEmit: true,
+    skipLibCheck: true,
+    types: [],
+  },
+};
+
+/** Recursively collect every generated `.ts` file under `dir`. */
+function collectTsFiles(dir: string): string[] {
+  const out: string[] = [];
+  for (const entry of readdirSync(dir)) {
+    const full = join(dir, entry);
+    if (statSync(full).isDirectory()) out.push(...collectTsFiles(full));
+    else if (entry.endsWith('.ts')) out.push(full);
+  }
+  return out;
+}
+
+describe('generate-client error mode', () => {
+  it('single-file result mode: typed error alias + Result terminal, strict tsc passes', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-errmode-single-'));
+    const out = join(dir, 'client.ts');
+    const res = spawnSync(
+      'node',
+      [
+        cli,
+        'generate-client',
+        join(__dirname, 'fixtures', 'error-mode.yaml'),
+        '--output',
+        out,
+        '--error-mode',
+        'result',
+      ],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(res.status, res.stderr).toBe(0);
+    expect(existsSync(out)).toBe(true);
+
+    const generated = readFileSync(out, 'utf-8');
+    expect(generated).toContain('export async function getThing');
+    expect(generated).toContain('Promise<Result<');
+    expect(generated).toContain('export type GetThingError = ProblemDetails;');
+    expect(generated).toContain('__requestResult');
+
+    writeFileSync(
+      join(dir, 'tsconfig.json'),
+      JSON.stringify({ ...TSCONFIG, include: ['client.ts'] }),
+      'utf-8'
+    );
+    const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
+    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('tags-split result mode: per-tag endpoints call __requestResult, strict tsc passes over the dir', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-errmode-split-'));
+    // Multi-file modes take a `.ts` entry path; per-tag dirs are written beside it.
+    const entry = join(dir, 'client.ts');
+    const res = spawnSync(
+      'node',
+      [
+        cli,
+        'generate-client',
+        join(__dirname, 'fixtures', 'error-mode.yaml'),
+        '--output',
+        entry,
+        '--error-mode',
+        'result',
+        '--output-mode',
+        'tags-split',
+      ],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(res.status, res.stderr).toBe(0);
+    expect(existsSync(entry)).toBe(true);
+
+    const files = collectTsFiles(dir);
+    const contents = files.map((f) => ({ f, src: readFileSync(f, 'utf-8') }));
+
+    // The endpoint call site must use the result terminal in multi-file modes
+    // (Task-4 fix) — at least one file calls `__requestResult`, and no file
+    // contains a bare throw-mode `__request<` call.
+    expect(contents.some(({ src }) => src.includes('__requestResult'))).toBe(true);
+    for (const { f, src } of contents) {
+      // `__requestResult<` is fine; a bare throw-mode `__request<` is not.
+      expect(
+        /__request</.test(src.replace(/__requestResult/g, '')),
+        `bare __request< in ${f}`
+      ).toBe(false);
+    }
+
+    // Strict tsc over the whole tree (bundler resolution handles the `.js` ESM imports).
+    const tsc = spawnSync(
+      tscBin,
+      [
+        '--noEmit',
+        '--strict',
+        '--noUnusedLocals',
+        '--target',
+        'ES2020',
+        '--module',
+        'esnext',
+        '--moduleResolution',
+        'bundler',
+        '--lib',
+        'ES2020,DOM',
+        ...files,
+      ],
+      { encoding: 'utf-8', cwd: dir }
+    );
+    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/extension.test.ts b/tests/e2e/generate-client/extension.test.ts
new file mode 100644
index 0000000000..f580591541
--- /dev/null
+++ b/tests/e2e/generate-client/extension.test.ts
@@ -0,0 +1,170 @@
+/**
+ * Behavioral e2e for the extension contract (D3). Rather than a live server, we
+ * inject a fake `fetch` via `configure()` / `new Client(config)` and capture what
+ * the generated runtime actually produced — proving that `baseUrl`, `config.headers`,
+ * `onRequest`, transport-swap, and per-instance config observably take effect.
+ */
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
+const fixture = join(__dirname, 'fixtures/base.yaml');
+const tsxBin = join(repoRoot, 'node_modules/.bin/tsx');
+
+function generate(dir: string, extraArgs: string[] = []): void {
+  // Mark the temp dir as ESM so tsx runs the consumer with top-level await support.
+  writeFileSync(join(dir, 'package.json'), JSON.stringify({ type: 'module' }), 'utf-8');
+  const out = join(dir, 'client.ts');
+  const result = spawnSync(
+    'node',
+    [cliEntry, 'generate-client', fixture, '--output', out, ...extraArgs],
+    { encoding: 'utf-8', cwd: repoRoot }
+  );
+  if (result.status !== 0) throw new Error(`generate-client failed:\n${result.stderr}`);
+}
+
+function runConsumer(dir: string, script: string): unknown {
+  writeFileSync(join(dir, 'consumer.ts'), script, 'utf-8');
+  const result = spawnSync(tsxBin, [join(dir, 'consumer.ts')], {
+    encoding: 'utf-8',
+    cwd: repoRoot,
+  });
+  if (result.status !== 0) {
+    throw new Error(`consumer failed:\nstdout:\n${result.stdout}\nstderr:\n${result.stderr}`);
+  }
+  return JSON.parse(result.stdout.trim());
+}
+
+describe('extension contract — functions facade (configure)', () => {
+  let dir = '';
+  beforeAll(() => {
+    dir = mkdtempSync(join(tmpdir(), 'ext-fn-'));
+    generate(dir);
+  }, 60_000);
+  afterAll(() => {
+    if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
+  });
+
+  test('configure() applies baseUrl, config.headers, onRequest, and the fetch transport-swap', () => {
+    const captured = runConsumer(
+      dir,
+      `
+import { configure, listPets } from './client.ts';
+
+const seen: { url?: string; headers?: Record<string, string> } = {};
+configure({
+  baseUrl: 'https://configured.example',
+  headers: { 'X-Tenant': 'acme' },
+  onRequest: (ctx) => { ctx.headers['X-Trace'] = 'trace-123'; },
+  fetch: (async (url: string, init: RequestInit) => {
+    seen.url = String(url);
+    seen.headers = init.headers as Record<string, string>;
+    return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
+  }) as unknown as typeof fetch,
+});
+
+await listPets();
+console.log(JSON.stringify(seen));
+`
+    ) as { url: string; headers: Record<string, string> };
+
+    // baseUrl override was honored (not the spec's localhost:3102).
+    expect(captured.url).toBe('https://configured.example/pets');
+    // The fake fetch was actually used, and both config.headers + onRequest applied.
+    expect(captured.headers['X-Tenant']).toBe('acme');
+    expect(captured.headers['X-Trace']).toBe('trace-123');
+  }, 60_000);
+
+  test('onError maps a failed request to a custom error', () => {
+    const result = runConsumer(
+      dir,
+      `
+import { configure, getPetById, ApiError } from './client.ts';
+
+class NotFound extends Error {}
+configure({
+  fetch: (async () =>
+    new Response('{"detail":"nope"}', { status: 404, headers: { 'content-type': 'application/json' } })) as unknown as typeof fetch,
+  onError: (error: ApiError) => new NotFound('mapped:' + error.status),
+});
+
+try {
+  await getPetById(1);
+  console.log(JSON.stringify({ threw: false }));
+} catch (e) {
+  console.log(JSON.stringify({ threw: true, name: (e as Error).constructor.name, message: (e as Error).message }));
+}
+`
+    ) as { threw: boolean; name: string; message: string };
+
+    expect(result.threw).toBe(true);
+    expect(result.name).toBe('NotFound');
+    expect(result.message).toBe('mapped:404');
+  }, 60_000);
+});
+
+describe('extension contract — service-class facade (per-instance config)', () => {
+  let dir = '';
+  beforeAll(() => {
+    dir = mkdtempSync(join(tmpdir(), 'ext-sc-'));
+    generate(dir, ['--facade', 'service-class', '--name', 'PetClient']);
+  }, 60_000);
+  afterAll(() => {
+    if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
+  });
+
+  test('two instances carry independent baseUrl + headers (multi-tenant isolation)', () => {
+    const calls = runConsumer(
+      dir,
+      `
+import { PetClient } from './client.ts';
+
+const calls: Array<{ tag: string; url: string; tenant: string }> = [];
+const make = (tag: string) =>
+  (async (url: string, init: RequestInit) => {
+    const headers = init.headers as Record<string, string>;
+    calls.push({ tag, url: String(url), tenant: headers['X-Tenant'] });
+    return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
+  }) as unknown as typeof fetch;
+
+const a = new PetClient({ baseUrl: 'https://a.example', headers: { 'X-Tenant': 'A' }, fetch: make('a') });
+const b = new PetClient({ baseUrl: 'https://b.example', headers: { 'X-Tenant': 'B' }, fetch: make('b') });
+
+await a.listPets();
+await b.listPets();
+console.log(JSON.stringify(calls));
+`
+    ) as Array<{ tag: string; url: string; tenant: string }>;
+
+    expect(calls).toHaveLength(2);
+    expect(calls[0]).toEqual({ tag: 'a', url: 'https://a.example/pets', tenant: 'A' });
+    expect(calls[1]).toEqual({ tag: 'b', url: 'https://b.example/pets', tenant: 'B' });
+  }, 60_000);
+
+  test('an instance with no config falls back to the spec-derived BASE', () => {
+    const seen = runConsumer(
+      dir,
+      `
+import { PetClient } from './client.ts';
+
+let captured = '';
+const client = new PetClient({
+  fetch: (async (url: string) => {
+    captured = String(url);
+    return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
+  }) as unknown as typeof fetch,
+});
+await client.listPets();
+console.log(JSON.stringify({ captured }));
+`
+    ) as { captured: string };
+
+    // No baseUrl in config → falls back to the inlined BASE from base.yaml.
+    expect(seen.captured).toBe('http://localhost:3102/pets');
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/fixtures/auth.yaml b/tests/e2e/generate-client/fixtures/auth.yaml
new file mode 100644
index 0000000000..c1f2c73d60
--- /dev/null
+++ b/tests/e2e/generate-client/fixtures/auth.yaml
@@ -0,0 +1,75 @@
+openapi: 3.0.3
+info: { title: Auth Breadth API, version: 1.0.0 }
+servers:
+  - { url: https://api.example.com }
+paths:
+  /bearer:
+    get:
+      operationId: getBearer
+      security:
+        - Bearer: []
+      responses:
+        '200':
+          description: ok
+          content:
+            application/json:
+              schema: { $ref: '#/components/schemas/Thing' }
+  /basic:
+    get:
+      operationId: getBasic
+      security:
+        - Basic: []
+      responses:
+        '200':
+          description: ok
+          content:
+            application/json:
+              schema: { $ref: '#/components/schemas/Thing' }
+  /query:
+    get:
+      operationId: getQuery
+      parameters:
+        - { name: limit, in: query, schema: { type: integer } }
+      security:
+        - QueryKey: []
+      responses:
+        '200':
+          description: ok
+          content:
+            application/json:
+              schema: { $ref: '#/components/schemas/Thing' }
+  /cookie:
+    get:
+      operationId: getCookie
+      security:
+        - CookieKey: []
+      responses:
+        '200':
+          description: ok
+          content:
+            application/json:
+              schema: { $ref: '#/components/schemas/Thing' }
+  /header:
+    get:
+      operationId: getHeader
+      security:
+        - HeaderKey: []
+      responses:
+        '200':
+          description: ok
+          content:
+            application/json:
+              schema: { $ref: '#/components/schemas/Thing' }
+components:
+  securitySchemes:
+    Bearer: { type: http, scheme: bearer }
+    Basic: { type: http, scheme: basic }
+    QueryKey: { type: apiKey, in: query, name: api_key }
+    CookieKey: { type: apiKey, in: cookie, name: sid }
+    HeaderKey: { type: apiKey, in: header, name: X-Key }
+  schemas:
+    Thing:
+      type: object
+      required: [id]
+      properties:
+        id: { type: string }
diff --git a/tests/e2e/generate-client/fixtures/base.yaml b/tests/e2e/generate-client/fixtures/base.yaml
new file mode 100644
index 0000000000..5d4d8ab2c6
--- /dev/null
+++ b/tests/e2e/generate-client/fixtures/base.yaml
@@ -0,0 +1,234 @@
+openapi: 3.1.0
+info:
+  title: Base Consumer
+  version: 1.0.0
+  description: |
+    Minimal spec that exercises core runtime behavior (real call, cancellation)
+    plus edge cases discovered against the real Redocly API (reunite.yaml):
+    OAS 3.1 `enum` containing `null`, and `style: deepObject` object query params.
+servers:
+  - url: http://localhost:3102
+paths:
+  /pets/{id}:
+    get:
+      operationId: getPetById
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: A single pet.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Pet'
+  /pets:
+    get:
+      operationId: listPets
+      parameters:
+        - name: filter
+          in: query
+          required: false
+          style: deepObject
+          explode: true
+          description: Object-valued filter serialized as deepObject.
+          schema:
+            $ref: '#/components/schemas/PetFilter'
+      responses:
+        '200':
+          description: A list of pets.
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Pet'
+    post:
+      operationId: createPet
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Pet'
+      responses:
+        '201':
+          description: The created pet.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Pet'
+  /pets/{id}/cancel-test:
+    get:
+      operationId: getSlowPet
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: A slow response (used to exercise cancellation).
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Pet'
+  /search:
+    post:
+      operationId: search
+      description: |
+        Name-collision regression: `operationId: search` makes the result alias name
+        match the SearchResult schema it returns. The generator must not emit a circular
+        self-referential alias (TS2440/TS2308 in multi-file output).
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/PetFilter'
+      responses:
+        '200':
+          description: Search results.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/SearchResult'
+  /pets/bulk:
+    post:
+      operationId: bulkUpsertPets
+      description: |
+        The 200 body is an array whose items are an *inline* discriminated union
+        (`status`). The generator must emit `is<Member>` guards for that nested
+        union, narrowing the items to the named member types.
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: array
+              items:
+                $ref: '#/components/schemas/Pet'
+      responses:
+        '200':
+          description: Per-item results.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/PetBulkResult'
+  /status:
+    get:
+      operationId: getStatus
+      description: |
+        Name-collision regression (non-self-referential): operationId `getStatus` derives a
+        result alias whose name also exists as an unrelated schema below. The generator must
+        suppress the operation result alias so the two don't both declare the same type name
+        (a duplicate-identifier error).
+      responses:
+        '200':
+          description: ok
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Pet'
+components:
+  schemas:
+    Pet:
+      type: object
+      required: [name]
+      properties:
+        id:
+          description: Server-assigned id; readOnly, so it is dropped from request bodies.
+          type: integer
+          readOnly: true
+        name:
+          type: string
+        status:
+          description: Lifecycle status; OAS 3.1 enum that includes null.
+          type:
+            - string
+            - 'null'
+          enum:
+            - available
+            - pending
+            - sold
+            - null
+        metadata:
+          description: Free-form object (no declared properties) — a record of unknown, not `{}`.
+          type: object
+        owner:
+          description: oneOf with an empty branch — must stay `string`, not collapse to `unknown`.
+          oneOf:
+            - type: string
+            - {}
+        deletedAt:
+          description: OAS 3.1 single null type — must render as `null`, not `unknown`.
+          type: 'null'
+    PetBulkSuccessItem:
+      description: Discriminated-union member (status=ok) — a nested-union guard target.
+      type: object
+      required: [status, resource]
+      properties:
+        status:
+          type: string
+          const: ok
+        resource:
+          $ref: '#/components/schemas/Pet'
+    PetBulkErrorItem:
+      description: Discriminated-union member (status=error).
+      type: object
+      required: [status, error]
+      properties:
+        status:
+          type: string
+          const: error
+        error:
+          type: string
+    PetBulkResult:
+      description: Array of an inline discriminated union — guards must narrow the items.
+      type: array
+      items:
+        oneOf:
+          - $ref: '#/components/schemas/PetBulkSuccessItem'
+          - $ref: '#/components/schemas/PetBulkErrorItem'
+        discriminator:
+          propertyName: status
+          mapping:
+            ok: '#/components/schemas/PetBulkSuccessItem'
+            error: '#/components/schemas/PetBulkErrorItem'
+    GetStatusResult:
+      description: Unrelated schema whose name collides with the `getStatus` op result alias.
+      type: object
+      properties:
+        ready:
+          type: boolean
+    PetFilter:
+      type: object
+      properties:
+        name:
+          type: string
+        status:
+          type: string
+    SearchResult:
+      description: Result alias for `search` collides with this schema name (regression guard).
+      type: object
+      properties:
+        total:
+          type: integer
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/Pet'
+    ExtendedPet:
+      description: Own discriminant property AND allOf — the own property must survive the intersection.
+      type: object
+      required: [kind]
+      properties:
+        kind:
+          type: string
+          const: extended
+      allOf:
+        - $ref: '#/components/schemas/Pet'
diff --git a/tests/e2e/generate-client/fixtures/cafe.yaml b/tests/e2e/generate-client/fixtures/cafe.yaml
new file mode 100644
index 0000000000..cd8a5883a5
--- /dev/null
+++ b/tests/e2e/generate-client/fixtures/cafe.yaml
@@ -0,0 +1,1163 @@
+openapi: 3.2.0
+info:
+  title: Redocly Cafe
+  description: |
+    Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+    Create API credentials and try it yourself in a realistic OpenAPI workflow.
+  version: 1.0.0
+  contact:
+    email: team@redocly.com
+    url: https://redocly.com/contact-us/
+  license:
+    name: MIT
+    url: https://opensource.org/licenses/MIT
+  termsOfService: https://redocly.com/subscription-agreement
+servers:
+  - url: https://cafe.cloud.redocly.com
+    description: Live server.
+tags:
+  - name: Authorization
+    description: Create a client to demo the API.
+  - name: Products
+    description: Operations related to products.
+  - name: Orders
+    description: Order management operations.
+  - name: Statistics
+    description: Statistics operations.
+paths:
+  /menu:
+    get:
+      tags:
+        - Products
+      summary: List all menu items
+      description: Retrieve a collection of menu items with optional filtering and pagination.
+      operationId: listMenuItems
+      security: []
+      parameters:
+        - $ref: '#/components/parameters/After'
+        - $ref: '#/components/parameters/Before'
+        - $ref: '#/components/parameters/Sort'
+        - $ref: '#/components/parameters/Filter'
+        - $ref: '#/components/parameters/Search'
+        - $ref: '#/components/parameters/Limit'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItemList'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    post:
+      tags:
+        - Products
+      summary: Create menu item
+      description: Create a new menu item.
+      operationId: createMenuItem
+      security:
+        - OAuth2:
+            - menu:write
+      requestBody:
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              $ref: '#/components/schemas/MenuItem'
+      responses:
+        '201':
+          description: Menu item created successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItem'
+              examples:
+                MenuItemResponse:
+                  value:
+                    id: prd_01khr487f7qm7p44xn427m43vb
+                    object: menuItem
+                    name: coffee
+                    price: 4000
+                    category: beverage
+                    createdAt: '2026-02-18T10:20:38.228Z'
+                    updatedAt: '2026-02-18T10:20:38.228Z'
+                    volume: 600
+                    containsCaffeine: false
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '409':
+          $ref: '#/components/responses/Conflict'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /menu/{menuItemId}:
+    parameters:
+      - $ref: '#/components/parameters/MenuItemId'
+    delete:
+      tags:
+        - Products
+      summary: Delete a menu item
+      description: Delete an existing menu item.
+      operationId: deleteMenuItem
+      security:
+        - OAuth2:
+            - menu:write
+      responses:
+        '204':
+          description: Menu item deleted successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /menu-item-images/{menuItemId}:
+    parameters:
+      - $ref: '#/components/parameters/MenuItemId'
+    get:
+      operationId: getMenuItemPhoto
+      summary: Retrieve a menu item photo
+      description: Retrieve the product photo image for a specific menu item.
+      security: []
+      tags:
+        - Products
+      parameters:
+        - $ref: '#/components/parameters/PhotoSize'
+      responses:
+        '200':
+          description: Menu item photo retrieved successfully.
+          content:
+            image/png:
+              schema:
+                type: string
+                format: binary
+            text/plain:
+              schema:
+                description: Alternative image text.
+                type: string
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /orders:
+    get:
+      tags:
+        - Orders
+      summary: List all orders
+      description: Retrieve a collection of orders with optional filtering and pagination.
+      operationId: listOrders
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/Filter'
+        - $ref: '#/components/parameters/Sort'
+        - $ref: '#/components/parameters/Limit'
+        - $ref: '#/components/parameters/After'
+        - $ref: '#/components/parameters/Before'
+        - $ref: '#/components/parameters/Search'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OrderList'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    post:
+      tags:
+        - Orders
+      summary: Create order
+      description: |
+        Create a new order.
+        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+      operationId: createOrder
+      security:
+        - OAuth2:
+            - orders:write
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Order'
+            examples:
+              OrderRequest:
+                dataValue:
+                  customerName: Mary Ann
+                  orderItems:
+                    - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                      quantity: 2
+                      comment: No sugar!
+                      discount: 0
+      responses:
+        '201':
+          description: Order placed successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: placed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /orders/{orderId}:
+    get:
+      tags:
+        - Orders
+      summary: Retrieve an order
+      description: Retrieve a single order by its ID.
+      operationId: getOrderById
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+        - name: X-Request-Id
+          in: header
+          required: false
+          description: |
+            Optional client-supplied correlation ID, echoed in logs and traces.
+          schema:
+            type: string
+            format: uuid
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: placed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    patch:
+      tags:
+        - Orders
+      summary: Partially update an order
+      description: |
+        Update an existing order status.
+        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+      operationId: updateOrder
+      security:
+        - OAuth2:
+            - orders:write
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              description: |
+                Partial order update using JSON Merge Patch - only include fields to update.
+              properties:
+                status:
+                  $ref: '#/components/schemas/OrderStatus'
+              required:
+                - status
+      responses:
+        '200':
+          description: Order updated successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: completed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    delete:
+      tags:
+        - Orders
+      summary: Delete an order
+      description: |
+        Delete the order.
+        To keep the order history, the order should be canceled instead of deleted.
+      operationId: deleteOrder
+      security:
+        - OAuth2:
+            - orders:write
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+      responses:
+        '204':
+          description: Order deleted successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /order-items:
+    get:
+      tags:
+        - Orders
+      summary: List all order items with menu item details
+      description: |
+        Returns an array of order items for a specific order.
+        Use the `filter` parameter to filter by order ID.
+      operationId: listOrderItems
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/Filter'
+          required: true
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                type: array
+                description: List of menu items that are part of the order.
+                items:
+                  $ref: '#/components/schemas/OrderItem'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /revenue:
+    get:
+      tags:
+        - Statistics
+      summary: Get revenue statistics
+      description: |
+        Retrieve revenue statistics for a configurable date range.
+        Returns revenue, order counts, average order amount, and other useful statistics.
+      operationId: getRevenue
+      security:
+        - ApiKey: []
+      parameters:
+        - name: startDate
+          in: query
+          required: false
+          description: |
+            Start date for the revenue calculation period (ISO 8601 datetime format).
+            Defaults to 30 days ago if not provided.
+          schema:
+            type: string
+            format: date
+          example: '2026-01-01'
+        - name: endDate
+          in: query
+          required: false
+          description: |
+            End date for the revenue calculation period (ISO 8601 datetime format).
+            Defaults to current time if not provided.
+          schema:
+            type: string
+            format: date
+          example: '2026-01-31'
+      responses:
+        '200':
+          description: Revenue statistics retrieved successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RevenueStatistics'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /oauth2/register:
+    post:
+      tags:
+        - Authorization
+      summary: Create OAuth2 client
+      description: |
+        Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+        - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type, 
+          `redirectUris` must be provided (per RFC 7591 Section 2).
+        - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+        Returns the registered client information per RFC 7591, including:
+        - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+      operationId: registerOAuth2Client
+      security: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/RegisterClientObject'
+      responses:
+        '201':
+          description: OAuth2 client registered successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OAuth2Client'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+webhooks:
+  order-notification:
+    post:
+      tags:
+        - Orders
+      operationId: orderNotificationWebhook
+      security: []
+      summary: Order notification webhook
+      description: Webhook triggered when a new order is placed.
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/OrderNotification'
+      responses:
+        '200':
+          description: Webhook received successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+components:
+  securitySchemes:
+    OAuth2:
+      type: oauth2
+      description: OAuth2 authorization for API access.
+      flows:
+        authorizationCode:
+          authorizationUrl: https://cafe.cloud.redocly.com/oauth2/authorize
+          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          scopes:
+            menu:read: Read access to menu items and images
+            menu:write: Write access to menu items (create, delete)
+            orders:read: Read access to orders
+            orders:write: Write access to orders (create, update, delete)
+        clientCredentials:
+          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          scopes:
+            menu:read: Read access to menu items and images
+            menu:write: Write access to menu items (create, delete)
+            orders:read: Read access to orders
+            orders:write: Write access to orders (create, update, delete)
+    ApiKey:
+      type: apiKey
+      name: X-API-Key
+      in: header
+      description: API key for internal operations.
+  parameters:
+    After:
+      name: after
+      in: query
+      required: false
+      description: Use the `endCursor` as a value for the `after` parameter to get the next page.
+      schema:
+        type: string
+      example: a25fgaksjf23la==
+    Before:
+      name: before
+      in: query
+      required: false
+      description: |
+        Use the `startCursor` as a value for the `before` parameter to get the next page.
+      schema:
+        type: string
+      example: bfg23aksjf23zb1==
+    Sort:
+      name: sort
+      description: |-
+        To sort by id in descending order use `-id`.
+        To sort by id in ascending order use `id`.
+      in: query
+      required: false
+      schema:
+        type: string
+      example: '-name'
+    Filter:
+      name: filter
+      description: |-
+        Filters the collection items using space-separated `field:value` pairs.
+
+        **Format:** `field1:value1 field2:value2`
+
+        **Supported operators:**
+        - `field:value` - Exact match
+        - `field:value1,value2` - Match any of the comma-separated values (OR)
+        - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+
+        **Examples:**
+        - `status:placed` - Filter by single status.
+        - `status:placed,completed` - Filter by multiple statuses.
+        - `createdAt:30d` - Filter orders created in the last 30 days.
+        - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+        - `status:placed createdAt:7d` - Combine multiple filters.
+      in: query
+      required: false
+      schema:
+        type: string
+      example: orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7
+    Search:
+      name: search
+      in: query
+      description: |-
+        Performs a case-insensitive text search across relevant fields in the collection.
+
+        **Fields searched depend on the endpoint:**
+        - **Menu items:** `name`, `photoTextDescription`
+        - **Orders:** `customerName`, `id`
+
+        Returns items where any of the searchable fields contain the search term as a substring.
+      required: false
+      schema:
+        type: string
+      example: coffee
+    Limit:
+      name: limit
+      description: |
+        Use to return a number of results per page.
+        If there is more data, use in combination with `after` to page through the data.
+      in: query
+      required: false
+      schema:
+        type: integer
+        minimum: 1
+        maximum: 100
+        default: 10
+      example: 10
+    MenuItemId:
+      name: menuItemId
+      in: path
+      description: ID of the menu item to retrieve.
+      required: true
+      schema:
+        type: string
+        pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+      example: prd_01h1s5z6vf2mm1mz3hevnn9va7
+    PhotoSize:
+      name: photoSize
+      in: query
+      description: Photo size to retrieve.
+      required: false
+      schema:
+        type: string
+        enum:
+          - thumbnail
+          - medium
+          - large
+        default: medium
+    OrderId:
+      name: orderId
+      in: path
+      description: ID of the order to retrieve.
+      required: true
+      schema:
+        type: string
+        pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+      example: ord_01h1s5z6vf2mm1mz3hevnn9va7
+  schemas:
+    Page:
+      type: object
+      properties:
+        endCursor:
+          type:
+            - string
+            - 'null'
+          description: |-
+            Use with the `after` query parameter to load the next page of data.
+            When `null`, there is no data.
+            The cursor is opaque and internal structure is subject to change.
+        startCursor:
+          type:
+            - string
+            - 'null'
+          description: |-
+            Use with the `before` query parameter to load the previous page of data.
+            When `null`, there is no data.
+            The cursor is opaque and internal structure is subject to change.
+        hasNextPage:
+          type: boolean
+          description: Indicates if there is a next page with items.
+        hasPrevPage:
+          type: boolean
+          description: Indicates if there is a previous page with items.
+        limit:
+          type: integer
+          minimum: 1
+          maximum: 100
+          default: 10
+          description: Value showing how many items are in the page limit.
+        total:
+          type: integer
+          description: Count of items across all pages.
+          minimum: 0
+      required:
+        - endCursor
+        - startCursor
+        - hasNextPage
+        - hasPrevPage
+        - limit
+        - total
+    MenuBaseItem:
+      type: object
+      properties:
+        createdAt:
+          description: Created date.
+          type: string
+          format: date-time
+          readOnly: true
+        updatedAt:
+          description: Updated date.
+          type: string
+          format: date-time
+          readOnly: true
+        id:
+          description: Menu item ID. Unique identifier prefixed with `prd_`.
+          type: string
+          readOnly: true
+          pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+          example: prd_01h1s5z6vf2mm1mz3hevnn9va7
+        object:
+          description: Entity name.
+          type: string
+          const: menuItem
+          readOnly: true
+        name:
+          description: Menu item name.
+          type: string
+          minLength: 1
+          maxLength: 50
+        price:
+          description: Price in cents.
+          type: integer
+          minimum: 0
+        photo:
+          writeOnly: true
+          type:
+            - string
+            - 'null'
+          format: binary
+          description: Photo of the menu item. Must be a PNG image and less than 1MB.
+        photoUrl:
+          readOnly: true
+          type: string
+          format: uri
+          description: Photo URL of the menu item.
+        photoTextDescription:
+          type:
+            - string
+            - 'null'
+      required:
+        - id
+        - name
+        - price
+        - createdAt
+        - updatedAt
+        - object
+    Beverage:
+      allOf:
+        - type: object
+          properties:
+            category:
+              description: Menu item category.
+              type: string
+              const: beverage
+            volume:
+              type: number
+              description: Size of the beverage in milliliters.
+              exclusiveMinimum: 0
+            containsCaffeine:
+              type: boolean
+              description: Indicates if the beverage contains caffeine.
+          required:
+            - category
+            - volume
+            - containsCaffeine
+        - $ref: '#/components/schemas/MenuBaseItem'
+    Dessert:
+      allOf:
+        - type: object
+          properties:
+            category:
+              description: Menu item category.
+              type: string
+              const: dessert
+            calories:
+              type: number
+              exclusiveMinimum: 0
+              description: Amount of calories.
+          required:
+            - category
+            - calories
+        - $ref: '#/components/schemas/MenuBaseItem'
+    MenuItem:
+      discriminator:
+        propertyName: category
+        mapping:
+          beverage: '#/components/schemas/Beverage'
+          dessert: '#/components/schemas/Dessert'
+      oneOf:
+        - $ref: '#/components/schemas/Beverage'
+        - $ref: '#/components/schemas/Dessert'
+      required:
+        - category
+    MenuItemList:
+      type: object
+      properties:
+        object:
+          type: string
+          const: list
+          description: Entity name.
+        page:
+          $ref: '#/components/schemas/Page'
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/MenuItem'
+      required:
+        - object
+        - page
+        - items
+    Error:
+      type: object
+      properties:
+        type:
+          type: string
+          format: uri-reference
+          description: URI reference that identifies the problem type.
+          default: about:blank
+        title:
+          type: string
+          description: Short summary of the problem type.
+        status:
+          type: integer
+          format: int32
+          description: |
+            HTTP status code generated by the origin server for this occurrence of the problem.
+          minimum: 100
+          exclusiveMaximum: 600
+        instance:
+          type: string
+          format: uri-reference
+          description: |
+            URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+            May be used to locate the root of this problem in the source code.
+          example: /some/uri-reference#specific-occurrence-context
+        details:
+          description: Additional error details.
+          type: object
+          additionalProperties: true
+      required:
+        - type
+        - title
+        - status
+    OrderStatus:
+      type: string
+      description: Order status.
+      enum:
+        - placed
+        - preparing
+        - completed
+        - canceled
+    Order:
+      type: object
+      title: Order
+      properties:
+        id:
+          description: Order ID. Unique identifier prefixed with `ord_`.
+          type: string
+          format: ulid
+          readOnly: true
+          pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+          example: ord_01h1s5z6vf2mm1mz3hevnn9va7
+        object:
+          description: Entity name.
+          type: string
+          const: order
+          readOnly: true
+        customerName:
+          description: |
+            Name of the customer who placed the order.
+            Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+          type: string
+          pattern: ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+          minLength: 1
+          maxLength: 100
+        status:
+          allOf:
+            - $ref: '#/components/schemas/OrderStatus'
+          readOnly: true
+        totalPrice:
+          description: Total order price in cents.
+          type: integer
+          minimum: 0
+          readOnly: true
+        createdAt:
+          description: Created date.
+          type: string
+          format: date-time
+          readOnly: true
+        updatedAt:
+          description: Updated date.
+          type: string
+          format: date-time
+          readOnly: true
+        orderItems:
+          type: array
+          description: List of items to include in the order.
+          minItems: 1
+          items:
+            type: object
+            properties:
+              menuItemId:
+                type: string
+                format: ulid
+                description: ID of the menu item to add to the order.
+              quantity:
+                type: integer
+                minimum: 1
+                description: Quantity of the menu item.
+              discount:
+                type: integer
+                minimum: 0
+                description: Discount amount in cents (absolute value).
+                default: 0
+              comment:
+                type: string
+                maxLength: 500
+                description: Optional comment for the order item (e.g., "No sugar").
+            required:
+              - menuItemId
+              - quantity
+      required:
+        - customerName
+        - orderItems
+    OrderList:
+      type: object
+      properties:
+        object:
+          type: string
+          const: list
+          description: Entity name.
+        page:
+          $ref: '#/components/schemas/Page'
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/Order'
+      required:
+        - object
+        - page
+        - items
+    OrderItem:
+      type: object
+      properties:
+        menuItemId:
+          type: string
+          description: ID of the menu item to add to the order.
+          writeOnly: true
+        menuItem:
+          allOf:
+            - $ref: '#/components/schemas/MenuItem'
+          description: Menu item that is part of the order.
+          readOnly: true
+        quantity:
+          type: integer
+          minimum: 1
+          description: Quantity of the menu item.
+        discount:
+          type: integer
+          minimum: 0
+          description: Discount amount in cents (absolute value).
+          default: 0
+        comment:
+          type: string
+          maxLength: 500
+          description: Optional comment for the order item (e.g., "No sugar").
+      required:
+        - menuItemId
+        - quantity
+    RevenueStatistics:
+      type: object
+      description: Revenue statistics for a given date range.
+      properties:
+        revenue:
+          type: number
+          format: float
+          description: Total revenue in cents from completed orders.
+          minimum: 0
+        averageOrderAmount:
+          type: number
+          format: float
+          description: Average order amount in cents (calculated from completed orders only).
+          minimum: 0
+        totalOrders:
+          type: integer
+          description: Total number of orders (all statuses) in the date range.
+          minimum: 0
+        placedOrders:
+          type: integer
+          description: Number of placed orders.
+          minimum: 0
+        preparingOrders:
+          type: integer
+          description: Number of preparing orders.
+          minimum: 0
+        completedOrders:
+          type: integer
+          description: Number of completed orders.
+          minimum: 0
+        canceledOrders:
+          type: integer
+          description: Number of canceled orders.
+          minimum: 0
+        startDate:
+          type: string
+          format: date
+          description: Start date of the revenue calculation period.
+        endDate:
+          type: string
+          format: date
+          description: End date of the revenue calculation period.
+      required:
+        - revenue
+        - averageOrderAmount
+        - totalOrders
+        - placedOrders
+        - preparingOrders
+        - completedOrders
+        - canceledOrders
+        - startDate
+        - endDate
+    RegisterClientObject:
+      type: object
+      properties:
+        name:
+          type: string
+          description: Client name.
+        redirectUris:
+          type: array
+          items:
+            type: string
+            format: uri
+          description: List of redirect URIs (optional, defaults to empty array).
+        scopes:
+          type: array
+          items:
+            type: string
+            enum:
+              - menu:read
+              - menu:write
+              - orders:read
+              - orders:write
+          description: List of scopes.
+        grantTypes:
+          type: array
+          items:
+            type: string
+            enum:
+              - authorization_code
+              - client_credentials
+          description: List of grant types.
+      required:
+        - name
+    OAuth2Client:
+      type: object
+      description: OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+      properties:
+        clientId:
+          type: string
+          description: Client identifier issued by the authorization server.
+        clientSecret:
+          type: string
+          description: Client secret issued by the authorization server.
+        clientIdIssuedAt:
+          type: integer
+          format: int64
+          description: Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+        clientSecretExpiresAt:
+          type: integer
+          format: int64
+          description: Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+        name:
+          type: string
+          description: Client name (registered metadata).
+        redirectUris:
+          type: array
+          items:
+            type: string
+            format: uri
+          description: List of redirect URIs (registered metadata).
+        registrationClientUri:
+          type: string
+          format: uri
+          description: URL of the client configuration endpoint for managing this client registration (RFC 7592).
+        registrationAccessToken:
+          type: string
+          description: Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+        scopes:
+          type: array
+          items:
+            type: string
+            enum:
+              - menu:read
+              - menu:write
+              - orders:read
+              - orders:write
+          description: List of scopes (registered metadata).
+        grantTypes:
+          type: array
+          items:
+            type: string
+            enum:
+              - authorization_code
+              - client_credentials
+          description: List of grant types (registered metadata).
+      required:
+        - clientId
+        - clientSecret
+        - clientIdIssuedAt
+        - clientSecretExpiresAt
+        - registrationClientUri
+        - registrationAccessToken
+    OrderNotification:
+      type: object
+      required:
+        - orderId
+        - orderStatus
+        - timestamp
+      properties:
+        orderId:
+          type: string
+          description: Unique order identifier.
+        orderStatus:
+          $ref: '#/components/schemas/OrderStatus'
+        timestamp:
+          type: string
+          format: date-time
+          description: When the event occurred.
+  responses:
+    BadRequest:
+      description: Bad request - invalid input parameters.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    InternalServerError:
+      description: Internal server error.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Unauthorized:
+      description: Unauthorized - authorization required.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Forbidden:
+      description: Forbidden - insufficient permissions.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Conflict:
+      description: Conflict - entity already exists.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    NotFound:
+      description: Resource not found.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
\ No newline at end of file
diff --git a/tests/e2e/generate-client/fixtures/error-mode.yaml b/tests/e2e/generate-client/fixtures/error-mode.yaml
new file mode 100644
index 0000000000..e6ffff38b1
--- /dev/null
+++ b/tests/e2e/generate-client/fixtures/error-mode.yaml
@@ -0,0 +1,36 @@
+openapi: 3.0.3
+info: { title: Error Mode API, version: 1.0.0 }
+servers:
+  - { url: https://api.example.com }
+paths:
+  /things/{id}:
+    get:
+      operationId: getThing
+      tags: [things]
+      parameters:
+        - { name: id, in: path, required: true, schema: { type: string } }
+      responses:
+        '200':
+          description: ok
+          content:
+            application/json:
+              schema: { $ref: '#/components/schemas/Thing' }
+        '404':
+          description: not found
+          content:
+            application/json:
+              schema: { $ref: '#/components/schemas/ProblemDetails' }
+components:
+  schemas:
+    Thing:
+      type: object
+      required: [id]
+      properties:
+        id: { type: string }
+        name: { type: string }
+    ProblemDetails:
+      type: object
+      required: [title]
+      properties:
+        title: { type: string }
+        status: { type: integer }
diff --git a/tests/e2e/generate-client/fixtures/no-operationid.yaml b/tests/e2e/generate-client/fixtures/no-operationid.yaml
new file mode 100644
index 0000000000..cee32bb4c3
--- /dev/null
+++ b/tests/e2e/generate-client/fixtures/no-operationid.yaml
@@ -0,0 +1,20 @@
+openapi: 3.0.3
+info: { title: No OperationId API, version: 1.0.0 }
+servers:
+  - { url: https://api.example.com }
+paths:
+  /giftcards/{cardId}:
+    get:
+      responses:
+        '200':
+          description: ok
+          content:
+            application/json:
+              schema: { $ref: '#/components/schemas/Giftcard' }
+components:
+  schemas:
+    Giftcard:
+      type: object
+      required: [cardId]
+      properties:
+        cardId: { type: string }
diff --git a/tests/e2e/generate-client/fixtures/oas3.2.yaml b/tests/e2e/generate-client/fixtures/oas3.2.yaml
new file mode 100644
index 0000000000..1447ecf8b9
--- /dev/null
+++ b/tests/e2e/generate-client/fixtures/oas3.2.yaml
@@ -0,0 +1,27 @@
+openapi: 3.2.0
+$self: https://example.com/openapi
+info: { title: OAS 3.2 API, version: 1.0.0 }
+servers:
+  - { url: https://api.example.com, name: production }
+paths:
+  /things/{id}:
+    get:
+      operationId: getThing
+      parameters:
+        - { name: id, in: path, required: true, schema: { type: string } }
+      responses:
+        '200':
+          description: ok
+          content:
+            application/json:
+              schema: { $ref: '#/components/schemas/Thing' }
+components:
+  schemas:
+    Thing:
+      type: object
+      required: [id]
+      properties:
+        id: { type: string }
+        status:
+          type: [string, 'null']
+          enum: [active, archived, null]
diff --git a/tests/e2e/generate-client/fixtures/query-styles.yaml b/tests/e2e/generate-client/fixtures/query-styles.yaml
new file mode 100644
index 0000000000..9d140cb7c3
--- /dev/null
+++ b/tests/e2e/generate-client/fixtures/query-styles.yaml
@@ -0,0 +1,56 @@
+openapi: 3.0.3
+info:
+  title: Query Styles
+  version: 1.0.0
+servers:
+  - url: http://localhost:3199
+paths:
+  /search:
+    get:
+      operationId: search
+      parameters:
+        - name: tags
+          in: query
+          style: pipeDelimited
+          explode: false
+          schema:
+            type: array
+            items:
+              type: string
+        - name: q
+          in: query
+          style: spaceDelimited
+          explode: false
+          schema:
+            type: array
+            items:
+              type: string
+        - name: ids
+          in: query
+          style: form
+          explode: false
+          schema:
+            type: array
+            items:
+              type: string
+        - name: filter
+          in: query
+          allowReserved: true
+          schema:
+            type: string
+        - name: limit
+          in: query
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: Results.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  results:
+                    type: array
+                    items:
+                      type: string
diff --git a/tests/e2e/generate-client/fixtures/route-map-plugin.mjs b/tests/e2e/generate-client/fixtures/route-map-plugin.mjs
new file mode 100644
index 0000000000..937da80d82
--- /dev/null
+++ b/tests/e2e/generate-client/fixtures/route-map-plugin.mjs
@@ -0,0 +1,18 @@
+// A custom generator loaded by path specifier in the plugin e2e. Plain ESM (no imports) so the
+// compiled CLI can import it under bare `node`. Emits a `<output>.routes.ts` map of every operation.
+export default {
+  name: 'route-map',
+  requires: ['sdk'],
+  run({ model, outputPath }) {
+    const routes = model.services
+      .flatMap((s) => s.operations)
+      .map((op) => `  ${op.name}: '${op.method.toUpperCase()} ${op.path}',`)
+      .join('\n');
+    return [
+      {
+        path: outputPath.replace(/\.ts$/, '.routes.ts'),
+        content: `export const routes = {\n${routes}\n} as const;\n`,
+      },
+    ];
+  },
+};
diff --git a/tests/e2e/generate-client/fixtures/sse.yaml b/tests/e2e/generate-client/fixtures/sse.yaml
new file mode 100644
index 0000000000..47fffcc4a4
--- /dev/null
+++ b/tests/e2e/generate-client/fixtures/sse.yaml
@@ -0,0 +1,58 @@
+openapi: 3.2.0
+$self: https://example.com/openapi
+info: { title: SSE API, version: 1.0.0 }
+servers:
+  - { url: http://localhost:3104, name: production }
+paths:
+  /health:
+    get:
+      operationId: getHealth
+      tags: [Health]
+      responses:
+        '200':
+          description: ok
+          content:
+            application/json:
+              schema: { $ref: '#/components/schemas/Health' }
+  /messages:
+    get:
+      operationId: streamMessages
+      tags: [Messages]
+      responses:
+        '200':
+          description: a stream of messages
+          content:
+            text/event-stream:
+              itemSchema: { $ref: '#/components/schemas/Message' }
+  /abort-messages:
+    get:
+      operationId: streamAbort
+      tags: [Messages]
+      responses:
+        '200':
+          description: a long-lived stream of messages (for the abort scenario)
+          content:
+            text/event-stream:
+              itemSchema: { $ref: '#/components/schemas/Message' }
+  /ticks:
+    get:
+      operationId: streamTicks
+      tags: [Ticks]
+      responses:
+        '200':
+          description: a stream of raw ticks
+          content:
+            text/event-stream: {}
+components:
+  schemas:
+    Health:
+      type: object
+      required: [status]
+      properties:
+        status: { type: string }
+    Message:
+      type: object
+      required: [text, seq]
+      properties:
+        text: { type: string }
+        seq: { type: integer }
diff --git a/tests/e2e/generate-client/fixtures/swagger2.yaml b/tests/e2e/generate-client/fixtures/swagger2.yaml
new file mode 100644
index 0000000000..1c09b6611f
--- /dev/null
+++ b/tests/e2e/generate-client/fixtures/swagger2.yaml
@@ -0,0 +1,37 @@
+swagger: '2.0'
+info: { title: Swagger2 API, version: 1.0.0 }
+host: api.example.com
+basePath: /v2
+schemes: [https]
+consumes: [application/json]
+produces: [application/json]
+securityDefinitions:
+  ApiKey: { type: apiKey, name: X-API-Key, in: header }
+paths:
+  /pets/{id}:
+    get:
+      operationId: getPet
+      parameters:
+        - { name: id, in: path, required: true, type: integer }
+        - { name: verbose, in: query, required: false, type: boolean }
+      responses:
+        '200': { description: ok, schema: { $ref: '#/definitions/Pet' } }
+  /pets:
+    post:
+      operationId: createPet
+      parameters:
+        - { name: body, in: body, required: true, schema: { $ref: '#/definitions/Pet' } }
+      responses:
+        '201': { description: created, schema: { $ref: '#/definitions/Pet' } }
+definitions:
+  Pet:
+    type: object
+    required: [id, name]
+    properties:
+      id: { type: integer }
+      name: { type: string }
+      owner: { $ref: '#/definitions/Owner' }
+  Owner:
+    type: object
+    properties:
+      name: { type: string }
diff --git a/tests/e2e/generate-client/fixtures/transformers.yaml b/tests/e2e/generate-client/fixtures/transformers.yaml
new file mode 100644
index 0000000000..2bd80b6deb
--- /dev/null
+++ b/tests/e2e/generate-client/fixtures/transformers.yaml
@@ -0,0 +1,61 @@
+openapi: 3.1.0
+info:
+  title: Transformers Fixture
+  version: 1.0.0
+  description: |
+    Exercises the `--date-type Date` sdk knob + the `transformers` generator
+    across the date-bearing shapes: a top-level `date-time` scalar, an array of
+    `date` scalars, and a `$ref` to another schema that also carries a date (to
+    drive transformer composition `transformPet -> transformOwner`).
+servers:
+  - url: http://localhost:3199
+paths:
+  /pets/{id}:
+    get:
+      operationId: getPet
+      parameters:
+        - name: id
+          in: path
+          required: true
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: A single pet.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Pet'
+components:
+  schemas:
+    Pet:
+      type: object
+      required: [id, name]
+      properties:
+        id:
+          type: integer
+        name:
+          type: string
+        createdAt:
+          description: Top-level date-time scalar — converted to Date.
+          type: string
+          format: date-time
+        dates:
+          description: Array of date scalars — each element converted to Date.
+          type: array
+          items:
+            type: string
+            format: date
+        owner:
+          description: Ref to a date-bearing schema — drives transformer composition.
+          $ref: '#/components/schemas/Owner'
+    Owner:
+      type: object
+      required: [name]
+      properties:
+        name:
+          type: string
+        since:
+          description: Nested/ref'd date — converted via transformOwner.
+          type: string
+          format: date
diff --git a/tests/e2e/generate-client/generator-contract.test.ts b/tests/e2e/generate-client/generator-contract.test.ts
new file mode 100644
index 0000000000..2cbc673261
--- /dev/null
+++ b/tests/e2e/generate-client/generator-contract.test.ts
@@ -0,0 +1,143 @@
+// The generator compatibility contract: an incompatible `--generators` selection must
+// fail fast with an actionable message (never emit a client that won't compile), and
+// `tanstack-query` must gracefully skip SSE operations (which the sdk doesn't export).
+import { spawnSync } from 'node:child_process';
+import { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { mkdtempSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const cafe = join(__dirname, 'fixtures', 'cafe.yaml');
+const sse = join(__dirname, 'fixtures', 'sse.yaml');
+
+function run(args: string[]): { status: number | null; out: string } {
+  const res = spawnSync('node', [cli, 'generate-client', ...args], {
+    encoding: 'utf-8',
+    cwd: repoRoot,
+  });
+  return { status: res.status, out: `${res.stdout}\n${res.stderr}` };
+}
+
+describe('generate-client generator compatibility contract', () => {
+  it('rejects tanstack-query without sdk, naming the fix', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-contract-'));
+    const { status, out } = run([cafe, '--output', join(dir, 'c.ts'), '--generators', 'tanstack-query']);
+    expect(status).not.toBe(0);
+    expect(out).toMatch(/requires the "sdk" generator/);
+    expect(out).toMatch(/--generators sdk,tanstack-query/);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('rejects tanstack-query with the service-class facade', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-contract-'));
+    const { status, out } = run([
+      cafe,
+      '--output',
+      join(dir, 'c.ts'),
+      '--generators',
+      'sdk,tanstack-query',
+      '--facade',
+      'service-class',
+    ]);
+    expect(status).not.toBe(0);
+    expect(out).toMatch(/does not support --facade "service-class"/);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('rejects tanstack-query with result error mode', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-contract-'));
+    const { status, out } = run([
+      cafe,
+      '--output',
+      join(dir, 'c.ts'),
+      '--generators',
+      'sdk,tanstack-query',
+      '--error-mode',
+      'result',
+    ]);
+    expect(status).not.toBe(0);
+    expect(out).toMatch(/does not support --error-mode "result"/);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('rejects transformers without --date-type Date', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-contract-'));
+    const { status, out } = run([cafe, '--output', join(dir, 'c.ts'), '--generators', 'sdk,transformers']);
+    expect(status).not.toBe(0);
+    expect(out).toMatch(/requires --date-type Date/);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('skips SSE operations in tanstack-query (reporting them) and still emits the rest', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-contract-'));
+    const { status, out } = run([
+      sse,
+      '--output',
+      join(dir, 'c.ts'),
+      '--generators',
+      'sdk,tanstack-query',
+    ]);
+    expect(status, out).toBe(0);
+    expect(out).toMatch(/tanstack-query skipped \d+ server-sent-events operation/);
+    const tanstack = readFileSync(join(dir, 'c.tanstack.ts'), 'utf-8');
+    // The non-SSE op is wrapped; the SSE ops are neither imported nor wrapped.
+    expect(tanstack).toContain('getHealthOptions');
+    expect(tanstack).not.toContain('streamMessages');
+    expect(existsSync(join(dir, 'c.ts'))).toBe(true);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('skips a tanstack op whose <Op>Variables collides with a schema; the tree still compiles', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-contract-'));
+    // Schema `GetUserVariables` collides with the `getUser` op's derived variables alias.
+    writeFileSync(
+      join(dir, 'api.yaml'),
+      `openapi: 3.1.0
+info: { title: C, version: '1.0.0' }
+paths:
+  /users/{id}:
+    get:
+      operationId: getUser
+      parameters: [{ name: id, in: path, required: true, schema: { type: string } }]
+      responses: { '200': { description: ok } }
+  /users:
+    get:
+      operationId: listUsers
+      responses: { '200': { description: ok } }
+components:
+  schemas:
+    GetUserVariables: { type: object, properties: { ready: { type: boolean } } }
+`,
+      'utf-8'
+    );
+    const { status, out } = run([
+      join(dir, 'api.yaml'),
+      '--output',
+      join(dir, 'c.ts'),
+      '--generators',
+      'sdk,tanstack-query',
+    ]);
+    expect(status, out).toBe(0);
+    expect(out).toMatch(/tanstack-query skipped \d+ operation\(s\) whose variables type name collides/);
+    const tanstack = readFileSync(join(dir, 'c.tanstack.ts'), 'utf-8');
+    expect(tanstack).not.toContain('getUserOptions'); // colliding op skipped
+    expect(tanstack).toContain('listUsersOptions'); // the rest still wrapped
+    // The whole tree compiles (no import of the suppressed alias).
+    const files = [join(dir, 'c.ts'), join(dir, 'c.tanstack.ts')];
+    const tsc = spawnSync(
+      join(repoRoot, 'node_modules/.bin/tsc'),
+      ['--noEmit', '--strict', '--target', 'ES2020', '--module', 'esnext', '--moduleResolution', 'bundler', '--lib', 'ES2020,DOM', ...files],
+      { encoding: 'utf-8', cwd: dir }
+    );
+    // `@tanstack/react-query` isn't installed in the temp dir; ignore only that missing-module error.
+    const real = tsc.stdout
+      .split('\n')
+      .filter((l) => l.includes('error TS') && !l.includes('@tanstack/react-query'));
+    expect(real, tsc.stdout).toEqual([]);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/identifier-injection.test.ts b/tests/e2e/generate-client/identifier-injection.test.ts
new file mode 100644
index 0000000000..2db33b06bc
--- /dev/null
+++ b/tests/e2e/generate-client/identifier-injection.test.ts
@@ -0,0 +1,96 @@
+// Security regression: a hostile OpenAPI document must never inject executable code
+// into the generated client. `ts.factory.createIdentifier` prints names verbatim and
+// JSDoc text is emitted as comments, so operationIds / schema names / descriptions
+// carrying `(){};`, `export`, or `*/` are the attack surface. The generator must
+// sanitize names and escape comments such that the output is inert and strict-`tsc`
+// clean — every payload trapped inside an identifier or a comment, never a statement.
+import { spawnSync } from 'node:child_process';
+import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+
+const HOSTILE_SPEC = `openapi: 3.1.0
+info:
+  title: "Evil */ ;globalThis.PWNED_TITLE=1; /*"
+  version: "1.0.0"
+  description: "desc */ ;globalThis.PWNED_DESC=1; /*"
+servers: [{ url: https://api.example.com }]
+paths:
+  /x:
+    get:
+      operationId: "foo(a){}; globalThis.PWNED_OPID=1; export async function bar"
+      security:
+        - "k(){}; globalThis.PWNED_KEY=1; export const z": []
+      responses:
+        '200':
+          description: "ok */ ;globalThis.PWNED_RESP=1; /*"
+          content:
+            application/json:
+              schema: { $ref: '#/components/schemas/Thing' }
+components:
+  securitySchemes:
+    "k(){}; globalThis.PWNED_KEY=1; export const z":
+      type: apiKey
+      in: header
+      name: X-Api-Key
+    other:
+      type: apiKey
+      in: header
+      name: X-Other
+  schemas:
+    Thing:
+      description: "schema */ ;globalThis.PWNED_SCHEMA=1; /*"
+      type: object
+      properties:
+        n: { type: integer }
+`;
+
+describe('generate-client identifier / comment injection', () => {
+  it('sanitizes hostile names and escapes comments; output is strict-tsc clean', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-injection-'));
+    writeFileSync(join(dir, 'openapi.yaml'), HOSTILE_SPEC, 'utf-8');
+    const entry = join(dir, 'client.ts');
+    const res = spawnSync('node', [cli, 'generate-client', join(dir, 'openapi.yaml'), '--output', entry], {
+      encoding: 'utf-8',
+      cwd: repoRoot,
+    });
+    expect(res.status, res.stderr).toBe(0);
+    // The unsafe operationId is reported and rewritten, not silently accepted.
+    expect(res.stderr).toMatch(/is not a valid TypeScript identifier/);
+
+    const src = readFileSync(entry, 'utf-8');
+    // No live comment-breakout: the payload's `*/` is neutralized to `*\/`.
+    expect(src).not.toMatch(/\*\/\s*;globalThis/);
+    // No payload survives as a top-level statement (only inside identifiers/comments).
+    expect(src).not.toMatch(/^\s*globalThis\.PWNED/m);
+    // The function name became a single valid identifier (no parens/spaces/semicolons).
+    expect(src).toMatch(/export async function [A-Za-z_$][A-Za-z0-9_$]*\(/);
+
+    // Strongest proof: the whole file type-checks. Injected statements would not.
+    const tsc = spawnSync(
+      tscBin,
+      [
+        '--noEmit',
+        '--strict',
+        '--target',
+        'ES2020',
+        '--module',
+        'esnext',
+        '--moduleResolution',
+        'bundler',
+        '--lib',
+        'ES2020,DOM',
+        entry,
+      ],
+      { encoding: 'utf-8', cwd: dir }
+    );
+    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/middleware.test.ts b/tests/e2e/generate-client/middleware.test.ts
new file mode 100644
index 0000000000..0f0f1f4c28
--- /dev/null
+++ b/tests/e2e/generate-client/middleware.test.ts
@@ -0,0 +1,209 @@
+/**
+ * Behavioral e2e for composable middleware/interceptors. Like `extension.test.ts`, we
+ * inject a fake `fetch` and exercise the generated runtime in a real consumer, proving
+ * that `use()` registers middleware, `onRequest` runs in order, `onResponse` runs in
+ * reverse (onion), `onError` chains, and the service-class facade has its own `use()`.
+ */
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
+const fixture = join(__dirname, 'fixtures/base.yaml');
+const tsxBin = join(repoRoot, 'node_modules/.bin/tsx');
+
+function generate(dir: string, extraArgs: string[] = []): void {
+  writeFileSync(join(dir, 'package.json'), JSON.stringify({ type: 'module' }), 'utf-8');
+  const out = join(dir, 'client.ts');
+  const result = spawnSync('node', [cliEntry, 'generate-client', fixture, '--output', out, ...extraArgs], {
+    encoding: 'utf-8',
+    cwd: repoRoot,
+  });
+  if (result.status !== 0) throw new Error(`generate-client failed:\n${result.stderr}`);
+}
+
+function runConsumer(dir: string, script: string): unknown {
+  writeFileSync(join(dir, 'consumer.ts'), script, 'utf-8');
+  const result = spawnSync(tsxBin, [join(dir, 'consumer.ts')], { encoding: 'utf-8', cwd: repoRoot });
+  if (result.status !== 0) {
+    throw new Error(`consumer failed:\nstdout:\n${result.stdout}\nstderr:\n${result.stderr}`);
+  }
+  return JSON.parse(result.stdout.trim());
+}
+
+const OK = `new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } })`;
+
+describe('middleware — functions facade (use)', () => {
+  let dir = '';
+  beforeAll(() => {
+    dir = mkdtempSync(join(tmpdir(), 'mw-fn-'));
+    generate(dir);
+  }, 60_000);
+  afterAll(() => {
+    if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
+  });
+
+  test('use() registers middleware: onRequest runs in order, onResponse in reverse (onion)', () => {
+    const captured = runConsumer(
+      dir,
+      `
+import { configure, use, listPets } from './client.ts';
+
+const order: string[] = [];
+let headers: Record<string, string> = {};
+configure({
+  fetch: (async (_url: string, init: RequestInit) => {
+    headers = init.headers as Record<string, string>;
+    return ${OK};
+  }) as unknown as typeof fetch,
+});
+use(
+  { onRequest: (ctx) => { order.push('req-A'); ctx.headers['X-A'] = '1'; }, onResponse: () => { order.push('res-A'); } },
+  { onRequest: (ctx) => { order.push('req-B'); ctx.headers['X-B'] = '1'; }, onResponse: () => { order.push('res-B'); } },
+);
+await listPets();
+console.log(JSON.stringify({ order, hasA: 'X-A' in headers, hasB: 'X-B' in headers }));
+`
+    ) as { order: string[]; hasA: boolean; hasB: boolean };
+
+    expect(captured.order).toEqual(['req-A', 'req-B', 'res-B', 'res-A']);
+    expect(captured.hasA).toBe(true);
+    expect(captured.hasB).toBe(true);
+  }, 60_000);
+
+  test('onError threads through each middleware in turn', () => {
+    const result = runConsumer(
+      dir,
+      `
+import { configure, use, getPetById, type ApiError } from './client.ts';
+
+configure({
+  fetch: (async () => new Response('{}', { status: 500, headers: { 'content-type': 'application/json' } })) as unknown as typeof fetch,
+});
+use(
+  { onError: (e: ApiError) => new Error('first:' + e.status) },
+  { onError: (e) => new Error('second:' + e.message) },
+);
+try {
+  await getPetById(1);
+  console.log(JSON.stringify({ threw: false }));
+} catch (e) {
+  console.log(JSON.stringify({ threw: true, message: (e as Error).message }));
+}
+`
+    ) as { threw: boolean; message: string };
+
+    expect(result.threw).toBe(true);
+    expect(result.message).toBe('second:first:500');
+  }, 60_000);
+
+  test('use() does not mutate a caller-provided middleware array (no cross-client leak)', () => {
+    const result = runConsumer(
+      dir,
+      `
+import { configure, use, listPets, type Middleware } from './client.ts';
+
+const mine: Middleware[] = [];
+configure({ middleware: mine, fetch: (async () => ${OK}) as unknown as typeof fetch });
+use({ onRequest: () => {} });
+await listPets();
+console.log(JSON.stringify({ mineLength: mine.length }));
+`
+    ) as { mineLength: number };
+
+    // use() must append to a fresh array, not push into the array the caller passed.
+    expect(result.mineLength).toBe(0);
+  }, 60_000);
+
+  test('the single config.onRequest hook still runs (as an implicit first middleware)', () => {
+    const captured = runConsumer(
+      dir,
+      `
+import { configure, use, listPets } from './client.ts';
+
+const order: string[] = [];
+configure({
+  onRequest: () => { order.push('config'); },
+  fetch: (async () => ${OK}) as unknown as typeof fetch,
+});
+use({ onRequest: () => { order.push('mw'); } });
+await listPets();
+console.log(JSON.stringify({ order }));
+`
+    ) as { order: string[] };
+
+    expect(captured.order).toEqual(['config', 'mw']);
+  }, 60_000);
+});
+
+describe('middleware — result error mode', () => {
+  let dir = '';
+  beforeAll(() => {
+    dir = mkdtempSync(join(tmpdir(), 'mw-result-'));
+    generate(dir, ['--error-mode', 'result']);
+  }, 60_000);
+  afterAll(() => {
+    if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
+  });
+
+  test('onRequest/onResponse run; onError does not fire (the error is returned, not thrown)', () => {
+    const result = runConsumer(
+      dir,
+      `
+import { configure, use, getPetById } from './client.ts';
+
+const ran: string[] = [];
+configure({
+  fetch: (async () => new Response('{"bad":true}', { status: 500, headers: { 'content-type': 'application/json' } })) as unknown as typeof fetch,
+});
+use({
+  onRequest: () => { ran.push('req'); },
+  onResponse: () => { ran.push('res'); },
+  onError: () => { ran.push('err'); return new Error('should-not-run'); },
+});
+const r = await getPetById(1) as { error: unknown; data: unknown };
+console.log(JSON.stringify({ ran, hasError: r.error !== undefined, hasData: r.data !== undefined }));
+`
+    ) as { ran: string[]; hasError: boolean; hasData: boolean };
+
+    // onRequest + onResponse ran; onError did NOT (result mode returns the error).
+    expect(result.ran).toEqual(['req', 'res']);
+    expect(result.hasError).toBe(true);
+    expect(result.hasData).toBe(false);
+  }, 60_000);
+});
+
+describe('middleware — service-class facade (use + constructor)', () => {
+  let dir = '';
+  beforeAll(() => {
+    dir = mkdtempSync(join(tmpdir(), 'mw-sc-'));
+    generate(dir, ['--facade', 'service-class', '--name', 'PetClient']);
+  }, 60_000);
+  afterAll(() => {
+    if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
+  });
+
+  test('constructor middleware runs before instance .use() middleware', () => {
+    const captured = runConsumer(
+      dir,
+      `
+import { PetClient } from './client.ts';
+
+const order: string[] = [];
+const client = new PetClient({
+  fetch: (async () => ${OK}) as unknown as typeof fetch,
+  middleware: [{ onRequest: () => { order.push('ctor'); } }],
+});
+client.use({ onRequest: () => { order.push('use'); } });
+await client.listPets();
+console.log(JSON.stringify({ order }));
+`
+    ) as { order: string[] };
+
+    expect(captured.order).toEqual(['ctor', 'use']);
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/mock.test.ts b/tests/e2e/generate-client/mock.test.ts
new file mode 100644
index 0000000000..ac15ea8e90
--- /dev/null
+++ b/tests/e2e/generate-client/mock.test.ts
@@ -0,0 +1,212 @@
+/**
+ * Behavioral e2e for the `mock` generator. We generate `sdk,mock` into a temp dir,
+ * then run a real consumer (via tsx) that installs the emitted MSW handlers into
+ * `setupServer` and calls a generated client operation whose native `fetch` MSW
+ * intercepts. With `onUnhandledRequest: 'error'`, a resolved call proves interception
+ * (an unmocked call would throw). The baked response is deterministic (from the
+ * sampler), so we assert exact field values.
+ */
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
+const fixture = join(__dirname, 'fixtures/base.yaml');
+// `@faker-js/faker` is hoisted to the repo root node_modules (a repo devDependency);
+// map it explicitly so tsc resolves the faker-mode module's `import { faker }` from the temp dir.
+const fakerPath = join(repoRoot, 'node_modules/@faker-js/faker');
+// A date-bearing fixture for the `--date-type Date` regression (mock + transformers).
+const dateFixture = join(__dirname, 'fixtures/transformers.yaml');
+const tsxBin = join(repoRoot, 'node_modules/.bin/tsx');
+
+function generate(dir: string, extraArgs: string[] = [], spec: string = fixture): void {
+  writeFileSync(join(dir, 'package.json'), JSON.stringify({ type: 'module' }), 'utf-8');
+  const out = join(dir, 'client.ts');
+  const result = spawnSync(
+    'node',
+    [cliEntry, 'generate-client', spec, '--output', out, ...extraArgs],
+    {
+      encoding: 'utf-8',
+      cwd: repoRoot,
+    }
+  );
+  if (result.status !== 0) throw new Error(`generate-client failed:\n${result.stderr}`);
+}
+
+function runConsumer(dir: string, script: string): unknown {
+  writeFileSync(join(dir, 'consumer.ts'), script, 'utf-8');
+  const result = spawnSync(tsxBin, [join(dir, 'consumer.ts')], {
+    encoding: 'utf-8',
+    cwd: repoRoot,
+  });
+  if (result.status !== 0) {
+    throw new Error(`consumer failed:\nstdout:\n${result.stdout}\nstderr:\n${result.stderr}`);
+  }
+  return JSON.parse(result.stdout.trim());
+}
+
+describe('mock generator — generated client through MSW', () => {
+  let dir = '';
+  beforeAll(() => {
+    // The consumer imports `msw` (a hoisted repo dep). Node ESM resolves modules
+    // relative to the importing file, so the temp dir must live inside the repo
+    // tree to walk up to the root node_modules — `os.tmpdir()` would not resolve it.
+    dir = mkdtempSync(join(__dirname, 'mock-consumer-'));
+    generate(dir, ['--generators', 'sdk,mock']);
+  }, 60_000);
+  afterAll(() => {
+    if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
+  });
+
+  test('emits a sibling client.mocks.ts', () => {
+    expect(existsSync(join(dir, 'client.mocks.ts'))).toBe(true);
+  });
+
+  test('handlers installed in setupServer intercept the generated fetch and return baked data', () => {
+    const result = runConsumer(
+      dir,
+      `
+import { setupServer } from 'msw/node';
+import { handlers } from './client.mocks.ts';
+import { configure, getPetById } from './client.ts';
+
+const server = setupServer(...handlers);
+server.listen({ onUnhandledRequest: 'error' });
+configure({ baseUrl: 'https://api.example.com' });
+try {
+  const pet = await getPetById(1);
+  process.stdout.write(JSON.stringify({ ok: pet !== undefined, id: pet.id, name: pet.name }));
+} finally {
+  server.close();
+}
+`
+    ) as { ok: boolean; id: number; name: string };
+
+    // Deterministic sampler output for the Pet schema in base.yaml.
+    expect(result.ok).toBe(true);
+    expect(result.id).toBe(0);
+    expect(result.name).toBe('string');
+  }, 60_000);
+
+  test('the generated client + mocks type-check together under strict mode', () => {
+    expect(existsSync(join(dir, 'client.mocks.ts')), 'generation must run first').toBe(true);
+
+    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+    const tsc = spawnSync(
+      tscBin,
+      [
+        '--noEmit',
+        '--strict',
+        // The temp dir lives inside the repo tree (so `msw` resolves), which puts the
+        // repo's own tsconfig.json on the upward search path; ignore it and type-check
+        // purely from these flags.
+        '--ignoreConfig',
+        '--target',
+        'ES2020',
+        '--module',
+        'esnext',
+        '--moduleResolution',
+        'bundler',
+        '--lib',
+        'ES2020,DOM',
+        join(dir, 'client.ts'),
+        join(dir, 'client.mocks.ts'),
+      ],
+      { encoding: 'utf-8', cwd: dir }
+    );
+    expect(tsc.status, `tsc errors:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+  }, 90_000);
+});
+
+describe('mock generator — mock + transformers + --date-type Date compile together', () => {
+  let dir = '';
+  beforeAll(() => {
+    dir = mkdtempSync(join(__dirname, 'mock-date-'));
+    // transformers REQUIRES --date-type Date; the sdk then types date fields `Date`,
+    // so the mock sampler must bake `new Date(...)` to type-check (BUG 1 regression).
+    generate(dir, ['--generators', 'sdk,mock,transformers', '--date-type', 'Date'], dateFixture);
+  }, 60_000);
+  afterAll(() => {
+    if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
+  });
+
+  test('strict-tsc-checks client + mocks + transformers together with 0 errors', () => {
+    expect(existsSync(join(dir, 'client.mocks.ts')), 'generation must run first').toBe(true);
+
+    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+    const tsc = spawnSync(
+      tscBin,
+      [
+        '--noEmit',
+        '--strict',
+        '--ignoreConfig',
+        '--target',
+        'ES2020',
+        '--module',
+        'esnext',
+        '--moduleResolution',
+        'bundler',
+        '--lib',
+        'ES2020,DOM',
+        join(dir, 'client.ts'),
+        join(dir, 'client.mocks.ts'),
+        join(dir, 'client.transformers.ts'),
+      ],
+      { encoding: 'utf-8', cwd: dir }
+    );
+    expect(tsc.status, `tsc errors:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+  }, 90_000);
+});
+
+describe('mock generator — faker mode strict-tsc-checks against real @faker-js/faker', () => {
+  let dir = '';
+  beforeAll(() => {
+    dir = mkdtempSync(join(__dirname, 'mock-faker-'));
+    generate(dir, ['--generators', 'sdk,mock', '--mock-data', 'faker', '--mock-seed', '42']);
+  }, 60_000);
+  afterAll(() => {
+    if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
+  });
+
+  test('emits the faker import, faker calls, and a seed pin', () => {
+    const source = readFileSync(join(dir, 'client.mocks.ts'), 'utf-8');
+    expect(source).toContain("import { faker } from '@faker-js/faker';");
+    expect(source).toMatch(/faker\.(number|lorem|datatype|string|internet|helpers)\./);
+    expect(source).toContain('faker.seed(42);');
+  });
+
+  test('the faker-mode client + mocks strict-tsc-check against real faker with 0 errors', () => {
+    expect(existsSync(join(dir, 'client.mocks.ts')), 'generation must run first').toBe(true);
+
+    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+    // A real-tsconfig run (not `--ignoreConfig`) so `paths` maps `@faker-js/faker` to the
+    // hoisted package — type-checking the emitted faker calls against faker's real v9 API.
+    writeFileSync(
+      join(dir, 'tsconfig.json'),
+      JSON.stringify({
+        compilerOptions: {
+          module: 'esnext',
+          moduleResolution: 'bundler',
+          target: 'ES2020',
+          lib: ['ES2020', 'DOM'],
+          strict: true,
+          noEmit: true,
+          skipLibCheck: true,
+          types: [],
+          paths: {
+            '@faker-js/faker': [fakerPath],
+            '@faker-js/faker/*': [join(fakerPath, '*')],
+          },
+        },
+        include: ['client.ts', 'client.mocks.ts'],
+      }),
+      'utf-8'
+    );
+
+    const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: dir });
+    expect(tsc.status, `tsc errors:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+  }, 90_000);
+});
diff --git a/tests/e2e/generate-client/multipart.test.ts b/tests/e2e/generate-client/multipart.test.ts
new file mode 100644
index 0000000000..d97581c934
--- /dev/null
+++ b/tests/e2e/generate-client/multipart.test.ts
@@ -0,0 +1,130 @@
+/**
+ * Behavioral e2e for typed multipart bodies (#5): the generated client takes a typed object
+ * and serializes it to `FormData` via `__toFormData` — binary→Blob, arrays→repeated fields,
+ * objects→JSON parts. We inject a fake `fetch` and inspect the FormData it actually sent.
+ */
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, readdirSync, rmSync, statSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const tsxBin = join(repoRoot, 'node_modules/.bin/tsx');
+const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+
+function collectTsFiles(d: string): string[] {
+  return readdirSync(d).flatMap((e) => {
+    const full = join(d, e);
+    return statSync(full).isDirectory() ? collectTsFiles(full) : full.endsWith('.ts') ? [full] : [];
+  });
+}
+
+const SPEC = `openapi: 3.1.0
+info: { title: M, version: 1.0.0 }
+paths:
+  /upload:
+    post:
+      operationId: upload
+      requestBody:
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              type: object
+              required: [file, orgId]
+              properties:
+                file: { type: string, format: binary }
+                orgId: { type: string }
+                tags: { type: array, items: { type: string } }
+                meta: { type: object }
+      responses: { '200': { description: ok } }
+`;
+
+describe('generate-client typed multipart body (#5)', () => {
+  let dir = '';
+  afterEach(() => {
+    if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
+  });
+
+  it('types the fields (binary→Blob) and serializes the object to FormData', () => {
+    dir = mkdtempSync(join(tmpdir(), 'ots-multipart-'));
+    writeFileSync(join(dir, 'package.json'), JSON.stringify({ type: 'module' }), 'utf-8');
+    writeFileSync(join(dir, 'api.yaml'), SPEC, 'utf-8');
+    const out = join(dir, 'client.ts');
+    const gen = spawnSync('node', [cli, 'generate-client', join(dir, 'api.yaml'), '--output', out], {
+      encoding: 'utf-8',
+      cwd: repoRoot,
+    });
+    expect(gen.status, gen.stderr).toBe(0);
+
+    writeFileSync(
+      join(dir, 'consumer.ts'),
+      `
+import { configure, upload } from './client.ts';
+
+let body: unknown;
+configure({
+  fetch: (async (_url: string, init: RequestInit) => {
+    body = init.body;
+    return new Response('', { status: 200 });
+  }) as unknown as typeof fetch,
+});
+
+const file = new Blob(['hello'], { type: 'text/plain' });
+await upload({ file, orgId: 'org_1', tags: ['a', 'b'], meta: { k: 'v' } });
+
+const fd = body as FormData;
+console.log(JSON.stringify({
+  isFormData: fd instanceof FormData,
+  orgId: fd.get('orgId'),
+  fileIsBlob: fd.get('file') instanceof Blob,
+  tags: fd.getAll('tags'),
+  meta: fd.get('meta'),
+}));
+`,
+      'utf-8'
+    );
+    const run = spawnSync(tsxBin, [join(dir, 'consumer.ts')], { encoding: 'utf-8', cwd: repoRoot });
+    expect(run.status, `${run.stdout}\n${run.stderr}`).toBe(0);
+    const result = JSON.parse(run.stdout.trim()) as Record<string, unknown>;
+
+    expect(result.isFormData).toBe(true);
+    expect(result.orgId).toBe('org_1');
+    expect(result.fileIsBlob).toBe(true);
+    expect(result.tags).toEqual(['a', 'b']); // array → one field per item
+    expect(result.meta).toBe('{"k":"v"}'); // nested object → JSON part
+  }, 60_000);
+
+  it('compiles in multi-file output (the __toFormData helper is imported into the endpoints module)', () => {
+    dir = mkdtempSync(join(tmpdir(), 'ots-multipart-tags-'));
+    writeFileSync(join(dir, 'api.yaml'), SPEC, 'utf-8');
+    const gen = spawnSync(
+      'node',
+      [cli, 'generate-client', join(dir, 'api.yaml'), '--output', join(dir, 'client.ts'), '--output-mode', 'tags'],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(gen.status, gen.stderr).toBe(0);
+    const files = collectTsFiles(dir);
+    const tsc = spawnSync(
+      tscBin,
+      [
+        '--noEmit',
+        '--strict',
+        '--target',
+        'ES2020',
+        '--module',
+        'esnext',
+        '--moduleResolution',
+        'bundler',
+        '--lib',
+        'ES2020,DOM',
+        ...files,
+      ],
+      { encoding: 'utf-8', cwd: dir }
+    );
+    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/name-collision.test.ts b/tests/e2e/generate-client/name-collision.test.ts
new file mode 100644
index 0000000000..141efc3fd9
--- /dev/null
+++ b/tests/e2e/generate-client/name-collision.test.ts
@@ -0,0 +1,88 @@
+// Regression: an operation whose `<Op>Result` alias name collides with an existing schema
+// name (operation `search` → the `SearchResult` schema it returns) must NOT emit the
+// self-referential `export type SearchResult = SearchResult;`. That alias is circular and, in
+// multi-file output, conflicts with the imported schema (TS2440) and duplicates the barrel
+// re-export (TS2308). `base.yaml` carries this shape (`operationId: search` → `$ref SearchResult`,
+// plus a `SearchResult` component). We generate the service-class/tags layout and strict-`tsc` it.
+import { spawnSync } from 'node:child_process';
+import { mkdtempSync, readdirSync, readFileSync, rmSync, statSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+const fixture = join(__dirname, 'fixtures', 'base.yaml');
+
+/** Recursively collect every generated `.ts` file under `dir`. */
+function collectTsFiles(dir: string): string[] {
+  const out: string[] = [];
+  for (const entry of readdirSync(dir)) {
+    const full = join(dir, entry);
+    if (statSync(full).isDirectory()) out.push(...collectTsFiles(full));
+    else if (entry.endsWith('.ts')) out.push(full);
+  }
+  return out;
+}
+
+describe('generate-client operation/schema name collision', () => {
+  it('does not emit a self-referential *Result alias; strict tsc passes over the tree', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-collision-'));
+    const entry = join(dir, 'client.ts');
+    const res = spawnSync(
+      'node',
+      [
+        cli,
+        'generate-client',
+        fixture,
+        '--output',
+        entry,
+        '--facade',
+        'service-class',
+        '--output-mode',
+        'tags',
+        '--args-style',
+        'grouped',
+      ],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(res.status, res.stderr).toBe(0);
+
+    const files = collectTsFiles(dir);
+    const allSource = files.map((f) => readFileSync(f, 'utf-8'));
+    // No file may contain the circular self-alias (self-referential variant).
+    for (let i = 0; i < files.length; i++) {
+      expect(allSource[i], `self-referential alias in ${files[i]}`).not.toMatch(
+        /export type (\w+) = \1;/
+      );
+    }
+    // Non-self-referential variant: `GetStatusResult` exists as a schema, so the op's
+    // `<Op>Result` alias must be suppressed — exactly one declaration across the tree.
+    const declarations = allSource.join('\n').match(/export type GetStatusResult\b/g) ?? [];
+    expect(declarations).toHaveLength(1);
+
+    // Strict tsc over the whole tree (bundler resolution handles the `.js` ESM imports).
+    const tsc = spawnSync(
+      tscBin,
+      [
+        '--noEmit',
+        '--strict',
+        '--noUnusedLocals',
+        '--target',
+        'ES2020',
+        '--module',
+        'esnext',
+        '--moduleResolution',
+        'bundler',
+        '--lib',
+        'ES2020,DOM',
+        ...files,
+      ],
+      { encoding: 'utf-8', cwd: dir }
+    );
+    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/parse-as.test.ts b/tests/e2e/generate-client/parse-as.test.ts
new file mode 100644
index 0000000000..5cc785ff2c
--- /dev/null
+++ b/tests/e2e/generate-client/parse-as.test.ts
@@ -0,0 +1,89 @@
+// Verifies the `parseAs` runtime escape hatch on the per-call `RequestOptions`:
+// the generated client emits the `ParseAs` type, threads `parseAs?` through
+// `RequestOptions`, and `__parse` decodes every kind (json/text/blob/arrayBuffer/
+// formData/stream/auto). We assert on the emitted source, prove the whole client
+// type-checks under strict `tsc`, and append a consumer snippet that calls an
+// operation with `{ parseAs: 'stream' }` / `{ parseAs: 'text' }` — type-checking
+// that proves the option is accepted by the generated operation signatures.
+//
+// No mock-server behavioral assertion here: `parseAs` is a pure runtime branch in
+// `__parse` (covered by the openapi-typescript unit suite) and the cafe-consumer
+// harness already exercises the default decoding path. Strict-tsc + string +
+// type-usage assertions are sufficient and keep this test process-light.
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+
+describe('generate-client parseAs', () => {
+  it('emits ParseAs + parseAs option, decodes every kind, and accepts parseAs per call', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-parseas-'));
+    const out = join(dir, 'client.ts');
+    const res = spawnSync(
+      'node',
+      [cli, 'generate-client', join(__dirname, 'fixtures', 'no-operationid.yaml'), '--output', out],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(res.status, res.stderr).toBe(0);
+    expect(existsSync(out)).toBe(true);
+    const generated = readFileSync(out, 'utf-8');
+
+    // The public `ParseAs` type and the option on `RequestOptions`.
+    expect(generated).toContain(
+      "export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';"
+    );
+    expect(generated).toMatch(/parseAs\?: ParseAs/);
+
+    // `__parse` gained the streaming / arrayBuffer / formData branches.
+    expect(generated).toContain('return response.body;');
+    expect(generated).toContain('return response.arrayBuffer();');
+    expect(generated).toContain('return response.formData();');
+
+    // A type-level consumer: calling the operation with `parseAs` must compile.
+    writeFileSync(
+      join(dir, 'usage.ts'),
+      [
+        "import { getGiftcardsCardId } from './client.js';",
+        '',
+        'export async function streamUsage() {',
+        "  return getGiftcardsCardId({ parseAs: 'stream' });",
+        '}',
+        '',
+        'export async function textUsage() {',
+        "  return getGiftcardsCardId({ parseAs: 'text' });",
+        '}',
+        '',
+        '// @ts-expect-error — parseAs is a closed union; bogus kinds are rejected.',
+        "export const bogus = getGiftcardsCardId({ parseAs: 'xml' });",
+        '',
+      ].join('\n'),
+      'utf-8'
+    );
+    writeFileSync(
+      join(dir, 'tsconfig.json'),
+      JSON.stringify({
+        compilerOptions: {
+          module: 'node16',
+          moduleResolution: 'node16',
+          target: 'es2022',
+          lib: ['ES2022', 'DOM'],
+          strict: true,
+          noEmit: true,
+          skipLibCheck: true,
+          types: [],
+        },
+        include: ['client.ts', 'usage.ts'],
+      }),
+      'utf-8'
+    );
+    const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
+    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/path-param-idents.test.ts b/tests/e2e/generate-client/path-param-idents.test.ts
new file mode 100644
index 0000000000..d4921c0d79
--- /dev/null
+++ b/tests/e2e/generate-client/path-param-idents.test.ts
@@ -0,0 +1,151 @@
+/**
+ * Behavioral e2e for non-identifier path parameters. OpenAPI allows parameter
+ * names that are not valid JS identifiers (`widget-id`), start with a digit
+ * (`2fa`), or collide with reserved words (`new`). The generator must sanitize
+ * each into a safe local argument name and use that same name in the URL
+ * substitution — otherwise the emitted client either fails to compile or encodes
+ * a literal string instead of the argument value.
+ *
+ * This generates a client from such a spec, type-checks it under strict mode
+ * (proving it compiles), then runs it through a fake `fetch` (proving the URL is
+ * built from the argument value).
+ */
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
+const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+const tsxBin = join(repoRoot, 'node_modules/.bin/tsx');
+
+const SPEC = `openapi: 3.0.3
+info:
+  title: Odd Names API
+  version: 1.0.0
+servers:
+  - url: https://api.example.com
+paths:
+  /widgets/{widget-id}:
+    get:
+      operationId: getWidget
+      parameters:
+        - name: widget-id
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: ok
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  id:
+                    type: string
+  /items/{new}:
+    get:
+      operationId: getItem
+      parameters:
+        - name: new
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: ok
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  id:
+                    type: string
+`;
+
+const TSCONFIG = JSON.stringify({
+  compilerOptions: {
+    module: 'node16',
+    moduleResolution: 'node16',
+    target: 'es2022',
+    lib: ['ES2022', 'DOM'],
+    strict: true,
+    noEmit: true,
+    noUnusedLocals: true,
+    noUnusedParameters: true,
+    skipLibCheck: true,
+    types: [],
+  },
+  include: ['client.ts'],
+});
+
+describe('non-identifier path parameters', () => {
+  let dir = '';
+  beforeAll(() => {
+    dir = mkdtempSync(join(tmpdir(), 'oddnames-'));
+    writeFileSync(join(dir, 'package.json'), JSON.stringify({ type: 'module' }), 'utf-8');
+    writeFileSync(join(dir, 'openapi.yaml'), SPEC, 'utf-8');
+    const result = spawnSync(
+      'node',
+      [cliEntry, 'generate-client', join(dir, 'openapi.yaml'), '--output', join(dir, 'client.ts')],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    if (result.status !== 0) throw new Error(`generate-client failed:\n${result.stderr}`);
+  }, 60_000);
+  afterAll(() => {
+    if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
+  });
+
+  test('emits safe argument names and matching URL substitutions', () => {
+    const client = spawnSync('cat', [join(dir, 'client.ts')], { encoding: 'utf-8' }).stdout;
+    // `widget-id` → `widget_id`; the URL uses the same identifier, not a literal.
+    expect(client).toContain('widget_id: string');
+    expect(client).toContain('${encodeURIComponent(String(widget_id))}');
+    expect(client).not.toContain('"widget-id": string');
+    // reserved word `new` → `_new`.
+    expect(client).toContain('_new: string');
+    expect(client).toContain('${encodeURIComponent(String(_new))}');
+  });
+
+  test('the generated client type-checks under strict mode', () => {
+    writeFileSync(join(dir, 'tsconfig.json'), TSCONFIG, 'utf-8');
+    const result = spawnSync(tscBin, ['--noEmit', '-p', join(dir, 'tsconfig.json')], {
+      encoding: 'utf-8',
+      cwd: repoRoot,
+    });
+    expect(result.status, `tsc failed:\n${result.stdout}\n${result.stderr}`).toBe(0);
+  }, 60_000);
+
+  test('builds the request URL from the argument value', () => {
+    const consumer = `
+import { configure, getWidget, getItem } from './client.ts';
+
+const urls: string[] = [];
+configure({
+  fetch: (async (url: string) => {
+    urls.push(url);
+    return new Response('{"id":"x"}', { status: 200, headers: { 'content-type': 'application/json' } });
+  }) as unknown as typeof fetch,
+});
+
+await getWidget('abc');
+await getItem('xyz');
+console.log(JSON.stringify(urls));
+`;
+    writeFileSync(join(dir, 'consumer.ts'), consumer, 'utf-8');
+    const result = spawnSync(tsxBin, [join(dir, 'consumer.ts')], {
+      encoding: 'utf-8',
+      cwd: repoRoot,
+    });
+    expect(result.status, `consumer failed:\n${result.stdout}\n${result.stderr}`).toBe(0);
+    const urls = JSON.parse(result.stdout.trim()) as string[];
+    expect(urls[0]).toBe('https://api.example.com/widgets/abc');
+    expect(urls[1]).toBe('https://api.example.com/items/xyz');
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/per-instance-auth.test.ts b/tests/e2e/generate-client/per-instance-auth.test.ts
new file mode 100644
index 0000000000..39998fc614
--- /dev/null
+++ b/tests/e2e/generate-client/per-instance-auth.test.ts
@@ -0,0 +1,78 @@
+// Behavioral proof of per-instance auth (the service-class facade's reason to exist):
+// two instances of the SAME generated client carry different `config.auth` and send
+// different credentials — without touching the module-global setters. A no-auth
+// instance sends nothing. We capture the wire `Authorization` header via an injected
+// `config.fetch`, so no mock server is needed.
+import { spawnSync } from 'node:child_process';
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const tsx = join(repoRoot, 'node_modules/.bin/tsx');
+
+const SPEC = `openapi: 3.1.0
+info: { title: Thing API, version: '1.0.0' }
+servers: [{ url: https://api.example.com }]
+components:
+  securitySchemes:
+    basicAuth: { type: http, scheme: basic }
+paths:
+  /thing:
+    get:
+      operationId: getThing
+      security: [{ basicAuth: [] }]
+      responses:
+        '200': { description: ok, content: { application/json: { schema: { type: object } } } }
+`;
+
+const DRIVER = `import { Client } from './client.js';
+
+const calls: (string | null)[] = [];
+const fakeFetch = (async (_url: string, init?: RequestInit) => {
+  const h = (init?.headers ?? {}) as Record<string, string>;
+  calls.push(h['Authorization'] ?? null);
+  return new Response('{}', { status: 200, headers: { 'content-type': 'application/json' } });
+}) as unknown as typeof fetch;
+
+async function main() {
+  const authed = new Client({ fetch: fakeFetch, auth: { basic: { username: 'alice', password: 'pw' } } });
+  const anon = new Client({ fetch: fakeFetch });
+  await authed.getThing();
+  await anon.getThing();
+  console.log(JSON.stringify(calls));
+}
+void main();
+`;
+
+describe('per-instance auth (service-class config.auth)', () => {
+  it('two instances send different credentials; a no-auth instance sends none', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-perinstance-'));
+    try {
+      writeFileSync(join(dir, 'openapi.yaml'), SPEC, 'utf-8');
+      // Mark the temp dir as ESM so tsx imports the generated `./client.js` and the
+      // driver's top-level structure resolve as modules.
+      writeFileSync(join(dir, 'package.json'), '{ "type": "module" }', 'utf-8');
+      const gen = spawnSync(
+        'node',
+        [cli, 'generate-client', join(dir, 'openapi.yaml'), '--output', join(dir, 'client.ts'), '--facade', 'service-class'],
+        { encoding: 'utf-8', cwd: repoRoot }
+      );
+      expect(gen.status, gen.stderr).toBe(0);
+
+      writeFileSync(join(dir, 'driver.ts'), DRIVER, 'utf-8');
+      const run = spawnSync(tsx, [join(dir, 'driver.ts')], { encoding: 'utf-8', cwd: dir });
+      expect(run.status, run.stderr).toBe(0);
+
+      const calls = JSON.parse(run.stdout.trim()) as (string | null)[];
+      const expected = 'Basic ' + Buffer.from('alice:pw').toString('base64');
+      expect(calls[0]).toBe(expected); // the authed instance sent its own basic credential
+      expect(calls[1]).toBeNull(); // the no-auth instance sent nothing (no global was set)
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/plugin.test.ts b/tests/e2e/generate-client/plugin.test.ts
new file mode 100644
index 0000000000..82c10b24e3
--- /dev/null
+++ b/tests/e2e/generate-client/plugin.test.ts
@@ -0,0 +1,53 @@
+// The experimental custom-generator (plugin) API end-to-end: a `generators` entry that is a path
+// specifier is dynamically imported and run alongside the built-ins, and a bad specifier fails fast.
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const cafe = join(__dirname, 'fixtures', 'cafe.yaml');
+const plugin = join(__dirname, 'fixtures', 'route-map-plugin.mjs');
+
+function run(args: string[]): { status: number | null; out: string } {
+  const res = spawnSync('node', [cli, 'generate-client', ...args], {
+    encoding: 'utf-8',
+    cwd: repoRoot,
+  });
+  return { status: res.status, out: `${res.stdout}\n${res.stderr}` };
+}
+
+describe('generate-client custom generator (plugin) API', () => {
+  it('loads a generator from a path specifier and runs it alongside the sdk', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-plugin-'));
+    const output = join(dir, 'client.ts');
+    const { status, out } = run([cafe, '--output', output, '--generators', `sdk,${plugin}`]);
+
+    expect(status, out).toBe(0);
+    expect(existsSync(output)).toBe(true);
+    const routesFile = output.replace(/\.ts$/, '.routes.ts');
+    expect(existsSync(routesFile)).toBe(true);
+    const routes = readFileSync(routesFile, 'utf-8');
+    expect(routes).toContain('export const routes = {');
+    // The plugin walked the same IR the built-ins see (real operations from cafe.yaml).
+    expect(routes).toMatch(/: '(GET|POST|PUT|PATCH|DELETE) \//);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('fails fast with an actionable message when a specifier cannot be loaded', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-plugin-'));
+    const { status, out } = run([
+      cafe,
+      '--output',
+      join(dir, 'client.ts'),
+      '--generators',
+      `sdk,${join(dir, 'missing-plugin.mjs')}`,
+    ]);
+    expect(status).not.toBe(0);
+    expect(out).toMatch(/Could not load generator/);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/query-styles.test.ts b/tests/e2e/generate-client/query-styles.test.ts
new file mode 100644
index 0000000000..1732676814
--- /dev/null
+++ b/tests/e2e/generate-client/query-styles.test.ts
@@ -0,0 +1,113 @@
+// Query-parameter serialization styles (P3.8). Generates a client from a spec
+// declaring non-default query styles, strict-`tsc`s it (the `styles` object
+// literal + 4th-arg `__buildUrl` call must type-check), asserts the emitted
+// source, and proves the WIRE FORMAT behaviorally.
+//
+// Behavioral approach: rather than stand up a mock server, we import the
+// generated client and stub `config.fetch` (via `configure`) to capture the
+// request URL, then assert it directly. This is the lightest harness that
+// proves `__buildUrl`'s output (literal delimiters + allowReserved on the
+// wire), which is the whole point of the feature.
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+const fixture = join(__dirname, 'fixtures', 'query-styles.yaml');
+
+describe('generate-client query serialization styles', () => {
+  let dir: string;
+  let generated: string;
+
+  beforeAll(() => {
+    dir = mkdtempSync(join(tmpdir(), 'ots-qstyles-'));
+    const out = join(dir, 'client.ts');
+    const res = spawnSync('node', [cli, 'generate-client', fixture, '--output', out], {
+      encoding: 'utf-8',
+      cwd: repoRoot,
+    });
+    expect(res.status, res.stderr).toBe(0);
+    expect(existsSync(out)).toBe(true);
+    generated = readFileSync(out, 'utf-8');
+  }, 60_000);
+
+  afterAll(() => {
+    if (dir) rmSync(dir, { recursive: true, force: true });
+  });
+
+  it('emits the styles literal for non-default params and none for the default param', () => {
+    // Styled array params carry their explicit style/explode.
+    expect(generated).toContain('"tags": { style: "pipeDelimited", explode: false }');
+    expect(generated).toContain('"q": { style: "spaceDelimited", explode: false }');
+    expect(generated).toContain('"ids": { style: "form", explode: false }');
+    // allowReserved param keeps the default form+explode but flags allowReserved.
+    expect(generated).toContain('"filter": { style: "form", explode: true, allowReserved: true }');
+    // The default param `limit` gets NO styles entry.
+    expect(generated).not.toContain('"limit":');
+    // The styles literal is passed as the 4th arg to __buildUrl.
+    expect(generated).toMatch(/__buildUrl\(__config, `\/search`, params, \{/);
+  });
+
+  it('strict-tsc type-checks the generated client', () => {
+    writeFileSync(
+      join(dir, 'tsconfig.json'),
+      JSON.stringify({
+        compilerOptions: {
+          module: 'node16',
+          moduleResolution: 'node16',
+          target: 'es2022',
+          lib: ['ES2022', 'DOM'],
+          strict: true,
+          noEmit: true,
+          skipLibCheck: true,
+          types: [],
+        },
+        include: ['client.ts'],
+      }),
+      'utf-8'
+    );
+    const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
+    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+  }, 60_000);
+
+  it('serializes the wire format: literal delimiters + allowReserved', () => {
+    // A tiny consumer imports the generated client, stubs config.fetch to
+    // capture the URL, and writes it to stdout.
+    const runner = join(dir, 'run.mts');
+    writeFileSync(
+      runner,
+      [
+        `import { search, configure } from './client.ts';`,
+        `let captured = '';`,
+        `configure({`,
+        `  fetch: async (url) => {`,
+        `    captured = String(url);`,
+        `    return new Response('{"results":[]}', { status: 200, headers: { 'content-type': 'application/json' } });`,
+        `  },`,
+        `});`,
+        `await search({ tags: ['a', 'b'], q: ['x', 'y'], ids: ['1', '2'], filter: 'a/b', limit: 5 });`,
+        `process.stdout.write(captured);`,
+        ``,
+      ].join('\n'),
+      'utf-8'
+    );
+    const run = spawnSync('npx', ['tsx', runner], { encoding: 'utf-8', cwd: dir });
+    expect(run.status, `consumer stderr:\n${run.stderr}`).toBe(0);
+    const url = run.stdout.trim();
+    // pipeDelimited: literal `|` on the wire (NOT %7C).
+    expect(url).toContain('tags=a|b');
+    // spaceDelimited: literal `%20` space delimiter between values.
+    expect(url).toContain('q=x%20y');
+    // form + explode:false: literal `,` delimiter.
+    expect(url).toContain('ids=1,2');
+    // allowReserved: the `/` survives un-encoded (NOT %2F).
+    expect(url).toContain('filter=a/b');
+    // The default param still encodes normally.
+    expect(url).toContain('limit=5');
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
new file mode 100644
index 0000000000..3a618fc4f1
--- /dev/null
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -0,0 +1,83 @@
+// generate-client reads its settings from a `redocly.yaml` `x-openapi-typescript`
+// block (auto-discovered from the cwd / `--config`), with CLI flags overriding it.
+// This is the redocly.yaml ingestion path the examples use (no `--config-file`).
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync, copyFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const fixture = join(__dirname, 'fixtures', 'cafe.yaml');
+
+/** Write a temp project: a vendored spec + a redocly.yaml carrying the extension block. */
+function project(xConfig: string): string {
+  const dir = mkdtempSync(join(tmpdir(), 'ots-redocly-'));
+  copyFileSync(fixture, join(dir, 'openapi.yaml'));
+  writeFileSync(join(dir, 'redocly.yaml'), `x-openapi-typescript:\n${xConfig}`, 'utf-8');
+  return dir;
+}
+
+describe('generate-client redocly.yaml config (x-openapi-typescript)', () => {
+  it('generates from the redocly.yaml block with no flags or --config-file', () => {
+    const dir = project(
+      ['  input: ./openapi.yaml', '  output: ./src/api/client.ts', '  generators: [sdk]', '  facade: service-class'].join('\n') + '\n'
+    );
+    const res = spawnSync('node', [cli, 'generate-client'], { cwd: dir, encoding: 'utf-8' });
+    expect(res.status, res.stderr).toBe(0);
+    const out = join(dir, 'src/api/client.ts');
+    expect(existsSync(out)).toBe(true);
+    // facade + generators came from the redocly.yaml block.
+    expect(readFileSync(out, 'utf-8')).toContain('export class Client');
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('resolves an `apis:` alias passed as <input> to that API’s root', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-alias-'));
+    copyFileSync(fixture, join(dir, 'openapi.yaml'));
+    writeFileSync(join(dir, 'redocly.yaml'), 'apis:\n  cafe:\n    root: ./openapi.yaml\n', 'utf-8');
+    // `cafe` is an alias, not a file path — it must resolve to ./openapi.yaml.
+    const res = spawnSync('node', [cli, 'generate-client', 'cafe', '--output', join(dir, 'out.ts')], {
+      cwd: dir,
+      encoding: 'utf-8',
+    });
+    expect(res.status, res.stderr).toBe(0);
+    expect(existsSync(join(dir, 'out.ts'))).toBe(true);
+    expect(readFileSync(join(dir, 'out.ts'), 'utf-8')).toContain('export async function listMenuItems');
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('lets a CLI flag override the redocly.yaml block (flags win)', () => {
+    const dir = project(
+      ['  input: ./openapi.yaml', '  output: ./src/api/client.ts', '  generators: [sdk]', '  facade: service-class'].join('\n') + '\n'
+    );
+    // Override facade: service-class (in redocly.yaml) → functions (flag).
+    const res = spawnSync('node', [cli, 'generate-client', '--facade', 'functions'], {
+      cwd: dir,
+      encoding: 'utf-8',
+    });
+    expect(res.status, res.stderr).toBe(0);
+    const src = readFileSync(join(dir, 'src/api/client.ts'), 'utf-8');
+    expect(src).toContain('export async function');
+    expect(src).not.toContain('export class Client');
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('resolves the block’s relative input/output against the redocly.yaml directory', () => {
+    const dir = project(
+      ['  input: ./openapi.yaml', '  output: ./out/client.ts', '  generators: [sdk]'].join('\n') + '\n'
+    );
+    // Run from the repo root, pointing at the config elsewhere via --config.
+    const res = spawnSync(
+      'node',
+      [cli, 'generate-client', '--config', join(dir, 'redocly.yaml')],
+      { cwd: repoRoot, encoding: 'utf-8' }
+    );
+    expect(res.status, res.stderr).toBe(0);
+    // input/output resolved relative to the redocly.yaml dir, not the cwd.
+    expect(existsSync(join(dir, 'out/client.ts'))).toBe(true);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/retry.test.ts b/tests/e2e/generate-client/retry.test.ts
new file mode 100644
index 0000000000..912a3db60c
--- /dev/null
+++ b/tests/e2e/generate-client/retry.test.ts
@@ -0,0 +1,149 @@
+/**
+ * Behavioral e2e for retry. Injects a fake `fetch` via `configure()` so we can
+ * script transient failures and count attempts deterministically — no live server.
+ */
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
+const fixture = join(__dirname, 'fixtures/base.yaml');
+const tsxBin = join(repoRoot, 'node_modules/.bin/tsx');
+
+function generate(dir: string): void {
+  writeFileSync(join(dir, 'package.json'), JSON.stringify({ type: 'module' }), 'utf-8');
+  const out = join(dir, 'client.ts');
+  const result = spawnSync('node', [cliEntry, 'generate-client', fixture, '--output', out], {
+    encoding: 'utf-8',
+    cwd: repoRoot,
+  });
+  if (result.status !== 0) throw new Error(`generate-client failed:\n${result.stderr}`);
+}
+
+function runConsumer(dir: string, script: string): unknown {
+  writeFileSync(join(dir, 'consumer.ts'), script, 'utf-8');
+  const result = spawnSync(tsxBin, [join(dir, 'consumer.ts')], {
+    encoding: 'utf-8',
+    cwd: repoRoot,
+  });
+  if (result.status !== 0) {
+    throw new Error(`consumer failed:\nstdout:\n${result.stdout}\nstderr:\n${result.stderr}`);
+  }
+  return JSON.parse(result.stdout.trim());
+}
+
+describe('retry behavior', () => {
+  let dir = '';
+  beforeAll(() => {
+    dir = mkdtempSync(join(tmpdir(), 'retry-'));
+    generate(dir);
+  }, 60_000);
+  afterAll(() => {
+    if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
+  });
+
+  test('retries a GET on 503 then succeeds; default is no retry', () => {
+    const result = runConsumer(
+      dir,
+      `
+import { configure, listPets } from './client.ts';
+
+let calls = 0;
+const makeFetch = (failures: number) =>
+  (async () => {
+    calls++;
+    if (calls <= failures) {
+      return new Response('busy', { status: 503, headers: { 'content-type': 'text/plain' } });
+    }
+    return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
+  }) as unknown as typeof fetch;
+
+// retries: 0 (default) → one call, throws.
+calls = 0;
+configure({ fetch: makeFetch(1) });
+let defaultThrew = false;
+try { await listPets(); } catch { defaultThrew = true; }
+const defaultCalls = calls;
+
+// retries: 3, fast backoff → recovers after 2 failures.
+calls = 0;
+configure({ fetch: makeFetch(2), retry: { retries: 3, retryDelay: 1 } });
+await listPets();
+const retryCalls = calls;
+
+console.log(JSON.stringify({ defaultThrew, defaultCalls, retryCalls }));
+`
+    ) as { defaultThrew: boolean; defaultCalls: number; retryCalls: number };
+
+    expect(result.defaultThrew).toBe(true);
+    expect(result.defaultCalls).toBe(1);
+    expect(result.retryCalls).toBe(3); // 2 failures + 1 success
+  }, 60_000);
+
+  test('does NOT retry a non-idempotent POST by default, but does when retryOn opts in', () => {
+    const result = runConsumer(
+      dir,
+      `
+import { configure, createPet } from './client.ts';
+
+let calls = 0;
+const failing = (async () => {
+  calls++;
+  return new Response('err', { status: 503, headers: { 'content-type': 'text/plain' } });
+}) as unknown as typeof fetch;
+
+// default predicate: POST is not idempotent → no retry.
+calls = 0;
+configure({ fetch: failing, retry: { retries: 3, retryDelay: 1 } });
+try { await createPet({ name: 'x' } as any); } catch {}
+const defaultCalls = calls;
+
+// retryOn: () => true → POST retried.
+calls = 0;
+configure({ fetch: failing, retry: { retries: 3, retryDelay: 1, retryOn: () => true } });
+try { await createPet({ name: 'x' } as any); } catch {}
+const optInCalls = calls;
+
+console.log(JSON.stringify({ defaultCalls, optInCalls }));
+`
+    ) as { defaultCalls: number; optInCalls: number };
+
+    expect(result.defaultCalls).toBe(1); // POST not retried by default
+    expect(result.optInCalls).toBe(4); // 1 + 3 retries
+  }, 60_000);
+
+  test('aborting during backoff stops retries and rejects', () => {
+    const result = runConsumer(
+      dir,
+      `
+import { configure, listPets } from './client.ts';
+
+let calls = 0;
+const failing = (async () => {
+  calls++;
+  return new Response('err', { status: 503, headers: { 'content-type': 'text/plain' } });
+}) as unknown as typeof fetch;
+
+configure({ fetch: failing, retry: { retries: 5, retryDelay: 50 } });
+const controller = new AbortController();
+setTimeout(() => controller.abort(), 10);
+
+let aborted = false;
+try {
+  // listPets takes (params, init); the signal belongs on init.
+  await listPets({}, { signal: controller.signal });
+} catch (e) {
+  aborted = (e as Error).name === 'AbortError';
+}
+console.log(JSON.stringify({ aborted, calls }));
+`
+    ) as { aborted: boolean; calls: number };
+
+    expect(result.aborted).toBe(true);
+    expect(result.calls).toBe(1); // aborted during the first backoff; no second attempt
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/service-class.test.ts b/tests/e2e/generate-client/service-class.test.ts
new file mode 100644
index 0000000000..167b338049
--- /dev/null
+++ b/tests/e2e/generate-client/service-class.test.ts
@@ -0,0 +1,296 @@
+/**
+ * E2E for `--facade service-class`: the emitted class-shaped client must compile
+ * under strict `tsc` with `--noUnusedLocals` (proving the hoisted aliases, method
+ * signatures, and runtime references are all sound), across every output mode.
+ *
+ * Uses cafe.yaml because it exercises auth, header params, named types, and
+ * discriminated-union guards — the same surface the functions facade is tested on.
+ */
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, readFileSync, readdirSync, rmSync, statSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
+const fixture = join(__dirname, 'fixtures/cafe.yaml');
+
+const TSC_ARGS = [
+  '--noEmit',
+  '--strict',
+  '--noUnusedLocals',
+  '--target',
+  'ES2020',
+  '--module',
+  'esnext',
+  '--moduleResolution',
+  'bundler',
+  '--lib',
+  'ES2020,DOM',
+];
+
+function collectTsFiles(dir: string): string[] {
+  const out: string[] = [];
+  for (const entry of readdirSync(dir)) {
+    const full = join(dir, entry);
+    if (statSync(full).isDirectory()) out.push(...collectTsFiles(full));
+    else if (entry.endsWith('.ts')) out.push(full);
+  }
+  return out;
+}
+
+describe('generate-client end-to-end (--facade service-class, --output-mode single)', () => {
+  let workDir = '';
+  let entry = '';
+
+  beforeAll(() => {
+    workDir = mkdtempSync(join(tmpdir(), 'sc-single-client-'));
+    entry = join(workDir, 'client.ts');
+  });
+
+  afterAll(() => {
+    if (workDir && existsSync(workDir)) rmSync(workDir, { recursive: true, force: true });
+  });
+
+  test('emits one named Client class with the operations as methods', () => {
+    const result = spawnSync(
+      'node',
+      [
+        cliEntry,
+        'generate-client',
+        fixture,
+        '--output',
+        entry,
+        '--facade',
+        'service-class',
+        '--name',
+        'CafeClient',
+      ],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(result.status, `generate-client stderr:\n${result.stderr}`).toBe(0);
+    expect(existsSync(entry)).toBe(true);
+
+    const src = readFileSync(entry, 'utf-8');
+    expect(src).toContain('export class CafeClient {');
+    expect(src).not.toContain('export async function');
+    // Methods live inside the class, bodies still call the shared runtime.
+    expect(src).toMatch(/\basync \w+\(/);
+    expect(src).toMatch(/return __request<[^>]*>\(this\.config,/);
+    // Operation aliases are hoisted to module level, ahead of the class.
+    expect(src).toMatch(/export type \w+Result/);
+    expect(src.search(/export type \w+Result/)).toBeLessThan(
+      src.indexOf('export class CafeClient {')
+    );
+  }, 90_000);
+
+  test('the class-shaped client type-checks under strict mode with no unused locals', () => {
+    expect(existsSync(entry), 'generation test must run first').toBe(true);
+    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+    const tsc = spawnSync(tscBin, [...TSC_ARGS, ...collectTsFiles(workDir)], {
+      encoding: 'utf-8',
+      cwd: workDir,
+    });
+    expect(tsc.status, `tsc errors:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+  }, 90_000);
+});
+
+describe('generate-client end-to-end (--facade service-class, --output-mode split)', () => {
+  let workDir = '';
+  let entry = '';
+
+  beforeAll(() => {
+    workDir = mkdtempSync(join(tmpdir(), 'sc-split-client-'));
+    entry = join(workDir, 'client.ts');
+  });
+
+  afterAll(() => {
+    if (workDir && existsSync(workDir)) rmSync(workDir, { recursive: true, force: true });
+  });
+
+  test('places the Client class in the entry beside the shared http + schemas modules', () => {
+    const result = spawnSync(
+      'node',
+      [
+        cliEntry,
+        'generate-client',
+        fixture,
+        '--output',
+        entry,
+        '--facade',
+        'service-class',
+        '--output-mode',
+        'split',
+      ],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(result.status, `generate-client stderr:\n${result.stderr}`).toBe(0);
+    expect(existsSync(join(workDir, 'client.http.ts'))).toBe(true);
+    expect(existsSync(join(workDir, 'client.schemas.ts'))).toBe(true);
+
+    const src = readFileSync(entry, 'utf-8');
+    // Default class name (no --name) is `Client`; it lives in the entry and imports
+    // the shared runtime/types from the sibling modules.
+    expect(src).toContain('export class Client {');
+    expect(src).toContain('from "./client.http.js"');
+    expect(src).toContain("export * from './client.schemas.js';");
+  }, 90_000);
+
+  test('the split class-shaped set type-checks under strict mode with no unused locals', () => {
+    expect(existsSync(entry), 'generation test must run first').toBe(true);
+    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+    const tsc = spawnSync(tscBin, [...TSC_ARGS, ...collectTsFiles(workDir)], {
+      encoding: 'utf-8',
+      cwd: workDir,
+    });
+    expect(tsc.status, `tsc errors:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+  }, 90_000);
+});
+
+describe('generate-client end-to-end (--facade service-class, --output-mode tags)', () => {
+  let workDir = '';
+  let entry = '';
+
+  beforeAll(() => {
+    workDir = mkdtempSync(join(tmpdir(), 'sc-tags-client-'));
+    entry = join(workDir, 'client.ts');
+  });
+
+  afterAll(() => {
+    if (workDir && existsSync(workDir)) rmSync(workDir, { recursive: true, force: true });
+  });
+
+  test('emits one service class per tag and re-exports them from the barrel', () => {
+    const result = spawnSync(
+      'node',
+      [
+        cliEntry,
+        'generate-client',
+        fixture,
+        '--output',
+        entry,
+        '--facade',
+        'service-class',
+        '--output-mode',
+        'tags',
+      ],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(result.status, `generate-client stderr:\n${result.stderr}`).toBe(0);
+
+    expect(readFileSync(join(workDir, 'Products.ts'), 'utf-8')).toContain(
+      'export class ProductsService {'
+    );
+    expect(readFileSync(join(workDir, 'Orders.ts'), 'utf-8')).toContain(
+      'export class OrdersService {'
+    );
+    const entrySrc = readFileSync(entry, 'utf-8');
+    expect(entrySrc).toContain("export * from './Products.js';");
+    expect(entrySrc).toContain("export * from './Orders.js';");
+
+    // The OPERATIONS metadata map is facade-independent: it lives once in the
+    // shared schemas module (not per-tag) and is re-exported from the barrel.
+    const schemasSrc = readFileSync(join(workDir, 'client.schemas.ts'), 'utf-8');
+    expect(schemasSrc).toContain('export const OPERATIONS = {');
+    expect(entrySrc).toContain("export * from './client.schemas.js';");
+    expect(readFileSync(join(workDir, 'Products.ts'), 'utf-8')).not.toContain(
+      'export const OPERATIONS'
+    );
+  }, 90_000);
+
+  test('the tags class-shaped set type-checks under strict mode with no unused locals', () => {
+    expect(existsSync(entry), 'generation test must run first').toBe(true);
+    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+    const tsc = spawnSync(tscBin, [...TSC_ARGS, ...collectTsFiles(workDir)], {
+      encoding: 'utf-8',
+      cwd: workDir,
+    });
+    expect(tsc.status, `tsc errors:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+  }, 90_000);
+});
+
+describe('generate-client end-to-end (--facade service-class, --output-mode tags-split)', () => {
+  let workDir = '';
+  let entry = '';
+
+  beforeAll(() => {
+    workDir = mkdtempSync(join(tmpdir(), 'sc-tags-split-client-'));
+    entry = join(workDir, 'client.ts');
+  });
+
+  afterAll(() => {
+    if (workDir && existsSync(workDir)) rmSync(workDir, { recursive: true, force: true });
+  });
+
+  test('emits one service class per tag folder, importing the shared modules via ../', () => {
+    const result = spawnSync(
+      'node',
+      [
+        cliEntry,
+        'generate-client',
+        fixture,
+        '--output',
+        entry,
+        '--facade',
+        'service-class',
+        '--output-mode',
+        'tags-split',
+      ],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(result.status, `generate-client stderr:\n${result.stderr}`).toBe(0);
+
+    const productsFile = join(workDir, 'Products', 'client.ts');
+    expect(existsSync(productsFile)).toBe(true);
+    const productsSrc = readFileSync(productsFile, 'utf-8');
+    expect(productsSrc).toContain('export class ProductsService {');
+    expect(productsSrc).toContain('from "../client.http.js"');
+    expect(readFileSync(entry, 'utf-8')).toContain("export * from './Products/client.js';");
+  }, 90_000);
+
+  test('the tags-split class-shaped tree type-checks under strict mode with no unused locals', () => {
+    expect(existsSync(entry), 'generation test must run first').toBe(true);
+    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+    const tsc = spawnSync(tscBin, [...TSC_ARGS, ...collectTsFiles(workDir)], {
+      encoding: 'utf-8',
+      cwd: workDir,
+    });
+    expect(tsc.status, `tsc errors:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+  }, 90_000);
+});
+
+describe('generate-client end-to-end — shared runtime across facades', () => {
+  test('the emitted http (core) module is byte-identical for functions and service-class', () => {
+    const fnDir = mkdtempSync(join(tmpdir(), 'fn-core-'));
+    const scDir = mkdtempSync(join(tmpdir(), 'sc-core-'));
+    try {
+      const gen = (dir: string, facade: string) =>
+        spawnSync(
+          'node',
+          [
+            cliEntry,
+            'generate-client',
+            fixture,
+            '--output',
+            join(dir, 'client.ts'),
+            '--output-mode',
+            'split',
+            '--facade',
+            facade,
+          ],
+          { encoding: 'utf-8', cwd: repoRoot }
+        );
+      expect(gen(fnDir, 'functions').status).toBe(0);
+      expect(gen(scDir, 'service-class').status).toBe(0);
+
+      const fnHttp = readFileSync(join(fnDir, 'client.http.ts'), 'utf-8');
+      const scHttp = readFileSync(join(scDir, 'client.http.ts'), 'utf-8');
+      expect(scHttp).toBe(fnHttp);
+    } finally {
+      rmSync(fnDir, { recursive: true, force: true });
+      rmSync(scDir, { recursive: true, force: true });
+    }
+  }, 90_000);
+});
diff --git a/tests/e2e/generate-client/spec-versions.test.ts b/tests/e2e/generate-client/spec-versions.test.ts
new file mode 100644
index 0000000000..b42c7e2ab0
--- /dev/null
+++ b/tests/e2e/generate-client/spec-versions.test.ts
@@ -0,0 +1,67 @@
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+
+function generateAndTypecheck(fixture: string): { generated: string } {
+  const dir = mkdtempSync(join(tmpdir(), 'ots-specver-'));
+  const out = join(dir, 'client.ts');
+  const res = spawnSync(
+    'node',
+    [cli, 'generate-client', join(__dirname, 'fixtures', fixture), '--output', out],
+    { encoding: 'utf-8', cwd: repoRoot }
+  );
+  expect(res.status, res.stderr).toBe(0);
+  expect(existsSync(out)).toBe(true);
+  const generated = readFileSync(out, 'utf-8');
+  writeFileSync(
+    join(dir, 'tsconfig.json'),
+    JSON.stringify({
+      compilerOptions: {
+        module: 'node16',
+        moduleResolution: 'node16',
+        target: 'es2022',
+        lib: ['ES2022', 'DOM'],
+        strict: true,
+        noEmit: true,
+        skipLibCheck: true,
+        types: [],
+      },
+      include: ['client.ts'],
+    }),
+    'utf-8'
+  );
+  const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
+  expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+  rmSync(dir, { recursive: true, force: true });
+  return { generated };
+}
+
+describe('generate-client spec versions', () => {
+  it('generates a type-checking client from a Swagger 2.0 document', () => {
+    const { generated } = generateAndTypecheck('swagger2.yaml');
+    expect(generated).toContain('export async function getPet');
+    expect(generated).toContain('export async function createPet');
+    expect(generated).toContain('export type Pet');
+    expect(generated).toContain('let BASE = "https://api.example.com/v2"');
+  }, 60_000);
+
+  it('generates a type-checking client from an OpenAPI 3.2 document', () => {
+    const { generated } = generateAndTypecheck('oas3.2.yaml');
+    expect(generated).toContain('export async function getThing');
+    expect(generated).toContain('export type Thing');
+    // 3.1/3.2 nullable enum renders as a nullable union.
+    expect(generated).toMatch(/status\?:\s*\("active" \| "archived"\) \| null;/);
+  }, 60_000);
+
+  it('synthesizes operation names from method+path when operationId is omitted', () => {
+    const { generated } = generateAndTypecheck('no-operationid.yaml');
+    expect(generated).toContain('export async function getGiftcardsCardId');
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/split.test.ts b/tests/e2e/generate-client/split.test.ts
new file mode 100644
index 0000000000..943d58d31a
--- /dev/null
+++ b/tests/e2e/generate-client/split.test.ts
@@ -0,0 +1,89 @@
+/**
+ * E2E for `--output-mode split`: the generated multi-file set must compile under
+ * strict `tsc` with `--noUnusedLocals`, which proves both that cross-file imports
+ * resolve and that each file imports exactly what it uses (no over-importing).
+ *
+ * Uses cafe.yaml because it exercises the full http module (bearer + apiKey auth,
+ * header params) and the schemas module (named types + discriminated-union guards).
+ */
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
+const fixture = join(__dirname, 'fixtures/cafe.yaml');
+
+describe('generate-client end-to-end (--output-mode split)', () => {
+  let workDir = '';
+  let entry = '';
+  let httpFile = '';
+  let schemasFile = '';
+
+  beforeAll(() => {
+    workDir = mkdtempSync(join(tmpdir(), 'split-client-'));
+    entry = join(workDir, 'client.ts');
+    httpFile = join(workDir, 'client.http.ts');
+    schemasFile = join(workDir, 'client.schemas.ts');
+  });
+
+  afterAll(() => {
+    if (workDir && existsSync(workDir)) {
+      rmSync(workDir, { recursive: true, force: true });
+    }
+  });
+
+  test('writes three sibling files derived from --output', () => {
+    const result = spawnSync(
+      'node',
+      [cliEntry, 'generate-client', fixture, '--output', entry, '--output-mode', 'split'],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(result.status, `generate-client stderr:\n${result.stderr}`).toBe(0);
+    expect(existsSync(entry)).toBe(true);
+    expect(existsSync(httpFile)).toBe(true);
+    expect(existsSync(schemasFile)).toBe(true);
+
+    const entrySrc = readFileSync(entry, 'utf-8');
+    // The entry imports helpers/types and re-exports the public surface.
+    expect(entrySrc).toContain('from "./client.http.js"');
+    expect(entrySrc).toContain('import type {');
+    expect(entrySrc).toContain("export * from './client.schemas.js';");
+
+    // The http module holds the runtime + auth; schemas holds the model types.
+    const httpSrc = readFileSync(httpFile, 'utf-8');
+    expect(httpSrc).toContain('export async function __request<T>(');
+    expect(httpSrc).toContain('export function setBearer(');
+    expect(readFileSync(schemasFile, 'utf-8')).toContain('export type ');
+  }, 90_000);
+
+  test('the multi-file set type-checks under strict mode with no unused imports', () => {
+    expect(existsSync(entry), 'generation test must run first').toBe(true);
+
+    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+    const tsc = spawnSync(
+      tscBin,
+      [
+        '--noEmit',
+        '--strict',
+        '--noUnusedLocals',
+        '--target',
+        'ES2020',
+        '--module',
+        'esnext',
+        '--moduleResolution',
+        'bundler',
+        '--lib',
+        'ES2020,DOM',
+        entry,
+        httpFile,
+        schemasFile,
+      ],
+      { encoding: 'utf-8', cwd: workDir }
+    );
+    expect(tsc.status, `tsc errors:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+  }, 90_000);
+});
diff --git a/tests/e2e/generate-client/sse-consumer/index-abort.ts b/tests/e2e/generate-client/sse-consumer/index-abort.ts
new file mode 100644
index 0000000000..f2a9d9713f
--- /dev/null
+++ b/tests/e2e/generate-client/sse-consumer/index-abort.ts
@@ -0,0 +1,33 @@
+import { configure, sse } from './api.js';
+
+const baseUrl = process.argv[2] ?? process.env.SSE_BASE_URL ?? 'http://127.0.0.1:3104';
+
+// Aborting an SSE stream via AbortSignal must terminate the `for await` loop
+// cleanly — the iterator completes and NO AbortError escapes the loop.
+async function main(): Promise<void> {
+  configure({ baseUrl });
+
+  const controller = new AbortController();
+  let received = 0;
+  let error: string | null = null;
+
+  try {
+    for await (const ev of sse.streamAbort({ signal: controller.signal })) {
+      void ev;
+      received++;
+      // Abort mid-stream, after the first event, while the server holds open.
+      if (received === 1) {
+        setTimeout(() => controller.abort(), 50);
+      }
+    }
+  } catch (e) {
+    error = e instanceof Error ? e.name : String(e);
+  }
+
+  process.stdout.write(JSON.stringify({ aborted: true, received, error }) + '\n');
+}
+
+main().catch((e) => {
+  process.stderr.write(`UNHANDLED: ${e instanceof Error ? e.message : String(e)}\n`);
+  process.exit(1);
+});
diff --git a/tests/e2e/generate-client/sse-consumer/index.ts b/tests/e2e/generate-client/sse-consumer/index.ts
new file mode 100644
index 0000000000..ec783b8110
--- /dev/null
+++ b/tests/e2e/generate-client/sse-consumer/index.ts
@@ -0,0 +1,37 @@
+import { configure, sse } from './api.js';
+
+const baseUrl = process.argv[2] ?? process.env.SSE_BASE_URL ?? 'http://127.0.0.1:3104';
+
+type Collected = { text: string; id: string | undefined };
+
+async function main(): Promise<void> {
+  configure({ baseUrl });
+
+  // Collect events across an auto-reconnect: the server drops after `b`, the
+  // client resumes with `Last-Event-ID: 2` and receives `c`. `ev.data` is the
+  // typed `Message`, so `ev.data.text` is statically a string.
+  const collected: Collected[] = [];
+  for await (const ev of sse.streamMessages()) {
+    collected.push({ text: ev.data.text, id: ev.id });
+    if (collected.length >= 3) break;
+  }
+
+  const logResponse = await fetch(`${baseUrl}/__test__/log`);
+  const log = (await logResponse.json()) as Array<{ path: string; lastEventId: string | null }>;
+  const lastEventIds = log
+    .filter((entry) => entry.path === '/messages')
+    .map((entry) => entry.lastEventId);
+
+  process.stdout.write(
+    JSON.stringify({
+      events: collected.map((e) => e.text),
+      ids: collected.map((e) => e.id),
+      lastEventIds,
+    }) + '\n'
+  );
+}
+
+main().catch((error) => {
+  process.stderr.write(`UNHANDLED: ${error instanceof Error ? error.message : String(error)}\n`);
+  process.exit(1);
+});
diff --git a/tests/e2e/generate-client/sse-consumer/package.json b/tests/e2e/generate-client/sse-consumer/package.json
new file mode 100644
index 0000000000..494edc26ba
--- /dev/null
+++ b/tests/e2e/generate-client/sse-consumer/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "sse-consumer",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module"
+}
diff --git a/tests/e2e/generate-client/sse-consumer/server.ts b/tests/e2e/generate-client/sse-consumer/server.ts
new file mode 100644
index 0000000000..b9a6709283
--- /dev/null
+++ b/tests/e2e/generate-client/sse-consumer/server.ts
@@ -0,0 +1,89 @@
+import * as http from 'node:http';
+
+// A hand-written SSE server. The generated client streams frames; we drop the
+// first connection mid-stream (to exercise auto-reconnect via Last-Event-ID) and
+// keep a long-lived stream open for the abort scenario. Each connection records
+// the `Last-Event-ID` header it received (or null) so the test can assert resume.
+
+type LogEntry = { path: string; lastEventId: string | null };
+
+const PORT = Number.parseInt(process.env.SSE_SERVER_PORT ?? '3104', 10);
+
+const requestLog: LogEntry[] = [];
+
+function writeFrame(res: http.ServerResponse, frame: string): void {
+  res.write(frame);
+}
+
+const server = http.createServer((req, res) => {
+  const url = req.url ?? '';
+  const { pathname } = new URL(url, 'http://localhost');
+
+  if (pathname === '/__test__/ready') {
+    res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' });
+    res.end('ready');
+    return;
+  }
+  if (pathname === '/__test__/log') {
+    res.writeHead(200, { 'Content-Type': 'application/json; charset=utf-8' });
+    res.end(JSON.stringify(requestLog));
+    return;
+  }
+
+  const lastEventId =
+    typeof req.headers['last-event-id'] === 'string' ? req.headers['last-event-id'] : null;
+  requestLog.push({ path: pathname, lastEventId });
+
+  // The reconnect stream: drop after two frames, then resume from `Last-Event-ID: 2`.
+  if (pathname === '/messages') {
+    res.writeHead(200, {
+      'Content-Type': 'text/event-stream',
+      'Cache-Control': 'no-cache',
+      Connection: 'keep-alive',
+    });
+    if (lastEventId === '2') {
+      // Reconnect: deliver the next frame and close.
+      writeFrame(res, 'id: 3\ndata: {"text":"c","seq":3}\n\n');
+      res.end();
+      return;
+    }
+    // First connect: deliver two frames then drop the connection (simulates a drop).
+    writeFrame(res, 'id: 1\nevent: msg\ndata: {"text":"a","seq":1}\n\n');
+    writeFrame(res, 'id: 2\ndata: {"text":"b","seq":2}\n\n');
+    res.end();
+    return;
+  }
+
+  // The abort stream: emit one frame, then hold the connection open so the
+  // client can abort mid-stream.
+  if (pathname === '/abort-messages') {
+    res.writeHead(200, {
+      'Content-Type': 'text/event-stream',
+      'Cache-Control': 'no-cache',
+      Connection: 'keep-alive',
+    });
+    writeFrame(res, 'id: 1\ndata: {"text":"a","seq":1}\n\n');
+    // Hold open: a periodic comment keeps the stream alive without new events.
+    const keepAlive = setInterval(() => {
+      res.write(': keep-alive\n\n');
+    }, 200);
+    res.on('close', () => clearInterval(keepAlive));
+    return;
+  }
+
+  res.writeHead(404, { 'Content-Type': 'text/plain; charset=utf-8' });
+  res.end('not found');
+});
+
+server.listen(PORT, () => {
+  process.stdout.write(`READY ${PORT}\n`);
+});
+
+const shutdown = (): void => {
+  server.close(() => {
+    process.exit(0);
+  });
+};
+
+process.on('SIGTERM', shutdown);
+process.on('SIGINT', shutdown);
diff --git a/tests/e2e/generate-client/sse-consumer/tsconfig.json b/tests/e2e/generate-client/sse-consumer/tsconfig.json
new file mode 100644
index 0000000000..1b3492b511
--- /dev/null
+++ b/tests/e2e/generate-client/sse-consumer/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "module": "node16",
+    "moduleResolution": "node16",
+    "target": "es2022",
+    "lib": ["ES2022", "DOM"],
+    "strict": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "types": ["node"]
+  },
+  "include": ["./**/*.ts"]
+}
diff --git a/tests/e2e/generate-client/sse.runtime.test.ts b/tests/e2e/generate-client/sse.runtime.test.ts
new file mode 100644
index 0000000000..f02e8a52e4
--- /dev/null
+++ b/tests/e2e/generate-client/sse.runtime.test.ts
@@ -0,0 +1,146 @@
+// Behavioral e2e for SSE: a hand-written `node:http` server streams real
+// `text/event-stream` frames, drops mid-stream, and the generated client
+// auto-reconnects (resuming via `Last-Event-ID`). A second scenario aborts the
+// stream mid-flight and asserts the loop completes WITHOUT throwing.
+import { spawn, spawnSync, type ChildProcess } from 'node:child_process';
+import { existsSync, rmSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const indexEntryPoint = join(repoRoot, 'packages/cli/lib/index.js');
+const fixture = join(__dirname, 'fixtures/sse.yaml');
+const consumerDir = join(__dirname, 'sse-consumer');
+const generatedFile = join(consumerDir, 'api.ts');
+const serverScript = join(consumerDir, 'server.ts');
+const indexScript = join(consumerDir, 'index.ts');
+const abortScript = join(consumerDir, 'index-abort.ts');
+
+const SERVER_PORT = 3104;
+const SERVER_BASE = `http://127.0.0.1:${SERVER_PORT}`;
+
+async function waitForServerReady(timeoutMs: number): Promise<void> {
+  const deadline = Date.now() + timeoutMs;
+  let lastError: unknown;
+  while (Date.now() < deadline) {
+    try {
+      const response = await fetch(`${SERVER_BASE}/__test__/ready`);
+      if (response.ok) return;
+    } catch (error) {
+      lastError = error;
+    }
+    await new Promise((r) => setTimeout(r, 100));
+  }
+  throw new Error(
+    `SSE server did not become ready within ${timeoutMs}ms: ${
+      lastError instanceof Error ? lastError.message : String(lastError)
+    }`
+  );
+}
+
+function killServer(server: ChildProcess): Promise<void> {
+  return new Promise((resolveFn) => {
+    if (!server.pid || server.exitCode !== null) {
+      resolveFn();
+      return;
+    }
+    const onExit = (): void => resolveFn();
+    server.once('exit', onExit);
+    server.kill('SIGTERM');
+    setTimeout(() => {
+      server.removeListener('exit', onExit);
+      if (server.exitCode === null) {
+        server.kill('SIGKILL');
+      }
+      resolveFn();
+    }, 2_000);
+  });
+}
+
+describe('generate-client SSE consumer (reconnect + abort)', () => {
+  let serverProcess: ChildProcess | undefined;
+
+  beforeAll(async () => {
+    if (existsSync(generatedFile)) {
+      rmSync(generatedFile, { force: true });
+    }
+
+    const generateResult = spawnSync(
+      'node',
+      [indexEntryPoint, 'generate-client', fixture, '--output', generatedFile],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(generateResult.status, `generate-client stderr:\n${generateResult.stderr}`).toBe(0);
+    expect(existsSync(generatedFile)).toBe(true);
+
+    serverProcess = spawn('npx', ['tsx', serverScript], {
+      cwd: consumerDir,
+      env: { ...process.env, SSE_SERVER_PORT: String(SERVER_PORT) },
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+
+    serverProcess.stderr?.on('data', (chunk: Buffer) => {
+      process.stderr.write(`[sse-server stderr] ${chunk.toString()}`);
+    });
+
+    await waitForServerReady(15_000);
+  }, 30_000);
+
+  afterAll(async () => {
+    if (serverProcess) {
+      await killServer(serverProcess);
+    }
+    // The generated `api.ts` is intentionally left in place (gitignored), matching
+    // the other consumer harnesses — `tsc --noEmit` over the repo expects it present.
+  });
+
+  test('reconnect: events stream across a dropped connection, resuming via Last-Event-ID', () => {
+    const runResult = spawnSync('npx', ['tsx', indexScript, SERVER_BASE], {
+      encoding: 'utf-8',
+      cwd: consumerDir,
+      timeout: 20_000,
+    });
+    expect(
+      runResult.status,
+      `consumer stdout:\n${runResult.stdout}\nstderr:\n${runResult.stderr}`
+    ).toBe(0);
+
+    const parsed = JSON.parse(runResult.stdout.trim()) as {
+      events: string[];
+      ids: Array<string | undefined>;
+      lastEventIds: Array<string | null>;
+    };
+
+    // Typed `data.text` parsed across a reconnect: a, b (first connection), c (resume).
+    expect(parsed.events).toEqual(['a', 'b', 'c']);
+    // Event ids surfaced on the typed event.
+    expect(parsed.ids).toEqual(['1', '2', '3']);
+    // The reconnect carried `Last-Event-ID: 2` (1st connection: none; 2nd: '2').
+    expect(parsed.lastEventIds).toEqual([null, '2']);
+  }, 30_000);
+
+  test('abort: aborting the stream via AbortSignal completes the loop without throwing', () => {
+    const runResult = spawnSync('npx', ['tsx', abortScript, SERVER_BASE], {
+      encoding: 'utf-8',
+      cwd: consumerDir,
+      timeout: 20_000,
+    });
+    expect(
+      runResult.status,
+      `abort consumer stdout:\n${runResult.stdout}\nstderr:\n${runResult.stderr}`
+    ).toBe(0);
+
+    const parsed = JSON.parse(runResult.stdout.trim()) as {
+      aborted: boolean;
+      received: number;
+      error: string | null;
+    };
+
+    // The loop saw the first event, then the abort terminated it cleanly: no
+    // AbortError escaped the `for await`.
+    expect(parsed.aborted).toBe(true);
+    expect(parsed.received).toBeGreaterThanOrEqual(1);
+    expect(parsed.error).toBeNull();
+  }, 30_000);
+});
diff --git a/tests/e2e/generate-client/sse.test.ts b/tests/e2e/generate-client/sse.test.ts
new file mode 100644
index 0000000000..6fa1047a3a
--- /dev/null
+++ b/tests/e2e/generate-client/sse.test.ts
@@ -0,0 +1,160 @@
+// e2e for SSE (`text/event-stream`) operations: the typed `sse.*` async-iterator
+// surface. We assert on the generated source (string checks) and strict-tsc the
+// output (single-file, plus the whole tags-split dir) — the same lightweight
+// harness used by error-mode.test.ts. The behavioral reconnect/abort path is
+// covered separately by the sse-consumer harness in sse.runtime.test.ts.
+import { spawnSync } from 'node:child_process';
+import {
+  existsSync,
+  mkdtempSync,
+  readdirSync,
+  readFileSync,
+  rmSync,
+  statSync,
+  writeFileSync,
+} from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+
+const TSCONFIG = {
+  compilerOptions: {
+    module: 'node16',
+    moduleResolution: 'node16',
+    target: 'es2022',
+    lib: ['ES2022', 'DOM'],
+    strict: true,
+    noEmit: true,
+    skipLibCheck: true,
+    types: [],
+  },
+};
+
+/** Recursively collect every generated `.ts` file under `dir`. */
+function collectTsFiles(dir: string): string[] {
+  const out: string[] = [];
+  for (const entry of readdirSync(dir)) {
+    const full = join(dir, entry);
+    if (statSync(full).isDirectory()) out.push(...collectTsFiles(full));
+    else if (entry.endsWith('.ts')) out.push(full);
+  }
+  return out;
+}
+
+const fixture = join(__dirname, 'fixtures', 'sse.yaml');
+
+describe('generate-client SSE', () => {
+  it('single-file, functions facade: __sse generator + sse aggregate + typed events, strict tsc passes', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-sse-single-'));
+    const out = join(dir, 'client.ts');
+    const res = spawnSync('node', [cli, 'generate-client', fixture, '--output', out], {
+      encoding: 'utf-8',
+      cwd: repoRoot,
+    });
+    expect(res.status, res.stderr).toBe(0);
+    expect(existsSync(out)).toBe(true);
+
+    const generated = readFileSync(out, 'utf-8');
+    expect(generated).toContain('async function* __sse');
+    expect(generated).toContain('export const sse = {');
+    expect(generated).toContain('streamMessages');
+    expect(generated).toContain('AsyncGenerator<ServerSentEvent<Message>>');
+    // The typeless stream falls back to a `string` event payload + the 'text' data kind.
+    expect(generated).toContain('__sse<string>');
+    expect(generated).toContain(', "text")');
+
+    // A type-usage snippet proving `ServerSentEvent<Message>.data.text` is typed
+    // and that `SseOptions` (reconnect/reconnectDelay) is accepted.
+    writeFileSync(
+      join(dir, 'usage.ts'),
+      [
+        `import { sse, configure } from './client.js';`,
+        `async function check() {`,
+        `  for await (const ev of sse.streamMessages()) { const t: string = ev.data.text; void t; const id: string | undefined = ev.id; void id; }`,
+        `  const it = sse.streamMessages({ reconnect: false, reconnectDelay: 500 });`,
+        `  void it;`,
+        `}`,
+        `void check; void configure;`,
+        ``,
+      ].join('\n'),
+      'utf-8'
+    );
+
+    writeFileSync(
+      join(dir, 'tsconfig.json'),
+      JSON.stringify({ ...TSCONFIG, include: ['client.ts', 'usage.ts'] }),
+      'utf-8'
+    );
+    const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
+    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('single-file, service-class facade: sse namespace bound on the class, strict tsc passes', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-sse-sc-'));
+    const out = join(dir, 'client.ts');
+    const res = spawnSync(
+      'node',
+      [cli, 'generate-client', fixture, '--output', out, '--facade', 'service-class'],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(res.status, res.stderr).toBe(0);
+    expect(existsSync(out)).toBe(true);
+
+    const generated = readFileSync(out, 'utf-8');
+    expect(generated).toContain('readonly sse = {');
+    expect(generated).toContain('streamMessages: this.streamMessages.bind(this)');
+
+    writeFileSync(
+      join(dir, 'tsconfig.json'),
+      JSON.stringify({ ...TSCONFIG, include: ['client.ts'] }),
+      'utf-8'
+    );
+    const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
+    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('tags-split, functions facade: the entry barrel merges per-tag sse fragments, strict tsc passes over the dir', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-sse-split-'));
+    const entry = join(dir, 'client.ts');
+    const res = spawnSync(
+      'node',
+      [cli, 'generate-client', fixture, '--output', entry, '--output-mode', 'tags-split'],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(res.status, res.stderr).toBe(0);
+    expect(existsSync(entry)).toBe(true);
+
+    // The entry barrel merges each per-tag SSE fragment into the public `sse`.
+    const entrySrc = readFileSync(entry, 'utf-8');
+    expect(entrySrc).toContain('export const sse = { ...__sse_');
+
+    const files = collectTsFiles(dir);
+    const tsc = spawnSync(
+      tscBin,
+      [
+        '--noEmit',
+        '--strict',
+        '--noUnusedLocals',
+        '--target',
+        'ES2020',
+        '--module',
+        'esnext',
+        '--moduleResolution',
+        'bundler',
+        '--lib',
+        'ES2020,DOM',
+        ...files,
+      ],
+      { encoding: 'utf-8', cwd: dir }
+    );
+    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/swr.test.ts b/tests/e2e/generate-client/swr.test.ts
new file mode 100644
index 0000000000..ec152198ee
--- /dev/null
+++ b/tests/e2e/generate-client/swr.test.ts
@@ -0,0 +1,80 @@
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+// `swr` is hoisted to the repo root node_modules (a repo devDependency); map it
+// explicitly so tsc resolves the generated module's `import useSWR from "swr"` and
+// `import useSWRMutation from "swr/mutation"` from the temp dir.
+const swrPath = join(repoRoot, 'node_modules/swr');
+
+describe('generate-client swr generator', () => {
+  it('emits a *.swr.ts module that strict-tsc-checks against real swr and composes with the sdk', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-swr-'));
+    const out = join(dir, 'client.ts');
+    const swrOut = join(dir, 'client.swr.ts');
+
+    const res = spawnSync(
+      'node',
+      [
+        cli,
+        'generate-client',
+        join(__dirname, 'fixtures', 'base.yaml'),
+        '--output',
+        out,
+        '--generators',
+        'sdk,swr',
+      ],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(res.status, res.stderr).toBe(0);
+
+    // Both the sdk client and the standalone swr module are produced.
+    expect(existsSync(out)).toBe(true);
+    expect(existsSync(swrOut)).toBe(true);
+
+    const source = readFileSync(swrOut, 'utf-8');
+    expect(source).toContain('import useSWR from "swr"');
+    expect(source).toContain('import useSWRMutation from "swr/mutation"');
+    // A GET op (path param) → key factory + useSWR hook.
+    expect(source).toContain('export const getPetByIdKey');
+    expect(source).toContain('export function useGetPetById');
+    expect(source).toContain('useSWR(');
+    // A POST op → useSWRMutation hook.
+    expect(source).toContain('export function useCreatePet');
+    expect(source).toContain('useSWRMutation(');
+
+    // strict-tsc the whole temp project: the emitted swr module against REAL swr,
+    // plus the generated sdk client. The hooks are React hooks; type-checking the
+    // module proves the emitted useSWR/useSWRMutation calls match swr's real API.
+    writeFileSync(
+      join(dir, 'tsconfig.json'),
+      JSON.stringify({
+        compilerOptions: {
+          module: 'nodenext',
+          moduleResolution: 'nodenext',
+          target: 'es2022',
+          lib: ['ES2022', 'DOM'],
+          strict: true,
+          noEmit: true,
+          skipLibCheck: true,
+          jsx: 'react-jsx',
+          types: [],
+          paths: { swr: [swrPath], 'swr/*': [join(swrPath, '*')] },
+        },
+        include: ['client.ts', 'client.swr.ts'],
+      }),
+      'utf-8'
+    );
+
+    const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
+    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/tags-split.test.ts b/tests/e2e/generate-client/tags-split.test.ts
new file mode 100644
index 0000000000..2c3b8e97b0
--- /dev/null
+++ b/tests/e2e/generate-client/tags-split.test.ts
@@ -0,0 +1,84 @@
+/**
+ * E2E for `--output-mode tags-split`: a folder per OpenAPI tag with shared
+ * http + schemas at the root. The whole generated tree must compile under strict
+ * `tsc` with `--noUnusedLocals` (proves the `../` imports back to the shared
+ * modules resolve and that each per-tag file imports exactly what it uses).
+ */
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, readdirSync, readFileSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
+const fixture = join(__dirname, 'fixtures/cafe.yaml');
+
+function collectTsFiles(dir: string): string[] {
+  return readdirSync(dir, { withFileTypes: true }).flatMap((entry) => {
+    const full = join(dir, entry.name);
+    if (entry.isDirectory()) return collectTsFiles(full);
+    return entry.name.endsWith('.ts') ? [full] : [];
+  });
+}
+
+describe('generate-client end-to-end (--output-mode tags-split)', () => {
+  let workDir = '';
+  let entry = '';
+
+  beforeAll(() => {
+    workDir = mkdtempSync(join(tmpdir(), 'tags-split-client-'));
+    entry = join(workDir, 'client.ts');
+  });
+
+  afterAll(() => {
+    if (workDir && existsSync(workDir)) {
+      rmSync(workDir, { recursive: true, force: true });
+    }
+  });
+
+  test('writes a folder per tag with shared modules at the root', () => {
+    const result = spawnSync(
+      'node',
+      [cliEntry, 'generate-client', fixture, '--output', entry, '--output-mode', 'tags-split'],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(result.status, `generate-client stderr:\n${result.stderr}`).toBe(0);
+
+    expect(existsSync(join(workDir, 'client.http.ts'))).toBe(true);
+    expect(existsSync(join(workDir, 'client.schemas.ts'))).toBe(true);
+    expect(existsSync(join(workDir, 'Products/client.ts'))).toBe(true);
+    expect(existsSync(join(workDir, 'Orders/client.ts'))).toBe(true);
+
+    expect(readFileSync(join(workDir, 'Products/client.ts'), 'utf-8')).toContain(
+      'from "../client.http.js"'
+    );
+    expect(readFileSync(entry, 'utf-8')).toContain("export * from './Products/client.js';");
+  }, 90_000);
+
+  test('the whole generated tree type-checks under strict mode with no unused imports', () => {
+    expect(existsSync(entry), 'generation test must run first').toBe(true);
+
+    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+    const tsc = spawnSync(
+      tscBin,
+      [
+        '--noEmit',
+        '--strict',
+        '--noUnusedLocals',
+        '--target',
+        'ES2020',
+        '--module',
+        'esnext',
+        '--moduleResolution',
+        'bundler',
+        '--lib',
+        'ES2020,DOM',
+        ...collectTsFiles(workDir),
+      ],
+      { encoding: 'utf-8', cwd: workDir }
+    );
+    expect(tsc.status, `tsc errors:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+  }, 90_000);
+});
diff --git a/tests/e2e/generate-client/tags.test.ts b/tests/e2e/generate-client/tags.test.ts
new file mode 100644
index 0000000000..8225b0422a
--- /dev/null
+++ b/tests/e2e/generate-client/tags.test.ts
@@ -0,0 +1,88 @@
+/**
+ * E2E for `--output-mode tags`: shared http + schemas, one endpoints file per
+ * OpenAPI tag, and a barrel entry. The whole generated set must compile under
+ * strict `tsc` with `--noUnusedLocals` (proves cross-file imports resolve and
+ * each per-tag file imports exactly what it uses).
+ */
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, readdirSync, readFileSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
+const fixture = join(__dirname, 'fixtures/cafe.yaml');
+
+describe('generate-client end-to-end (--output-mode tags)', () => {
+  let workDir = '';
+  let entry = '';
+
+  beforeAll(() => {
+    workDir = mkdtempSync(join(tmpdir(), 'tags-client-'));
+    entry = join(workDir, 'client.ts');
+  });
+
+  afterAll(() => {
+    if (workDir && existsSync(workDir)) {
+      rmSync(workDir, { recursive: true, force: true });
+    }
+  });
+
+  test('writes shared files, one file per tag, and the barrel entry', () => {
+    const result = spawnSync(
+      'node',
+      [cliEntry, 'generate-client', fixture, '--output', entry, '--output-mode', 'tags'],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(result.status, `generate-client stderr:\n${result.stderr}`).toBe(0);
+
+    for (const name of [
+      'client.ts',
+      'client.http.ts',
+      'client.schemas.ts',
+      'Products.ts',
+      'Orders.ts',
+    ]) {
+      expect(existsSync(join(workDir, name)), `expected ${name}`).toBe(true);
+    }
+
+    // Products operations live in Products.ts (first-tag assignment), not the barrel.
+    expect(readFileSync(join(workDir, 'Products.ts'), 'utf-8')).toContain(
+      'export async function listMenuItems('
+    );
+    const entrySrc = readFileSync(entry, 'utf-8');
+    expect(entrySrc).toContain("export * from './Products.js';");
+    expect(entrySrc).toContain("export * from './Orders.js';");
+  }, 90_000);
+
+  test('the whole generated set type-checks under strict mode with no unused imports', () => {
+    expect(existsSync(entry), 'generation test must run first').toBe(true);
+
+    const tsFiles = readdirSync(workDir)
+      .filter((name) => name.endsWith('.ts'))
+      .map((name) => join(workDir, name));
+
+    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+    const tsc = spawnSync(
+      tscBin,
+      [
+        '--noEmit',
+        '--strict',
+        '--noUnusedLocals',
+        '--target',
+        'ES2020',
+        '--module',
+        'esnext',
+        '--moduleResolution',
+        'bundler',
+        '--lib',
+        'ES2020,DOM',
+        ...tsFiles,
+      ],
+      { encoding: 'utf-8', cwd: workDir }
+    );
+    expect(tsc.status, `tsc errors:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+  }, 90_000);
+});
diff --git a/tests/e2e/generate-client/tanstack-consumer/.gitignore b/tests/e2e/generate-client/tanstack-consumer/.gitignore
new file mode 100644
index 0000000000..1d171661f2
--- /dev/null
+++ b/tests/e2e/generate-client/tanstack-consumer/.gitignore
@@ -0,0 +1,3 @@
+# Generated fresh by tanstack-query.runtime.test.ts in beforeAll and removed in afterAll.
+client.ts
+client.tanstack.ts
diff --git a/tests/e2e/generate-client/tanstack-query.runtime.test.ts b/tests/e2e/generate-client/tanstack-query.runtime.test.ts
new file mode 100644
index 0000000000..f5c9aed7b2
--- /dev/null
+++ b/tests/e2e/generate-client/tanstack-query.runtime.test.ts
@@ -0,0 +1,127 @@
+/** @vitest-environment jsdom */
+//
+// Tier-3 runtime React-hook integration for the tanstack-query generator.
+//
+// MECHANISM (documented choice): we generate `sdk,tanstack-query` into a fixed,
+// checked-in consumer dir (`tanstack-consumer/`) and dynamic-`import()` the
+// generated `client.tanstack.ts` directly — vite transforms it and resolves its
+// `./client.js` import to the sibling `.ts` reliably (verified). The data is
+// driven by a STUBBED `fetch` installed via the generated sdk's `configure()`
+// (no mock server): the tanstack `queryFn` forwards to the sdk operation
+// function, which uses that fetch. This proves the real React render path —
+// `renderHook` + `QueryClientProvider` + `useQuery(getXOptions(vars))` — fires
+// the queryFn and resolves the hook with the canned data, without mock-server
+// flakiness or cross-process plumbing.
+
+import { QueryClient, QueryClientProvider, useMutation, useQuery } from '@tanstack/react-query';
+import { renderHook, waitFor } from '@testing-library/react';
+import { spawnSync } from 'node:child_process';
+import { existsSync, rmSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { createElement, type ReactNode } from 'react';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const consumerDir = join(__dirname, 'tanstack-consumer');
+const sdkFile = join(consumerDir, 'client.ts');
+const tanstackFile = join(consumerDir, 'client.tanstack.ts');
+
+const PET = { id: 1, name: 'rex', status: 'available' as const };
+
+function wrapper(client: QueryClient) {
+  return ({ children }: { children: ReactNode }) =>
+    createElement(QueryClientProvider, { client }, children);
+}
+
+function newClient(): QueryClient {
+  // Retries off so a query/mutation settles deterministically within the test.
+  return new QueryClient({
+    defaultOptions: { queries: { retry: false }, mutations: { retry: false } },
+  });
+}
+
+describe('generate-client tanstack-query runtime (React hooks, jsdom)', () => {
+  beforeAll(() => {
+    for (const f of [sdkFile, tanstackFile]) {
+      if (existsSync(f)) rmSync(f, { force: true });
+    }
+    const res = spawnSync(
+      'node',
+      [
+        cli,
+        'generate-client',
+        join(__dirname, 'fixtures', 'base.yaml'),
+        '--output',
+        sdkFile,
+        '--generators',
+        'sdk,tanstack-query',
+      ],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(res.status, res.stderr).toBe(0);
+    expect(existsSync(tanstackFile)).toBe(true);
+  });
+
+  afterAll(() => {
+    for (const f of [sdkFile, tanstackFile]) {
+      if (existsSync(f)) rmSync(f, { force: true });
+    }
+  });
+
+  it('useQuery(getPetByIdOptions(vars)) fires the queryFn and resolves with the response data', async () => {
+    const sdk = await import(join(consumerDir, 'client.ts'));
+    const mod = await import(join(consumerDir, 'client.tanstack.ts'));
+
+    sdk.configure({
+      fetch: (input: RequestInfo | URL) => {
+        // The sdk built the URL from the path param; assert the queryFn forwarded it.
+        expect(String(input)).toContain('/pets/1');
+        return Promise.resolve(
+          new Response(JSON.stringify(PET), {
+            status: 200,
+            headers: { 'Content-Type': 'application/json' },
+          })
+        );
+      },
+    });
+
+    const { result } = renderHook(() => useQuery(mod.getPetByIdOptions({ id: 1 })), {
+      wrapper: wrapper(newClient()),
+    });
+
+    await waitFor(() => expect(result.current.isSuccess).toBe(true));
+    expect(result.current.data).toEqual(PET);
+  }, 30_000);
+
+  it('useMutation(createPetMutation()) fires the mutationFn and resolves with the created resource', async () => {
+    const sdk = await import(join(consumerDir, 'client.ts'));
+    const mod = await import(join(consumerDir, 'client.tanstack.ts'));
+
+    sdk.configure({
+      fetch: (input: RequestInfo | URL, init?: RequestInit) => {
+        expect(init?.method).toBe('POST');
+        return Promise.resolve(
+          new Response(JSON.stringify(PET), {
+            status: 201,
+            headers: { 'Content-Type': 'application/json' },
+          })
+        );
+      },
+    });
+
+    const { result } = renderHook(
+      () =>
+        useMutation<unknown, Error, { body: { name: string; status: string } }>(
+          mod.createPetMutation()
+        ),
+      { wrapper: wrapper(newClient()) }
+    );
+
+    const created = await result.current.mutateAsync({
+      body: { name: 'rex', status: 'available' },
+    });
+    expect(created).toEqual(PET);
+  }, 30_000);
+});
diff --git a/tests/e2e/generate-client/tanstack-query.test.ts b/tests/e2e/generate-client/tanstack-query.test.ts
new file mode 100644
index 0000000000..01d8bf9436
--- /dev/null
+++ b/tests/e2e/generate-client/tanstack-query.test.ts
@@ -0,0 +1,131 @@
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+// `@tanstack/react-query` is hoisted to the repo root node_modules (a repo
+// devDependency); map it explicitly so tsc resolves the generated module's
+// `import { queryOptions } from "@tanstack/react-query"` from the temp dir.
+const tanstackPath = join(repoRoot, 'node_modules/@tanstack/react-query');
+
+describe('generate-client tanstack-query generator', () => {
+  it('emits a *.tanstack.ts module that strict-tsc-checks against real @tanstack/react-query and composes with the sdk', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-tanstack-'));
+    const out = join(dir, 'client.ts');
+    const tanstackOut = join(dir, 'client.tanstack.ts');
+
+    const res = spawnSync(
+      'node',
+      [
+        cli,
+        'generate-client',
+        join(__dirname, 'fixtures', 'base.yaml'),
+        '--output',
+        out,
+        '--generators',
+        'sdk,tanstack-query',
+      ],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(res.status, res.stderr).toBe(0);
+
+    // Both the sdk client and the standalone tanstack module are produced.
+    expect(existsSync(out)).toBe(true);
+    expect(existsSync(tanstackOut)).toBe(true);
+
+    const source = readFileSync(tanstackOut, 'utf-8');
+    expect(source).toContain('import { queryOptions } from "@tanstack/react-query"');
+    // A GET op (path param) → query factories.
+    expect(source).toContain('export const getPetByIdQueryKey');
+    expect(source).toContain('export const getPetByIdOptions');
+    expect(source).toContain('queryOptions({');
+    // A POST op → mutation factory.
+    expect(source).toContain('export const createPetMutation');
+    expect(source).toContain('mutationFn:');
+
+    // A consumer that composes the generated factories with TanStack's real
+    // useQuery/useMutation types — proves the emitted hooks type-check against
+    // the actual @tanstack/react-query API surface, not just in isolation.
+    writeFileSync(
+      join(dir, 'check.ts'),
+      [
+        "import { useMutation, useQuery } from '@tanstack/react-query';",
+        "import { createPetMutation, getPetByIdOptions, listPetsOptions } from './client.tanstack.js';",
+        'export function useGetPet(id: number) {',
+        '  return useQuery(getPetByIdOptions({ id }));',
+        '}',
+        'export function useListPets() {',
+        "  return useQuery(listPetsOptions({ params: { filter: { name: 'rex' } } }));",
+        '}',
+        'export function useCreatePet() {',
+        '  return useMutation(createPetMutation());',
+        '}',
+        '',
+      ].join('\n'),
+      'utf-8'
+    );
+
+    // strict-tsc the whole temp project: the emitted tanstack module against
+    // REAL @tanstack/react-query, plus the useQuery/useMutation composition.
+    writeFileSync(
+      join(dir, 'tsconfig.json'),
+      JSON.stringify({
+        compilerOptions: {
+          module: 'nodenext',
+          moduleResolution: 'nodenext',
+          target: 'es2022',
+          lib: ['ES2022', 'DOM'],
+          strict: true,
+          noEmit: true,
+          skipLibCheck: true,
+          types: [],
+          paths: { '@tanstack/react-query': [tanstackPath] },
+        },
+        include: ['client.ts', 'client.tanstack.ts', 'check.ts'],
+      }),
+      'utf-8'
+    );
+
+    const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
+    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('--query-framework vue swaps only the import specifier to @tanstack/vue-query', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-tanstack-vue-'));
+    const out = join(dir, 'client.ts');
+    const tanstackOut = join(dir, 'client.tanstack.ts');
+
+    const res = spawnSync(
+      'node',
+      [
+        cli,
+        'generate-client',
+        join(__dirname, 'fixtures', 'base.yaml'),
+        '--output',
+        out,
+        '--generators',
+        'sdk,tanstack-query',
+        '--query-framework',
+        'vue',
+      ],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(res.status, res.stderr).toBe(0);
+
+    // No strict-tsc compile here: @tanstack/vue-query isn't a dev dependency, and the
+    // react test already proves the queryOptions output type-checks against a real
+    // adapter — the only per-framework difference is this import string.
+    const source = readFileSync(tanstackOut, 'utf-8');
+    expect(source).toContain('import { queryOptions } from "@tanstack/vue-query"');
+    expect(source).not.toContain('@tanstack/react-query');
+
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/transformers-consumer/.gitignore b/tests/e2e/generate-client/transformers-consumer/.gitignore
new file mode 100644
index 0000000000..7264a69518
--- /dev/null
+++ b/tests/e2e/generate-client/transformers-consumer/.gitignore
@@ -0,0 +1,3 @@
+# Generated fresh by transformers.test.ts in beforeAll and removed in afterAll.
+client.ts
+client.transformers.ts
diff --git a/tests/e2e/generate-client/transformers.test.ts b/tests/e2e/generate-client/transformers.test.ts
new file mode 100644
index 0000000000..80bba07fe8
--- /dev/null
+++ b/tests/e2e/generate-client/transformers.test.ts
@@ -0,0 +1,128 @@
+//
+// e2e for the `transformers` generator paired with the sdk `--date-type Date`
+// knob. Two tiers:
+//
+//  - TYPE-CHECK: generate `sdk,transformers --date-type Date` into a temp dir,
+//    assert the sdk types `Date` for date fields and the transformers module has
+//    `transform<Name>` with `new Date(`, then strict-`tsc` `client.ts` +
+//    `client.transformers.ts` TOGETHER. tsc exit 0 proves each generated
+//    `transform<Name>(data: <Name>): <Name>` type-checks against the Date-typed
+//    sdk schema (incl. the union-ref guarded-cast and the collection write-backs).
+//
+//  - RUNTIME: generate into a fixed, checked-in consumer dir and dynamic-
+//    `import()` the generated `client.transformers.ts` (its only import of
+//    `./client.js` is `import type`, erased at runtime — no sdk needed at
+//    runtime). Call `transformPet` on WIRE data and assert the date positions
+//    became `Date` instances: top-level scalar, array elements, and the ref'd
+//    nested date (proving composition + write-back at runtime).
+//
+//  - DEFAULT UNCHANGED: without `--date-type Date` the sdk date field stays
+//    typed `string` (the byte-identical default).
+
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+const fixture = join(__dirname, 'fixtures', 'transformers.yaml');
+const consumerDir = join(__dirname, 'transformers-consumer');
+
+function generate(out: string, args: string[]): void {
+  const res = spawnSync(
+    'node',
+    [cli, 'generate-client', fixture, '--output', out, '--generators', ...args],
+    { encoding: 'utf-8', cwd: repoRoot }
+  );
+  expect(res.status, res.stderr).toBe(0);
+}
+
+describe('generate-client transformers generator', () => {
+  it('emits Date-typed sdk + a transformers module that strict-tsc-checks together', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-transformers-'));
+    const out = join(dir, 'client.ts');
+    const transformersOut = join(dir, 'client.transformers.ts');
+
+    generate(out, ['sdk,transformers', '--date-type', 'Date']);
+
+    expect(existsSync(out)).toBe(true);
+    expect(existsSync(transformersOut)).toBe(true);
+
+    // The sdk emits `Date` (not `string`) for the date-time field under --date-type Date.
+    const sdkSource = readFileSync(out, 'utf-8');
+    expect(sdkSource).toContain('createdAt?: Date;');
+
+    // The transformers module: a type-only import, the transform fn, and `new Date(`.
+    const transformersSource = readFileSync(transformersOut, 'utf-8');
+    expect(transformersSource).toContain('import type {');
+    expect(transformersSource).toContain('export const transformPet');
+    expect(transformersSource).toContain('new Date(');
+
+    // strict-tsc the sdk + transformers TOGETHER: proves transform<Name>(data:
+    // <Name>): <Name> type-checks against the Date-typed sdk schema.
+    writeFileSync(
+      join(dir, 'tsconfig.json'),
+      JSON.stringify({
+        compilerOptions: {
+          module: 'nodenext',
+          moduleResolution: 'nodenext',
+          target: 'es2022',
+          lib: ['ES2022', 'DOM'],
+          strict: true,
+          noEmit: true,
+          skipLibCheck: true,
+          types: [],
+        },
+        include: ['client.ts', 'client.transformers.ts'],
+      }),
+      'utf-8'
+    );
+
+    const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
+    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('transformPet converts top-level, array, and ref nested dates at runtime', async () => {
+    const sdkFile = join(consumerDir, 'client.ts');
+    const transformersFile = join(consumerDir, 'client.transformers.ts');
+    for (const f of [sdkFile, transformersFile]) if (existsSync(f)) rmSync(f, { force: true });
+
+    generate(sdkFile, ['sdk,transformers', '--date-type', 'Date']);
+    expect(existsSync(transformersFile)).toBe(true);
+
+    const mod = await import(transformersFile);
+
+    const result = mod.transformPet({
+      id: 1,
+      name: 'rex',
+      createdAt: '2020-01-02T03:04:05Z',
+      dates: ['2021-01-01T00:00:00Z', '2022-02-02T00:00:00Z'],
+      owner: { name: 'sam', since: '2019-06-01' },
+    });
+
+    // Top-level scalar.
+    expect(result.createdAt).toBeInstanceOf(Date);
+    expect((result.createdAt as Date).toISOString()).toBe('2020-01-02T03:04:05.000Z');
+    // Array elements (write-back via map).
+    expect(Array.isArray(result.dates)).toBe(true);
+    for (const d of result.dates) expect(d).toBeInstanceOf(Date);
+    // Ref'd nested date (composition: transformPet -> transformOwner).
+    expect(result.owner.since).toBeInstanceOf(Date);
+
+    for (const f of [sdkFile, transformersFile]) if (existsSync(f)) rmSync(f, { force: true });
+  }, 60_000);
+
+  it('without --date-type Date the sdk date field stays typed string (default)', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-transformers-default-'));
+    const out = join(dir, 'client.ts');
+    generate(out, ['sdk']);
+    expect(readFileSync(out, 'utf-8')).toContain('createdAt?: string;');
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/zod.test.ts b/tests/e2e/generate-client/zod.test.ts
new file mode 100644
index 0000000000..8448d50f81
--- /dev/null
+++ b/tests/e2e/generate-client/zod.test.ts
@@ -0,0 +1,87 @@
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+// `zod` is hoisted to the repo root node_modules (a repo devDependency); map it
+// explicitly so tsc resolves `import { z } from 'zod'` from the out-of-tree temp dir.
+const zodPath = join(repoRoot, 'node_modules/zod');
+
+describe('generate-client zod generator', () => {
+  it('emits a *.zod.ts module that strict-tsc-checks against real zod and agrees with the sdk types', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-zod-'));
+    const out = join(dir, 'client.ts');
+    const zodOut = join(dir, 'client.zod.ts');
+
+    const res = spawnSync(
+      'node',
+      [
+        cli,
+        'generate-client',
+        join(__dirname, 'fixtures', 'cafe.yaml'),
+        '--output',
+        out,
+        '--generators',
+        'sdk,zod',
+      ],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(res.status, res.stderr).toBe(0);
+
+    // Both the sdk client and the standalone zod module are produced.
+    expect(existsSync(out)).toBe(true);
+    expect(existsSync(zodOut)).toBe(true);
+
+    const zodSource = readFileSync(zodOut, 'utf-8');
+    expect(zodSource).toContain('import { z } from "zod"');
+    expect(zodSource).toContain('export const PageSchema = z.object(');
+
+    // z.infer<typeof PageSchema> must be assignable to the sdk's Page type
+    // (schema ↔ type agreement). For `Page` (all-required scalars) the
+    // assignability is in fact bidirectional; we assert the z.infer → sdk
+    // direction, which is the one the schema is expected to guarantee.
+    writeFileSync(
+      join(dir, 'check.ts'),
+      [
+        "import type { z } from 'zod';",
+        "import type { Page } from './client.js';",
+        "import type { PageSchema } from './client.zod.js';",
+        'const _x: Page = {} as z.infer<typeof PageSchema>;',
+        'void _x;',
+        '',
+      ].join('\n'),
+      'utf-8'
+    );
+
+    // strict-tsc the whole temp project: the emitted zod module against REAL
+    // zod, plus the schema ↔ type agreement check.
+    writeFileSync(
+      join(dir, 'tsconfig.json'),
+      JSON.stringify({
+        compilerOptions: {
+          module: 'node16',
+          moduleResolution: 'node16',
+          target: 'es2022',
+          lib: ['ES2022', 'DOM'],
+          strict: true,
+          noEmit: true,
+          skipLibCheck: true,
+          types: [],
+          paths: { zod: [zodPath] },
+        },
+        include: ['client.ts', 'client.zod.ts', 'check.ts'],
+      }),
+      'utf-8'
+    );
+
+    const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
+    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+});
diff --git a/tsconfig.build.json b/tsconfig.build.json
index 0450f9022a..01761c5f38 100644
--- a/tsconfig.build.json
+++ b/tsconfig.build.json
@@ -3,6 +3,7 @@
   "references": [
     { "path": "packages/core" },
     { "path": "packages/cli" },
-    { "path": "packages/respect-core" }
+    { "path": "packages/respect-core" },
+    { "path": "packages/openapi-typescript" }
   ]
 }
diff --git a/tsconfig.json b/tsconfig.json
index 7286cd15a8..4b09cdeb07 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,9 @@
 {
   "compilerOptions": {
-    "types": ["vitest/globals", "node"],
+    "types": [
+      "vitest/globals",
+      "node"
+    ],
     "composite": true,
     "declaration": true,
     "declarationMap": true,
@@ -17,10 +20,27 @@
     "strictFunctionTypes": true,
     "forceConsistentCasingInFileNames": true,
     "allowJs": false,
-    "lib": ["ES2023", "DOM", "dom.iterable"],
-    "paths": { "*": ["./packages/*"] },
+    "lib": [
+      "ES2023",
+      "DOM",
+      "dom.iterable"
+    ],
+    "paths": {
+      "*": [
+        "./packages/*"
+      ]
+    },
     "skipLibCheck": true,
     "moduleResolution": "nodenext",
     "esModuleInterop": true
-  }
+  },
+  "exclude": [
+    "node_modules"
+  ],
+  "include": [
+    "packages/*/src/**/*.ts",
+    "packages/*/__tests__/**/*.ts",
+    "tests/**/*.ts",
+    "vitest.config.ts"
+  ]
 }
diff --git a/vitest.config.ts b/vitest.config.ts
index 228411848b..3e994e12f7 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -12,6 +12,7 @@ const configExtension: { [key: string]: ViteUserConfig } = {
           'packages/cli/src/**/*.ts',
           'packages/core/src/**/*.ts',
           'packages/respect-core/src/**/*.ts',
+          'packages/openapi-typescript/src/**/*.ts',
         ],
         provider: 'istanbul',
         exclude: [
@@ -24,6 +25,14 @@ const configExtension: { [key: string]: ViteUserConfig } = {
           functions: 83,
           statements: 80,
           branches: 72,
+          // Strict per-file 100% coverage for the new client generator. Per-glob thresholds run
+          // alongside the repo-wide minimums above, so other packages stay unaffected.
+          'packages/openapi-typescript/src/**/*.ts': {
+            lines: 100,
+            functions: 100,
+            statements: 100,
+            branches: 100,
+          },
         },
       },
     },

From 6aeb52b0c3bef2a63fc336599c051c70b381a4e6 Mon Sep 17 00:00:00 2001
From: JLekawa <jacek.lekawa@redocly.com>
Date: Wed, 17 Jun 2026 19:01:24 +0200
Subject: [PATCH 002/134] docs(cli): update text formatting

---
 docs/@v2/commands/generate-client.md          | 390 +++++++-----------
 packages/openapi-typescript/ARCHITECTURE.md   | 202 ++++-----
 packages/openapi-typescript/CONTEXT.md        | 228 ++++------
 packages/openapi-typescript/README.md         | 243 +++++------
 .../docs/adr/0001-ast-codegen.md              |  33 +-
 .../docs/adr/0002-typescript-peer-dep.md      |  26 +-
 .../docs/adr/0003-spec-agnostic-ir.md         |  21 +-
 .../docs/adr/0004-registry-seams.md           |  20 +-
 .../docs/adr/0005-error-mode-terminals.md     |  29 +-
 .../docs/adr/0006-sse-namespace.md            |  26 +-
 .../docs/adr/0007-call-site-auth.md           |  20 +-
 .../docs/adr/0008-redocly-yaml-config.md      |  25 +-
 .../docs/adr/0009-per-instance-auth.md        |  34 +-
 .../docs/adr/0010-mock-data-baked-vs-faker.md |  44 +-
 .../docs/adr/0011-wrapper-generators.md       |  39 +-
 .../docs/adr/0012-plugin-api.md               |  52 +--
 .../docs/adr/0013-experimental-status.md      |  58 +--
 .../openapi-typescript/docs/adr/README.md     |  11 +-
 18 files changed, 561 insertions(+), 940 deletions(-)

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index 99ced7fb6d..521c9f2407 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -6,22 +6,20 @@ slug:
 # `generate-client`
 
 {% admonition type="warning" name="Experimental" %}
-`generate-client` is **experimental**. Its CLI flags, generated output, configuration schema, and the
-custom-generator plugin API may change in any minor release until the feature is declared stable. Pin
-your `@redocly/cli` version if you depend on the generated output, and plan to regenerate when you
-upgrade. We'd love your feedback while we stabilize it.
+`generate-client` is **experimental**.
+Its CLI flags, generated output, configuration schema, and the custom-generator plugin API may change in any minor release until the feature is declared stable.
+Pin your `@redocly/cli` version if you depend on the generated output, and plan to regenerate when you upgrade.
+We'd love your feedback while we stabilize it.
 {% /admonition %}
 
 Generate a typed TypeScript client from an OpenAPI description.
 
-Accepts **OpenAPI 3.0, 3.1, and 3.2.0**, plus **Swagger 2.0** (normalized to the 3.x shape
-before generation). `<input>` is a file path, a URL, or an `apis:` alias from `redocly.yaml`.
+Accepts **OpenAPI 3.0, 3.1, and 3.2.0**, plus **Swagger 2.0** (normalized to the 3.x shape before generation).
+`<input>` is a file path, a URL, or an `apis:` alias from `redocly.yaml`.
 
-The generated client has **zero runtime dependencies** — it uses only web-standard APIs
-(`fetch`, `AbortController`, `URLSearchParams`, …), so it runs in browsers, Node, Bun,
-Deno, and edge runtimes. Code is produced through the TypeScript compiler AST (not string
-templates), so output is correct by construction. By default it emits a single file
-containing inline types and one async function per operation.
+The generated client has **zero runtime dependencies** — it uses only web-standard APIs (`fetch`, `AbortController`, `URLSearchParams`, …), so it runs in browsers, Node, Bun, Deno, and edge runtimes.
+Code is produced through the TypeScript compiler AST (not string templates), so output is correct by construction.
+By default it emits a single file containing inline types and one async function per operation.
 
 ## Usage
 
@@ -51,19 +49,27 @@ redocly generate-client cafe -o src/client.ts
 
 - `--output`, `-o` {% required=true %}
 - `string`
-- Output path for the generated client. Must end in `.ts`. In multi-file modes it is the entry file; sibling files derive from its name and directory.
+- Output path for the generated client. Must end in `.ts`.
+  In multi-file modes it is the entry file; sibling files derive from its name and directory.
 
 ---
 
 - `--output-mode`
 - `string`
-- File layout: `single` (default, one file), `split` (endpoints, schemas, and runtime in sibling files), `tags` (one endpoints file per OpenAPI tag), or `tags-split` (a folder per tag). All multi-file modes share the schemas and runtime modules.
+- File layout: `single` (default, one file), `split` (endpoints, schemas, and runtime in sibling files), `tags` (one endpoints file per OpenAPI tag), or `tags-split` (a folder per tag).
+  All multi-file modes share the schemas and runtime modules.
 
 ---
 
 - `--generators`
 - `string`
-- Comma-separated generators to run (default `sdk`). `sdk` is the typed client; `zod` additionally emits a standalone `<output>.zod.ts` module of [Zod](https://zod.dev) schemas; `tanstack-query` additionally emits a `<output>.tanstack.ts` module of [TanStack Query](https://tanstack.com/query) v5 factories wrapping the sdk (framework selected by `--query-framework`); `swr` additionally emits a `<output>.swr.ts` module of [SWR](https://swr.vercel.app) hooks; `mock` additionally emits a `<output>.mocks.ts` module of [MSW](https://mswjs.io) request handlers (data controlled by `--mock-data`); `transformers` additionally emits a `<output>.transformers.ts` module of `transform<Name>` functions that convert wire ISO strings to `Date` (pair with `--date-type Date`). Example: `--generators sdk,zod` or `--generators sdk,tanstack-query,mock`.
+- Comma-separated generators to run (default `sdk`).
+  `sdk` is the typed client.
+  `zod` additionally emits a standalone `<output>.zod.ts` module of [Zod](https://zod.dev) schemas.
+  `tanstack-query` additionally emits a `<output>.tanstack.ts` module of [TanStack Query](https://tanstack.com/query) v5 factories wrapping the sdk (framework selected by `--query-framework`).
+  `swr` additionally emits a `<output>.swr.ts` module of [SWR](https://swr.vercel.app) hooks.
+  `mock` additionally emits a `<output>.mocks.ts` module of [MSW](https://mswjs.io) request handlers (data controlled by `--mock-data`).
+  `transformers` additionally emits a `<output>.transformers.ts` module of `transform<Name>` functions that convert wire ISO strings to `Date` (pair with `--date-type Date`). Example: `--generators sdk,zod` or `--generators sdk,tanstack-query,mock`.
 
 ---
 
@@ -141,9 +147,8 @@ redocly generate-client cafe -o src/client.ts
 
 ## Configuration
 
-Instead of passing flags every time, you can put the settings in your `redocly.yaml` under
-an `x-openapi-typescript` block. `generate-client` reads it automatically — from a `redocly.yaml`
-in the working directory, or one pointed to by the standard `--config` flag:
+Instead of passing flags every time, you can put the settings in your `redocly.yaml` under an `x-openapi-typescript` block.
+`generate-client` reads it automatically — from a `redocly.yaml` in the working directory, or one pointed to by the standard `--config` flag:
 
 ```yaml
 # redocly.yaml
@@ -161,19 +166,16 @@ Then simply run:
 redocly generate-client
 ```
 
-Relative `input`/`output` are resolved against the `redocly.yaml` directory, so the command
-works the same from any working directory.
+Relative `input`/`output` are resolved against the `redocly.yaml` directory, so the command works the same from any working directory.
 
-A dedicated `defineConfig` file is also supported via `--config-file` (useful when the config
-lives outside the project or in a nested folder):
+A dedicated `defineConfig` file is also supported via `--config-file` (useful when the config lives outside the project or in a nested folder):
 
 ```sh
 redocly generate-client --config-file ./config/openapi-typescript.config.ts
 ```
 
-**Precedence** (lowest to highest): the `redocly.yaml` `x-openapi-typescript` block → an explicit
-`--config-file` → individual CLI flags. Each layer overrides per setting, so you can keep a base
-config and override one value on the command line.
+**Precedence** (lowest to highest): the `redocly.yaml` `x-openapi-typescript` block → an explicit `--config-file` → individual CLI flags.
+Each layer overrides per setting, so you can keep a base config and override one value on the command line.
 
 ## Examples
 
@@ -212,8 +214,7 @@ const order = await getOrderById('ord_01khr487f7qm7p44xn427m43vb');
 
 ## Authentication
 
-A setter is generated for each `securityScheme` the runtime can apply, and each operation
-automatically sends the credentials its `security` requires:
+A setter is generated for each `securityScheme` the runtime can apply, and each operation automatically sends the credentials its `security` requires:
 
 | Scheme                 | Generated setter                          | Applied as                      |
 | ---------------------- | ----------------------------------------- | ------------------------------- |
@@ -223,11 +224,10 @@ automatically sends the credentials its `security` requires:
 | `apiKey` in query      | `setApiKey(key)` / `setApiKey<Name>(key)` | the named URL query parameter   |
 | `apiKey` in cookie     | `setApiKey(key)` / `setApiKey<Name>(key)` | folded into the `Cookie` header |
 
-`setApiKey` is unsuffixed when the spec declares a single apiKey scheme; otherwise each gets a
-`setApiKey<SchemeName>` setter. `mutualTLS` is not injectable.
+`setApiKey` is unsuffixed when the spec declares a single apiKey scheme; otherwise each gets a `setApiKey<SchemeName>` setter.
+`mutualTLS` is not injectable.
 
-Bearer and apiKey credentials accept a **`TokenProvider`** — a string, or a (possibly async)
-function called per request, which is handy for refresh-token flows:
+Bearer and apiKey credentials accept a **`TokenProvider`** — a string, or a (possibly async) function called per request, which is handy for refresh-token flows:
 
 ```ts
 import { setBearer, setBasicAuth, setApiKey } from './client.ts';
@@ -240,10 +240,9 @@ setApiKey('my-api-key'); // header / query / cookie, per the scheme's `in`
 
 ### Per-instance credentials (service-class facade)
 
-The setters above are **module-global** — every call shares them. When you run multiple independent
-clients (the reason to choose `--facade service-class`), give each instance its own credentials via
-`ClientConfig.auth`. It overrides the global setters for that instance and still honors each
-operation's declared `security`; omitted fields fall back to the global slots.
+The setters above are **module-global** — every call shares them.
+When you run multiple independent clients (the reason to choose `--facade service-class`), give each instance its own credentials via `ClientConfig.auth`.
+It overrides the global setters for that instance and still honors each operation's declared `security`; omitted fields fall back to the global slots.
 
 ```ts
 import { Client } from './client.ts';
@@ -261,9 +260,7 @@ The functions facade can set the same field once globally via `configure({ auth:
 
 ## Argument style
 
-By default each operation takes **positional arguments** — path params in URL order,
-then `params` (query), `body`, and `headers` slots, with the per-call request `init`
-last:
+By default each operation takes **positional arguments** — path params in URL order, then `params` (query), `body`, and `headers` slots, with the per-call request `init` last:
 
 ```ts
 // --args-style flat (default)
@@ -273,8 +270,8 @@ const order = await updateOrder(
 );
 ```
 
-With `--args-style grouped`, every input is bundled into a single `vars` object typed
-as the operation's exported `<Op>Variables` type. The `init` argument stays separate:
+With `--args-style grouped`, every input is bundled into a single `vars` object typed as the operation's exported `<Op>Variables` type.
+The `init` argument stays separate:
 
 ```ts
 // --args-style grouped
@@ -284,10 +281,8 @@ const order = await updateOrder({
 });
 ```
 
-The grouped style is order-independent and additive — new path or query params show up
-as new keys rather than shifting positions — which makes it a good fit as specs evolve
-and for wiring operations into React Query / SWR `mutationFn`s. Operations with no
-inputs take no `vars` object at all (just the optional `init`).
+The grouped style is order-independent and additive — new path or query params show up as new keys rather than shifting positions — which makes it a good fit as specs evolve and for wiring operations into React Query / SWR `mutationFn`s.
+Operations with no inputs take no `vars` object at all (just the optional `init`).
 
 ```sh
 redocly generate-client openapi.yaml --output src/client.ts --args-style grouped
@@ -295,9 +290,9 @@ redocly generate-client openapi.yaml --output src/client.ts --args-style grouped
 
 ## Query serialization
 
-Query parameters are serialized per their OpenAPI `style` / `explode` / `allowReserved`
-declarations. The default — `style: form` with `explode: true` — repeats array values
-(`tags=a&tags=b`) and is what you get when you declare nothing. The other supported forms:
+Query parameters are serialized per their OpenAPI `style` / `explode` / `allowReserved` declarations.
+The default — `style: form` with `explode: true` — repeats array values (`tags=a&tags=b`) and is what you get when you declare nothing.
+The other supported forms:
 
 | `style`          | `explode` | Array `['a', 'b']` on the wire |
 | ---------------- | --------- | ------------------------------ |
@@ -307,9 +302,8 @@ declarations. The default — `style: form` with `explode: true` — repeats arr
 | `pipeDelimited`  | `false`   | `key=a\|b`                     |
 
 Delimiters are emitted literally (the individual values are still percent-encoded).
-`allowReserved: true` leaves the RFC-3986 reserved set (`:/?#[]@!$&'()*+,;=`) un-encoded
-in a value, so e.g. `filter=a/b` survives instead of `filter=a%2Fb`. Declare these on the
-parameter object in the spec:
+`allowReserved: true` leaves the RFC-3986 reserved set (`:/?#[]@!$&'()*+,;=`) un-encoded in a value, so e.g. `filter=a/b` survives instead of `filter=a%2Fb`.
+Declare these on the parameter object in the spec:
 
 ```yaml
 - name: tags
@@ -325,14 +319,12 @@ parameter object in the spec:
 Object-valued query params serialize as `deepObject` brackets (`key[sub]=val`).
 
 {% admonition type="info" name="Note" %}
-An object param at the default `form` style is also emitted as `key[sub]=val` brackets rather than
-the spec's `sub=val` spread.
+An object param at the default `form` style is also emitted as `key[sub]=val` brackets rather than the spec's `sub=val` spread.
 {% /admonition %}
 
 ## Error handling
 
-By default (`--error-mode throw`) an operation throws an `ApiError` on any non-2xx
-response, so a call returns the success body directly:
+By default (`--error-mode throw`) an operation throws an `ApiError` on any non-2xx response, so a call returns the success body directly:
 
 ```ts
 try {
@@ -342,12 +334,10 @@ try {
 }
 ```
 
-With `--error-mode result`, an operation never throws on a non-2xx response. Instead it
-returns a discriminated `Result<TData, TError>` — `{ data, error, response }` — whose
-`error` is typed from the spec's declared 4xx/5xx response bodies (the `<Op>Error`
-union). On success `error` is `undefined`; on a non-2xx response `data` is `undefined`
-and `error` holds the typed body. `response` is always the raw `Response`, so the HTTP
-status is `response.status`:
+With `--error-mode result`, an operation never throws on a non-2xx response.
+Instead it returns a discriminated `Result<TData, TError>` — `{ data, error, response }` — whose `error` is typed from the spec's declared 4xx/5xx response bodies (the `<Op>Error` union).
+On success `error` is `undefined`; on a non-2xx response `data` is `undefined` and `error` holds the typed body.
+`response` is always the raw `Response`, so the HTTP status is `response.status`:
 
 ```ts
 // --error-mode result
@@ -360,8 +350,8 @@ if (error) {
 }
 ```
 
-Transport-level and abort failures still throw in both modes; the `onError` hook applies
-to `throw` mode only. The choice is made once at generate time for the whole client.
+Transport-level and abort failures still throw in both modes; the `onError` hook applies to `throw` mode only.
+The choice is made once at generate time for the whole client.
 
 ```sh
 redocly generate-client openapi.yaml --output src/client.ts --error-mode result
@@ -369,9 +359,7 @@ redocly generate-client openapi.yaml --output src/client.ts --error-mode result
 
 ## Operation metadata
 
-Alongside the operations, the client exports an `OPERATIONS` map keyed by
-operationId, holding each operation's HTTP method and path template (with
-`{param}` placeholders intact):
+Alongside the operations, the client exports an `OPERATIONS` map keyed by operationId, holding each operation's HTTP method and path template (with `{param}` placeholders intact):
 
 ```ts
 export const OPERATIONS = {
@@ -384,11 +372,8 @@ export type OperationId = keyof typeof OPERATIONS;
 export type OperationMetadata = { readonly method: string; readonly path: string };
 ```
 
-Because the keys and values are plain string literals — not function or method
-names — they survive bundling and minification. That makes `OPERATIONS` the stable
-handle to reach for when building cache/query keys, tracing span names, or request
-log labels, instead of reflecting over a function (`fn.name` / `fn.toString()`),
-which a minifier can rename:
+Because the keys and values are plain string literals — not function or method names — they survive bundling and minification.
+That makes `OPERATIONS` the stable handle to reach for when building cache/query keys, tracing span names, or request log labels, instead of reflecting over a function (`fn.name` / `fn.toString()`), which a minifier can rename:
 
 ```ts
 import { OPERATIONS, getOrderById } from './client.ts';
@@ -398,16 +383,12 @@ const queryKey = [OPERATIONS.getOrderById.path, orderId];
 const order = await getOrderById(orderId);
 ```
 
-The map is emitted for both facades (`functions` and `service-class`) and, in the
-multi-file output modes, lives once in the shared schemas module and is re-exported
-from the entry barrel.
+The map is emitted for both facades (`functions` and `service-class`) and, in the multi-file output modes, lives once in the shared schemas module and is re-exported from the entry barrel.
 
 ## Discriminated unions
 
-A `oneOf` / `anyOf` with a usable discriminator gets an exported `is<Member>` type
-guard per member, narrowing the union to that member's named type. The discriminator
-is taken from the spec's `discriminator` block, or inferred when every member is a
-named schema that pins one shared property to a distinct string `const`.
+A `oneOf` / `anyOf` with a usable discriminator gets an exported `is<Member>` type guard per member, narrowing the union to that member's named type.
+The discriminator is taken from the spec's `discriminator` block, or inferred when every member is a named schema that pins one shared property to a distinct string `const`.
 
 ```ts
 export type MenuItem = Beverage | Dessert;
@@ -416,8 +397,7 @@ export function isBeverage(value: MenuItem): value is Beverage { … }
 export function isDessert(value: MenuItem): value is Dessert { … }
 ```
 
-Guards are also emitted when the union is **nested** inside another schema — e.g. the
-`items` of an array, or a property value — as long as every member is a named schema.
+Guards are also emitted when the union is **nested** inside another schema — e.g. the `items` of an array, or a property value — as long as every member is a named schema.
 The guard's parameter is then the inline member union:
 
 ```ts
@@ -431,17 +411,14 @@ const created = result.flatMap((item) => (isBulkSuccessItem(item) ? [item.resour
 ```
 
 {% admonition type="info" name="Note" %}
-Each `is<Member>` is emitted once, even when the same member appears in several unions
-(the first occurrence in document order wins). A union without a usable discriminator
-gets no guard — TypeScript can't soundly narrow it.
+Each `is<Member>` is emitted once, even when the same member appears in several unions (the first occurrence in document order wins).
+A union without a usable discriminator gets no guard — TypeScript can't soundly narrow it.
 {% /admonition %}
 
 ## Middleware
 
-Beyond the single `onRequest` / `onResponse` / `onError` hooks on `ClientConfig`, the client
-takes **composable middleware** — the escape hatch for cross-cutting concerns like auth-token
-refresh, logging, tracing, or request IDs. A middleware is an object with any subset of the three
-hooks:
+Beyond the single `onRequest` / `onResponse` / `onError` hooks on `ClientConfig`, the client takes **composable middleware** — the escape hatch for cross-cutting concerns like auth-token refresh, logging, tracing, or request IDs.
+A middleware is an object with any subset of the three hooks:
 
 ```ts
 type Middleware = {
@@ -454,8 +431,7 @@ type Middleware = {
 };
 ```
 
-Register with `use()` (functions facade) or `<Client>.use()` (service-class facade); both accept
-several at once and can be called repeatedly:
+Register with `use()` (functions facade) or `<Client>.use()` (service-class facade); both accept several at once and can be called repeatedly:
 
 ```ts
 // functions facade
@@ -478,26 +454,23 @@ const client = new Client({ middleware: [authRefresh] }); // declaratively…
 client.use(logging); // …or imperatively (chainable)
 ```
 
-`onRequest` runs in registration order; `onResponse` runs in **reverse** — an onion, so the
-last-registered middleware wraps closest to the network. `onError` (throw mode only) is threaded
-through each middleware in turn, so any can map the failure. `onRequest` may mutate the request
-context (`url` / `method` / `headers`); `onResponse` may return a replacement `Response`.
+`onRequest` runs in registration order; `onResponse` runs in **reverse** — an onion, so the last-registered middleware wraps closest to the network.
+`onError` (throw mode only) is threaded through each middleware in turn, so any can map the failure.
+`onRequest` may mutate the request context (`url` / `method` / `headers`); `onResponse` may return a replacement `Response`.
 
-`onRequest` and `onResponse` run for every request — under both `throw` and `result` error modes,
-and around each Server-Sent-Events connect/reconnect. `onError` only fires when a non-2xx response
-would be **thrown**, so it is a no-op in `result` mode (inspect `result.error` instead) and for SSE
-(which throws its own `ApiError`). Transport/network failures are not routed through `onError`.
+`onRequest` and `onResponse` run for every request — under both `throw` and `result` error modes, and around each Server-Sent-Events connect/reconnect.
+`onError` only fires when a non-2xx response would be **thrown**, so it is a no-op in `result` mode (inspect `result.error` instead) and for SSE (which throws its own `ApiError`).
+Transport/network failures are not routed through `onError`.
 
 {% admonition type="info" name="Relation to the single hooks" %}
-The `onRequest` / `onResponse` / `onError` fields on `ClientConfig` still work — they run as one
-implicit, first middleware. `use()` simply appends to the same chain (`ClientConfig.middleware`),
-so existing code is unaffected.
+The `onRequest` / `onResponse` / `onError` fields on `ClientConfig` still work — they run as one implicit, first middleware.
+`use()` simply appends to the same chain (`ClientConfig.middleware`), so existing code is unaffected.
 {% /admonition %}
 
 ## Retries
 
-The generated client can retry transient failures. Retry is **opt-in** and configured
-through `ClientConfig`, with an optional per-call override.
+The generated client can retry transient failures.
+Retry is **opt-in** and configured through `ClientConfig`, with an optional per-call override.
 
 ```ts
 // Global policy (functions facade)
@@ -513,18 +486,16 @@ await getOrderById('ord_01khr487f7qm7p44xn427m43vb', {}, { retry: { retries: 5 }
 await listMenuItems({ limit: 10 }, { retry: { retries: 0 } });
 ```
 
-By default only **idempotent** methods (`GET`, `HEAD`, `PUT`, `DELETE`, `OPTIONS`)
-are retried, on a network error or a transient status (`408`, `429`, `500`, `502`,
-`503`, `504`). `POST`/`PATCH` are **not** retried automatically, because re-sending a
-non-idempotent request can duplicate side effects. Opt in explicitly when your API is
-safe (e.g. it uses idempotency keys):
+By default only **idempotent** methods (`GET`, `HEAD`, `PUT`, `DELETE`, `OPTIONS`) are retried, on a network error or a transient status (`408`, `429`, `500`, `502`, `503`, `504`).
+`POST`/`PATCH` are **not** retried automatically, because re-sending a non-idempotent request can duplicate side effects.
+Opt in explicitly when your API is safe (e.g. it uses idempotency keys):
 
 ```ts
 await createOrder(body, { retry: { retries: 3, retryOn: () => true } });
 ```
 
-Backoff is exponential with full jitter (`retryStrategy: 'fixed'` for a constant
-delay). A `Retry-After` response header takes precedence over the computed delay.
+Backoff is exponential with full jitter (`retryStrategy: 'fixed'` for a constant delay).
+A `Retry-After` response header takes precedence over the computed delay.
 Retries stop immediately when the request's `AbortSignal` aborts.
 
 ### `RetryConfig` fields
@@ -567,14 +538,12 @@ Retries stop immediately when the request's `AbortSignal` aborts.
 
 {% /table %}
 
-A per-call override is merged field-by-field over the global policy, so a single field
-(such as `retries: 0`) can disable retry for one call without restating the whole policy.
+A per-call override is merged field-by-field over the global policy, so a single field (such as `retries: 0`) can disable retry for one call without restating the whole policy.
 
 ### Custom `retryOn`
 
-`retryOn` receives a `RetryContext` for the attempt that just failed and returns whether to
-retry. A custom predicate **fully replaces** the idempotent-only default — so it is also how
-you opt a `POST`/`PATCH` into retrying (the method is no longer checked for you).
+`retryOn` receives a `RetryContext` for the attempt that just failed and returns whether to retry.
+A custom predicate **fully replaces** the idempotent-only default — so it is also how you opt a `POST`/`PATCH` into retrying (the method is no longer checked for you).
 
 {% table %}
 
@@ -608,9 +577,8 @@ you opt a `POST`/`PATCH` into retrying (the method is no longer checked for you)
 
 {% /table %}
 
-Exactly one of `response` / `error` is set: branch on `ctx.error` for transport failures and
-`ctx.response` for HTTP status codes. To inspect the **response body**, clone it first — the body
-is a single-use stream, and reading it directly would leave nothing for the client to parse:
+Exactly one of `response` / `error` is set: branch on `ctx.error` for transport failures and `ctx.response` for HTTP status codes.
+To inspect the **response body**, clone it first — the body is a single-use stream, and reading it directly would leave nothing for the client to parse:
 
 ```ts
 await pushRemoteContent(
@@ -638,34 +606,29 @@ await pushRemoteContent(
 ```
 
 {% admonition type="warning" name="Read the body via clone()" %}
-`ctx.response` is the raw `Response` — its body can be read only once. Always inspect it through
-`ctx.response.clone()`; calling `.json()`/`.text()` on `ctx.response` directly consumes the stream
-and the client can no longer decode the result.
+`ctx.response` is the raw `Response` — its body can be read only once.
+Always inspect it through `ctx.response.clone()`; calling `.json()`/`.text()` on `ctx.response` directly consumes the stream and the client can no longer decode the result.
 {% /admonition %}
 
 ## Multipart uploads
 
-A `multipart/form-data` request body whose schema is an **object** is generated as a typed
-object — you pass a plain object and the client serializes it to `FormData` for you. Binary
-fields (`type: string, format: binary`) are typed as `Blob` (a `File` is assignable):
+A `multipart/form-data` request body whose schema is an **object** is generated as a typed object — you pass a plain object and the client serializes it to `FormData` for you.
+Binary fields (`type: string, format: binary`) are typed as `Blob` (a `File` is assignable):
 
 ```ts
 // type UploadBody = { file: Blob; orgId: string; tags?: string[] };
 await upload({ file, orgId: 'org_1', tags: ['a', 'b'] });
 ```
 
-Serialization rules: `Blob`/`File` and strings pass through; arrays append one field per item;
-nested objects are JSON-encoded; other scalars are stringified; `undefined`/`null` are skipped.
-A multipart body whose schema **isn't** a concrete object keeps the raw `FormData` type, so you
-can build the form yourself when the shape can't be expressed.
+Serialization rules: `Blob`/`File` and strings pass through; arrays append one field per item; nested objects are JSON-encoded; other scalars are stringified; `undefined`/`null` are skipped.
+A multipart body whose schema **isn't** a concrete object keeps the raw `FormData` type, so you can build the form yourself when the shape can't be expressed.
 
 `format: binary` surfaces as `Blob` wherever it appears; `format: byte` (base64) stays a `string`.
 
 ## Response decoding
 
-By default the client reads each response body by negotiating from its `Content-Type`
-(JSON, then `text/*`, then `Blob`). The per-call request `init` accepts a `parseAs`
-option to force a specific reader:
+By default the client reads each response body by negotiating from its `Content-Type` (JSON, then `text/*`, then `Blob`).
+The per-call request `init` accepts a `parseAs` option to force a specific reader:
 
 ```ts
 // Read the raw bytes as a stream instead of decoding JSON.
@@ -675,36 +638,31 @@ for await (const chunk of res as ReadableStream<Uint8Array>) {
 }
 ```
 
-`parseAs` accepts `'json'`, `'text'`, `'blob'`, `'arrayBuffer'`, `'formData'`,
-`'stream'` (the raw `ReadableStream` from `response.body`), or `'auto'` (the default
-content-type sniff).
+`parseAs` accepts `'json'`, `'text'`, `'blob'`, `'arrayBuffer'`, `'formData'`, `'stream'` (the raw `ReadableStream` from `response.body`), or `'auto'` (the default content-type sniff).
 
 {% admonition type="warning" name="Runtime override only" %}
-`parseAs` does not change the operation's static return type. Forcing a reader that disagrees with
-the schema (for example `'blob'` on a JSON endpoint) returns that value at runtime while TypeScript
+`parseAs` does not change the operation's static return type.
+Forcing a reader that disagrees with the schema (for example `'blob'` on a JSON endpoint) returns that value at runtime while TypeScript
 still reports the declared type; reconciling the two is the caller's responsibility.
 {% /admonition %}
 
 ## Runtime validation with Zod
 
-Pass `--generators sdk,zod` to additionally emit a standalone `<output>.zod.ts` module of
-[Zod](https://zod.dev) schemas — one `export const <Name>Schema` per schema in the
-description:
+Pass `--generators sdk,zod` to additionally emit a standalone `<output>.zod.ts` module of [Zod](https://zod.dev) schemas — one `export const <Name>Schema` per schema in the description:
 
 ```sh
 redocly generate-client openapi.yaml --output src/client.ts --generators sdk,zod
 # → src/client.ts (the zero-dependency client) + src/client.zod.ts (the Zod schemas)
 ```
 
-The generated **client stays dependency-free** and never imports Zod. The `*.zod.ts`
-module is the only file that imports Zod, so install it in your app as a peer:
+The generated **client stays dependency-free** and never imports Zod.
+The `*.zod.ts` module is the only file that imports Zod, so install it in your app as a peer:
 
 ```sh
 npm install zod   # any zod ^3.23 || ^4
 ```
 
-Validate a payload with `.parse()` (or `.safeParse()`), and derive the static type from
-the same schema with `z.infer` — it matches the client's exported type:
+Validate a payload with `.parse()` (or `.safeParse()`), and derive the static type from the same schema with `z.infer` — it matches the client's exported type:
 
 ```ts
 import { z } from 'zod';
@@ -716,18 +674,13 @@ type PetFromSchema = z.infer<typeof PetSchema>; // structurally equal to `Pet`
 const typed: Pet = pet;
 ```
 
-Each schema maps the OpenAPI structure plus the validation refinements that are stable
-across Zod 3.23 and 4 — string/array length (`.min`/`.max`), numeric bounds
-(`.min`/`.max`/`.gt`/`.lt`), `.int`, and `.regex`. Refs become `z.lazy(() => …)`, so
-recursive and forward-referencing schemas validate correctly. Format-specific helpers
-(`.email`/`.uuid`/`.url`) are intentionally not emitted, since they diverge between Zod 3
-and 4.
+Each schema maps the OpenAPI structure plus the validation refinements that are stable across Zod 3.23 and 4 — string/array length (`.min`/`.max`), numeric bounds (`.min`/`.max`/`.gt`/`.lt`), `.int`, and `.regex`.
+Refs become `z.lazy(() => …)`, so recursive and forward-referencing schemas validate correctly.
+Format-specific helpers (`.email`/`.uuid`/`.url`) are intentionally not emitted, since they diverge between Zod 3 and 4.
 
 ## TanStack Query
 
-Pass `--generators sdk,tanstack-query` to additionally emit a standalone
-`<output>.tanstack.ts` module of [TanStack Query](https://tanstack.com/query) v5 factories
-that wrap the sdk operations:
+Pass `--generators sdk,tanstack-query` to additionally emit a standalone `<output>.tanstack.ts` module of [TanStack Query](https://tanstack.com/query) v5 factories that wrap the sdk operations:
 
 ```sh
 redocly generate-client openapi.yaml --output src/client.ts --generators sdk,tanstack-query
@@ -738,11 +691,9 @@ redocly generate-client openapi.yaml --output src/client.ts \
   --generators sdk,tanstack-query --query-framework vue
 ```
 
-Per **query** operation (`GET`/`HEAD`) the module exports a `<op>QueryKey(vars)` and a
-`<op>Options(vars, init?)` factory that returns `queryOptions({ queryKey, queryFn })`; per
-**mutation** (every other method) it exports a `<op>Mutation()` factory returning
-`{ mutationKey, mutationFn }`. Each factory forwards to the matching sdk function, so the
-generated client itself stays dependency-free. Compose them with `useQuery`/`useMutation`:
+Per **query** operation (`GET`/`HEAD`) the module exports a `<op>QueryKey(vars)` and a `<op>Options(vars, init?)` factory that returns `queryOptions({ queryKey, queryFn })`; per **mutation** (every other method) it exports a `<op>Mutation()` factory returning `{ mutationKey, mutationFn }`.
+Each factory forwards to the matching sdk function, so the generated client itself stays dependency-free.
+Compose them with `useQuery`/`useMutation`:
 
 ```ts
 import { useQuery, useMutation } from '@tanstack/react-query';
@@ -755,43 +706,33 @@ function Pet({ id }: { id: string }) {
 }
 ```
 
-The `*.tanstack.ts` module is the only file that imports TanStack Query, so install the
-adapter for your framework as a peer — any `@tanstack/<framework>-query` `^5`:
+The `*.tanstack.ts` module is the only file that imports TanStack Query, so install the adapter for your framework as a peer — any `@tanstack/<framework>-query` `^5`:
 
 ```sh
 npm install @tanstack/react-query   # ^5  (or @tanstack/vue-query, /svelte-query, /solid-query)
 ```
 
 Select the framework with `--query-framework` (`react` default, `vue`, `svelte`, `solid`).
-Only the import specifier the module reads from changes — the emitted factory module is
-otherwise **byte-identical** across frameworks, since TanStack Query's `queryOptions`/mutation
-shapes are framework-agnostic.
+Only the import specifier the module reads from changes — the emitted factory module is otherwise **byte-identical** across frameworks, since TanStack Query's `queryOptions`/mutation shapes are framework-agnostic.
 
-The factories wrap the **throw-mode** sdk (the default): TanStack's `queryFn` is expected to
-throw on error, so use the default (throw-mode) client — a `--error-mode result` client would
-need an unwrap-and-throw shim, which is out of scope.
+The factories wrap the **throw-mode** sdk (the default): TanStack's `queryFn` is expected to throw on error, so use the default (throw-mode) client — a `--error-mode result` client would need an unwrap-and-throw shim, which is out of scope.
 
 {% admonition type="info" name="Compatibility" %}
-`tanstack-query` wraps the sdk's exported throw-mode functions, so it requires `--generators sdk`,
-`--facade functions`, and `--error-mode throw`. An incompatible selection fails fast with an
-explanatory message rather than emitting a client that won't compile. Server-Sent-Events
-operations have no request/response function to wrap (you consume them via the sdk's `sse.*`
-surface), so they are **skipped** with a notice — the rest of the operations are still generated.
+`tanstack-query` wraps the sdk's exported throw-mode functions, so it requires `--generators sdk`, `--facade functions`, and `--error-mode throw`. An incompatible selection fails fast with an explanatory message rather than emitting a client that won't compile.
+Server-Sent-Events operations have no request/response function to wrap (you consume them via the sdk's `sse.*` surface), so they are **skipped** with a notice — the rest of the operations are still generated.
 {% /admonition %}
 
 ## SWR
 
-Pass `--generators sdk,swr` to additionally emit a standalone `<output>.swr.ts` module of
-[SWR](https://swr.vercel.app) hooks that wrap the sdk operations:
+Pass `--generators sdk,swr` to additionally emit a standalone `<output>.swr.ts` module of [SWR](https://swr.vercel.app) hooks that wrap the sdk operations:
 
 ```sh
 redocly generate-client openapi.yaml --output src/client.ts --generators sdk,swr
 # → src/client.ts (the zero-dependency client) + src/client.swr.ts (the SWR hooks)
 ```
 
-Each **query** operation (`GET`/`HEAD`) exports a `<op>Key(vars)` tuple factory and a
-`use<Op>(vars, init?)` hook returning `useSWR(key, fetcher)`; each **mutation** exports a
-`use<Op>()` hook returning `useSWRMutation(key, trigger)`. Call them straight from a component:
+Each **query** operation (`GET`/`HEAD`) exports a `<op>Key(vars)` tuple factory and a `use<Op>(vars, init?)` hook returning `useSWR(key, fetcher)`; each **mutation** exports a `use<Op>()` hook returning `useSWRMutation(key, trigger)`.
+Call them straight from a component:
 
 ```ts
 import { useGetPetById, useCreatePet } from './client.swr.ts';
@@ -801,27 +742,24 @@ const { trigger } = useCreatePet();
 await trigger({ body: { name: 'Rex' } });
 ```
 
-The generated client stays dependency-free; only the `*.swr.ts` module imports SWR (`swr` for
-queries, `swr/mutation` for mutations). Install it in your app as a peer — any `swr` `^2`:
+The generated client stays dependency-free; only the `*.swr.ts` module imports SWR (`swr` for queries, `swr/mutation` for mutations).
+Install it in your app as a peer — any `swr` `^2`:
 
 ```sh
 npm install swr   # ^2
 ```
 
 {% admonition type="info" name="Compatibility" %}
-The hooks wrap the **throw-mode** sdk (the default), since SWR's fetcher is expected to throw
-on error. `swr` requires `--generators sdk`, `--facade functions`, and `--error-mode throw`; an
-incompatible selection fails fast. SSE operations are **skipped** with a notice (consume them
-via the sdk's `sse.*` surface).
+The hooks wrap the **throw-mode** sdk (the default), since SWR's fetcher is expected to throw an error.
+`swr` requires `--generators sdk`, `--facade functions`, and `--error-mode throw`. 
+An incompatible selection fails fast.
+SSE operations are **skipped** with a notice (consume them via the sdk's `sse.*` surface).
 {% /admonition %}
 
 ## Date transformers
 
-By default, `date-time`/`date` fields are typed as `string` (the ISO wire shape). Pass
-`--date-type Date` to type them as `Date` instead, and pair it with
-`--generators sdk,transformers` to emit a standalone `<output>.transformers.ts` module of
-`transform<Name>(data)` functions that convert those wire ISO strings to `Date` at runtime so
-the value matches the type:
+By default, `date-time`/`date` fields are typed as `string` (the ISO wire shape).
+Pass `--date-type Date` to type them as `Date` instead, and pair it with `--generators sdk,transformers` to emit a standalone `<output>.transformers.ts` module of `transform<Name>(data)` functions that convert those wire ISO strings to `Date` at runtime so the value matches the type:
 
 ```sh
 redocly generate-client openapi.yaml --output src/client.ts \
@@ -829,10 +767,8 @@ redocly generate-client openapi.yaml --output src/client.ts \
 # → src/client.ts (the zero-dependency client, dates typed `Date`) + src/client.transformers.ts
 ```
 
-Per schema that (recursively) carries a date field, the module exports a
-`transform<Name>(data: <Name>): <Name>` that walks the value and rewrites the date positions
-in place — top-level scalars, arrays of dates, records, and `$ref`s (composing
-`transformPet` → `transformOwner`). Pipe responses through it:
+Per schema that (recursively) carries a date field, the module exports a `transform<Name>(data: <Name>): <Name>` that walks the value and rewrites the date positions in place — top-level scalars, arrays of dates, records, and `$ref`s (composing `transformPet` → `transformOwner`).
+Pipe responses through it:
 
 ```ts
 import { getPet } from './client.ts';
@@ -842,10 +778,8 @@ const pet = transformPet(await getPet(id));
 // pet.createdAt is now a Date
 ```
 
-The transformers module imports only the schema **types** from the client, so the generated
-client itself stays dependency-free (`Date` is a web standard — no library). `int64` → `bigint`
-is deferred to a follow-up; without `--date-type Date` the date fields stay `string` and the
-output is byte-identical to before.
+The transformers module imports only the schema **types** from the client, so the generated client itself stays dependency-free (`Date` is a web standard — no library).
+`int64` → `bigint` is deferred to a follow-up; without `--date-type Date` the date fields stay `string` and the output is byte-identical to before.
 
 {% admonition type="info" name="Compatibility" %}
 `transformers` requires `--generators sdk` and `--date-type Date`: it assigns `Date` values to the
@@ -856,18 +790,15 @@ compile.
 
 ## MSW mocks
 
-Pass `--generators sdk,mock` to additionally emit a standalone `<output>.mocks.ts` module of
-[MSW](https://mswjs.io) v2 request handlers and `create<Schema>(overrides?)` data factories:
+Pass `--generators sdk,mock` to additionally emit a standalone `<output>.mocks.ts` module of [MSW](https://mswjs.io) v2 request handlers and `create<Schema>(overrides?)` data factories:
 
 ```sh
 redocly generate-client openapi.yaml --output src/client.ts --generators sdk,mock
 # → src/client.ts (the zero-dependency client) + src/client.mocks.ts (MSW handlers + factories)
 ```
 
-Each handler intercepts its operation's method + path and responds with a fixture baked from
-the spec (prefers `example`/`default`; `format: binary` → `new Blob([])`; recursive schemas
-terminate at the cycle with an empty array/record). Each `create<Schema>` factory builds the
-same default object and merges in any `overrides`, so factories double as test builders:
+Each handler intercepts its operation's method + path and responds with a fixture baked from the spec (prefers `example`/`default`; `format: binary` → `new Blob([])`; recursive schemas terminate at the cycle with an empty array/record).
+Each `create<Schema>` factory builds the same default object and merges in any `overrides`, so factories double as test builders:
 
 ```ts
 // test setup (Node)
@@ -884,9 +815,8 @@ import { createMenuItem } from './client.mocks.ts';
 const special = createMenuItem({ name: 'Cold Brew', price: 499 });
 ```
 
-By default mock data is **baked** — deterministic literals inlined from the spec, with no extra
-runtime dependency. Pass `--mock-data faker` to emit [`@faker-js/faker`](https://fakerjs.dev)
-calls for realistic data, and `--mock-seed <n>` to pin faker's PRNG so the data is reproducible:
+By default mock data is **baked** — deterministic literals inlined from the spec, with no extra runtime dependency.
+Pass `--mock-data faker` to emit [`@faker-js/faker`](https://fakerjs.dev) calls for realistic data, and `--mock-seed <n>` to pin faker's PRNG so the data is reproducible:
 
 ```sh
 redocly generate-client openapi.yaml --output src/client.ts \
@@ -894,21 +824,18 @@ redocly generate-client openapi.yaml --output src/client.ts \
 ```
 
 {% admonition type="info" name="Compatibility" %}
-`mock` requires `--generators sdk` (the factories reference its types). Install MSW in your app
-as a dev dependency (`msw` `^2`); for `--mock-data faker`, also install `@faker-js/faker`. The
-generated client itself stays dependency-free — only the `*.mocks.ts` module imports them.
+`mock` requires `--generators sdk` (the factories reference its types). Install MSW in your app as a dev dependency (`msw` `^2`); for `--mock-data faker`, also install `@faker-js/faker`.
+The generated client itself stays dependency-free — only the `*.mocks.ts` module imports them.
 {% /admonition %}
 
 ## Custom generators
 
-The built-in generators (`sdk`, `zod`, …) cover the common targets. For anything else derived from
-the same description — validators in another library, a permissions map for your UI, mocks in your
-test runner's format, an SDK in your company's house style — write a **custom generator**. It reads
-the same spec-agnostic model the built-ins consume and runs in the same command, so its output never
-drifts from the spec and you never parse OpenAPI yourself.
+The built-in generators (`sdk`, `zod`, …) cover the common targets.
+For anything else derived from the same description — validators in another library, a permissions map for your UI, mocks in your test runner's format, an SDK in your company's house style — write a **custom generator**.
+It reads the same spec-agnostic model the built-ins consume and runs in the same command, so its output never drifts from the spec and you never parse OpenAPI yourself.
 
-A generator is `{ name, run }` (plus optional compatibility metadata). `run` receives the model and
-returns files; author it with `defineGenerator` for type inference:
+A generator is `{ name, run }` (plus optional compatibility metadata).
+`run` receives the model and returns files; author it with `defineGenerator` for type inference:
 
 ```ts
 // route-map-generator.ts
@@ -932,17 +859,11 @@ export default defineGenerator({
 });
 ```
 
-The `@redocly/openapi-typescript/plugin` entry also exports the **codegen toolkit** the built-in
-generators use — `ts` (the `ts.factory` wrapper), `printStatements`, `parseStatements`,
-`operationSignature`, `schemaToTypeNode`, `pascalCase`, `safeIdent` — and the IR types (`ApiModel`,
-`OperationModel`, `SchemaModel`, …), so a custom generator can emit TypeScript exactly as the
-first-party ones do.
+The `@redocly/openapi-typescript/plugin` entry also exports the **codegen toolkit** the built-in generators use — `ts` (the `ts.factory` wrapper), `printStatements`, `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, `safeIdent` — and the IR types (`ApiModel`, `OperationModel`, `SchemaModel`, …), so a custom generator can emit TypeScript exactly as the first-party ones do.
 
 ### Selecting a custom generator
 
-A `generators` entry that is not a built-in name is either an **inline** generator (registered via
-`customGenerators` in a `defineConfig` file) or an **import specifier** — a path (resolved against
-the config's directory) or an installed package — that default-exports the generator:
+A `generators` entry that is not a built-in name is either an **inline** generator (registered via `customGenerators` in a `defineConfig` file) or an **import specifier** — a path (resolved against the config's directory) or an installed package — that default-exports the generator:
 
 ```yaml
 # redocly.yaml — by path or by published package
@@ -968,25 +889,18 @@ export default defineConfig({
 });
 ```
 
-A worked example lives in
-[`examples/custom-generator`](https://github.com/Redocly/redocly-cli/tree/main/packages/openapi-typescript/examples/custom-generator).
+A worked example lives in [`examples/custom-generator`](https://github.com/Redocly/redocly-cli/tree/main/packages/openapi-typescript/examples/custom-generator).
 
 {% admonition type="info" name="Compatibility & trust" %}
-A custom generator declares the same `requires` / `facades` / `errorModes` / `dateTypes` contract as
-the built-ins, validated up front — an incompatible selection, a name that collides with another
-generator, or an unloadable specifier fails fast with an actionable message. The generated client
-stays dependency-free: a generator's output is its own file(s), and any libraries it targets are
-peers of _your app_. Import-specifier generators execute at generation time — the same trust level as
-any installed dependency or `defineConfig` file.
+A custom generator declares the same `requires` / `facades` / `errorModes` / `dateTypes` contract as the built-ins, validated up front — an incompatible selection, a name that collides with another generator, or an unloadable specifier fails fast with an actionable message.
+The generated client stays dependency-free: a generator's output is its own file(s), and any libraries it targets are peers of _your app_.
+Import-specifier generators execute at generation time — the same trust level as any installed dependency or `defineConfig` file.
 {% /admonition %}
 
 ## Server-Sent Events (streaming)
 
-An operation whose `2xx` response declares `text/event-stream` is generated as a typed async
-iterator under an `sse` namespace instead of as a regular call — no flag is required; it is
-detected from the description. Each event's `data` is typed from the OpenAPI 3.2 `itemSchema`
-(falling back to the media `schema`, then `string`); when the payload is a structured type the
-runtime `JSON.parse`s `data` for you, otherwise it passes the raw string.
+An operation whose `2xx` response declares `text/event-stream` is generated as a typed async iterator under an `sse` namespace instead of as a regular call — no flag is required; it is detected from the description.
+Each event's `data` is typed from the OpenAPI 3.2 `itemSchema` (falling back to the media `schema`, then `string`); when the payload is a structured type the runtime `JSON.parse`s `data` for you, otherwise it passes the raw string.
 
 ```ts
 import { sse } from './client.ts';
@@ -997,12 +911,10 @@ for await (const ev of sse.streamMessages()) {
 ```
 
 Each yielded `ServerSentEvent<T>` is `{ event?: string; data: T; id?: string; retry?: number }`.
-With the **service-class** facade the same surface lives on the instance:
-`new Client(cfg).sse.streamMessages()`.
+With the **service-class** facade the same surface lives on the instance: `new Client(cfg).sse.streamMessages()`.
 
-The stream **auto-reconnects** on a dropped connection, resuming from the last seen event id via
-the `Last-Event-ID` header (backoff honors the server's `retry:` field, then `reconnectDelay`, then
-1s — exponential with jitter, capped at 30s). Opt out or tune it per call:
+The stream **auto-reconnects** on a dropped connection, resuming from the last seen event id via the `Last-Event-ID` header (backoff honors the server's `retry:` field, then `reconnectDelay`, then 1s — exponential with jitter, capped at 30s).
+Opt out or tune it per call:
 
 ```ts
 // Disable reconnection, or set the base delay (ms).
@@ -1012,8 +924,7 @@ for await (const ev of sse.streamMessages({ reconnect: false })) {
 const stream = sse.streamMessages({ reconnectDelay: 500 });
 ```
 
-To stop early, `break` out of the loop or pass an `AbortSignal` — both end the iterator **cleanly**
-(no error is thrown):
+To stop early, `break` out of the loop or pass an `AbortSignal` — both end the iterator **cleanly** (no error is thrown):
 
 ```ts
 const ac = new AbortController();
@@ -1024,8 +935,7 @@ for await (const ev of sse.streamMessages({ signal: ac.signal })) {
 // loop ends without throwing when the signal aborts
 ```
 
-SSE operations are **error-mode-agnostic**: they always throw an `ApiError` if the initial response
-is non-2xx, and never return the `--error-mode result` `Result` shape.
+SSE operations are **error-mode-agnostic**: they always throw an `ApiError` if the initial response is non-2xx, and never return the `--error-mode result` `Result` shape.
 
 ## Resources
 
diff --git a/packages/openapi-typescript/ARCHITECTURE.md b/packages/openapi-typescript/ARCHITECTURE.md
index e877bebb5b..d185f1ce58 100644
--- a/packages/openapi-typescript/ARCHITECTURE.md
+++ b/packages/openapi-typescript/ARCHITECTURE.md
@@ -1,32 +1,24 @@
 # Client Generator — Architecture
 
-How `@redocly/openapi-typescript` is built. This is a **descriptive** map of the current shape — the
-pipeline, the modules, and the seams. It says _what is_; the **why** (the significant decisions and
-their trade-offs) lives in the Architecture Decision Records under [`docs/adr/`](./docs/adr/), linked
-inline below. For the vocabulary used here (IR, emitter, writer, runtime, facade, output mode, …), see
-[CONTEXT.md](./CONTEXT.md). This is not a roadmap; planned refactors live in their own specs.
+How `@redocly/openapi-typescript` is built.
+This is a **descriptive** map of the current shape — the pipeline, the modules, and the seams.
+It says _what is_; the **why** (the significant decisions and their trade-offs) lives in the Architecture Decision Records under [`docs/adr/`](./docs/adr/), linked inline below.
+For the vocabulary used here (IR, emitter, writer, runtime, facade, output mode, …), see [CONTEXT.md](./CONTEXT.md).
+This is not a roadmap; planned refactors live in their own specs.
 
 ## Overview
 
-The package turns an OpenAPI description into a typed TypeScript client with **zero runtime
-dependencies** — the generated code uses only web-standard APIs (`fetch`, `AbortController`,
-`URLSearchParams`), so it runs in browsers, Node, Bun, Deno, and edge runtimes (see
-[ADR-0002](./docs/adr/0002-typescript-peer-dep.md)). It backs the `redocly generate-client` CLI command.
+The package turns an OpenAPI description into a typed TypeScript client with **zero runtime dependencies** — the generated code uses only web-standard APIs (`fetch`, `AbortController`, `URLSearchParams`), so it runs in browsers, Node, Bun, Deno, and edge runtimes (see [ADR-0002](./docs/adr/0002-typescript-peer-dep.md)).
+It backs the `redocly generate-client` CLI command.
 
 ## Codegen approach
 
-Generated TypeScript is built as a **TypeScript AST** (`ts.factory` nodes) and emitted by the
-compiler's own printer (`ts.createPrinter`), **not** by string interpolation — rationale and trade-offs
-in [ADR-0001](./docs/adr/0001-ast-codegen.md). The one generation-time dependency is `typescript`
-itself, declared as a **peer** ([ADR-0002](./docs/adr/0002-typescript-peer-dep.md)); it is never
-emitted, so the generated client stays dependency-free.
+Generated TypeScript is built as a **TypeScript AST** (`ts.factory` nodes) and emitted by the compiler's own printer (`ts.createPrinter`), **not** by string interpolation — rationale and trade-offs in [ADR-0001](./docs/adr/0001-ast-codegen.md).
+The one generation-time dependency is `typescript` itself, declared as a **peer** ([ADR-0002](./docs/adr/0002-typescript-peer-dep.md)); it is never emitted, so the generated client stays dependency-free.
 
-A foundation module (`emitters/ts.ts`) wraps the ergonomics: re-exports `ts` (the `factory`),
-`printNodes(nodes)` over a shared printer, `parseStatements(source)` to embed hand-authored constant
-code (the **runtime**) as parsed nodes routed through the same printer, and `jsdoc(node, text)`. Each
-emitter produces `ts.Statement[]` / `ts.TypeNode`s; the composition (`client.ts`) assembles the
-per-file statement list and prints **once**. Formatting is the printer's; a pretty-print pass is
-deferred to optional-formatter work (roadmap P7.3).
+A foundation module (`emitters/ts.ts`) wraps the ergonomics: re-exports `ts` (the `factory`), `printNodes(nodes)` over a shared printer, `parseStatements(source)` to embed hand-authored constant code (the **runtime**) as parsed nodes routed through the same printer, and `jsdoc(node, text)`.
+Each emitter produces `ts.Statement[]` / `ts.TypeNode`s; the composition (`client.ts`) assembles the per-file statement list and prints **once**.
+Formatting is the printer's; a pretty-print pass is deferred to optional-formatter work (roadmap P7.3).
 
 ## Pipeline
 
@@ -41,19 +33,13 @@ flowchart LR
   emit --> files[[".ts files"]]
 ```
 
-1. **`loadSpec`** (`loader.ts`) — bundles the OpenAPI document via `@redocly/openapi-core`, resolving
-   external `$ref`s while **preserving internal `$ref`s** (the IR builder relies on named references
-   staying intact). Also detects the spec version (`detectSpec`).
-   1.5. **`normalizeSwagger2`** (`ir/normalize-swagger2.ts`) — when the detected version is `oas2`,
-   converts the Swagger 2.0 document to the OpenAPI 3.x shape (definitions → components.schemas,
-   host/basePath/schemes → servers, body/formData params → requestBody, `responses[].schema` →
-   `responses[].content`, securityDefinitions → securitySchemes, `$ref` rewrite). OAS 3.0/3.1/3.2 skip
-   this step.
-2. **`buildApiModel`** (`ir/build.ts`) — walks the OpenAPI document and produces the spec-agnostic
-   **IR** (`ir/model.ts`). Everything downstream reads the IR, never the raw spec
-   ([ADR-0003](./docs/adr/0003-spec-agnostic-ir.md)).
-3. **`getWriter(outputMode)`** (`writers/index.ts`) — selects the **Writer** for the chosen output
-   mode.
+1. **`loadSpec`** (`loader.ts`) — bundles the OpenAPI document via `@redocly/openapi-core`, resolving external `$ref`s while **preserving internal `$ref`s** (the IR builder relies on named references staying intact).
+   Also detects the spec version (`detectSpec`).
+   1.5. **`normalizeSwagger2`** (`ir/normalize-swagger2.ts`) — when the detected version is `oas2`, converts the Swagger 2.0 document to the OpenAPI 3.x shape (definitions → components.schemas, host/basePath/schemes → servers, body/formData params → requestBody, `responses[].schema` → `responses[].content`, securityDefinitions → securitySchemes, `$ref` rewrite).
+   OAS 3.0/3.1/3.2 skip this step.
+2. **`buildApiModel`** (`ir/build.ts`) — walks the OpenAPI document and produces the spec-agnostic **IR** (`ir/model.ts`).
+   Everything downstream reads the IR, never the raw spec ([ADR-0003](./docs/adr/0003-spec-agnostic-ir.md)).
+3. **`getWriter(outputMode)`** (`writers/index.ts`) — selects the **Writer** for the chosen output mode.
 4. The **Writer** decides the file layout and fills each file by calling the **emitters**.
 5. The **emitters** (`emitters/`) build a **TypeScript AST** and print it via `emitters/ts.ts`.
 6. `generateClient` (`index.ts`) writes the files to disk.
@@ -78,49 +64,37 @@ builder and the emitters ([ADR-0003](./docs/adr/0003-spec-agnostic-ir.md)).
 Places where behavior varies without editing in place:
 
 - **The `getGenerator` seam** — a generator is `(input) => GeneratedFile[]` (`generators/types.ts`).
-  `generateClient` resolves the configured selection (default `['sdk']`) via `resolveGenerators`
-  (`generators/resolve.ts`) into a name→descriptor registry, then runs them through
-  `collectGeneratedFiles` and merges their files (duplicate output paths throw). A selection entry is a
-  built-in name, the `name` of an inline `customGenerators` entry, or a **plugin import specifier**
-  (path or package, dynamically imported and validated). This is the public, **experimental**
-  extension point — authored with `defineGenerator` from `@redocly/openapi-typescript/plugin`, which
-  also re-exports the IR types and the codegen toolkit. Where new capabilities (zod, framework hooks)
-  plug in. See [ADR-0004](./docs/adr/0004-registry-seams.md) and
-  [ADR-0012](./docs/adr/0012-plugin-api.md).
-- **The `getWriter` seam** — `getWriter(outputMode)` maps an output mode to a `Writer`. Four adapters:
-  `single`, `split`, `tags`, `tags-split` (the tag layouts share `buildTaggedClient`). Where a new file
-  layout plugs in. See [ADR-0004](./docs/adr/0004-registry-seams.md).
-- **The emitter ↔ writer seam** — `emitModules(model, options): ClientModules` is the _only_ thing
-  writers consume from the emitter. `ClientModules` exposes each emitted module's content (`http`,
-  `schemas`, `operations`) plus per-file wiring (`renderEndpoints`, `endpointImports`,
-  `publicReexport`). The emitter's internal **fragment** breakdown never crosses this seam. `single`
-  output bypasses this via `emitSingleFile`.
-- **Runtime emission** — the runtime is authored as reference TypeScript source and parsed into
-  `ts.Statement[]` (`runtimeStatements`, `emitters/runtime.ts`) via `parseStatements`, with the base
-  URL inlined and the public declarations optionally `export`ed (multi-file) or kept local
-  (single-file). `renderRuntime` prints those statements for the string-asserting unit tests.
-- **The runtime-terminals seam** — the fetch wrapper is a shared core (`__send` + `__parse`) plus one
-  of two terminals selected by **error mode** (`__request` for throw, `__requestResult` for result).
-  Only the chosen terminal is emitted. See [ADR-0005](./docs/adr/0005-error-mode-terminals.md).
-- **Response decoding is a runtime concern** — `__parse` decodes the body; the inferred kind comes from
-  the operation's `responseKind` (a generate-time hint). The per-call `RequestOptions.parseAs` overrides
-  it (e.g. `'stream'` for the raw `ReadableStream`); the static return type is **not** narrowed by
-  `parseAs`, keeping operation signatures stable.
-- **The SSE seam** — an operation whose 2xx response declares `text/event-stream` is a **derived
-  response kind**, detected by `emitters/sse.ts` and emitted under a separate `sse` namespace backed by
-  a gated `__sse<T>` generator that reuses `__send`. See [ADR-0006](./docs/adr/0006-sse-namespace.md).
-- **The async-auth seam** — credentials are resolved **at the call site** via an async
-  `__auth(schemes, config)`, not in the runtime; non-authed operations emit no auth code. Each scheme
-  resolves from the instance's `config.auth?.<scheme>` (per-instance, `ClientConfig.auth`) falling back
-  to the module-global `set*` slot. See [ADR-0007](./docs/adr/0007-call-site-auth.md) and
-  [ADR-0009](./docs/adr/0009-per-instance-auth.md).
+  `generateClient` resolves the configured selection (default `['sdk']`) via `resolveGenerators` (`generators/resolve.ts`) into a name→descriptor registry, then runs them through `collectGeneratedFiles` and merges their files (duplicate output paths throw).
+  A selection entry is a built-in name, the `name` of an inline `customGenerators` entry, or a **plugin import specifier** (path or package, dynamically imported and validated).
+  This is the public, **experimental** extension point — authored with `defineGenerator` from `@redocly/openapi-typescript/plugin`, which also re-exports the IR types and the codegen toolkit.
+  Where new capabilities (zod, framework hooks) plug in.
+  See [ADR-0004](./docs/adr/0004-registry-seams.md) and [ADR-0012](./docs/adr/0012-plugin-api.md).
+- **The `getWriter` seam** — `getWriter(outputMode)` maps an output mode to a `Writer`.
+  Four adapters: `single`, `split`, `tags`, `tags-split` (the tag layouts share `buildTaggedClient`).
+  Where a new file layout plugs in.
+  See [ADR-0004](./docs/adr/0004-registry-seams.md).
+- **The emitter ↔ writer seam** — `emitModules(model, options): ClientModules` is the _only_ thing writers consume from the emitter.
+  `ClientModules` exposes each emitted module's content (`http`, `schemas`, `operations`) plus per-file wiring (`renderEndpoints`, `endpointImports`, `publicReexport`).
+  The emitter's internal **fragment** breakdown never crosses this seam.
+  `single` output bypasses this via `emitSingleFile`.
+- **Runtime emission** — the runtime is authored as reference TypeScript source and parsed into `ts.Statement[]` (`runtimeStatements`, `emitters/runtime.ts`) via `parseStatements`, with the base URL inlined and the public declarations optionally `export`ed (multi-file) or kept local (single-file).
+  `renderRuntime` prints those statements for the string-asserting unit tests.
+- **The runtime-terminals seam** — the fetch wrapper is a shared core (`__send` + `__parse`) plus one of two terminals selected by **error mode** (`__request` for throw, `__requestResult` for result).
+  Only the chosen terminal is emitted.
+  See [ADR-0005](./docs/adr/0005-error-mode-terminals.md).
+- **Response decoding is a runtime concern** — `__parse` decodes the body; the inferred kind comes from the operation's `responseKind` (a generate-time hint).
+  The per-call `RequestOptions.parseAs` overrides it (e.g. `'stream'` for the raw `ReadableStream`); the static return type is **not** narrowed by `parseAs`, keeping operation signatures stable.
+- **The SSE seam** — an operation whose 2xx response declares `text/event-stream` is a **derived response kind**, detected by `emitters/sse.ts` and emitted under a separate `sse` namespace backed by a gated `__sse<T>` generator that reuses `__send`.
+  See [ADR-0006](./docs/adr/0006-sse-namespace.md).
+- **The async-auth seam** — credentials are resolved **at the call site** via an async `__auth(schemes, config)`, not in the runtime; non-authed operations emit no auth code.
+  Each scheme resolves from the instance's `config.auth?.<scheme>` (per-instance, `ClientConfig.auth`) falling back to the module-global `set*` slot.
+  See [ADR-0007](./docs/adr/0007-call-site-auth.md) and [ADR-0009](./docs/adr/0009-per-instance-auth.md).
 
 ## Configuration
 
-`generate-client` reads its options from an `x-openapi-typescript` block in `redocly.yaml`
-(auto-discovered), with a dedicated `*.config.ts` (`--config-file`) and CLI flags layering over it. The
-extraction lives in the CLI command, not this package's core. See
-[ADR-0008](./docs/adr/0008-redocly-yaml-config.md).
+`generate-client` reads its options from an `x-openapi-typescript` block in `redocly.yaml` (auto-discovered), with a dedicated `*.config.ts` (`--config-file`) and CLI flags layering over it.
+The extraction lives in the CLI command, not this package's core.
+See [ADR-0008](./docs/adr/0008-redocly-yaml-config.md).
 
 ## What varies
 
@@ -130,62 +104,40 @@ Three orthogonal knobs combine freely:
 - **Facade** (`--facade`): `functions` · `service-class` — operation shape.
 - **Args style** (`--args-style`): `flat` · `grouped` — how inputs are passed.
 
-Plus **enum style** (`--enum-style`: `union` · `const-object`), **error mode** (`--error-mode`: `throw`
-· `result`), **date type** (`--date-type`: `string` · `Date`), and `--base-url` / `--name` modifiers.
-The **runtime** and **schemas** modules are identical across facade and args-style choices; only the
-**endpoints** differ.
+Plus **enum style** (`--enum-style`: `union` · `const-object`), **error mode** (`--error-mode`: `throw` · `result`), **date type** (`--date-type`: `string` · `Date`), and `--base-url` / `--name` modifiers.
+The **runtime** and **schemas** modules are identical across facade and args-style choices; only the **endpoints** differ.
 
-Orthogonally, **`--generators`** selects which generators run (default `sdk`; plus `zod`,
-`tanstack-query`, `swr`, `transformers`, `mock`, and custom plugins), with per-generator knobs:
-`--query-framework` (`react` · `vue` · `svelte` · `solid`, for `tanstack-query`) and `--mock-data`
-(`baked` · `faker`) / `--mock-seed` (for `mock`).
+Orthogonally, **`--generators`** selects which generators run (default `sdk`; plus `zod`, `tanstack-query`, `swr`, `transformers`, `mock`, and custom plugins), with per-generator knobs: `--query-framework` (`react` · `vue` · `svelte` · `solid`, for `tanstack-query`) and `--mock-data` (`baked` · `faker`) / `--mock-seed` (for `mock`).
 
-## Testing model
+## Test architeture
 
-- **Unit tests** (`VITEST_SUITE=unit`) live in `__tests__/` beside source. This package is held to
-  **100% per-file coverage**. The IR builder, ref collection, writers, and each emitter are tested
-  directly through their interfaces, sharing `__tests__/fixtures.ts`; the emitters are largely covered
-  by output-string assertions.
-- **E2E tests** (`VITEST_SUITE=e2e`, under `tests/e2e/generate-client/`) generate a client, type-check
-  it under strict `tsc` (`--noUnusedLocals`), and — for behavioral cases — run it against a local mock
-  server.
-- **The runtime** is emitted as a source string, so its behavior (retry, abort, body serialization,
-  query building, SSE reconnection) is exercised through the e2e path.
+- **Unit tests** (`VITEST_SUITE=unit`) live in `__tests__/` beside source.
+  This package is held to **100% per-file coverage**.
+  The IR builder, ref collection, writers, and each emitter are tested directly through their interfaces, sharing `__tests__/fixtures.ts`; the emitters are largely covered by output-string assertions.
+- **E2E tests** (`VITEST_SUITE=e2e`, under `tests/e2e/generate-client/`) generate a client, type-check it under strict `tsc` (`--noUnusedLocals`), and — for behavioral cases — run it against a local mock server.
+- **The runtime** is emitted as a source string, so its behavior (retry, abort, body serialization, query building, SSE reconnection) is exercised through the e2e path.
 
-Tests run from a single root `vitest.config.ts`; there are no per-package vitest configs. Compile
-(`npm run compile`) before running tests — they run against built output.
+Tests run from a single root `vitest.config.ts`; there are no per-package vitest configs.
+Compile (`npm run compile`) before running tests — they run against built output.
 
 ## How to add things
 
-- **A new output mode** — add the literal to `OutputMode` (`writers/types.ts`), write a `Writer` (or
-  extend `buildTaggedClient`), and register it in the `WRITERS` map (`writers/index.ts`). Wire the CLI
-  choice in the `generate-client` command.
-- **A new facade** — extend the `Facade` type and `operationsBlockStatements` in
-  `emitters/operations.ts` (build the function/method nodes via `emitters/ts.ts`); both single and
-  multi-file writers route through it.
-- **A new schema kind** — add the variant to `SchemaModel` (`ir/model.ts`), produce it in `ir/build.ts`,
-  and build its `ts.TypeNode` in `schemaToTypeNode` (`emitters/types.ts`).
-- **A new runtime capability** — extend the authored source in `emitters/runtime.ts` (parsed into nodes
-  via `parseStatements`); surface any new public type via `PUBLIC_RUNTIME_TYPES` so multi-file output
-  re-exports it from the barrel.
-- **A new wrapper generator** (a framework adapter that forwards to the sdk functions) — reuse
-  `emitters/wrapper-support.ts` for operation eligibility (SSE / `<Op>Variables`-collision skips) and
-  the `vars`/`init` parameter shape, and derive the forwarding call's argument order and
-  `<Op>Variables` naming from `operationSignature` (`emitters/operation-signature.ts`), the same
-  source the sdk's parameter list uses, so the wrappers cannot drift. Declare its compatibility
-  contract (`requires`/`facades`/`errorModes`/`dateTypes`) in the generator registry
-  (`generators/index.ts`). See [ADR-0011](./docs/adr/0011-wrapper-generators.md).
-- **A new mock data source** — the `mock` generator's data comes from `emitters/sample.ts` (baked literals)
-  or `emitters/faker.ts` (faker calls), selected by `--mock-data`; both walk the IR with the same
-  cycle semantics. See [ADR-0010](./docs/adr/0010-mock-data-baked-vs-faker.md).
-- **A custom generator (plugin, experimental)** — author `{ name, run }` with `defineGenerator` from
-  the `@redocly/openapi-typescript/plugin` entry (it also exports the IR types and the codegen toolkit);
-  select it in `generators` by inline `customGenerators` name or by import specifier. No core change is
-  needed — `resolve.ts` loads and validates it. See [ADR-0012](./docs/adr/0012-plugin-api.md).
-
-## Keeping this current
-
-Update this file when the **pipeline** stages, the **seams**, or the **module map** change — not for
-routine feature work within an existing module. Keep it **descriptive**. When you make a significant,
-hard-to-reverse decision, record it as a new ADR in [`docs/adr/`](./docs/adr/) (don't rewrite an
-existing ADR — supersede it), and link the relevant seam here to it.
+- **A new output mode** — add the literal to `OutputMode` (`writers/types.ts`), write a `Writer` (or extend `buildTaggedClient`), and register it in the `WRITERS` map (`writers/index.ts`).
+  Wire the CLI choice in the `generate-client` command.
+- **A new facade** — extend the `Facade` type and `operationsBlockStatements` in `emitters/operations.ts` (build the function/method nodes via `emitters/ts.ts`); both single and multi-file writers route through it.
+- **A new schema kind** — add the variant to `SchemaModel` (`ir/model.ts`), produce it in `ir/build.ts`, and build its `ts.TypeNode` in `schemaToTypeNode` (`emitters/types.ts`).
+- **A new runtime capability** — extend the authored source in `emitters/runtime.ts` (parsed into nodes via `parseStatements`); surface any new public type via `PUBLIC_RUNTIME_TYPES` so multi-file output re-exports it from the barrel.
+- **A new wrapper generator** (a framework adapter that forwards to the sdk functions) — reuse `emitters/wrapper-support.ts` for operation eligibility (SSE / `<Op>Variables`-collision skips) and the `vars`/`init` parameter shape, and derive the forwarding call's argument order and `<Op>Variables` naming from `operationSignature` (`emitters/operation-signature.ts`), the same source the sdk's parameter list uses, so the wrappers cannot drift.
+  Declare its compatibility contract (`requires`/`facades`/`errorModes`/`dateTypes`) in the generator registry (`generators/index.ts`).
+  See [ADR-0011](./docs/adr/0011-wrapper-generators.md).
+- **A new mock data source** — the `mock` generator's data comes from `emitters/sample.ts` (baked literals) or `emitters/faker.ts` (faker calls), selected by `--mock-data`; both walk the IR with the same cycle semantics.
+  See [ADR-0010](./docs/adr/0010-mock-data-baked-vs-faker.md).
+- **A custom generator (plugin, experimental)** — author `{ name, run }` with `defineGenerator` from the `@redocly/openapi-typescript/plugin` entry (it also exports the IR types and the codegen toolkit); select it in `generators` by inline `customGenerators` name or by import specifier.
+  No core change is needed — `resolve.ts` loads and validates it.
+  See [ADR-0012](./docs/adr/0012-plugin-api.md).
+
+## Keep this current
+
+Update this file when the **pipeline** stages, the **seams**, or the **module map** change — not for routine feature work within an existing module.
+Keep it **descriptive**.
+When you make a significant, hard-to-reverse decision, record it as a new ADR in [`docs/adr/`](./docs/adr/) (don't rewrite an existing ADR — supersede it), and link the relevant seam here to it.
diff --git a/packages/openapi-typescript/CONTEXT.md b/packages/openapi-typescript/CONTEXT.md
index 21340d5d3c..56c86138b6 100644
--- a/packages/openapi-typescript/CONTEXT.md
+++ b/packages/openapi-typescript/CONTEXT.md
@@ -1,8 +1,7 @@
 # Client Generator — Context
 
-The domain language of `@redocly/openapi-typescript`: the package that turns
-an OpenAPI description into a typed, zero-dependency TypeScript client. Use these terms
-exactly — in code, comments, commits, and reviews — so the vocabulary stays consistent.
+The domain language of `@redocly/openapi-typescript`: the package that turns an OpenAPI description into a typed, zero-dependency TypeScript client.
+Use these terms exactly — in code, comments, commits, and reviews — so the vocabulary stays consistent.
 For _how the pieces fit together_, see [ARCHITECTURE.md](./ARCHITECTURE.md).
 
 ## Language
@@ -10,211 +9,154 @@ For _how the pieces fit together_, see [ARCHITECTURE.md](./ARCHITECTURE.md).
 ### The model
 
 **IR** (Intermediate Representation):
-The spec-agnostic model the generator works against, produced from an OpenAPI document
-by `buildApiModel`. Everything downstream reads the IR, never the raw OpenAPI. The root
-node is the **ApiModel**. Inputs are accepted as OpenAPI 3.0/3.1/3.2 directly; **Swagger
-2.0** is converted to the 3.x shape by `normalizeSwagger2` before `buildApiModel`, so the
-builder stays 3.x-only.
+The spec-agnostic model the generator works against, produced from an OpenAPI document by `buildApiModel`.
+Everything downstream reads the IR, never the raw OpenAPI.
+The root node is the **ApiModel**.
+Inputs are accepted as OpenAPI 3.0/3.1/3.2 directly; **Swagger 2.0** is converted to the 3.x shape by `normalizeSwagger2` before `buildApiModel`, so the builder stays 3.x-only.
 _Avoid_: AST, schema graph, DOM.
 
 **ApiModel**:
-The root of the IR — title, version, base URL, services, schemas, security schemes. Has
-many **ServiceModel**s; each has many **OperationModel**s.
+The root of the IR — title, version, base URL, services, schemas, security schemes.
+Has many **ServiceModel**s; each has many **OperationModel**s.
 _Avoid_: spec, document (those are the raw OpenAPI input).
 
 **SchemaModel**:
-A normalized type node in the IR — one of a fixed set of kinds (scalar, object, array,
-record, ref, literal, enum, union, intersection, null, unknown). The emitter turns it
-into a TypeScript type.
+A normalized type node in the IR — one of a fixed set of kinds (scalar, object, array, record, ref, literal, enum, union, intersection, null, unknown).
+The emitter turns it into a TypeScript type.
 _Avoid_: type, schema (unqualified "schema" means the raw OpenAPI schema, not this).
 
 **OperationModel**:
-One API operation in the IR — method, path, parameters (split into path/query/header),
-request body, success responses, **error responses** (`errorResponses`: the declared
-4xx/5xx bodies, plus `default` when a 2xx success also exists — consumed only by
-`errorMode: 'result'` to type the result's `error`), security. Its `name` is the spec's `operationId`, or —
-when absent — a synthesized `<method><PascalCasePath>` made unique across the document
-(declared `operationId`s always win). Distinct from an **endpoint**, which is the
-_emitted_ function/file.
+One API operation in the IR — method, path, parameters (split into path/query/header), request body, success responses, **error responses** (`errorResponses`: the declared 4xx/5xx bodies, plus `default` when a 2xx success also exists — consumed only by `errorMode: 'result'` to type the result's `error`), security.
+Its `name` is the spec's `operationId`, or — when absent — a synthesized `<method><PascalCasePath>` made unique across the document (declared `operationId`s always win).
+Distinct from an **endpoint**, which is the _emitted_ function/file.
 _Avoid_: route, handler.
 
 **ResponseBodyModel** (`itemSchema`):
-A success/error response body in the IR — its `contentType`, the decoded `schema`, and (OpenAPI
-3.2 only) an optional `itemSchema`: the per-item type of a streaming media type. For a
-`text/event-stream` response, `itemSchema` is the type of each event's `data` payload; the
-emitter prefers it over the response `schema` when typing **SSE** events.
+A success/error response body in the IR — its `contentType`, the decoded `schema`, and (OpenAPI 3.2 only) an optional `itemSchema`: the per-item type of a streaming media type.
+For a `text/event-stream` response, `itemSchema` is the type of each event's `data` payload; the emitter prefers it over the response `schema` when typing **SSE** events.
 _Avoid_: streamSchema, eventSchema (in code identifiers — `itemSchema` mirrors the OpenAPI key).
 
 ### Emission
 
 **Emitter**:
-Builds a TypeScript **AST** (`ts.factory` nodes) from the IR. Lives in `emitters/`. Each
-emitter is deep — one narrow entry point over hidden node-building bulk — and owns a single
-concern: `types.ts` (`typesStatements`/`schemaToTypeNode`), `type-guards.ts`
-(`typeGuardStatements`), `auth.ts` (`authStatements`), `operations.ts`
-(`operationsBlockStatements`/`operationsMetaStatements`), `sse.ts` (the **SSE** detection seam:
-`isSseOp`/`partitionOps`/`sseEventType`/`sseDataKind`/`sseFragmentName`), and the **runtime** emitter
-`runtime.ts`. The foundation module `ts.ts` owns the shared printer and ergonomics:
-`printNodes` (nodes → source), `parseStatements` (embed hand-authored source as nodes), and
-`jsdoc` (attach a block comment). `client.ts` is the _composition_ emitter: it assembles each
-file's `ts.Statement[]` and prints **once** via `printNodes`, exposing `emitSingleFile` /
-`emitModules`. The writer-facing seam (`ClientModules`) stays string-based. Low-level text
-helpers (`pascalCase`, `splitLines`, `joinSections`) stay private in `support.ts`, and the
-JSDoc-body builder in `jsdoc.ts` — consumed only by the deep emitters, never by writers. Each
-emitter also keeps a string-returning wrapper (`renderTypes`/`renderAuth`/… → `printNodes(…)`)
-that the unit tests assert against.
+Builds a TypeScript **AST** (`ts.factory` nodes) from the IR.
+Lives in `emitters/`.
+Each emitter is deep — one narrow entry point over hidden node-building bulk — and owns a single concern: `types.ts` (`typesStatements`/`schemaToTypeNode`), `type-guards.ts` (`typeGuardStatements`), `auth.ts` (`authStatements`), `operations.ts` (`operationsBlockStatements`/`operationsMetaStatements`), `sse.ts` (the **SSE** detection seam: `isSseOp`/`partitionOps`/`sseEventType`/`sseDataKind`/`sseFragmentName`), and the **runtime** emitter `runtime.ts`.
+The foundation module `ts.ts` owns the shared printer and ergonomics: `printNodes` (nodes → source), `parseStatements` (embed hand-authored source as nodes), and `jsdoc` (attach a block comment).
+`client.ts` is the _composition_ emitter: it assembles each file's `ts.Statement[]` and prints **once** via `printNodes`, exposing `emitSingleFile` / `emitModules`.
+The writer-facing seam (`ClientModules`) stays string-based.
+Low-level text helpers (`pascalCase`, `splitLines`, `joinSections`) stay private in `support.ts`, and the JSDoc-body builder in `jsdoc.ts` — consumed only by the deep emitters, never by writers.
+Each emitter also keeps a string-returning wrapper (`renderTypes`/`renderAuth`/… → `printNodes(…)`) that the unit tests assert against.
 _Avoid_: renderer, codegen.
 
 **Writer**:
-Chooses the _file layout_ from the IR and emit options, then fills each file by calling
-the emitter. Lives in `writers/`. One **Writer** per **output mode**, selected by
-`getWriter`. A Writer is an implementation detail of the `sdk` **Generator**.
+Chooses the _file layout_ from the IR and emit options, then fills each file by calling the emitter.
+Lives in `writers/`.
+One **Writer** per **output mode**, selected by `getWriter`.
+A Writer is an implementation detail of the `sdk` **Generator**.
 _Avoid_: formatter, builder.
 
 **Generator**:
-A deep module that turns the IR into a set of files for one concern, selected by name
-through `getGenerator(name)` (mirrors the `getWriter(outputMode)` seam). Lives in
-`generators/`. The `sdk` generator is the typed client (it delegates to the output-mode
-**Writer**); the `zod` generator emits a standalone `<stem>.zod.ts` **schema module** (one
-`export const <Name>Schema` per IR named schema) beside the client; the `tanstack-query`
-generator emits a TanStack Query v5 (React) module (`<stem>.tanstack.ts`) wrapping the sdk —
-per query op a `<op>QueryKey`/`<op>Options` (`queryOptions`) factory + query key, per mutation a
-`<op>Mutation` (`mutationKey`/`mutationFn`) factory (requires the `sdk` generator; the consumer
-installs `@tanstack/react-query`); the `transformers` generator emits a standalone
-`<stem>.transformers.ts` of `transform<Name>(data: <Name>): <Name>` functions — one per IR named
-schema that (recursively) carries a `date-time`/`date` field — that walk the value and rewrite wire
-ISO strings to `new Date(...)` in place, composing across refs (`transformPet` calls
-`transformOwner`); pair it with the **dateType** knob (`--date-type Date`) so the runtime value
-matches the `Date`-typed sdk schema (it imports only the schema TYPES, so the client stays zero-dep).
-`generateClient` runs the configured generators (default
-`['sdk']`, selected via `--generators sdk,zod`) and merges their files. First-party only — no
-public plugin API yet.
+A deep module that turns the IR into a set of files for one concern, selected by name through `getGenerator(name)` (mirrors the `getWriter(outputMode)` seam).
+Lives in `generators/`.
+The `sdk` generator is the typed client (it delegates to the output-mode **Writer**).
+The `zod` generator emits a standalone `<stem>.zod.ts` **schema module** (one `export const <Name>Schema` per IR named schema) beside the client.
+The `tanstack-query` generator emits a TanStack Query v5 (React) module (`<stem>.tanstack.ts`) wrapping the sdk — per query op a `<op>QueryKey`/`<op>Options` (`queryOptions`) factory + query key, per mutation a `<op>Mutation` (`mutationKey`/`mutationFn`) factory (requires the `sdk` generator; the consumer installs `@tanstack/react-query`).
+The `transformers` generator emits a standalone `<stem>.transformers.ts` of `transform<Name>(data: <Name>): <Name>` functions — one per IR named schema that (recursively) carries a `date-time`/`date` field — that walk the value and rewrite wire ISO strings to `new Date(...)` in place, composing across refs (`transformPet` calls `transformOwner`); pair it with the **dateType** knob (`--date-type Date`) so the parsed value matches the type (it imports only the schema TYPES, so the client stays zero-dep).
+`generateClient` runs the configured generators (default `['sdk']`, selected via `--generators sdk,zod`) and merges their files.
+First-party only — no public plugin API yet.
 _Avoid_: plugin (reserved for a future public API), middleware.
 
 **Schema module** (`zod` generator):
-The `<stem>.zod.ts` file the `zod` generator emits — `import { z } from 'zod'` plus one
-`export const <Name>Schema = z.object(…)` per IR named schema. Output-mode-agnostic in phase 1
-(one module regardless of how the sdk partitions its files); refs become `z.lazy(() => …)`. Only
-the metadata refinements stable across zod `3.23 || 4` are emitted (`.min`/`.max`/`.int`/`.gt`/`.lt`/
-`.regex`); format methods (`.email`/`.uuid`/`.url`) are skipped. The generated **sdk** client never
-imports zod — `zod` is the _consumer's_ peer (`^3.23 || ^4`), installed only when validating
-(`PetSchema.parse(data)`) or deriving types (`z.infer<typeof PetSchema>`).
+The `<stem>.zod.ts` file the `zod` generator emits — `import { z } from 'zod'` plus one `export const <Name>Schema = z.object(…)` per IR named schema.
+Output-mode-agnostic in phase 1 (one module regardless of how the sdk partitions its files); refs become `z.lazy(() => …)`.
+Only the metadata refinements stable across zod `3.23 || 4` are emitted (`.min`/`.max`/`.int`/`.gt`/`.lt`/`.regex`); format methods (`.email`/`.uuid`/`.url`) are skipped.
+The generated **sdk** client never imports zod — `zod` is the _consumer's_ peer (`^3.23 || ^4`), installed only when validating (`PetSchema.parse(data)`) or deriving types (`z.infer<typeof PetSchema>`).
 _Avoid_: validation runtime, zod runtime (the sdk has no zod dependency).
 
 **Runtime**:
-The zero-dependency code emitted into every generated client — the `fetch` wrapper, URL/query
-builder (`__buildUrl`), retry machinery, auth state, and the public setters (`configure`,
-`setBaseUrl`, `setBearer`, `setBasicAuth`, `setApiKey…`). Uses only web-standard APIs. The wrapper is split into a
-shared core and one of two **terminals** (selected by **error mode**): `__send` runs the
-payload/header build + retry/fetch loop and returns the raw `Response`; `__parse` decodes a success
-body into the requested kind — `json` / `text` / `blob` / `arrayBuffer` / `formData` / `stream`
-(raw `ReadableStream` via `response.body`) / `auto` (content-type sniff, the generated default);
-`__request` (throw mode) delegates to both and throws `ApiError` on non-2xx, while
-`__requestResult` (result mode) returns the discriminated `Result<TData, TError>` instead. The
-per-call `RequestOptions` (the trailing `init` arg) carries `parseAs?: ParseAs` — a runtime escape
-hatch that overrides the inferred decode kind (static return type unchanged) — alongside the
-`retry` override. For **SSE** operations the runtime also emits `__sse<T>` — an
-`async function*` that wraps `__send`, parses `text/event-stream` frames into
-`ServerSentEvent<T>` (`{ event?, data, id?, retry? }`), and auto-reconnects (resuming with
-`Last-Event-ID`; backoff = server `retry:` → `reconnectDelay` → 1000ms, exponential + jitter,
-30s cap). `SseOptions` (`RequestInit & { reconnect?; reconnectDelay? }`) is the per-call init;
-aborting via `AbortSignal` or `break`ing the loop completes the iterator cleanly (no throw).
-The whole `__sse`/`ServerSentEvent`/`SseOptions` block is **gated** — emitted only when a model
-declares a streaming op.
+The zero-dependency code emitted into every generated client — the `fetch` wrapper, URL/query builder (`__buildUrl`), retry machinery, auth state, and the public setters (`configure`, `setBaseUrl`, `setBearer`, `setBasicAuth`, `setApiKey…`).
+Uses only web-standard APIs.
+The wrapper is split into a shared core and one of two **terminals** (selected by **error mode**): `__send` runs the payload/header build + retry/fetch loop and returns the raw `Response`; `__parse` decodes a success body into the requested kind — `json` / `text` / `blob` / `arrayBuffer` / `formData` / `stream` (raw `ReadableStream` via `response.body`) / `auto` (content-type sniff, the generated default); `__request` (throw mode) delegates to both and throws `ApiError` on non-2xx, while `__requestResult` (result mode) returns the discriminated `Result<TData, TError>` instead.
+The per-call `RequestOptions` (the trailing `init` arg) carries `parseAs?: ParseAs` — a runtime escape hatch that overrides the inferred decode kind (static return type unchanged) — alongside the `retry` override.
+For **SSE** operations the runtime also emits `__sse<T>` — an `async function*` that wraps `__send`, parses `text/event-stream` frames into `ServerSentEvent<T>` (`{ event?, data, id?, retry? }`), and auto-reconnects (resuming with `Last-Event-ID`; backoff = server `retry:` → `reconnectDelay` → 1000ms, exponential + jitter, 30s cap).
+`SseOptions` (`RequestInit & { reconnect?; reconnectDelay? }`) is the per-call init; aborting via `AbortSignal` or `break`ing the loop completes the iterator cleanly (no throw).
+The whole `__sse`/`ServerSentEvent`/`SseOptions` block is **gated** — emitted only when a model declares a streaming op.
 _Avoid_: helpers, lib, sdk-core.
 
 **SSE** / the `sse` namespace:
-An operation whose 2xx response declares `text/event-stream` is an **SSE** operation. It is
-detection-driven — no flag — and is emitted under a separate `sse` surface rather than as a plain
-endpoint: a typed `async function*` returning `AsyncGenerator<ServerSentEvent<T>>`, where `T` comes
-from the response **`itemSchema`** → media `schema` → `string`. The functions facade exposes
-`export const sse = { streamX, … }`; the service-class facade a bound `readonly sse = { … }`; in
-multi-file modes each tag/class contributes a `__sse_<Class>` fragment that the **barrel** merges
-into the public `sse`. SSE ops are error-mode-agnostic (they always throw on an initial non-2xx;
-never return the `Result` shape).
+An operation whose 2xx response declares `text/event-stream` is an **SSE** operation.
+It is detection-driven — no flag — and is emitted under a separate `sse` surface rather than as a plain endpoint: a typed `async function*` returning `AsyncGenerator<ServerSentEvent<T>>`, where `T` comes from the response **`itemSchema`** → media `schema` → `string`.
+The functions facade exposes `export const sse = { streamX, … }`; the service-class facade a bound `readonly sse = { … }`; in multi-file modes each tag/class contributes a `__sse_<Class>` fragment that the **barrel** merges into the public `sse`.
+SSE ops are error-mode-agnostic (they always throw on an initial non-2xx; never return the `Result` shape).
 _Avoid_: stream namespace, events client, subscribe.
 
 **Fragments** → **ClientModules**:
-**Fragments** are the emitter's _internal_ breakdown of a client (header, types, type
-guards, runtime, auth, operations, …) — never exposed to writers. **ClientModules** is
-the writer-facing interface `emitModules` returns: the _content_ of each emitted module
-(`http`, `schemas`, `operations`) plus the per-file wiring. Writers consume
-**ClientModules**, never **Fragments**.
+**Fragments** are the emitter's _internal_ breakdown of a client (header, types, type guards, runtime, auth, operations, …) — never exposed to writers.
+**ClientModules** is the writer-facing interface `emitModules` returns: the _content_ of each emitted module (`http`, `schemas`, `operations`) plus the per-file wiring.
+Writers consume **ClientModules**, never **Fragments**.
 _Avoid_: sections, parts, chunks.
 
 **Endpoints** / **Barrel**:
 **Endpoints** is the emitted operation code (the standalone functions or class methods).
-The **Barrel** is the entry file that re-exports the public surface from the other
-emitted files.
+The **Barrel** is the entry file that re-exports the public surface from the other emitted files.
 _Avoid_: index (for the barrel), routes (for endpoints).
 
 ### Knobs
 
 **Output mode**:
-The file layout: `single` (one file), `split` (http + schemas + endpoints siblings),
-`tags` (one endpoints file per OpenAPI tag), `tags-split` (a folder per tag). Selected by
-`--output-mode`.
+The file layout: `single` (one file), `split` (http + schemas + endpoints siblings), `tags` (one endpoints file per OpenAPI tag), `tags-split` (a folder per tag).
+Selected by `--output-mode`.
 _Avoid_: format, layout (in prose), split (as a synonym for the whole concept).
 
 **Facade**:
-The developer-facing operation shape: `functions` (standalone async functions) or
-`service-class` (operations as class methods). Selected by `--facade`. Orthogonal to
-**output mode** and **args style**.
+The developer-facing operation shape: `functions` (standalone async functions) or `service-class` (operations as class methods).
+Selected by `--facade`.
+Orthogonal to **output mode** and **args style**.
 _Avoid_: style, mode, flavor.
 
 **Args style**:
-How an operation's inputs are passed: `flat` (path params then `params`/`body`/
-`headers` slots) or `grouped` (one **Variables** object). Selected by `--args-style`.
+How an operation's inputs are passed: `flat` (path params then `params`/`body`/`headers` slots) or `grouped` (one **Variables** object).
+Selected by `--args-style`.
 _Avoid_: param style, calling convention.
 
 **Error mode**:
-The client's error-handling shape: `throw` (default — operations throw `ApiError` on non-2xx) or
-`result` (operations return a discriminated `Result<TData, TError>` = `{ data, error, response }`,
-with `error` typed from the spec's 4xx/5xx response bodies as the `<Op>Error` union). Selected by
-`--error-mode`. Transport/abort failures still throw in both modes; `onError` is a throw-mode hook.
+The client's error-handling shape: `throw` (default — operations throw `ApiError` on non-2xx) or `result` (operations return a discriminated `Result<TData, TError>` = `{ data, error, response }`, with `error` typed from the spec's 4xx/5xx response bodies as the `<Op>Error` union).
+Selected by `--error-mode`.
+Transport/abort failures still throw in both modes; `onError` is a throw-mode hook.
 _Avoid_: throwOnError, errorHandling, result shape (in code identifiers).
 
 **dateType**:
-How `format: date-time`/`date` string fields are typed: `string` (default — byte-identical to the
-ISO wire shape) or `Date`. Selected by `--date-type`. Under `Date` the sdk emits `Date` for those
-scalar `string` schemas; the runtime conversion is opt-in and separate — pair it with the
-**`transformers` generator** (`--generators sdk,transformers`) so the parsed value matches the type.
+How `format: date-time`/`date` string fields are typed: `string` (default — byte-identical to the ISO wire shape) or `Date`.
+Selected by `--date-type`.
+Under `Date` the sdk emits `Date` for those scalar `string` schemas; the runtime conversion is opt-in and separate — pair it with the **`transformers` generator** (`--generators sdk,transformers`) so the parsed value matches the type.
 `int64` → `bigint` is deferred to a follow-up.
 _Avoid_: dateMode, parseDates (in code identifiers).
 
 **Variables** (`<Op>Variables`):
-The combined-inputs object type for an operation — path params + `params` + `body` +
-`headers`. It is the `vars` argument under `args-style grouped`, and the seam wrappers
-(React Query / SWR) consume it.
+The combined-inputs object type for an operation — path params + `params` + `body` + `headers`.
+It is the `vars` argument under `args-style grouped`, and the seam wrappers (React Query / SWR) consume it.
 _Avoid_: args, params, inputs (those mean narrower things — see below).
 
 **Params**:
-Query parameters, specifically. In a generated operation, `params` is always the query
-object; it never means "arguments in general".
+Query parameters, specifically.
+In a generated operation, `params` is always the query object; it never means "arguments in general".
 _Avoid_: arguments, inputs, query-string (in code identifiers).
 
 **Query serialization style**:
-How a query param's value is rendered onto the wire. The OpenAPI default is `form` +
-`explode: true` (arrays repeat the key; objects become `key[sub]=val`). `ParamModel`
-carries the spec's `style` / `explode` / `allowReserved` **only for query params**, and
-**only when present** — absence means the default, so the IR stays clean. The operation
-emits a per-param `styles` literal as `__buildUrl`'s 4th arg **only for non-default**
-params (style ≠ `form`, or `explode: false`, or `allowReserved`); default params get no
-entry, so `__buildUrl` runs its existing path and the output is byte-identical. `__buildUrl`
-honors `form`+`explode:false` (`key=a,b`), `spaceDelimited` (`key=a%20b`), `pipeDelimited`
-(`key=a|b`) — literal delimiters, values encoded — and `deepObject` (the bracket form);
-`allowReserved` skips percent-encoding of RFC-3986 reserved chars (built via `__encodeReserved`).
-Known deviation: an **object** query param at the default `form` style still serializes as
-`key[sub]=val` (deepObject brackets), not the spec's `sub=val` spread.
+How a query param's value is rendered onto the wire.
+The OpenAPI default is `form` + `explode: true` (arrays repeat the key; objects become `key[sub]=val`).
+`ParamModel` carries the spec's `style` / `explode` / `allowReserved` **only for query params**, and **only when present** — absence means the default, so the IR stays clean.
+The operation emits a per-param `styles` literal as `__buildUrl`'s 4th arg **only for non-default** params (style ≠ `form`, or `explode: false`, or `allowReserved`); default params get no entry, so `__buildUrl` runs its existing path and the output is byte-identical.
+`__buildUrl` honors `form`+`explode:false` (`key=a,b`), `spaceDelimited` (`key=a%20b`), `pipeDelimited` (`key=a|b`) — literal delimiters, values encoded — and `deepObject` (the bracket form); `allowReserved` skips percent-encoding of RFC-3986 reserved chars (built via `__encodeReserved`).
+Known deviation: an **object** query param at the default `form` style still serializes as `key[sub]=val` (deepObject brackets), not the spec's `sub=val` spread.
 
 **Injectable security scheme**:
-A security scheme the **runtime** can auto-apply via a setter — HTTP `bearer`
-(`setBearer`), HTTP `basic` (`setBasicAuth`), and `apiKey` in header / query / cookie
-(`setApiKey…`). OAuth2 / OpenID Connect normalize to `bearer`. Only `mutualTLS` is skipped.
-Bearer/apiKey credentials are a **`TokenProvider`** — a string or a (possibly async)
-function `() => string | Promise<string>`, resolved per request. `__auth` is **async**,
-returning `{ headers, query }`; query-auth merges into the URL, cookie-auth folds into a
-combined `Cookie` header.
+A security scheme the **runtime** can auto-apply via a setter — HTTP `bearer` (`setBearer`), HTTP `basic` (`setBasicAuth`), and `apiKey` in header / query / cookie (`setApiKey…`).
+OAuth2 / OpenID Connect normalize to `bearer`.
+Only `mutualTLS` is skipped.
+Bearer/apiKey credentials are a **`TokenProvider`** — a string or a (possibly async) function `() => string | Promise<string>`, resolved per request.
+`__auth` is **async**, returning `{ headers, query }`; query-auth merges into the URL, cookie-auth folds into a combined `Cookie` header.
 _Avoid_: auth (unqualified), credential.
 
 ## Flagged ambiguities
@@ -222,8 +164,7 @@ _Avoid_: auth (unqualified), credential.
 **"module"** — two senses, keep them straight:
 
 - _Architecture sense_ (interface + implementation) — used when discussing depth/seams.
-- _Emitted-file sense_ — the `http` / `schemas` / `endpoints` / barrel files a client is
-  split into. `ClientModules` is the writer-facing interface describing these.
+- _Emitted-file sense_ — the `http` / `schemas` / `endpoints` / barrel files a client is split into. `ClientModules` is the writer-facing interface describing these.
 
 **`params` vs `Variables` vs `args style`** — easy to conflate:
 
@@ -231,8 +172,7 @@ _Avoid_: auth (unqualified), credential.
 - `Variables` = the _whole_ combined-inputs object (path + params + body + headers).
 - `args style` = the _choice_ of how inputs reach the function (positional vs object).
 
-**operation vs endpoint** — `operation` is the IR/spec concept (an `OperationModel`);
-`endpoints` is the emitted code that realizes operations.
+**operation vs endpoint** — `operation` is the IR/spec concept (an `OperationModel`); `endpoints` is the emitted code that realizes operations.
 
 ## Example dialogue
 
diff --git a/packages/openapi-typescript/README.md b/packages/openapi-typescript/README.md
index 5278074a4d..22342d94e2 100644
--- a/packages/openapi-typescript/README.md
+++ b/packages/openapi-typescript/README.md
@@ -1,57 +1,48 @@
 # @redocly/openapi-typescript
 
-> ⚠️ **Experimental.** This package and the client generator are released as **experimental**: the
-> generated output, options, and the plugin API may change in any minor release until it is declared
-> stable (see [ADR-0013](./docs/adr/0013-experimental-status.md)). Pin your version if you depend on
-> the output, and expect to regenerate when you upgrade. Feedback is very welcome while we stabilize it.
-
-Generate a typed TypeScript client (inline types + `fetch` runtime) from an OpenAPI description. The
-emitted client has **zero runtime dependencies** — it uses only web-standard APIs (`fetch`,
-`AbortController`, `URLSearchParams`, …), so it runs in browsers, Node ≥ 18, Bun, Deno, and edge
-runtimes. Code is produced through the TypeScript compiler AST (not string templates), so output is
-correct by construction; `typescript` is the only (peer) dependency.
-
-This package is the engine behind the **`redocly generate-client`** command. To run it from the
-command line, install [`@redocly/cli`](https://github.com/Redocly/redocly-cli) and see the
-[`generate-client` command reference](https://redocly.com/docs/cli/commands/generate-client). The rest
-of this README covers using the package **programmatically**.
+> ⚠️ **Experimental.** This package and the client generator are released as **experimental**: the generated output, options, and the plugin API may change in any minor release until it is declared stable (see [ADR-0013](./docs/adr/0013-experimental-status.md)).
+> Pin your version if you depend on the output, and expect to regenerate when you upgrade.
+> Feedback is very welcome while we stabilize it.
+
+Generate a typed TypeScript client (inline types + `fetch` runtime) from an OpenAPI description.
+The emitted client has **zero runtime dependencies** — it uses only web-standard APIs (`fetch`, `AbortController`, `URLSearchParams`, …), so it runs in browsers, Node ≥ 18, Bun, Deno, and edge runtimes.
+Code is produced through the TypeScript compiler AST (not string templates), so output is correct by construction; `typescript` is the only (peer) dependency.
+
+This package is the engine behind the **`redocly generate-client`** command.
+To run it from the command line, install [`@redocly/cli`](https://github.com/Redocly/redocly-cli) and see the [`generate-client` command reference](https://redocly.com/docs/cli/commands/generate-client).
+The rest of this README covers using the package **programmatically**.
 
 ## Features
 
-- **Broad input** — OpenAPI **3.0, 3.1, and 3.2.0**, plus **Swagger 2.0** (normalized to 3.x before
-  generation). `input` is a file path or URL.
-- **Zero-dependency client** built via the TS AST, with `typescript` as the only peer dep.
-- **Output modes** — `single`, `split`, `tags`, `tags-split` (`outputMode`).
-- **Facades** — standalone `functions` or a `service-class` (`facade`), the latter supporting
-  **per-instance configuration and credentials** (`new Client({ auth, baseUrl, … })`).
-- **Argument styles** — `flat` positional args or a `grouped` `vars` object (`argsStyle`).
-- **Rich types** — inline types for every schema; string enums as unions or runtime `const` objects
-  (`enumStyle`); **discriminated-union `is<Member>()` type guards**; `<Op>Result` / `Error` / `Params`
-  / `Body` / `Headers` / `Variables` aliases (collision-suppressed); validation keywords surfaced as
-  JSDoc; `dateType: 'Date'`; **typed `multipart/form-data` bodies** (object fields, binary → `Blob`)
-  auto-serialized to `FormData`.
-- **Runtime** — `setBaseUrl` + a typed `ClientConfig` (headers, `fetch` swap, hooks); **composable
-  middleware** (`onRequest`/`onResponse`/`onError`); **opt-in, abort-aware retries** with backoff,
-  jitter, `Retry-After`, and a custom `retryOn`; per-call response decoding (`parseAs`); OpenAPI
-  **query-serialization styles**; `errorMode: 'result'` for a discriminated `{ data, error, response }`;
-  and a minification-safe `OPERATIONS` metadata map.
-- **Auth** — Basic / Bearer / apiKey (header, query, cookie) setters from `securitySchemes`, async
-  token providers, and per-instance credentials via `ClientConfig.auth`.
-- **Server-Sent Events** — `text/event-stream` operations as typed async iterators with auto-reconnect;
-  payloads typed from OpenAPI 3.2 `itemSchema`.
-- **Generators** (`generators`) — `sdk` (default), `zod`, `tanstack-query` (React/Vue/Svelte/Solid),
-  `swr`, `transformers`, `mock` (MSW handlers + baked or `faker` data), and a
-  [custom-generator plugin API](#custom-generators).
-- **Hardened** — document-derived names coerced to safe unique identifiers, comment text escaped, and a
-  bounded SSE reader.
-
-Every add-on generator keeps the emitted client dependency-free; its peer library is needed only in
-your app.
+- **Broad input** — OpenAPI **3.0, 3.1, and 3.2.0**, plus **Swagger 2.0** (normalized to 3.x before generation)
+  `input` is a file path or URL.
+- **Zero-dependency client** built via the TS AST, with `typescript` as the only peer dep
+- **Output modes** — `single`, `split`, `tags`, `tags-split` (`outputMode`)
+- **Facades** — standalone `functions` or a `service-class` (`facade`), the latter supporting **per-instance configuration and credentials** (`new Client({ auth, baseUrl, … })`)
+- **Argument styles** — `flat` positional args or a `grouped` `vars` object (`argsStyle`)
+- **Rich types** — inline types for every schema:
+  - string enums as unions or runtime `const` objects (`enumStyle`)
+  - **discriminated-union `is<Member>()` type guards** `<Op>Result` / `Error` / `Params` / `Body` / `Headers` / `Variables` aliases (collision-suppressed)
+  - validation keywords surfaced as JSDoc
+  - `dateType: 'Date'`
+  - **typed `multipart/form-data` bodies** (object fields, binary → `Blob`) auto-serialized to `FormData`
+- **Runtime** — `setBaseUrl` + a typed `ClientConfig` (headers, `fetch` swap, hooks):
+  - **composable middleware** (`onRequest`/`onResponse`/`onError`)
+  - **opt-in, abort-aware retries** with backoff, jitter, `Retry-After`, and a custom `retryOn`
+  - per-call response decoding (`parseAs`)
+  - OpenAPI **query-serialization styles**
+  - `errorMode: 'result'` for a discriminated `{ data, error, response }`
+  - a minification-safe `OPERATIONS` metadata map
+- **Auth** — Basic / Bearer / apiKey (header, query, cookie) setters from `securitySchemes`, async token providers, and per-instance credentials via `ClientConfig.auth`
+- **Server-Sent Events** — `text/event-stream` operations as typed async iterators with auto-reconnect; payloads typed from OpenAPI 3.2 `itemSchema`
+- **Generators** (`generators`) — `sdk` (default), `zod`, `tanstack-query` (React/Vue/Svelte/Solid), `swr`, `transformers`, `mock` (MSW handlers + baked or `faker` data), and a [custom-generator plugin API](#custom-generators)
+- **Hardened** — document-derived names coerced to safe unique identifiers, comment text escaped, and a bounded SSE reader
+
+Every add-on generator keeps the emitted client dependency-free; its peer library is needed only in your app.
 
 ## Use programmatically
 
-`generateClient(options)` is the API behind the CLI command — it loads the spec, builds the client,
-and writes the files:
+`generateClient(options)` is the API behind the CLI command — it loads the spec, builds the client, and writes the files:
 
 ```ts
 import { generateClient } from '@redocly/openapi-typescript';
@@ -84,8 +75,7 @@ export default defineConfig({
 });
 ```
 
-To inspect the output without writing to disk, the lower-level `collectGeneratedFiles(model, opts)`
-returns the files in memory (see `src/index.ts`).
+To inspect the output without writing to disk, the lower-level `collectGeneratedFiles(model, opts)` returns the files in memory (see `src/index.ts`).
 
 ## Using the generated client
 
@@ -112,32 +102,26 @@ const order = await getOrderById('ord_01khr487f7qm7p44xn427m43vb');
 const live = await listMenuItems({ limit: 10 }, { signal: controller.signal });
 ```
 
-Each operation's trailing `init` argument is `RequestOptions` (`RequestInit` plus an optional per-call
-`retry` override and a `parseAs` reader). Retry is opt-in and abort-aware; a custom `retryOn(ctx)`
-predicate can branch on `ctx.error` (transport failure) or `ctx.response` (HTTP status / body) and opt
-a `POST` in.
+Each operation's trailing `init` argument is `RequestOptions` (`RequestInit` plus an optional per-call `retry` override and a `parseAs` reader).
+Retry is opt-in and abort-aware.
+A custom `retryOn(ctx)` predicate can branch on `ctx.error` (transport failure) or `ctx.response` (HTTP status / body) and opt a `POST` in.
 
-By default a response body is decoded by negotiating from its `Content-Type`. Pass `parseAs` in `init`
-to force a reader — `'json'`, `'text'`, `'blob'`, `'arrayBuffer'`, `'formData'`, `'stream'` (the raw
-`ReadableStream`), or `'auto'` (the default):
+By default a response body is decoded by negotiating from its `Content-Type`.
+Pass `parseAs` in `init` to force a reader — `'json'`, `'text'`, `'blob'`, `'arrayBuffer'`, `'formData'`, `'stream'` (the raw `ReadableStream`), or `'auto'` (the default):
 
 ```ts
 const stream = await getMenuItemPhoto('prd_…', { parseAs: 'stream' }); // ReadableStream
 ```
 
-`parseAs` is a **runtime override only** — it does not change the operation's static return type, so
-forcing a reader that disagrees with the schema is the caller's responsibility.
+`parseAs` is a **runtime override only** — it does not change the operation's static return type.
+Forcing a reader that disagrees with the schema is the caller's responsibility.
 
-Query parameters honor their OpenAPI serialization style. The default (`form` + `explode: true`)
-repeats array values; declare `style` / `explode` / `allowReserved` on a parameter to get
-`form`+`explode:false` (`key=a,b`), `spaceDelimited` (`key=a%20b`), `pipeDelimited` (`key=a|b`),
-`deepObject`, or reserved-char passthrough.
+Query parameters honor their OpenAPI serialization style.
+The default (`form` + `explode: true`) repeats array values.
+Declare `style` / `explode` / `allowReserved` on a parameter to get `form`+`explode:false` (`key=a,b`), `spaceDelimited` (`key=a%20b`), `pipeDelimited` (`key=a|b`), `deepObject`, or reserved-char passthrough.
 
-A setter is generated for each injectable scheme — `setBearer` (HTTP `bearer` / OAuth2),
-`setBasicAuth(username, password)` (HTTP `basic`), and `setApiKey…` for `apiKey` schemes in header,
-query, or cookie — and each operation sends the credentials its `security` requires. Bearer/apiKey
-credentials accept a `TokenProvider` (a string or a possibly-async function resolved per request) for
-refresh-token flows:
+A setter is generated for each injectable scheme — `setBearer` (HTTP `bearer` / OAuth2), `setBasicAuth(username, password)` (HTTP `basic`), and `setApiKey…` for `apiKey` schemes in header, query, or cookie — and each operation sends the credentials its `security` requires.
+Bearer/apiKey credentials accept a `TokenProvider` (a string or a possibly-async function resolved per request) for refresh-token flows:
 
 ```ts
 import { setBearer, setBasicAuth, setApiKey } from './client.ts';
@@ -147,16 +131,15 @@ setBasicAuth('alice', 's3cr3t'); // `Authorization: Basic <base64>`
 setApiKey('my-api-key'); // header / query / cookie, per the scheme's `in`
 ```
 
-With `argsStyle: 'grouped'`, inputs are bundled into a single `vars` object (typed as the operation's
-`<Op>Variables`) instead of positional arguments, while `init` stays the trailing argument:
+With `argsStyle: 'grouped'`, inputs are bundled into a single `vars` object (typed as the operation's `<Op>Variables`) instead of positional arguments, while `init` stays the trailing argument:
 
 ```ts
 const order = await getOrderById({ orderId: 'ord_01khr487f7qm7p44xn427m43vb' });
 ```
 
-With `errorMode: 'result'`, operations don't throw on non-2xx; each returns a discriminated
-`{ data, error, response }` whose `error` is typed from the spec's 4xx/5xx bodies (the `<Op>Error`
-union). On success `error` is `undefined`; the HTTP status is always on `response.status`:
+With `errorMode: 'result'`, operations don't throw on non-2xx.
+Each operation returns a discriminated `{ data, error, response }` whose `error` is typed from the spec's 4xx/5xx bodies (the `<Op>Error` union).
+On success `error` is `undefined`; the HTTP status is always on `response.status`:
 
 ```ts
 const { data, error, response } = await getOrderById('ord_01khr487f7qm7p44xn427m43vb');
@@ -167,9 +150,8 @@ else console.log(data.id); // `data` is the success body
 
 Transport/abort failures still throw in both modes.
 
-The client also exports an `OPERATIONS` map (operationId → `{ method, path }`) plus `OperationId` /
-`OperationMetadata` types. The string-literal keys and path templates survive minification, so they're
-the stable handle for cache/query keys, tracing span names, and request logging:
+The client also exports an `OPERATIONS` map (operationId → `{ method, path }`) plus `OperationId` / `OperationMetadata` types.
+The string-literal keys and path templates survive minification, so they're the stable handle for cache/query keys, tracing span names, and request logging:
 
 ```ts
 import { OPERATIONS, getOrderById } from './client.ts';
@@ -179,14 +161,14 @@ const queryKey = [OPERATIONS.getOrderById.path, orderId]; // "/orders/{orderId}"
 
 ## Generators
 
-`generators` (default `['sdk']`) selects which files to emit. The `sdk` client is always
-dependency-free; each add-on lands in its own sibling file and needs its peer library only in your app.
+`generators` (default `['sdk']`) selects which files to emit.
+The `sdk` client is always dependency-free; each add-on lands in its own sibling file and needs its peer library only in your app.
 
 ### Runtime validation with Zod
 
-`generators: ['sdk', 'zod']` emits a standalone `<output>.zod.ts` module of [Zod](https://zod.dev)
-schemas (one `export const <Name>Schema` per schema). The generated client never imports Zod; only the
-`*.zod.ts` module does. Install Zod in your app as a peer — any `zod` `^3.23 || ^4`:
+`generators: ['sdk', 'zod']` emits a standalone `<output>.zod.ts` module of [Zod](https://zod.dev) schemas (one `export const <Name>Schema` per schema).
+The generated client never imports Zod; only the `*.zod.ts` module does.
+Install Zod in your app as a peer — any `zod` `^3.23 || ^4`:
 
 ```ts
 import { z } from 'zod';
@@ -196,16 +178,15 @@ import { PetSchema } from './client.zod.ts';
 const pet: Pet = PetSchema.parse(await res.json()); // z.infer<typeof PetSchema> === Pet
 ```
 
-Schemas carry the validation refinements stable across Zod 3.23 and 4 (`.min`/`.max`, `.gt`/`.lt`,
-`.int`, `.regex`); refs become `z.lazy(() => …)` so recursive schemas work. Format helpers
-(`.email`/`.uuid`/`.url`) are not emitted, since they diverge between Zod 3 and 4.
+Schemas carry the validation refinements stable across Zod 3.23 and 4 (`.min`/`.max`, `.gt`/`.lt`, `.int`, `.regex`).
+Refs become `z.lazy(() => …)` so recursive schemas work.
+Format helpers (`.email`/`.uuid`/`.url`) are not emitted, since they diverge between Zod 3 and 4.
 
 ### TanStack Query
 
-`generators: ['sdk', 'tanstack-query']` emits a standalone `<output>.tanstack.ts` module of
-[TanStack Query](https://tanstack.com/query) v5 factories wrapping the sdk operations. Each query op
-(`GET`/`HEAD`) gets a `<op>QueryKey`/`<op>Options` factory (returning `queryOptions`); each mutation
-gets a `<op>Mutation` factory (returning `mutationKey`/`mutationFn`):
+`generators: ['sdk', 'tanstack-query']` emits a standalone `<output>.tanstack.ts` module of [TanStack Query](https://tanstack.com/query) v5 factories wrapping the sdk operations.
+Each query op (`GET`/`HEAD`) gets a `<op>QueryKey`/`<op>Options` factory (returning `queryOptions`).
+Each mutation gets a `<op>Mutation` factory (returning `mutationKey`/`mutationFn`):
 
 ```ts
 import { useQuery, useMutation } from '@tanstack/react-query';
@@ -215,20 +196,16 @@ const { data } = useQuery(getPetOptions({ id }));
 const { mutate } = useMutation(createPetMutation());
 ```
 
-Only the `*.tanstack.ts` module imports TanStack Query; install it as a peer — any
-`@tanstack/react-query` `^5`. The factories wrap the **throw-mode** sdk (the default), since TanStack's
-`queryFn` is expected to throw on error.
+Only the `*.tanstack.ts` module imports TanStack Query; install it as a peer — any `@tanstack/react-query` `^5`.
+The factories wrap the **throw-mode** sdk (the default), since TanStack's `queryFn` is expected to throw on error.
 
-**Framework** — TanStack's `queryOptions`/`mutationOptions` API is identical across adapters, so the
-emitted module is byte-identical across frameworks; only the import specifier differs. Set
-`queryFramework` to `react` (default), `vue`, `svelte`, or `solid` and install the matching adapter
-(`@tanstack/<framework>-query`, any `^5`).
+**Framework** — TanStack's `queryOptions`/`mutationOptions` API is identical across adapters, so the emitted module is byte-identical across frameworks; only the import specifier differs.
+Set `queryFramework` to `react` (default), `vue`, `svelte`, or `solid` and install the matching adapter (`@tanstack/<framework>-query`, any `^5`).
 
 ### SWR
 
-`generators: ['sdk', 'swr']` emits a standalone `<output>.swr.ts` module of
-[SWR](https://swr.vercel.app) hooks. Each query op (`GET`/`HEAD`) gets a `<op>Key` tuple factory + a
-`use<Op>(vars, init?)` hook over `useSWR`; each mutation gets a `use<Op>()` hook over `useSWRMutation`:
+`generators: ['sdk', 'swr']` emits a standalone `<output>.swr.ts` module of [SWR](https://swr.vercel.app) hooks.
+Each query op (`GET`/`HEAD`) gets a `<op>Key` tuple factory + a `use<Op>(vars, init?)` hook over `useSWR`; each mutation gets a `use<Op>()` hook over `useSWRMutation`:
 
 ```ts
 import { useGetPetById, useCreatePet } from './client.swr.ts';
@@ -238,14 +215,13 @@ const { trigger } = useCreatePet();
 await trigger({ body: { name: 'Rex' } });
 ```
 
-Only the `*.swr.ts` module imports SWR (`swr` for queries, `swr/mutation` for mutations); install it as
-a peer — any `swr` `^2`. The hooks wrap the **throw-mode** sdk and support only the `functions` facade.
+Only the `*.swr.ts` module imports SWR (`swr` for queries, `swr/mutation` for mutations); install it as a peer — any `swr` `^2`.
+The hooks wrap the **throw-mode** sdk and support only the `functions` facade.
 
 ### Date transformers
 
-By default `date-time`/`date` fields are typed `string`. Set `dateType: 'Date'` to type them as `Date`,
-and add `'transformers'` to `generators` to emit a `<output>.transformers.ts` module of
-`transform<Name>` functions that convert wire ISO strings to `Date` at runtime:
+By default `date-time`/`date` fields are typed `string`.
+Set `dateType: 'Date'` to type them as `Date`, and add `'transformers'` to `generators` to emit a `<output>.transformers.ts` module of `transform<Name>` functions that convert wire ISO strings to `Date` at runtime:
 
 ```ts
 import { getPet } from './client.ts';
@@ -254,17 +230,16 @@ import { transformPet } from './client.transformers.ts';
 const pet = transformPet(await getPet(id)); // pet.createdAt is now a Date
 ```
 
-The transformers import only the schema **types**, so the client stays dependency-free (`Date` is a web
-standard). `int64` → `bigint` is deferred; without `dateType: 'Date'` the date fields stay `string`.
+The transformers import only the schema **types**, so the client stays dependency-free (`Date` is a web standard).
+`int64` → `bigint` is deferred; without `dateType: 'Date'` the date fields stay `string`.
 
 ### MSW mocks
 
-`generators: ['sdk', 'mock']` emits a standalone `<output>.mocks.ts` module of [MSW](https://mswjs.io)
-v2 request handlers and `create<Schema>(overrides?)` data factories. Each handler intercepts its
-operation's method + path and responds with a fixture baked from the spec (prefers `example`/`default`;
-`format: binary` → `new Blob([])`; recursive schemas terminate at the cycle with an empty array/record).
-Each `create<Schema>` factory builds the same default object and merges `overrides`, so factories double
-as test builders. Install MSW as a dev dependency — `msw` `^2`:
+`generators: ['sdk', 'mock']` emits a standalone `<output>.mocks.ts` module of [MSW](https://mswjs.io) v2 request handlers and `create<Schema>(overrides?)` data factories.
+Each handler intercepts its operation's method + path and responds with a fixture baked from the spec (prefers `example`/`default`; `format: binary` → `new Blob([])`.
+Recursive schemas terminate at the cycle with an empty array/record).
+Each `create<Schema>` factory builds the same default object and merges `overrides`, so factories double as test builders.
+Install MSW as a dev dependency — `msw` `^2`:
 
 ```ts
 // test setup (Node)
@@ -281,18 +256,14 @@ import { createMenuItem } from './client.mocks';
 const special = createMenuItem({ name: 'Cold Brew', price: 499 });
 ```
 
-**Realistic data with faker** — mock data is **baked** by default (deterministic literals, no extra
-dependency). Set `mockData: 'faker'` to emit [`@faker-js/faker`](https://fakerjs.dev) calls for
-realistic data, and `mockSeed: <n>` to pin faker's PRNG so the data is reproducible. Factory signatures
-are identical in both modes; faker mode makes `@faker-js/faker` (`^9`) a dev dependency of your app
-(the client itself stays dependency-free).
+**Realistic data with faker** — mock data is **baked** by default (deterministic literals, no extra dependency).
+Set `mockData: 'faker'` to emit [`@faker-js/faker`](https://fakerjs.dev) calls for realistic data, and `mockSeed: <n>` to pin faker's PRNG so the data is reproducible.
+Factory signatures are identical in both modes; faker mode makes `@faker-js/faker` (`^9`) a dev dependency of your app (the client itself stays dependency-free).
 
 ## Custom generators
 
-Need an output the built-ins don't ship — validators in another library, a UI permissions map, mocks
-in your test runner's format, an SDK in your house style? Write a **custom generator**: it reads the
-same OpenAPI-derived model the built-ins do, runs in the same pass, and its output never drifts from
-the spec.
+Need an output the built-ins don't ship — validators in another library, a UI permissions map, mocks in your test runner's format, an SDK in your house style?
+Write a **custom generator**: it reads the same OpenAPI-derived model the built-ins do, runs in the same pass, and its output never drifts from the spec.
 
 ```ts
 // route-map-generator.ts
@@ -316,8 +287,7 @@ export default defineGenerator({
 });
 ```
 
-Select it in `generators` by import specifier (a path or package), or register it inline and select it
-by `name`:
+Select it in `generators` by import specifier (a path or package), or register it inline and select it by `name`:
 
 ```ts
 import generateClient from '@redocly/openapi-typescript';
@@ -331,16 +301,15 @@ await generateClient({
 });
 ```
 
-`@redocly/openapi-typescript/plugin` also exports the IR types and the codegen toolkit the built-ins
-use (`ts`, `printStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, …). A generator
-declares the same `requires`/`facades`/`errorModes`/`dateTypes` contract, validated up front; the
-generated client stays dependency-free. See `examples/custom-generator` for a runnable example.
+`@redocly/openapi-typescript/plugin` also exports the IR types and the codegen toolkit the built-ins use (`ts`, `printStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, …).
+A generator declares the same `requires`/`facades`/`errorModes`/`dateTypes` contract, validated up front.
+The generated client stays dependency-free.
+See `examples/custom-generator` for a runnable example.
 
 ## Server-Sent Events (streaming)
 
-An operation whose `2xx` response declares `text/event-stream` is generated — with no option — as a
-typed async iterator under an `sse` namespace. Each event's `data` is typed from the OpenAPI 3.2
-`itemSchema` (falling back to the media `schema`, then `string`):
+An operation whose `2xx` response declares `text/event-stream` is generated — with no option — as a typed async iterator under an `sse` namespace.
+Each event's `data` is typed from the OpenAPI 3.2 `itemSchema` (falling back to the media `schema`, then `string`):
 
 ```ts
 import { sse } from './client.ts';
@@ -350,22 +319,18 @@ for await (const ev of sse.streamMessages()) {
 }
 ```
 
-The stream **auto-reconnects** on a dropped connection, resuming via the `Last-Event-ID` header
-(backoff: server `retry:` → `reconnectDelay` → 1s, exponential with jitter, capped at 30s). Tune or opt
-out per call (`{ reconnect: false }` / `{ reconnectDelay: 500 }`), and `break` or pass an `AbortSignal`
-to stop early — both end the iterator cleanly (no throw). SSE operations always throw `ApiError` on an
-initial non-2xx and never return the `result`-mode shape.
+The stream **auto-reconnects** on a dropped connection, resuming via the `Last-Event-ID` header (backoff: server `retry:` → `reconnectDelay` → 1s, exponential with jitter, capped at 30s).
+Tune or opt out per call (`{ reconnect: false }` / `{ reconnectDelay: 500 }`), and `break` or pass an `AbortSignal` to stop early — both end the iterator cleanly (no throw).
+SSE operations always throw `ApiError` on an initial non-2xx and never return the `result`-mode shape.
 
 ## Examples
 
-Runnable examples live in [`examples/`](./examples): `fetch-functions`, `service-class`, `zod`,
-`tanstack-query`, `mock`, and `custom-generator`. Each is a standalone Vite app with a checked-in,
-drift-checked generated client.
+Runnable examples live in [`examples/`](./examples): `fetch-functions`, `service-class`, `zod`, `tanstack-query`, `mock`, and `custom-generator`.
+Each is a standalone Vite app with a checked-in, drift-checked generated client.
 
 ## Documentation
 
-- [`generate-client` command reference](https://redocly.com/docs/cli/commands/generate-client) — CLI
-  usage, every flag, and `redocly.yaml` configuration.
+- [`generate-client` command reference](https://redocly.com/docs/cli/commands/generate-client) — CLI usage, every flag, and `redocly.yaml` configuration.
 - [`ARCHITECTURE.md`](./ARCHITECTURE.md) and the [ADRs](./docs/adr/) — how the package is built and why.
 
 ## Development
@@ -378,6 +343,4 @@ npm run unit                    # unit tests (this package is held at 100% cover
 VITEST_SUITE=e2e npx vitest run tests/e2e/generate-client/   # behavioral e2e
 ```
 
-The emitted runtime lives in `src/emitters/runtime.ts` (a template string), the structural emitters in
-`src/emitters/`, the IR in `src/ir/`, the generators in `src/generators/`, and the multi-file layout
-strategies in `src/writers/`.
+The emitted runtime lives in `src/emitters/runtime.ts` (a template string), the structural emitters in `src/emitters/`, the IR in `src/ir/`, the generators in `src/generators/`, and the multi-file layout strategies in `src/writers/`.
diff --git a/packages/openapi-typescript/docs/adr/0001-ast-codegen.md b/packages/openapi-typescript/docs/adr/0001-ast-codegen.md
index e715237737..3d2eb71740 100644
--- a/packages/openapi-typescript/docs/adr/0001-ast-codegen.md
+++ b/packages/openapi-typescript/docs/adr/0001-ast-codegen.md
@@ -5,33 +5,18 @@
 
 ## Context
 
-The generator must emit TypeScript across a growing matrix of options — output modes, facades,
-args-styles, error modes, auth breadth, `parseAs`, and a set of feature generators (zod, TanStack
-Query, transformers, SSE). String-template codegen makes the cross-cutting concerns (escaping,
-import/name coordination, indentation, dedup) brittle: every new axis multiplies the places a
-template can produce malformed or mis-formatted output.
+The generator must emit TypeScript across a growing matrix of options — output modes, facades, args-styles, error modes, auth breadth, `parseAs`, and a set of feature generators (zod, TanStack Query, transformers, SSE).
+String-template codegen makes the cross-cutting concerns (escaping, import/name coordination, indentation, dedup) brittle: every new axis multiplies the places a template can produce malformed or mis-formatted output.
 
 ## Decision
 
-We build generated code as a **TypeScript AST** using `ts.factory` and emit it with the compiler's own
-printer (`ts.createPrinter`). A foundation module (`emitters/ts.ts`) wraps the ergonomics: a shared
-printer, `printNodes`, `parseStatements` (to embed hand-authored reference source — notably the
-runtime — as parsed nodes), and `jsdoc`. Each emitter returns `ts.Statement[]` / `ts.TypeNode`s; the
-composition (`client.ts`) assembles a per-file statement list and prints once.
+We build generated code as a **TypeScript AST** using `ts.factory` and emit it with the compiler's own printer (`ts.createPrinter`).
+A foundation module (`emitters/ts.ts`) wraps the ergonomics: a shared printer, `printNodes`, `parseStatements` (to embed hand-authored reference source — notably the runtime — as parsed nodes), and `jsdoc`.
+Each emitter returns `ts.Statement[]` / `ts.TypeNode`s; the composition (`client.ts`) assembles a per-file statement list and prints once.
 
 ## Consequences
 
-- Structurally malformed output (mismatched braces, wrong nesting) is impossible; passes can
-  compose/transform/dedupe nodes before printing; the option matrix scales without brittle template
-  edits.
-- **The AST is not a sanitizer.** `ts.factory.createIdentifier` prints its text verbatim and
-  synthetic comments are emitted as written — so a spec-supplied name or description still reaches the
-  output unchecked. Those two channels are closed *before* the printer, not by it: names are coerced
-  to safe identifiers in the IR (`ir/sanitize-identifiers.ts`, with an assert backstop) and all
-  comment text is run through `escapeJsDoc` (`emitters/ts.ts`). Treat any new value that flows into an
-  identifier slot or a comment as requiring the same handling.
-- Output formatting is the printer's (valid, but plainer than hand-formatting) — a pretty-print pass
-  is deferred to optional-formatter work.
-- The cost is a dependency on `typescript` at generation time (see [ADR-0002](./0002-typescript-peer-dep.md)),
-  and emitter code is more verbose than templates for trivial snippets — accepted for the correctness
-  and composability gains.
+- Structurally malformed output (mismatched braces, wrong nesting) is impossible; passes can compose/transform/dedupe nodes before printing; the option matrix scales without brittle template edits.
+- **The AST is not a sanitizer.** `ts.factory.createIdentifier` prints its text verbatim and synthetic comments are emitted as written — so a spec-supplied name or description still reaches the output unchecked. Those two channels are closed *before* the printer, not by it: names are coerced to safe identifiers in the IR (`ir/sanitize-identifiers.ts`, with an assert backstop) and all comment text is run through `escapeJsDoc` (`emitters/ts.ts`). Treat any new value that flows into an identifier slot or a comment as requiring the same handling.
+- Output formatting is the printer's (valid, but plainer than hand-formatting) — a pretty-print pass is deferred to optional-formatter work.
+- The cost is a dependency on `typescript` at generation time (see [ADR-0002](./0002-typescript-peer-dep.md)), and emitter code is more verbose than templates for trivial snippets — accepted for the correctness and composability gains.
diff --git a/packages/openapi-typescript/docs/adr/0002-typescript-peer-dep.md b/packages/openapi-typescript/docs/adr/0002-typescript-peer-dep.md
index 36ec6b8e77..ea31ab054c 100644
--- a/packages/openapi-typescript/docs/adr/0002-typescript-peer-dep.md
+++ b/packages/openapi-typescript/docs/adr/0002-typescript-peer-dep.md
@@ -5,26 +5,18 @@
 
 ## Context
 
-[ADR-0001](./0001-ast-codegen.md) makes `typescript` (for `ts.factory` + `ts.createPrinter`) a
-generation-time requirement. We must decide how the package depends on it without (a) bloating
-installs for consumers who already have `typescript`, or (b) compromising the headline property that
-the **generated client has no runtime dependencies**.
+[ADR-0001](./0001-ast-codegen.md) makes `typescript` (for `ts.factory` + `ts.createPrinter`) a generation-time requirement.
+We must decide how the package depends on it without (a) bloating installs for consumers who already have `typescript`, or (b) compromising the headline property that the **generated client has no runtime dependencies**.
 
 ## Decision
 
-We declare `typescript` (`>=5.5.0`) as a **`peerDependency`** of `@redocly/openapi-typescript`. The
-only real runtime `dependency` is `@redocly/openapi-core` (the input/document side). Package-in-code
-consumers (`import { generateClient }`) already have `typescript`; `@redocly/cli` declares it as a real
-`dependency` so the CLI works standalone (and transitively satisfies the peer). The codegen uses only
-stable `factory` / `createPrinter` / `createSourceFile` / `SyntaxKind` APIs, so the wide peer range is
-safe.
+We declare `typescript` (`>=5.5.0`) as a **`peerDependency`** of `@redocly/openapi-typescript`.
+The only real runtime `dependency` is `@redocly/openapi-core` (the input/document side).
+Package-in-code consumers (`import { generateClient }`) already have `typescript`; `@redocly/cli` declares it as a real `dependency` so the CLI works standalone (and transitively satisfies the peer).
+The codegen uses only stable `factory` / `createPrinter` / `createSourceFile` / `SyntaxKind` APIs, so the wide peer range is safe.
 
 ## Consequences
 
-- `typescript` is used **only at generation time** and never emitted, so the generated client stays
-  dependency-free (web-standard APIs only: `fetch`, `AbortController`, `URLSearchParams`) and runs in
-  browsers, Node, Bun, Deno, and edge runtimes.
-- `@redocly/openapi-core` must **not** grow a TS code-builder — its `yaml-ast-parser` is the input AST,
-  not an output one.
-- Consumers in unusual setups may need to add `typescript` explicitly; the wide peer range keeps this
-  rare.
+- `typescript` is used **only at generation time** and never emitted, so the generated client stays dependency-free (web-standard APIs only: `fetch`, `AbortController`, `URLSearchParams`) and runs in browsers, Node, Bun, Deno, and edge runtimes.
+- `@redocly/openapi-core` must **not** grow a TS code-builder — its `yaml-ast-parser` is the input AST, not an output one.
+- Consumers in unusual setups may need to add `typescript` explicitly; the wide peer range keeps this rare.
\ No newline at end of file
diff --git a/packages/openapi-typescript/docs/adr/0003-spec-agnostic-ir.md b/packages/openapi-typescript/docs/adr/0003-spec-agnostic-ir.md
index e49e31e457..b99c185bbc 100644
--- a/packages/openapi-typescript/docs/adr/0003-spec-agnostic-ir.md
+++ b/packages/openapi-typescript/docs/adr/0003-spec-agnostic-ir.md
@@ -5,23 +5,18 @@
 
 ## Context
 
-The generator must support multiple input dialects (OpenAPI 3.0/3.1/3.2 and Swagger 2.0) and multiple
-output shapes. If emitters read the raw OpenAPI document directly, every emitter would have to handle
-every spec quirk and version difference, and adding a dialect or an output target would ripple across
-the whole codebase.
+The generator must support multiple input dialects (OpenAPI 3.0/3.1/3.2 and Swagger 2.0) and multiple output shapes.
+If emitters read the raw OpenAPI document directly, every emitter would have to handle every spec quirk and version difference, and adding a dialect or an output target would ripple across the whole codebase.
 
 ## Decision
 
-We interpose a **spec-agnostic intermediate representation** (`ir/model.ts`) between parsing and
-emission. `buildApiModel` (`ir/build.ts`) walks the (bundled, ref-preserved) document once and produces
-the IR; Swagger 2.0 is first normalized to the 3.x shape (`ir/normalize-swagger2.ts`) so the builder
-sees one shape. **Everything downstream reads the IR, never the raw spec.** The IR is a pure type model
-— no runtime code — and is the contract between the builder and the emitters.
+We interpose a **spec-agnostic intermediate representation** (`ir/model.ts`) between parsing and emission.
+`buildApiModel` (`ir/build.ts`) walks the (bundled, ref-preserved) document once and produces the IR; Swagger 2.0 is first normalized to the 3.x shape (`ir/normalize-swagger2.ts`) so the builder sees one shape.
+**Everything downstream reads the IR, never the raw spec.**
+The IR is a pure type model — no runtime code — and is the contract between the builder and the emitters.
 
 ## Consequences
 
 - A new input dialect is absorbed in one place (normalize + build); emitters are untouched.
-- A new output target (e.g. another language) can be written against the IR without re-parsing specs —
-  the IR is the seam that makes multi-language plausible.
-- The IR must stay genuinely spec-agnostic; leaking OpenAPI-isms into it would erode the boundary. New
-  schema kinds are added to `SchemaModel` and produced in the builder, then consumed by emitters.
+- A new output target (e.g. another language) can be written against the IR without re-parsing specs — the IR is the seam that makes multi-language plausible.
+- The IR must stay genuinely spec-agnostic; leaking OpenAPI-isms into it would erode the boundary. New schema kinds are added to `SchemaModel` and produced in the builder, then consumed by emitters.
diff --git a/packages/openapi-typescript/docs/adr/0004-registry-seams.md b/packages/openapi-typescript/docs/adr/0004-registry-seams.md
index fb97ab3152..9445d9b441 100644
--- a/packages/openapi-typescript/docs/adr/0004-registry-seams.md
+++ b/packages/openapi-typescript/docs/adr/0004-registry-seams.md
@@ -5,28 +5,20 @@
 
 ## Context
 
-The package needs to vary two things independently: **what** is generated (the SDK, plus optional
-feature outputs like zod schemas or framework hooks) and **how** files are laid out (single file, split,
-per-tag, …). We want these to be extensible internally without committing — yet — to a public plugin
-API and its long-term compatibility surface.
+The package needs to vary two things independently: **what** is generated (the SDK, plus optional feature outputs like zod schemas or framework hooks) and **how** files are laid out (single file, split, per-tag, …).
+We want these to be extensible internally without committing — yet — to a public plugin API and its long-term compatibility surface.
 
 ## Decision
 
 We expose two internal **registry seams**, each mapping a name to an implementation:
 
-- **`getGenerator(name)`** → `Generator` (`(input) => GeneratedFile[]`). `generateClient` runs the
-  configured generators (default `['sdk']`), merging their files (duplicate output paths throw). New
-  capabilities (zod, tanstack-query, transformers, …) plug in here. The `sdk` generator delegates to
-  the writer seam below.
-- **`getWriter(outputMode)`** → `Writer`. Adapters for `single` / `split` / `tags` / `tags-split`
-  (the two tag layouts share `buildTaggedClient`). New file layouts plug in here.
+- **`getGenerator(name)`** → `Generator` (`(input) => GeneratedFile[]`). `generateClient` runs the configured generators (default `['sdk']`), merging their files (duplicate output paths throw). New capabilities (zod, tanstack-query, transformers, …) plug in here. The `sdk` generator delegates to the writer seam below.
+- **`getWriter(outputMode)`** → `Writer`. Adapters for `single` / `split` / `tags` / `tags-split` (the two tag layouts share `buildTaggedClient`). New file layouts plug in here.
 
 Both are **first-party only** — no public third-party plugin API yet.
 
 ## Consequences
 
 - New generators and layouts are added by registering an implementation, not by editing call sites.
-- Writers consume the emitter only through the `emitModules(...) → ClientModules` seam, so they stay
-  layout-only and the emitter's internal fragment breakdown never leaks.
-- Deferring a public plugin API keeps us free to change `Generator`/`Writer` internals; third-party
-  extensibility is a deliberate later step, revisited once the first-party set stabilizes.
+- Writers consume the emitter only through the `emitModules(...) → ClientModules` seam, so they stay layout-only and the emitter's internal fragment breakdown never leaks.
+- Deferring a public plugin API keeps us free to change `Generator`/`Writer` internals; third-party extensibility is a deliberate later step, revisited once the first-party set stabilizes.
\ No newline at end of file
diff --git a/packages/openapi-typescript/docs/adr/0005-error-mode-terminals.md b/packages/openapi-typescript/docs/adr/0005-error-mode-terminals.md
index de3fe1a81c..f6daa39682 100644
--- a/packages/openapi-typescript/docs/adr/0005-error-mode-terminals.md
+++ b/packages/openapi-typescript/docs/adr/0005-error-mode-terminals.md
@@ -5,29 +5,22 @@
 
 ## Context
 
-Consumers want different error-handling ergonomics: some prefer exceptions, others prefer a
-discriminated `{ data, error }` result they must inspect. Encoding this **per call** (à la a
-`throwOnError` flag) forces conditional-return overloads and complicates every operation signature. A
-codebase generally picks one convention anyway.
+Consumers want different error-handling ergonomics: some prefer exceptions, others prefer a discriminated `{ data, error }` result they must inspect.
+Encoding this **per call** (à la a `throwOnError` flag) forces conditional-return overloads and complicates every operation signature.
+A codebase generally picks one convention anyway.
 
 ## Decision
 
-Error handling is a **generate-time mode** (`--error-mode throw | result`, default `throw`). The fetch
-wrapper is factored into a shared core plus one of two terminals:
+Error handling is a **generate-time mode** (`--error-mode throw | result`, default `throw`).
+The fetch wrapper is factored into a shared core plus one of two terminals:
 
-- `__send` — payload/header build + the retry/fetch loop → a raw `Response`; `__parse` — success-body
-  decode.
-- `__request` (**throw** mode — throws `ApiError` on non-2xx) **or** `__requestResult` (**result** mode
-  — returns `Result<TData, TError>`).
+- `__send` — payload/header build + the retry/fetch loop → a raw `Response`; `__parse` — success-body decode.
+- `__request` (**throw** mode — throws `ApiError` on non-2xx) **or** `__requestResult` (**result** mode — returns `Result<TData, TError>`).
 
-`renderRuntime(..., errorMode)` emits **only** the chosen terminal (so `noUnusedLocals` stays clean);
-`renderOperationsBlock(..., { errorMode })` emits matching call sites and the `<Op>Error` aliases.
+`renderRuntime(..., errorMode)` emits **only** the chosen terminal (so `noUnusedLocals` stays clean); `renderOperationsBlock(..., { errorMode })` emits matching call sites and the `<Op>Error` aliases.
 
 ## Consequences
 
-- Operation signatures stay simple — no per-call conditional overloads; the mode is uniform across the
-  client.
-- Throw mode is byte-identical to the pre-extraction behavior; result mode reuses the same `__send`
-  core, so retry/abort/auth/decoding logic lives in one place.
-- Switching conventions requires regeneration (acceptable — it's a project-level choice, not a per-call
-  one).
+- Operation signatures stay simple — no per-call conditional overloads; the mode is uniform across the client.
+- Throw mode is byte-identical to the pre-extraction behavior; result mode reuses the same `__send` core, so retry/abort/auth/decoding logic lives in one place.
+- Switching conventions requires regeneration (acceptable — it's a project-level choice, not a per-call one).
diff --git a/packages/openapi-typescript/docs/adr/0006-sse-namespace.md b/packages/openapi-typescript/docs/adr/0006-sse-namespace.md
index 8f6febda71..5a52aa352e 100644
--- a/packages/openapi-typescript/docs/adr/0006-sse-namespace.md
+++ b/packages/openapi-typescript/docs/adr/0006-sse-namespace.md
@@ -5,27 +5,19 @@
 
 ## Context
 
-Some operations stream Server-Sent Events (`text/event-stream`). These don't fit the one-shot
-request/response shape: they return an async iterator of typed events, need reconnection
-(`Last-Event-ID` + backoff), and are errorMode-agnostic. We must surface them without complicating
-ordinary operations or the default output.
+Some operations stream Server-Sent Events (`text/event-stream`).
+These don't fit the one-shot request/response shape: they return an async iterator of typed events, need reconnection (`Last-Event-ID` + backoff), and are errorMode-agnostic.
+We must surface them without complicating ordinary operations or the default output.
 
 ## Decision
 
-SSE is a **derived response kind**, detected (not flagged) by `emitters/sse.ts`
-(`isSseOp`/`partitionOps`): an operation whose 2xx response declares `text/event-stream` is emitted
-under a separate **`sse` namespace** instead of as a plain endpoint. The runtime gains a **gated**
-`__sse<T>` generator — an `async function*` that **reuses `__send`** for the initial request +
-retry/auth, then parses event frames and auto-reconnects via `Last-Event-ID`. The event payload type
-`T` comes from the response `itemSchema` → media `schema` → `string`. `client.ts` partitions each
-service's ops and exposes the SSE ones under `sse` (functions: `export const sse = { … }`;
-service-class: a bound `readonly sse = { … }`); in multi-file modes each tag/class contributes a
-`__sse_<Class>` fragment that the barrel merges.
+SSE is a **derived response kind**, detected (not flagged) by `emitters/sse.ts` (`isSseOp`/`partitionOps`): an operation whose 2xx response declares `text/event-stream` is emitted under a separate **`sse` namespace** instead of as a plain endpoint.
+The runtime gains a **gated** `__sse<T>` generator — an `async function*` that **reuses `__send`** for the initial request + retry/auth, then parses event frames and auto-reconnects via `Last-Event-ID`.
+The event payload type `T` comes from the response `itemSchema` → media `schema` → `string`.
+`client.ts` partitions each service's ops and exposes the SSE ones under `sse` (functions: `export const sse = { … }`; service-class: a bound `readonly sse = { … }`); in multi-file modes each tag/class contributes a `__sse_<Class>` fragment that the barrel merges.
 
 ## Consequences
 
 - Streaming ops get an ergonomic, typed async-iterator surface without touching ordinary operations.
-- The whole `__sse`/`ServerSentEvent`/`SseOptions` block is **gated off** when no op streams, so
-  non-SSE clients are byte-identical (no churn).
-- SSE bypasses the error-mode terminals ([ADR-0005](./0005-error-mode-terminals.md)) by design — it has
-  no `Result` form.
+- The whole `__sse`/`ServerSentEvent`/`SseOptions` block is **gated off** when no op streams, so non-SSE clients are byte-identical (no churn).
+- SSE bypasses the error-mode terminals ([ADR-0005](./0005-error-mode-terminals.md)) by design — it has no `Result` form.
diff --git a/packages/openapi-typescript/docs/adr/0007-call-site-auth.md b/packages/openapi-typescript/docs/adr/0007-call-site-auth.md
index 1f450686f8..7efc519d8d 100644
--- a/packages/openapi-typescript/docs/adr/0007-call-site-auth.md
+++ b/packages/openapi-typescript/docs/adr/0007-call-site-auth.md
@@ -5,24 +5,18 @@
 
 ## Context
 
-Security schemes vary (HTTP bearer/basic, apiKey in header/query/cookie) and credentials may be async
-(a token provider returning a `Promise`). We want all of this handled without bloating the shared
-runtime with auth branching, and without emitting auth code into operations that don't need it.
+Security schemes vary (HTTP bearer/basic, apiKey in header/query/cookie) and credentials may be async (a token provider returning a `Promise`).
+We want all of this handled without bloating the shared runtime with auth branching, and without emitting auth code into operations that don't need it.
 
 ## Decision
 
-Credentials are resolved **at the call site**, not inside the runtime fetch wrapper. `renderAuth`
-(`emitters/auth.ts`) emits module-scoped credential slots, the `set*` setters (accepting a
-`TokenProvider` = value-or-`(() => string | Promise<string>)` for bearer/apiKey; `setBasicAuth` stays
-sync), and an **async** `__auth(schemes): Promise<{ headers, query }>` that awaits each resolvable
-credential. Every authed operation emits `const __a = await __auth([...])`, spreads `...__a.headers`,
-and (for `apiKeyQuery` keys, threaded via `queryAuthKeys`) merges `...__a.query` into the URL builder.
+Credentials are resolved **at the call site**, not inside the runtime fetch wrapper.
+`renderAuth` (`emitters/auth.ts`) emits module-scoped credential slots, the `set*` setters (accepting a `TokenProvider` = value-or-`(() => string | Promise<string>)` for bearer/apiKey; `setBasicAuth` stays sync), and an **async** `__auth(schemes): Promise<{ headers, query }>` that awaits each resolvable credential.
+Every authed operation emits `const __a = await __auth([...])`, spreads `...__a.headers`, and (for `apiKeyQuery` keys, threaded via `queryAuthKeys`) merges `...__a.query` into the URL builder.
 Non-authed operations emit **no** auth code at all.
 
 ## Consequences
 
-- All auth — header/query/cookie, sync/async — lives in one place next to URL building, with zero
-  churn to the runtime fetch wrapper.
+- All auth — header/query/cookie, sync/async — lives in one place next to URL building, with zero churn to the runtime fetch wrapper.
 - Operations pay only for the auth they use; unauthenticated ops stay clean.
-- Auth resolution is per-call (awaited each request), which is the correct behavior for rotating/async
-  tokens; the small overhead is acceptable.
+- Auth resolution is per-call (awaited each request), which is the correct behavior for rotating/async tokens; the small overhead is acceptable.
diff --git a/packages/openapi-typescript/docs/adr/0008-redocly-yaml-config.md b/packages/openapi-typescript/docs/adr/0008-redocly-yaml-config.md
index 645e153eeb..b246e022f3 100644
--- a/packages/openapi-typescript/docs/adr/0008-redocly-yaml-config.md
+++ b/packages/openapi-typescript/docs/adr/0008-redocly-yaml-config.md
@@ -5,25 +5,20 @@
 
 ## Context
 
-`generate-client` settings could live in a dedicated `defineConfig` file (`*.config.ts`), but Redocly
-users expect a single project config — `redocly.yaml`. First-class config keys belong in the
-`@redocly/config` package (a separate repo), which doesn't model client-gen settings yet. We want
-redocly.yaml-driven generation **now**, without blocking on that release.
+`generate-client` settings could live in a dedicated `defineConfig` file (`*.config.ts`), but Redocly users expect a single project config — `redocly.yaml`.
+First-class config keys belong in the `@redocly/config` package (a separate repo), which doesn't model client-gen settings yet.
+We want redocly.yaml-driven generation **now**, without blocking on that release.
 
 ## Decision
 
-`generate-client` reads its options from an **`x-openapi-typescript` extension block** in
-`redocly.yaml`. The `x-` prefix is the tolerated-extension convention, so no `@redocly/config` schema
-change is needed — and `@redocly/openapi-core` already preserves the block verbatim in
-`config.resolvedConfig`. The CLI extracts it, resolving relative `input`/`output` against the
-redocly.yaml directory. Precedence, low → high: **`redocly.yaml` block → `--config-file` (the
-`*.config.ts`, retained) → CLI flags**. Examples ship a `redocly.yaml` and run `redocly generate-client`
-with no flags.
+`generate-client` reads its options from an **`x-openapi-typescript` extension block** in `redocly.yaml`.
+The `x-` prefix is the tolerated-extension convention, so no `@redocly/config` schema change is needed — and `@redocly/openapi-core` already preserves the block verbatim in `config.resolvedConfig`.
+The CLI extracts it, resolving relative `input`/`output` against the redocly.yaml directory.
+Precedence, low → high: **`redocly.yaml` block → `--config-file` (the `*.config.ts`, retained) → CLI flags**.
+Examples ship a `redocly.yaml` and run `redocly generate-client` with no flags.
 
 ## Consequences
 
 - One project config; `redocly generate-client` works with no flags by auto-discovering `redocly.yaml`.
-- No core/`@redocly/config` change required yet; when first-class keys land, the `x-` block can be
-  swapped for typed fields (a future ADR will supersede this).
-- The dedicated `*.config.ts` path stays available (via `--config-file`) for configs outside the
-  project or in nested folders.
+- No core/`@redocly/config` change required yet; when first-class keys land, the `x-` block can be swapped for typed fields (a future ADR will supersede this).
+- The dedicated `*.config.ts` path stays available (via `--config-file`) for configs outside the project or in nested folders.
diff --git a/packages/openapi-typescript/docs/adr/0009-per-instance-auth.md b/packages/openapi-typescript/docs/adr/0009-per-instance-auth.md
index d181fc7c75..771516d423 100644
--- a/packages/openapi-typescript/docs/adr/0009-per-instance-auth.md
+++ b/packages/openapi-typescript/docs/adr/0009-per-instance-auth.md
@@ -5,31 +5,21 @@
 
 ## Context
 
-[ADR-0007](./0007-call-site-auth.md) resolves credentials at the call site, but from **module-global**
-slots (`setBearer`/`setBasicAuth`/`setApiKey*`). The `service-class` facade exists to run **multiple
-independent client instances** — yet global auth means every instance of a generated module shares one
-credential. Real adoption hit this: two clients of the _same_ generated module needing different HTTP
-Basic credentials (e.g. an internal vs. a public syncer client), which the globals cannot represent.
-The workaround — injecting `Authorization` via per-instance `config.headers` — bypasses the spec's
-per-operation `security`, sending the header even to endpoints that don't declare it.
+[ADR-0007](./0007-call-site-auth.md) resolves credentials at the call site, but from **module-global** slots (`setBearer`/`setBasicAuth`/`setApiKey*`).
+The `service-class` facade exists to run **multiple independent client instances** — yet global auth means every instance of a generated module shares one credential.
+Real adoption hit this: two clients of the _same_ generated module needing different HTTP Basic credentials (e.g. an internal vs. a public syncer client), which the globals cannot represent.
+The workaround — injecting `Authorization` via per-instance `config.headers` — bypasses the spec's per-operation `security`, sending the header even to endpoints that don't declare it.
 
 ## Decision
 
-Add an optional **`auth?: AuthCredentials`** to `ClientConfig`, carrying per-instance credentials, and
-thread the config into the resolver: `__auth(schemes, config)`. Each scheme resolves from
-`config.auth?.<scheme> ?? <global slot>` — the per-instance value wins, the global setters remain the
-fallback. `AuthCredentials` mirrors the schemes the spec declares:
-`{ bearer?: TokenProvider; basic?: { username; password }; apiKey?: Record<string, TokenProvider> }`.
-It is emitted only when the client has injectable schemes (so non-auth clients are byte-identical), and
-works for both facades (the functions facade sets it once via `configure({ auth })`).
+Add an optional **`auth?: AuthCredentials`** to `ClientConfig`, carrying per-instance credentials, and thread the config into the resolver: `__auth(schemes, config)`.
+Each scheme resolves from `config.auth?.<scheme> ?? <global slot>` — the per-instance value wins, the global setters remain the fallback.
+`AuthCredentials` mirrors the schemes the spec declares: `{ bearer?: TokenProvider; basic?: { username; password }; apiKey?: Record<string, TokenProvider> }`.
+It is emitted only when the client has injectable schemes (so non-auth clients are byte-identical), and works for both facades (the functions facade sets it once via `configure({ auth })`).
 
 ## Consequences
 
-- The service-class facade can finally run independent instances with independent credentials — its
-  reason to exist.
-- **Backward compatible:** the global setters are unchanged and remain the fallback; the functions
-  facade is unchanged unless `auth` is set.
-- Unlike the header workaround, it still honors each operation's declared `security` (only declared
-  schemes are sent).
-- **Extends** ADR-0007 rather than superseding it — credentials are still resolved at the call site;
-  the source is now "config-then-global" instead of "global only".
+- The service-class facade can finally run independent instances with independent credentials — its reason to exist.
+- **Backward compatible:** the global setters are unchanged and remain the fallback; the functions facade is unchanged unless `auth` is set.
+- Unlike the header workaround, it still honors each operation's declared `security` (only declared schemes are sent).
+- **Extends** ADR-0007 rather than superseding it — credentials are still resolved at the call site; the source is now "config-then-global" instead of "global only".
diff --git a/packages/openapi-typescript/docs/adr/0010-mock-data-baked-vs-faker.md b/packages/openapi-typescript/docs/adr/0010-mock-data-baked-vs-faker.md
index 5515f05733..6e82293ec6 100644
--- a/packages/openapi-typescript/docs/adr/0010-mock-data-baked-vs-faker.md
+++ b/packages/openapi-typescript/docs/adr/0010-mock-data-baked-vs-faker.md
@@ -5,42 +5,28 @@
 
 ## Context
 
-The `mock` generator emits [MSW](https://mswjs.io) request handlers plus `create<Schema>` data
-factories. Those factories need values to return. Two sources are reasonable, and they pull in
-opposite directions:
+The `mock` generator emits [MSW](https://mswjs.io) request handlers plus `create<Schema>` data factories.
+Those factories need values to return.
+Two sources are reasonable, and they pull in opposite directions:
 
-- **Baked literals** — deterministic values synthesized from the schema (preferring `example` /
-  `default`). Zero runtime dependency, reproducible by construction, but unrealistic ("string",
-  `0`, the same UUID every time).
-- **[`@faker-js/faker`](https://fakerjs.dev) calls** — realistic, varied data (names, emails,
-  dates), at the cost of a dependency and (without a seed) non-determinism.
+- **Baked literals** — deterministic values synthesized from the schema (preferring `example` / `default`). Zero runtime dependency, reproducible by construction, but unrealistic ("string", `0`, the same UUID every time).
+- **[`@faker-js/faker`](https://fakerjs.dev) calls** — realistic, varied data (names, emails, dates), at the cost of a dependency and (without a seed) non-determinism.
 
-A mock generator that hard-codes either choice is wrong for half its users: test suites want
-deterministic zero-dep fixtures; demos and Storybook want realistic data. The core constraint is
-that the generated **client stays dependency-free** ([ADR-0002](./0002-typescript-peer-dep.md)) —
-whatever mocks pull in must not leak into it.
+A mock generator that hard-codes either choice is wrong for half its users: test suites want deterministic zero-dep fixtures; demos and Storybook want realistic data.
+The core constraint is that the generated **client stays dependency-free** ([ADR-0002](./0002-typescript-peer-dep.md)) — whatever mocks pull in must not leak into it.
 
 ## Decision
 
-Make data source a knob — **`--mock-data baked` (default) | `faker`** — with **identical factory
-signatures** in both modes, so a consumer flips it without touching call sites. Baked mode lives in
-`emitters/sample.ts` (`sampleValue` → a JS value, printed as a literal); faker mode lives in
-`emitters/faker.ts` (`fakerExpression` → a `ts.Expression` of `@faker-js/faker` calls). Both walk
-the same IR with the same visited-set cycle guard, so they agree on shape; `--mock-seed <n>` emits
-`faker.seed(n)` for reproducible faker output. The `@faker-js/faker` import appears only in the
-`*.mocks.ts` module — never in the client.
+Make data source a knob — **`--mock-data baked` (default) | `faker`** — with **identical factory signatures** in both modes, so a consumer flips it without touching call sites.
+Baked mode lives in `emitters/sample.ts` (`sampleValue` → a JS value, printed as a literal); faker mode lives in `emitters/faker.ts` (`fakerExpression` → a `ts.Expression` of `@faker-js/faker` calls).
+Both walk the same IR with the same visited-set cycle guard, so they agree on shape; `--mock-seed <n>` emits `faker.seed(n)` for reproducible faker output.
+The `@faker-js/faker` import appears only in the `*.mocks.ts` module — never in the client.
 
-A `$ref` cycle terminates in the **type-correct empty value** for its position (array → `[]`,
-record → `{}`, optional property → omitted; only a required, non-container self-reference degrades
-to `null`), shared by both modes, so mock data always satisfies the generated non-nullable types.
+A `$ref` cycle terminates in the **type-correct empty value** for its position (array → `[]`, record → `{}`, optional property → omitted; only a required, non-container self-reference degrades to `null`), shared by both modes, so mock data always satisfies the generated non-nullable types.
 
 ## Consequences
 
 - Default output is zero-dependency and deterministic — safe for CI fixtures with no install.
-- Realistic data is one flag away, and reproducible with `--mock-seed`, without changing how the
-  factories are called.
-- Two walkers (`emitters/sample.ts`, `emitters/faker.ts`) must be kept structurally in lockstep; the
-  shared cycle semantics and a parallel test suite are what hold them together. Both live under
-  `emitters/` (a mock concern, not the IR layer).
-- `mock` requires the `sdk` generator (factories reference its types) and is validated by the
-  generator contract ([ADR-0004](./0004-registry-seams.md)).
+- Realistic data is one flag away, and reproducible with `--mock-seed`, without changing how the factories are called.
+- Two walkers (`emitters/sample.ts`, `emitters/faker.ts`) must be kept structurally in lockstep; the shared cycle semantics and a parallel test suite are what hold them together. Both live under `emitters/` (a mock concern, not the IR layer).
+- `mock` requires the `sdk` generator (factories reference its types) and is validated by the generator contract ([ADR-0004](./0004-registry-seams.md)).
\ No newline at end of file
diff --git a/packages/openapi-typescript/docs/adr/0011-wrapper-generators.md b/packages/openapi-typescript/docs/adr/0011-wrapper-generators.md
index e5f9cdcc4e..0cf69c1303 100644
--- a/packages/openapi-typescript/docs/adr/0011-wrapper-generators.md
+++ b/packages/openapi-typescript/docs/adr/0011-wrapper-generators.md
@@ -5,41 +5,26 @@
 
 ## Context
 
-The sdk emits framework-agnostic `async function`s. Application code that uses
-[TanStack Query](https://tanstack.com/query) or [SWR](https://swr.vercel.app) then hand-writes the
-same glue per operation — query keys, `queryFn`/fetcher wrappers, mutation factories — which drifts
-from the spec and is exactly the boilerplate a generator should own. Two questions had to be
-answered without compromising the dependency-free client ([ADR-0002](./0002-typescript-peer-dep.md)):
-how the wrappers stay in step with the sdk's calling convention, and how to support multiple
-frameworks (TanStack ships `react`/`vue`/`svelte`/`solid` adapters) without four near-copies.
+The sdk emits framework-agnostic `async function`s.
+Application code that uses [TanStack Query](https://tanstack.com/query) or [SWR](https://swr.vercel.app) then hand-writes the same glue per operation — query keys, `queryFn`/fetcher wrappers, mutation factories — which drifts from the spec and is exactly the boilerplate a generator should own.
+Two questions had to be answered without compromising the dependency-free client ([ADR-0002](./0002-typescript-peer-dep.md)): how the wrappers stay in step with the sdk's calling convention, and how to support multiple frameworks (TanStack ships `react`/`vue`/`svelte`/`solid` adapters) without four near-copies.
 
 ## Decision
 
-Each wrapper is a **registry generator** ([ADR-0004](./0004-registry-seams.md)) emitting a separate
-`*.tanstack.ts` / `*.swr.ts` module that imports the framework peer and **forwards to the sdk's
-exported functions** — the client never imports the framework. Both wrappers derive their argument
-order from the shared `operation-signature.ts`, so a forwarding call lines up with the sdk by
-construction.
+Each wrapper is a **registry generator** ([ADR-0004](./0004-registry-seams.md)) emitting a separate `*.tanstack.ts` / `*.swr.ts` module that imports the framework peer and **forwards to the sdk's exported functions** — the client never imports the framework.
+Both wrappers derive their argument order from the shared `operation-signature.ts`, so a forwarding call lines up with the sdk by construction.
 
-Their cross-cutting agreement — which operations are wrappable (skip SSE; skip `<Op>Variables`
-name collisions) and the `vars`/`init` parameter shape — lives in one shared `wrapper-support.ts`,
-so the two emitters (and any third adapter) cannot diverge.
+Their cross-cutting agreement — which operations are wrappable (skip SSE; skip `<Op>Variables` name collisions) and the `vars`/`init` parameter shape — lives in one shared `wrapper-support.ts`, so the two emitters (and any third adapter) cannot diverge.
 
-For TanStack's multiple frameworks, the **emitted factory module is byte-identical across
-frameworks** — `queryOptions` and the mutation shape are framework-agnostic — so the only
-difference is the import specifier. `--query-framework` selects it (`@tanstack/<framework>-query`),
-rather than forking the generator per framework.
+For TanStack's multiple frameworks, the **emitted factory module is byte-identical across frameworks** — `queryOptions` and the mutation shape are framework-agnostic — so the only difference is the import specifier.
+`--query-framework` selects it (`@tanstack/<framework>-query`), rather than forking the generator per framework.
 
-Wrappers wrap the **throw-mode** sdk (TanStack/SWR expect the fetcher to throw), so they require
-`--error-mode throw` and the `functions` facade; the generator contract fails fast otherwise.
+Wrappers wrap the **throw-mode** sdk (TanStack/SWR expect the fetcher to throw), so they require `--error-mode throw` and the `functions` facade; the generator contract fails fast otherwise.
 
 ## Consequences
 
-- Adding a third wrapper (e.g. another fetching library) reuses `wrapper-support.ts` and
-  `operation-signature.ts` — only the per-operation factory bodies are new.
+- Adding a third wrapper (e.g. another fetching library) reuses `wrapper-support.ts` and `operation-signature.ts` — only the per-operation factory bodies are new.
 - TanStack framework support costs one import-specifier switch, not a code path per framework.
 - The client stays dependency-free; the framework is a peer of the wrapper module only.
-- SSE operations and `<Op>Variables` schema collisions are skipped with a logged notice rather than
-  emitting a module that won't compile.
-- Vercel/Next.js-specific data fetching is intentionally out of scope (SWR covers the React-Query
-  alternative); revisit only if there is concrete demand.
+- SSE operations and `<Op>Variables` schema collisions are skipped with a logged notice rather than emitting a module that won't compile.
+- Vercel/Next.js-specific data fetching is intentionally out of scope (SWR covers the React-Query alternative); revisit only if there is concrete demand.
diff --git a/packages/openapi-typescript/docs/adr/0012-plugin-api.md b/packages/openapi-typescript/docs/adr/0012-plugin-api.md
index c6d7db0caf..93a412a37c 100644
--- a/packages/openapi-typescript/docs/adr/0012-plugin-api.md
+++ b/packages/openapi-typescript/docs/adr/0012-plugin-api.md
@@ -5,46 +5,24 @@
 
 ## Context
 
-The built-in generators ([ADR-0004](./0004-registry-seams.md)) cover common targets (sdk, zod,
-tanstack-query, swr, transformers, mock). They cannot cover the long tail: outputs that are
-org-specific (a house-style SDK wrapper, a UI permissions map) or niche (validators in a library we
-don't ship, mocks in another test runner's format). Today a user's only options are forking the tool
-or writing a separate program that re-parses the spec. The registry seam is already shaped to admit
-more generators — the question was whether, and how, to open it to third parties without
-compromising the dependency-free client ([ADR-0002](./0002-typescript-peer-dep.md)) or locking the
-IR's shape prematurely.
+The built-in generators ([ADR-0004](./0004-registry-seams.md)) cover common targets (sdk, zod, tanstack-query, swr, transformers, mock).
+They cannot cover the long tail: outputs that are org-specific (a house-style SDK wrapper, a UI permissions map) or niche (validators in a library we don't ship, mocks in another test runner's format).
+Today a user's only options are forking the tool or writing a separate program that re-parses the spec.
+The registry seam is already shaped to admit more generators — the question was whether, and how, to open it to third parties without compromising the dependency-free client ([ADR-0002](./0002-typescript-peer-dep.md)) or locking the IR's shape prematurely.
 
 ## Decision
 
-Open the `getGenerator` registry as a **public, experimental** API for **custom generators only**
-(not writers or AST hooks). A custom generator is the internal `GeneratorDescriptor` plus a `name`:
-`{ name, run, requires?, facades?, errorModes?, dateTypes? }`, where `run(input) => GeneratedFile[]`
-receives the same IR the built-ins do.
-
-- **Loading is dual.** A `generators` entry resolves as a built-in name, an inline `customGenerators`
-  entry (from a `defineConfig` file — type-safe, no dynamic import), or an **import specifier** (a
-  path resolved against the config dir, or an installed package) that is dynamically `import()`ed and
-  default-exported (mirroring how config files load). A new `resolveGenerators` performs this before
-  emission, producing a name→descriptor registry that `validateGenerators` and the run loop consume.
-- **Surface + stability.** A dedicated `@redocly/openapi-typescript/plugin` entry exports
-  `defineGenerator`, the IR types, and a curated codegen toolkit (`ts`, `printStatements`,
-  `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, `safeIdent`) — the same
-  internals the built-in generators use, re-surfaced (no new logic). The whole surface is
-  **`@experimental`**: it may change between minor versions until real plugins exercise it and it is
-  stabilized.
-- **Fail fast.** Collisions (a custom name equal to a built-in or another custom), invalid exports,
-  unloadable specifiers, and unmet `requires`/`facades`/`errorModes`/`dateTypes` all throw an
-  actionable error before any file is written.
+Open the `getGenerator` registry as a **public, experimental** API for **custom generators only** (not writers or AST hooks).
+A custom generator is the internal `GeneratorDescriptor` plus a `name`: `{ name, run, requires?, facades?, errorModes?, dateTypes? }`, where `run(input) => GeneratedFile[]` receives the same IR the built-ins do.
+
+- **Loading is dual.** A `generators` entry resolves as a built-in name, an inline `customGenerators` entry (from a `defineConfig` file — type-safe, no dynamic import), or an **import specifier** (a path resolved against the config dir, or an installed package) that is dynamically `import()`ed and default-exported (mirroring how config files load). A new `resolveGenerators` performs this before emission, producing a name→descriptor registry that `validateGenerators` and the run loop consume.
+- **Surface + stability.** A dedicated `@redocly/openapi-typescript/plugin` entry exports `defineGenerator`, the IR types, and a curated codegen toolkit (`ts`, `printStatements`, `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, `safeIdent`) — the same internals the built-in generators use, re-surfaced (no new logic). The whole surface is **`@experimental`**: it may change between minor versions until real plugins exercise it and it is stabilized.
+- **Fail fast.** Collisions (a custom name equal to a built-in or another custom), invalid exports, unloadable specifiers, and unmet `requires`/`facades`/`errorModes`/`dateTypes` all throw an actionable error before any file is written.
 
 ## Consequences
 
-- The long tail is addressable without forking; a generator is a small module against a stable IR,
-  and is a first-class peer of the built-ins (same model, same toolkit).
-- The generated client stays dependency-free — a generator's output is its own file, and its target
-  libraries are peers of the consumer's app, not the client.
-- **Trust:** import-specifier generators execute arbitrary code at generation time — the same trust
-  level as any installed dependency or `defineConfig` file. Not sandboxed (out of scope); documented.
-- **Commitment is deferred:** marking the surface experimental keeps the IR and toolkit free to
-  evolve while the API is proven; graduating it to stable is future work.
-- **Out of scope (v1):** custom writers / output modes, emitter/AST hooks, per-plugin options
-  passthrough, and a plugin marketplace.
+- The long tail is addressable without forking; a generator is a small module against a stable IR, and is a first-class peer of the built-ins (same model, same toolkit).
+- The generated client stays dependency-free — a generator's output is its own file, and its target libraries are peers of the consumer's app, not the client.
+- **Trust:** import-specifier generators execute arbitrary code at generation time — the same trust level as any installed dependency or `defineConfig` file. Not sandboxed (out of scope); documented.
+- **Commitment is deferred:** marking the surface experimental keeps the IR and toolkit free to evolve while the API is proven; graduating it to stable is future work.
+- **Out of scope (v1):** custom writers / output modes, emitter/AST hooks, per-plugin options passthrough, and a plugin marketplace.
diff --git a/packages/openapi-typescript/docs/adr/0013-experimental-status.md b/packages/openapi-typescript/docs/adr/0013-experimental-status.md
index 4c23bdd199..6152d82711 100644
--- a/packages/openapi-typescript/docs/adr/0013-experimental-status.md
+++ b/packages/openapi-typescript/docs/adr/0013-experimental-status.md
@@ -5,58 +5,38 @@
 
 ## Context
 
-`generate-client` (and `@redocly/openapi-typescript`) ships a large public surface in one go: CLI
-flags, the **exact generated output**, the configuration schema, six generators, and a
-custom-generator plugin API that exposes the IR ([ADR-0012](./0012-plugin-api.md)). Several of these
-are hard to walk back once committed to:
-
-- **Generated output is the real lock-in** — consumers commit the generated client to their repos and
-  depend on its exact shape; changing it is a breaking change.
-- **The IR is semi-public** through the plugin API (already `@experimental`), so freezing the
-  surrounding feature while the IR moves would be incoherent.
-- There are **known deferrals** (`int64`→`bigint`, oauth2 token-flow helpers, a pretty-print pass, no
-  built-in Angular/Valibot) and **little real-world adoption** yet to validate the design.
+`generate-client` (and `@redocly/openapi-typescript`) ships a large public surface in one go: CLI flags, the **exact generated output**, the configuration schema, six generators, and a custom-generator plugin API that exposes the IR ([ADR-0012](./0012-plugin-api.md)).
+Several of these are hard to walk back once committed to:
+
+- **Generated output is the real lock-in** — consumers commit the generated client to their repos and depend on its exact shape; changing it is a breaking change.
+- **The IR is semi-public** through the plugin API (already `@experimental`), so freezing the surrounding feature while the IR moves would be incoherent.
+- There are **known deferrals** (`int64`→`bigint`, oauth2 token-flow helpers, a pretty-print pass, no built-in Angular/Valibot) and **little real-world adoption** yet to validate the design.
 
 Committing all of this to semver-stable on day one is a promise we can't yet keep.
 
 ## Decision
 
-Release the **entire feature as experimental**. Its CLI flags, generated output, configuration, and
-the plugin API may change in any minor release until it is declared stable.
+Release the **entire feature as experimental**.
+Its CLI flags, generated output, configuration, and the plugin API may change in any minor release until it is declared stable.
 
-- **Versioning:** `@redocly/openapi-typescript` is versioned **independently, starting at `0.x`** —
-  it is **not** in the monorepo's `fixed` lockstep group (which keeps `@redocly/cli` /
-  `@redocly/openapi-core` / `@redocly/respect-core` in step). A `0.x` version is the semver-native
-  signal that the API may change, and it decouples the experimental package's churn from the stable
-  CLI's version (the CLI bundles it and pins the exact version it ships). It graduates to `1.0.0` when
-  declared stable.
-- **Disclosure:** the `0.x` version, the README banner, the command-doc admonition, the changeset
-  entry, and this ADR all state the experimental status and link here.
+- **Versioning:** `@redocly/openapi-typescript` is versioned **independently, starting at `0.x`** — it is **not** in the monorepo's `fixed` lockstep group (which keeps `@redocly/cli` / `@redocly/openapi-core` / `@redocly/respect-core` in step). A `0.x` version is the semver-native signal that the API may change, and it decouples the experimental package's churn from the stable CLI's version (the CLI bundles it and pins the exact version it ships). It graduates to `1.0.0` when declared stable.
+- **Disclosure:** the `0.x` version, the README banner, the command-doc admonition, the changeset entry, and this ADR all state the experimental status and link here.
 
 ### Stabilization criteria (what graduates it to stable)
 
 The feature stays experimental until all of the following hold:
 
-1. **Validated against real-world specs** — exercised on a representative set of production OpenAPI
-   descriptions (incl. internal consumers) with no output-shape surprises.
-2. **Generated-output shape frozen** — no pending changes to the emitted client/types that would
-   break a committed, generated client.
-3. **Plugin IR committed to** — the IR and codegen toolkit re-exported from
-   `@redocly/openapi-typescript/plugin` are reviewed and promoted from `@experimental` to stable.
-4. **Deferrals decided** — `int64`→`bigint`, oauth2 token-flow helpers, and the formatting/pretty-print
-   pass are each either implemented or explicitly declared out of scope.
-5. **Soak period** — a defined window of no breaking changes to flags/output/config before the flag is
-   flipped.
+1. **Validated against real-world specs** — exercised on a representative set of production OpenAPI descriptions (incl. internal consumers) with no output-shape surprises.
+2. **Generated-output shape frozen** — no pending changes to the emitted client/types that would break a committed, generated client.
+3. **Plugin IR committed to** — the IR and codegen toolkit re-exported from `@redocly/openapi-typescript/plugin` are reviewed and promoted from `@experimental` to stable.
+4. **Deferrals decided** — `int64`→`bigint`, oauth2 token-flow helpers, and the formatting/pretty-print pass are each either implemented or explicitly declared out of scope.
+5. **Soak period** — a defined window of no breaking changes to flags/output/config before the flag is flipped.
 
-Stabilization is tracked in a public issue linked from the docs; flipping to stable is itself a
-changelog-worthy change.
+Stabilization is tracked in a public issue linked from the docs; flipping to stable is itself a changelog-worthy change.
 
 ## Consequences
 
-- We can refine flags, output, config, and the IR based on real adoption without breaking-change
-  apologies — the experimental label sets that expectation up front.
-- The cost is the usual one: some teams defer adopting experimental tooling. For a _codegen_ tool the
-  risk is low — the output lives in the consumer's repo and the version can be pinned.
-- "Experimental" must not become permanent: the criteria above are the explicit exit, and graduating
-  to `1.0.0` (with the docs disclaimers dropped) is the signal that they have been met.
+- We can refine flags, output, config, and the IR based on real adoption without breaking-change apologies — the experimental label sets that expectation up front.
+- The cost is the usual one: some teams defer adopting experimental tooling. For a _codegen_ tool the risk is low — the output lives in the consumer's repo and the version can be pinned.
+- "Experimental" must not become permanent: the criteria above are the explicit exit, and graduating to `1.0.0` (with the docs disclaimers dropped) is the signal that they have been met.
 - This ADR is the canonical record of the status; superseded when the feature is declared stable.
diff --git a/packages/openapi-typescript/docs/adr/README.md b/packages/openapi-typescript/docs/adr/README.md
index d2112f209b..30e0493e3b 100644
--- a/packages/openapi-typescript/docs/adr/README.md
+++ b/packages/openapi-typescript/docs/adr/README.md
@@ -1,12 +1,11 @@
 # Architecture Decision Records
 
-Immutable, point-in-time records of the significant, hard-to-reverse decisions behind
-`@redocly/openapi-typescript`. Each ADR captures the **context**, the **decision**, and its
-**consequences** at the time it was made. ADRs are not edited as the code evolves — when a decision is
-revisited, add a new ADR that supersedes the old one (and mark the old one `Superseded by ADR-NNNN`).
+Immutable, point-in-time records of the significant, hard-to-reverse decisions behind `@redocly/openapi-typescript`.
+Each ADR captures the **context**, the **decision**, and its **consequences** at the time it was made.
+ADRs are not edited as the code evolves — when a decision is revisited, add a new ADR that supersedes the old one (and mark the old one `Superseded by ADR-NNNN`).
 
-For the **descriptive** map of how the package is built today (pipeline, module map, seams), see
-[`../../ARCHITECTURE.md`](../../ARCHITECTURE.md). ARCHITECTURE.md says _what is_; these ADRs say _why_.
+For the **descriptive** map of how the package is built today (pipeline, module map, seams), see [`../../ARCHITECTURE.md`](../../ARCHITECTURE.md).
+ARCHITECTURE.md says _what is_; these ADRs say _why_.
 
 ## Index
 

From 2e5ae8d396f7a024154113e368c92916b6447fd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20=C5=81=C4=99kawa?=
 <164185257+JLekawa@users.noreply.github.com>
Date: Wed, 17 Jun 2026 19:08:27 +0200
Subject: [PATCH 003/134] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jacek Łękawa <164185257+JLekawa@users.noreply.github.com>
---
 .changeset/openapi-typescript.md |  2 +-
 CONTRIBUTING.md                  | 22 ++++++++++++++--------
 README.md                        | 13 +++++--------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/.changeset/openapi-typescript.md b/.changeset/openapi-typescript.md
index e73a325d73..1bcf06ece8 100644
--- a/.changeset/openapi-typescript.md
+++ b/.changeset/openapi-typescript.md
@@ -3,4 +3,4 @@
 '@redocly/cli': minor
 ---
 
-Add the `generate-client` command (**experimental**): generate a typed, zero-dependency TypeScript client from an OpenAPI description.
+Added an **experimental** `generate-client` command that generates a typed, zero-dependency TypeScript client from an OpenAPI description.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 49f229932a..598d9dada0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -240,7 +240,7 @@ The root configuration is in [`vitest.config.ts`](./vitest.config.ts) and define
 - Repo-wide minimum coverage thresholds, plus optional per-glob overrides for packages that want stricter limits.
 
 Vitest globals (`describe`, `it`, `expect`, `vi`, `beforeEach`, `afterEach`, …) are enabled and the TypeScript types for them are provided through [`tsconfig.json`](./tsconfig.json)'s `"types": ["vitest/globals", "node"]`.
-Do **not** add `import { describe, it, expect } from 'vitest'` to test files — those names are already in scope.
+Do **not** add `import { describe, it, expect } from 'vitest'` to test files — these names are already in scope.
 
 ### Where tests live
 
@@ -258,13 +258,15 @@ packages/<your-package>/
         thing.test.ts
 ```
 
-The root config automatically picks them up; no additional wiring is needed for **discovery**.
+The root config picks up the test files automatically.
+There is no need to add additional wiring for **discovery**.
 
 ### Adding tests for a new package
 
-When introducing a new package under `packages/`, do the following to plug it into the existing test infrastructure:
+When introducing a new package under `packages/`, plug it into the existing test infrastructure:
 
-1. Author tests under `packages/<your-package>/src/**/__tests__/*.test.ts`. Use the Vitest globals — no imports from `'vitest'`.
+1. Author tests under `packages/<your-package>/src/**/__tests__/*.test.ts`.
+    Use the Vitest globals — no imports from `'vitest'`.
 2. Open the root [`vitest.config.ts`](./vitest.config.ts) and append your package's source glob to `coverage.include`, for example:
 
    ```typescript
@@ -277,7 +279,7 @@ When introducing a new package under `packages/`, do the following to plug it in
    ```
 
 3. If your package contains pure type-definition modules (files that compile to empty `.js` like `types.ts` or `model.ts`), add them to `coverage.exclude` so they don't dilute the coverage signal.
-4. Optionally enforce stricter per-file coverage for your package using a per-glob threshold alongside the repo-wide minimums:
+4. (Optional) Enforce stricter per-file coverage for your package using a per-glob threshold alongside the repo-wide minimums:
 
    ```typescript
    thresholds: {
@@ -294,12 +296,13 @@ When introducing a new package under `packages/`, do the following to plug it in
    },
    ```
 
-5. Do not declare `vitest` or `@vitest/coverage-istanbul` in the new package's `package.json`. They are workspace-wide dev dependencies, installed once at the root.
+5. Do not declare `vitest` or `@vitest/coverage-istanbul` in the new package's `package.json`.
+    These are workspace-wide dev dependencies, installed once at the root.
 
 ### Unit tests
 
 Run unit tests with this command: `npm run unit`.
-This runs the suite for every package whose tests match the discovery glob — there is no per-package `npm test` script.
+This command runs the suite for every package whose tests match the discovery glob — there is no per-package `npm test` script.
 
 Unit tests in the **cli** package are sensitive to top-level configuration file (**redocly.yaml**).
 
@@ -315,7 +318,10 @@ Run e2e tests with this command: `npm run e2e`.
 
 E2E tests are sensitive to any additional output (like `console.log`) in the source code.
 
-To update snapshots, run `npm run e2e -- -u`. This includes the file-based snapshots used by some tests via `toMatchFileSnapshot` (for example, `tests/e2e/generate-client/cafe.snapshot.ts` — the committed full-file output of the TypeScript client generator). Always review snapshot diffs in the pull request to confirm the change is intentional.
+To update snapshots, run `npm run e2e -- -u`.
+This command includes the file-based snapshots used by some tests via `toMatchFileSnapshot`.
+For example, `tests/e2e/generate-client/cafe.snapshot.ts` is the committed full-file output of the TypeScript client generator.
+Always review snapshot diffs in the pull request to confirm the change is intentional.
 
 If you made any changes, make sure to compile the code before running the tests.
 
diff --git a/README.md b/README.md
index 8c8ee6e1c9..affe7ef399 100644
--- a/README.md
+++ b/README.md
@@ -143,19 +143,16 @@ Learn more about [Respect](https://redocly.com/respect) and [get started with AP
 
 > ⚠️ **Experimental** — flags, output, and configuration may change in any minor release until declared stable.
 
-Turn an OpenAPI description (3.0/3.1/3.2 or Swagger 2.0) into a typed TypeScript client with the
-`generate-client` command. The emitted client has **zero runtime dependencies** — it uses only
-web-standard APIs (`fetch`, `AbortController`, …), so it runs in browsers, Node, Bun, Deno, and edge
-runtimes.
+Turn an OpenAPI description (3.0/3.1/3.2 or Swagger 2.0) into a typed TypeScript client with the `generate-client` command.
+The emitted client has **zero runtime dependencies** — it uses only web-standard APIs (`fetch`, `AbortController`, …), so it runs in browsers, Node, Bun, Deno, and edge runtimes.
 
 ```sh
 redocly generate-client openapi.yaml --output src/client.ts
 ```
 
-Inline types plus one async function per operation (or `--facade service-class` for class methods),
-with auth, opt-in abort-aware retries, middleware, and typed Server-Sent Events. The same command can
-also emit Zod schemas, TanStack Query / SWR hooks, MSW mocks, and more via `--generators`.
-[Read the `generate-client` docs](./docs/@v2/commands/generate-client.md).
+Inline types plus one async function per operation (or `--facade service-class` for class methods), with auth, opt-in abort-aware retries, middleware, and typed Server-Sent Events.
+The same command can also emit Zod schemas, TanStack Query / SWR hooks, MSW mocks, and more via `--generators`.
+For detailed information, read the [ `generate-client` docs](./docs/@v2/commands/generate-client.md).
 
 ### Transform an OpenAPI description
 

From ae5cebecba6be9fce7e7da6b61da7b2c60c612e5 Mon Sep 17 00:00:00 2001
From: JLekawa <jacek.lekawa@redocly.com>
Date: Wed, 17 Jun 2026 19:40:41 +0200
Subject: [PATCH 004/134] docs(cli): fix Markdoc errors, fix formatting

---
 docs/@v2/commands/generate-client.md | 137 ++++++++++++++++++---------
 1 file changed, 92 insertions(+), 45 deletions(-)

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index 521c9f2407..77b86431a5 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -41,15 +41,17 @@ redocly generate-client cafe -o src/client.ts
 
 ---
 
-- `input` {% required=true %}
+- `input`
 - `string`
-- Positional argument: OpenAPI description file path, or an alias from the `apis:` section of `redocly.yaml`.
+- **REQUIRED.**
+  Positional argument: OpenAPI description file path, or an alias from the `apis:` section of `redocly.yaml`.
 
 ---
 
-- `--output`, `-o` {% required=true %}
+- `--output`, `-o`
 - `string`
-- Output path for the generated client. Must end in `.ts`.
+- **REQUIRED.**
+  Output path for the generated client. Must end in `.ts`.
   In multi-file modes it is the entry file; sibling files derive from its name and directory.
 
 ---
@@ -75,25 +77,31 @@ redocly generate-client cafe -o src/client.ts
 
 - `--query-framework`
 - `string`
-- TanStack Query adapter the `tanstack-query` generator imports from: `react` (default), `vue`, `svelte`, or `solid`. Only the import specifier changes — the emitted factory module is byte-identical across frameworks.
+- TanStack Query adapter the `tanstack-query` generator imports from: `react` (default), `vue`, `svelte`, or `solid`.
+  Only the import specifier changes — the emitted factory module is byte-identical across frameworks.
 
 ---
 
 - `--mock-data`
 - `string`
-- How the `mock` generator produces data: `baked` (default) inlines deterministic literals (zero runtime dependency); `faker` emits `@faker-js/faker` calls for realistic data (install `@faker-js/faker` as a dev dependency).
+- How the `mock` generator produces data: `baked` (default) inlines deterministic literals (zero runtime dependency).
+  `faker` emits `@faker-js/faker` calls for realistic data (install `@faker-js/faker` as a dev dependency).
 
 ---
 
 - `--mock-seed`
 - `number`
-- Seed for faker-mode mocks: emits a top-level `faker.seed(<n>)` so generated data is reproducible across runs. Ignored in `baked` mode.
+- Seed for faker-mode mocks: emits a top-level `faker.seed(<n>)` so generated data is reproducible across runs.
+  Ignored in `baked` mode.
 
 ---
 
 - `--date-type`
 - `string`
-- How `date-time`/`date` string fields are typed: `string` (default) keeps the ISO wire shape, byte-identical to before; `Date` emits a `Date` instead. Pair `--date-type Date` with `--generators sdk,transformers` so the runtime value (parsed by `transform<Name>`) matches the type. `int64` → `bigint` is deferred to a follow-up.
+- How `date-time`/`date` string fields are typed: `string` (default) keeps the ISO wire shape, byte-identical to before.
+  `Date` emits a `Date` instead.
+  Pair `--date-type Date` with `--generators sdk,transformers` so the runtime value (parsed by `transform<Name>`) matches the type.
+  `int64` → `bigint` is deferred to a follow-up.
 
 ---
 
@@ -111,7 +119,8 @@ redocly generate-client cafe -o src/client.ts
 
 - `--args-style`
 - `string`
-- How operation inputs are passed: `flat` (default) spreads path params as positional arguments followed by `params`/`body`/`headers`; `grouped` bundles every input into a single `vars` object (typed as the operation's `<Op>Variables`). The per-call request `init` stays a separate trailing argument in both styles.
+- How operation inputs are passed: `flat` (default) spreads path params as positional arguments followed by `params`/`body`/`headers`; `grouped` bundles every input into a single `vars` object (typed as the operation's `<Op>Variables`).
+  The per-call request `init` stays a separate trailing argument in both styles.
 
 ---
 
@@ -123,25 +132,29 @@ redocly generate-client cafe -o src/client.ts
 
 - `--error-mode`
 - `string`
-- Error-handling shape: `throw` (default) throws `ApiError` on a non-2xx response; `result` returns a discriminated `{ data, error, response }` object instead, with `error` typed from the spec's 4xx/5xx response bodies.
+- Error-handling shape: `throw` (default) throws `ApiError` on a non-2xx response.
+  `result` returns a discriminated `{ data, error, response }` object instead, with `error` typed from the spec's 4xx/5xx response bodies.
 
 ---
 
 - `--base-url`
 - `string`
-- Override the `BASE` URL inlined into the generated runtime. Defaults to `servers[0].url` from the description. Must be a valid URL.
+- Override the `BASE` URL inlined into the generated runtime.
+  Defaults to `servers[0].url` from the description. Must be a valid URL.
 
 ---
 
 - `--config`
 - `string`
-- Path to the `redocly.yaml` configuration file (where the `x-openapi-typescript` block lives). Defaults to the `redocly.yaml` discovered in the working directory.
+- Path to the `redocly.yaml` configuration file (where the `x-openapi-typescript` block lives).
+  Defaults to the `redocly.yaml` discovered in the working directory.
 
 ---
 
 - `--config-file`
 - `string`
-- Path to a dedicated `defineConfig` config file (`*.config.ts`/`.mjs`/`.js`), as an alternative to the `redocly.yaml` `x-openapi-typescript` block. Useful when the config lives outside the project or in a nested folder.
+- Path to a dedicated `defineConfig` config file (`*.config.ts`/`.mjs`/`.js`), as an alternative to the `redocly.yaml` `x-openapi-typescript` block.
+  Useful when the config lives outside the project or in a nested folder.
 
 {% /table %}
 
@@ -160,7 +173,7 @@ x-openapi-typescript:
   facade: service-class
 ```
 
-Then simply run:
+Then run:
 
 ```sh
 redocly generate-client
@@ -224,7 +237,8 @@ A setter is generated for each `securityScheme` the runtime can apply, and each
 | `apiKey` in query      | `setApiKey(key)` / `setApiKey<Name>(key)` | the named URL query parameter   |
 | `apiKey` in cookie     | `setApiKey(key)` / `setApiKey<Name>(key)` | folded into the `Cookie` header |
 
-`setApiKey` is unsuffixed when the spec declares a single apiKey scheme; otherwise each gets a `setApiKey<SchemeName>` setter.
+`setApiKey` is unsuffixed when the spec declares a single apiKey scheme.
+Otherwise, each gets a `setApiKey<SchemeName>` setter.
 `mutualTLS` is not injectable.
 
 Bearer and apiKey credentials accept a **`TokenProvider`** — a string, or a (possibly async) function called per request, which is handy for refresh-token flows:
@@ -281,7 +295,8 @@ const order = await updateOrder({
 });
 ```
 
-The grouped style is order-independent and additive — new path or query params show up as new keys rather than shifting positions — which makes it a good fit as specs evolve and for wiring operations into React Query / SWR `mutationFn`s.
+The grouped style is order-independent and additive — new path or query params show up as new keys rather than shifting positions.
+This strategy makes it a good fit as specs evolve and for wiring operations into React Query / SWR `mutationFn`s.
 Operations with no inputs take no `vars` object at all (just the optional `init`).
 
 ```sh
@@ -538,12 +553,14 @@ Retries stop immediately when the request's `AbortSignal` aborts.
 
 {% /table %}
 
-A per-call override is merged field-by-field over the global policy, so a single field (such as `retries: 0`) can disable retry for one call without restating the whole policy.
+A per-call override is merged field-by-field over the global policy.
+A single field (such as `retries: 0`) can disable retry for one call without restating the whole policy.
 
 ### Custom `retryOn`
 
 `retryOn` receives a `RetryContext` for the attempt that just failed and returns whether to retry.
-A custom predicate **fully replaces** the idempotent-only default — so it is also how you opt a `POST`/`PATCH` into retrying (the method is no longer checked for you).
+A custom predicate **fully replaces** the idempotent-only default.
+This way you opt a `POST`/`PATCH` into retrying (the method is no longer checked for you).
 
 {% table %}
 
@@ -567,13 +584,15 @@ A custom predicate **fully replaces** the idempotent-only default — so it is a
 
 - `response`
 - `Response | undefined`
-- Present when the server returned a (non-ok) response. Absent on a transport error.
+- Present when the server returned a (non-ok) response.
+  Absent on a transport error.
 
 ---
 
 - `error`
 - `unknown`
-- Present when the transport threw (network error, DNS, connection reset). Absent on an HTTP response.
+- Present when the transport threw (network error, DNS, connection reset).
+  Absent on an HTTP response.
 
 {% /table %}
 
@@ -607,12 +626,14 @@ await pushRemoteContent(
 
 {% admonition type="warning" name="Read the body via clone()" %}
 `ctx.response` is the raw `Response` — its body can be read only once.
-Always inspect it through `ctx.response.clone()`; calling `.json()`/`.text()` on `ctx.response` directly consumes the stream and the client can no longer decode the result.
+Always inspect it through `ctx.response.clone()`.
+Calling `.json()`/`.text()` on `ctx.response` directly consumes the stream and the client can no longer decode the result.
 {% /admonition %}
 
 ## Multipart uploads
 
-A `multipart/form-data` request body whose schema is an **object** is generated as a typed object — you pass a plain object and the client serializes it to `FormData` for you.
+A `multipart/form-data` request body whose schema is an **object** is generated as a typed object.
+When you pass a plain object, the client serializes it to `FormData` for you.
 Binary fields (`type: string, format: binary`) are typed as `Blob` (a `File` is assignable):
 
 ```ts
@@ -620,8 +641,15 @@ Binary fields (`type: string, format: binary`) are typed as `Blob` (a `File` is
 await upload({ file, orgId: 'org_1', tags: ['a', 'b'] });
 ```
 
-Serialization rules: `Blob`/`File` and strings pass through; arrays append one field per item; nested objects are JSON-encoded; other scalars are stringified; `undefined`/`null` are skipped.
-A multipart body whose schema **isn't** a concrete object keeps the raw `FormData` type, so you can build the form yourself when the shape can't be expressed.
+Serialization rules: 
+- `Blob`/`File` and strings pass through
+- arrays append one field per item
+- nested objects are JSON-encoded
+- other scalars are stringified
+- `undefined`/`null` are skipped
+
+A multipart body whose schema **isn't** a concrete object keeps the raw `FormData` type. 
+You can build the form yourself when the shape can't be expressed.
 
 `format: binary` surfaces as `Blob` wherever it appears; `format: byte` (base64) stays a `string`.
 
@@ -642,8 +670,8 @@ for await (const chunk of res as ReadableStream<Uint8Array>) {
 
 {% admonition type="warning" name="Runtime override only" %}
 `parseAs` does not change the operation's static return type.
-Forcing a reader that disagrees with the schema (for example `'blob'` on a JSON endpoint) returns that value at runtime while TypeScript
-still reports the declared type; reconciling the two is the caller's responsibility.
+Forcing a reader that disagrees with the schema (for example `'blob'` on a JSON endpoint) returns that value at runtime while TypeScript still reports the declared type.
+Reconciling the two is the caller's responsibility.
 {% /admonition %}
 
 ## Runtime validation with Zod
@@ -691,8 +719,10 @@ redocly generate-client openapi.yaml --output src/client.ts \
   --generators sdk,tanstack-query --query-framework vue
 ```
 
-Per **query** operation (`GET`/`HEAD`) the module exports a `<op>QueryKey(vars)` and a `<op>Options(vars, init?)` factory that returns `queryOptions({ queryKey, queryFn })`; per **mutation** (every other method) it exports a `<op>Mutation()` factory returning `{ mutationKey, mutationFn }`.
+Per **query** operation (`GET`/`HEAD`) the module exports a `<op>QueryKey(vars)` and a `<op>Options(vars, init?)` factory that returns `queryOptions({ queryKey, queryFn })`.
+Per **mutation** (every other method), it exports a `<op>Mutation()` factory returning `{ mutationKey, mutationFn }`.
 Each factory forwards to the matching sdk function, so the generated client itself stays dependency-free.
+
 Compose them with `useQuery`/`useMutation`:
 
 ```ts
@@ -715,11 +745,15 @@ npm install @tanstack/react-query   # ^5  (or @tanstack/vue-query, /svelte-query
 Select the framework with `--query-framework` (`react` default, `vue`, `svelte`, `solid`).
 Only the import specifier the module reads from changes — the emitted factory module is otherwise **byte-identical** across frameworks, since TanStack Query's `queryOptions`/mutation shapes are framework-agnostic.
 
-The factories wrap the **throw-mode** sdk (the default): TanStack's `queryFn` is expected to throw on error, so use the default (throw-mode) client — a `--error-mode result` client would need an unwrap-and-throw shim, which is out of scope.
+The factories wrap the **throw-mode** sdk (the default): TanStack's `queryFn` is expected to throw on error.
+Use the default (throw-mode) client — a `--error-mode result` client would need an unwrap-and-throw shim, which is out of scope.
 
 {% admonition type="info" name="Compatibility" %}
-`tanstack-query` wraps the sdk's exported throw-mode functions, so it requires `--generators sdk`, `--facade functions`, and `--error-mode throw`. An incompatible selection fails fast with an explanatory message rather than emitting a client that won't compile.
-Server-Sent-Events operations have no request/response function to wrap (you consume them via the sdk's `sse.*` surface), so they are **skipped** with a notice — the rest of the operations are still generated.
+`tanstack-query` wraps the sdk's exported throw-mode functions, so it requires `--generators sdk`, `--facade functions`, and `--error-mode throw`.
+An incompatible selection fails fast with an explanatory message rather than emitting a client that doesn't compile.
+
+Server-Sent-Events operations have no request/response function to wrap: you consume them via the sdk's `sse.*` surface.
+These operations they are **skipped** with a notice, and the rest of the operations are still generated.
 {% /admonition %}
 
 ## SWR
@@ -731,7 +765,8 @@ redocly generate-client openapi.yaml --output src/client.ts --generators sdk,swr
 # → src/client.ts (the zero-dependency client) + src/client.swr.ts (the SWR hooks)
 ```
 
-Each **query** operation (`GET`/`HEAD`) exports a `<op>Key(vars)` tuple factory and a `use<Op>(vars, init?)` hook returning `useSWR(key, fetcher)`; each **mutation** exports a `use<Op>()` hook returning `useSWRMutation(key, trigger)`.
+Each **query** operation (`GET`/`HEAD`) exports a `<op>Key(vars)` tuple factory and a `use<Op>(vars, init?)` hook returning `useSWR(key, fetcher)`.
+Each **mutation** exports a `use<Op>()` hook returning `useSWRMutation(key, trigger)`.
 Call them straight from a component:
 
 ```ts
@@ -742,7 +777,8 @@ const { trigger } = useCreatePet();
 await trigger({ body: { name: 'Rex' } });
 ```
 
-The generated client stays dependency-free; only the `*.swr.ts` module imports SWR (`swr` for queries, `swr/mutation` for mutations).
+The generated client stays dependency-free.
+Only the `*.swr.ts` module imports SWR (`swr` for queries, `swr/mutation` for mutations).
 Install it in your app as a peer — any `swr` `^2`:
 
 ```sh
@@ -751,7 +787,7 @@ npm install swr   # ^2
 
 {% admonition type="info" name="Compatibility" %}
 The hooks wrap the **throw-mode** sdk (the default), since SWR's fetcher is expected to throw an error.
-`swr` requires `--generators sdk`, `--facade functions`, and `--error-mode throw`. 
+`swr` requires `--generators sdk`, `--facade functions`, and `--error-mode throw`.
 An incompatible selection fails fast.
 SSE operations are **skipped** with a notice (consume them via the sdk's `sse.*` surface).
 {% /admonition %}
@@ -782,10 +818,9 @@ The transformers module imports only the schema **types** from the client, so th
 `int64` → `bigint` is deferred to a follow-up; without `--date-type Date` the date fields stay `string` and the output is byte-identical to before.
 
 {% admonition type="info" name="Compatibility" %}
-`transformers` requires `--generators sdk` and `--date-type Date`: it assigns `Date` values to the
-sdk's date fields, so it only type-checks when the sdk types them as `Date`. Selecting it without
-`--date-type Date` fails fast with an explanatory message rather than emitting a module that won't
-compile.
+`transformers` requires `--generators sdk` and `--date-type Date`.
+`transformers` assigns `Date` values to the sdk's date fields, so it only type-checks when the sdk types them as `Date`.
+Selecting it without `--date-type Date` fails fast with an explanatory message rather than emitting a module that doesn't compile.
 {% /admonition %}
 
 ## MSW mocks
@@ -797,7 +832,8 @@ redocly generate-client openapi.yaml --output src/client.ts --generators sdk,moc
 # → src/client.ts (the zero-dependency client) + src/client.mocks.ts (MSW handlers + factories)
 ```
 
-Each handler intercepts its operation's method + path and responds with a fixture baked from the spec (prefers `example`/`default`; `format: binary` → `new Blob([])`; recursive schemas terminate at the cycle with an empty array/record).
+Each handler intercepts its operation's method + path and responds with a fixture baked from the spec (prefers `example`/`default`; `format: binary` → `new Blob([])`.
+Recursive schemas terminate at the cycle with an empty array/record).
 Each `create<Schema>` factory builds the same default object and merges in any `overrides`, so factories double as test builders:
 
 ```ts
@@ -824,7 +860,9 @@ redocly generate-client openapi.yaml --output src/client.ts \
 ```
 
 {% admonition type="info" name="Compatibility" %}
-`mock` requires `--generators sdk` (the factories reference its types). Install MSW in your app as a dev dependency (`msw` `^2`); for `--mock-data faker`, also install `@faker-js/faker`.
+`mock` requires `--generators sdk` (the factories reference its types).
+Install MSW in your app as a dev dependency (`msw` `^2`).
+For `--mock-data faker`, also install `@faker-js/faker`.
 The generated client itself stays dependency-free — only the `*.mocks.ts` module imports them.
 {% /admonition %}
 
@@ -861,9 +899,14 @@ export default defineGenerator({
 
 The `@redocly/openapi-typescript/plugin` entry also exports the **codegen toolkit** the built-in generators use — `ts` (the `ts.factory` wrapper), `printStatements`, `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, `safeIdent` — and the IR types (`ApiModel`, `OperationModel`, `SchemaModel`, …), so a custom generator can emit TypeScript exactly as the first-party ones do.
 
-### Selecting a custom generator
+### Select a custom generator
+
+A `generators` entry that is not a built-in name is either:
+- an **inline** generator (registered via `customGenerators` in a `defineConfig` file)
+- an **import specifier** — a path (resolved against the config's directory)
+- an installed package — that default-exports the generator
 
-A `generators` entry that is not a built-in name is either an **inline** generator (registered via `customGenerators` in a `defineConfig` file) or an **import specifier** — a path (resolved against the config's directory) or an installed package — that default-exports the generator:
+For example:
 
 ```yaml
 # redocly.yaml — by path or by published package
@@ -893,14 +936,18 @@ A worked example lives in [`examples/custom-generator`](https://github.com/Redoc
 
 {% admonition type="info" name="Compatibility & trust" %}
 A custom generator declares the same `requires` / `facades` / `errorModes` / `dateTypes` contract as the built-ins, validated up front — an incompatible selection, a name that collides with another generator, or an unloadable specifier fails fast with an actionable message.
-The generated client stays dependency-free: a generator's output is its own file(s), and any libraries it targets are peers of _your app_.
-Import-specifier generators execute at generation time — the same trust level as any installed dependency or `defineConfig` file.
+The generated client stays dependency-free. 
+A generator's output is its own file(s), and any libraries it targets are peers of _your app_.
+Import-specifier generators execute at generation time.'
+It has the same trust level as any installed dependency or `defineConfig` file.
 {% /admonition %}
 
 ## Server-Sent Events (streaming)
 
-An operation whose `2xx` response declares `text/event-stream` is generated as a typed async iterator under an `sse` namespace instead of as a regular call — no flag is required; it is detected from the description.
-Each event's `data` is typed from the OpenAPI 3.2 `itemSchema` (falling back to the media `schema`, then `string`); when the payload is a structured type the runtime `JSON.parse`s `data` for you, otherwise it passes the raw string.
+An operation whose `2xx` response declares `text/event-stream` is generated as a typed async iterator under an `sse` namespace instead of as a regular call — no flag is required.
+It is detected from the description.
+Each event's `data` is typed from the OpenAPI 3.2 `itemSchema` (falling back to the media `schema`, then `string`).
+When the payload is a structured type the runtime `JSON.parse`s `data` for you, otherwise it passes the raw string.
 
 ```ts
 import { sse } from './client.ts';

From 3f3846659616be6878b1672fc3592ad94e980d0a Mon Sep 17 00:00:00 2001
From: JLekawa <jacek.lekawa@redocly.com>
Date: Thu, 18 Jun 2026 12:17:52 +0200
Subject: [PATCH 005/134] docs(realm): fix redirect error

---
 docs/@v2/rules/oas/request-mime-type.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/@v2/rules/oas/request-mime-type.md b/docs/@v2/rules/oas/request-mime-type.md
index 5521974d60..c0216028b7 100644
--- a/docs/@v2/rules/oas/request-mime-type.md
+++ b/docs/@v2/rules/oas/request-mime-type.md
@@ -1,5 +1,5 @@
 ---
-slug: /docs/cli/rules/oas/request-mine-type
+slug: /docs/cli/rules/oas/request-mime-type
 ---
 
 # request-mime-type

From 1adbf1ef365278ecfe56c62c4602fa157e6952aa Mon Sep 17 00:00:00 2001
From: JLekawa <jacek.lekawa@redocly.com>
Date: Thu, 18 Jun 2026 12:27:51 +0200
Subject: [PATCH 006/134] docs(cli): fix redirect error

---
 docs/@v1/rules/oas/request-mime-type.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/@v1/rules/oas/request-mime-type.md b/docs/@v1/rules/oas/request-mime-type.md
index 4033f88965..b07589f64d 100644
--- a/docs/@v1/rules/oas/request-mime-type.md
+++ b/docs/@v1/rules/oas/request-mime-type.md
@@ -1,5 +1,5 @@
 ---
-slug: /docs/cli/v1/rules/oas/request-mine-type
+slug: /docs/cli/v1/rules/oas/request-mime-type
 ---
 
 # request-mime-type

From 0d974de39885280343882cf2d4b442cb18643938 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 22 Jun 2026 14:06:45 +0300
Subject: [PATCH 007/134] fix(openapi-typescript): point examples at the spec
 server + add testing docs

Switch the runnable examples and the cafe e2e fixture/snapshot to the spec's
`servers[0].url` (api.cafe.redocly.com), regenerated with the current generator.
Demonstrate middleware in the fetch-functions example via `onResponse` so it
isn't blocked by the demo API's CORS preflight (it doesn't allow a custom
`X-Request-Id` request header). Add a "Testing the generated client" section to
the README (Node / browser-CORS / MSW mocks).
---
 packages/openapi-typescript/README.md         | 41 +++++++++++++++++++
 .../examples/custom-generator/openapi.yaml    |  8 ++--
 .../custom-generator/src/api/client.ts        |  2 +-
 .../examples/custom-generator/src/main.ts     |  2 +-
 .../examples/fetch-functions/openapi.yaml     |  8 ++--
 .../fetch-functions/src/api/client.ts         |  2 +-
 .../examples/fetch-functions/src/main.ts      | 19 +++++----
 .../examples/mock/openapi.yaml                |  8 ++--
 .../examples/mock/src/api/client.ts           |  2 +-
 .../examples/mock/src/main.ts                 |  8 +++-
 .../examples/programmatic/openapi.yaml        |  8 ++--
 .../examples/programmatic/src/api/client.ts   |  2 +-
 .../examples/programmatic/src/main.ts         |  2 +-
 .../examples/service-class/openapi.yaml       |  8 ++--
 .../examples/service-class/src/api/client.ts  |  2 +-
 .../examples/service-class/src/main.ts        |  2 +-
 .../examples/tanstack-query/openapi.yaml      |  8 ++--
 .../examples/tanstack-query/src/App.tsx       |  2 +-
 .../examples/tanstack-query/src/api/client.ts |  2 +-
 .../examples/zod/openapi.yaml                 |  8 ++--
 .../examples/zod/src/api/client.ts            |  2 +-
 .../examples/zod/src/main.ts                  |  2 +-
 tests/e2e/generate-client/cafe.snapshot.ts    |  2 +-
 tests/e2e/generate-client/fixtures/cafe.yaml  |  8 ++--
 24 files changed, 104 insertions(+), 54 deletions(-)

diff --git a/packages/openapi-typescript/README.md b/packages/openapi-typescript/README.md
index 22342d94e2..d6e44b6aa7 100644
--- a/packages/openapi-typescript/README.md
+++ b/packages/openapi-typescript/README.md
@@ -159,6 +159,47 @@ import { OPERATIONS, getOrderById } from './client.ts';
 const queryKey = [OPERATIONS.getOrderById.path, orderId]; // "/orders/{orderId}"
 ```
 
+## Testing the generated client
+
+The client is plain `fetch` code, so you test it like any HTTP code — there is no special harness.
+
+**In Node** (scripts, Vitest/Jest) there is **no CORS** — point it at any reachable API and call it:
+
+```ts
+import { configure, listMenuItems } from './client.ts';
+
+configure({ baseUrl: 'https://api.example.com' });
+const items = await listMenuItems(); // resolves or throws ApiError
+```
+
+**In the browser, CORS applies** — and it's the **target API's** policy, not the client's. Two things
+to watch:
+
+- The API must allow your origin (`Access-Control-Allow-Origin`).
+- Any **custom request header** you add (e.g. `X-Request-Id` via `use({ onRequest })` middleware)
+  triggers a **CORS preflight**, so the API must also list that header in `Access-Control-Allow-Headers`
+  — otherwise the browser blocks the request and `fetch` throws `TypeError: Failed to fetch`. If the
+  API doesn't allow it, drop the header, use a dev proxy (e.g. Vite's `server.proxy`), or mock the API.
+
+**Without a backend (recommended for tests and local dev), use MSW mocks.** Add `mock` to
+`generators` to emit an MSW handler module; requests are intercepted in-process, so there's **no real
+network and no CORS** — the same client runs unchanged against the mocks:
+
+```ts
+import { setupServer } from 'msw/node'; // or 'msw/browser' for the browser
+import { handlers } from './client.mocks.ts';
+
+const server = setupServer(...handlers);
+beforeAll(() => server.listen());
+afterAll(() => server.close());
+
+// now calls to the generated client resolve from the mocks
+```
+
+The repo's [`examples/`](./examples) are runnable end-to-end: `npm install && npm run dev` in an
+example directory serves it on `http://localhost:5173` against the live demo API (a CORS-enabled
+`GET`), and `examples/mock` shows the MSW-backed flow.
+
 ## Generators
 
 `generators` (default `['sdk']`) selects which files to emit.
diff --git a/packages/openapi-typescript/examples/custom-generator/openapi.yaml b/packages/openapi-typescript/examples/custom-generator/openapi.yaml
index a6a75dffd0..a255b72a20 100644
--- a/packages/openapi-typescript/examples/custom-generator/openapi.yaml
+++ b/packages/openapi-typescript/examples/custom-generator/openapi.yaml
@@ -13,7 +13,7 @@ info:
     url: https://opensource.org/licenses/MIT
   termsOfService: https://redocly.com/subscription-agreement
 servers:
-  - url: https://cafe.cloud.redocly.com
+  - url: https://api.cafe.redocly.com
     description: Live server.
 tags:
   - name: Authorization
@@ -515,15 +515,15 @@ components:
       description: OAuth2 authorization for API access.
       flows:
         authorizationCode:
-          authorizationUrl: https://cafe.cloud.redocly.com/oauth2/authorize
-          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          authorizationUrl: https://api.cafe.redocly.com/oauth2/authorize
+          tokenUrl: https://api.cafe.redocly.com/oauth2/token
           scopes:
             menu:read: Read access to menu items and images
             menu:write: Write access to menu items (create, delete)
             orders:read: Read access to orders
             orders:write: Write access to orders (create, update, delete)
         clientCredentials:
-          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          tokenUrl: https://api.cafe.redocly.com/oauth2/token
           scopes:
             menu:read: Read access to menu items and images
             menu:write: Write access to menu items (create, delete)
diff --git a/packages/openapi-typescript/examples/custom-generator/src/api/client.ts b/packages/openapi-typescript/examples/custom-generator/src/api/client.ts
index dcb4900f7c..89486e000c 100644
--- a/packages/openapi-typescript/examples/custom-generator/src/api/client.ts
+++ b/packages/openapi-typescript/examples/custom-generator/src/api/client.ts
@@ -446,7 +446,7 @@ export type OperationMetadata = {
     readonly path: string;
 };
 
-let BASE = "https://cafe.cloud.redocly.com";
+let BASE = "https://api.cafe.redocly.com";
 
 /** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
 export type RequestContext = {
diff --git a/packages/openapi-typescript/examples/custom-generator/src/main.ts b/packages/openapi-typescript/examples/custom-generator/src/main.ts
index 37a659680a..8cd0f89024 100644
--- a/packages/openapi-typescript/examples/custom-generator/src/main.ts
+++ b/packages/openapi-typescript/examples/custom-generator/src/main.ts
@@ -3,7 +3,7 @@
 import { configure, listMenuItems } from './api/client';
 import { routes } from './api/client.routes';
 
-configure({ baseUrl: 'https://cafe.cloud.redocly.com' });
+configure({ baseUrl: 'https://api.cafe.redocly.com' });
 
 const out = document.querySelector<HTMLPreElement>('#out')!;
 
diff --git a/packages/openapi-typescript/examples/fetch-functions/openapi.yaml b/packages/openapi-typescript/examples/fetch-functions/openapi.yaml
index a6a75dffd0..a255b72a20 100644
--- a/packages/openapi-typescript/examples/fetch-functions/openapi.yaml
+++ b/packages/openapi-typescript/examples/fetch-functions/openapi.yaml
@@ -13,7 +13,7 @@ info:
     url: https://opensource.org/licenses/MIT
   termsOfService: https://redocly.com/subscription-agreement
 servers:
-  - url: https://cafe.cloud.redocly.com
+  - url: https://api.cafe.redocly.com
     description: Live server.
 tags:
   - name: Authorization
@@ -515,15 +515,15 @@ components:
       description: OAuth2 authorization for API access.
       flows:
         authorizationCode:
-          authorizationUrl: https://cafe.cloud.redocly.com/oauth2/authorize
-          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          authorizationUrl: https://api.cafe.redocly.com/oauth2/authorize
+          tokenUrl: https://api.cafe.redocly.com/oauth2/token
           scopes:
             menu:read: Read access to menu items and images
             menu:write: Write access to menu items (create, delete)
             orders:read: Read access to orders
             orders:write: Write access to orders (create, update, delete)
         clientCredentials:
-          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          tokenUrl: https://api.cafe.redocly.com/oauth2/token
           scopes:
             menu:read: Read access to menu items and images
             menu:write: Write access to menu items (create, delete)
diff --git a/packages/openapi-typescript/examples/fetch-functions/src/api/client.ts b/packages/openapi-typescript/examples/fetch-functions/src/api/client.ts
index dcb4900f7c..89486e000c 100644
--- a/packages/openapi-typescript/examples/fetch-functions/src/api/client.ts
+++ b/packages/openapi-typescript/examples/fetch-functions/src/api/client.ts
@@ -446,7 +446,7 @@ export type OperationMetadata = {
     readonly path: string;
 };
 
-let BASE = "https://cafe.cloud.redocly.com";
+let BASE = "https://api.cafe.redocly.com";
 
 /** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
 export type RequestContext = {
diff --git a/packages/openapi-typescript/examples/fetch-functions/src/main.ts b/packages/openapi-typescript/examples/fetch-functions/src/main.ts
index 20a63e7543..83ef6958aa 100644
--- a/packages/openapi-typescript/examples/fetch-functions/src/main.ts
+++ b/packages/openapi-typescript/examples/fetch-functions/src/main.ts
@@ -1,18 +1,23 @@
 import { configure, use, listMenuItems, ApiError } from './api/client';
 
-configure({ baseUrl: 'https://cafe.cloud.redocly.com' });
+configure({ baseUrl: 'https://api.cafe.redocly.com' });
+
+const out = document.querySelector<HTMLPreElement>('#out')!;
 
 // Middleware composes cross-cutting concerns (tracing, auth refresh, logging, …).
-// `onRequest` runs in registration order, `onResponse` in reverse (onion). Register
-// as many as you like with `use()`; the service-class facade uses `client.use()`.
+// `onRequest` runs in registration order, `onResponse` in reverse (onion); register as many as you
+// like with `use()` (the service-class facade uses `client.use()`). Here we observe the response.
+//
+// Heads-up: adding a *custom request header* in `onRequest` (e.g. `ctx.headers['X-Request-Id'] = …`)
+// makes the browser send a CORS preflight, so the target API must list that header in its
+// `Access-Control-Allow-Headers`. The public cafe demo allows only Content-Type / Authorization /
+// X-API-Key, so injecting `X-Request-Id` there fails with "Failed to fetch".
 use({
-  onRequest: (ctx) => {
-    ctx.headers['X-Request-Id'] = crypto.randomUUID();
+  onResponse: (response) => {
+    document.title = `cafe — ${response.status}`;
   },
 });
 
-const out = document.querySelector<HTMLPreElement>('#out')!;
-
 async function main() {
   try {
     const items = await listMenuItems();
diff --git a/packages/openapi-typescript/examples/mock/openapi.yaml b/packages/openapi-typescript/examples/mock/openapi.yaml
index a6a75dffd0..a255b72a20 100644
--- a/packages/openapi-typescript/examples/mock/openapi.yaml
+++ b/packages/openapi-typescript/examples/mock/openapi.yaml
@@ -13,7 +13,7 @@ info:
     url: https://opensource.org/licenses/MIT
   termsOfService: https://redocly.com/subscription-agreement
 servers:
-  - url: https://cafe.cloud.redocly.com
+  - url: https://api.cafe.redocly.com
     description: Live server.
 tags:
   - name: Authorization
@@ -515,15 +515,15 @@ components:
       description: OAuth2 authorization for API access.
       flows:
         authorizationCode:
-          authorizationUrl: https://cafe.cloud.redocly.com/oauth2/authorize
-          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          authorizationUrl: https://api.cafe.redocly.com/oauth2/authorize
+          tokenUrl: https://api.cafe.redocly.com/oauth2/token
           scopes:
             menu:read: Read access to menu items and images
             menu:write: Write access to menu items (create, delete)
             orders:read: Read access to orders
             orders:write: Write access to orders (create, update, delete)
         clientCredentials:
-          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          tokenUrl: https://api.cafe.redocly.com/oauth2/token
           scopes:
             menu:read: Read access to menu items and images
             menu:write: Write access to menu items (create, delete)
diff --git a/packages/openapi-typescript/examples/mock/src/api/client.ts b/packages/openapi-typescript/examples/mock/src/api/client.ts
index dcb4900f7c..89486e000c 100644
--- a/packages/openapi-typescript/examples/mock/src/api/client.ts
+++ b/packages/openapi-typescript/examples/mock/src/api/client.ts
@@ -446,7 +446,7 @@ export type OperationMetadata = {
     readonly path: string;
 };
 
-let BASE = "https://cafe.cloud.redocly.com";
+let BASE = "https://api.cafe.redocly.com";
 
 /** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
 export type RequestContext = {
diff --git a/packages/openapi-typescript/examples/mock/src/main.ts b/packages/openapi-typescript/examples/mock/src/main.ts
index ee3ca10e8d..51fa94828b 100644
--- a/packages/openapi-typescript/examples/mock/src/main.ts
+++ b/packages/openapi-typescript/examples/mock/src/main.ts
@@ -8,9 +8,13 @@ const out = document.querySelector<HTMLPreElement>('#out')!;
 async function main() {
   try {
     await setupWorker(...handlers).start();
-    configure({ baseUrl: 'https://cafe.cloud.redocly.com' });
+    configure({ baseUrl: 'https://api.cafe.redocly.com' });
     const response = await listMenuItems();
-    out.textContent = `Mocked ${response.items.length} items:\n${JSON.stringify(response, null, 2)}`;
+    out.textContent = `Mocked ${response.items.length} items:\n${JSON.stringify(
+      response,
+      null,
+      2
+    )}`;
   } catch (error) {
     out.textContent =
       error instanceof ApiError ? `ApiError ${error.status}` : `Error: ${String(error)}`;
diff --git a/packages/openapi-typescript/examples/programmatic/openapi.yaml b/packages/openapi-typescript/examples/programmatic/openapi.yaml
index a6a75dffd0..a255b72a20 100644
--- a/packages/openapi-typescript/examples/programmatic/openapi.yaml
+++ b/packages/openapi-typescript/examples/programmatic/openapi.yaml
@@ -13,7 +13,7 @@ info:
     url: https://opensource.org/licenses/MIT
   termsOfService: https://redocly.com/subscription-agreement
 servers:
-  - url: https://cafe.cloud.redocly.com
+  - url: https://api.cafe.redocly.com
     description: Live server.
 tags:
   - name: Authorization
@@ -515,15 +515,15 @@ components:
       description: OAuth2 authorization for API access.
       flows:
         authorizationCode:
-          authorizationUrl: https://cafe.cloud.redocly.com/oauth2/authorize
-          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          authorizationUrl: https://api.cafe.redocly.com/oauth2/authorize
+          tokenUrl: https://api.cafe.redocly.com/oauth2/token
           scopes:
             menu:read: Read access to menu items and images
             menu:write: Write access to menu items (create, delete)
             orders:read: Read access to orders
             orders:write: Write access to orders (create, update, delete)
         clientCredentials:
-          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          tokenUrl: https://api.cafe.redocly.com/oauth2/token
           scopes:
             menu:read: Read access to menu items and images
             menu:write: Write access to menu items (create, delete)
diff --git a/packages/openapi-typescript/examples/programmatic/src/api/client.ts b/packages/openapi-typescript/examples/programmatic/src/api/client.ts
index dcb4900f7c..89486e000c 100644
--- a/packages/openapi-typescript/examples/programmatic/src/api/client.ts
+++ b/packages/openapi-typescript/examples/programmatic/src/api/client.ts
@@ -446,7 +446,7 @@ export type OperationMetadata = {
     readonly path: string;
 };
 
-let BASE = "https://cafe.cloud.redocly.com";
+let BASE = "https://api.cafe.redocly.com";
 
 /** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
 export type RequestContext = {
diff --git a/packages/openapi-typescript/examples/programmatic/src/main.ts b/packages/openapi-typescript/examples/programmatic/src/main.ts
index 37a9f18687..eae2eca5f5 100644
--- a/packages/openapi-typescript/examples/programmatic/src/main.ts
+++ b/packages/openapi-typescript/examples/programmatic/src/main.ts
@@ -2,7 +2,7 @@
 // programmatic generation only changes *how* you invoke the generator, not what it emits.
 import { configure, listMenuItems } from './api/client';
 
-configure({ baseUrl: 'https://cafe.cloud.redocly.com' });
+configure({ baseUrl: 'https://api.cafe.redocly.com' });
 
 export async function loadMenu() {
   return listMenuItems();
diff --git a/packages/openapi-typescript/examples/service-class/openapi.yaml b/packages/openapi-typescript/examples/service-class/openapi.yaml
index a6a75dffd0..a255b72a20 100644
--- a/packages/openapi-typescript/examples/service-class/openapi.yaml
+++ b/packages/openapi-typescript/examples/service-class/openapi.yaml
@@ -13,7 +13,7 @@ info:
     url: https://opensource.org/licenses/MIT
   termsOfService: https://redocly.com/subscription-agreement
 servers:
-  - url: https://cafe.cloud.redocly.com
+  - url: https://api.cafe.redocly.com
     description: Live server.
 tags:
   - name: Authorization
@@ -515,15 +515,15 @@ components:
       description: OAuth2 authorization for API access.
       flows:
         authorizationCode:
-          authorizationUrl: https://cafe.cloud.redocly.com/oauth2/authorize
-          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          authorizationUrl: https://api.cafe.redocly.com/oauth2/authorize
+          tokenUrl: https://api.cafe.redocly.com/oauth2/token
           scopes:
             menu:read: Read access to menu items and images
             menu:write: Write access to menu items (create, delete)
             orders:read: Read access to orders
             orders:write: Write access to orders (create, update, delete)
         clientCredentials:
-          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          tokenUrl: https://api.cafe.redocly.com/oauth2/token
           scopes:
             menu:read: Read access to menu items and images
             menu:write: Write access to menu items (create, delete)
diff --git a/packages/openapi-typescript/examples/service-class/src/api/client.ts b/packages/openapi-typescript/examples/service-class/src/api/client.ts
index d3ff0b8f08..7ee08fa5a0 100644
--- a/packages/openapi-typescript/examples/service-class/src/api/client.ts
+++ b/packages/openapi-typescript/examples/service-class/src/api/client.ts
@@ -446,7 +446,7 @@ export type OperationMetadata = {
     readonly path: string;
 };
 
-let BASE = "https://cafe.cloud.redocly.com";
+let BASE = "https://api.cafe.redocly.com";
 
 /** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
 export type RequestContext = {
diff --git a/packages/openapi-typescript/examples/service-class/src/main.ts b/packages/openapi-typescript/examples/service-class/src/main.ts
index 73667fb75e..5dd326b483 100644
--- a/packages/openapi-typescript/examples/service-class/src/main.ts
+++ b/packages/openapi-typescript/examples/service-class/src/main.ts
@@ -1,6 +1,6 @@
 import { Client, ApiError } from './api/client';
 
-const client = new Client({ baseUrl: 'https://cafe.cloud.redocly.com' });
+const client = new Client({ baseUrl: 'https://api.cafe.redocly.com' });
 
 const out = document.querySelector<HTMLPreElement>('#out')!;
 
diff --git a/packages/openapi-typescript/examples/tanstack-query/openapi.yaml b/packages/openapi-typescript/examples/tanstack-query/openapi.yaml
index a6a75dffd0..a255b72a20 100644
--- a/packages/openapi-typescript/examples/tanstack-query/openapi.yaml
+++ b/packages/openapi-typescript/examples/tanstack-query/openapi.yaml
@@ -13,7 +13,7 @@ info:
     url: https://opensource.org/licenses/MIT
   termsOfService: https://redocly.com/subscription-agreement
 servers:
-  - url: https://cafe.cloud.redocly.com
+  - url: https://api.cafe.redocly.com
     description: Live server.
 tags:
   - name: Authorization
@@ -515,15 +515,15 @@ components:
       description: OAuth2 authorization for API access.
       flows:
         authorizationCode:
-          authorizationUrl: https://cafe.cloud.redocly.com/oauth2/authorize
-          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          authorizationUrl: https://api.cafe.redocly.com/oauth2/authorize
+          tokenUrl: https://api.cafe.redocly.com/oauth2/token
           scopes:
             menu:read: Read access to menu items and images
             menu:write: Write access to menu items (create, delete)
             orders:read: Read access to orders
             orders:write: Write access to orders (create, update, delete)
         clientCredentials:
-          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          tokenUrl: https://api.cafe.redocly.com/oauth2/token
           scopes:
             menu:read: Read access to menu items and images
             menu:write: Write access to menu items (create, delete)
diff --git a/packages/openapi-typescript/examples/tanstack-query/src/App.tsx b/packages/openapi-typescript/examples/tanstack-query/src/App.tsx
index 4063874827..45cb464f22 100644
--- a/packages/openapi-typescript/examples/tanstack-query/src/App.tsx
+++ b/packages/openapi-typescript/examples/tanstack-query/src/App.tsx
@@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/react-query';
 import { configure } from './api/client';
 import { listMenuItemsOptions } from './api/client.tanstack';
 
-configure({ baseUrl: 'https://cafe.cloud.redocly.com' });
+configure({ baseUrl: 'https://api.cafe.redocly.com' });
 
 export function App() {
   const { data, error, isLoading } = useQuery(listMenuItemsOptions({}));
diff --git a/packages/openapi-typescript/examples/tanstack-query/src/api/client.ts b/packages/openapi-typescript/examples/tanstack-query/src/api/client.ts
index dcb4900f7c..89486e000c 100644
--- a/packages/openapi-typescript/examples/tanstack-query/src/api/client.ts
+++ b/packages/openapi-typescript/examples/tanstack-query/src/api/client.ts
@@ -446,7 +446,7 @@ export type OperationMetadata = {
     readonly path: string;
 };
 
-let BASE = "https://cafe.cloud.redocly.com";
+let BASE = "https://api.cafe.redocly.com";
 
 /** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
 export type RequestContext = {
diff --git a/packages/openapi-typescript/examples/zod/openapi.yaml b/packages/openapi-typescript/examples/zod/openapi.yaml
index a6a75dffd0..a255b72a20 100644
--- a/packages/openapi-typescript/examples/zod/openapi.yaml
+++ b/packages/openapi-typescript/examples/zod/openapi.yaml
@@ -13,7 +13,7 @@ info:
     url: https://opensource.org/licenses/MIT
   termsOfService: https://redocly.com/subscription-agreement
 servers:
-  - url: https://cafe.cloud.redocly.com
+  - url: https://api.cafe.redocly.com
     description: Live server.
 tags:
   - name: Authorization
@@ -515,15 +515,15 @@ components:
       description: OAuth2 authorization for API access.
       flows:
         authorizationCode:
-          authorizationUrl: https://cafe.cloud.redocly.com/oauth2/authorize
-          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          authorizationUrl: https://api.cafe.redocly.com/oauth2/authorize
+          tokenUrl: https://api.cafe.redocly.com/oauth2/token
           scopes:
             menu:read: Read access to menu items and images
             menu:write: Write access to menu items (create, delete)
             orders:read: Read access to orders
             orders:write: Write access to orders (create, update, delete)
         clientCredentials:
-          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          tokenUrl: https://api.cafe.redocly.com/oauth2/token
           scopes:
             menu:read: Read access to menu items and images
             menu:write: Write access to menu items (create, delete)
diff --git a/packages/openapi-typescript/examples/zod/src/api/client.ts b/packages/openapi-typescript/examples/zod/src/api/client.ts
index dcb4900f7c..89486e000c 100644
--- a/packages/openapi-typescript/examples/zod/src/api/client.ts
+++ b/packages/openapi-typescript/examples/zod/src/api/client.ts
@@ -446,7 +446,7 @@ export type OperationMetadata = {
     readonly path: string;
 };
 
-let BASE = "https://cafe.cloud.redocly.com";
+let BASE = "https://api.cafe.redocly.com";
 
 /** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
 export type RequestContext = {
diff --git a/packages/openapi-typescript/examples/zod/src/main.ts b/packages/openapi-typescript/examples/zod/src/main.ts
index 16bbea3025..2e75d5827d 100644
--- a/packages/openapi-typescript/examples/zod/src/main.ts
+++ b/packages/openapi-typescript/examples/zod/src/main.ts
@@ -1,7 +1,7 @@
 import { configure, listMenuItems, ApiError } from './api/client';
 import { MenuItemListSchema } from './api/client.zod';
 
-configure({ baseUrl: 'https://cafe.cloud.redocly.com' });
+configure({ baseUrl: 'https://api.cafe.redocly.com' });
 
 const out = document.querySelector<HTMLPreElement>('#out')!;
 
diff --git a/tests/e2e/generate-client/cafe.snapshot.ts b/tests/e2e/generate-client/cafe.snapshot.ts
index dcb4900f7c..89486e000c 100644
--- a/tests/e2e/generate-client/cafe.snapshot.ts
+++ b/tests/e2e/generate-client/cafe.snapshot.ts
@@ -446,7 +446,7 @@ export type OperationMetadata = {
     readonly path: string;
 };
 
-let BASE = "https://cafe.cloud.redocly.com";
+let BASE = "https://api.cafe.redocly.com";
 
 /** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
 export type RequestContext = {
diff --git a/tests/e2e/generate-client/fixtures/cafe.yaml b/tests/e2e/generate-client/fixtures/cafe.yaml
index cd8a5883a5..d39d250242 100644
--- a/tests/e2e/generate-client/fixtures/cafe.yaml
+++ b/tests/e2e/generate-client/fixtures/cafe.yaml
@@ -13,7 +13,7 @@ info:
     url: https://opensource.org/licenses/MIT
   termsOfService: https://redocly.com/subscription-agreement
 servers:
-  - url: https://cafe.cloud.redocly.com
+  - url: https://api.cafe.redocly.com
     description: Live server.
 tags:
   - name: Authorization
@@ -515,15 +515,15 @@ components:
       description: OAuth2 authorization for API access.
       flows:
         authorizationCode:
-          authorizationUrl: https://cafe.cloud.redocly.com/oauth2/authorize
-          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          authorizationUrl: https://api.cafe.redocly.com/oauth2/authorize
+          tokenUrl: https://api.cafe.redocly.com/oauth2/token
           scopes:
             menu:read: Read access to menu items and images
             menu:write: Write access to menu items (create, delete)
             orders:read: Read access to orders
             orders:write: Write access to orders (create, update, delete)
         clientCredentials:
-          tokenUrl: https://cafe.cloud.redocly.com/oauth2/token
+          tokenUrl: https://api.cafe.redocly.com/oauth2/token
           scopes:
             menu:read: Read access to menu items and images
             menu:write: Write access to menu items (create, delete)

From e53e0b1c731726daef39903fc2b8000c75414214 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 22 Jun 2026 15:39:57 +0300
Subject: [PATCH 008/134] docs(generate-client): strip trailing spaces to
 satisfy markdownlint MD009

Three prose lines had a stray single trailing space (lines 644, 651, 939),
which markdownlint MD009 rejects (expects 0 or 2). Verified clean with
markdownlint-cli2 v0.22.0 against the repo's .markdownlint.yaml.
---
 docs/@v2/commands/generate-client.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index 77b86431a5..411a5751c5 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -641,14 +641,14 @@ Binary fields (`type: string, format: binary`) are typed as `Blob` (a `File` is
 await upload({ file, orgId: 'org_1', tags: ['a', 'b'] });
 ```
 
-Serialization rules: 
+Serialization rules:
 - `Blob`/`File` and strings pass through
 - arrays append one field per item
 - nested objects are JSON-encoded
 - other scalars are stringified
 - `undefined`/`null` are skipped
 
-A multipart body whose schema **isn't** a concrete object keeps the raw `FormData` type. 
+A multipart body whose schema **isn't** a concrete object keeps the raw `FormData` type.
 You can build the form yourself when the shape can't be expressed.
 
 `format: binary` surfaces as `Blob` wherever it appears; `format: byte` (base64) stays a `string`.
@@ -936,7 +936,7 @@ A worked example lives in [`examples/custom-generator`](https://github.com/Redoc
 
 {% admonition type="info" name="Compatibility & trust" %}
 A custom generator declares the same `requires` / `facades` / `errorModes` / `dateTypes` contract as the built-ins, validated up front — an incompatible selection, a name that collides with another generator, or an unloadable specifier fails fast with an actionable message.
-The generated client stays dependency-free. 
+The generated client stays dependency-free.
 A generator's output is its own file(s), and any libraries it targets are peers of _your app_.
 Import-specifier generators execute at generation time.'
 It has the same trust level as any installed dependency or `defineConfig` file.

From 95adc1eee0185a10eb03afea56b1958b1ad4b9e7 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 22 Jun 2026 15:47:40 +0300
Subject: [PATCH 009/134] ci(docs): use vale filter_mode nofilter to survive
 large-PR diffs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The vale job used reviewdog with filter_mode: file, which fetches the PR
diff to scope findings to changed files. GitHub's diff API caps at 20000
lines, so large PRs (this one adds ~54k lines) return 406 and reviewdog
fails on the post step — not on any actual vale finding.

filter_mode: nofilter skips the diff fetch and lints the full files
directly. Verified the committed docs are clean (0 errors/warnings/
suggestions across 320 files with vale 3.15.1), so nofilter adds no noise
and the error-level gate still holds.
---
 .github/workflows/docs-tests.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docs-tests.yaml b/.github/workflows/docs-tests.yaml
index c153c1c5aa..b8e8a832ad 100644
--- a/.github/workflows/docs-tests.yaml
+++ b/.github/workflows/docs-tests.yaml
@@ -23,7 +23,11 @@ jobs:
       - uses: errata-ai/vale-action@reviewdog
         with:
           files: '["README.md", "docs", ".changeset"]'
-          filter_mode: file
+          # `nofilter` instead of `file`: file-level filtering makes reviewdog
+          # fetch the PR diff, which GitHub caps at 20000 lines (large PRs get a
+          # 406 and the job fails on the post step, not on any vale finding).
+          # nofilter skips the diff fetch and lints the full files directly.
+          filter_mode: nofilter
           fail_on_error: true
 
   linkcheck:

From 5afa6a5318a6ce3d33bce5cc6c249aaf1b8e96cb Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 22 Jun 2026 16:17:10 +0300
Subject: [PATCH 010/134] test(generate-client): commit consumer api.ts so flat
 typecheck finds it
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The consumer harnesses (base/cafe/sse) have tracked index*.ts that import a
generated `./api.js`. The repo-wide `tsc --noEmit` includes tests/**/*.ts, so
it typechecks those imports — but `api.ts` was gitignored and only created when
the e2e suite ran, so a fresh checkout (CI) failed with TS2307.

The harnesses already expected api.ts present for typecheck (see the note in
sse.runtime.test.ts); gitignoring it was the gap. generate-client output is
byte-deterministic for these fixtures (fixed ports, fixed specs — verified by
regenerating and diffing), so commit the files instead of touching tsconfig.
The e2e suite still regenerates them each run, producing identical content
(verified: no drift after running base.test.ts).
---
 .gitignore                                    |    3 -
 .../e2e/generate-client/base-consumer/api.ts  |  660 +++++++
 .../e2e/generate-client/cafe-consumer/api.ts  | 1513 +++++++++++++++++
 tests/e2e/generate-client/sse-consumer/api.ts |  638 +++++++
 tests/e2e/generate-client/sse.runtime.test.ts |    5 +-
 5 files changed, 2814 insertions(+), 5 deletions(-)
 create mode 100644 tests/e2e/generate-client/base-consumer/api.ts
 create mode 100644 tests/e2e/generate-client/cafe-consumer/api.ts
 create mode 100644 tests/e2e/generate-client/sse-consumer/api.ts

diff --git a/.gitignore b/.gitignore
index 7852a63764..10b3c2b8c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,3 @@ packages/cli/.publish/
 packages/cli/THIRD_PARTY_NOTICES
 .env
 packages/respect-core/src/modules/runtime-expressions/abnf-parser.js
-tests/e2e/generate-client/base-consumer/api.ts
-tests/e2e/generate-client/cafe-consumer/api.ts
-tests/e2e/generate-client/sse-consumer/api.ts
diff --git a/tests/e2e/generate-client/base-consumer/api.ts b/tests/e2e/generate-client/base-consumer/api.ts
new file mode 100644
index 0000000000..b4e3eb45ca
--- /dev/null
+++ b/tests/e2e/generate-client/base-consumer/api.ts
@@ -0,0 +1,660 @@
+// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Base Consumer (v1.0.0)
+ * Minimal spec that exercises core runtime behavior (real call, cancellation)
+ * plus edge cases discovered against the real Redocly API (reunite.yaml):
+ * OAS 3.1 `enum` containing `null`, and `style: deepObject` object query params.
+ * 
+ */
+
+export type Pet = {
+    /**
+     * Server-assigned id; readOnly, so it is dropped from request bodies.
+     */
+    readonly id?: number;
+    name: string;
+    /**
+     * Lifecycle status; OAS 3.1 enum that includes null.
+     */
+    status?: ("available" | "pending" | "sold") | null;
+    /**
+     * Free-form object (no declared properties) — a record of unknown, not `{}`.
+     */
+    metadata?: Record<string, unknown>;
+    /**
+     * oneOf with an empty branch — must stay `string`, not collapse to `unknown`.
+     */
+    owner?: string;
+    /**
+     * OAS 3.1 single null type — must render as `null`, not `unknown`.
+     */
+    deletedAt?: null;
+};
+
+/**
+ * Discriminated-union member (status=ok) — a nested-union guard target.
+ */
+export type PetBulkSuccessItem = {
+    status: "ok";
+    resource: Pet;
+};
+
+/**
+ * Discriminated-union member (status=error).
+ */
+export type PetBulkErrorItem = {
+    status: "error";
+    error: string;
+};
+
+/**
+ * Array of an inline discriminated union — guards must narrow the items.
+ */
+export type PetBulkResult = (PetBulkSuccessItem | PetBulkErrorItem)[];
+
+/**
+ * Unrelated schema whose name collides with the `getStatus` op result alias.
+ */
+export type GetStatusResult = {
+    ready?: boolean;
+};
+
+export type PetFilter = {
+    name?: string;
+    status?: string;
+};
+
+/**
+ * Result alias for `search` collides with this schema name (regression guard).
+ */
+export type SearchResult = {
+    total?: number;
+    items?: Pet[];
+};
+
+/**
+ * Own discriminant property AND allOf — the own property must survive the intersection.
+ */
+export type ExtendedPet = {
+    kind: "extended";
+} & Pet;
+
+/**
+ * Narrow a `PetBulkSuccessItem | PetBulkErrorItem` to `PetBulkSuccessItem` via its `status` discriminant.
+ */
+export function isPetBulkSuccessItem(value: PetBulkSuccessItem | PetBulkErrorItem): value is PetBulkSuccessItem {
+    return (value as Record<string, unknown>)["status"] === "ok";
+}
+
+/**
+ * Narrow a `PetBulkSuccessItem | PetBulkErrorItem` to `PetBulkErrorItem` via its `status` discriminant.
+ */
+export function isPetBulkErrorItem(value: PetBulkSuccessItem | PetBulkErrorItem): value is PetBulkErrorItem {
+    return (value as Record<string, unknown>)["status"] === "error";
+}
+
+/**
+ * Static metadata for every operation, keyed by operationId: the HTTP `method`
+ * and the `path` template (with `{param}` placeholders intact). Minification-safe
+ * — useful for building cache/query keys, tracing span names, and request logging
+ * without re-deriving them at each call site.
+ */
+export const OPERATIONS = {
+    getPetById: { method: "GET", path: "/pets/{id}" },
+    listPets: { method: "GET", path: "/pets" },
+    createPet: { method: "POST", path: "/pets" },
+    getSlowPet: { method: "GET", path: "/pets/{id}/cancel-test" },
+    search: { method: "POST", path: "/search" },
+    bulkUpsertPets: { method: "POST", path: "/pets/bulk" },
+    getStatus: { method: "GET", path: "/status" }
+} as const;
+
+/**
+ * The operationId of any operation in this client.
+ */
+export type OperationId = keyof typeof OPERATIONS;
+
+/**
+ * Static metadata describing one operation: its HTTP method and path template.
+ */
+export type OperationMetadata = {
+    readonly method: string;
+    readonly path: string;
+};
+
+let BASE = "http://localhost:3102";
+
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+export type RequestContext = {
+    url: string;
+    method: string;
+    headers: Record<string, string>;
+    body?: unknown;
+};
+
+/**
+ * Configuration and extension hooks for a client. Supplied per-instance via
+ * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
+ * (functions facade).
+ */
+export type ClientConfig = {
+    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    baseUrl?: string;
+    /** Extra headers merged into every request; a function is invoked per request. */
+    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+    /** Transport used to issue requests. Defaults to the global `fetch`. */
+    fetch?: typeof fetch;
+    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    /** Observe — or replace, by returning a `Response` — the response before parsing. */
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    /**
+     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
+     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
+     */
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
+    /**
+     * Composable interceptors run around every request, alongside the single
+     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
+     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
+     * the last-registered middleware wraps closest to the network. Register more at runtime
+     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
+     */
+    middleware?: Middleware[];
+    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
+    retry?: RetryConfig;
+};
+
+/**
+ * A request interceptor; every field is optional, so a middleware can hook any subset of
+ * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
+ * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
+ * failure into the error to throw, threaded through each middleware in turn.
+ */
+export type Middleware = {
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/** Context handed to `retryOn` for the attempt that just failed. */
+export type RetryContext = {
+    /** 1-based number of the attempt that just failed. */
+    attempt: number;
+    /** The request that was attempted. */
+    request: RequestContext;
+    /** Present when the server returned a (non-ok) response. */
+    response?: Response;
+    /** Present when the transport threw (network error, DNS, connection reset). */
+    error?: unknown;
+};
+
+/** Retry policy; all fields optional with sensible defaults. */
+export type RetryConfig = {
+    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
+    retries?: number;
+    /** Base delay in milliseconds. Default 1000. */
+    retryDelay?: number;
+    /** Backoff shape. Default 'exponential'. */
+    retryStrategy?: RetryStrategy;
+    /** Apply full jitter over the computed delay. Default true. */
+    jitter?: boolean;
+    /**
+     * Decide whether to retry a failed attempt. Default: retry only idempotent
+     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
+     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
+     */
+    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
+};
+
+/**
+ * How the response body is read. `'auto'` negotiates from the content type (the
+ * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
+ */
+export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
+
+/**
+ * The trailing per-operation argument: standard `RequestInit` plus an optional
+ * per-call retry override and a `parseAs` escape hatch.
+ *
+ * `parseAs` forces how the response body is read; overrides the inferred kind.
+ * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
+ * override — the static return type is unchanged.
+ */
+export type RequestOptions = RequestInit & {
+    retry?: Partial<RetryConfig>;
+    parseAs?: ParseAs;
+};
+
+/**
+ * Override the base URL used by every generated operation. Useful when the
+ * runtime environment differs from the value declared in `servers[0].url`
+ * (e.g. dev / staging / prod toggles in a single-page app).
+ *
+ * Mutates a module-scoped binding shared by the functions facade. For multiple
+ * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ */
+export function setBaseUrl(url: string): void {
+    BASE = url;
+}
+
+/** The global config used by the functions facade (see `configure`). */
+const __config: ClientConfig = {};
+
+/**
+ * Merge `config` into the global configuration used by the functions facade —
+ * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
+ * hooks once for every free function. The service-class facade configures per
+ * instance instead (`new Client(config)`).
+ */
+export function configure(config: ClientConfig): void {
+    Object.assign(__config, config);
+}
+
+/**
+ * Append interceptors to the functions facade's global middleware chain (see
+ * `ClientConfig.middleware`). The service-class facade registers per instance via
+ * `<Client>.use(...)` instead.
+ */
+export function use(...middleware: Middleware[]): void {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    __config.middleware = [...(__config.middleware ?? []), ...middleware];
+}
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function __middleware(config: ClientConfig): Middleware[] {
+    const single = config.onRequest || config.onResponse || config.onError
+        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+        : [];
+    return [...single, ...(config.middleware ?? [])];
+}
+
+export class ApiError extends Error {
+    public readonly url: string;
+    public readonly status: number;
+    public readonly statusText: string;
+    public readonly body: unknown;
+    constructor(url: string, status: number, statusText: string, body: unknown) {
+        super(`Request failed with status ${status}`);
+        this.name = 'ApiError';
+        this.url = url;
+        this.status = status;
+        this.statusText = statusText;
+        this.body = body;
+    }
+}
+
+type QueryPrimitive = string | number | boolean;
+
+type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
+
+/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
+type QueryStyle = {
+    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+    explode: boolean;
+    allowReserved?: boolean;
+};
+
+/**
+ * Percent-encode `value` but leave the RFC-3986 reserved set
+ * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
+ */
+function __encodeReserved(value: string): string {
+    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
+}
+
+function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
+    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    if (!query)
+        return url;
+    const params = new URLSearchParams();
+    const raw: string[] = [];
+    for (const [key, value] of Object.entries(query)) {
+        if (value === undefined || value === null)
+            continue;
+        const spec = styles?.[key];
+        if (!spec) {
+            if (Array.isArray(value)) {
+                for (const v of value) {
+                    if (v !== undefined && v !== null)
+                        params.append(key, String(v));
+                }
+            }
+            else if (typeof value === 'object') {
+                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+                for (const [subKey, subValue] of Object.entries(value)) {
+                    if (subValue !== undefined && subValue !== null) {
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                    }
+                }
+            }
+            else {
+                params.append(key, String(value));
+            }
+            continue;
+        }
+        if (Array.isArray(value)) {
+            const items = value.filter((v) => v !== undefined && v !== null).map(String);
+            if (spec.style === 'form' && spec.explode) {
+                for (const v of items) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}=${__encodeReserved(v)}`);
+                    else
+                        params.append(key, v);
+                }
+            }
+            else {
+                // Delimited styles put the LITERAL delimiter on the wire; only the
+                // values are encoded. `%20` (not `+`) is the literal space delimiter.
+                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
+                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+            }
+        }
+        else if (typeof value === 'object') {
+            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+            for (const [subKey, subValue] of Object.entries(value)) {
+                if (subValue !== undefined && subValue !== null) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
+                    else
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                }
+            }
+        }
+        else if (spec.allowReserved) {
+            raw.push(`${key}=${__encodeReserved(String(value))}`);
+        }
+        else {
+            params.append(key, String(value));
+        }
+    }
+    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+    return qs ? `${url}?${qs}` : url;
+}
+
+async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+    response: Response;
+    context: RequestContext;
+}> {
+    const { retry: callRetry, ...fetchInit } = init;
+    const retry: RetryConfig = { ...config.retry, ...callRetry };
+    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+    const headers: Record<string, string> = {
+        Accept: 'application/json',
+        ...extra,
+        ...(fetchInit.headers as Record<string, string> | undefined),
+    };
+    let payload: BodyInit | undefined;
+    if (body !== undefined) {
+        const isBinary = body instanceof Blob ||
+            body instanceof ArrayBuffer ||
+            ArrayBuffer.isView(body as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
+        const isURLSearchParams = body instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
+            payload = body as BodyInit;
+        }
+        else {
+            payload = JSON.stringify(body);
+            if (!('Content-Type' in headers) && !('content-type' in headers)) {
+                headers['Content-Type'] = 'application/json';
+            }
+        }
+    }
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    const doFetch = config.fetch ?? fetch;
+    const maxAttempts = 1 + (retry.retries ?? 0);
+    const retryOn = retry.retryOn ?? __defaultRetryOn;
+    const signal = fetchInit.signal ?? undefined;
+    let attempt = 0;
+    while (true) {
+        attempt++;
+        if (signal?.aborted)
+            throw __abortError(signal);
+        let response: Response;
+        try {
+            response = await doFetch(context.url, {
+                ...fetchInit,
+                method: context.method,
+                headers: context.headers,
+                body: payload,
+            });
+        }
+        catch (error) {
+            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
+                await __sleep(__retryDelay(retry, attempt, null), signal);
+                continue;
+            }
+            throw error;
+        }
+        // Reverse order: the last-registered middleware wraps closest to the network (onion).
+        for (let i = middleware.length - 1; i >= 0; i--) {
+            const onResponse = middleware[i].onResponse;
+            if (onResponse) {
+                const replaced = await onResponse(response, context);
+                if (replaced)
+                    response = replaced;
+            }
+        }
+        if (!response.ok &&
+            attempt < maxAttempts &&
+            !signal?.aborted &&
+            (await retryOn({ attempt, request: context, response }))) {
+            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            continue;
+        }
+        return { response, context };
+    }
+}
+
+async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+    if (kind === 'void' || response.status === 204)
+        return undefined;
+    if (kind === 'stream')
+        return response.body;
+    if (kind === 'blob')
+        return response.blob();
+    if (kind === 'arrayBuffer')
+        return response.arrayBuffer();
+    if (kind === 'formData')
+        return response.formData();
+    if (kind === 'text')
+        return response.text();
+    if (kind === 'json')
+        return response.json();
+    // 'auto' — negotiate from the response's content type.
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json'))
+        return response.json();
+    if (contentType.startsWith('text/'))
+        return response.text();
+    return response.blob();
+}
+
+async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+    const { parseAs, ...sendInit } = init;
+    const { response, context } = await __send(config, url, sendInit, body);
+    if (!response.ok) {
+        const errorBody = await readError(response);
+        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
+        // Thread the error through each middleware's onError in turn (each may replace it).
+        for (const mw of __middleware(config)) {
+            if (mw.onError)
+                error = await mw.onError(error as ApiError, context);
+        }
+        throw error;
+    }
+    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
+    return (await __parse(response, kind)) as T;
+}
+
+async function readError(response: Response): Promise<unknown> {
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json')) {
+        return response.json().catch(() => undefined);
+    }
+    return response.text().catch(() => undefined);
+}
+
+const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+
+const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+function __defaultRetryOn(ctx: RetryContext): boolean {
+    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
+        return false;
+    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+    if (retryAfter) {
+        const seconds = Number(retryAfter);
+        if (!Number.isNaN(seconds))
+            return seconds * 1000;
+        const when = Date.parse(retryAfter);
+        if (!Number.isNaN(when))
+            return Math.max(0, when - Date.now());
+    }
+    const base = retry.retryDelay ?? 1000;
+    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+    return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
+    return new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject(__abortError(signal));
+            return;
+        }
+        const onAbort = () => {
+            clearTimeout(timer);
+            reject(__abortError(signal as AbortSignal));
+        };
+        const timer = setTimeout(() => {
+            if (signal)
+                signal.removeEventListener('abort', onAbort);
+            resolve();
+        }, ms);
+        if (signal)
+            signal.addEventListener('abort', onAbort, { once: true });
+    });
+}
+
+function __abortError(signal: AbortSignal): globalThis.Error {
+    const reason = (signal as {
+        reason?: unknown;
+    }).reason;
+    if (reason instanceof Error)
+        return reason;
+    return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+export type GetPetByIdResult = Pet;
+
+export type GetPetByIdVariables = {
+    id: number;
+};
+
+export async function getPetById(id: number, init: RequestOptions = {}): Promise<Pet> {
+    return __request<Pet>(__config, __buildUrl(__config, `/pets/${encodeURIComponent(String(id))}`), { method: "GET", ...init });
+}
+
+export type ListPetsResult = Pet[];
+
+export type ListPetsParams = {
+    /**
+     * Object-valued filter serialized as deepObject.
+     */
+    filter?: PetFilter;
+};
+
+export type ListPetsVariables = {
+    params?: ListPetsParams;
+};
+
+export async function listPets(params: {
+    /**
+     * Object-valued filter serialized as deepObject.
+     */
+    filter?: PetFilter;
+} = {}, init: RequestOptions = {}): Promise<Pet[]> {
+    return __request<Pet[]>(__config, __buildUrl(__config, `/pets`, params, { "filter": { style: "deepObject", explode: true } }), { method: "GET", ...init });
+}
+
+export type CreatePetResult = Pet;
+
+export type CreatePetBody = Omit<Pet, "id">;
+
+export type CreatePetVariables = {
+    body: CreatePetBody;
+};
+
+export async function createPet(body: Omit<Pet, "id">, init: RequestOptions = {}): Promise<Pet> {
+    return __request<Pet>(__config, __buildUrl(__config, `/pets`), { method: "POST", ...init }, body);
+}
+
+export type GetSlowPetResult = Pet;
+
+export type GetSlowPetVariables = {
+    id: number;
+};
+
+export async function getSlowPet(id: number, init: RequestOptions = {}): Promise<Pet> {
+    return __request<Pet>(__config, __buildUrl(__config, `/pets/${encodeURIComponent(String(id))}/cancel-test`), { method: "GET", ...init });
+}
+
+export type SearchBody = PetFilter;
+
+export type SearchVariables = {
+    body: SearchBody;
+};
+
+/**
+ * Name-collision regression: `operationId: search` makes the result alias name
+ * match the SearchResult schema it returns. The generator must not emit a circular
+ * self-referential alias (TS2440/TS2308 in multi-file output).
+ */
+export async function search(body: PetFilter, init: RequestOptions = {}): Promise<SearchResult> {
+    return __request<SearchResult>(__config, __buildUrl(__config, `/search`), { method: "POST", ...init }, body);
+}
+
+export type BulkUpsertPetsResult = PetBulkResult;
+
+export type BulkUpsertPetsBody = Pet[];
+
+export type BulkUpsertPetsVariables = {
+    body: BulkUpsertPetsBody;
+};
+
+/**
+ * The 200 body is an array whose items are an *inline* discriminated union
+ * (`status`). The generator must emit `is<Member>` guards for that nested
+ * union, narrowing the items to the named member types.
+ */
+export async function bulkUpsertPets(body: Pet[], init: RequestOptions = {}): Promise<PetBulkResult> {
+    return __request<PetBulkResult>(__config, __buildUrl(__config, `/pets/bulk`), { method: "POST", ...init }, body);
+}
+
+/**
+ * Name-collision regression (non-self-referential): operationId `getStatus` derives a
+ * result alias whose name also exists as an unrelated schema below. The generator must
+ * suppress the operation result alias so the two don't both declare the same type name
+ * (a duplicate-identifier error).
+ */
+export async function getStatus(init: RequestOptions = {}): Promise<Pet> {
+    return __request<Pet>(__config, __buildUrl(__config, `/status`), { method: "GET", ...init });
+}
diff --git a/tests/e2e/generate-client/cafe-consumer/api.ts b/tests/e2e/generate-client/cafe-consumer/api.ts
new file mode 100644
index 0000000000..18d166779b
--- /dev/null
+++ b/tests/e2e/generate-client/cafe-consumer/api.ts
@@ -0,0 +1,1513 @@
+// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Redocly Cafe (v1.0.0)
+ * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+ * Create API credentials and try it yourself in a realistic OpenAPI workflow.
+ * 
+ */
+
+export type Page = {
+    /**
+     * Use with the `after` query parameter to load the next page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    endCursor: string | null;
+    /**
+     * Use with the `before` query parameter to load the previous page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    startCursor: string | null;
+    /**
+     * Indicates if there is a next page with items.
+     */
+    hasNextPage: boolean;
+    /**
+     * Indicates if there is a previous page with items.
+     */
+    hasPrevPage: boolean;
+    /**
+     * Value showing how many items are in the page limit.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit: number;
+    /**
+     * Count of items across all pages.
+     * @minimum 0
+     */
+    total: number;
+};
+
+export type MenuBaseItem = {
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt: string;
+    /**
+     * Menu item ID. Unique identifier prefixed with `prd_`.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    readonly id: string;
+    /**
+     * Entity name.
+     */
+    readonly object: "menuItem";
+    /**
+     * Menu item name.
+     * @minLength 1
+     * @maxLength 50
+     */
+    name: string;
+    /**
+     * Price in cents.
+     * @minimum 0
+     */
+    price: number;
+    /**
+     * Photo of the menu item. Must be a PNG image and less than 1MB.
+     * @format binary
+     */
+    photo?: Blob | null;
+    /**
+     * Photo URL of the menu item.
+     * @format uri
+     */
+    readonly photoUrl?: string;
+    photoTextDescription?: string | null;
+};
+
+export type Beverage = {
+    /**
+     * Menu item category.
+     */
+    category: "beverage";
+    /**
+     * Size of the beverage in milliliters.
+     * @exclusiveMinimum 0
+     */
+    volume: number;
+    /**
+     * Indicates if the beverage contains caffeine.
+     */
+    containsCaffeine: boolean;
+} & MenuBaseItem;
+
+export type Dessert = {
+    /**
+     * Menu item category.
+     */
+    category: "dessert";
+    /**
+     * Amount of calories.
+     * @exclusiveMinimum 0
+     */
+    calories: number;
+} & MenuBaseItem;
+
+export type MenuItem = Beverage | Dessert;
+
+export type MenuItemList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: MenuItem[];
+};
+
+export type Error = {
+    /**
+     * URI reference that identifies the problem type.
+     * @format uri-reference
+     */
+    type: string;
+    /**
+     * Short summary of the problem type.
+     */
+    title: string;
+    /**
+     * HTTP status code generated by the origin server for this occurrence of the problem.
+     * @minimum 100
+     * @exclusiveMaximum 600
+     * @format int32
+     */
+    status: number;
+    /**
+     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+     * May be used to locate the root of this problem in the source code.
+     * @format uri-reference
+     */
+    instance?: string;
+    /**
+     * Additional error details.
+     */
+    details?: Record<string, unknown>;
+};
+
+/**
+ * Order status.
+ */
+export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
+
+export const OrderStatus = {
+    placed: "placed",
+    preparing: "preparing",
+    completed: "completed",
+    canceled: "canceled"
+} as const;
+
+export type Order = {
+    /**
+     * Order ID. Unique identifier prefixed with `ord_`.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     * @format ulid
+     */
+    readonly id?: string;
+    /**
+     * Entity name.
+     */
+    readonly object?: "order";
+    /**
+     * Name of the customer who placed the order.
+     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+     * @minLength 1
+     * @maxLength 100
+     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+     */
+    customerName: string;
+    readonly status?: OrderStatus;
+    /**
+     * Total order price in cents.
+     * @minimum 0
+     */
+    readonly totalPrice?: number;
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt?: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt?: string;
+    /**
+     * List of items to include in the order.
+     * @minItems 1
+     */
+    orderItems: {
+        /**
+         * ID of the menu item to add to the order.
+         * @format ulid
+         */
+        menuItemId: string;
+        /**
+         * Quantity of the menu item.
+         * @minimum 1
+         */
+        quantity: number;
+        /**
+         * Discount amount in cents (absolute value).
+         * @minimum 0
+         */
+        discount?: number;
+        /**
+         * Optional comment for the order item (e.g., "No sugar").
+         * @maxLength 500
+         */
+        comment?: string;
+    }[];
+};
+
+export type OrderList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: Order[];
+};
+
+export type OrderItem = {
+    /**
+     * ID of the menu item to add to the order.
+     */
+    menuItemId: string;
+    /**
+     * Menu item that is part of the order.
+     */
+    readonly menuItem?: MenuItem;
+    /**
+     * Quantity of the menu item.
+     * @minimum 1
+     */
+    quantity: number;
+    /**
+     * Discount amount in cents (absolute value).
+     * @minimum 0
+     */
+    discount?: number;
+    /**
+     * Optional comment for the order item (e.g., "No sugar").
+     * @maxLength 500
+     */
+    comment?: string;
+};
+
+/**
+ * Revenue statistics for a given date range.
+ */
+export type RevenueStatistics = {
+    /**
+     * Total revenue in cents from completed orders.
+     * @minimum 0
+     * @format float
+     */
+    revenue: number;
+    /**
+     * Average order amount in cents (calculated from completed orders only).
+     * @minimum 0
+     * @format float
+     */
+    averageOrderAmount: number;
+    /**
+     * Total number of orders (all statuses) in the date range.
+     * @minimum 0
+     */
+    totalOrders: number;
+    /**
+     * Number of placed orders.
+     * @minimum 0
+     */
+    placedOrders: number;
+    /**
+     * Number of preparing orders.
+     * @minimum 0
+     */
+    preparingOrders: number;
+    /**
+     * Number of completed orders.
+     * @minimum 0
+     */
+    completedOrders: number;
+    /**
+     * Number of canceled orders.
+     * @minimum 0
+     */
+    canceledOrders: number;
+    /**
+     * Start date of the revenue calculation period.
+     * @format date
+     */
+    startDate: string;
+    /**
+     * End date of the revenue calculation period.
+     * @format date
+     */
+    endDate: string;
+};
+
+export type RegisterClientObject = {
+    /**
+     * Client name.
+     */
+    name: string;
+    /**
+     * List of redirect URIs (optional, defaults to empty array).
+     */
+    redirectUris?: string[];
+    /**
+     * List of scopes.
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types.
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+/**
+ * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+ */
+export type OAuth2Client = {
+    /**
+     * Client identifier issued by the authorization server.
+     */
+    clientId: string;
+    /**
+     * Client secret issued by the authorization server.
+     */
+    clientSecret: string;
+    /**
+     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+     * @format int64
+     */
+    clientIdIssuedAt: number;
+    /**
+     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+     * @format int64
+     */
+    clientSecretExpiresAt: number;
+    /**
+     * Client name (registered metadata).
+     */
+    name?: string;
+    /**
+     * List of redirect URIs (registered metadata).
+     */
+    redirectUris?: string[];
+    /**
+     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
+     * @format uri
+     */
+    registrationClientUri: string;
+    /**
+     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+     */
+    registrationAccessToken: string;
+    /**
+     * List of scopes (registered metadata).
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types (registered metadata).
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+export type OrderNotification = {
+    /**
+     * Unique order identifier.
+     */
+    orderId: string;
+    orderStatus: OrderStatus;
+    /**
+     * When the event occurred.
+     * @format date-time
+     */
+    timestamp: string;
+};
+
+/**
+ * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
+ */
+export function isBeverage(value: MenuItem): value is Beverage {
+    return (value as Record<string, unknown>)["category"] === "beverage";
+}
+
+/**
+ * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
+ */
+export function isDessert(value: MenuItem): value is Dessert {
+    return (value as Record<string, unknown>)["category"] === "dessert";
+}
+
+/**
+ * Static metadata for every operation, keyed by operationId: the HTTP `method`
+ * and the `path` template (with `{param}` placeholders intact). Minification-safe
+ * — useful for building cache/query keys, tracing span names, and request logging
+ * without re-deriving them at each call site.
+ */
+export const OPERATIONS = {
+    listMenuItems: { method: "GET", path: "/menu" },
+    createMenuItem: { method: "POST", path: "/menu" },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
+    listOrders: { method: "GET", path: "/orders" },
+    createOrder: { method: "POST", path: "/orders" },
+    getOrderById: { method: "GET", path: "/orders/{orderId}" },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
+    listOrderItems: { method: "GET", path: "/order-items" },
+    getRevenue: { method: "GET", path: "/revenue" },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
+} as const;
+
+/**
+ * The operationId of any operation in this client.
+ */
+export type OperationId = keyof typeof OPERATIONS;
+
+/**
+ * Static metadata describing one operation: its HTTP method and path template.
+ */
+export type OperationMetadata = {
+    readonly method: string;
+    readonly path: string;
+};
+
+let BASE = "http://127.0.0.1:3101";
+
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+export type RequestContext = {
+    url: string;
+    method: string;
+    headers: Record<string, string>;
+    body?: unknown;
+};
+
+/**
+ * Configuration and extension hooks for a client. Supplied per-instance via
+ * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
+ * (functions facade).
+ */
+export type ClientConfig = {
+    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    baseUrl?: string;
+    /** Extra headers merged into every request; a function is invoked per request. */
+    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+    /** Transport used to issue requests. Defaults to the global `fetch`. */
+    fetch?: typeof fetch;
+    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    /** Observe — or replace, by returning a `Response` — the response before parsing. */
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    /**
+     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
+     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
+     */
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
+    /**
+     * Composable interceptors run around every request, alongside the single
+     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
+     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
+     * the last-registered middleware wraps closest to the network. Register more at runtime
+     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
+     */
+    middleware?: Middleware[];
+    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
+    retry?: RetryConfig;
+    /**
+     * Per-instance auth credentials. When set, they override the module-global
+     * `set*` helpers for requests made through this config (each scheme falls back
+     * to its global slot when omitted here). Only the schemes an operation declares
+     * in its `security` are ever sent.
+     */
+    auth?: AuthCredentials;
+};
+
+/**
+ * A request interceptor; every field is optional, so a middleware can hook any subset of
+ * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
+ * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
+ * failure into the error to throw, threaded through each middleware in turn.
+ */
+export type Middleware = {
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/** Context handed to `retryOn` for the attempt that just failed. */
+export type RetryContext = {
+    /** 1-based number of the attempt that just failed. */
+    attempt: number;
+    /** The request that was attempted. */
+    request: RequestContext;
+    /** Present when the server returned a (non-ok) response. */
+    response?: Response;
+    /** Present when the transport threw (network error, DNS, connection reset). */
+    error?: unknown;
+};
+
+/** Retry policy; all fields optional with sensible defaults. */
+export type RetryConfig = {
+    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
+    retries?: number;
+    /** Base delay in milliseconds. Default 1000. */
+    retryDelay?: number;
+    /** Backoff shape. Default 'exponential'. */
+    retryStrategy?: RetryStrategy;
+    /** Apply full jitter over the computed delay. Default true. */
+    jitter?: boolean;
+    /**
+     * Decide whether to retry a failed attempt. Default: retry only idempotent
+     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
+     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
+     */
+    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
+};
+
+/**
+ * How the response body is read. `'auto'` negotiates from the content type (the
+ * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
+ */
+export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
+
+/**
+ * The trailing per-operation argument: standard `RequestInit` plus an optional
+ * per-call retry override and a `parseAs` escape hatch.
+ *
+ * `parseAs` forces how the response body is read; overrides the inferred kind.
+ * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
+ * override — the static return type is unchanged.
+ */
+export type RequestOptions = RequestInit & {
+    retry?: Partial<RetryConfig>;
+    parseAs?: ParseAs;
+};
+
+/**
+ * Override the base URL used by every generated operation. Useful when the
+ * runtime environment differs from the value declared in `servers[0].url`
+ * (e.g. dev / staging / prod toggles in a single-page app).
+ *
+ * Mutates a module-scoped binding shared by the functions facade. For multiple
+ * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ */
+export function setBaseUrl(url: string): void {
+    BASE = url;
+}
+
+/** The global config used by the functions facade (see `configure`). */
+const __config: ClientConfig = {};
+
+/**
+ * Merge `config` into the global configuration used by the functions facade —
+ * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
+ * hooks once for every free function. The service-class facade configures per
+ * instance instead (`new Client(config)`).
+ */
+export function configure(config: ClientConfig): void {
+    Object.assign(__config, config);
+}
+
+/**
+ * Append interceptors to the functions facade's global middleware chain (see
+ * `ClientConfig.middleware`). The service-class facade registers per instance via
+ * `<Client>.use(...)` instead.
+ */
+export function use(...middleware: Middleware[]): void {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    __config.middleware = [...(__config.middleware ?? []), ...middleware];
+}
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function __middleware(config: ClientConfig): Middleware[] {
+    const single = config.onRequest || config.onResponse || config.onError
+        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+        : [];
+    return [...single, ...(config.middleware ?? [])];
+}
+
+export class ApiError extends Error {
+    public readonly url: string;
+    public readonly status: number;
+    public readonly statusText: string;
+    public readonly body: unknown;
+    constructor(url: string, status: number, statusText: string, body: unknown) {
+        super(`Request failed with status ${status}`);
+        this.name = 'ApiError';
+        this.url = url;
+        this.status = status;
+        this.statusText = statusText;
+        this.body = body;
+    }
+}
+
+type QueryPrimitive = string | number | boolean;
+
+type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
+
+/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
+type QueryStyle = {
+    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+    explode: boolean;
+    allowReserved?: boolean;
+};
+
+/**
+ * Percent-encode `value` but leave the RFC-3986 reserved set
+ * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
+ */
+function __encodeReserved(value: string): string {
+    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
+}
+
+function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
+    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    if (!query)
+        return url;
+    const params = new URLSearchParams();
+    const raw: string[] = [];
+    for (const [key, value] of Object.entries(query)) {
+        if (value === undefined || value === null)
+            continue;
+        const spec = styles?.[key];
+        if (!spec) {
+            if (Array.isArray(value)) {
+                for (const v of value) {
+                    if (v !== undefined && v !== null)
+                        params.append(key, String(v));
+                }
+            }
+            else if (typeof value === 'object') {
+                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+                for (const [subKey, subValue] of Object.entries(value)) {
+                    if (subValue !== undefined && subValue !== null) {
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                    }
+                }
+            }
+            else {
+                params.append(key, String(value));
+            }
+            continue;
+        }
+        if (Array.isArray(value)) {
+            const items = value.filter((v) => v !== undefined && v !== null).map(String);
+            if (spec.style === 'form' && spec.explode) {
+                for (const v of items) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}=${__encodeReserved(v)}`);
+                    else
+                        params.append(key, v);
+                }
+            }
+            else {
+                // Delimited styles put the LITERAL delimiter on the wire; only the
+                // values are encoded. `%20` (not `+`) is the literal space delimiter.
+                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
+                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+            }
+        }
+        else if (typeof value === 'object') {
+            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+            for (const [subKey, subValue] of Object.entries(value)) {
+                if (subValue !== undefined && subValue !== null) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
+                    else
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                }
+            }
+        }
+        else if (spec.allowReserved) {
+            raw.push(`${key}=${__encodeReserved(String(value))}`);
+        }
+        else {
+            params.append(key, String(value));
+        }
+    }
+    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+    return qs ? `${url}?${qs}` : url;
+}
+
+async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+    response: Response;
+    context: RequestContext;
+}> {
+    const { retry: callRetry, ...fetchInit } = init;
+    const retry: RetryConfig = { ...config.retry, ...callRetry };
+    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+    const headers: Record<string, string> = {
+        Accept: 'application/json',
+        ...extra,
+        ...(fetchInit.headers as Record<string, string> | undefined),
+    };
+    let payload: BodyInit | undefined;
+    if (body !== undefined) {
+        const isBinary = body instanceof Blob ||
+            body instanceof ArrayBuffer ||
+            ArrayBuffer.isView(body as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
+        const isURLSearchParams = body instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
+            payload = body as BodyInit;
+        }
+        else {
+            payload = JSON.stringify(body);
+            if (!('Content-Type' in headers) && !('content-type' in headers)) {
+                headers['Content-Type'] = 'application/json';
+            }
+        }
+    }
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    const doFetch = config.fetch ?? fetch;
+    const maxAttempts = 1 + (retry.retries ?? 0);
+    const retryOn = retry.retryOn ?? __defaultRetryOn;
+    const signal = fetchInit.signal ?? undefined;
+    let attempt = 0;
+    while (true) {
+        attempt++;
+        if (signal?.aborted)
+            throw __abortError(signal);
+        let response: Response;
+        try {
+            response = await doFetch(context.url, {
+                ...fetchInit,
+                method: context.method,
+                headers: context.headers,
+                body: payload,
+            });
+        }
+        catch (error) {
+            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
+                await __sleep(__retryDelay(retry, attempt, null), signal);
+                continue;
+            }
+            throw error;
+        }
+        // Reverse order: the last-registered middleware wraps closest to the network (onion).
+        for (let i = middleware.length - 1; i >= 0; i--) {
+            const onResponse = middleware[i].onResponse;
+            if (onResponse) {
+                const replaced = await onResponse(response, context);
+                if (replaced)
+                    response = replaced;
+            }
+        }
+        if (!response.ok &&
+            attempt < maxAttempts &&
+            !signal?.aborted &&
+            (await retryOn({ attempt, request: context, response }))) {
+            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            continue;
+        }
+        return { response, context };
+    }
+}
+
+async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+    if (kind === 'void' || response.status === 204)
+        return undefined;
+    if (kind === 'stream')
+        return response.body;
+    if (kind === 'blob')
+        return response.blob();
+    if (kind === 'arrayBuffer')
+        return response.arrayBuffer();
+    if (kind === 'formData')
+        return response.formData();
+    if (kind === 'text')
+        return response.text();
+    if (kind === 'json')
+        return response.json();
+    // 'auto' — negotiate from the response's content type.
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json'))
+        return response.json();
+    if (contentType.startsWith('text/'))
+        return response.text();
+    return response.blob();
+}
+
+async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+    const { parseAs, ...sendInit } = init;
+    const { response, context } = await __send(config, url, sendInit, body);
+    if (!response.ok) {
+        const errorBody = await readError(response);
+        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
+        // Thread the error through each middleware's onError in turn (each may replace it).
+        for (const mw of __middleware(config)) {
+            if (mw.onError)
+                error = await mw.onError(error as ApiError, context);
+        }
+        throw error;
+    }
+    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
+    return (await __parse(response, kind)) as T;
+}
+
+async function readError(response: Response): Promise<unknown> {
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json')) {
+        return response.json().catch(() => undefined);
+    }
+    return response.text().catch(() => undefined);
+}
+
+const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+
+const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+function __defaultRetryOn(ctx: RetryContext): boolean {
+    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
+        return false;
+    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+    if (retryAfter) {
+        const seconds = Number(retryAfter);
+        if (!Number.isNaN(seconds))
+            return seconds * 1000;
+        const when = Date.parse(retryAfter);
+        if (!Number.isNaN(when))
+            return Math.max(0, when - Date.now());
+    }
+    const base = retry.retryDelay ?? 1000;
+    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+    return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
+    return new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject(__abortError(signal));
+            return;
+        }
+        const onAbort = () => {
+            clearTimeout(timer);
+            reject(__abortError(signal as AbortSignal));
+        };
+        const timer = setTimeout(() => {
+            if (signal)
+                signal.removeEventListener('abort', onAbort);
+            resolve();
+        }, ms);
+        if (signal)
+            signal.addEventListener('abort', onAbort, { once: true });
+    });
+}
+
+function __abortError(signal: AbortSignal): globalThis.Error {
+    const reason = (signal as {
+        reason?: unknown;
+    }).reason;
+    if (reason instanceof Error)
+        return reason;
+    return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * Normalize an operation's header-parameter object into a plain string record,
+ * dropping any `undefined` / `null` entries (optional headers the caller omitted)
+ * and stringifying the rest. Mirrors __buildUrl's handling of query values.
+ */
+function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
+    const out: Record<string, string> = {};
+    for (const [key, value] of Object.entries(values)) {
+        if (value !== undefined && value !== null)
+            out[key] = String(value);
+    }
+    return out;
+}
+
+/**
+ * A credential value, or a (possibly async) function that returns one per request.
+ */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/**
+ * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
+ * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
+ * to the global slots.
+ */
+export type AuthCredentials = {
+    bearer?: TokenProvider;
+    apiKey?: Record<string, TokenProvider>;
+};
+
+let __bearerToken: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
+ * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
+ * (possibly async) function resolved per request.
+ */
+export function setBearer(token: TokenProvider | null): void {
+    __bearerToken = token;
+}
+
+let __apiKey_ApiKey: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
+ * string or a (possibly async) function resolved per request.
+ */
+export function setApiKey(key: TokenProvider | null): void {
+    __apiKey_ApiKey = key;
+}
+
+/**
+ * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
+ */
+async function __resolve(slot: TokenProvider | null): Promise<string | null> {
+    if (slot === null)
+        return null;
+    return typeof slot === "function" ? slot() : slot;
+}
+
+/**
+ * Build the auth `headers` and `query` for an operation from the currently-set credentials.
+ * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
+ * can always override by passing their own `init.headers`.
+ */
+async function __auth(schemes: string[], config: ClientConfig): Promise<{
+    headers: Record<string, string>;
+    query: Record<string, string>;
+}> {
+    const headers: Record<string, string> = {};
+    const query: Record<string, string> = {};
+    const cookies: string[] = [];
+    for (const scheme of schemes) {
+        switch (scheme) {
+            case "OAuth2": {
+                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
+                if (v !== null)
+                    headers["Authorization"] = `Bearer ${v}`;
+                break;
+            }
+            case "ApiKey": {
+                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
+                if (v !== null)
+                    headers["X-API-Key"] = v;
+                break;
+            }
+        }
+    }
+    if (cookies.length > 0)
+        headers["Cookie"] = cookies.join("; ");
+    return { headers, query };
+}
+
+export type ListMenuItemsResult = MenuItemList;
+
+export type ListMenuItemsParams = {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+};
+
+export type ListMenuItemsVariables = {
+    params?: ListMenuItemsParams;
+};
+
+/**
+ * List all menu items
+ *
+ * Retrieve a collection of menu items with optional filtering and pagination.
+ */
+export async function listMenuItems(params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
+    return __request<MenuItemList>(__config, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
+}
+
+export type CreateMenuItemResult = MenuItem;
+
+export type CreateMenuItemBody = FormData;
+
+export type CreateMenuItemVariables = {
+    body: CreateMenuItemBody;
+};
+
+/**
+ * Create menu item
+ *
+ * Create a new menu item.
+ */
+export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<MenuItem>(__config, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type DeleteMenuItemResult = void;
+
+export type DeleteMenuItemVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+};
+
+/**
+ * Delete a menu item
+ *
+ * Delete an existing menu item.
+ */
+export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type GetMenuItemPhotoResult = Blob | string;
+
+export type GetMenuItemPhotoParams = {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+};
+
+export type GetMenuItemPhotoVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+    params?: GetMenuItemPhotoParams;
+};
+
+/**
+ * Retrieve a menu item photo
+ *
+ * Retrieve the product photo image for a specific menu item.
+ */
+export async function getMenuItemPhoto(menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}): Promise<Blob | string> {
+    return __request<Blob | string>(__config, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+}
+
+export type ListOrdersResult = OrderList;
+
+export type ListOrdersParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+};
+
+export type ListOrdersVariables = {
+    params?: ListOrdersParams;
+};
+
+/**
+ * List all orders
+ *
+ * Retrieve a collection of orders with optional filtering and pagination.
+ */
+export async function listOrders(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderList> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderList>(__config, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+/**
+ * Create order
+ *
+ * Create a new order.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    headers?: GetOrderByIdHeaders;
+};
+
+/**
+ * Retrieve an order
+ *
+ * Retrieve a single order by its ID.
+ */
+export async function getOrderById(orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+}
+
+export type DeleteOrderResult = void;
+
+export type DeleteOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+};
+
+/**
+ * Delete an order
+ *
+ * Delete the order.
+ * To keep the order history, the order should be canceled instead of deleted.
+ */
+export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type UpdateOrderResult = Order;
+
+export type UpdateOrderBody = {
+    status: OrderStatus;
+};
+
+export type UpdateOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    body?: UpdateOrderBody;
+};
+
+/**
+ * Partially update an order
+ *
+ * Update an existing order status.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function updateOrder(orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type ListOrderItemsResult = OrderItem[];
+
+export type ListOrderItemsParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+};
+
+export type ListOrderItemsVariables = {
+    params?: ListOrderItemsParams;
+};
+
+/**
+ * List all order items with menu item details
+ *
+ * Returns an array of order items for a specific order.
+ * Use the `filter` parameter to filter by order ID.
+ */
+export async function listOrderItems(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderItem[]>(__config, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+/**
+ * Get revenue statistics
+ *
+ * Retrieve revenue statistics for a configurable date range.
+ * Returns revenue, order counts, average order amount, and other useful statistics.
+ */
+export async function getRevenue(params: {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
+    const __a = await __auth(["ApiKey"], __config);
+    return __request<RevenueStatistics>(__config, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Create OAuth2 client
+ *
+ * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+ * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
+ *   `redirectUris` must be provided (per RFC 7591 Section 2).
+ * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+ * Returns the registered client information per RFC 7591, including:
+ * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+ */
+export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
+    return __request<OAuth2Client>(__config, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+}
diff --git a/tests/e2e/generate-client/sse-consumer/api.ts b/tests/e2e/generate-client/sse-consumer/api.ts
new file mode 100644
index 0000000000..7551911e98
--- /dev/null
+++ b/tests/e2e/generate-client/sse-consumer/api.ts
@@ -0,0 +1,638 @@
+// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * SSE API (v1.0.0)
+ */
+
+export type Health = {
+    status: string;
+};
+
+export type Message = {
+    text: string;
+    seq: number;
+};
+
+/**
+ * Static metadata for every operation, keyed by operationId: the HTTP `method`
+ * and the `path` template (with `{param}` placeholders intact). Minification-safe
+ * — useful for building cache/query keys, tracing span names, and request logging
+ * without re-deriving them at each call site.
+ */
+export const OPERATIONS = {
+    getHealth: { method: "GET", path: "/health" },
+    streamMessages: { method: "GET", path: "/messages" },
+    streamAbort: { method: "GET", path: "/abort-messages" },
+    streamTicks: { method: "GET", path: "/ticks" }
+} as const;
+
+/**
+ * The operationId of any operation in this client.
+ */
+export type OperationId = keyof typeof OPERATIONS;
+
+/**
+ * Static metadata describing one operation: its HTTP method and path template.
+ */
+export type OperationMetadata = {
+    readonly method: string;
+    readonly path: string;
+};
+
+let BASE = "http://localhost:3104";
+
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+export type RequestContext = {
+    url: string;
+    method: string;
+    headers: Record<string, string>;
+    body?: unknown;
+};
+
+/**
+ * Configuration and extension hooks for a client. Supplied per-instance via
+ * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
+ * (functions facade).
+ */
+export type ClientConfig = {
+    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    baseUrl?: string;
+    /** Extra headers merged into every request; a function is invoked per request. */
+    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+    /** Transport used to issue requests. Defaults to the global `fetch`. */
+    fetch?: typeof fetch;
+    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    /** Observe — or replace, by returning a `Response` — the response before parsing. */
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    /**
+     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
+     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
+     */
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
+    /**
+     * Composable interceptors run around every request, alongside the single
+     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
+     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
+     * the last-registered middleware wraps closest to the network. Register more at runtime
+     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
+     */
+    middleware?: Middleware[];
+    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
+    retry?: RetryConfig;
+};
+
+/**
+ * A request interceptor; every field is optional, so a middleware can hook any subset of
+ * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
+ * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
+ * failure into the error to throw, threaded through each middleware in turn.
+ */
+export type Middleware = {
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/** Context handed to `retryOn` for the attempt that just failed. */
+export type RetryContext = {
+    /** 1-based number of the attempt that just failed. */
+    attempt: number;
+    /** The request that was attempted. */
+    request: RequestContext;
+    /** Present when the server returned a (non-ok) response. */
+    response?: Response;
+    /** Present when the transport threw (network error, DNS, connection reset). */
+    error?: unknown;
+};
+
+/** Retry policy; all fields optional with sensible defaults. */
+export type RetryConfig = {
+    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
+    retries?: number;
+    /** Base delay in milliseconds. Default 1000. */
+    retryDelay?: number;
+    /** Backoff shape. Default 'exponential'. */
+    retryStrategy?: RetryStrategy;
+    /** Apply full jitter over the computed delay. Default true. */
+    jitter?: boolean;
+    /**
+     * Decide whether to retry a failed attempt. Default: retry only idempotent
+     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
+     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
+     */
+    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
+};
+
+/**
+ * How the response body is read. `'auto'` negotiates from the content type (the
+ * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
+ */
+export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
+
+/**
+ * The trailing per-operation argument: standard `RequestInit` plus an optional
+ * per-call retry override and a `parseAs` escape hatch.
+ *
+ * `parseAs` forces how the response body is read; overrides the inferred kind.
+ * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
+ * override — the static return type is unchanged.
+ */
+export type RequestOptions = RequestInit & {
+    retry?: Partial<RetryConfig>;
+    parseAs?: ParseAs;
+};
+
+/**
+ * Override the base URL used by every generated operation. Useful when the
+ * runtime environment differs from the value declared in `servers[0].url`
+ * (e.g. dev / staging / prod toggles in a single-page app).
+ *
+ * Mutates a module-scoped binding shared by the functions facade. For multiple
+ * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ */
+export function setBaseUrl(url: string): void {
+    BASE = url;
+}
+
+/** The global config used by the functions facade (see `configure`). */
+const __config: ClientConfig = {};
+
+/**
+ * Merge `config` into the global configuration used by the functions facade —
+ * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
+ * hooks once for every free function. The service-class facade configures per
+ * instance instead (`new Client(config)`).
+ */
+export function configure(config: ClientConfig): void {
+    Object.assign(__config, config);
+}
+
+/**
+ * Append interceptors to the functions facade's global middleware chain (see
+ * `ClientConfig.middleware`). The service-class facade registers per instance via
+ * `<Client>.use(...)` instead.
+ */
+export function use(...middleware: Middleware[]): void {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    __config.middleware = [...(__config.middleware ?? []), ...middleware];
+}
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function __middleware(config: ClientConfig): Middleware[] {
+    const single = config.onRequest || config.onResponse || config.onError
+        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+        : [];
+    return [...single, ...(config.middleware ?? [])];
+}
+
+export class ApiError extends Error {
+    public readonly url: string;
+    public readonly status: number;
+    public readonly statusText: string;
+    public readonly body: unknown;
+    constructor(url: string, status: number, statusText: string, body: unknown) {
+        super(`Request failed with status ${status}`);
+        this.name = 'ApiError';
+        this.url = url;
+        this.status = status;
+        this.statusText = statusText;
+        this.body = body;
+    }
+}
+
+type QueryPrimitive = string | number | boolean;
+
+type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
+
+/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
+type QueryStyle = {
+    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+    explode: boolean;
+    allowReserved?: boolean;
+};
+
+/**
+ * Percent-encode `value` but leave the RFC-3986 reserved set
+ * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
+ */
+function __encodeReserved(value: string): string {
+    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
+}
+
+function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
+    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    if (!query)
+        return url;
+    const params = new URLSearchParams();
+    const raw: string[] = [];
+    for (const [key, value] of Object.entries(query)) {
+        if (value === undefined || value === null)
+            continue;
+        const spec = styles?.[key];
+        if (!spec) {
+            if (Array.isArray(value)) {
+                for (const v of value) {
+                    if (v !== undefined && v !== null)
+                        params.append(key, String(v));
+                }
+            }
+            else if (typeof value === 'object') {
+                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+                for (const [subKey, subValue] of Object.entries(value)) {
+                    if (subValue !== undefined && subValue !== null) {
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                    }
+                }
+            }
+            else {
+                params.append(key, String(value));
+            }
+            continue;
+        }
+        if (Array.isArray(value)) {
+            const items = value.filter((v) => v !== undefined && v !== null).map(String);
+            if (spec.style === 'form' && spec.explode) {
+                for (const v of items) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}=${__encodeReserved(v)}`);
+                    else
+                        params.append(key, v);
+                }
+            }
+            else {
+                // Delimited styles put the LITERAL delimiter on the wire; only the
+                // values are encoded. `%20` (not `+`) is the literal space delimiter.
+                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
+                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+            }
+        }
+        else if (typeof value === 'object') {
+            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+            for (const [subKey, subValue] of Object.entries(value)) {
+                if (subValue !== undefined && subValue !== null) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
+                    else
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                }
+            }
+        }
+        else if (spec.allowReserved) {
+            raw.push(`${key}=${__encodeReserved(String(value))}`);
+        }
+        else {
+            params.append(key, String(value));
+        }
+    }
+    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+    return qs ? `${url}?${qs}` : url;
+}
+
+async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+    response: Response;
+    context: RequestContext;
+}> {
+    const { retry: callRetry, ...fetchInit } = init;
+    const retry: RetryConfig = { ...config.retry, ...callRetry };
+    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+    const headers: Record<string, string> = {
+        Accept: 'application/json',
+        ...extra,
+        ...(fetchInit.headers as Record<string, string> | undefined),
+    };
+    let payload: BodyInit | undefined;
+    if (body !== undefined) {
+        const isBinary = body instanceof Blob ||
+            body instanceof ArrayBuffer ||
+            ArrayBuffer.isView(body as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
+        const isURLSearchParams = body instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
+            payload = body as BodyInit;
+        }
+        else {
+            payload = JSON.stringify(body);
+            if (!('Content-Type' in headers) && !('content-type' in headers)) {
+                headers['Content-Type'] = 'application/json';
+            }
+        }
+    }
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    const doFetch = config.fetch ?? fetch;
+    const maxAttempts = 1 + (retry.retries ?? 0);
+    const retryOn = retry.retryOn ?? __defaultRetryOn;
+    const signal = fetchInit.signal ?? undefined;
+    let attempt = 0;
+    while (true) {
+        attempt++;
+        if (signal?.aborted)
+            throw __abortError(signal);
+        let response: Response;
+        try {
+            response = await doFetch(context.url, {
+                ...fetchInit,
+                method: context.method,
+                headers: context.headers,
+                body: payload,
+            });
+        }
+        catch (error) {
+            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
+                await __sleep(__retryDelay(retry, attempt, null), signal);
+                continue;
+            }
+            throw error;
+        }
+        // Reverse order: the last-registered middleware wraps closest to the network (onion).
+        for (let i = middleware.length - 1; i >= 0; i--) {
+            const onResponse = middleware[i].onResponse;
+            if (onResponse) {
+                const replaced = await onResponse(response, context);
+                if (replaced)
+                    response = replaced;
+            }
+        }
+        if (!response.ok &&
+            attempt < maxAttempts &&
+            !signal?.aborted &&
+            (await retryOn({ attempt, request: context, response }))) {
+            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            continue;
+        }
+        return { response, context };
+    }
+}
+
+async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+    if (kind === 'void' || response.status === 204)
+        return undefined;
+    if (kind === 'stream')
+        return response.body;
+    if (kind === 'blob')
+        return response.blob();
+    if (kind === 'arrayBuffer')
+        return response.arrayBuffer();
+    if (kind === 'formData')
+        return response.formData();
+    if (kind === 'text')
+        return response.text();
+    if (kind === 'json')
+        return response.json();
+    // 'auto' — negotiate from the response's content type.
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json'))
+        return response.json();
+    if (contentType.startsWith('text/'))
+        return response.text();
+    return response.blob();
+}
+
+async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+    const { parseAs, ...sendInit } = init;
+    const { response, context } = await __send(config, url, sendInit, body);
+    if (!response.ok) {
+        const errorBody = await readError(response);
+        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
+        // Thread the error through each middleware's onError in turn (each may replace it).
+        for (const mw of __middleware(config)) {
+            if (mw.onError)
+                error = await mw.onError(error as ApiError, context);
+        }
+        throw error;
+    }
+    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
+    return (await __parse(response, kind)) as T;
+}
+
+async function readError(response: Response): Promise<unknown> {
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json')) {
+        return response.json().catch(() => undefined);
+    }
+    return response.text().catch(() => undefined);
+}
+
+const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+
+const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+function __defaultRetryOn(ctx: RetryContext): boolean {
+    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
+        return false;
+    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+    if (retryAfter) {
+        const seconds = Number(retryAfter);
+        if (!Number.isNaN(seconds))
+            return seconds * 1000;
+        const when = Date.parse(retryAfter);
+        if (!Number.isNaN(when))
+            return Math.max(0, when - Date.now());
+    }
+    const base = retry.retryDelay ?? 1000;
+    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+    return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
+    return new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject(__abortError(signal));
+            return;
+        }
+        const onAbort = () => {
+            clearTimeout(timer);
+            reject(__abortError(signal as AbortSignal));
+        };
+        const timer = setTimeout(() => {
+            if (signal)
+                signal.removeEventListener('abort', onAbort);
+            resolve();
+        }, ms);
+        if (signal)
+            signal.addEventListener('abort', onAbort, { once: true });
+    });
+}
+
+function __abortError(signal: AbortSignal): globalThis.Error {
+    const reason = (signal as {
+        reason?: unknown;
+    }).reason;
+    if (reason instanceof Error)
+        return reason;
+    return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/** A single decoded Server-Sent Event. `data` is the parsed payload (`T`). */
+export type ServerSentEvent<T> = {
+    event?: string;
+    data: T;
+    id?: string;
+    retry?: number;
+};
+
+/** Per-call options for an SSE stream. `reconnect` defaults to true (auto-reconnect). */
+export type SseOptions = RequestInit & {
+    /** Opt out of automatic reconnection; the iterator then ends/throws on the first stream end/error. */
+    reconnect?: boolean;
+    /** Override the base reconnect backoff in ms. The server's `retry:` value still takes precedence. */
+    reconnectDelay?: number;
+};
+
+async function* __sse<T>(config: ClientConfig, url: string, init: SseOptions, dataKind: 'json' | 'text' = 'text'): AsyncGenerator<ServerSentEvent<T>> {
+    const { reconnect = true, reconnectDelay, ...rest } = init;
+    const signal = rest.signal ?? undefined;
+    const headers: Record<string, string> = {
+        Accept: 'text/event-stream',
+        ...(rest.headers as Record<string, string> | undefined),
+    };
+    let lastEventId: string | undefined;
+    let serverRetry: number | undefined;
+    let failures = 0;
+    while (true) {
+        if (signal?.aborted)
+            return;
+        const sendHeaders = lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
+        let response: Response;
+        try {
+            ({ response } = await __send(config, url, { ...rest, method: rest.method ?? 'GET', headers: sendHeaders }));
+        }
+        catch (error) {
+            if (signal?.aborted)
+                return;
+            throw error;
+        }
+        if (!response.ok) {
+            const errorBody = await readError(response);
+            throw new ApiError(url, response.status, response.statusText, errorBody);
+        }
+        failures = 0;
+        try {
+            const body = response.body;
+            if (!body)
+                return;
+            const reader = body.getReader();
+            const decoder = new TextDecoder();
+            let buffer = '';
+            try {
+                while (true) {
+                    const { done, value } = await reader.read();
+                    if (done)
+                        break;
+                    buffer += decoder.decode(value, { stream: true });
+                    let index: number;
+                    while ((index = buffer.search(/\r\n\r\n|\n\n|\r\r/)) !== -1) {
+                        const raw = buffer.slice(0, index);
+                        buffer = buffer.slice(index + buffer.slice(index).match(/^(\r\n\r\n|\n\n|\r\r)/)![0].length);
+                        const event = __parseSseFrame(raw, dataKind);
+                        if (event) {
+                            if (event.id !== undefined)
+                                lastEventId = event.id;
+                            if (event.retry !== undefined)
+                                serverRetry = event.retry;
+                            yield event as ServerSentEvent<T>;
+                        }
+                    }
+                    // Bound memory: a server that never sends a frame delimiter would otherwise
+                    // grow `buffer` without limit. 1 MiB is far above any real SSE frame.
+                    if (buffer.length > 1048576) {
+                        throw new Error('SSE frame exceeded 1048576 characters without a delimiter');
+                    }
+                }
+            }
+            finally {
+                await reader.cancel().catch(() => undefined);
+            }
+        }
+        catch (error) {
+            if (signal?.aborted)
+                return;
+            if (!reconnect)
+                throw error;
+        }
+        if (!reconnect || signal?.aborted)
+            return;
+        failures++;
+        const base = serverRetry ?? reconnectDelay ?? 1000;
+        const delay = Math.min(base * Math.pow(2, failures - 1), 30000);
+        try {
+            await __sleep(Math.random() * delay, signal);
+        }
+        catch (error) {
+            if (signal?.aborted)
+                return;
+            throw error;
+        }
+    }
+}
+
+/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */
+function __parseSseFrame(raw: string, dataKind: 'json' | 'text'): ServerSentEvent<unknown> | undefined {
+    let event: string | undefined;
+    const dataLines: string[] = [];
+    let id: string | undefined;
+    let retry: number | undefined;
+    let sawField = false;
+    for (const line of raw.split(/\r\n|\n|\r/)) {
+        if (line === '' || line.startsWith(':'))
+            continue;
+        const colon = line.indexOf(':');
+        const field = colon === -1 ? line : line.slice(0, colon);
+        let val = colon === -1 ? '' : line.slice(colon + 1);
+        if (val.startsWith(' '))
+            val = val.slice(1);
+        sawField = true;
+        if (field === 'event')
+            event = val;
+        else if (field === 'data')
+            dataLines.push(val);
+        else if (field === 'id')
+            id = val;
+        else if (field === 'retry') {
+            const n = Number(val);
+            if (!Number.isNaN(n))
+                retry = n;
+        }
+    }
+    if (!sawField)
+        return undefined;
+    const dataText = dataLines.join('\n');
+    const data = dataKind === 'json' && dataText !== '' ? JSON.parse(dataText) : dataText;
+    return { event, data, id, retry };
+}
+
+export type GetHealthResult = Health;
+
+export async function getHealth(init: RequestOptions = {}): Promise<Health> {
+    return __request<Health>(__config, __buildUrl(__config, `/health`), { method: "GET", ...init });
+}
+
+async function* streamMessages(init: SseOptions = {}): AsyncGenerator<ServerSentEvent<Message>> {
+    yield* __sse<Message>(__config, __buildUrl(__config, `/messages`), { method: "GET", ...init }, "json");
+}
+
+async function* streamAbort(init: SseOptions = {}): AsyncGenerator<ServerSentEvent<Message>> {
+    yield* __sse<Message>(__config, __buildUrl(__config, `/abort-messages`), { method: "GET", ...init }, "json");
+}
+
+async function* streamTicks(init: SseOptions = {}): AsyncGenerator<ServerSentEvent<string>> {
+    yield* __sse<string>(__config, __buildUrl(__config, `/ticks`), { method: "GET", ...init }, "text");
+}
+
+export const sse = { streamMessages, streamAbort, streamTicks };
diff --git a/tests/e2e/generate-client/sse.runtime.test.ts b/tests/e2e/generate-client/sse.runtime.test.ts
index f02e8a52e4..b813d16d12 100644
--- a/tests/e2e/generate-client/sse.runtime.test.ts
+++ b/tests/e2e/generate-client/sse.runtime.test.ts
@@ -91,8 +91,9 @@ describe('generate-client SSE consumer (reconnect + abort)', () => {
     if (serverProcess) {
       await killServer(serverProcess);
     }
-    // The generated `api.ts` is intentionally left in place (gitignored), matching
-    // the other consumer harnesses — `tsc --noEmit` over the repo expects it present.
+    // The generated `api.ts` is intentionally left in place, matching the other
+    // consumer harnesses — it's committed (regeneration is deterministic) so the
+    // repo-wide `tsc --noEmit` typecheck finds it present on a fresh checkout.
   });
 
   test('reconnect: events stream across a dropped connection, resuming via Last-Event-ID', () => {

From adc413e7a12dd0bd94edbbb14545c882c67ec2b0 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 22 Jun 2026 16:49:16 +0300
Subject: [PATCH 011/134] fix: formatting

---
 .oxfmtrc.json                                 |  1 +
 .oxlintrc.json                                |  3 +-
 CONTRIBUTING.md                               |  4 +-
 docs/@v2/commands/generate-client.md          |  2 +
 packages/cli/src/commands/generate-client.ts  |  8 ++-
 .../docs/adr/0001-ast-codegen.md              |  2 +-
 .../docs/adr/0002-typescript-peer-dep.md      |  2 +-
 .../docs/adr/0004-registry-seams.md           |  2 +-
 .../docs/adr/0010-mock-data-baked-vs-faker.md |  2 +-
 .../emitters/__tests__/type-guards.test.ts    | 31 ++++++++---
 .../openapi-typescript/src/emitters/mock.ts   |  2 +-
 .../src/emitters/operations.ts                |  1 -
 .../src/emitters/type-guards.ts               | 15 ++++--
 .../src/generators/__tests__/resolve.test.ts  | 16 +++---
 .../src/generators/resolve.ts                 |  3 +-
 .../src/ir/sanitize-identifiers.ts            |  3 +-
 tests/e2e/generate-client/auth.test.ts        |  4 +-
 .../generator-contract.test.ts                | 37 +++++++++++---
 .../identifier-injection.test.ts              | 12 +++--
 tests/e2e/generate-client/middleware.test.ts  | 17 +++++--
 tests/e2e/generate-client/multipart.test.ts   | 22 ++++++--
 .../generate-client/per-instance-auth.test.ts | 10 +++-
 .../generate-client/redocly-config.test.ts    | 51 ++++++++++++++-----
 tsconfig.json                                 |  9 +---
 24 files changed, 183 insertions(+), 76 deletions(-)

diff --git a/.oxfmtrc.json b/.oxfmtrc.json
index b744bd7103..b4ebd4ff2d 100644
--- a/.oxfmtrc.json
+++ b/.oxfmtrc.json
@@ -14,6 +14,7 @@
     "LICENSE.md",
     "snapshot*.txt",
     "*.snapshot.ts",
+    "tests/e2e/generate-client/*-consumer/api.ts",
     ".changeset/pre.json",
     "*.html",
     "tests/e2e/**/*.yaml",
diff --git a/.oxlintrc.json b/.oxlintrc.json
index 2ebed39660..c2abb6ed2c 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -15,7 +15,8 @@
     "packages/openapi-typescript/examples/*/generate.ts",
     "*.js",
     "*.cjs",
-    "tests/e2e/generate-client/*.snapshot.ts"
+    "tests/e2e/generate-client/*.snapshot.ts",
+    "tests/e2e/generate-client/*-consumer/api.ts"
   ],
   "rules": {
     "eslint/no-array-constructor": "error",
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fa5fa0504f..e73a80a9e0 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -273,7 +273,7 @@ There is no need to add additional wiring for **discovery**.
 When introducing a new package under `packages/`, plug it into the existing test infrastructure:
 
 1. Author tests under `packages/<your-package>/src/**/__tests__/*.test.ts`.
-    Use the Vitest globals — no imports from `'vitest'`.
+   Use the Vitest globals — no imports from `'vitest'`.
 2. Open the root [`vitest.config.ts`](./vitest.config.ts) and append your package's source glob to `coverage.include`, for example:
 
    ```typescript
@@ -304,7 +304,7 @@ When introducing a new package under `packages/`, plug it into the existing test
    ```
 
 5. Do not declare `vitest` or `@vitest/coverage-istanbul` in the new package's `package.json`.
-    These are workspace-wide dev dependencies, installed once at the root.
+   These are workspace-wide dev dependencies, installed once at the root.
 
 ### Unit tests
 
diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index 411a5751c5..3468b3ff66 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -642,6 +642,7 @@ await upload({ file, orgId: 'org_1', tags: ['a', 'b'] });
 ```
 
 Serialization rules:
+
 - `Blob`/`File` and strings pass through
 - arrays append one field per item
 - nested objects are JSON-encoded
@@ -902,6 +903,7 @@ The `@redocly/openapi-typescript/plugin` entry also exports the **codegen toolki
 ### Select a custom generator
 
 A `generators` entry that is not a built-in name is either:
+
 - an **inline** generator (registered via `customGenerators` in a `defineConfig` file)
 - an **import specifier** — a path (resolved against the config's directory)
 - an installed package — that default-exports the generator
diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index aad62133a4..6a923de41a 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -115,7 +115,13 @@ export async function handleGenerateClient({
 
   try {
     logger.info(gray('\n  Generating TypeScript client... \n'));
-    const result = await generateClient({ ...merged, input, output: outputPath, config, configDir });
+    const result = await generateClient({
+      ...merged,
+      input,
+      output: outputPath,
+      config,
+      configDir,
+    });
     const summary =
       result.files.length === 1
         ? `TypeScript client successfully generated to ${yellow(result.outputPath)} (${result.bytes} bytes).`
diff --git a/packages/openapi-typescript/docs/adr/0001-ast-codegen.md b/packages/openapi-typescript/docs/adr/0001-ast-codegen.md
index 3d2eb71740..4ccb31affb 100644
--- a/packages/openapi-typescript/docs/adr/0001-ast-codegen.md
+++ b/packages/openapi-typescript/docs/adr/0001-ast-codegen.md
@@ -17,6 +17,6 @@ Each emitter returns `ts.Statement[]` / `ts.TypeNode`s; the composition (`client
 ## Consequences
 
 - Structurally malformed output (mismatched braces, wrong nesting) is impossible; passes can compose/transform/dedupe nodes before printing; the option matrix scales without brittle template edits.
-- **The AST is not a sanitizer.** `ts.factory.createIdentifier` prints its text verbatim and synthetic comments are emitted as written — so a spec-supplied name or description still reaches the output unchecked. Those two channels are closed *before* the printer, not by it: names are coerced to safe identifiers in the IR (`ir/sanitize-identifiers.ts`, with an assert backstop) and all comment text is run through `escapeJsDoc` (`emitters/ts.ts`). Treat any new value that flows into an identifier slot or a comment as requiring the same handling.
+- **The AST is not a sanitizer.** `ts.factory.createIdentifier` prints its text verbatim and synthetic comments are emitted as written — so a spec-supplied name or description still reaches the output unchecked. Those two channels are closed _before_ the printer, not by it: names are coerced to safe identifiers in the IR (`ir/sanitize-identifiers.ts`, with an assert backstop) and all comment text is run through `escapeJsDoc` (`emitters/ts.ts`). Treat any new value that flows into an identifier slot or a comment as requiring the same handling.
 - Output formatting is the printer's (valid, but plainer than hand-formatting) — a pretty-print pass is deferred to optional-formatter work.
 - The cost is a dependency on `typescript` at generation time (see [ADR-0002](./0002-typescript-peer-dep.md)), and emitter code is more verbose than templates for trivial snippets — accepted for the correctness and composability gains.
diff --git a/packages/openapi-typescript/docs/adr/0002-typescript-peer-dep.md b/packages/openapi-typescript/docs/adr/0002-typescript-peer-dep.md
index ea31ab054c..e0d62e1266 100644
--- a/packages/openapi-typescript/docs/adr/0002-typescript-peer-dep.md
+++ b/packages/openapi-typescript/docs/adr/0002-typescript-peer-dep.md
@@ -19,4 +19,4 @@ The codegen uses only stable `factory` / `createPrinter` / `createSourceFile` /
 
 - `typescript` is used **only at generation time** and never emitted, so the generated client stays dependency-free (web-standard APIs only: `fetch`, `AbortController`, `URLSearchParams`) and runs in browsers, Node, Bun, Deno, and edge runtimes.
 - `@redocly/openapi-core` must **not** grow a TS code-builder — its `yaml-ast-parser` is the input AST, not an output one.
-- Consumers in unusual setups may need to add `typescript` explicitly; the wide peer range keeps this rare.
\ No newline at end of file
+- Consumers in unusual setups may need to add `typescript` explicitly; the wide peer range keeps this rare.
diff --git a/packages/openapi-typescript/docs/adr/0004-registry-seams.md b/packages/openapi-typescript/docs/adr/0004-registry-seams.md
index 9445d9b441..4dc4c562d0 100644
--- a/packages/openapi-typescript/docs/adr/0004-registry-seams.md
+++ b/packages/openapi-typescript/docs/adr/0004-registry-seams.md
@@ -21,4 +21,4 @@ Both are **first-party only** — no public third-party plugin API yet.
 
 - New generators and layouts are added by registering an implementation, not by editing call sites.
 - Writers consume the emitter only through the `emitModules(...) → ClientModules` seam, so they stay layout-only and the emitter's internal fragment breakdown never leaks.
-- Deferring a public plugin API keeps us free to change `Generator`/`Writer` internals; third-party extensibility is a deliberate later step, revisited once the first-party set stabilizes.
\ No newline at end of file
+- Deferring a public plugin API keeps us free to change `Generator`/`Writer` internals; third-party extensibility is a deliberate later step, revisited once the first-party set stabilizes.
diff --git a/packages/openapi-typescript/docs/adr/0010-mock-data-baked-vs-faker.md b/packages/openapi-typescript/docs/adr/0010-mock-data-baked-vs-faker.md
index 6e82293ec6..bac2a0daf9 100644
--- a/packages/openapi-typescript/docs/adr/0010-mock-data-baked-vs-faker.md
+++ b/packages/openapi-typescript/docs/adr/0010-mock-data-baked-vs-faker.md
@@ -29,4 +29,4 @@ A `$ref` cycle terminates in the **type-correct empty value** for its position (
 - Default output is zero-dependency and deterministic — safe for CI fixtures with no install.
 - Realistic data is one flag away, and reproducible with `--mock-seed`, without changing how the factories are called.
 - Two walkers (`emitters/sample.ts`, `emitters/faker.ts`) must be kept structurally in lockstep; the shared cycle semantics and a parallel test suite are what hold them together. Both live under `emitters/` (a mock concern, not the IR layer).
-- `mock` requires the `sdk` generator (factories reference its types) and is validated by the generator contract ([ADR-0004](./0004-registry-seams.md)).
\ No newline at end of file
+- `mock` requires the `sdk` generator (factories reference its types) and is validated by the generator contract ([ADR-0004](./0004-registry-seams.md)).
diff --git a/packages/openapi-typescript/src/emitters/__tests__/type-guards.test.ts b/packages/openapi-typescript/src/emitters/__tests__/type-guards.test.ts
index 9c3da2611b..7becb8febb 100644
--- a/packages/openapi-typescript/src/emitters/__tests__/type-guards.test.ts
+++ b/packages/openapi-typescript/src/emitters/__tests__/type-guards.test.ts
@@ -371,11 +371,15 @@ describe('discriminated-union type guards (C6.4)', () => {
         schemas: [
           namedSchema('SuccessItem', {
             kind: 'object',
-            properties: [{ name: 'status', schema: { kind: 'literal', value: 'ok' }, required: true }],
+            properties: [
+              { name: 'status', schema: { kind: 'literal', value: 'ok' }, required: true },
+            ],
           }),
           namedSchema('ErrorItem', {
             kind: 'object',
-            properties: [{ name: 'status', schema: { kind: 'literal', value: 'error' }, required: true }],
+            properties: [
+              { name: 'status', schema: { kind: 'literal', value: 'error' }, required: true },
+            ],
           }),
           // The union is the array's *items*, not a top-level named union.
           namedSchema('BulkResponse', {
@@ -414,11 +418,15 @@ describe('discriminated-union type guards (C6.4)', () => {
         schemas: [
           namedSchema('Cat', {
             kind: 'object',
-            properties: [{ name: 'kind', schema: { kind: 'literal', value: 'cat' }, required: true }],
+            properties: [
+              { name: 'kind', schema: { kind: 'literal', value: 'cat' }, required: true },
+            ],
           }),
           namedSchema('Dog', {
             kind: 'object',
-            properties: [{ name: 'kind', schema: { kind: 'literal', value: 'dog' }, required: true }],
+            properties: [
+              { name: 'kind', schema: { kind: 'literal', value: 'dog' }, required: true },
+            ],
           }),
           namedSchema('PetMap', {
             kind: 'record',
@@ -443,11 +451,15 @@ describe('discriminated-union type guards (C6.4)', () => {
         schemas: [
           namedSchema('Cat', {
             kind: 'object',
-            properties: [{ name: 'kind', schema: { kind: 'literal', value: 'cat' }, required: true }],
+            properties: [
+              { name: 'kind', schema: { kind: 'literal', value: 'cat' }, required: true },
+            ],
           }),
           namedSchema('Dog', {
             kind: 'object',
-            properties: [{ name: 'kind', schema: { kind: 'literal', value: 'dog' }, required: true }],
+            properties: [
+              { name: 'kind', schema: { kind: 'literal', value: 'dog' }, required: true },
+            ],
           }),
           namedSchema('Envelope', {
             kind: 'object',
@@ -499,7 +511,12 @@ describe('discriminated-union type guards (C6.4)', () => {
       });
     const out = emitSingleFile(
       apiModel({
-        schemas: [item('Ok', 'ok'), item('Err', 'error'), arrayOfUnion('ListA'), arrayOfUnion('ListB')],
+        schemas: [
+          item('Ok', 'ok'),
+          item('Err', 'error'),
+          arrayOfUnion('ListA'),
+          arrayOfUnion('ListB'),
+        ],
       })
     );
     expect(out.match(/export function isOk\(/g)).toHaveLength(1);
diff --git a/packages/openapi-typescript/src/emitters/mock.ts b/packages/openapi-typescript/src/emitters/mock.ts
index 4ea97d48d5..9175b4c5f6 100644
--- a/packages/openapi-typescript/src/emitters/mock.ts
+++ b/packages/openapi-typescript/src/emitters/mock.ts
@@ -12,10 +12,10 @@ import type {
   ResponseBodyModel,
   SchemaModel,
 } from '../ir/model.js';
-import { sampleValue, SampleExpression } from './sample.js';
 import { allOperations } from '../writers/util.js';
 import { fakerExpression } from './faker.js';
 import { safeIdent } from './identifier.js';
+import { sampleValue, SampleExpression } from './sample.js';
 import { pascalCase } from './support.js';
 import { parseExpression, printStatements, ts } from './ts.js';
 import type { DateType } from './types.js';
diff --git a/packages/openapi-typescript/src/emitters/operations.ts b/packages/openapi-typescript/src/emitters/operations.ts
index 858e553107..128f680b68 100644
--- a/packages/openapi-typescript/src/emitters/operations.ts
+++ b/packages/openapi-typescript/src/emitters/operations.ts
@@ -995,4 +995,3 @@ function renderOperationDoc(op: OperationModel): string | undefined {
 function withDoc<T extends ts.Node>(node: T, doc: string | undefined): T {
   return doc === undefined ? node : jsdoc(node, doc);
 }
-
diff --git a/packages/openapi-typescript/src/emitters/type-guards.ts b/packages/openapi-typescript/src/emitters/type-guards.ts
index c23fdf376c..af04b3c402 100644
--- a/packages/openapi-typescript/src/emitters/type-guards.ts
+++ b/packages/openapi-typescript/src/emitters/type-guards.ts
@@ -39,7 +39,8 @@ export function typeGuardStatements(schemas: NamedSchemaModel[]): ts.FunctionDec
 
   for (const named of schemas) {
     for (const site of collectUnionSites(named)) {
-      const discriminator = site.union.discriminator ?? detectImplicitDiscriminator(site.union, byName);
+      const discriminator =
+        site.union.discriminator ?? detectImplicitDiscriminator(site.union, byName);
       if (!discriminator) continue;
 
       // Group discriminant values by target schema so two mapping keys pointing at
@@ -57,7 +58,13 @@ export function typeGuardStatements(schemas: NamedSchemaModel[]): ts.FunctionDec
         if (emitted.has(guardName)) continue;
         emitted.add(guardName);
         nodes.push(
-          buildTypeGuard(site.makeParamType(), site.label, discriminator.propertyName, schemaName, values)
+          buildTypeGuard(
+            site.makeParamType(),
+            site.label,
+            discriminator.propertyName,
+            schemaName,
+            values
+          )
         );
       }
     }
@@ -176,9 +183,7 @@ function buildTypeGuard(
     undefined,
     `is${schemaName}`,
     undefined,
-    [
-      factory.createParameterDeclaration(undefined, undefined, 'value', undefined, paramType),
-    ],
+    [factory.createParameterDeclaration(undefined, undefined, 'value', undefined, paramType)],
     factory.createTypePredicateNode(
       undefined,
       'value',
diff --git a/packages/openapi-typescript/src/generators/__tests__/resolve.test.ts b/packages/openapi-typescript/src/generators/__tests__/resolve.test.ts
index c8d6aa5388..241c442b6a 100644
--- a/packages/openapi-typescript/src/generators/__tests__/resolve.test.ts
+++ b/packages/openapi-typescript/src/generators/__tests__/resolve.test.ts
@@ -1,8 +1,8 @@
-import { fileURLToPath } from 'node:url';
 import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
 
-import type { CustomGenerator } from '../types.js';
 import { resolveGenerators } from '../resolve.js';
+import type { CustomGenerator } from '../types.js';
 
 const fixtures = join(dirname(fileURLToPath(import.meta.url)), 'fixtures');
 
@@ -63,9 +63,9 @@ describe('resolveGenerators', () => {
   });
 
   it('throws an actionable error when a specifier cannot be loaded', async () => {
-    await expect(resolveGenerators(['./does-not-exist.ts'], { configDir: fixtures })).rejects.toThrow(
-      /Could not load generator "\.\/does-not-exist\.ts"/
-    );
+    await expect(
+      resolveGenerators(['./does-not-exist.ts'], { configDir: fixtures })
+    ).rejects.toThrow(/Could not load generator "\.\/does-not-exist\.ts"/);
   });
 
   it('treats a non-built-in entry with no configDir as a package specifier (resolved from cwd)', async () => {
@@ -77,8 +77,8 @@ describe('resolveGenerators', () => {
   });
 
   it('throws when a loaded module does not export a generator', async () => {
-    await expect(
-      resolveGenerators(['./empty-plugin.ts'], { configDir: fixtures })
-    ).rejects.toThrow(/must export a generator/);
+    await expect(resolveGenerators(['./empty-plugin.ts'], { configDir: fixtures })).rejects.toThrow(
+      /must export a generator/
+    );
   });
 });
diff --git a/packages/openapi-typescript/src/generators/resolve.ts b/packages/openapi-typescript/src/generators/resolve.ts
index 1abfba9e31..505a183135 100644
--- a/packages/openapi-typescript/src/generators/resolve.ts
+++ b/packages/openapi-typescript/src/generators/resolve.ts
@@ -5,11 +5,10 @@
 // default (or `generator`) export validated, and registered under its declared name. Built-ins are
 // seeded fresh per call (see `builtinGenerators`), so registration never mutates the built-in table.
 
+import { isPlainObject } from '@redocly/openapi-core';
 import { isAbsolute, resolve as resolvePath } from 'node:path';
 import { pathToFileURL } from 'node:url';
 
-import { isPlainObject } from '@redocly/openapi-core';
-
 import { NotSupportedError } from '../errors.js';
 import { builtinGenerators } from './index.js';
 import type { CustomGenerator, GeneratorDescriptor } from './types.js';
diff --git a/packages/openapi-typescript/src/ir/sanitize-identifiers.ts b/packages/openapi-typescript/src/ir/sanitize-identifiers.ts
index d5c2bb50a1..48002157b9 100644
--- a/packages/openapi-typescript/src/ir/sanitize-identifiers.ts
+++ b/packages/openapi-typescript/src/ir/sanitize-identifiers.ts
@@ -133,7 +133,8 @@ function rewriteRefs(schema: SchemaModel, fixRef: (name: string) => string): voi
     case 'union':
       for (const member of schema.members) rewriteRefs(member, fixRef);
       if (schema.discriminator) {
-        for (const entry of schema.discriminator.mapping) entry.schemaName = fixRef(entry.schemaName);
+        for (const entry of schema.discriminator.mapping)
+          entry.schemaName = fixRef(entry.schemaName);
       }
       break;
     case 'intersection':
diff --git a/tests/e2e/generate-client/auth.test.ts b/tests/e2e/generate-client/auth.test.ts
index 3a043c2007..b14e01c44e 100644
--- a/tests/e2e/generate-client/auth.test.ts
+++ b/tests/e2e/generate-client/auth.test.ts
@@ -64,7 +64,9 @@ describe('generate-client auth breadth (auth.yaml)', () => {
 
     // Per-kind injection inside __auth — each prefers per-instance config.auth, then the global slot.
     expect(generated).toContain('headers["Authorization"] = `Bearer ${v}`');
-    expect(generated).toContain('const basic = b ? btoa(`${b.username}:${b.password}`) : __basicAuth;');
+    expect(generated).toContain(
+      'const basic = b ? btoa(`${b.username}:${b.password}`) : __basicAuth;'
+    );
     expect(generated).toContain('headers["Authorization"] = `Basic ${basic}`');
     expect(generated).toContain('query["api_key"] = v'); // apiKeyQuery
     expect(generated).toContain('cookies.push("sid=" + v)'); // apiKeyCookie
diff --git a/tests/e2e/generate-client/generator-contract.test.ts b/tests/e2e/generate-client/generator-contract.test.ts
index 2cbc673261..d7c4484ca3 100644
--- a/tests/e2e/generate-client/generator-contract.test.ts
+++ b/tests/e2e/generate-client/generator-contract.test.ts
@@ -2,8 +2,7 @@
 // fail fast with an actionable message (never emit a client that won't compile), and
 // `tanstack-query` must gracefully skip SSE operations (which the sdk doesn't export).
 import { spawnSync } from 'node:child_process';
-import { existsSync, readFileSync, writeFileSync } from 'node:fs';
-import { mkdtempSync, rmSync } from 'node:fs';
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -25,7 +24,13 @@ function run(args: string[]): { status: number | null; out: string } {
 describe('generate-client generator compatibility contract', () => {
   it('rejects tanstack-query without sdk, naming the fix', () => {
     const dir = mkdtempSync(join(tmpdir(), 'ots-contract-'));
-    const { status, out } = run([cafe, '--output', join(dir, 'c.ts'), '--generators', 'tanstack-query']);
+    const { status, out } = run([
+      cafe,
+      '--output',
+      join(dir, 'c.ts'),
+      '--generators',
+      'tanstack-query',
+    ]);
     expect(status).not.toBe(0);
     expect(out).toMatch(/requires the "sdk" generator/);
     expect(out).toMatch(/--generators sdk,tanstack-query/);
@@ -66,7 +71,13 @@ describe('generate-client generator compatibility contract', () => {
 
   it('rejects transformers without --date-type Date', () => {
     const dir = mkdtempSync(join(tmpdir(), 'ots-contract-'));
-    const { status, out } = run([cafe, '--output', join(dir, 'c.ts'), '--generators', 'sdk,transformers']);
+    const { status, out } = run([
+      cafe,
+      '--output',
+      join(dir, 'c.ts'),
+      '--generators',
+      'sdk,transformers',
+    ]);
     expect(status).not.toBe(0);
     expect(out).toMatch(/requires --date-type Date/);
     rmSync(dir, { recursive: true, force: true });
@@ -122,7 +133,9 @@ components:
       'sdk,tanstack-query',
     ]);
     expect(status, out).toBe(0);
-    expect(out).toMatch(/tanstack-query skipped \d+ operation\(s\) whose variables type name collides/);
+    expect(out).toMatch(
+      /tanstack-query skipped \d+ operation\(s\) whose variables type name collides/
+    );
     const tanstack = readFileSync(join(dir, 'c.tanstack.ts'), 'utf-8');
     expect(tanstack).not.toContain('getUserOptions'); // colliding op skipped
     expect(tanstack).toContain('listUsersOptions'); // the rest still wrapped
@@ -130,7 +143,19 @@ components:
     const files = [join(dir, 'c.ts'), join(dir, 'c.tanstack.ts')];
     const tsc = spawnSync(
       join(repoRoot, 'node_modules/.bin/tsc'),
-      ['--noEmit', '--strict', '--target', 'ES2020', '--module', 'esnext', '--moduleResolution', 'bundler', '--lib', 'ES2020,DOM', ...files],
+      [
+        '--noEmit',
+        '--strict',
+        '--target',
+        'ES2020',
+        '--module',
+        'esnext',
+        '--moduleResolution',
+        'bundler',
+        '--lib',
+        'ES2020,DOM',
+        ...files,
+      ],
       { encoding: 'utf-8', cwd: dir }
     );
     // `@tanstack/react-query` isn't installed in the temp dir; ignore only that missing-module error.
diff --git a/tests/e2e/generate-client/identifier-injection.test.ts b/tests/e2e/generate-client/identifier-injection.test.ts
index 2db33b06bc..a03980ded6 100644
--- a/tests/e2e/generate-client/identifier-injection.test.ts
+++ b/tests/e2e/generate-client/identifier-injection.test.ts
@@ -56,10 +56,14 @@ describe('generate-client identifier / comment injection', () => {
     const dir = mkdtempSync(join(tmpdir(), 'ots-injection-'));
     writeFileSync(join(dir, 'openapi.yaml'), HOSTILE_SPEC, 'utf-8');
     const entry = join(dir, 'client.ts');
-    const res = spawnSync('node', [cli, 'generate-client', join(dir, 'openapi.yaml'), '--output', entry], {
-      encoding: 'utf-8',
-      cwd: repoRoot,
-    });
+    const res = spawnSync(
+      'node',
+      [cli, 'generate-client', join(dir, 'openapi.yaml'), '--output', entry],
+      {
+        encoding: 'utf-8',
+        cwd: repoRoot,
+      }
+    );
     expect(res.status, res.stderr).toBe(0);
     // The unsafe operationId is reported and rewritten, not silently accepted.
     expect(res.stderr).toMatch(/is not a valid TypeScript identifier/);
diff --git a/tests/e2e/generate-client/middleware.test.ts b/tests/e2e/generate-client/middleware.test.ts
index 0f0f1f4c28..d3dd4f4c1e 100644
--- a/tests/e2e/generate-client/middleware.test.ts
+++ b/tests/e2e/generate-client/middleware.test.ts
@@ -19,16 +19,23 @@ const tsxBin = join(repoRoot, 'node_modules/.bin/tsx');
 function generate(dir: string, extraArgs: string[] = []): void {
   writeFileSync(join(dir, 'package.json'), JSON.stringify({ type: 'module' }), 'utf-8');
   const out = join(dir, 'client.ts');
-  const result = spawnSync('node', [cliEntry, 'generate-client', fixture, '--output', out, ...extraArgs], {
-    encoding: 'utf-8',
-    cwd: repoRoot,
-  });
+  const result = spawnSync(
+    'node',
+    [cliEntry, 'generate-client', fixture, '--output', out, ...extraArgs],
+    {
+      encoding: 'utf-8',
+      cwd: repoRoot,
+    }
+  );
   if (result.status !== 0) throw new Error(`generate-client failed:\n${result.stderr}`);
 }
 
 function runConsumer(dir: string, script: string): unknown {
   writeFileSync(join(dir, 'consumer.ts'), script, 'utf-8');
-  const result = spawnSync(tsxBin, [join(dir, 'consumer.ts')], { encoding: 'utf-8', cwd: repoRoot });
+  const result = spawnSync(tsxBin, [join(dir, 'consumer.ts')], {
+    encoding: 'utf-8',
+    cwd: repoRoot,
+  });
   if (result.status !== 0) {
     throw new Error(`consumer failed:\nstdout:\n${result.stdout}\nstderr:\n${result.stderr}`);
   }
diff --git a/tests/e2e/generate-client/multipart.test.ts b/tests/e2e/generate-client/multipart.test.ts
index d97581c934..d84eeeae83 100644
--- a/tests/e2e/generate-client/multipart.test.ts
+++ b/tests/e2e/generate-client/multipart.test.ts
@@ -54,10 +54,14 @@ describe('generate-client typed multipart body (#5)', () => {
     writeFileSync(join(dir, 'package.json'), JSON.stringify({ type: 'module' }), 'utf-8');
     writeFileSync(join(dir, 'api.yaml'), SPEC, 'utf-8');
     const out = join(dir, 'client.ts');
-    const gen = spawnSync('node', [cli, 'generate-client', join(dir, 'api.yaml'), '--output', out], {
-      encoding: 'utf-8',
-      cwd: repoRoot,
-    });
+    const gen = spawnSync(
+      'node',
+      [cli, 'generate-client', join(dir, 'api.yaml'), '--output', out],
+      {
+        encoding: 'utf-8',
+        cwd: repoRoot,
+      }
+    );
     expect(gen.status, gen.stderr).toBe(0);
 
     writeFileSync(
@@ -103,7 +107,15 @@ console.log(JSON.stringify({
     writeFileSync(join(dir, 'api.yaml'), SPEC, 'utf-8');
     const gen = spawnSync(
       'node',
-      [cli, 'generate-client', join(dir, 'api.yaml'), '--output', join(dir, 'client.ts'), '--output-mode', 'tags'],
+      [
+        cli,
+        'generate-client',
+        join(dir, 'api.yaml'),
+        '--output',
+        join(dir, 'client.ts'),
+        '--output-mode',
+        'tags',
+      ],
       { encoding: 'utf-8', cwd: repoRoot }
     );
     expect(gen.status, gen.stderr).toBe(0);
diff --git a/tests/e2e/generate-client/per-instance-auth.test.ts b/tests/e2e/generate-client/per-instance-auth.test.ts
index 39998fc614..61a46fd92a 100644
--- a/tests/e2e/generate-client/per-instance-auth.test.ts
+++ b/tests/e2e/generate-client/per-instance-auth.test.ts
@@ -58,7 +58,15 @@ describe('per-instance auth (service-class config.auth)', () => {
       writeFileSync(join(dir, 'package.json'), '{ "type": "module" }', 'utf-8');
       const gen = spawnSync(
         'node',
-        [cli, 'generate-client', join(dir, 'openapi.yaml'), '--output', join(dir, 'client.ts'), '--facade', 'service-class'],
+        [
+          cli,
+          'generate-client',
+          join(dir, 'openapi.yaml'),
+          '--output',
+          join(dir, 'client.ts'),
+          '--facade',
+          'service-class',
+        ],
         { encoding: 'utf-8', cwd: repoRoot }
       );
       expect(gen.status, gen.stderr).toBe(0);
diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
index 3a618fc4f1..ee64dbd46a 100644
--- a/tests/e2e/generate-client/redocly-config.test.ts
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -2,7 +2,14 @@
 // block (auto-discovered from the cwd / `--config`), with CLI flags overriding it.
 // This is the redocly.yaml ingestion path the examples use (no `--config-file`).
 import { spawnSync } from 'node:child_process';
-import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync, copyFileSync } from 'node:fs';
+import {
+  existsSync,
+  mkdtempSync,
+  readFileSync,
+  rmSync,
+  writeFileSync,
+  copyFileSync,
+} from 'node:fs';
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -23,7 +30,12 @@ function project(xConfig: string): string {
 describe('generate-client redocly.yaml config (x-openapi-typescript)', () => {
   it('generates from the redocly.yaml block with no flags or --config-file', () => {
     const dir = project(
-      ['  input: ./openapi.yaml', '  output: ./src/api/client.ts', '  generators: [sdk]', '  facade: service-class'].join('\n') + '\n'
+      [
+        '  input: ./openapi.yaml',
+        '  output: ./src/api/client.ts',
+        '  generators: [sdk]',
+        '  facade: service-class',
+      ].join('\n') + '\n'
     );
     const res = spawnSync('node', [cli, 'generate-client'], { cwd: dir, encoding: 'utf-8' });
     expect(res.status, res.stderr).toBe(0);
@@ -39,19 +51,30 @@ describe('generate-client redocly.yaml config (x-openapi-typescript)', () => {
     copyFileSync(fixture, join(dir, 'openapi.yaml'));
     writeFileSync(join(dir, 'redocly.yaml'), 'apis:\n  cafe:\n    root: ./openapi.yaml\n', 'utf-8');
     // `cafe` is an alias, not a file path — it must resolve to ./openapi.yaml.
-    const res = spawnSync('node', [cli, 'generate-client', 'cafe', '--output', join(dir, 'out.ts')], {
-      cwd: dir,
-      encoding: 'utf-8',
-    });
+    const res = spawnSync(
+      'node',
+      [cli, 'generate-client', 'cafe', '--output', join(dir, 'out.ts')],
+      {
+        cwd: dir,
+        encoding: 'utf-8',
+      }
+    );
     expect(res.status, res.stderr).toBe(0);
     expect(existsSync(join(dir, 'out.ts'))).toBe(true);
-    expect(readFileSync(join(dir, 'out.ts'), 'utf-8')).toContain('export async function listMenuItems');
+    expect(readFileSync(join(dir, 'out.ts'), 'utf-8')).toContain(
+      'export async function listMenuItems'
+    );
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
   it('lets a CLI flag override the redocly.yaml block (flags win)', () => {
     const dir = project(
-      ['  input: ./openapi.yaml', '  output: ./src/api/client.ts', '  generators: [sdk]', '  facade: service-class'].join('\n') + '\n'
+      [
+        '  input: ./openapi.yaml',
+        '  output: ./src/api/client.ts',
+        '  generators: [sdk]',
+        '  facade: service-class',
+      ].join('\n') + '\n'
     );
     // Override facade: service-class (in redocly.yaml) → functions (flag).
     const res = spawnSync('node', [cli, 'generate-client', '--facade', 'functions'], {
@@ -67,14 +90,14 @@ describe('generate-client redocly.yaml config (x-openapi-typescript)', () => {
 
   it('resolves the block’s relative input/output against the redocly.yaml directory', () => {
     const dir = project(
-      ['  input: ./openapi.yaml', '  output: ./out/client.ts', '  generators: [sdk]'].join('\n') + '\n'
+      ['  input: ./openapi.yaml', '  output: ./out/client.ts', '  generators: [sdk]'].join('\n') +
+        '\n'
     );
     // Run from the repo root, pointing at the config elsewhere via --config.
-    const res = spawnSync(
-      'node',
-      [cli, 'generate-client', '--config', join(dir, 'redocly.yaml')],
-      { cwd: repoRoot, encoding: 'utf-8' }
-    );
+    const res = spawnSync('node', [cli, 'generate-client', '--config', join(dir, 'redocly.yaml')], {
+      cwd: repoRoot,
+      encoding: 'utf-8',
+    });
     expect(res.status, res.stderr).toBe(0);
     // input/output resolved relative to the redocly.yaml dir, not the cwd.
     expect(existsSync(join(dir, 'out/client.ts'))).toBe(true);
diff --git a/tsconfig.json b/tsconfig.json
index 406c682ea3..b124459a32 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,9 +1,6 @@
 {
   "compilerOptions": {
-    "types": [
-      "vitest/globals",
-      "node"
-    ],
+    "types": ["vitest/globals", "node"],
     "composite": true,
     "declaration": true,
     "declarationMap": true,
@@ -26,9 +23,7 @@
     "moduleResolution": "nodenext",
     "esModuleInterop": true
   },
-  "exclude": [
-    "node_modules"
-  ],
+  "exclude": ["node_modules"],
   "include": [
     "packages/*/src/**/*.ts",
     "packages/*/__tests__/**/*.ts",

From f44e269e39991c3d06b83c87bda1b254be495146 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 22 Jun 2026 17:03:43 +0300
Subject: [PATCH 012/134] fix: align root react/react-dom with main (19.x) to
 fix build-docs snapshots
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The branch added `react`/`react-dom` `^18.2.0` to the root devDependencies
(main has neither — it resolves react 19.2.7 via packages/cli's
`^17 || ^18.2.0 || ^19.2.7` range). That root `^18.2.0` cap forced npm to
hoist react 18.3.1 for the whole workspace, so build-docs rendered React 18's
`useId` format (`tab:R9pq:0`) instead of the React 19 format (`tab_R_9pq_0`)
the committed redoc-static snapshots were generated with — failing
build-docs.test.ts on CI.

Bump root react/react-dom to `^19.2.0` so npm resolves 19.2.7, matching main.
Verified: build-docs.test.ts (7/7) and the react-19 consumers
(tanstack-query.runtime, swr) all pass.
---
 package-lock.json | 35 ++++++++++++++---------------------
 package.json      |  4 ++--
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ad2a6dbc90..ea28bc864b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,8 +29,8 @@
         "oxfmt": "^0.33.0",
         "oxlint": "^1.48.0",
         "pegjs": "0.11.0-master.b7b87ea",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0",
+        "react": "^19.2.0",
+        "react-dom": "^19.2.0",
         "slackify-markdown": "^4.3.1",
         "swr": "^2.4.1",
         "tsx": "^4.19.3",
@@ -7952,30 +7952,26 @@
       ]
     },
     "node_modules/react": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
-      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+      "version": "19.2.7",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.2.7.tgz",
+      "integrity": "sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/react-dom": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
-      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
+      "version": "19.2.7",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.7.tgz",
+      "integrity": "sha512-t0BRVXvbiE/o20Hfw669rLbMCDWtYZLvmJigy2f0MxsXF+71pxhR3xOkspmsO8h3ZlNzyibAmtCa3l4lYKk6gQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.2"
+        "scheduler": "^0.27.0"
       },
       "peerDependencies": {
-        "react": "^18.3.1"
+        "react": "^19.2.7"
       }
     },
     "node_modules/react-is": {
@@ -8369,14 +8365,11 @@
       }
     },
     "node_modules/scheduler": {
-      "version": "0.23.2",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
-      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
+      "version": "0.27.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz",
+      "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      }
+      "license": "MIT"
     },
     "node_modules/semver": {
       "version": "7.7.4",
diff --git a/package.json b/package.json
index f04b69e9d5..9f314c7671 100644
--- a/package.json
+++ b/package.json
@@ -69,8 +69,8 @@
     "oxfmt": "^0.33.0",
     "oxlint": "^1.48.0",
     "pegjs": "0.11.0-master.b7b87ea",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^19.2.0",
+    "react-dom": "^19.2.0",
     "slackify-markdown": "^4.3.1",
     "swr": "^2.4.1",
     "tsx": "^4.19.3",

From 212bb7f8c7ffb737aebdc1895b70700ae4ed9722 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 22 Jun 2026 17:12:48 +0300
Subject: [PATCH 013/134] ci(docs): use reviewdog local reporter for vale so
 large PRs don't 406
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

filter_mode: nofilter alone wasn't enough — the github-pr-annotations reporter
still fetches the PR diff to position comments, and GitHub caps that diff at
20000 lines, so this 54k-line PR gets a 406 and reviewdog exits 1 (on the diff
fetch, not on any vale finding).

Switch reporter to `local`: reviewdog prints findings to the job log and exits
non-zero only on vale errors, with no GitHub API call and therefore no diff to
fetch. The gate still holds (committed docs verified: 0 vale errors across 320
files). Trade-off: findings show in the Actions log rather than as inline PR
annotations — which a 20k-line-capped diff can't render on a PR this size anyway.
---
 .github/workflows/docs-tests.yaml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docs-tests.yaml b/.github/workflows/docs-tests.yaml
index b8e8a832ad..eb51b068a9 100644
--- a/.github/workflows/docs-tests.yaml
+++ b/.github/workflows/docs-tests.yaml
@@ -23,10 +23,13 @@ jobs:
       - uses: errata-ai/vale-action@reviewdog
         with:
           files: '["README.md", "docs", ".changeset"]'
-          # `nofilter` instead of `file`: file-level filtering makes reviewdog
-          # fetch the PR diff, which GitHub caps at 20000 lines (large PRs get a
-          # 406 and the job fails on the post step, not on any vale finding).
-          # nofilter skips the diff fetch and lints the full files directly.
+          # `local` reporter prints findings to the job log and exits non-zero on
+          # errors WITHOUT calling the GitHub API. The PR-annotation reporters
+          # fetch the PR diff to position comments, which GitHub caps at 20000
+          # lines — a large PR returns 406 and the job fails on that fetch, not on
+          # any vale finding. `local` has no diff to fetch, so it survives any PR
+          # size while still gating on real vale errors.
+          reporter: local
           filter_mode: nofilter
           fail_on_error: true
 

From 34594a79f9709e130b3cfc2268422d66389166ef Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <roman.marshevskyy@redoc.ly>
Date: Mon, 22 Jun 2026 17:27:22 +0300
Subject: [PATCH 014/134] Update docs/@v2/commands/generate-client.md

Co-authored-by: Andrew Tatomyr <andrew.tatomyr@redocly.com>
---
 docs/@v2/commands/generate-client.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index 3468b3ff66..23345ab63d 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -14,7 +14,7 @@ We'd love your feedback while we stabilize it.
 
 Generate a typed TypeScript client from an OpenAPI description.
 
-Accepts **OpenAPI 3.0, 3.1, and 3.2.0**, plus **Swagger 2.0** (normalized to the 3.x shape before generation).
+Accepts **OpenAPI 3.x**, plus **Swagger 2.0** (normalized to the 3.x shape before generation).
 `<input>` is a file path, a URL, or an `apis:` alias from `redocly.yaml`.
 
 The generated client has **zero runtime dependencies** — it uses only web-standard APIs (`fetch`, `AbortController`, `URLSearchParams`, …), so it runs in browsers, Node, Bun, Deno, and edge runtimes.

From f0c810b96479b9d6a2f1532f153eb28c591f23c7 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 22 Jun 2026 22:38:16 +0300
Subject: [PATCH 015/134] fix(openapi-typescript): explicit .js extensions in
 example imports; exclude examples from root typecheck
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The example consumers imported `./api/client` (and generated `.routes`/`.mocks`/
`.zod`/`.tanstack` modules, and `./App`) without the `.js` extension that
nodenext requires — fixed across all examples. This also clears a cascading
implicit-any in fetch-functions (the unresolved import had made `use` `any`).

Exclude `packages/openapi-typescript/examples` from the root flat typecheck:
they're standalone Vite/React apps with their own tsconfigs (JSX, vite types)
and are typechecked separately via `typecheck:examples`; the root Node config
can't typecheck them. Root tsconfig now differs from main by this one line.
---
 .../examples/custom-generator/src/main.ts                 | 4 ++--
 .../examples/fetch-functions/src/main.ts                  | 2 +-
 packages/openapi-typescript/examples/mock/src/main.ts     | 4 ++--
 .../openapi-typescript/examples/programmatic/src/main.ts  | 2 +-
 .../openapi-typescript/examples/service-class/src/main.ts | 2 +-
 .../examples/tanstack-query/src/App.tsx                   | 4 ++--
 .../examples/tanstack-query/src/main.tsx                  | 2 +-
 packages/openapi-typescript/examples/zod/src/main.ts      | 4 ++--
 tsconfig.json                                             | 8 +-------
 9 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/packages/openapi-typescript/examples/custom-generator/src/main.ts b/packages/openapi-typescript/examples/custom-generator/src/main.ts
index 8cd0f89024..79c36b34e3 100644
--- a/packages/openapi-typescript/examples/custom-generator/src/main.ts
+++ b/packages/openapi-typescript/examples/custom-generator/src/main.ts
@@ -1,7 +1,7 @@
 // Consumes both the built-in sdk client and the custom generator's output (`routes`),
 // proving the plugin's file is generated alongside the client and type-checks.
-import { configure, listMenuItems } from './api/client';
-import { routes } from './api/client.routes';
+import { configure, listMenuItems } from './api/client.js';
+import { routes } from './api/client.routes.js';
 
 configure({ baseUrl: 'https://api.cafe.redocly.com' });
 
diff --git a/packages/openapi-typescript/examples/fetch-functions/src/main.ts b/packages/openapi-typescript/examples/fetch-functions/src/main.ts
index 83ef6958aa..5a178477ec 100644
--- a/packages/openapi-typescript/examples/fetch-functions/src/main.ts
+++ b/packages/openapi-typescript/examples/fetch-functions/src/main.ts
@@ -1,4 +1,4 @@
-import { configure, use, listMenuItems, ApiError } from './api/client';
+import { configure, use, listMenuItems, ApiError } from './api/client.js';
 
 configure({ baseUrl: 'https://api.cafe.redocly.com' });
 
diff --git a/packages/openapi-typescript/examples/mock/src/main.ts b/packages/openapi-typescript/examples/mock/src/main.ts
index 51fa94828b..7cc7507b3a 100644
--- a/packages/openapi-typescript/examples/mock/src/main.ts
+++ b/packages/openapi-typescript/examples/mock/src/main.ts
@@ -1,7 +1,7 @@
 import { setupWorker } from 'msw/browser';
 
-import { configure, listMenuItems, ApiError } from './api/client';
-import { handlers } from './api/client.mocks';
+import { configure, listMenuItems, ApiError } from './api/client.js';
+import { handlers } from './api/client.mocks.js';
 
 const out = document.querySelector<HTMLPreElement>('#out')!;
 
diff --git a/packages/openapi-typescript/examples/programmatic/src/main.ts b/packages/openapi-typescript/examples/programmatic/src/main.ts
index eae2eca5f5..d50d970d76 100644
--- a/packages/openapi-typescript/examples/programmatic/src/main.ts
+++ b/packages/openapi-typescript/examples/programmatic/src/main.ts
@@ -1,6 +1,6 @@
 // Consume the programmatically-generated client. The output is identical to the CLI's —
 // programmatic generation only changes *how* you invoke the generator, not what it emits.
-import { configure, listMenuItems } from './api/client';
+import { configure, listMenuItems } from './api/client.js';
 
 configure({ baseUrl: 'https://api.cafe.redocly.com' });
 
diff --git a/packages/openapi-typescript/examples/service-class/src/main.ts b/packages/openapi-typescript/examples/service-class/src/main.ts
index 5dd326b483..f934c17152 100644
--- a/packages/openapi-typescript/examples/service-class/src/main.ts
+++ b/packages/openapi-typescript/examples/service-class/src/main.ts
@@ -1,4 +1,4 @@
-import { Client, ApiError } from './api/client';
+import { Client, ApiError } from './api/client.js';
 
 const client = new Client({ baseUrl: 'https://api.cafe.redocly.com' });
 
diff --git a/packages/openapi-typescript/examples/tanstack-query/src/App.tsx b/packages/openapi-typescript/examples/tanstack-query/src/App.tsx
index 45cb464f22..bc767ec6cc 100644
--- a/packages/openapi-typescript/examples/tanstack-query/src/App.tsx
+++ b/packages/openapi-typescript/examples/tanstack-query/src/App.tsx
@@ -1,7 +1,7 @@
 import { useQuery } from '@tanstack/react-query';
 
-import { configure } from './api/client';
-import { listMenuItemsOptions } from './api/client.tanstack';
+import { configure } from './api/client.js';
+import { listMenuItemsOptions } from './api/client.tanstack.js';
 
 configure({ baseUrl: 'https://api.cafe.redocly.com' });
 
diff --git a/packages/openapi-typescript/examples/tanstack-query/src/main.tsx b/packages/openapi-typescript/examples/tanstack-query/src/main.tsx
index 599220e9a4..0184b35f37 100644
--- a/packages/openapi-typescript/examples/tanstack-query/src/main.tsx
+++ b/packages/openapi-typescript/examples/tanstack-query/src/main.tsx
@@ -2,7 +2,7 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import React from 'react';
 import { createRoot } from 'react-dom/client';
 
-import { App } from './App';
+import { App } from './App.js';
 
 const queryClient = new QueryClient();
 
diff --git a/packages/openapi-typescript/examples/zod/src/main.ts b/packages/openapi-typescript/examples/zod/src/main.ts
index 2e75d5827d..af1f816399 100644
--- a/packages/openapi-typescript/examples/zod/src/main.ts
+++ b/packages/openapi-typescript/examples/zod/src/main.ts
@@ -1,5 +1,5 @@
-import { configure, listMenuItems, ApiError } from './api/client';
-import { MenuItemListSchema } from './api/client.zod';
+import { configure, listMenuItems, ApiError } from './api/client.js';
+import { MenuItemListSchema } from './api/client.zod.js';
 
 configure({ baseUrl: 'https://api.cafe.redocly.com' });
 
diff --git a/tsconfig.json b/tsconfig.json
index b124459a32..8fa9f1147d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -23,11 +23,5 @@
     "moduleResolution": "nodenext",
     "esModuleInterop": true
   },
-  "exclude": ["node_modules"],
-  "include": [
-    "packages/*/src/**/*.ts",
-    "packages/*/__tests__/**/*.ts",
-    "tests/**/*.ts",
-    "vitest.config.ts"
-  ]
+  "exclude": ["packages/openapi-typescript/examples"]
 }

From 041040e632f5dc896ff70fe2bca1b12ac49ddd0b Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 22 Jun 2026 22:39:32 +0300
Subject: [PATCH 016/134] chore: revert vale reporter change; drop branch-added
 coverage threshold and CONTRIBUTING section

- docs-tests.yaml: revert the vale step to `filter_mode: file` (removes the
  `reporter: local` change). Note: the vale CI job will hit the 20000-line diff
  406 again on this large PR.
- vitest.config.ts: remove the openapi-typescript per-glob 100% coverage threshold.
- CONTRIBUTING.md: remove the "Monorepo test conventions" section.
---
 .github/workflows/docs-tests.yaml |  9 +---
 CONTRIBUTING.md                   | 76 -------------------------------
 vitest.config.ts                  | 10 +---
 3 files changed, 2 insertions(+), 93 deletions(-)

diff --git a/.github/workflows/docs-tests.yaml b/.github/workflows/docs-tests.yaml
index eb51b068a9..c153c1c5aa 100644
--- a/.github/workflows/docs-tests.yaml
+++ b/.github/workflows/docs-tests.yaml
@@ -23,14 +23,7 @@ jobs:
       - uses: errata-ai/vale-action@reviewdog
         with:
           files: '["README.md", "docs", ".changeset"]'
-          # `local` reporter prints findings to the job log and exits non-zero on
-          # errors WITHOUT calling the GitHub API. The PR-annotation reporters
-          # fetch the PR diff to position comments, which GitHub caps at 20000
-          # lines — a large PR returns 406 and the job fails on that fetch, not on
-          # any vale finding. `local` has no diff to fetch, so it survives any PR
-          # size while still gating on real vale errors.
-          reporter: local
-          filter_mode: nofilter
+          filter_mode: file
           fail_on_error: true
 
   linkcheck:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e73a80a9e0..e65efaa916 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -233,79 +233,6 @@ When running tests, make sure the code is compiled (`npm run compile`).
 Having `redocly.yaml` in the root of the project affects the unit tests, and console logs affect the e2e tests, so make sure to get rid of both before running tests.
 Run `npm test` to start both unit and e2e tests (and additionally typecheck the code).
 
-### Monorepo test conventions
-
-This is a monorepo with NPM workspaces.
-All tests share a single Vitest installation and a single configuration file at the repository root.
-Do not add a per-package `vitest.config.ts`, a per-package `test` script, or per-package `vitest` / `@vitest/*` dependencies — they will be ignored or conflict with the root setup.
-
-The root configuration is in [`vitest.config.ts`](./vitest.config.ts) and defines:
-
-- The `unit` suite, which discovers tests via the glob `packages/*/src/**/*.test.ts`.
-- The `e2e` suite, which discovers tests under `tests/e2e/**`.
-- Coverage (Istanbul provider) collected for packages enumerated in `coverage.include`.
-- Repo-wide minimum coverage thresholds, plus optional per-glob overrides for packages that want stricter limits.
-
-Vitest globals (`describe`, `it`, `expect`, `vi`, `beforeEach`, `afterEach`, …) are enabled and the TypeScript types for them are provided through [`tsconfig.json`](./tsconfig.json)'s `"types": ["vitest/globals", "node"]`.
-Do **not** add `import { describe, it, expect } from 'vitest'` to test files — these names are already in scope.
-
-### Where tests live
-
-Tests live next to the source they cover, inside a sibling `__tests__/` folder, and use the `.test.ts` suffix:
-
-```text
-packages/<your-package>/
-  src/
-    feature.ts
-    __tests__/
-      feature.test.ts        ← unit tests
-    submodule/
-      thing.ts
-      __tests__/
-        thing.test.ts
-```
-
-The root config picks up the test files automatically.
-There is no need to add additional wiring for **discovery**.
-
-### Adding tests for a new package
-
-When introducing a new package under `packages/`, plug it into the existing test infrastructure:
-
-1. Author tests under `packages/<your-package>/src/**/__tests__/*.test.ts`.
-   Use the Vitest globals — no imports from `'vitest'`.
-2. Open the root [`vitest.config.ts`](./vitest.config.ts) and append your package's source glob to `coverage.include`, for example:
-
-   ```typescript
-   include: [
-     'packages/cli/src/**/*.ts',
-     'packages/core/src/**/*.ts',
-     'packages/respect-core/src/**/*.ts',
-     'packages/<your-package>/src/**/*.ts',
-   ],
-   ```
-
-3. If your package contains pure type-definition modules (files that compile to empty `.js` like `types.ts` or `model.ts`), add them to `coverage.exclude` so they don't dilute the coverage signal.
-4. (Optional) Enforce stricter per-file coverage for your package using a per-glob threshold alongside the repo-wide minimums:
-
-   ```typescript
-   thresholds: {
-     lines: 80,
-     functions: 83,
-     statements: 80,
-     branches: 72,
-     'packages/<your-package>/src/**/*.ts': {
-       lines: 100,
-       functions: 100,
-       statements: 100,
-       branches: 100,
-     },
-   },
-   ```
-
-5. Do not declare `vitest` or `@vitest/coverage-istanbul` in the new package's `package.json`.
-   These are workspace-wide dev dependencies, installed once at the root.
-
 ### Unit tests
 
 Run unit tests with this command: `npm run unit`.
@@ -327,9 +254,6 @@ Run e2e tests with this command: `npm run e2e`.
 E2E tests are sensitive to any additional output (like `console.log`) in the source code.
 
 To update snapshots, run `npm run e2e -- -u`.
-This command includes the file-based snapshots used by some tests via `toMatchFileSnapshot`.
-For example, `tests/e2e/generate-client/cafe.snapshot.ts` is the committed full-file output of the TypeScript client generator.
-Always review snapshot diffs in the pull request to confirm the change is intentional.
 
 If you made any changes, make sure to compile the code before running the tests.
 
diff --git a/vitest.config.ts b/vitest.config.ts
index e9f73552ac..6610523856 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -25,14 +25,6 @@ const configExtension: { [key: string]: ViteUserConfig } = {
           functions: 84,
           statements: 80,
           branches: 73,
-          // Strict per-file 100% coverage for the new client generator. Per-glob thresholds run
-          // alongside the repo-wide minimums above, so other packages stay unaffected.
-          'packages/openapi-typescript/src/**/*.ts': {
-            lines: 100,
-            functions: 100,
-            statements: 100,
-            branches: 100,
-          },
         },
       },
     },
@@ -63,5 +55,5 @@ export default mergeConfig(
       },
     },
   }),
-  configExtension[process.env.VITEST_SUITE || 'default']
+  configExtension[process.env.VITEST_SUITE || 'default'],
 );

From 776d818af4f207d08f1a327bd5ae769c5ef7cc6d Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 23 Jun 2026 15:31:26 +0300
Subject: [PATCH 017/134] docs(openapi-typescript): add a Node (msw/node)
 variant to the mock example
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The mock example now shows both consumption paths from the same generated
sdk+mock client and the same handlers:
- browser (src/main.ts) — `setupWorker`, unchanged
- node (src/node.ts) — `msw/node`'s `setupServer`, exporting `loadMockedMenu()`

No new example folder or wiring: src/node.ts is hand-written (not generated), so
the regen/typecheck/drift coverage of the `mock` example already applies.
Verified: the example typechecks and `loadMockedMenu()` returns mocked data at runtime.
---
 .../examples/mock/README.md                   | 15 ++++++++++----
 .../examples/mock/src/node.ts                 | 20 +++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 packages/openapi-typescript/examples/mock/src/node.ts

diff --git a/packages/openapi-typescript/examples/mock/README.md b/packages/openapi-typescript/examples/mock/README.md
index b1156369e7..dfe9c89273 100644
--- a/packages/openapi-typescript/examples/mock/README.md
+++ b/packages/openapi-typescript/examples/mock/README.md
@@ -1,16 +1,23 @@
 # mock example
 
-Generated TypeScript client plus **MSW** mocks (`generators: ['sdk', 'mock']`). The app starts an MSW
-browser worker from the generated `handlers`, then calls the sdk — requests are served by the mocks, no
-real backend required.
+Generated TypeScript client plus **MSW** mocks (`generators: ['sdk', 'mock']`), shown two ways from the
+same generated `src/api/` and the same `handlers`:
+
+- **Browser** (`src/main.ts`) — starts an MSW browser worker with `setupWorker` and renders the result.
+- **Node** (`src/node.ts`) — starts a server with `msw/node`'s `setupServer` and exports `loadMockedMenu()`.
+  Node has no Service Worker, so msw patches global `fetch` directly (no `public/mockServiceWorker.js`).
+
+Either way, requests are served by the mocks — no real backend required.
 
 ## Run
 
 ```bash
 npm install
 npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
-npm run dev        # open the printed local URL
+npm run dev        # browser: open the printed local URL
 ```
 
+For the Node variant, import and call `loadMockedMenu()` from `src/node.ts` in your own entrypoint or test.
+
 The generated client + MSW mocks under `src/api/` are committed and drift-checked against the
 generator in CI.
diff --git a/packages/openapi-typescript/examples/mock/src/node.ts b/packages/openapi-typescript/examples/mock/src/node.ts
new file mode 100644
index 0000000000..8b62794039
--- /dev/null
+++ b/packages/openapi-typescript/examples/mock/src/node.ts
@@ -0,0 +1,20 @@
+// Node counterpart to `main.ts`: the same generated `sdk` + `mock` client and the same
+// `handlers`, but driven by msw/node's `setupServer`. Node has no Service Worker, so msw
+// patches global `fetch` directly instead of registering `public/mockServiceWorker.js`.
+import { setupServer } from 'msw/node';
+
+import { configure, listMenuItems } from './api/client.js';
+import { handlers } from './api/client.mocks.js';
+
+const server = setupServer(...handlers);
+
+export async function loadMockedMenu() {
+  server.listen();
+  configure({ baseUrl: 'https://api.cafe.redocly.com' });
+  try {
+    // Served by the generated mocks — no real backend required.
+    return await listMenuItems();
+  } finally {
+    server.close();
+  }
+}

From 0340e2dd22d5f032b10cacf9e8d6fc4c02f2d79a Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 23 Jun 2026 15:31:26 +0300
Subject: [PATCH 018/134] chore: drop trailing comma in vitest.config.ts (oxfmt
 es5 normalization)

---
 vitest.config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vitest.config.ts b/vitest.config.ts
index 6610523856..46045af663 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -55,5 +55,5 @@ export default mergeConfig(
       },
     },
   }),
-  configExtension[process.env.VITEST_SUITE || 'default'],
+  configExtension[process.env.VITEST_SUITE || 'default']
 );

From 8dad18b97d24116ed587dacc76917e395d001efd Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 23 Jun 2026 16:36:07 +0300
Subject: [PATCH 019/134] =?UTF-8?q?fix(openapi-typescript):=20SSE=20?=
 =?UTF-8?q?=E2=80=94=20flush=20final=20frame=20and=20finish=20on=20clean?=
 =?UTF-8?q?=20close?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Two issues in the generated SSE iterator's end-of-stream handling:
- A final event arriving without a trailing delimiter before the server closed
  was dropped: on `done` the loop broke without parsing the remaining buffer.
- A clean stream end (reader.read() → done) was treated like a dropped
  connection and entered the reconnect/backoff loop, so finite/one-shot streams
  reopened forever.

On clean `done` the iterator now flushes the trailing buffer through
__parseSseFrame (yielding a dangling final event) and returns. Only a thrown
read (a real drop) reconnects.

Test harness updated to match: the server now genuinely drops the first
connection (socket destroy) instead of a clean res.end(), and delivers the final
frame without a trailing delimiter; a new index-finite consumer iterates to
completion to prove a clean close finishes rather than reconnecting endlessly.
---
 .../src/emitters/runtime.ts                   | 14 +++++++--
 tests/e2e/generate-client/sse-consumer/api.ts | 17 +++++++++--
 .../sse-consumer/index-finite.ts              | 30 +++++++++++++++++++
 .../generate-client/sse-consumer/server.ts    | 12 +++++---
 tests/e2e/generate-client/sse.runtime.test.ts | 26 ++++++++++++++++
 5 files changed, 90 insertions(+), 9 deletions(-)
 create mode 100644 tests/e2e/generate-client/sse-consumer/index-finite.ts

diff --git a/packages/openapi-typescript/src/emitters/runtime.ts b/packages/openapi-typescript/src/emitters/runtime.ts
index be19d7c0f3..205528ed20 100644
--- a/packages/openapi-typescript/src/emitters/runtime.ts
+++ b/packages/openapi-typescript/src/emitters/runtime.ts
@@ -183,8 +183,7 @@ ${ex}async function* __sse<T>(
       try {
         while (true) {
           const { done, value } = await reader.read();
-          if (done) break;
-          buffer += decoder.decode(value, { stream: true });
+          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });
           let index: number;
           while ((index = buffer.search(/\\r\\n\\r\\n|\\n\\n|\\r\\r/)) !== -1) {
             const raw = buffer.slice(0, index);
@@ -196,6 +195,17 @@ ${ex}async function* __sse<T>(
               yield event as ServerSentEvent<T>;
             }
           }
+          if (done) {
+            // Stream closed cleanly. Flush a final event that arrived without a trailing
+            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.
+            const event = buffer.length > 0 ? __parseSseFrame(buffer, dataKind) : undefined;
+            if (event) {
+              if (event.id !== undefined) lastEventId = event.id;
+              if (event.retry !== undefined) serverRetry = event.retry;
+              yield event as ServerSentEvent<T>;
+            }
+            return;
+          }
           // Bound memory: a server that never sends a frame delimiter would otherwise
           // grow \`buffer\` without limit. 1 MiB is far above any real SSE frame.
           if (buffer.length > 1048576) {
diff --git a/tests/e2e/generate-client/sse-consumer/api.ts b/tests/e2e/generate-client/sse-consumer/api.ts
index 7551911e98..892905f39c 100644
--- a/tests/e2e/generate-client/sse-consumer/api.ts
+++ b/tests/e2e/generate-client/sse-consumer/api.ts
@@ -533,9 +533,7 @@ async function* __sse<T>(config: ClientConfig, url: string, init: SseOptions, da
             try {
                 while (true) {
                     const { done, value } = await reader.read();
-                    if (done)
-                        break;
-                    buffer += decoder.decode(value, { stream: true });
+                    buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });
                     let index: number;
                     while ((index = buffer.search(/\r\n\r\n|\n\n|\r\r/)) !== -1) {
                         const raw = buffer.slice(0, index);
@@ -549,6 +547,19 @@ async function* __sse<T>(config: ClientConfig, url: string, init: SseOptions, da
                             yield event as ServerSentEvent<T>;
                         }
                     }
+                    if (done) {
+                        // Stream closed cleanly. Flush a final event that arrived without a trailing
+                        // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.
+                        const event = buffer.length > 0 ? __parseSseFrame(buffer, dataKind) : undefined;
+                        if (event) {
+                            if (event.id !== undefined)
+                                lastEventId = event.id;
+                            if (event.retry !== undefined)
+                                serverRetry = event.retry;
+                            yield event as ServerSentEvent<T>;
+                        }
+                        return;
+                    }
                     // Bound memory: a server that never sends a frame delimiter would otherwise
                     // grow `buffer` without limit. 1 MiB is far above any real SSE frame.
                     if (buffer.length > 1048576) {
diff --git a/tests/e2e/generate-client/sse-consumer/index-finite.ts b/tests/e2e/generate-client/sse-consumer/index-finite.ts
new file mode 100644
index 0000000000..f318df0820
--- /dev/null
+++ b/tests/e2e/generate-client/sse-consumer/index-finite.ts
@@ -0,0 +1,30 @@
+import { configure, sse } from './api.js';
+
+const baseUrl = process.argv[2] ?? process.env.SSE_BASE_URL ?? 'http://127.0.0.1:3104';
+
+// Iterate to natural completion — no `break`. The server drops the first connection
+// (client reconnects via Last-Event-ID), then delivers the final frame WITHOUT a
+// trailing delimiter and closes cleanly. Reaching the end of the `for await` proves
+// two things: the final dangling frame was flushed, and a clean close finished the
+// stream instead of looping forever on reconnect.
+async function main(): Promise<void> {
+  configure({ baseUrl });
+
+  const collected: Array<{ text: string; id: string | undefined }> = [];
+  for await (const ev of sse.streamMessages()) {
+    collected.push({ text: ev.data.text, id: ev.id });
+  }
+
+  process.stdout.write(
+    JSON.stringify({
+      events: collected.map((e) => e.text),
+      ids: collected.map((e) => e.id),
+      finished: true,
+    }) + '\n'
+  );
+}
+
+main().catch((error) => {
+  process.stderr.write(`UNHANDLED: ${error instanceof Error ? error.message : String(error)}\n`);
+  process.exit(1);
+});
diff --git a/tests/e2e/generate-client/sse-consumer/server.ts b/tests/e2e/generate-client/sse-consumer/server.ts
index b9a6709283..144d07c2f9 100644
--- a/tests/e2e/generate-client/sse-consumer/server.ts
+++ b/tests/e2e/generate-client/sse-consumer/server.ts
@@ -42,15 +42,19 @@ const server = http.createServer((req, res) => {
       Connection: 'keep-alive',
     });
     if (lastEventId === '2') {
-      // Reconnect: deliver the next frame and close.
-      writeFrame(res, 'id: 3\ndata: {"text":"c","seq":3}\n\n');
+      // Reconnect: deliver the final frame WITHOUT a trailing delimiter, then close
+      // cleanly. The client must flush this dangling frame on stream end (final frame
+      // not dropped) and then finish — a clean close is not a dropped connection.
+      writeFrame(res, 'id: 3\ndata: {"text":"c","seq":3}');
       res.end();
       return;
     }
-    // First connect: deliver two frames then drop the connection (simulates a drop).
+    // First connect: deliver two frames then abruptly destroy the socket (no chunked
+    // terminator) to simulate a real drop. The client's reader throws → it reconnects
+    // via Last-Event-ID. (A clean res.end() here would instead finish, not reconnect.)
     writeFrame(res, 'id: 1\nevent: msg\ndata: {"text":"a","seq":1}\n\n');
     writeFrame(res, 'id: 2\ndata: {"text":"b","seq":2}\n\n');
-    res.end();
+    setTimeout(() => res.destroy(), 100);
     return;
   }
 
diff --git a/tests/e2e/generate-client/sse.runtime.test.ts b/tests/e2e/generate-client/sse.runtime.test.ts
index b813d16d12..9bcd03964c 100644
--- a/tests/e2e/generate-client/sse.runtime.test.ts
+++ b/tests/e2e/generate-client/sse.runtime.test.ts
@@ -16,6 +16,7 @@ const generatedFile = join(consumerDir, 'api.ts');
 const serverScript = join(consumerDir, 'server.ts');
 const indexScript = join(consumerDir, 'index.ts');
 const abortScript = join(consumerDir, 'index-abort.ts');
+const finiteScript = join(consumerDir, 'index-finite.ts');
 
 const SERVER_PORT = 3104;
 const SERVER_BASE = `http://127.0.0.1:${SERVER_PORT}`;
@@ -121,6 +122,31 @@ describe('generate-client SSE consumer (reconnect + abort)', () => {
     expect(parsed.lastEventIds).toEqual([null, '2']);
   }, 30_000);
 
+  test('clean close: a finite stream finishes (no endless reconnect) and flushes the final undelimited frame', () => {
+    const runResult = spawnSync('npx', ['tsx', finiteScript, SERVER_BASE], {
+      encoding: 'utf-8',
+      cwd: consumerDir,
+      timeout: 20_000,
+    });
+    expect(
+      runResult.status,
+      `finite consumer stdout:\n${runResult.stdout}\nstderr:\n${runResult.stderr}`
+    ).toBe(0);
+
+    const parsed = JSON.parse(runResult.stdout.trim()) as {
+      events: string[];
+      ids: Array<string | undefined>;
+      finished: boolean;
+    };
+
+    // The loop ran to completion: a clean server close finished the stream rather than
+    // reconnecting forever. `c` was delivered only via the final-frame flush (the third
+    // frame had no trailing delimiter before the server closed).
+    expect(parsed.finished).toBe(true);
+    expect(parsed.events).toEqual(['a', 'b', 'c']);
+    expect(parsed.ids).toEqual(['1', '2', '3']);
+  }, 30_000);
+
   test('abort: aborting the stream via AbortSignal completes the loop without throwing', () => {
     const runResult = spawnSync('npx', ['tsx', abortScript, SERVER_BASE], {
       encoding: 'utf-8',

From dab6d5039fe4a57e7380c9d663da36b6a8de2e68 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 23 Jun 2026 16:36:19 +0300
Subject: [PATCH 020/134] fix(openapi-typescript): empty generators list falls
 back to the default sdk
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

An explicitly empty generators selection (config `generators: []`, or
`--generators ,`) ran zero generators and wrote no client, yet the command still
reported success. The default sdk was only applied when generators was
`undefined`, not `[]`.

- generateClient now resolves `options.generators?.length ? … : ['sdk']`, so an
  empty list behaves like "unspecified".
- The CLI `--generators` coerce returns `undefined` for an empty value, so it
  neither replaces the default nor clobbers a config-file selection via merge.

Added a generator-contract e2e asserting `--generators ,` emits the sdk client.
---
 packages/cli/src/index.ts                            |  5 ++++-
 packages/openapi-typescript/src/index.ts             |  5 ++++-
 tests/e2e/generate-client/generator-contract.test.ts | 12 ++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index d8e58a51a1..9d19af8750 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -952,10 +952,13 @@ yargs(hideBin(process.argv))
               // valid here; the generator resolver validates each (and reports unknown/unloadable
               // entries with an actionable message) once the config is assembled.
               if (value === undefined) return undefined;
-              return value
+              const names = value
                 .split(',')
                 .map((s) => s.trim())
                 .filter(Boolean);
+              // Treat an empty value (`--generators ` or `,`) as unset, so it neither
+              // replaces the default sdk generator nor clobbers a config-file selection.
+              return names.length ? names : undefined;
             },
           },
           config: {
diff --git a/packages/openapi-typescript/src/index.ts b/packages/openapi-typescript/src/index.ts
index 5958506e6c..338bb0a8eb 100644
--- a/packages/openapi-typescript/src/index.ts
+++ b/packages/openapi-typescript/src/index.ts
@@ -85,7 +85,10 @@ export async function generateClient(
 
   // Resolve the selection into a registry: built-in names pass through, inline `customGenerators`
   // register, and any other entry is imported as a plugin specifier (path/package).
-  const { selected, registry } = await resolveGenerators(options.generators ?? ['sdk'], {
+  // An empty list (e.g. `generators: []` in config, or `--generators ,`) means
+  // "unspecified" — fall back to the default sdk client rather than emitting nothing.
+  const requested = options.generators?.length ? options.generators : ['sdk'];
+  const { selected, registry } = await resolveGenerators(requested, {
     customGenerators: options.customGenerators,
     configDir: options.configDir,
   });
diff --git a/tests/e2e/generate-client/generator-contract.test.ts b/tests/e2e/generate-client/generator-contract.test.ts
index d7c4484ca3..2bc785bcd7 100644
--- a/tests/e2e/generate-client/generator-contract.test.ts
+++ b/tests/e2e/generate-client/generator-contract.test.ts
@@ -83,6 +83,18 @@ describe('generate-client generator compatibility contract', () => {
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
+  it('treats an empty --generators value as unset, defaulting to the sdk client', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-contract-'));
+    const outFile = join(dir, 'c.ts');
+    // `--generators ,` coerces to an empty list; it must fall back to the default sdk
+    // generator and emit a client, not silently report success with no output.
+    const { status, out } = run([cafe, '--output', outFile, '--generators', ',']);
+    expect(status, out).toBe(0);
+    expect(existsSync(outFile)).toBe(true);
+    expect(readFileSync(outFile, 'utf-8')).toContain('export async function');
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
   it('skips SSE operations in tanstack-query (reporting them) and still emits the rest', () => {
     const dir = mkdtempSync(join(tmpdir(), 'ots-contract-'));
     const { status, out } = run([

From aab5c4af9659bccc9debdce215a3e52fc1700dce Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 23 Jun 2026 16:36:20 +0300
Subject: [PATCH 021/134] fix(cli): generate-client only loads a config file
 when --config-file is given
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Previously every run called loadConfigFile, which auto-discovers a cwd
`redocly-openapi-typescript.config.*` when no path is passed and merges it on top
of redocly.yaml's `x-openapi-typescript` — silently overriding redocly.yaml, and
resolving the discovered file's relative plugin specifiers against redocly.yaml's
directory (the wrong base). A config file is now loaded only when --config-file is
explicitly provided; no implicit cwd discovery.

Added a config-file e2e asserting a stray cwd config is ignored without --config-file.
---
 packages/cli/src/commands/generate-client.ts  |  6 ++++-
 tests/e2e/generate-client/config-file.test.ts | 23 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index 6a923de41a..47cd6c55fa 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -61,8 +61,12 @@ export async function handleGenerateClient({
 
   // Config sources, lowest → highest precedence: redocly.yaml `x-openapi-typescript`
   // (the ambient base) → an explicit `--config-file` *.config.ts → CLI flags.
+  // Only an explicit `--config-file` is loaded — no implicit cwd discovery, so a stray
+  // `redocly-openapi-typescript.config.*` can't silently override `redocly.yaml`.
   const redoclyExtension = readRedoclyExtension(config);
-  const fileConfig = (await loadConfigFile(argv['config-file'])) ?? {};
+  const fileConfig = argv['config-file']
+    ? ((await loadConfigFile(argv['config-file'])) ?? {})
+    : {};
   const merged = mergeConfig(mergeConfig(redoclyExtension as typeof fileConfig, fileConfig), {
     input: argv.input,
     output: argv.output,
diff --git a/tests/e2e/generate-client/config-file.test.ts b/tests/e2e/generate-client/config-file.test.ts
index cee1d1ef16..7034c7130a 100644
--- a/tests/e2e/generate-client/config-file.test.ts
+++ b/tests/e2e/generate-client/config-file.test.ts
@@ -53,4 +53,27 @@ describe('generate-client config file', () => {
     expect(existsSync(join(dir, 'split/client.http.ts'))).toBe(true);
     expect(existsSync(join(dir, 'split/client.schemas.ts'))).toBe(true);
   }, 30_000);
+
+  it('does not auto-discover a cwd config file without --config-file (no silent override of redocly.yaml)', () => {
+    const subdir = mkdtempSync(join(tmpdir(), 'ots-nodiscover-'));
+    const fromYaml = join(subdir, 'from-yaml.ts');
+    const fromStray = join(subdir, 'from-stray.ts');
+    writeFileSync(
+      join(subdir, 'redocly.yaml'),
+      `x-openapi-typescript:\n  input: ${JSON.stringify(fixture)}\n  output: ./from-yaml.ts\n`,
+      'utf-8'
+    );
+    // A stray default-named config in cwd that, if discovered, would redirect output.
+    writeFileSync(
+      join(subdir, 'redocly-openapi-typescript.config.mjs'),
+      `export default { output: ${JSON.stringify(fromStray)} };\n`,
+      'utf-8'
+    );
+    const res = spawnSync('node', [cli, 'generate-client'], { encoding: 'utf-8', cwd: subdir });
+    expect(res.status, res.stderr).toBe(0);
+    // redocly.yaml's output wins; the un-requested cwd config file is ignored.
+    expect(existsSync(fromYaml)).toBe(true);
+    expect(existsSync(fromStray)).toBe(false);
+    rmSync(subdir, { recursive: true, force: true });
+  }, 30_000);
 });

From 840c33a75e5bacddf23a54212a250aa7d49ed912 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 23 Jun 2026 17:25:58 +0300
Subject: [PATCH 022/134] fix: formatting

---
 packages/cli/src/commands/generate-client.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index 47cd6c55fa..32a2c8217b 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -64,9 +64,7 @@ export async function handleGenerateClient({
   // Only an explicit `--config-file` is loaded — no implicit cwd discovery, so a stray
   // `redocly-openapi-typescript.config.*` can't silently override `redocly.yaml`.
   const redoclyExtension = readRedoclyExtension(config);
-  const fileConfig = argv['config-file']
-    ? ((await loadConfigFile(argv['config-file'])) ?? {})
-    : {};
+  const fileConfig = argv['config-file'] ? ((await loadConfigFile(argv['config-file'])) ?? {}) : {};
   const merged = mergeConfig(mergeConfig(redoclyExtension as typeof fileConfig, fileConfig), {
     input: argv.input,
     output: argv.output,

From f7dec25031665b00f459f72e2ef428f6e03db17e Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 23 Jun 2026 18:28:59 +0300
Subject: [PATCH 023/134] fix(openapi-typescript): drain a retried response
 body before the next attempt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In the generated __send retry loop, a retryable non-OK response was abandoned
without consuming its body before the next fetch. Under Node/undici (and other
strict HTTP clients) an unread body keeps the connection checked out, which can
stall the connection pool and make retries unreliable under load.

Before retrying, cancel the abandoned body (`response.body?.cancel()`, errors
ignored — e.g. a middleware already read it). Added a retry e2e that scripts an
observable ReadableStream and asserts the 503 body is cancelled before the retry.

Regenerated all committed clients (examples, consumer fixtures, cafe snapshot)
since __send is part of every client's runtime.
---
 .../custom-generator/src/api/client.ts        |  7 +++-
 .../fetch-functions/src/api/client.ts         |  7 +++-
 .../examples/mock/src/api/client.ts           |  7 +++-
 .../examples/service-class/src/api/client.ts  |  7 +++-
 .../examples/tanstack-query/src/api/client.ts |  7 +++-
 .../examples/zod/src/api/client.ts            |  7 +++-
 .../src/emitters/runtime.ts                   |  7 +++-
 .../e2e/generate-client/base-consumer/api.ts  |  7 +++-
 .../e2e/generate-client/cafe-consumer/api.ts  |  7 +++-
 tests/e2e/generate-client/cafe.snapshot.ts    |  7 +++-
 tests/e2e/generate-client/retry.test.ts       | 33 +++++++++++++++++++
 tests/e2e/generate-client/sse-consumer/api.ts |  7 +++-
 12 files changed, 99 insertions(+), 11 deletions(-)

diff --git a/packages/openapi-typescript/examples/custom-generator/src/api/client.ts b/packages/openapi-typescript/examples/custom-generator/src/api/client.ts
index 89486e000c..69068d44a4 100644
--- a/packages/openapi-typescript/examples/custom-generator/src/api/client.ts
+++ b/packages/openapi-typescript/examples/custom-generator/src/api/client.ts
@@ -783,7 +783,12 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
             attempt < maxAttempts &&
             !signal?.aborted &&
             (await retryOn({ attempt, request: context, response }))) {
-            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            const retryAfter = response.headers.get('retry-after');
+            // Drain the abandoned response body before the next attempt: an unread body
+            // keeps the connection checked out (and can stall the pool) under Node/undici
+            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+            await response.body?.cancel().catch(() => undefined);
+            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
             continue;
         }
         return { response, context };
diff --git a/packages/openapi-typescript/examples/fetch-functions/src/api/client.ts b/packages/openapi-typescript/examples/fetch-functions/src/api/client.ts
index 89486e000c..69068d44a4 100644
--- a/packages/openapi-typescript/examples/fetch-functions/src/api/client.ts
+++ b/packages/openapi-typescript/examples/fetch-functions/src/api/client.ts
@@ -783,7 +783,12 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
             attempt < maxAttempts &&
             !signal?.aborted &&
             (await retryOn({ attempt, request: context, response }))) {
-            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            const retryAfter = response.headers.get('retry-after');
+            // Drain the abandoned response body before the next attempt: an unread body
+            // keeps the connection checked out (and can stall the pool) under Node/undici
+            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+            await response.body?.cancel().catch(() => undefined);
+            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
             continue;
         }
         return { response, context };
diff --git a/packages/openapi-typescript/examples/mock/src/api/client.ts b/packages/openapi-typescript/examples/mock/src/api/client.ts
index 89486e000c..69068d44a4 100644
--- a/packages/openapi-typescript/examples/mock/src/api/client.ts
+++ b/packages/openapi-typescript/examples/mock/src/api/client.ts
@@ -783,7 +783,12 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
             attempt < maxAttempts &&
             !signal?.aborted &&
             (await retryOn({ attempt, request: context, response }))) {
-            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            const retryAfter = response.headers.get('retry-after');
+            // Drain the abandoned response body before the next attempt: an unread body
+            // keeps the connection checked out (and can stall the pool) under Node/undici
+            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+            await response.body?.cancel().catch(() => undefined);
+            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
             continue;
         }
         return { response, context };
diff --git a/packages/openapi-typescript/examples/service-class/src/api/client.ts b/packages/openapi-typescript/examples/service-class/src/api/client.ts
index 7ee08fa5a0..f8ae077856 100644
--- a/packages/openapi-typescript/examples/service-class/src/api/client.ts
+++ b/packages/openapi-typescript/examples/service-class/src/api/client.ts
@@ -783,7 +783,12 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
             attempt < maxAttempts &&
             !signal?.aborted &&
             (await retryOn({ attempt, request: context, response }))) {
-            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            const retryAfter = response.headers.get('retry-after');
+            // Drain the abandoned response body before the next attempt: an unread body
+            // keeps the connection checked out (and can stall the pool) under Node/undici
+            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+            await response.body?.cancel().catch(() => undefined);
+            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
             continue;
         }
         return { response, context };
diff --git a/packages/openapi-typescript/examples/tanstack-query/src/api/client.ts b/packages/openapi-typescript/examples/tanstack-query/src/api/client.ts
index 89486e000c..69068d44a4 100644
--- a/packages/openapi-typescript/examples/tanstack-query/src/api/client.ts
+++ b/packages/openapi-typescript/examples/tanstack-query/src/api/client.ts
@@ -783,7 +783,12 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
             attempt < maxAttempts &&
             !signal?.aborted &&
             (await retryOn({ attempt, request: context, response }))) {
-            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            const retryAfter = response.headers.get('retry-after');
+            // Drain the abandoned response body before the next attempt: an unread body
+            // keeps the connection checked out (and can stall the pool) under Node/undici
+            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+            await response.body?.cancel().catch(() => undefined);
+            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
             continue;
         }
         return { response, context };
diff --git a/packages/openapi-typescript/examples/zod/src/api/client.ts b/packages/openapi-typescript/examples/zod/src/api/client.ts
index 89486e000c..69068d44a4 100644
--- a/packages/openapi-typescript/examples/zod/src/api/client.ts
+++ b/packages/openapi-typescript/examples/zod/src/api/client.ts
@@ -783,7 +783,12 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
             attempt < maxAttempts &&
             !signal?.aborted &&
             (await retryOn({ attempt, request: context, response }))) {
-            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            const retryAfter = response.headers.get('retry-after');
+            // Drain the abandoned response body before the next attempt: an unread body
+            // keeps the connection checked out (and can stall the pool) under Node/undici
+            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+            await response.body?.cancel().catch(() => undefined);
+            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
             continue;
         }
         return { response, context };
diff --git a/packages/openapi-typescript/src/emitters/runtime.ts b/packages/openapi-typescript/src/emitters/runtime.ts
index 205528ed20..fc410e9f7f 100644
--- a/packages/openapi-typescript/src/emitters/runtime.ts
+++ b/packages/openapi-typescript/src/emitters/runtime.ts
@@ -648,7 +648,12 @@ ${ex}async function __send(
       !signal?.aborted &&
       (await retryOn({ attempt, request: context, response }))
     ) {
-      await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
       continue;
     }
     return { response, context };
diff --git a/tests/e2e/generate-client/base-consumer/api.ts b/tests/e2e/generate-client/base-consumer/api.ts
index b4e3eb45ca..351dda22ee 100644
--- a/tests/e2e/generate-client/base-consumer/api.ts
+++ b/tests/e2e/generate-client/base-consumer/api.ts
@@ -454,7 +454,12 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
             attempt < maxAttempts &&
             !signal?.aborted &&
             (await retryOn({ attempt, request: context, response }))) {
-            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            const retryAfter = response.headers.get('retry-after');
+            // Drain the abandoned response body before the next attempt: an unread body
+            // keeps the connection checked out (and can stall the pool) under Node/undici
+            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+            await response.body?.cancel().catch(() => undefined);
+            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
             continue;
         }
         return { response, context };
diff --git a/tests/e2e/generate-client/cafe-consumer/api.ts b/tests/e2e/generate-client/cafe-consumer/api.ts
index 18d166779b..c1cc11db87 100644
--- a/tests/e2e/generate-client/cafe-consumer/api.ts
+++ b/tests/e2e/generate-client/cafe-consumer/api.ts
@@ -783,7 +783,12 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
             attempt < maxAttempts &&
             !signal?.aborted &&
             (await retryOn({ attempt, request: context, response }))) {
-            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            const retryAfter = response.headers.get('retry-after');
+            // Drain the abandoned response body before the next attempt: an unread body
+            // keeps the connection checked out (and can stall the pool) under Node/undici
+            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+            await response.body?.cancel().catch(() => undefined);
+            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
             continue;
         }
         return { response, context };
diff --git a/tests/e2e/generate-client/cafe.snapshot.ts b/tests/e2e/generate-client/cafe.snapshot.ts
index 89486e000c..69068d44a4 100644
--- a/tests/e2e/generate-client/cafe.snapshot.ts
+++ b/tests/e2e/generate-client/cafe.snapshot.ts
@@ -783,7 +783,12 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
             attempt < maxAttempts &&
             !signal?.aborted &&
             (await retryOn({ attempt, request: context, response }))) {
-            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            const retryAfter = response.headers.get('retry-after');
+            // Drain the abandoned response body before the next attempt: an unread body
+            // keeps the connection checked out (and can stall the pool) under Node/undici
+            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+            await response.body?.cancel().catch(() => undefined);
+            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
             continue;
         }
         return { response, context };
diff --git a/tests/e2e/generate-client/retry.test.ts b/tests/e2e/generate-client/retry.test.ts
index 912a3db60c..b5ddcbd0d3 100644
--- a/tests/e2e/generate-client/retry.test.ts
+++ b/tests/e2e/generate-client/retry.test.ts
@@ -84,6 +84,39 @@ console.log(JSON.stringify({ defaultThrew, defaultCalls, retryCalls }));
     expect(result.retryCalls).toBe(3); // 2 failures + 1 success
   }, 60_000);
 
+  test('drains the unread body of a retried response before the next attempt', () => {
+    const result = runConsumer(
+      dir,
+      `
+import { configure, listPets } from './client.ts';
+
+let calls = 0;
+let cancelled = 0;
+// A 503 whose body cancellation is observable, then a 200 success.
+const makeFetch = () =>
+  (async () => {
+    calls++;
+    if (calls === 1) {
+      const body = new ReadableStream({
+        start(c) { c.enqueue(new TextEncoder().encode('busy')); c.close(); },
+        cancel() { cancelled++; },
+      });
+      return new Response(body, { status: 503, headers: { 'content-type': 'text/plain' } });
+    }
+    return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
+  }) as unknown as typeof fetch;
+
+configure({ fetch: makeFetch(), retry: { retries: 3, retryDelay: 1 } });
+await listPets();
+
+console.log(JSON.stringify({ calls, cancelled }));
+`
+    ) as { calls: number; cancelled: number };
+
+    expect(result.calls).toBe(2); // 1 failure + 1 success
+    expect(result.cancelled).toBe(1); // the abandoned 503 body was cancelled before retrying
+  }, 60_000);
+
   test('does NOT retry a non-idempotent POST by default, but does when retryOn opts in', () => {
     const result = runConsumer(
       dir,
diff --git a/tests/e2e/generate-client/sse-consumer/api.ts b/tests/e2e/generate-client/sse-consumer/api.ts
index 892905f39c..5fbc17d158 100644
--- a/tests/e2e/generate-client/sse-consumer/api.ts
+++ b/tests/e2e/generate-client/sse-consumer/api.ts
@@ -370,7 +370,12 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
             attempt < maxAttempts &&
             !signal?.aborted &&
             (await retryOn({ attempt, request: context, response }))) {
-            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            const retryAfter = response.headers.get('retry-after');
+            // Drain the abandoned response body before the next attempt: an unread body
+            // keeps the connection checked out (and can stall the pool) under Node/undici
+            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+            await response.body?.cancel().catch(() => undefined);
+            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
             continue;
         }
         return { response, context };

From 653252034c5dda58b839243774e95b8c517f3e95 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Wed, 24 Jun 2026 11:41:56 +0300
Subject: [PATCH 024/134] fix(openapi-typescript): regenerate programmatic
 example with the body-drain fix

The programmatic example regenerates via `tsx generate.ts`, which had resolved a
stale nested `node_modules/@redocly/openapi-typescript` (a local-packed copy)
instead of the freshly-built workspace lib, so its committed client missed the
retry body-drain change and the examples drift test failed in CI (CI has no
nested example node_modules, so its fresh generation included the fix).
---
 .../examples/programmatic/src/api/client.ts                | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/openapi-typescript/examples/programmatic/src/api/client.ts b/packages/openapi-typescript/examples/programmatic/src/api/client.ts
index 89486e000c..69068d44a4 100644
--- a/packages/openapi-typescript/examples/programmatic/src/api/client.ts
+++ b/packages/openapi-typescript/examples/programmatic/src/api/client.ts
@@ -783,7 +783,12 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
             attempt < maxAttempts &&
             !signal?.aborted &&
             (await retryOn({ attempt, request: context, response }))) {
-            await __sleep(__retryDelay(retry, attempt, response.headers.get('retry-after')), signal);
+            const retryAfter = response.headers.get('retry-after');
+            // Drain the abandoned response body before the next attempt: an unread body
+            // keeps the connection checked out (and can stall the pool) under Node/undici
+            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+            await response.body?.cancel().catch(() => undefined);
+            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
             continue;
         }
         return { response, context };

From 914d1c612bdb9a666c220c33d062b3b707fdec7b Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Wed, 24 Jun 2026 12:34:14 +0300
Subject: [PATCH 025/134] fix(openapi-typescript): SSE reconnects on a
 transport failure opening the stream
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The emitted __sse loop only reconnected when reading the stream body failed; a
failure from __send (a transport error — connection refused/reset/DNS — when
opening or completing the SSE request) was always rethrown, so the documented
auto-reconnect never ran for the dropped-connection case it's meant for.

Unify the send + body-read into one try: a transport failure (or a mid-stream
read error) now falls through to the backoff/reconnect path when reconnect is
enabled. A non-OK HTTP response (4xx/5xx) is still surfaced immediately as an
ApiError rather than reconnecting in a loop.

Added an SSE e2e (injected fetch that fails the first attempt, then streams) that
asserts the iterator reconnects and yields. Regenerated sse-consumer/api.ts (only
SSE clients embed __sse, so no other committed client changes).
---
 .../src/emitters/runtime.ts                   | 23 ++++++-------
 tests/e2e/generate-client/sse-consumer/api.ts | 26 +++++++-------
 .../sse-consumer/index-connect-retry.ts       | 34 +++++++++++++++++++
 tests/e2e/generate-client/sse.runtime.test.ts | 25 ++++++++++++++
 4 files changed, 82 insertions(+), 26 deletions(-)
 create mode 100644 tests/e2e/generate-client/sse-consumer/index-connect-retry.ts

diff --git a/packages/openapi-typescript/src/emitters/runtime.ts b/packages/openapi-typescript/src/emitters/runtime.ts
index fc410e9f7f..1f467f3da7 100644
--- a/packages/openapi-typescript/src/emitters/runtime.ts
+++ b/packages/openapi-typescript/src/emitters/runtime.ts
@@ -162,19 +162,13 @@ ${ex}async function* __sse<T>(
   while (true) {
     if (signal?.aborted) return;
     const sendHeaders = lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
-    let response: Response;
-    try {
-      ({ response } = await __send(config, url, { ...rest, method: rest.method ?? 'GET', headers: sendHeaders }));
-    } catch (error) {
-      if (signal?.aborted) return;
-      throw error;
-    }
-    if (!response.ok) {
-      const errorBody = await readError(response);
-      throw new ApiError(url, response.status, response.statusText, errorBody);
-    }
-    failures = 0;
     try {
+      const { response } = await __send(config, url, { ...rest, method: rest.method ?? 'GET', headers: sendHeaders });
+      if (!response.ok) {
+        const errorBody = await readError(response);
+        throw new ApiError(url, response.status, response.statusText, errorBody);
+      }
+      failures = 0;
       const body = response.body;
       if (!body) return;
       const reader = body.getReader();
@@ -217,6 +211,11 @@ ${ex}async function* __sse<T>(
       }
     } catch (error) {
       if (signal?.aborted) return;
+      // A non-OK HTTP response is a definitive error (4xx/5xx), not a transient drop —
+      // surface it instead of reconnecting in a loop.
+      if (error instanceof ApiError) throw error;
+      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream
+      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.
       if (!reconnect) throw error;
     }
     if (!reconnect || signal?.aborted) return;
diff --git a/tests/e2e/generate-client/sse-consumer/api.ts b/tests/e2e/generate-client/sse-consumer/api.ts
index 5fbc17d158..411f59e0de 100644
--- a/tests/e2e/generate-client/sse-consumer/api.ts
+++ b/tests/e2e/generate-client/sse-consumer/api.ts
@@ -514,21 +514,13 @@ async function* __sse<T>(config: ClientConfig, url: string, init: SseOptions, da
         if (signal?.aborted)
             return;
         const sendHeaders = lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
-        let response: Response;
-        try {
-            ({ response } = await __send(config, url, { ...rest, method: rest.method ?? 'GET', headers: sendHeaders }));
-        }
-        catch (error) {
-            if (signal?.aborted)
-                return;
-            throw error;
-        }
-        if (!response.ok) {
-            const errorBody = await readError(response);
-            throw new ApiError(url, response.status, response.statusText, errorBody);
-        }
-        failures = 0;
         try {
+            const { response } = await __send(config, url, { ...rest, method: rest.method ?? 'GET', headers: sendHeaders });
+            if (!response.ok) {
+                const errorBody = await readError(response);
+                throw new ApiError(url, response.status, response.statusText, errorBody);
+            }
+            failures = 0;
             const body = response.body;
             if (!body)
                 return;
@@ -579,6 +571,12 @@ async function* __sse<T>(config: ClientConfig, url: string, init: SseOptions, da
         catch (error) {
             if (signal?.aborted)
                 return;
+            // A non-OK HTTP response is a definitive error (4xx/5xx), not a transient drop —
+            // surface it instead of reconnecting in a loop.
+            if (error instanceof ApiError)
+                throw error;
+            // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream
+            // read error, is a dropped connection: fall through to backoff/reconnect when enabled.
             if (!reconnect)
                 throw error;
         }
diff --git a/tests/e2e/generate-client/sse-consumer/index-connect-retry.ts b/tests/e2e/generate-client/sse-consumer/index-connect-retry.ts
new file mode 100644
index 0000000000..df7fe70cac
--- /dev/null
+++ b/tests/e2e/generate-client/sse-consumer/index-connect-retry.ts
@@ -0,0 +1,34 @@
+import { configure, sse } from './api.js';
+
+// No real server: inject a `fetch` that fails the first attempt with a transport-style
+// error (as if the connection were refused/reset while opening the request), then
+// succeeds. With the fix, __sse must treat a __send failure as a dropped connection and
+// reconnect — not rethrow on the first error.
+let calls = 0;
+configure({
+  fetch: (async () => {
+    calls++;
+    if (calls === 1) throw new TypeError('simulated connection failure');
+    const body = new ReadableStream({
+      start(c) {
+        c.enqueue(new TextEncoder().encode('id: 1\ndata: {"text":"a","seq":1}\n\n'));
+        c.close();
+      },
+    });
+    return new Response(body, { status: 200, headers: { 'content-type': 'text/event-stream' } });
+  }) as unknown as typeof fetch,
+});
+
+async function main(): Promise<void> {
+  const events: string[] = [];
+  // Tiny reconnect backoff so the test doesn't wait on the 1s default.
+  for await (const ev of sse.streamMessages({ reconnectDelay: 1 })) {
+    events.push(ev.data.text);
+  }
+  process.stdout.write(JSON.stringify({ calls, events, finished: true }) + '\n');
+}
+
+main().catch((error) => {
+  process.stderr.write(`UNHANDLED: ${error instanceof Error ? error.message : String(error)}\n`);
+  process.exit(1);
+});
diff --git a/tests/e2e/generate-client/sse.runtime.test.ts b/tests/e2e/generate-client/sse.runtime.test.ts
index 9bcd03964c..2f08701d14 100644
--- a/tests/e2e/generate-client/sse.runtime.test.ts
+++ b/tests/e2e/generate-client/sse.runtime.test.ts
@@ -17,6 +17,7 @@ const serverScript = join(consumerDir, 'server.ts');
 const indexScript = join(consumerDir, 'index.ts');
 const abortScript = join(consumerDir, 'index-abort.ts');
 const finiteScript = join(consumerDir, 'index-finite.ts');
+const connectRetryScript = join(consumerDir, 'index-connect-retry.ts');
 
 const SERVER_PORT = 3104;
 const SERVER_BASE = `http://127.0.0.1:${SERVER_PORT}`;
@@ -147,6 +148,30 @@ describe('generate-client SSE consumer (reconnect + abort)', () => {
     expect(parsed.ids).toEqual(['1', '2', '3']);
   }, 30_000);
 
+  test('reconnect: a transport failure opening the stream reconnects (not just mid-stream errors)', () => {
+    const runResult = spawnSync('npx', ['tsx', connectRetryScript], {
+      encoding: 'utf-8',
+      cwd: consumerDir,
+      timeout: 20_000,
+    });
+    expect(
+      runResult.status,
+      `connect-retry consumer stdout:\n${runResult.stdout}\nstderr:\n${runResult.stderr}`
+    ).toBe(0);
+
+    const parsed = JSON.parse(runResult.stdout.trim()) as {
+      calls: number;
+      events: string[];
+      finished: boolean;
+    };
+
+    // The first __send threw (simulated connection failure); the iterator reconnected
+    // and the second attempt streamed the event, then finished.
+    expect(parsed.calls).toBe(2);
+    expect(parsed.events).toEqual(['a']);
+    expect(parsed.finished).toBe(true);
+  }, 30_000);
+
   test('abort: aborting the stream via AbortSignal completes the loop without throwing', () => {
     const runResult = spawnSync('npx', ['tsx', abortScript, SERVER_BASE], {
       encoding: 'utf-8',

From 28a9c05ee4e673be959d1dd2ea779e006d30fe19 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Wed, 24 Jun 2026 13:30:32 +0300
Subject: [PATCH 026/134] test(openapi-typescript): move examples drift test
 under generate-client/

examples.test.ts is entirely about generate-client (it regenerates the
openapi-typescript examples via the CLI / programmatic API and diffs the
committed src/api), so it belongs next to the other generate-client e2e tests
rather than loose at the tests/e2e/ root. Only the repoRoot path changes
(one more level up); behavior is unchanged.
---
 tests/e2e/{ => generate-client}/examples.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename tests/e2e/{ => generate-client}/examples.test.ts (98%)

diff --git a/tests/e2e/examples.test.ts b/tests/e2e/generate-client/examples.test.ts
similarity index 98%
rename from tests/e2e/examples.test.ts
rename to tests/e2e/generate-client/examples.test.ts
index d049c18a86..0b7556a9cd 100644
--- a/tests/e2e/examples.test.ts
+++ b/tests/e2e/generate-client/examples.test.ts
@@ -5,7 +5,7 @@ import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../..');
+const repoRoot = resolve(__dirname, '../../..');
 const cli = join(repoRoot, 'packages/cli/lib/index.js');
 const tsx = join(repoRoot, 'node_modules/.bin/tsx');
 const examplesDir = join(repoRoot, 'packages/openapi-typescript/examples');

From 3a0754bfa5c5739cee36a2ca6b87938436772af7 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Fri, 26 Jun 2026 13:19:13 +0300
Subject: [PATCH 027/134] refactor(openapi-typescript): drop *.config.ts
 config-file support and defineConfig
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The CLI had two declarative config surfaces — redocly.yaml's `x-openapi-typescript`
block and a separate `*.config.ts` `defineConfig` file loaded via `--config-file`.
Collapse to one: `redocly.yaml` (located with the standard `--config` flag) is the
only declarative surface; code-level control (including inline custom generators via
`customGenerators`) uses the programmatic `generateClient()` API. This removes an
overlapping third mechanism while the feature is still experimental.

- cli: remove the `--config-file` option and its handling; `configDir` now derives
  solely from the redocly.yaml location (or cwd). `--config` is unchanged.
- openapi-typescript: remove `loadConfigFile` (keep `mergeConfig` for layering
  redocly.yaml + flags) and the `defineConfig` identity helper. `Config` stays
  exported, so `satisfies Config` covers type-safe standalone config authoring.
- docs: drop the `--config-file` row + the dedicated-config-file section, fix the
  precedence to `redocly.yaml → CLI flags`, and rework the custom-generators section
  to redocly.yaml-by-path + the programmatic inline path.
- tests: drop the *.config.ts/loadConfigFile cases; redocly-config e2e already covers
  the `--config` relative-path resolution.

No generated client output changes (config handling is CLI-side only).
---
 docs/@v2/commands/generate-client.md          | 34 +++-----
 packages/cli/src/commands/generate-client.ts  | 23 ++----
 packages/cli/src/index.ts                     |  7 +-
 .../src/__tests__/config-file.test.ts         | 60 +-------------
 .../src/__tests__/config.test.ts              | 26 ------
 .../openapi-typescript/src/config-file.ts     | 41 +---------
 packages/openapi-typescript/src/config.ts     | 14 +---
 .../src/generators/resolve.ts                 |  2 +-
 packages/openapi-typescript/src/index.ts      |  1 -
 tests/e2e/generate-client/config-file.test.ts | 79 -------------------
 .../generate-client/redocly-config.test.ts    |  6 +-
 11 files changed, 34 insertions(+), 259 deletions(-)
 delete mode 100644 packages/openapi-typescript/src/__tests__/config.test.ts
 delete mode 100644 tests/e2e/generate-client/config-file.test.ts

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index 23345ab63d..cded6c2ba2 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -149,13 +149,6 @@ redocly generate-client cafe -o src/client.ts
 - Path to the `redocly.yaml` configuration file (where the `x-openapi-typescript` block lives).
   Defaults to the `redocly.yaml` discovered in the working directory.
 
----
-
-- `--config-file`
-- `string`
-- Path to a dedicated `defineConfig` config file (`*.config.ts`/`.mjs`/`.js`), as an alternative to the `redocly.yaml` `x-openapi-typescript` block.
-  Useful when the config lives outside the project or in a nested folder.
-
 {% /table %}
 
 ## Configuration
@@ -180,15 +173,15 @@ redocly generate-client
 ```
 
 Relative `input`/`output` are resolved against the `redocly.yaml` directory, so the command works the same from any working directory.
-
-A dedicated `defineConfig` file is also supported via `--config-file` (useful when the config lives outside the project or in a nested folder):
+Point at a `redocly.yaml` elsewhere with the standard `--config` flag:
 
 ```sh
-redocly generate-client --config-file ./config/openapi-typescript.config.ts
+redocly generate-client --config ./config/redocly.yaml
 ```
 
-**Precedence** (lowest to highest): the `redocly.yaml` `x-openapi-typescript` block → an explicit `--config-file` → individual CLI flags.
+**Precedence** (lowest to highest): the `redocly.yaml` `x-openapi-typescript` block → individual CLI flags.
 Each layer overrides per setting, so you can keep a base config and override one value on the command line.
+For code-level control — including registering custom generators inline — use the programmatic API instead (see [Custom generators](#custom-generators)).
 
 ## Examples
 
@@ -902,14 +895,11 @@ The `@redocly/openapi-typescript/plugin` entry also exports the **codegen toolki
 
 ### Select a custom generator
 
-A `generators` entry that is not a built-in name is either:
+In `redocly.yaml`, a `generators` entry that is not a built-in name is an **import specifier**:
 
-- an **inline** generator (registered via `customGenerators` in a `defineConfig` file)
-- an **import specifier** — a path (resolved against the config's directory)
+- a path (resolved against the `redocly.yaml` directory), or
 - an installed package — that default-exports the generator
 
-For example:
-
 ```yaml
 # redocly.yaml — by path or by published package
 x-openapi-typescript:
@@ -921,12 +911,14 @@ x-openapi-typescript:
     - '@acme/openapi-valibot' # npm package
 ```
 
+To register a generator **inline** (the function itself, with full type-safety and no install), use the programmatic API and pass it via `customGenerators`:
+
 ```ts
-// redocly-openapi-typescript.config.ts — inline (full type-safety, no install)
-import { defineConfig } from '@redocly/openapi-typescript';
+// generate.ts — run with `node --import tsx generate.ts`
+import { generateClient } from '@redocly/openapi-typescript';
 import routeMap from './tools/route-map-generator.ts';
 
-export default defineConfig({
+await generateClient({
   input: './openapi.yaml',
   output: './src/api/client.ts',
   customGenerators: [routeMap], // register…
@@ -940,8 +932,8 @@ A worked example lives in [`examples/custom-generator`](https://github.com/Redoc
 A custom generator declares the same `requires` / `facades` / `errorModes` / `dateTypes` contract as the built-ins, validated up front — an incompatible selection, a name that collides with another generator, or an unloadable specifier fails fast with an actionable message.
 The generated client stays dependency-free.
 A generator's output is its own file(s), and any libraries it targets are peers of _your app_.
-Import-specifier generators execute at generation time.'
-It has the same trust level as any installed dependency or `defineConfig` file.
+Import-specifier generators execute at generation time.
+It has the same trust level as any installed dependency you run.
 {% /admonition %}
 
 ## Server-Sent Events (streaming)
diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index 32a2c8217b..8a513d5fb4 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -1,4 +1,5 @@
 import { type Config, HandledError, isPlainObject, logger } from '@redocly/openapi-core';
+import { type Config as OpenApiTsConfig } from '@redocly/openapi-typescript';
 import { blue, gray, yellow } from 'colorette';
 import { dirname, isAbsolute, resolve as resolvePath } from 'node:path';
 
@@ -35,7 +36,6 @@ function readRedoclyExtension(config: Config): Record<string, unknown> {
 export type GenerateClientCommandArgv = {
   input?: string;
   output?: string;
-  'config-file'?: string;
   config?: string;
   'base-url'?: string;
   'enum-style'?: 'union' | 'const-object';
@@ -57,15 +57,12 @@ export async function handleGenerateClient({
   config,
 }: CommandArgs<GenerateClientCommandArgv>) {
   const { generateClient } = await import('@redocly/openapi-typescript');
-  const { loadConfigFile, mergeConfig } = await import('@redocly/openapi-typescript/config-file');
+  const { mergeConfig } = await import('@redocly/openapi-typescript/config-file');
 
-  // Config sources, lowest → highest precedence: redocly.yaml `x-openapi-typescript`
-  // (the ambient base) → an explicit `--config-file` *.config.ts → CLI flags.
-  // Only an explicit `--config-file` is loaded — no implicit cwd discovery, so a stray
-  // `redocly-openapi-typescript.config.*` can't silently override `redocly.yaml`.
+  // Config sources, lowest → highest precedence: the `redocly.yaml` `x-openapi-typescript`
+  // block (located via the standard `--config` flag, else discovered in cwd) → CLI flags.
   const redoclyExtension = readRedoclyExtension(config);
-  const fileConfig = argv['config-file'] ? ((await loadConfigFile(argv['config-file'])) ?? {}) : {};
-  const merged = mergeConfig(mergeConfig(redoclyExtension as typeof fileConfig, fileConfig), {
+  const merged = mergeConfig(redoclyExtension as Partial<OpenApiTsConfig>, {
     input: argv.input,
     output: argv.output,
     baseUrl: argv['base-url'],
@@ -92,13 +89,9 @@ export async function handleGenerateClient({
   const input = getAliasOrPath(config, merged.input).path;
   const outputPath = resolvePath(merged.output);
 
-  // Relative-path generator specifiers (and inline plugins) resolve against the config's location:
-  // the explicit `--config-file`, else the discovered `redocly.yaml`, else the working directory.
-  const configDir = argv['config-file']
-    ? dirname(resolvePath(argv['config-file']))
-    : config.configPath
-      ? dirname(config.configPath)
-      : process.cwd();
+  // Relative-path generator specifiers (and inline plugins) resolve against the
+  // `redocly.yaml` directory (the config's location), else the working directory.
+  const configDir = config.configPath ? dirname(config.configPath) : process.cwd();
 
   if (!outputPath.endsWith('.ts')) {
     throw new HandledError(
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index 9d19af8750..d6a2cbe0cf 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -872,11 +872,6 @@ yargs(hideBin(process.argv))
             type: 'string',
             requiresArg: true,
           },
-          'config-file': {
-            describe: 'Path to a generate-client config file (defineConfig).',
-            type: 'string',
-            requiresArg: true,
-          },
           'base-url': {
             describe:
               'Override the BASE URL inlined into the generated runtime. Defaults to `servers[0].url`.',
@@ -957,7 +952,7 @@ yargs(hideBin(process.argv))
                 .map((s) => s.trim())
                 .filter(Boolean);
               // Treat an empty value (`--generators ` or `,`) as unset, so it neither
-              // replaces the default sdk generator nor clobbers a config-file selection.
+              // replaces the default sdk generator nor clobbers a redocly.yaml selection.
               return names.length ? names : undefined;
             },
           },
diff --git a/packages/openapi-typescript/src/__tests__/config-file.test.ts b/packages/openapi-typescript/src/__tests__/config-file.test.ts
index 6efddfa1a0..a4f1b24df3 100644
--- a/packages/openapi-typescript/src/__tests__/config-file.test.ts
+++ b/packages/openapi-typescript/src/__tests__/config-file.test.ts
@@ -1,11 +1,7 @@
-import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-
-import { loadConfigFile, mergeConfig } from '../config-file.js';
+import { mergeConfig } from '../config-file.js';
 
 describe('mergeConfig', () => {
-  it('CLI overrides win over config-file values; undefined overrides are ignored', () => {
+  it('CLI overrides win over base values; undefined overrides are ignored', () => {
     const merged = mergeConfig(
       { input: 'spec.yaml', output: 'a.ts', outputMode: 'single' },
       { output: 'b.ts', outputMode: undefined, facade: 'service-class' }
@@ -18,55 +14,3 @@ describe('mergeConfig', () => {
     });
   });
 });
-
-describe('loadConfigFile', () => {
-  let dir = '';
-  beforeAll(() => {
-    dir = mkdtempSync(join(tmpdir(), 'ots-cfg-'));
-  });
-  afterAll(() => rmSync(dir, { recursive: true, force: true }));
-
-  it('imports the default export of an explicit .mjs config path', async () => {
-    const file = join(dir, 'my.config.mjs');
-    writeFileSync(
-      file,
-      `export default { input: 'spec.yaml', output: 'out.ts', generators: ['sdk'] };\n`,
-      'utf-8'
-    );
-    const config = await loadConfigFile(file);
-    expect(config).toEqual({ input: 'spec.yaml', output: 'out.ts', generators: ['sdk'] });
-  });
-
-  it('returns undefined when no path is given and none is discovered', async () => {
-    const config = await loadConfigFile(undefined, dir);
-    expect(config).toBeUndefined();
-  });
-
-  it('discovers a default-named config when no explicit path is given', async () => {
-    const file = join(dir, 'redocly-openapi-typescript.config.mjs');
-    writeFileSync(
-      file,
-      `export default { input: 'discovered.yaml', output: 'discovered.ts' };\n`,
-      'utf-8'
-    );
-    const config = await loadConfigFile(undefined, dir);
-    expect(config).toEqual({ input: 'discovered.yaml', output: 'discovered.ts' });
-  });
-
-  it('throws when the config file has no default export', async () => {
-    const file = join(dir, 'no-default.config.mjs');
-    writeFileSync(file, `export const x = 1;\n`, 'utf-8');
-    await expect(loadConfigFile(file)).rejects.toThrow(/export default/);
-  });
-
-  it('resolves a relative path against the given cwd', async () => {
-    // Write a config in dir and pass a relative filename + cwd=dir
-    writeFileSync(
-      join(dir, 'relative.config.mjs'),
-      `export default { input: 'rel.yaml', output: 'rel.ts' };\n`,
-      'utf-8'
-    );
-    const config = await loadConfigFile('relative.config.mjs', dir);
-    expect(config).toEqual({ input: 'rel.yaml', output: 'rel.ts' });
-  });
-});
diff --git a/packages/openapi-typescript/src/__tests__/config.test.ts b/packages/openapi-typescript/src/__tests__/config.test.ts
deleted file mode 100644
index 5ebf8a093f..0000000000
--- a/packages/openapi-typescript/src/__tests__/config.test.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-// packages/openapi-typescript/src/__tests__/config.test.ts
-import { defineConfig } from '../config.js';
-
-describe('defineConfig', () => {
-  it('returns its argument unchanged (identity, for type-safe config authoring)', () => {
-    const config = defineConfig({
-      input: './openapi.yaml',
-      output: './src/api.ts',
-      outputMode: 'split',
-      generators: ['sdk'],
-    });
-    expect(config).toEqual({
-      input: './openapi.yaml',
-      output: './src/api.ts',
-      outputMode: 'split',
-      generators: ['sdk'],
-    });
-  });
-
-  it('accepts a minimal config (input + output only)', () => {
-    expect(defineConfig({ input: 'a.yaml', output: 'a.ts' })).toEqual({
-      input: 'a.yaml',
-      output: 'a.ts',
-    });
-  });
-});
diff --git a/packages/openapi-typescript/src/config-file.ts b/packages/openapi-typescript/src/config-file.ts
index edece0cfe4..eac72d1137 100644
--- a/packages/openapi-typescript/src/config-file.ts
+++ b/packages/openapi-typescript/src/config-file.ts
@@ -1,45 +1,10 @@
 // packages/openapi-typescript/src/config-file.ts
-import { existsSync } from 'node:fs';
-import { isAbsolute, join, resolve } from 'node:path';
-import { pathToFileURL } from 'node:url';
-
 import type { Config } from './config.js';
 
-const DEFAULT_NAMES = [
-  'redocly-openapi-typescript.config.ts',
-  'redocly-openapi-typescript.config.mjs',
-  'redocly-openapi-typescript.config.js',
-];
-
-/**
- * Load a config file's default export. With an explicit `path`, imports it; else
- * discovers a default-named config in `cwd`. Returns `undefined` when none is found.
- *
- * Uses native dynamic `import()` — no transpiler dependency. `.ts` configs require
- * a host runtime that strips types (Node >= 22.18); otherwise pass a `.mjs`/`.js`
- * config or run under a TS-capable runtime.
- */
-export async function loadConfigFile(
-  path: string | undefined,
-  cwd: string = process.cwd()
-): Promise<Config | undefined> {
-  const resolved = path
-    ? isAbsolute(path)
-      ? path
-      : resolve(cwd, path)
-    : DEFAULT_NAMES.map((name) => join(cwd, name)).find((candidate) => existsSync(candidate));
-  if (!resolved) return undefined;
-  const module = (await import(pathToFileURL(resolved).href)) as { default?: Config };
-  if (!module.default) {
-    throw new Error(`Config file ${resolved} must \`export default\` a config object.`);
-  }
-  return module.default;
-}
-
 /**
- * Merge a base config (from a file) with CLI overrides. Defined keys in
- * `overrides` win; `undefined` override values are ignored so absent flags don't
- * clobber file values.
+ * Merge a base config (the `redocly.yaml` `x-openapi-typescript` block) with CLI
+ * overrides. Defined keys in `overrides` win; `undefined` override values are ignored
+ * so absent flags don't clobber the base values.
  */
 export function mergeConfig(base: Partial<Config>, overrides: Partial<Config>): Partial<Config> {
   const merged: Partial<Config> = { ...base };
diff --git a/packages/openapi-typescript/src/config.ts b/packages/openapi-typescript/src/config.ts
index 3cd5f72d06..cbc6ad9839 100644
--- a/packages/openapi-typescript/src/config.ts
+++ b/packages/openapi-typescript/src/config.ts
@@ -4,9 +4,9 @@ import type { CustomGenerator } from './generators/types.js';
 import type { OutputMode } from './writers/types.js';
 
 /**
- * The user-facing generation config — what `defineConfig` accepts and what a
- * `*.config.ts` default-exports. A superset of the programmatic options plus the
- * `generators` list. `redocly.yaml` ingestion is intentionally not modeled here
+ * The user-facing generation config: the options `generateClient()` accepts, plus the
+ * `generators` list. Annotate a standalone config object with `satisfies Config` for
+ * type-safe authoring. `redocly.yaml` ingestion is intentionally not modeled here
  * (roadmap P7.5).
  */
 export type Config = {
@@ -54,11 +54,3 @@ export type Config = {
    */
   customGenerators?: CustomGenerator[];
 };
-
-/**
- * Identity helper for type-safe config authoring in a `*.config.ts` file:
- * `export default defineConfig({ … })`. Returns its argument unchanged.
- */
-export function defineConfig(config: Config): Config {
-  return config;
-}
diff --git a/packages/openapi-typescript/src/generators/resolve.ts b/packages/openapi-typescript/src/generators/resolve.ts
index 505a183135..93f3b9d160 100644
--- a/packages/openapi-typescript/src/generators/resolve.ts
+++ b/packages/openapi-typescript/src/generators/resolve.ts
@@ -21,7 +21,7 @@ export type ResolvedGenerators = {
 };
 
 export type ResolveOptions = {
-  /** Inline custom generators (from a `defineConfig` file) registered before resolution. */
+  /** Inline custom generators (via the programmatic `generateClient` API) registered before resolution. */
   customGenerators?: CustomGenerator[];
   /** Directory relative-path specifiers resolve against (the config's location). Defaults to cwd. */
   configDir?: string;
diff --git a/packages/openapi-typescript/src/index.ts b/packages/openapi-typescript/src/index.ts
index 338bb0a8eb..71ec6de8b4 100644
--- a/packages/openapi-typescript/src/index.ts
+++ b/packages/openapi-typescript/src/index.ts
@@ -13,7 +13,6 @@ import type { GenerateClientOptions, GenerateClientResult } from './types.js';
 import type { GeneratedFile, OutputMode } from './writers/types.js';
 
 export { NotSupportedError } from './errors.js';
-export { defineConfig } from './config.js';
 export type { Config } from './config.js';
 export type { Generator, GeneratorInput, GeneratorName } from './generators/index.js';
 export type {
diff --git a/tests/e2e/generate-client/config-file.test.ts b/tests/e2e/generate-client/config-file.test.ts
deleted file mode 100644
index 7034c7130a..0000000000
--- a/tests/e2e/generate-client/config-file.test.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { spawnSync } from 'node:child_process';
-import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
-const fixture = join(__dirname, 'fixtures/base.yaml');
-
-describe('generate-client config file', () => {
-  let dir = '';
-  beforeAll(() => {
-    dir = mkdtempSync(join(tmpdir(), 'ots-cfgfile-'));
-  });
-  afterAll(() => rmSync(dir, { recursive: true, force: true }));
-
-  it('reads input/output from a .mjs config file', () => {
-    const out = join(dir, 'client.ts');
-    const cfg = join(dir, 'gen.config.mjs');
-    writeFileSync(
-      cfg,
-      `export default { input: ${JSON.stringify(fixture)}, output: ${JSON.stringify(out)} };\n`,
-      'utf-8'
-    );
-    const res = spawnSync('node', [cli, 'generate-client', '--config-file', cfg], {
-      encoding: 'utf-8',
-      cwd: repoRoot,
-    });
-    expect(res.status, res.stderr).toBe(0);
-    expect(existsSync(out)).toBe(true);
-    expect(readFileSync(out, 'utf-8')).toContain('export async function getPetById');
-  }, 30_000);
-
-  it('honors a config-file value for a CLI-defaulted option (no flag clobbering)', () => {
-    // `outputMode: 'split'` from the file must produce multiple files even though no
-    // `--output-mode` flag is passed — i.e. the CLI must NOT inject a default that
-    // overrides the config file. Single mode would emit just the one anchor file.
-    const out = join(dir, 'split/client.ts');
-    const cfg = join(dir, 'split.config.mjs');
-    writeFileSync(
-      cfg,
-      `export default { input: ${JSON.stringify(fixture)}, output: ${JSON.stringify(out)}, outputMode: 'split' };\n`,
-      'utf-8'
-    );
-    const res = spawnSync('node', [cli, 'generate-client', '--config-file', cfg], {
-      encoding: 'utf-8',
-      cwd: repoRoot,
-    });
-    expect(res.status, res.stderr).toBe(0);
-    // split mode emits sibling .http.ts and .schemas.ts next to the entry.
-    expect(existsSync(join(dir, 'split/client.http.ts'))).toBe(true);
-    expect(existsSync(join(dir, 'split/client.schemas.ts'))).toBe(true);
-  }, 30_000);
-
-  it('does not auto-discover a cwd config file without --config-file (no silent override of redocly.yaml)', () => {
-    const subdir = mkdtempSync(join(tmpdir(), 'ots-nodiscover-'));
-    const fromYaml = join(subdir, 'from-yaml.ts');
-    const fromStray = join(subdir, 'from-stray.ts');
-    writeFileSync(
-      join(subdir, 'redocly.yaml'),
-      `x-openapi-typescript:\n  input: ${JSON.stringify(fixture)}\n  output: ./from-yaml.ts\n`,
-      'utf-8'
-    );
-    // A stray default-named config in cwd that, if discovered, would redirect output.
-    writeFileSync(
-      join(subdir, 'redocly-openapi-typescript.config.mjs'),
-      `export default { output: ${JSON.stringify(fromStray)} };\n`,
-      'utf-8'
-    );
-    const res = spawnSync('node', [cli, 'generate-client'], { encoding: 'utf-8', cwd: subdir });
-    expect(res.status, res.stderr).toBe(0);
-    // redocly.yaml's output wins; the un-requested cwd config file is ignored.
-    expect(existsSync(fromYaml)).toBe(true);
-    expect(existsSync(fromStray)).toBe(false);
-    rmSync(subdir, { recursive: true, force: true });
-  }, 30_000);
-});
diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
index ee64dbd46a..7e36b165c5 100644
--- a/tests/e2e/generate-client/redocly-config.test.ts
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -1,6 +1,6 @@
 // generate-client reads its settings from a `redocly.yaml` `x-openapi-typescript`
-// block (auto-discovered from the cwd / `--config`), with CLI flags overriding it.
-// This is the redocly.yaml ingestion path the examples use (no `--config-file`).
+// block (discovered in the cwd, or located via `--config`), with CLI flags overriding it.
+// This is the only declarative config surface — the examples use it.
 import { spawnSync } from 'node:child_process';
 import {
   existsSync,
@@ -28,7 +28,7 @@ function project(xConfig: string): string {
 }
 
 describe('generate-client redocly.yaml config (x-openapi-typescript)', () => {
-  it('generates from the redocly.yaml block with no flags or --config-file', () => {
+  it('generates from the redocly.yaml block with no flags', () => {
     const dir = project(
       [
         '  input: ./openapi.yaml',

From 69393cf26e6d4ffee065c3261add8fb98c621e1e Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Fri, 26 Jun 2026 14:02:34 +0300
Subject: [PATCH 028/134] =?UTF-8?q?refactor!:=20rename=20@redocly/openapi-?=
 =?UTF-8?q?typescript=20=E2=86=92=20@redocly/client-generator?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The package name pinned the input format (OpenAPI) and collided with the
unrelated, popular `openapi-typescript` npm package. Rename it to reflect what it
is — a client generator — leaving room for more input specs (AsyncAPI/GraphQL)
and matching the `generate-client` command.

- Package `@redocly/openapi-typescript` → `@redocly/client-generator`; folder
  `packages/openapi-typescript` → `packages/client-generator`.
- The `redocly.yaml` config key `x-openapi-typescript` → `x-client-generator`.
- Swept all imports, subpaths (`/plugin`, `/config-file`), path refs (tsconfig
  project refs, vitest coverage, oxlint/oxfmt ignores, root tsconfig exclude),
  the CLI dependency + dynamic import, docs, ADRs, scripts, and tests.
- The generated-file header (`// Generated by …`) changed, so all committed
  outputs were regenerated: examples, consumer fixtures, and the cafe snapshot.

The `generate-client` command name is unchanged. Verified: typecheck, 849 unit
tests, and the e2e suite (examples drift, redocly.yaml config, custom generators,
contract, consumers, SSE) all pass; lockfile regenerated.
---
 ...napi-typescript.md => client-generator.md} |    2 +-
 .oxfmtrc.json                                 |    2 +-
 .oxlintrc.json                                |    4 +-
 docs/@v2/commands/generate-client.md          |   18 +-
 package-lock.json                             | 1579 +++--------------
 packages/cli/package.json                     |    2 +-
 packages/cli/src/commands/generate-client.ts  |   12 +-
 packages/cli/tsconfig.json                    |    2 +-
 .../ARCHITECTURE.md                           |   10 +-
 .../CONTEXT.md                                |    2 +-
 .../README.md                                 |   12 +-
 .../docs/adr/0001-ast-codegen.md              |    0
 .../docs/adr/0002-typescript-peer-dep.md      |    2 +-
 .../docs/adr/0003-spec-agnostic-ir.md         |    0
 .../docs/adr/0004-registry-seams.md           |    0
 .../docs/adr/0005-error-mode-terminals.md     |    0
 .../docs/adr/0006-sse-namespace.md            |    0
 .../docs/adr/0007-call-site-auth.md           |    0
 .../docs/adr/0008-redocly-yaml-config.md      |    4 +-
 .../docs/adr/0009-per-instance-auth.md        |    0
 .../docs/adr/0010-mock-data-baked-vs-faker.md |    0
 .../docs/adr/0011-wrapper-generators.md       |    0
 .../docs/adr/0012-plugin-api.md               |    2 +-
 .../docs/adr/0013-experimental-status.md      |    6 +-
 .../docs/adr/README.md                        |    4 +-
 .../examples/README.md                        |    6 +-
 .../examples/custom-generator/.gitignore      |    0
 .../examples/custom-generator/README.md       |    6 +-
 .../examples/custom-generator/index.html      |    2 +-
 .../examples/custom-generator/openapi.yaml    |    0
 .../examples/custom-generator/package.json    |    0
 .../examples/custom-generator/redocly.yaml    |    2 +-
 .../custom-generator/route-map-generator.mjs  |    2 +-
 .../custom-generator/src/api/client.routes.ts |    0
 .../custom-generator/src/api/client.ts        |    2 +-
 .../examples/custom-generator/src/main.ts     |    0
 .../examples/custom-generator/tsconfig.json   |    0
 .../examples/custom-generator/vite.config.ts  |    0
 .../examples/fetch-functions/.gitignore       |    0
 .../examples/fetch-functions/README.md        |    0
 .../examples/fetch-functions}/index.html      |    2 +-
 .../examples/fetch-functions/openapi.yaml     |    0
 .../examples/fetch-functions/package.json     |    0
 .../examples/fetch-functions/redocly.yaml     |    4 +-
 .../fetch-functions/src/api/client.ts         |    2 +-
 .../examples/fetch-functions/src/main.ts      |    0
 .../examples/fetch-functions/tsconfig.json    |    0
 .../examples/fetch-functions/vite.config.ts   |    0
 .../examples/mock/.gitignore                  |    0
 .../examples/mock/README.md                   |    0
 .../examples/mock}/index.html                 |    2 +-
 .../examples/mock/openapi.yaml                |    0
 .../examples/mock/package.json                |    0
 .../examples/mock/public/mockServiceWorker.js |    0
 .../examples/mock/redocly.yaml                |    4 +-
 .../examples/mock/src/api/client.mocks.ts     |    2 +-
 .../examples/mock/src/api/client.ts           |    2 +-
 .../examples/mock/src/main.ts                 |    0
 .../examples/mock/src/node.ts                 |    0
 .../examples/mock/tsconfig.json               |    0
 .../examples/mock/vite.config.ts              |    0
 .../examples/programmatic/.gitignore          |    0
 .../examples/programmatic/README.md           |    2 +-
 .../examples/programmatic/generate.ts         |    2 +-
 .../examples/programmatic/openapi.yaml        |    0
 .../examples/programmatic/package.json        |    2 +-
 .../examples/programmatic/src/api/client.ts   |    2 +-
 .../examples/programmatic/src/main.ts         |    0
 .../examples/programmatic/tsconfig.json       |    0
 .../examples/service-class/.gitignore         |    0
 .../examples/service-class/README.md          |    0
 .../examples/service-class/index.html         |   11 +
 .../examples/service-class/openapi.yaml       |    0
 .../examples/service-class/package.json       |    0
 .../examples/service-class/redocly.yaml       |    4 +-
 .../examples/service-class/src/api/client.ts  |    2 +-
 .../examples/service-class/src/main.ts        |    0
 .../examples/service-class/tsconfig.json      |    0
 .../examples/service-class/vite.config.ts     |    0
 .../examples/tanstack-query/.gitignore        |    0
 .../examples/tanstack-query/README.md         |    0
 .../examples/tanstack-query/index.html        |    2 +-
 .../examples/tanstack-query/openapi.yaml      |    0
 .../examples/tanstack-query/package.json      |    0
 .../examples/tanstack-query/redocly.yaml      |    4 +-
 .../examples/tanstack-query/src/App.tsx       |    0
 .../tanstack-query/src/api/client.tanstack.ts |    2 +-
 .../examples/tanstack-query/src/api/client.ts | 1518 ++++++++++++++++
 .../examples/tanstack-query/src/main.tsx      |    0
 .../examples/tanstack-query/tsconfig.json     |    0
 .../examples/tanstack-query/vite.config.ts    |    0
 .../examples/tsconfig.base.json               |    0
 .../examples/zod/.gitignore                   |    0
 .../examples/zod/README.md                    |    0
 .../examples/zod}/index.html                  |    2 +-
 .../examples/zod/openapi.yaml                 |    0
 .../examples/zod/package.json                 |    0
 .../examples/zod/redocly.yaml                 |    4 +-
 .../examples/zod/src/api/client.ts            | 1518 ++++++++++++++++
 .../examples/zod/src/api/client.zod.ts        |    2 +-
 .../examples/zod/src/main.ts                  |    0
 .../examples/zod/tsconfig.json                |    0
 .../examples/zod/vite.config.ts               |    0
 .../package.json                              |    2 +-
 .../scripts/regenerate-examples.mjs           |    2 +-
 .../scripts/typecheck-examples.mjs            |    0
 .../src/__tests__/config-file.test.ts         |    0
 .../src/__tests__/errors.test.ts              |    0
 .../src/__tests__/index.test.ts               |    2 +-
 .../src/__tests__/loader.test.ts              |    0
 .../src/__tests__/plugin.test.ts              |    0
 .../src/config-file.ts                        |    4 +-
 .../src/config.ts                             |    4 +-
 .../src/emitters/__tests__/auth.test.ts       |    0
 .../src/emitters/__tests__/client.test.ts     |    2 +-
 .../src/emitters/__tests__/faker.test.ts      |    0
 .../src/emitters/__tests__/fixtures.ts        |    0
 .../src/emitters/__tests__/identifier.test.ts |    0
 .../src/emitters/__tests__/mock.test.ts       |    0
 .../__tests__/operation-signature.test.ts     |    0
 .../src/emitters/__tests__/operations.test.ts |    0
 .../src/emitters/__tests__/runtime.test.ts    |    0
 .../src/emitters/__tests__/sample.test.ts     |    0
 .../emitters/__tests__/sse.deletion.test.ts   |    0
 .../src/emitters/__tests__/sse.test.ts        |    0
 .../src/emitters/__tests__/swr.test.ts        |    0
 .../emitters/__tests__/tanstack-query.test.ts |    0
 .../emitters/__tests__/transformers.test.ts   |    0
 .../src/emitters/__tests__/ts.test.ts         |    0
 .../emitters/__tests__/type-guards.test.ts    |    0
 .../src/emitters/__tests__/types.test.ts      |    0
 .../src/emitters/__tests__/zod.test.ts        |    0
 .../src/emitters/auth.ts                      |    0
 .../src/emitters/client.ts                    |    2 +-
 .../src/emitters/faker.ts                     |    0
 .../src/emitters/identifier.ts                |    0
 .../src/emitters/jsdoc.ts                     |    0
 .../src/emitters/mock.ts                      |    0
 .../src/emitters/operation-aliases.ts         |    0
 .../src/emitters/operation-signature.ts       |    0
 .../src/emitters/operation-types.ts           |    0
 .../src/emitters/operations.ts                |    0
 .../src/emitters/runtime.ts                   |    0
 .../src/emitters/sample.ts                    |    0
 .../src/emitters/sse.ts                       |    0
 .../src/emitters/support.ts                   |    0
 .../src/emitters/swr.ts                       |    0
 .../src/emitters/tanstack-query.ts            |    0
 .../src/emitters/transformers.ts              |    0
 .../src/emitters/ts.ts                        |    0
 .../src/emitters/type-guards.ts               |    0
 .../src/emitters/types.ts                     |    0
 .../src/emitters/wrapper-support.ts           |    0
 .../src/emitters/zod.ts                       |    0
 .../src/errors.ts                             |    0
 .../__tests__/fixtures/empty-plugin.ts        |    0
 .../__tests__/fixtures/route-map-plugin.ts    |    0
 .../src/generators/__tests__/index.test.ts    |    0
 .../src/generators/__tests__/mock.test.ts     |    2 +-
 .../src/generators/__tests__/resolve.test.ts  |    0
 .../src/generators/__tests__/sdk.test.ts      |    0
 .../src/generators/__tests__/swr.test.ts      |    2 +-
 .../__tests__/tanstack-query.test.ts          |    2 +-
 .../generators/__tests__/transformers.test.ts |    2 +-
 .../src/generators/__tests__/zod.test.ts      |    2 +-
 .../src/generators/index.ts                   |    0
 .../src/generators/mock.ts                    |    0
 .../src/generators/resolve.ts                 |    0
 .../src/generators/sdk.ts                     |    0
 .../src/generators/swr.ts                     |    0
 .../src/generators/tanstack-query.ts          |    0
 .../src/generators/transformers.ts            |    0
 .../src/generators/types.ts                   |    4 +-
 .../src/generators/zod.ts                     |    0
 .../src/index.ts                              |    0
 .../src/ir/__tests__/build.test.ts            |    0
 .../ir/__tests__/normalize-swagger2.test.ts   |    0
 .../src/ir/__tests__/refs.test.ts             |    0
 .../ir/__tests__/sanitize-identifiers.test.ts |    0
 .../src/ir/build.ts                           |    0
 .../src/ir/model.ts                           |    0
 .../src/ir/normalize-swagger2.ts              |    0
 .../src/ir/refs.ts                            |    0
 .../src/ir/sanitize-identifiers.ts            |    0
 .../src/loader.ts                             |    0
 .../src/plugin.ts                             |    2 +-
 .../src/types.ts                              |    2 +-
 .../writers/__tests__/group-by-tag.test.ts    |    0
 .../src/writers/__tests__/index.test.ts       |    2 +-
 .../writers/__tests__/split-writer.test.ts    |    0
 .../__tests__/tags-split-writer.test.ts       |    0
 .../src/writers/__tests__/tags-writer.test.ts |    0
 .../src/writers/group-by-tag.ts               |    0
 .../src/writers/index.ts                      |    0
 .../src/writers/single-file-writer.ts         |    0
 .../src/writers/split-writer.ts               |    0
 .../src/writers/tagged.ts                     |    0
 .../src/writers/tags-split-writer.ts          |    0
 .../src/writers/tags-writer.ts                |    0
 .../src/writers/types.ts                      |    0
 .../src/writers/util.ts                       |    0
 .../tsconfig.json                             |    0
 .../examples/fetch-functions/index.html       |   11 -
 .../examples/tanstack-query/src/api/client.ts | 1518 ----------------
 .../examples/zod/src/api/client.ts            | 1518 ----------------
 .../e2e/generate-client/base-consumer/api.ts  |    2 +-
 .../e2e/generate-client/cafe-consumer/api.ts  |    2 +-
 tests/e2e/generate-client/cafe.snapshot.ts    |    2 +-
 tests/e2e/generate-client/examples.test.ts    |    6 +-
 tests/e2e/generate-client/parse-as.test.ts    |    2 +-
 .../generate-client/redocly-config.test.ts    |    6 +-
 tests/e2e/generate-client/sse-consumer/api.ts |    2 +-
 tsconfig.build.json                           |    2 +-
 tsconfig.json                                 |    2 +-
 vitest.config.ts                              |    2 +-
 215 files changed, 3400 insertions(+), 4491 deletions(-)
 rename .changeset/{openapi-typescript.md => client-generator.md} (82%)
 rename packages/{openapi-typescript => client-generator}/ARCHITECTURE.md (95%)
 rename packages/{openapi-typescript => client-generator}/CONTEXT.md (99%)
 rename packages/{openapi-typescript => client-generator}/README.md (97%)
 rename packages/{openapi-typescript => client-generator}/docs/adr/0001-ast-codegen.md (100%)
 rename packages/{openapi-typescript => client-generator}/docs/adr/0002-typescript-peer-dep.md (97%)
 rename packages/{openapi-typescript => client-generator}/docs/adr/0003-spec-agnostic-ir.md (100%)
 rename packages/{openapi-typescript => client-generator}/docs/adr/0004-registry-seams.md (100%)
 rename packages/{openapi-typescript => client-generator}/docs/adr/0005-error-mode-terminals.md (100%)
 rename packages/{openapi-typescript => client-generator}/docs/adr/0006-sse-namespace.md (100%)
 rename packages/{openapi-typescript => client-generator}/docs/adr/0007-call-site-auth.md (100%)
 rename packages/{openapi-typescript => client-generator}/docs/adr/0008-redocly-yaml-config.md (87%)
 rename packages/{openapi-typescript => client-generator}/docs/adr/0009-per-instance-auth.md (100%)
 rename packages/{openapi-typescript => client-generator}/docs/adr/0010-mock-data-baked-vs-faker.md (100%)
 rename packages/{openapi-typescript => client-generator}/docs/adr/0011-wrapper-generators.md (100%)
 rename packages/{openapi-typescript => client-generator}/docs/adr/0012-plugin-api.md (85%)
 rename packages/{openapi-typescript => client-generator}/docs/adr/0013-experimental-status.md (75%)
 rename packages/{openapi-typescript => client-generator}/docs/adr/README.md (95%)
 rename packages/{openapi-typescript => client-generator}/examples/README.md (88%)
 rename packages/{openapi-typescript => client-generator}/examples/custom-generator/.gitignore (100%)
 rename packages/{openapi-typescript => client-generator}/examples/custom-generator/README.md (75%)
 rename packages/{openapi-typescript => client-generator}/examples/custom-generator/index.html (76%)
 rename packages/{openapi-typescript => client-generator}/examples/custom-generator/openapi.yaml (100%)
 rename packages/{openapi-typescript => client-generator}/examples/custom-generator/package.json (100%)
 rename packages/{openapi-typescript => client-generator}/examples/custom-generator/redocly.yaml (94%)
 rename packages/{openapi-typescript => client-generator}/examples/custom-generator/route-map-generator.mjs (93%)
 rename packages/{openapi-typescript => client-generator}/examples/custom-generator/src/api/client.routes.ts (100%)
 rename packages/{openapi-typescript => client-generator}/examples/custom-generator/src/api/client.ts (99%)
 rename packages/{openapi-typescript => client-generator}/examples/custom-generator/src/main.ts (100%)
 rename packages/{openapi-typescript => client-generator}/examples/custom-generator/tsconfig.json (100%)
 rename packages/{openapi-typescript => client-generator}/examples/custom-generator/vite.config.ts (100%)
 rename packages/{openapi-typescript => client-generator}/examples/fetch-functions/.gitignore (100%)
 rename packages/{openapi-typescript => client-generator}/examples/fetch-functions/README.md (100%)
 rename packages/{openapi-typescript/examples/service-class => client-generator/examples/fetch-functions}/index.html (76%)
 rename packages/{openapi-typescript => client-generator}/examples/fetch-functions/openapi.yaml (100%)
 rename packages/{openapi-typescript => client-generator}/examples/fetch-functions/package.json (100%)
 rename packages/{openapi-typescript => client-generator}/examples/fetch-functions/redocly.yaml (68%)
 rename packages/{openapi-typescript => client-generator}/examples/fetch-functions/src/api/client.ts (99%)
 rename packages/{openapi-typescript => client-generator}/examples/fetch-functions/src/main.ts (100%)
 rename packages/{openapi-typescript => client-generator}/examples/fetch-functions/tsconfig.json (100%)
 rename packages/{openapi-typescript => client-generator}/examples/fetch-functions/vite.config.ts (100%)
 rename packages/{openapi-typescript => client-generator}/examples/mock/.gitignore (100%)
 rename packages/{openapi-typescript => client-generator}/examples/mock/README.md (100%)
 rename packages/{openapi-typescript/examples/zod => client-generator/examples/mock}/index.html (76%)
 rename packages/{openapi-typescript => client-generator}/examples/mock/openapi.yaml (100%)
 rename packages/{openapi-typescript => client-generator}/examples/mock/package.json (100%)
 rename packages/{openapi-typescript => client-generator}/examples/mock/public/mockServiceWorker.js (100%)
 rename packages/{openapi-typescript => client-generator}/examples/mock/redocly.yaml (69%)
 rename packages/{openapi-typescript => client-generator}/examples/mock/src/api/client.mocks.ts (99%)
 rename packages/{openapi-typescript => client-generator}/examples/mock/src/api/client.ts (99%)
 rename packages/{openapi-typescript => client-generator}/examples/mock/src/main.ts (100%)
 rename packages/{openapi-typescript => client-generator}/examples/mock/src/node.ts (100%)
 rename packages/{openapi-typescript => client-generator}/examples/mock/tsconfig.json (100%)
 rename packages/{openapi-typescript => client-generator}/examples/mock/vite.config.ts (100%)
 rename packages/{openapi-typescript => client-generator}/examples/programmatic/.gitignore (100%)
 rename packages/{openapi-typescript => client-generator}/examples/programmatic/README.md (82%)
 rename packages/{openapi-typescript => client-generator}/examples/programmatic/generate.ts (93%)
 rename packages/{openapi-typescript => client-generator}/examples/programmatic/openapi.yaml (100%)
 rename packages/{openapi-typescript => client-generator}/examples/programmatic/package.json (84%)
 rename packages/{openapi-typescript => client-generator}/examples/programmatic/src/api/client.ts (99%)
 rename packages/{openapi-typescript => client-generator}/examples/programmatic/src/main.ts (100%)
 rename packages/{openapi-typescript => client-generator}/examples/programmatic/tsconfig.json (100%)
 rename packages/{openapi-typescript => client-generator}/examples/service-class/.gitignore (100%)
 rename packages/{openapi-typescript => client-generator}/examples/service-class/README.md (100%)
 create mode 100644 packages/client-generator/examples/service-class/index.html
 rename packages/{openapi-typescript => client-generator}/examples/service-class/openapi.yaml (100%)
 rename packages/{openapi-typescript => client-generator}/examples/service-class/package.json (100%)
 rename packages/{openapi-typescript => client-generator}/examples/service-class/redocly.yaml (69%)
 rename packages/{openapi-typescript => client-generator}/examples/service-class/src/api/client.ts (99%)
 rename packages/{openapi-typescript => client-generator}/examples/service-class/src/main.ts (100%)
 rename packages/{openapi-typescript => client-generator}/examples/service-class/tsconfig.json (100%)
 rename packages/{openapi-typescript => client-generator}/examples/service-class/vite.config.ts (100%)
 rename packages/{openapi-typescript => client-generator}/examples/tanstack-query/.gitignore (100%)
 rename packages/{openapi-typescript => client-generator}/examples/tanstack-query/README.md (100%)
 rename packages/{openapi-typescript => client-generator}/examples/tanstack-query/index.html (72%)
 rename packages/{openapi-typescript => client-generator}/examples/tanstack-query/openapi.yaml (100%)
 rename packages/{openapi-typescript => client-generator}/examples/tanstack-query/package.json (100%)
 rename packages/{openapi-typescript => client-generator}/examples/tanstack-query/redocly.yaml (70%)
 rename packages/{openapi-typescript => client-generator}/examples/tanstack-query/src/App.tsx (100%)
 rename packages/{openapi-typescript => client-generator}/examples/tanstack-query/src/api/client.tanstack.ts (98%)
 create mode 100644 packages/client-generator/examples/tanstack-query/src/api/client.ts
 rename packages/{openapi-typescript => client-generator}/examples/tanstack-query/src/main.tsx (100%)
 rename packages/{openapi-typescript => client-generator}/examples/tanstack-query/tsconfig.json (100%)
 rename packages/{openapi-typescript => client-generator}/examples/tanstack-query/vite.config.ts (100%)
 rename packages/{openapi-typescript => client-generator}/examples/tsconfig.base.json (100%)
 rename packages/{openapi-typescript => client-generator}/examples/zod/.gitignore (100%)
 rename packages/{openapi-typescript => client-generator}/examples/zod/README.md (100%)
 rename packages/{openapi-typescript/examples/mock => client-generator/examples/zod}/index.html (76%)
 rename packages/{openapi-typescript => client-generator}/examples/zod/openapi.yaml (100%)
 rename packages/{openapi-typescript => client-generator}/examples/zod/package.json (100%)
 rename packages/{openapi-typescript => client-generator}/examples/zod/redocly.yaml (69%)
 create mode 100644 packages/client-generator/examples/zod/src/api/client.ts
 rename packages/{openapi-typescript => client-generator}/examples/zod/src/api/client.zod.ts (98%)
 rename packages/{openapi-typescript => client-generator}/examples/zod/src/main.ts (100%)
 rename packages/{openapi-typescript => client-generator}/examples/zod/tsconfig.json (100%)
 rename packages/{openapi-typescript => client-generator}/examples/zod/vite.config.ts (100%)
 rename packages/{openapi-typescript => client-generator}/package.json (97%)
 rename packages/{openapi-typescript => client-generator}/scripts/regenerate-examples.mjs (91%)
 rename packages/{openapi-typescript => client-generator}/scripts/typecheck-examples.mjs (100%)
 rename packages/{openapi-typescript => client-generator}/src/__tests__/config-file.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/__tests__/errors.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/__tests__/index.test.ts (98%)
 rename packages/{openapi-typescript => client-generator}/src/__tests__/loader.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/__tests__/plugin.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/config-file.ts (78%)
 rename packages/{openapi-typescript => client-generator}/src/config.ts (96%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/__tests__/auth.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/__tests__/client.test.ts (99%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/__tests__/faker.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/__tests__/fixtures.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/__tests__/identifier.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/__tests__/mock.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/__tests__/operation-signature.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/__tests__/operations.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/__tests__/runtime.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/__tests__/sample.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/__tests__/sse.deletion.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/__tests__/sse.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/__tests__/swr.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/__tests__/tanstack-query.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/__tests__/transformers.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/__tests__/ts.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/__tests__/type-guards.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/__tests__/types.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/__tests__/zod.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/auth.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/client.ts (99%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/faker.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/identifier.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/jsdoc.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/mock.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/operation-aliases.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/operation-signature.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/operation-types.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/operations.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/runtime.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/sample.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/sse.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/support.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/swr.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/tanstack-query.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/transformers.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/ts.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/type-guards.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/types.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/wrapper-support.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/emitters/zod.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/errors.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/generators/__tests__/fixtures/empty-plugin.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/generators/__tests__/fixtures/route-map-plugin.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/generators/__tests__/index.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/generators/__tests__/mock.test.ts (91%)
 rename packages/{openapi-typescript => client-generator}/src/generators/__tests__/resolve.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/generators/__tests__/sdk.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/generators/__tests__/swr.test.ts (98%)
 rename packages/{openapi-typescript => client-generator}/src/generators/__tests__/tanstack-query.test.ts (98%)
 rename packages/{openapi-typescript => client-generator}/src/generators/__tests__/transformers.test.ts (98%)
 rename packages/{openapi-typescript => client-generator}/src/generators/__tests__/zod.test.ts (98%)
 rename packages/{openapi-typescript => client-generator}/src/generators/index.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/generators/mock.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/generators/resolve.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/generators/sdk.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/generators/swr.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/generators/tanstack-query.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/generators/transformers.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/generators/types.ts (94%)
 rename packages/{openapi-typescript => client-generator}/src/generators/zod.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/index.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/ir/__tests__/build.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/ir/__tests__/normalize-swagger2.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/ir/__tests__/refs.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/ir/__tests__/sanitize-identifiers.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/ir/build.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/ir/model.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/ir/normalize-swagger2.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/ir/refs.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/ir/sanitize-identifiers.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/loader.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/plugin.ts (98%)
 rename packages/{openapi-typescript => client-generator}/src/types.ts (98%)
 rename packages/{openapi-typescript => client-generator}/src/writers/__tests__/group-by-tag.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/writers/__tests__/index.test.ts (98%)
 rename packages/{openapi-typescript => client-generator}/src/writers/__tests__/split-writer.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/writers/__tests__/tags-split-writer.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/writers/__tests__/tags-writer.test.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/writers/group-by-tag.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/writers/index.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/writers/single-file-writer.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/writers/split-writer.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/writers/tagged.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/writers/tags-split-writer.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/writers/tags-writer.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/writers/types.ts (100%)
 rename packages/{openapi-typescript => client-generator}/src/writers/util.ts (100%)
 rename packages/{openapi-typescript => client-generator}/tsconfig.json (100%)
 delete mode 100644 packages/openapi-typescript/examples/fetch-functions/index.html
 delete mode 100644 packages/openapi-typescript/examples/tanstack-query/src/api/client.ts
 delete mode 100644 packages/openapi-typescript/examples/zod/src/api/client.ts

diff --git a/.changeset/openapi-typescript.md b/.changeset/client-generator.md
similarity index 82%
rename from .changeset/openapi-typescript.md
rename to .changeset/client-generator.md
index 1bcf06ece8..a162ba178b 100644
--- a/.changeset/openapi-typescript.md
+++ b/.changeset/client-generator.md
@@ -1,5 +1,5 @@
 ---
-'@redocly/openapi-typescript': minor
+'@redocly/client-generator': minor
 '@redocly/cli': minor
 ---
 
diff --git a/.oxfmtrc.json b/.oxfmtrc.json
index 25937afaa0..9900c1d513 100644
--- a/.oxfmtrc.json
+++ b/.oxfmtrc.json
@@ -5,7 +5,7 @@
   "experimentalSortPackageJson": false,
   "ignorePatterns": [
     "coverage/",
-    "packages/openapi-typescript/examples/*/src/api/",
+    "packages/client-generator/examples/*/src/api/",
     "lib/",
     "output/",
     "packages/respect-core/src/modules/runtime-expressions/abnf-parser.js",
diff --git a/.oxlintrc.json b/.oxlintrc.json
index c2abb6ed2c..94f1826bcd 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -11,8 +11,8 @@
   },
   "ignorePatterns": [
     "packages/*/lib/**",
-    "packages/openapi-typescript/examples/*/src/api/**",
-    "packages/openapi-typescript/examples/*/generate.ts",
+    "packages/client-generator/examples/*/src/api/**",
+    "packages/client-generator/examples/*/generate.ts",
     "*.js",
     "*.cjs",
     "tests/e2e/generate-client/*.snapshot.ts",
diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index cded6c2ba2..c1963fd133 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -146,19 +146,19 @@ redocly generate-client cafe -o src/client.ts
 
 - `--config`
 - `string`
-- Path to the `redocly.yaml` configuration file (where the `x-openapi-typescript` block lives).
+- Path to the `redocly.yaml` configuration file (where the `x-client-generator` block lives).
   Defaults to the `redocly.yaml` discovered in the working directory.
 
 {% /table %}
 
 ## Configuration
 
-Instead of passing flags every time, you can put the settings in your `redocly.yaml` under an `x-openapi-typescript` block.
+Instead of passing flags every time, you can put the settings in your `redocly.yaml` under an `x-client-generator` block.
 `generate-client` reads it automatically — from a `redocly.yaml` in the working directory, or one pointed to by the standard `--config` flag:
 
 ```yaml
 # redocly.yaml
-x-openapi-typescript:
+x-client-generator:
   input: ./openapi.yaml
   output: ./src/api/client.ts
   generators:
@@ -179,7 +179,7 @@ Point at a `redocly.yaml` elsewhere with the standard `--config` flag:
 redocly generate-client --config ./config/redocly.yaml
 ```
 
-**Precedence** (lowest to highest): the `redocly.yaml` `x-openapi-typescript` block → individual CLI flags.
+**Precedence** (lowest to highest): the `redocly.yaml` `x-client-generator` block → individual CLI flags.
 Each layer overrides per setting, so you can keep a base config and override one value on the command line.
 For code-level control — including registering custom generators inline — use the programmatic API instead (see [Custom generators](#custom-generators)).
 
@@ -871,7 +871,7 @@ A generator is `{ name, run }` (plus optional compatibility metadata).
 
 ```ts
 // route-map-generator.ts
-import { defineGenerator } from '@redocly/openapi-typescript/plugin';
+import { defineGenerator } from '@redocly/client-generator/plugin';
 
 export default defineGenerator({
   name: 'route-map',
@@ -891,7 +891,7 @@ export default defineGenerator({
 });
 ```
 
-The `@redocly/openapi-typescript/plugin` entry also exports the **codegen toolkit** the built-in generators use — `ts` (the `ts.factory` wrapper), `printStatements`, `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, `safeIdent` — and the IR types (`ApiModel`, `OperationModel`, `SchemaModel`, …), so a custom generator can emit TypeScript exactly as the first-party ones do.
+The `@redocly/client-generator/plugin` entry also exports the **codegen toolkit** the built-in generators use — `ts` (the `ts.factory` wrapper), `printStatements`, `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, `safeIdent` — and the IR types (`ApiModel`, `OperationModel`, `SchemaModel`, …), so a custom generator can emit TypeScript exactly as the first-party ones do.
 
 ### Select a custom generator
 
@@ -902,7 +902,7 @@ In `redocly.yaml`, a `generators` entry that is not a built-in name is an **impo
 
 ```yaml
 # redocly.yaml — by path or by published package
-x-openapi-typescript:
+x-client-generator:
   input: ./openapi.yaml
   output: ./src/api/client.ts
   generators:
@@ -915,7 +915,7 @@ To register a generator **inline** (the function itself, with full type-safety a
 
 ```ts
 // generate.ts — run with `node --import tsx generate.ts`
-import { generateClient } from '@redocly/openapi-typescript';
+import { generateClient } from '@redocly/client-generator';
 import routeMap from './tools/route-map-generator.ts';
 
 await generateClient({
@@ -926,7 +926,7 @@ await generateClient({
 });
 ```
 
-A worked example lives in [`examples/custom-generator`](https://github.com/Redocly/redocly-cli/tree/main/packages/openapi-typescript/examples/custom-generator).
+A worked example lives in [`examples/custom-generator`](https://github.com/Redocly/redocly-cli/tree/main/packages/client-generator/examples/custom-generator).
 
 {% admonition type="info" name="Compatibility & trust" %}
 A custom generator declares the same `requires` / `facades` / `errorModes` / `dateTypes` contract as the built-ins, validated up front — an incompatible selection, a name that collides with another generator, or an unloadable specifier fails fast with an actionable message.
diff --git a/package-lock.json b/package-lock.json
index ea28bc864b..d0f488eeaa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -45,15 +45,11 @@
     },
     "node_modules/@acemir/cssom": {
       "version": "0.9.24",
-      "resolved": "https://registry.npmjs.org/@acemir/cssom/-/cssom-0.9.24.tgz",
-      "integrity": "sha512-5YjgMmAiT2rjJZU7XK1SNI7iqTy92DpaYVgG6x63FxkJ11UpYfLndHJATtinWJClAXiOlW9XWaUyAQf8pMrQPg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@asamuzakjp/css-color": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-4.1.0.tgz",
-      "integrity": "sha512-9xiBAtLn4aNsa4mDnpovJvBn72tNEIACyvlqaNJ+ADemR+yeMJWnBudOi2qGDviJa7SwcDOU/TRh5dnET7qk0w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -66,8 +62,6 @@
     },
     "node_modules/@asamuzakjp/dom-selector": {
       "version": "6.7.4",
-      "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.7.4.tgz",
-      "integrity": "sha512-buQDjkm+wDPXd6c13534URWZqbz0RP5PAhXZ+LIoa5LgwInT9HVJvGIJivg75vi8I13CxDGdTnz+aY5YUJlIAA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -80,15 +74,11 @@
     },
     "node_modules/@asamuzakjp/nwsapi": {
       "version": "2.3.9",
-      "resolved": "https://registry.npmjs.org/@asamuzakjp/nwsapi/-/nwsapi-2.3.9.tgz",
-      "integrity": "sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@babel/code-frame": {
       "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz",
-      "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.29.7",
@@ -101,8 +91,6 @@
     },
     "node_modules/@babel/compat-data": {
       "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.7.tgz",
-      "integrity": "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -111,8 +99,6 @@
     },
     "node_modules/@babel/core": {
       "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz",
-      "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -142,8 +128,6 @@
     },
     "node_modules/@babel/core/node_modules/semver": {
       "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -152,8 +136,6 @@
     },
     "node_modules/@babel/generator": {
       "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.7.tgz",
-      "integrity": "sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -169,8 +151,6 @@
     },
     "node_modules/@babel/helper-compilation-targets": {
       "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz",
-      "integrity": "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -186,8 +166,6 @@
     },
     "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -196,8 +174,6 @@
     },
     "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
       "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -206,8 +182,6 @@
     },
     "node_modules/@babel/helper-globals": {
       "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.29.7.tgz",
-      "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -216,8 +190,6 @@
     },
     "node_modules/@babel/helper-module-imports": {
       "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz",
-      "integrity": "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -230,8 +202,6 @@
     },
     "node_modules/@babel/helper-module-transforms": {
       "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz",
-      "integrity": "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -248,8 +218,6 @@
     },
     "node_modules/@babel/helper-string-parser": {
       "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz",
-      "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -258,8 +226,6 @@
     },
     "node_modules/@babel/helper-validator-identifier": {
       "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
-      "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -267,8 +233,6 @@
     },
     "node_modules/@babel/helper-validator-option": {
       "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz",
-      "integrity": "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -277,8 +241,6 @@
     },
     "node_modules/@babel/helpers": {
       "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.7.tgz",
-      "integrity": "sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -291,8 +253,6 @@
     },
     "node_modules/@babel/parser": {
       "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.7.tgz",
-      "integrity": "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -307,8 +267,6 @@
     },
     "node_modules/@babel/runtime": {
       "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.1.tgz",
-      "integrity": "sha512-1x3D2xEk2fRo3PAhwQwu5UubzgiVWSXTBfWpVd2Mx2AzRqJuDJCsgaDVZ7HB5iGzDW1Hl1sWN2mFyKjmR9uAog==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -316,8 +274,6 @@
     },
     "node_modules/@babel/template": {
       "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.29.7.tgz",
-      "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -331,8 +287,6 @@
     },
     "node_modules/@babel/traverse": {
       "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.7.tgz",
-      "integrity": "sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -350,8 +304,6 @@
     },
     "node_modules/@babel/types": {
       "version": "7.29.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz",
-      "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -364,8 +316,6 @@
     },
     "node_modules/@changesets/apply-release-plan": {
       "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/@changesets/apply-release-plan/-/apply-release-plan-7.1.1.tgz",
-      "integrity": "sha512-9qPCm/rLx/xoOFXIHGB229+4GOL76S4MC+7tyOuTsR6+1jYlfFDQORdvwR5hDA6y4FL2BPt3qpbcQIS+dW85LA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -386,15 +336,11 @@
     },
     "node_modules/@changesets/apply-release-plan/node_modules/outdent": {
       "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/outdent/-/outdent-0.5.0.tgz",
-      "integrity": "sha512-/jHxFIzoMXdqPzTaCpFzAAWhpkSjZPF4Vsn6jAfNpmbH/ymsmd7Qc6VE9BGn0L6YMj6uwpQLxCECpus4ukKS9Q==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@changesets/assemble-release-plan": {
       "version": "6.0.10",
-      "resolved": "https://registry.npmjs.org/@changesets/assemble-release-plan/-/assemble-release-plan-6.0.10.tgz",
-      "integrity": "sha512-rSDcqdJ9KbVyjpBIuCidhvZNIiVt1XaIYp73ycVQRIA5n/j6wQaEk0ChRLMUQ1vkxZe51PTQ9OIhbg6HQMW45A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -408,8 +354,6 @@
     },
     "node_modules/@changesets/changelog-git": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/@changesets/changelog-git/-/changelog-git-0.2.1.tgz",
-      "integrity": "sha512-x/xEleCFLH28c3bQeQIyeZf8lFXyDFVn1SgcBiR2Tw/r4IAWlk1fzxCEZ6NxQAjF2Nwtczoen3OA2qR+UawQ8Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -418,8 +362,6 @@
     },
     "node_modules/@changesets/cli": {
       "version": "2.31.0",
-      "resolved": "https://registry.npmjs.org/@changesets/cli/-/cli-2.31.0.tgz",
-      "integrity": "sha512-AhI4enNTgHu2IZr6K4WZyf0EPch4XVMn1yOMFmCD9gsfBGqMYaHXls5HyDv6/CL5axVQABz68eG30eCtbr2wFg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -456,8 +398,6 @@
     },
     "node_modules/@changesets/config": {
       "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/@changesets/config/-/config-3.1.4.tgz",
-      "integrity": "sha512-pf0bvD/v6WI2cRlZ6hzpjtZdSlXDXMAJ+Iz7xfFzV4ZxJ8OGGAON+1qYc99ZPrijnt4xp3VGG7eNvAOGS24V1Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -473,8 +413,6 @@
     },
     "node_modules/@changesets/errors": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@changesets/errors/-/errors-0.2.0.tgz",
-      "integrity": "sha512-6BLOQUscTpZeGljvyQXlWOItQyU71kCdGz7Pi8H8zdw6BI0g3m43iL4xKUVPWtG+qrrL9DTjpdn8eYuCQSRpow==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -483,8 +421,6 @@
     },
     "node_modules/@changesets/get-dependents-graph": {
       "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@changesets/get-dependents-graph/-/get-dependents-graph-2.1.4.tgz",
-      "integrity": "sha512-ZsS00x6WvmHq3sQv8oCMwL0f/z3wbXCVuSVTJwCnnmbC/iBdNJGFx1EcbMG4PC6sXRyH69liM4A2WKXzn/kRPg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -496,8 +432,6 @@
     },
     "node_modules/@changesets/get-release-plan": {
       "version": "4.0.16",
-      "resolved": "https://registry.npmjs.org/@changesets/get-release-plan/-/get-release-plan-4.0.16.tgz",
-      "integrity": "sha512-2K5Om6CrMPm45rtvckfzWo7e9jOVCKLCnXia5eUPaURH7/LWzri7pK1TycdzAuAtehLkW7VPbWLCSExTHmiI6g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -511,15 +445,11 @@
     },
     "node_modules/@changesets/get-version-range-type": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@changesets/get-version-range-type/-/get-version-range-type-0.4.0.tgz",
-      "integrity": "sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@changesets/git": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@changesets/git/-/git-3.0.4.tgz",
-      "integrity": "sha512-BXANzRFkX+XcC1q/d27NKvlJ1yf7PSAgi8JG6dt8EfbHFHi4neau7mufcSca5zRhwOL8j9s6EqsxmT+s+/E6Sw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -532,8 +462,6 @@
     },
     "node_modules/@changesets/logger": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@changesets/logger/-/logger-0.1.1.tgz",
-      "integrity": "sha512-OQtR36ZlnuTxKqoW4Sv6x5YIhOmClRd5pWsjZsddYxpWs517R0HkyiefQPIytCVh4ZcC5x9XaG8KTdd5iRQUfg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -542,8 +470,6 @@
     },
     "node_modules/@changesets/parse": {
       "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@changesets/parse/-/parse-0.4.3.tgz",
-      "integrity": "sha512-ZDmNc53+dXdWEv7fqIUSgRQOLYoUom5Z40gmLgmATmYR9NbL6FJJHwakcCpzaeCy+1D0m0n7mT4jj2B/MQPl7A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -553,8 +479,6 @@
     },
     "node_modules/@changesets/pre": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@changesets/pre/-/pre-2.0.2.tgz",
-      "integrity": "sha512-HaL/gEyFVvkf9KFg6484wR9s0qjAXlZ8qWPDkTyKF6+zqjBe/I2mygg3MbpZ++hdi0ToqNUF8cjj7fBy0dg8Ug==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -566,8 +490,6 @@
     },
     "node_modules/@changesets/read": {
       "version": "0.6.7",
-      "resolved": "https://registry.npmjs.org/@changesets/read/-/read-0.6.7.tgz",
-      "integrity": "sha512-D1G4AUYGrBEk8vj8MGwf75k9GpN6XL3wg8i42P2jZZwFLXnlr2Pn7r9yuQNbaMCarP7ZQWNJbV6XLeysAIMhTA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -582,8 +504,6 @@
     },
     "node_modules/@changesets/should-skip-package": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/@changesets/should-skip-package/-/should-skip-package-0.1.2.tgz",
-      "integrity": "sha512-qAK/WrqWLNCP22UDdBTMPH5f41elVDlsNyat180A33dWxuUDyNpg6fPi/FyTZwRriVjg0L8gnjJn2F9XAoF0qw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -593,15 +513,11 @@
     },
     "node_modules/@changesets/types": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@changesets/types/-/types-6.1.0.tgz",
-      "integrity": "sha512-rKQcJ+o1nKNgeoYRHKOS07tAMNd3YSN0uHaJOZYjBAgxfV7TUE7JE+z4BzZdQwb5hKaYbayKN5KrYV7ODb2rAA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@changesets/write": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@changesets/write/-/write-0.4.0.tgz",
-      "integrity": "sha512-CdTLvIOPiCNuH71pyDu3rA+Q0n65cmAbXnwWH84rKGiFumFzkmHNT8KHTMEchcxN+Kl8I54xGUhJ7l3E7X396Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -613,8 +529,6 @@
     },
     "node_modules/@cspotcode/source-map-support": {
       "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -626,8 +540,6 @@
     },
     "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -637,8 +549,6 @@
     },
     "node_modules/@csstools/color-helpers": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz",
-      "integrity": "sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==",
       "dev": true,
       "funding": [
         {
@@ -657,8 +567,6 @@
     },
     "node_modules/@csstools/css-calc": {
       "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.4.tgz",
-      "integrity": "sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==",
       "dev": true,
       "funding": [
         {
@@ -681,8 +589,6 @@
     },
     "node_modules/@csstools/css-color-parser": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz",
-      "integrity": "sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==",
       "dev": true,
       "funding": [
         {
@@ -709,8 +615,6 @@
     },
     "node_modules/@csstools/css-parser-algorithms": {
       "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz",
-      "integrity": "sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==",
       "dev": true,
       "funding": [
         {
@@ -732,8 +636,6 @@
     },
     "node_modules/@csstools/css-syntax-patches-for-csstree": {
       "version": "1.0.17",
-      "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.0.17.tgz",
-      "integrity": "sha512-LCC++2h8pLUSPY+EsZmrrJ1EOUu+5iClpEiDhhdw3zRJpPbABML/N5lmRuBHjxtKm9VnRcsUzioyD0sekFMF0A==",
       "dev": true,
       "funding": [
         {
@@ -752,8 +654,6 @@
     },
     "node_modules/@csstools/css-tokenizer": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz",
-      "integrity": "sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==",
       "dev": true,
       "funding": [
         {
@@ -806,8 +706,6 @@
     },
     "node_modules/@emotion/is-prop-valid": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.4.0.tgz",
-      "integrity": "sha512-QgD4fyscGcbbKwJmqNvUMSE02OsHUa+lAWKdEUIJKgqe5IwRSKd7+KhibEWdaKwgjLj0DRSHA9biAIqGBk05lw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -816,8 +714,6 @@
     },
     "node_modules/@emotion/memoize": {
       "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz",
-      "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -908,8 +804,6 @@
     },
     "node_modules/@esbuild/darwin-x64": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.28.1.tgz",
-      "integrity": "sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==",
       "cpu": [
         "x64"
       ],
@@ -1265,15 +1159,11 @@
     },
     "node_modules/@exodus/schemasafe": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.3.0.tgz",
-      "integrity": "sha512-5Aap/GaRupgNx/feGBwLLTVv8OQFfv3pq2lPRzPg9R+IOBnDgghTGW7l7EuVXOvg5cc/xSAlRW8rBrjIC3Nvqw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@faker-js/faker": {
       "version": "9.9.0",
-      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-9.9.0.tgz",
-      "integrity": "sha512-OEl393iCOoo/z8bMezRlJu+GlRGlsKbUAN7jKB6LhnKoqKve5DXRpalbItIIcwnCjs1k/FOPjFzcA6Qn+H+YbA==",
       "dev": true,
       "funding": [
         {
@@ -1289,8 +1179,6 @@
     },
     "node_modules/@humanwhocodes/momoa": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/momoa/-/momoa-2.0.4.tgz",
-      "integrity": "sha512-RE815I4arJFtt+FVeU1Tgp9/Xvecacji8w/V6XtXsWWH/wz/eNkNbhb+ny/+PlVZjV0rxQpRSQKNKE3lcktHEA==",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=10.10.0"
@@ -1298,8 +1186,6 @@
     },
     "node_modules/@inquirer/ansi": {
       "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@inquirer/ansi/-/ansi-2.0.7.tgz",
-      "integrity": "sha512-3eTuUO1vH2cZm2ZKHeQxnOqlTi9EfZDGgIe3BL3I4u+rJHocr9Fz86M4fjYABPvFnQG/gGK551HqDiIcETwU6Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1308,8 +1194,6 @@
     },
     "node_modules/@inquirer/confirm": {
       "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-6.1.1.tgz",
-      "integrity": "sha512-eb8DBZcz/2qHWQda4rk2JiQk5h9QV/cVHi1yjt0f69WFZMRFn0sJTye3EAP8icut8UDMjQPsaH5KbcOogefrFQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1330,8 +1214,6 @@
     },
     "node_modules/@inquirer/core": {
       "version": "11.2.1",
-      "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-11.2.1.tgz",
-      "integrity": "sha512-Qd6GJT1yVyrZZCfN8W2qKF5ApmqryXRhRKCuip8h01x2w/esJQ2XIYc6f9abMIHgKQdBfFTSOdbHRLAhuM09UA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1357,8 +1239,6 @@
     },
     "node_modules/@inquirer/external-editor": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@inquirer/external-editor/-/external-editor-1.0.3.tgz",
-      "integrity": "sha512-RWbSrDiYmO4LbejWY7ttpxczuwQyZLBUyygsA9Nsv95hpzUWwnNTVQmAq3xuh7vNwCp07UTmE5i11XAEExx4RA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1379,8 +1259,6 @@
     },
     "node_modules/@inquirer/external-editor/node_modules/iconv-lite": {
       "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz",
-      "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1396,8 +1274,6 @@
     },
     "node_modules/@inquirer/figures": {
       "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@inquirer/figures/-/figures-2.0.7.tgz",
-      "integrity": "sha512-aJ8TBPOGB6f/2qziPfElISTCEd5XOYTFckA2SGjhNmiKzfK/u4ot3v0DUzGVdUnKjN10EqnnEPck36BkyfLnJw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1406,8 +1282,6 @@
     },
     "node_modules/@inquirer/type": {
       "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-4.0.7.tgz",
-      "integrity": "sha512-t28inv14nMQ1PhKpsJPY+kEs/c00qzeCOS2gTNRyTjG5d6qsVA2fItxW4hkvGZ5lvanGLdtCzVIx5dwdRpN1+g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1424,8 +1298,6 @@
     },
     "node_modules/@istanbuljs/schema": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.6.tgz",
-      "integrity": "sha512-+Sg6GCR/wy1oSmQDFq4LQDAhm3ETKnorxN+y5nbLULOR3P0c14f2Wurzj3/xqPXtasLFfHd5iRFQ7AJt4KH2cw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1434,8 +1306,6 @@
     },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.13",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
-      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1445,8 +1315,6 @@
     },
     "node_modules/@jridgewell/remapping": {
       "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
-      "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1456,8 +1324,6 @@
     },
     "node_modules/@jridgewell/resolve-uri": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1466,15 +1332,11 @@
     },
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
-      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.31",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
-      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1484,8 +1346,6 @@
     },
     "node_modules/@manypkg/find-root": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@manypkg/find-root/-/find-root-1.1.0.tgz",
-      "integrity": "sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1497,15 +1357,11 @@
     },
     "node_modules/@manypkg/find-root/node_modules/@types/node": {
       "version": "12.20.55",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz",
-      "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@manypkg/find-root/node_modules/fs-extra": {
       "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1519,8 +1375,6 @@
     },
     "node_modules/@manypkg/get-packages": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@manypkg/get-packages/-/get-packages-1.1.3.tgz",
-      "integrity": "sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1534,15 +1388,11 @@
     },
     "node_modules/@manypkg/get-packages/node_modules/@changesets/types": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@changesets/types/-/types-4.1.0.tgz",
-      "integrity": "sha512-LDQvVDv5Kb50ny2s25Fhm3d9QSZimsoUGBsUioj6MC3qbMUCuC8GPIvk/M6IvXx3lYhAs0lwWUQLb+VIEUCECw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@manypkg/get-packages/node_modules/fs-extra": {
       "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1556,8 +1406,6 @@
     },
     "node_modules/@mswjs/interceptors": {
       "version": "0.41.9",
-      "resolved": "https://registry.npmjs.org/@mswjs/interceptors/-/interceptors-0.41.9.tgz",
-      "integrity": "sha512-VVPPgHyQ6ShqnrmDWuxjmUIsO9gWyOZFmuOfLd9LfBGQJwZfy0gvv9pbHSJuoFNIYC7ZDX9aoFwowjcdSC4E8w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1574,20 +1422,18 @@
     },
     "node_modules/@mswjs/interceptors/node_modules/@open-draft/deferred-promise": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@open-draft/deferred-promise/-/deferred-promise-2.2.0.tgz",
-      "integrity": "sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@napi-rs/wasm-runtime": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz",
-      "integrity": "sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz",
+      "integrity": "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==",
       "dev": true,
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "@tybys/wasm-util": "^0.10.1"
+        "@tybys/wasm-util": "^0.10.3"
       },
       "funding": {
         "type": "github",
@@ -1600,8 +1446,6 @@
     },
     "node_modules/@noble/hashes": {
       "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz",
-      "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==",
       "license": "MIT",
       "engines": {
         "node": "^14.21.3 || >=16"
@@ -1612,8 +1456,6 @@
     },
     "node_modules/@nodable/entities": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@nodable/entities/-/entities-2.1.0.tgz",
-      "integrity": "sha512-nyT7T3nbMyBI/lvr6L5TyWbFJAI9FTgVRakNoBqCD+PmID8DzFrrNdLLtHMwMszOtqZa8PAOV24ZqDnQrhQINA==",
       "funding": [
         {
           "type": "github",
@@ -1624,8 +1466,6 @@
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1638,8 +1478,6 @@
     },
     "node_modules/@nodelib/fs.stat": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1648,8 +1486,6 @@
     },
     "node_modules/@nodelib/fs.walk": {
       "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1662,15 +1498,11 @@
     },
     "node_modules/@open-draft/deferred-promise": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@open-draft/deferred-promise/-/deferred-promise-3.0.0.tgz",
-      "integrity": "sha512-XW375UK8/9SqUVNVa6M0yEy8+iTi4QN5VZ7aZuRFQmy76LRwI9wy5F4YIBU6T+eTe2/DNDo8tqu8RHlwLHM6RA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@open-draft/logger": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@open-draft/logger/-/logger-0.3.0.tgz",
-      "integrity": "sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1680,15 +1512,11 @@
     },
     "node_modules/@open-draft/until": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@open-draft/until/-/until-2.1.0.tgz",
-      "integrity": "sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@opentelemetry/api": {
       "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz",
-      "integrity": "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -1697,8 +1525,6 @@
     },
     "node_modules/@opentelemetry/api-logs": {
       "version": "0.219.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.219.0.tgz",
-      "integrity": "sha512-FFx7YnaYJlIjqWW/AG/yAZ0L/NEY724PipXXXQLdtZPbLwBGbUMTGL1i/esI56TWfTUXxhLfpgrnWJCG8aUJyg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1710,8 +1536,6 @@
     },
     "node_modules/@opentelemetry/context-async-hooks": {
       "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/context-async-hooks/-/context-async-hooks-2.8.0.tgz",
-      "integrity": "sha512-/3FIraneMcng67SUJCxvyInk/oxzwsxyadufk0wwfOBLf5wqtAGX4MoQASwSbndBPeARzBryUM9Azr5kHIdWLw==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -1723,8 +1547,6 @@
     },
     "node_modules/@opentelemetry/core": {
       "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-2.8.0.tgz",
-      "integrity": "sha512-hd1Lfh8p545nNz+jq1Ejfz+Mn1hyLuxYn1YzTfFNrxr8urEWMNQLPf1Th8kjOH+HxwawCrtgBp8JpBUR4ZSgww==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1739,8 +1561,6 @@
     },
     "node_modules/@opentelemetry/exporter-trace-otlp-http": {
       "version": "0.219.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.219.0.tgz",
-      "integrity": "sha512-9t6SvBXXBEjOBcIzgozvBbd3jWrv3Gt3ngGhl1fhdZ/zRc7oZDVOFEqbi2zlBpW9BXhgDMKv422J0DL/3iQWfw==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1759,8 +1579,6 @@
     },
     "node_modules/@opentelemetry/otlp-exporter-base": {
       "version": "0.219.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.219.0.tgz",
-      "integrity": "sha512-zvIxQX/AZUVKDU+hCuYx+7UkiP7GRdnk1ZbFQRYzHvYp47cAWR4j3IhoPhV9KaeXEv2xdGq3IA6PnpzDmLcmSA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1776,8 +1594,6 @@
     },
     "node_modules/@opentelemetry/otlp-transformer": {
       "version": "0.219.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-transformer/-/otlp-transformer-0.219.0.tgz",
-      "integrity": "sha512-aaYKAyXhw9VchKZVGOopD3Gw/kPsyrX2c6IQ0AW32mTjqmZOh5Y6Gf5OYqTNqVktAeBjmFinhyFaCwW6GYK9YQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1797,8 +1613,6 @@
     },
     "node_modules/@opentelemetry/resources": {
       "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-2.8.0.tgz",
-      "integrity": "sha512-qmXQ27ilDbUK/vGMqwL8D4/rhn76C+sherM4wTbjlfknR8Nvfc/hCxjRJPhkzZzUsPiNg16SA31NxMabwttRjg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1814,8 +1628,6 @@
     },
     "node_modules/@opentelemetry/sdk-logs": {
       "version": "0.219.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-logs/-/sdk-logs-0.219.0.tgz",
-      "integrity": "sha512-s6lTKRakaPClvKoWHRChxnXjDMkM/TQ30ff78jN6EBGf7MI7VzANE5PU3f4z9qDUudWjvZjOLHG0rBnBKYvoXA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1833,8 +1645,6 @@
     },
     "node_modules/@opentelemetry/sdk-metrics": {
       "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-2.8.0.tgz",
-      "integrity": "sha512-UDBGaj6W0Rgy5rTTaoxs8gVGF/aGkAKyjurJv7se6wjRxJu7FoquTLT/vt54DZfo4crbprYfhX/SOK9+BPw1qg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1850,8 +1660,6 @@
     },
     "node_modules/@opentelemetry/sdk-trace-base": {
       "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.8.0.tgz",
-      "integrity": "sha512-mhU4jp+vW0mGbFRd+GeXHvmfA4aDqWjBjLC3pE5XMpLs0IE2ryYb019Ts2AQrOq67gaTF25D91+fgvEHDZEnuQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1868,8 +1676,6 @@
     },
     "node_modules/@opentelemetry/sdk-trace-node": {
       "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-node/-/sdk-trace-node-2.8.0.tgz",
-      "integrity": "sha512-nZt9OGufioAc3AfoLTqA9bsAeaMJAictYDdI2VcNQ+PmT+3rfKjAZDZvgPfd8VPX0O5Bw1hdQF6kDK8VSpZiWg==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1886,8 +1692,6 @@
     },
     "node_modules/@opentelemetry/semantic-conventions": {
       "version": "1.41.1",
-      "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.41.1.tgz",
-      "integrity": "sha512-/UhIkaZgPutTFmQ7RnIJGgDXZmtEJ7Dvi86xNTFWcnRxVRNk/aotsqDJYeEvDP+FSMB2SdW+pQzNMcWP0rwuNA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -1896,8 +1700,6 @@
     },
     "node_modules/@oxc-project/types": {
       "version": "0.133.0",
-      "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.133.0.tgz",
-      "integrity": "sha512-KzkdCd6Uxqnf6l3HOw1xfatAlUURA0g14cvBYFyJ5SaNOQbOUvBr9PKArcPcrNIeRsBdgcUzOGrhKveVpvOIGA==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -1957,8 +1759,6 @@
     },
     "node_modules/@oxfmt/binding-darwin-x64": {
       "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/@oxfmt/binding-darwin-x64/-/binding-darwin-x64-0.33.0.tgz",
-      "integrity": "sha512-8278bqQtOcHRPhhzcqwN9KIideut+cftBjF8d2TOsSQrlsJSFx41wCCJ38mFmH9NOmU1M+x9jpeobHnbRP1okw==",
       "cpu": [
         "x64"
       ],
@@ -2031,6 +1831,9 @@
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2048,6 +1851,9 @@
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2065,6 +1871,9 @@
         "ppc64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2082,6 +1891,9 @@
         "riscv64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2099,6 +1911,9 @@
         "riscv64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2116,6 +1931,9 @@
         "s390x"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2133,6 +1951,9 @@
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2150,6 +1971,9 @@
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2280,8 +2104,6 @@
     },
     "node_modules/@oxlint/binding-darwin-x64": {
       "version": "1.48.0",
-      "resolved": "https://registry.npmjs.org/@oxlint/binding-darwin-x64/-/binding-darwin-x64-1.48.0.tgz",
-      "integrity": "sha512-kvo87BujEUjCJREuWDC4aPh1WoXCRFFWE4C7uF6wuoMw2f6N2hypA/cHHcYn9DdL8R2RrgUZPefC8JExyeIMKA==",
       "cpu": [
         "x64"
       ],
@@ -2354,6 +2176,9 @@
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2371,6 +2196,9 @@
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2388,6 +2216,9 @@
         "ppc64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2405,6 +2236,9 @@
         "riscv64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2422,6 +2256,9 @@
         "riscv64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2439,6 +2276,9 @@
         "s390x"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2456,6 +2296,9 @@
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2473,6 +2316,9 @@
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2552,14 +2398,11 @@
     },
     "node_modules/@polka/url": {
       "version": "1.0.0-next.28",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.28.tgz",
-      "integrity": "sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@redocly/ajv": {
       "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.18.1.tgz",
-      "integrity": "sha512-Ifm/pP/tul1qmAecpbVxCBluVE32rKfjf8gYXH4xI2gCv9mRWFhJMHzkPDM4TXlxwPQYIFegymlsy8lXz7optA==",
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
@@ -2578,8 +2421,6 @@
     },
     "node_modules/@redocly/cli-otel": {
       "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@redocly/cli-otel/-/cli-otel-0.3.1.tgz",
-      "integrity": "sha512-TbC4bK2zLtU/O9I2pszHPP0rtJOvFhQmEwQ/FHxERPu71fgKG8POUDP2jSiGmsXE7NdGSHBKqnf+y9Acn2jq5g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2588,18 +2429,18 @@
     },
     "node_modules/@redocly/cli-otel/node_modules/ulid": {
       "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/ulid/-/ulid-2.4.0.tgz",
-      "integrity": "sha512-fIRiVTJNcSRmXKPZtGzFQv9WRrZ3M9eoptl/teFJvjOzmpU+/K/JH6HZ8deBfb5vMEpicJcLn7JmvdknlMq7Zg==",
       "dev": true,
       "license": "MIT",
       "bin": {
         "ulid": "bin/cli.js"
       }
     },
+    "node_modules/@redocly/client-generator": {
+      "resolved": "packages/client-generator",
+      "link": true
+    },
     "node_modules/@redocly/config": {
       "version": "0.49.0",
-      "resolved": "https://registry.npmjs.org/@redocly/config/-/config-0.49.0.tgz",
-      "integrity": "sha512-OI/rpEffX3fKUuy+OuBHPRspRI/S30b9aiqxfZLMpSWZzDncEGPxSEP1O2LrBVshnDX4hLjVjLvCZ4YT85+1rw==",
       "license": "MIT",
       "dependencies": {
         "json-schema-to-ts": "2.7.2"
@@ -2607,8 +2448,6 @@
     },
     "node_modules/@redocly/config/node_modules/json-schema-to-ts": {
       "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/json-schema-to-ts/-/json-schema-to-ts-2.7.2.tgz",
-      "integrity": "sha512-R1JfqKqbBR4qE8UyBR56Ms30LL62/nlhoz+1UkfI/VE7p54Awu919FZ6ZUPG8zIa3XB65usPJgr1ONVncUGSaQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.18.3",
@@ -2621,14 +2460,10 @@
     },
     "node_modules/@redocly/config/node_modules/ts-algebra": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/ts-algebra/-/ts-algebra-1.2.2.tgz",
-      "integrity": "sha512-kloPhf1hq3JbCPOTYoOWDKxebWjNb2o/LKnNfkWhxVVisFFmMJPPdJeGoGmM+iRLyoXAR61e08Pb+vUXINg8aA==",
       "license": "MIT"
     },
     "node_modules/@redocly/mock-server": {
       "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@redocly/mock-server/-/mock-server-0.7.0.tgz",
-      "integrity": "sha512-gr9e1aq5iKy+AN3F+NwFC4cbi15XCdL1HTpfZudV9jg2OqTPRMZd1RNvFQvKUF0UZq+TLLpR88KmD+ufiVAX0w==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
@@ -2647,8 +2482,6 @@
     },
     "node_modules/@redocly/mock-server/node_modules/@redocly/ajv": {
       "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.18.0.tgz",
-      "integrity": "sha512-F+LMD2IDIXuHxgpLJh3nkLj9+tSaEzoUWd+7fONGq5pe2169FUDjpEkOfEpoGLz1sbZni/69p07OsecNfAOpqA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2664,8 +2497,6 @@
     },
     "node_modules/@redocly/mock-server/node_modules/@redocly/config": {
       "version": "0.48.2",
-      "resolved": "https://registry.npmjs.org/@redocly/config/-/config-0.48.2.tgz",
-      "integrity": "sha512-DUHthTRdj+caAQWCtJae4yzvxaUDuwQkFsZFVaAEyORd8Bt8K2wYso61jYZuR/kQZaDejfUREtQTVVZ5VYTqgw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2674,8 +2505,6 @@
     },
     "node_modules/@redocly/mock-server/node_modules/@redocly/openapi-core": {
       "version": "2.30.5",
-      "resolved": "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-2.30.5.tgz",
-      "integrity": "sha512-ikljMaow1wX3GoRvLiJvqOq8H3f6XsuMBZqCGmeY0+UPmlnVhrvW8m/gC1vkKcGNvYINUrgi/Z6dBtzQ7854wA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2697,8 +2526,6 @@
     },
     "node_modules/@redocly/mock-server/node_modules/@redocly/openapi-core/node_modules/@redocly/ajv": {
       "version": "8.18.3",
-      "resolved": "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.18.3.tgz",
-      "integrity": "sha512-l42u0of3hY98sN2A+M4qTX1O/KrpgGH32Hu9kP2GtHyD5Dfqq86PKFLe5dwaD8DEnNmlOlll2BAmeEtf0DaySg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2715,8 +2542,6 @@
     "node_modules/@redocly/mock-server/node_modules/@redocly/openapi-core/node_modules/ajv": {
       "name": "@redocly/ajv",
       "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.18.1.tgz",
-      "integrity": "sha512-Ifm/pP/tul1qmAecpbVxCBluVE32rKfjf8gYXH4xI2gCv9mRWFhJMHzkPDM4TXlxwPQYIFegymlsy8lXz7optA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2732,8 +2557,6 @@
     },
     "node_modules/@redocly/mock-server/node_modules/cliui": {
       "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -2747,8 +2570,6 @@
     },
     "node_modules/@redocly/mock-server/node_modules/json-schema-to-ts": {
       "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/json-schema-to-ts/-/json-schema-to-ts-2.7.2.tgz",
-      "integrity": "sha512-R1JfqKqbBR4qE8UyBR56Ms30LL62/nlhoz+1UkfI/VE7p54Awu919FZ6ZUPG8zIa3XB65usPJgr1ONVncUGSaQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2762,8 +2583,6 @@
     },
     "node_modules/@redocly/mock-server/node_modules/picomatch": {
       "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
-      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2775,8 +2594,6 @@
     },
     "node_modules/@redocly/mock-server/node_modules/punycode": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2785,15 +2602,11 @@
     },
     "node_modules/@redocly/mock-server/node_modules/ts-algebra": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/ts-algebra/-/ts-algebra-1.2.2.tgz",
-      "integrity": "sha512-kloPhf1hq3JbCPOTYoOWDKxebWjNb2o/LKnNfkWhxVVisFFmMJPPdJeGoGmM+iRLyoXAR61e08Pb+vUXINg8aA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@redocly/mock-server/node_modules/yargs": {
       "version": "17.7.3",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.3.tgz",
-      "integrity": "sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2811,8 +2624,6 @@
     },
     "node_modules/@redocly/mock-server/node_modules/yargs-parser": {
       "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -2823,10 +2634,6 @@
       "resolved": "packages/core",
       "link": true
     },
-    "node_modules/@redocly/openapi-typescript": {
-      "resolved": "packages/openapi-typescript",
-      "link": true
-    },
     "node_modules/@redocly/respect-core": {
       "resolved": "packages/respect-core",
       "link": true
@@ -2867,8 +2674,6 @@
     },
     "node_modules/@rolldown/binding-darwin-x64": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.0.3.tgz",
-      "integrity": "sha512-9YpfeUvSE2RS7wysJ81uOZkXJz7f7Q55H2Gvp3VEw/EsahqDtrphrZ0EwDLK5vvKOzaCrBsjF8JmnMLcUt78Gg==",
       "cpu": [
         "x64"
       ],
@@ -2924,6 +2729,9 @@
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2941,6 +2749,9 @@
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2958,6 +2769,9 @@
         "ppc64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2975,6 +2789,9 @@
         "s390x"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -2992,6 +2809,9 @@
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3009,6 +2829,9 @@
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MIT",
       "optional": true,
       "os": [
@@ -3090,22 +2913,16 @@
     },
     "node_modules/@rolldown/pluginutils": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.1.tgz",
-      "integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@standard-schema/spec": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
-      "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@tanstack/query-core": {
       "version": "5.101.0",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.101.0.tgz",
-      "integrity": "sha512-cQetA74EB+seWySv1TTKr828TnP0u39m6LykwDXIo84SNortpDkp30TMEjkqtYCNP9c40uT/iwl6MLiufEt0Ow==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -3115,8 +2932,6 @@
     },
     "node_modules/@tanstack/react-query": {
       "version": "5.101.0",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.101.0.tgz",
-      "integrity": "sha512-rLlJXSpkqfizLWgkR5+eLeIk0MvTx/meEIR7LRjxic+qxiQP8zVjq7BqQkiCMNLQBlLfuOLqqr6KO5GtrDlmSg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3132,8 +2947,6 @@
     },
     "node_modules/@testing-library/dom": {
       "version": "10.4.1",
-      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
-      "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -3153,8 +2966,6 @@
     },
     "node_modules/@testing-library/react": {
       "version": "16.3.2",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.2.tgz",
-      "integrity": "sha512-XU5/SytQM+ykqMnAnvB2umaJNIOsLF3PVv//1Ew4CTcpz0/BRyy/af40qqrt7SjKpDdT1saBMc42CUok5gaw+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3181,8 +2992,6 @@
     },
     "node_modules/@tinyhttp/accepts": {
       "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/@tinyhttp/accepts/-/accepts-2.2.3.tgz",
-      "integrity": "sha512-9pQN6pJAJOU3McmdJWTcyq7LLFW8Lj5q+DadyKcvp+sxMkEpktKX5sbfJgJuOvjk6+1xWl7pe0YL1US1vaO/1w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3199,8 +3008,6 @@
     },
     "node_modules/@tinyhttp/app": {
       "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/@tinyhttp/app/-/app-2.5.0.tgz",
-      "integrity": "sha512-mwVY6RhTqF/s49tqNqpkRWbXAC7OmfpxR6YI6atp9xDauUOv3n1hv38AKy89Ga8HC8G2p1KR9vPD66VmF6VMnw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3222,8 +3029,6 @@
     },
     "node_modules/@tinyhttp/content-disposition": {
       "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@tinyhttp/content-disposition/-/content-disposition-2.2.2.tgz",
-      "integrity": "sha512-crXw1txzrS36huQOyQGYFvhTeLeG0Si1xu+/l6kXUVYpE0TjFjEZRqTbuadQLfKGZ0jaI+jJoRyqaWwxOSHW2g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3236,8 +3041,6 @@
     },
     "node_modules/@tinyhttp/content-type": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/@tinyhttp/content-type/-/content-type-0.1.4.tgz",
-      "integrity": "sha512-dl6f3SHIJPYbhsW1oXdrqOmLSQF/Ctlv3JnNfXAE22kIP7FosqJHxkz/qj2gv465prG8ODKH5KEyhBkvwrueKQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3246,8 +3049,6 @@
     },
     "node_modules/@tinyhttp/cookie": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@tinyhttp/cookie/-/cookie-2.1.1.tgz",
-      "integrity": "sha512-h/kL9jY0e0Dvad+/QU3efKZww0aTvZJslaHj3JTPmIPC9Oan9+kYqmh3M6L5JUQRuTJYFK2nzgL2iJtH2S+6dA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3260,8 +3061,6 @@
     },
     "node_modules/@tinyhttp/cookie-signature": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@tinyhttp/cookie-signature/-/cookie-signature-2.1.1.tgz",
-      "integrity": "sha512-VDsSMY5OJfQJIAtUgeQYhqMPSZptehFSfvEEtxr+4nldPA8IImlp3QVcOVuK985g4AFR4Hl1sCbWCXoqBnVWnw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3270,8 +3069,6 @@
     },
     "node_modules/@tinyhttp/cors": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@tinyhttp/cors/-/cors-2.0.1.tgz",
-      "integrity": "sha512-qrmo6WJuaiCzKWagv2yA/kw6hIISfF/hOqPWwmI6w0o8apeTMmRN3DoCFvQ/wNVuWVdU5J4KU7OX8aaSOEq51A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3283,8 +3080,6 @@
     },
     "node_modules/@tinyhttp/encode-url": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@tinyhttp/encode-url/-/encode-url-2.1.1.tgz",
-      "integrity": "sha512-AhY+JqdZ56qV77tzrBm0qThXORbsVjs/IOPgGCS7x/wWnsa/Bx30zDUU/jPAUcSzNOzt860x9fhdGpzdqbUeUw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3293,8 +3088,6 @@
     },
     "node_modules/@tinyhttp/etag": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@tinyhttp/etag/-/etag-2.1.2.tgz",
-      "integrity": "sha512-j80fPKimGqdmMh6962y+BtQsnYPVCzZfJw0HXjyH70VaJBHLKGF+iYhcKqzI3yef6QBNa8DKIPsbEYpuwApXTw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3303,8 +3096,6 @@
     },
     "node_modules/@tinyhttp/forwarded": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@tinyhttp/forwarded/-/forwarded-2.1.1.tgz",
-      "integrity": "sha512-nO3kq0R1LRl2+CAMlnggm22zE6sT8gfvGbNvSitV6F9eaUSurHP0A8YZFMihSkugHxK+uIegh1TKrqgD8+lyGQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3313,8 +3104,6 @@
     },
     "node_modules/@tinyhttp/logger": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@tinyhttp/logger/-/logger-2.0.0.tgz",
-      "integrity": "sha512-8DfLQjGDIaIJeivYamVrrpmwmsGwS8wt2DGvzlcY5HEBagdiI4QJy/veAFcUHuaJqufn4wLwmn4q5VUkW8BCpQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3328,15 +3117,11 @@
     },
     "node_modules/@tinyhttp/logger/node_modules/colorette": {
       "version": "2.0.20",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@tinyhttp/proxy-addr": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@tinyhttp/proxy-addr/-/proxy-addr-2.2.0.tgz",
-      "integrity": "sha512-WM/PPL9xNvrs7/8Om5nhKbke5FHrP3EfjOOR+wBnjgESfibqn0K7wdUTnzSLp1lBmemr88os1XvzwymSgaibyA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3349,8 +3134,6 @@
     },
     "node_modules/@tinyhttp/req": {
       "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/@tinyhttp/req/-/req-2.2.4.tgz",
-      "integrity": "sha512-lQAZIAo0NOeghxFOZS57tQzxpHSPPLs9T68Krq2BncEBImKwqaDKUt7M9Y5Kb+rvC/GwIL3LeErhkg7f5iG4IQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3365,8 +3148,6 @@
     },
     "node_modules/@tinyhttp/res": {
       "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/@tinyhttp/res/-/res-2.2.4.tgz",
-      "integrity": "sha512-ETBRShnO19oJyIg2XQHQoofXPWeTXPAuwnIVYkU8WaftvXd/Vz4y5+WFQDHUzKlmdGOw5fAFnrEU7pIVMeFeVA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3386,8 +3167,6 @@
     },
     "node_modules/@tinyhttp/router": {
       "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/@tinyhttp/router/-/router-2.2.3.tgz",
-      "integrity": "sha512-O0MQqWV3Vpg/uXsMYg19XsIgOhwjyhTYWh51Qng7bxqXixxx2PEvZWnFjP7c84K7kU/nUX41KpkEBTLnznk9/Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3396,8 +3175,6 @@
     },
     "node_modules/@tinyhttp/send": {
       "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/@tinyhttp/send/-/send-2.2.3.tgz",
-      "integrity": "sha512-o4cVHHGQ8WjVBS8UT0EE/2WnjoybrfXikHwsRoNlG1pfrC/Sd01u1N4Te8cOd/9aNGLr4mGxWb5qTm2RRtEi7g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3411,8 +3188,6 @@
     },
     "node_modules/@tinyhttp/type-is": {
       "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/@tinyhttp/type-is/-/type-is-2.2.4.tgz",
-      "integrity": "sha512-7F328NheridwjIfefBB2j1PEcKKABpADgv7aCJaE8x8EON77ZFrAkI3Rir7pGjopV7V9MBmW88xUQigBEX2rmQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3425,8 +3200,6 @@
     },
     "node_modules/@tinyhttp/url": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@tinyhttp/url/-/url-2.1.1.tgz",
-      "integrity": "sha512-POJeq2GQ5jI7Zrdmj22JqOijB5/GeX+LEX7DUdml1hUnGbJOTWDx7zf2b5cCERj7RoXL67zTgyzVblBJC+NJWg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3435,8 +3208,6 @@
     },
     "node_modules/@tinyhttp/vary": {
       "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@tinyhttp/vary/-/vary-0.1.3.tgz",
-      "integrity": "sha512-SoL83sQXAGiHN1jm2VwLUWQSQeDAAl1ywOm6T0b0Cg1CZhVsjoiZadmjhxF6FHCCY7OHHVaLnTgSMxTPIDLxMg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3445,36 +3216,28 @@
     },
     "node_modules/@tsconfig/node10": {
       "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.12.tgz",
-      "integrity": "sha512-UCYBaeFvM11aU2y3YPZ//O5Rhj+xKyzy7mvcIoAjASbigy8mHMryP5cK7dgjlz2hWxh1g5pLw084E0a/wlUSFQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@tsconfig/node12": {
       "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
-      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@tsconfig/node14": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@tsconfig/node16": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
-      "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@tybys/wasm-util": {
-      "version": "0.10.2",
-      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.2.tgz",
-      "integrity": "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==",
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz",
+      "integrity": "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==",
       "dev": true,
       "license": "MIT",
       "optional": true,
@@ -3484,16 +3247,12 @@
     },
     "node_modules/@types/aria-query": {
       "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
-      "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
       "dev": true,
       "license": "MIT",
       "peer": true
     },
     "node_modules/@types/chai": {
       "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz",
-      "integrity": "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3503,71 +3262,53 @@
     },
     "node_modules/@types/cookie": {
       "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/deep-eql": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
-      "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/estree": {
       "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz",
-      "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/har-format": {
       "version": "1.2.16",
-      "resolved": "https://registry.npmjs.org/@types/har-format/-/har-format-1.2.16.tgz",
-      "integrity": "sha512-fluxdy7ryD3MV6h8pTfTYpy/xQzCFC7m89nOH9y94cNqJ1mDIDPut7MnRHI3F6qRmh/cT2fUjG1MLdCNb4hE9A==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/js-levenshtein": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/js-levenshtein/-/js-levenshtein-1.1.1.tgz",
-      "integrity": "sha512-qC4bCqYGy1y/NP7dDVr7KJarn+PbX1nSpwA7JXdu0HxT3QYjO8MJ+cntENtHFVy2dRAyBV23OZ6MxsW1AM1L8g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/js-yaml": {
       "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.9.tgz",
-      "integrity": "sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/json-pointer": {
       "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/@types/json-pointer/-/json-pointer-1.0.34.tgz",
-      "integrity": "sha512-JRnWcxzXSaLei98xgw1B7vAeBVOrkyw0+Rt9j1QoJrczE78OpHsyQC8GNbuhw+/2vxxDe58QvWnngS86CoIbRg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
       "license": "MIT"
     },
     "node_modules/@types/mdast": {
       "version": "3.0.12",
-      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.12.tgz",
-      "integrity": "sha512-DT+iNIRNX884cx0/Q1ja7NyUPpZuv0KPyL5rGNxm1WC1OtHstl7n4Jb7nk+xacNShQMbczJjt8uFzznpp6kYBg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/unist": "^2"
       }
     },
     "node_modules/@types/node": {
       "version": "22.19.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.3.tgz",
-      "integrity": "sha512-1N9SBnWYOJTrNZCdh/yJE+t910Y128BoyY+zBLWhL3r0TYzlTmFdXrPwHL9DyFZmlEXNQQolTZh3KHV31QDhyA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3576,21 +3317,16 @@
     },
     "node_modules/@types/picomatch": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/picomatch/-/picomatch-4.0.2.tgz",
-      "integrity": "sha512-qHHxQ+P9PysNEGbALT8f8YOSHW0KJu6l2xU8DYY0fu/EmGxXdVnuTLvFUvBgPJMSqXq29SYHveejeAha+4AYgA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/pluralize": {
       "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/pluralize/-/pluralize-0.0.29.tgz",
-      "integrity": "sha512-BYOID+l2Aco2nBik+iYS4SZX0Lf20KPILP5RGmM1IgzdwNdTs0eebiFriOPcej1sX9mLnSoiNte5zcFxssgpGA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/react": {
       "version": "19.2.16",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.16.tgz",
-      "integrity": "sha512-esJiCAnl0kfpNdE69f3So4WJUXy95dLZydX0KwK46riIHDzHM7O9Vtf9xCHW0PXIqvgqNrswl522kA/5yx+F4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3599,8 +3335,6 @@
     },
     "node_modules/@types/react-dom": {
       "version": "19.2.3",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.3.tgz",
-      "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -3609,14 +3343,11 @@
     },
     "node_modules/@types/semver": {
       "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz",
-      "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/set-cookie-parser": {
       "version": "2.4.10",
-      "resolved": "https://registry.npmjs.org/@types/set-cookie-parser/-/set-cookie-parser-2.4.10.tgz",
-      "integrity": "sha512-GGmQVGpQWUe5qglJozEjZV/5dyxbOOZ0LHe/lqyWssB88Y4svNfst0uqBVscdDeIKl5Jy5+aPSvy7mI9tYRguw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3625,44 +3356,35 @@
     },
     "node_modules/@types/statuses": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@types/statuses/-/statuses-2.0.6.tgz",
-      "integrity": "sha512-xMAgYwceFhRA2zY+XbEA7mxYbA093wdiW8Vu6gZPGWy9cmOyU9XesH1tNcEWsKFd5Vzrqx5T3D38PWx1FIIXkA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/trusted-types": {
       "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
-      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
       "dev": true,
       "license": "MIT",
       "optional": true
     },
     "node_modules/@types/unist": {
       "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.7.tgz",
-      "integrity": "sha512-cputDpIbFgLUaGQn6Vqg3/YsJwxUwHLO13v3i5ouxT4lat0khip9AEWxtERujXV9wxIB1EyF97BSJFt6vpdI8g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/yargs": {
       "version": "17.0.32",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
-      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
     "node_modules/@types/yargs-parser": {
       "version": "21.0.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz",
-      "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@vitest/coverage-istanbul": {
       "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-istanbul/-/coverage-istanbul-4.1.8.tgz",
-      "integrity": "sha512-/h514nMZMKI6foh21mVgO1zlCH6pdDamwKMbla1uLU2GMxTlfp0PQMxovWozmzQdCIQYZ2XXEzg2zNZom2zAOg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3686,8 +3408,6 @@
     },
     "node_modules/@vitest/expect": {
       "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.8.tgz",
-      "integrity": "sha512-h3nDO677RDLEGlBxyQ5CW8RlMThSKSRLUePLOx09gNIWRL40edgA1GCZSZgf1W55MFAG6/Sw14KeaAnqv0NKdQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3704,8 +3424,6 @@
     },
     "node_modules/@vitest/pretty-format": {
       "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.8.tgz",
-      "integrity": "sha512-9GasEBxpZ1VYIpqHf/0+YGg121uSNwCKOJqIrTwWP/TB7DmFCiaBpNl3aPZzoLWfWkuqhbH8vJIVobZkvdo2cA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3717,8 +3435,6 @@
     },
     "node_modules/@vitest/runner": {
       "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.8.tgz",
-      "integrity": "sha512-EmVxeBAfMJvycdjd6Hm+RbFBbA9fKvo0Kx37hNpBYoYeavH3RNsBXWDooR1mgD52dCrxIIuP7UotpfiwOikvcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3731,8 +3447,6 @@
     },
     "node_modules/@vitest/snapshot": {
       "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.8.tgz",
-      "integrity": "sha512-acfZboRmAIf05DEKcBQy33VXojFJjtUdLyo7oOmV9kebb2xdU01UknNiPuPZoJZQyO7DF0gZdTGTpeAzET9QPQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3747,8 +3461,6 @@
     },
     "node_modules/@vitest/spy": {
       "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.8.tgz",
-      "integrity": "sha512-6EevtBp6OZOPF7bmz36HrGMeP3txgVSrgebWxHOafDXGkhIzfXK14f8KF6MuFfgXXUeHxmpD3BQxkV00/3s5mA==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -3757,8 +3469,6 @@
     },
     "node_modules/@vitest/utils": {
       "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.8.tgz",
-      "integrity": "sha512-uOJamYALNhfJ6iolExyQM40yIQwDqYnkKtQ5VCiSe17E33H0aQ/u+1GlRuz4LZBk6Mm3sg90G9hEbmEt37C1Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3772,8 +3482,6 @@
     },
     "node_modules/acorn": {
       "version": "8.17.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz",
-      "integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -3785,8 +3493,6 @@
     },
     "node_modules/acorn-walk": {
       "version": "8.3.5",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.5.tgz",
-      "integrity": "sha512-HEHNfbars9v4pgpW6SO1KSPkfoS0xVOM/9UzkJltjlsHZmJasxg8aXkuZa7SMf8vKGIBhpUsPluQSqhJFCqebw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3798,8 +3504,6 @@
     },
     "node_modules/agent-base": {
       "version": "7.1.4",
-      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
-      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3808,8 +3512,6 @@
     },
     "node_modules/ajv": {
       "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
-      "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
@@ -3824,8 +3526,6 @@
     },
     "node_modules/ajv-formats": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-3.0.1.tgz",
-      "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
       "license": "MIT",
       "dependencies": {
         "ajv": "^8.0.0"
@@ -3841,26 +3541,23 @@
     },
     "node_modules/ansi-colors": {
       "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -3873,20 +3570,15 @@
     },
     "node_modules/arg": {
       "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/argparse": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+      "license": "Python-2.0"
     },
     "node_modules/aria-query": {
       "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
-      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
       "dev": true,
       "license": "Apache-2.0",
       "peer": true,
@@ -3896,8 +3588,6 @@
     },
     "node_modules/array-union": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3906,8 +3596,6 @@
     },
     "node_modules/assertion-error": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
-      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3916,9 +3604,8 @@
     },
     "node_modules/bail": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
-      "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
@@ -3926,15 +3613,11 @@
     },
     "node_modules/balanced-match": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/baseline-browser-mapping": {
       "version": "2.10.33",
-      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.33.tgz",
-      "integrity": "sha512-bA6+tcSLpz2tIEdDXZPpPTIuxBcC4+w6SieaYyfigIa4h8GlFxbA17v22Vx3JUtuZQj9SgOsnbK+aTBzyDyEuw==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -3946,8 +3629,6 @@
     },
     "node_modules/better-ajv-errors": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/better-ajv-errors/-/better-ajv-errors-2.0.3.tgz",
-      "integrity": "sha512-t1vxUP+vYKsaYi/BbKo2K98nEAZmfi4sjwvmRT8aOPDzPJeAtLurfoIDazVkLILxO4K+Sw4YrLYnBQ46l6pePg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
@@ -3965,8 +3646,6 @@
     },
     "node_modules/better-path-resolve": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/better-path-resolve/-/better-path-resolve-1.0.0.tgz",
-      "integrity": "sha512-pbnl5XzGBdrFU/wT4jqmJVPn2B6UHPBOhzMQkY/SPUPB6QtUXtmBHBIwCbXJol93mOpGMnQyP/+BB19q04xj7g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3978,8 +3657,6 @@
     },
     "node_modules/bidi-js": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.0.3.tgz",
-      "integrity": "sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3988,8 +3665,6 @@
     },
     "node_modules/brace-expansion": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.1.tgz",
-      "integrity": "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3998,9 +3673,8 @@
     },
     "node_modules/braces": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -4010,8 +3684,6 @@
     },
     "node_modules/browserslist": {
       "version": "4.28.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz",
-      "integrity": "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==",
       "dev": true,
       "funding": [
         {
@@ -4044,15 +3716,11 @@
     },
     "node_modules/call-me-maybe": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.2.tgz",
-      "integrity": "sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/camelize": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz",
-      "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -4061,8 +3729,6 @@
     },
     "node_modules/caniuse-lite": {
       "version": "1.0.30001793",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001793.tgz",
-      "integrity": "sha512-iwSsYWaCOoh26cV8NwNRViHlrfUvYsHDfRVcbtmw0Kg6PJIZZXwMkj1442FYLBGkeUf1juAsU3DTfxW579mrPA==",
       "dev": true,
       "funding": [
         {
@@ -4082,9 +3748,8 @@
     },
     "node_modules/ccount": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz",
-      "integrity": "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
@@ -4092,8 +3757,6 @@
     },
     "node_modules/chai": {
       "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz",
-      "integrity": "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4102,8 +3765,7 @@
     },
     "node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -4117,9 +3779,8 @@
     },
     "node_modules/character-entities": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
-      "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
@@ -4127,9 +3788,8 @@
     },
     "node_modules/character-entities-legacy": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
-      "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
@@ -4137,9 +3797,8 @@
     },
     "node_modules/character-reference-invalid": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
-      "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
@@ -4147,15 +3806,11 @@
     },
     "node_modules/chardet": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-2.1.1.tgz",
-      "integrity": "sha512-PsezH1rqdV9VvyNhxxOW32/d75r01NY7TQCmOqomRo15ZSOKbpTFVsfjghxo6JloQUCGnH4k1LGu0R4yCLlWQQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/chokidar": {
       "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4170,15 +3825,11 @@
     },
     "node_modules/classnames": {
       "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
-      "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/cli-cursor": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-5.0.0.tgz",
-      "integrity": "sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4193,8 +3844,6 @@
     },
     "node_modules/cli-truncate": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz",
-      "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4210,8 +3859,6 @@
     },
     "node_modules/cli-truncate/node_modules/ansi-regex": {
       "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
-      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4223,15 +3870,11 @@
     },
     "node_modules/cli-truncate/node_modules/emoji-regex": {
       "version": "10.6.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
-      "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/cli-truncate/node_modules/string-width": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
-      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4248,8 +3891,6 @@
     },
     "node_modules/cli-truncate/node_modules/strip-ansi": {
       "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
-      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4264,8 +3905,6 @@
     },
     "node_modules/cli-width": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-4.1.0.tgz",
-      "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -4274,9 +3913,8 @@
     },
     "node_modules/cliui": {
       "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
@@ -4285,8 +3923,6 @@
     },
     "node_modules/clsx": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
-      "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4295,8 +3931,7 @@
     },
     "node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -4306,25 +3941,19 @@
     },
     "node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+      "license": "MIT"
     },
     "node_modules/colorette": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
-      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="
+      "license": "MIT"
     },
     "node_modules/convert-source-map": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/cookie": {
       "version": "0.7.2",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
-      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4333,8 +3962,6 @@
     },
     "node_modules/core-js": {
       "version": "3.49.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.49.0.tgz",
-      "integrity": "sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -4346,16 +3973,13 @@
     },
     "node_modules/create-require": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -4367,8 +3991,6 @@
     },
     "node_modules/css-color-keywords": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
-      "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -4377,8 +3999,6 @@
     },
     "node_modules/css-to-react-native": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.2.0.tgz",
-      "integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4389,8 +4009,6 @@
     },
     "node_modules/css-tree": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.1.0.tgz",
-      "integrity": "sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4403,8 +4021,6 @@
     },
     "node_modules/cssstyle": {
       "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-5.3.3.tgz",
-      "integrity": "sha512-OytmFH+13/QXONJcC75QNdMtKpceNk3u8ThBjyyYjkEcy/ekBwR1mMAuNvi3gdBPW3N5TlCzQ0WZw8H0lN/bDw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4418,15 +4034,11 @@
     },
     "node_modules/csstype": {
       "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz",
-      "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/data-urls": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-6.0.0.tgz",
-      "integrity": "sha512-BnBS08aLUM+DKamupXs3w2tJJoqU+AkaE/+6vQxi/G/DPmIZFJJp9Dkb1kM03AZx8ADehDUZgsNxju3mPXZYIA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4439,8 +4051,6 @@
     },
     "node_modules/data-urls/node_modules/tr46": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-6.0.0.tgz",
-      "integrity": "sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4452,8 +4062,6 @@
     },
     "node_modules/data-urls/node_modules/webidl-conversions": {
       "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-8.0.1.tgz",
-      "integrity": "sha512-BMhLD/Sw+GbJC21C/UgyaZX41nPt8bUTg+jWyDeg7e7YN4xOM05YPSIXceACnXVtqyEw/LMClUQMtMZ+PGGpqQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
@@ -4462,8 +4070,6 @@
     },
     "node_modules/data-urls/node_modules/whatwg-url": {
       "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-15.1.0.tgz",
-      "integrity": "sha512-2ytDk0kiEj/yu90JOAp44PVPUkO9+jVhyf+SybKlRHSDlvOOZhdPIrr7xTH64l4WixO2cP+wQIcgujkGBPPz6g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4476,15 +4082,11 @@
     },
     "node_modules/dayjs": {
       "version": "1.11.13",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
-      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/debug": {
       "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
-      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4501,21 +4103,15 @@
     },
     "node_modules/decimal.js": {
       "version": "10.6.0",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
-      "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/decko": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decko/-/decko-1.2.0.tgz",
-      "integrity": "sha512-m8FnyHXV1QX+S1cl+KPFDIl6NMkxtKsy6+U/aYyjrOqWMuwAwYWu7ePqrsUHtDR5Y8Yk2pi/KIDSgF+vT4cPOQ==",
       "dev": true
     },
     "node_modules/dequal": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
-      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4524,8 +4120,6 @@
     },
     "node_modules/detect-indent": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
-      "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4534,8 +4128,6 @@
     },
     "node_modules/detect-libc": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
-      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -4544,8 +4136,6 @@
     },
     "node_modules/diff": {
       "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.4.tgz",
-      "integrity": "sha512-X07nttJQkwkfKfvTPG/KSnE2OMdcUCao6+eXF3wmnIQRn2aPAHH3VxDbDOdegkd6JbPsXqShpvEOHfAT+nCNwQ==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
@@ -4554,8 +4144,6 @@
     },
     "node_modules/dir-glob": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4567,16 +4155,12 @@
     },
     "node_modules/dom-accessibility-api": {
       "version": "0.5.16",
-      "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
-      "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
       "dev": true,
       "license": "MIT",
       "peer": true
     },
     "node_modules/dompurify": {
       "version": "3.4.10",
-      "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.10.tgz",
-      "integrity": "sha512-0xzNv0e7oYC6yyuOGZIABPM4qtg3QxLFniDNPP4ZP90wR8Yq3zgwpRbrNiT4N3IKqDbbYFEJLV+JWEs19aZ//w==",
       "dev": true,
       "license": "(MPL-2.0 OR Apache-2.0)",
       "optionalDependencies": {
@@ -4585,8 +4169,6 @@
     },
     "node_modules/dot-prop": {
       "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-9.0.0.tgz",
-      "integrity": "sha512-1gxPBJpI/pcjQhKgIU91II6Wkay+dLcN3M6rf2uwP8hRur3HtQXjVrdAK3sjC0piaEuxzMwjXChcETiJl47lAQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4601,8 +4183,6 @@
     },
     "node_modules/dotenv": {
       "version": "16.4.7",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz",
-      "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
@@ -4614,22 +4194,18 @@
     },
     "node_modules/electron-to-chromium": {
       "version": "1.5.365",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.365.tgz",
-      "integrity": "sha512-xfip4u1QF1s+URFqpA6N+OeFpDGpN7VJz1f3MO3bVL0QYBjpGiZ5/Of7kugvM+o8TTqmanUlviHN3c8M9vYWCw==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/emoji-regex": {
       "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/enquirer": {
       "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
-      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-colors": "^4.1.1",
         "strip-ansi": "^6.0.1"
@@ -4640,8 +4216,6 @@
     },
     "node_modules/entities": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
-      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
       "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
@@ -4653,8 +4227,6 @@
     },
     "node_modules/environment": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/environment/-/environment-1.1.0.tgz",
-      "integrity": "sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4666,8 +4238,6 @@
     },
     "node_modules/es-escape-html": {
       "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/es-escape-html/-/es-escape-html-0.1.1.tgz",
-      "integrity": "sha512-yUx1o+8RsG7UlszmYPtks+dm6Lho2m8lgHMOsLJQsFI0R8XwUJwiMhM1M4E/S8QLeGyf6MkDV/pWgjQ0tdTSyQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4676,22 +4246,16 @@
     },
     "node_modules/es-module-lexer": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.1.0.tgz",
-      "integrity": "sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/es6-promise": {
       "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
-      "integrity": "sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/esbuild": {
       "version": "0.28.1",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.28.1.tgz",
-      "integrity": "sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -4732,8 +4296,6 @@
     },
     "node_modules/escalade": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
-      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4742,9 +4304,8 @@
     },
     "node_modules/escape-string-regexp": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -4754,8 +4315,6 @@
     },
     "node_modules/esprima": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true,
       "license": "BSD-2-Clause",
       "bin": {
@@ -4768,8 +4327,6 @@
     },
     "node_modules/estree-walker": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
-      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4778,8 +4335,6 @@
     },
     "node_modules/eta": {
       "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/eta/-/eta-3.5.0.tgz",
-      "integrity": "sha512-e3x3FBvGzeCIHhF+zhK8FZA2vC5uFn6b4HJjegUbIWrDb4mJ7JjTGMJY9VGIbRVpmSwHopNiaJibhjIr+HfLug==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4791,14 +4346,11 @@
     },
     "node_modules/eventemitter3": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
-      "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/expect-type": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz",
-      "integrity": "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -4807,26 +4359,20 @@
     },
     "node_modules/extend": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/extendable-error": {
       "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/extendable-error/-/extendable-error-0.1.7.tgz",
-      "integrity": "sha512-UOiS2in6/Q0FK0R0q6UY9vYpQ21mr/Qn1KOnte7vsACuNJf514WvCCUHSRCPcgjPT2bAhNIJdlE6bVap1GKmeg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+      "license": "MIT"
     },
     "node_modules/fast-glob": {
       "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
-      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4842,22 +4388,16 @@
     },
     "node_modules/fast-safe-stringify": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
-      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/fast-string-truncated-width": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/fast-string-truncated-width/-/fast-string-truncated-width-3.0.3.tgz",
-      "integrity": "sha512-0jjjIEL6+0jag3l2XWWizO64/aZVtpiGE3t0Zgqxv0DPuxiMjvB3M24fCyhZUO4KomJQPj3LTSUnDP3GpdwC0g==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/fast-string-width": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/fast-string-width/-/fast-string-width-3.0.2.tgz",
-      "integrity": "sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4866,8 +4406,6 @@
     },
     "node_modules/fast-uri": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz",
-      "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==",
       "funding": [
         {
           "type": "github",
@@ -4882,8 +4420,6 @@
     },
     "node_modules/fast-wrap-ansi": {
       "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/fast-wrap-ansi/-/fast-wrap-ansi-0.2.2.tgz",
-      "integrity": "sha512-7F2Fl+TjRSenLqlU3UjSH0iyqopqoZIu7eZVpEirP2g1GtWa2G/ecEmBdgz31+Mxr+ELclgg6sokpSFIQiZ02Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4892,8 +4428,6 @@
     },
     "node_modules/fast-xml-builder": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.2.0.tgz",
-      "integrity": "sha512-00aAWieqff+ZJhsXA4g1g7M8k+7AYoMUUHF+/zFb5U6Uv/P0Vl4QZo84/IcufzYalLuEj9928bXN9PbbFzMF0Q==",
       "funding": [
         {
           "type": "github",
@@ -4908,8 +4442,6 @@
     },
     "node_modules/fast-xml-parser": {
       "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.7.3.tgz",
-      "integrity": "sha512-C0AaNuC+mscy6vrAQKAc/rMq+zAPHodfHGZu4sGVehvAQt/JLG1O5zEcYcXSY5zSqr4YVgxsB+pHXTq0i7eDlg==",
       "funding": [
         {
           "type": "github",
@@ -4929,8 +4461,6 @@
     },
     "node_modules/fastq": {
       "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz",
-      "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -4939,9 +4469,8 @@
     },
     "node_modules/fill-range": {
       "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -4951,8 +4480,6 @@
     },
     "node_modules/find-up": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4965,13 +4492,10 @@
     },
     "node_modules/foreach": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.6.tgz",
-      "integrity": "sha512-k6GAGDyqLe9JaebCsFCoudPPWfihKu8pylYXRlqP1J7ms39iPoTtk2fviNglIeQEwdh0bQeKJ01ZPyuyQvKzwg=="
+      "license": "MIT"
     },
     "node_modules/fs-extra": {
       "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4985,10 +4509,7 @@
     },
     "node_modules/fsevents": {
       "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
       "dev": true,
-      "hasInstallScript": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -5000,8 +4521,6 @@
     },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5010,17 +4529,14 @@
     },
     "node_modules/get-caller-file": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
     },
     "node_modules/get-east-asian-width": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.4.0.tgz",
-      "integrity": "sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5032,8 +4548,6 @@
     },
     "node_modules/glob": {
       "version": "13.0.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.5.tgz",
-      "integrity": "sha512-BzXxZg24Ibra1pbQ/zE7Kys4Ua1ks7Bn6pKLkVPZ9FZe4JQS6/Q7ef3LG1H+k7lUf5l4T3PLSyYyYJVYUvfgTw==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
@@ -5050,8 +4564,6 @@
     },
     "node_modules/glob-parent": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -5063,8 +4575,6 @@
     },
     "node_modules/glob/node_modules/path-scurry": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.1.tgz",
-      "integrity": "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
@@ -5080,8 +4590,6 @@
     },
     "node_modules/globby": {
       "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5101,14 +4609,11 @@
     },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/graphql": {
       "version": "16.14.2",
-      "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.14.2.tgz",
-      "integrity": "sha512-Chq1s4CY7jmh8gO2qvLIJyfCDIN+EHLFW/9iShnp1z8FjBQMoodWP1kDC36VAMXXIvAjj4ARa7ntfAV2BrjsbA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5117,8 +4622,6 @@
     },
     "node_modules/handlebars": {
       "version": "4.7.9",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.9.tgz",
-      "integrity": "sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5139,16 +4642,13 @@
     },
     "node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/header-range-parser": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/header-range-parser/-/header-range-parser-1.1.3.tgz",
-      "integrity": "sha512-B9zCFt3jH8g09LR1vHL4pcAn8yMEtlSlOUdQemzHMRKMImNIhhszdeosYFfNW0WXKQtXIlWB+O4owHJKvEJYaA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5157,8 +4657,6 @@
     },
     "node_modules/headers-polyfill": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/headers-polyfill/-/headers-polyfill-5.0.1.tgz",
-      "integrity": "sha512-1TJ6Fih/b8h5TIcv+1+Hw0PDQWJTKDKzFZzcKOiW1wJza3XoAQlkCuXLbymPYB8+ZQyw8mHvdw560e8zVFIWyA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5168,15 +4666,11 @@
     },
     "node_modules/headers-polyfill/node_modules/set-cookie-parser": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-3.1.0.tgz",
-      "integrity": "sha512-kjnC1DXBHcxaOaOXBHBeRtltsDG2nUiUni+jP92M9gYdW12rsmx92UsfpH7o5tDRs7I1ZZPSQJQGv3UaRfCiuw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/html-encoding-sniffer": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz",
-      "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5188,15 +4682,11 @@
     },
     "node_modules/html-escaper": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/http-proxy-agent": {
       "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
-      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5209,22 +4699,16 @@
     },
     "node_modules/http-status-emojis": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/http-status-emojis/-/http-status-emojis-2.2.0.tgz",
-      "integrity": "sha512-ompKtgwpx8ff0hsbpIB7oE4ax1LXoHmftsHHStMELX56ivG3GhofTX8ZHWlUaFKfGjcGjw6G3rPk7dJRXMmbbg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/http2-client": {
       "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/http2-client/-/http2-client-1.3.5.tgz",
-      "integrity": "sha512-EC2utToWl4RKfs5zd36Mxq7nzHHBuomZboI0yYL6Y0RmBgT7Sgkq4rQ0ezFTYoIsSs7Tm9SJe+o2FcAg6GBhGA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/https-proxy-agent": {
       "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5237,8 +4721,6 @@
     },
     "node_modules/human-id": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/human-id/-/human-id-4.1.1.tgz",
-      "integrity": "sha512-3gKm/gCSUipeLsRYZbbdA1BD83lBoWUkZ7G9VFrhWPAU76KwYo5KR8V28bpoPm/ygy0x5/GCbpRQdY7VLYCoIg==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -5247,8 +4729,6 @@
     },
     "node_modules/husky": {
       "version": "9.1.7",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz",
-      "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -5263,8 +4743,6 @@
     },
     "node_modules/iconv-lite": {
       "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5276,8 +4754,6 @@
     },
     "node_modules/ignore": {
       "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
-      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5286,8 +4762,6 @@
     },
     "node_modules/inflection": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/inflection/-/inflection-3.0.2.tgz",
-      "integrity": "sha512-+Bg3+kg+J6JUWn8J6bzFmOWkTQ6L/NHfDRSYU+EVvuKHDxUDHAXgqixHfVlzuBQaPOTac8hn43aPhMNk6rMe3g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5296,8 +4770,6 @@
     },
     "node_modules/ipaddr.js": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
-      "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5306,9 +4778,8 @@
     },
     "node_modules/is-alphabetical": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
-      "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
@@ -5316,9 +4787,8 @@
     },
     "node_modules/is-alphanumerical": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
-      "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-alphabetical": "^1.0.0",
         "is-decimal": "^1.0.0"
@@ -5330,8 +4800,6 @@
     },
     "node_modules/is-buffer": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
-      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
       "dev": true,
       "funding": [
         {
@@ -5354,9 +4822,8 @@
     },
     "node_modules/is-decimal": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
-      "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
@@ -5364,8 +4831,6 @@
     },
     "node_modules/is-extglob": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5374,17 +4839,14 @@
     },
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/is-glob": {
       "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5396,9 +4858,8 @@
     },
     "node_modules/is-hexadecimal": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
-      "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
@@ -5406,31 +4867,24 @@
     },
     "node_modules/is-node-process": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-node-process/-/is-node-process-1.2.0.tgz",
-      "integrity": "sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/is-number": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
     },
     "node_modules/is-potential-custom-element-name": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/is-subdir": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-subdir/-/is-subdir-1.2.0.tgz",
-      "integrity": "sha512-2AT6j+gXe/1ueqbW6fLZJiIw3F8iXGJtt0yDrZaBhAZEG1raiTxKWU+IPqMCzQAXOUCKdA4UDMgacKH25XG2Cw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5442,8 +4896,6 @@
     },
     "node_modules/is-windows": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5452,14 +4904,11 @@
     },
     "node_modules/isexe": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/istanbul-lib-coverage": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
-      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
@@ -5468,8 +4917,6 @@
     },
     "node_modules/istanbul-lib-report": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
-      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -5483,8 +4930,6 @@
     },
     "node_modules/istanbul-reports": {
       "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz",
-      "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -5497,21 +4942,17 @@
     },
     "node_modules/js-levenshtein": {
       "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
-      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/js-tokens": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+      "license": "MIT"
     },
     "node_modules/js-yaml": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
-      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5523,8 +4964,6 @@
     },
     "node_modules/jsdom": {
       "version": "27.2.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-27.2.0.tgz",
-      "integrity": "sha512-454TI39PeRDW1LgpyLPyURtB4Zx1tklSr6+OFOipsxGUH1WMTvk6C65JQdrj455+DP2uJ1+veBEHTGFKWVLFoA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5563,8 +5002,6 @@
     },
     "node_modules/jsdom/node_modules/tr46": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-6.0.0.tgz",
-      "integrity": "sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5576,8 +5013,6 @@
     },
     "node_modules/jsdom/node_modules/webidl-conversions": {
       "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-8.0.1.tgz",
-      "integrity": "sha512-BMhLD/Sw+GbJC21C/UgyaZX41nPt8bUTg+jWyDeg7e7YN4xOM05YPSIXceACnXVtqyEw/LMClUQMtMZ+PGGpqQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
@@ -5586,8 +5021,6 @@
     },
     "node_modules/jsdom/node_modules/whatwg-url": {
       "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-15.1.0.tgz",
-      "integrity": "sha512-2ytDk0kiEj/yu90JOAp44PVPUkO9+jVhyf+SybKlRHSDlvOOZhdPIrr7xTH64l4WixO2cP+wQIcgujkGBPPz6g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5600,8 +5033,6 @@
     },
     "node_modules/jsdom/node_modules/ws": {
       "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.0.tgz",
-      "integrity": "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5622,8 +5053,6 @@
     },
     "node_modules/jsesc": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
-      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -5635,16 +5064,13 @@
     },
     "node_modules/json-pointer": {
       "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/json-pointer/-/json-pointer-0.6.2.tgz",
-      "integrity": "sha512-vLWcKbOaXlO+jvRy4qNd+TI1QUPZzfJj1tpJ3vAXDych5XJf93ftpUKe5pKCrzyIIwgBJcOcCVRUfqQP25afBw==",
+      "license": "MIT",
       "dependencies": {
         "foreach": "^2.0.4"
       }
     },
     "node_modules/json-schema-to-ts": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/json-schema-to-ts/-/json-schema-to-ts-3.1.1.tgz",
-      "integrity": "sha512-+DWg8jCJG2TEnpy7kOm/7/AxaYoaRbjVB4LFZLySZlWn8exGs3A4OLJR966cVvU26N7X9TWxl+Jsw7dzAqKT6g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5657,13 +5083,10 @@
     },
     "node_modules/json-schema-traverse": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+      "license": "MIT"
     },
     "node_modules/json-server": {
       "version": "1.0.0-beta.3",
-      "resolved": "https://registry.npmjs.org/json-server/-/json-server-1.0.0-beta.3.tgz",
-      "integrity": "sha512-DwE69Ep5ccwIJZBUIWEENC30Yj8bwr4Ax9W9VoIWAYnB8Sj4ReptscO8/DRHv/nXwVlmb3Bk73Ls86+VZdYkkA==",
       "dev": true,
       "license": "SEE LICENSE IN ./LICENSE",
       "dependencies": {
@@ -5690,8 +5113,6 @@
     },
     "node_modules/json-server/node_modules/chalk": {
       "version": "5.6.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
-      "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5703,9 +5124,8 @@
     },
     "node_modules/json5": {
       "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -5715,8 +5135,6 @@
     },
     "node_modules/jsonfile": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
       "dev": true,
       "license": "MIT",
       "optionalDependencies": {
@@ -5725,8 +5143,6 @@
     },
     "node_modules/jsonpath-rfc9535": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/jsonpath-rfc9535/-/jsonpath-rfc9535-1.3.0.tgz",
-      "integrity": "sha512-3jFHya7oZ45aDxIIdx+/zQARahHXxFSMWBkcBUldfXpLS9VCXDJyTKt35kQfEXLqh0K3Ixw/9xFnvcDStaxh7Q==",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=20"
@@ -5734,8 +5150,6 @@
     },
     "node_modules/jsonpointer": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz",
-      "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -5743,16 +5157,13 @@
     },
     "node_modules/leven": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/lightningcss": {
       "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz",
-      "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==",
       "dev": true,
       "license": "MPL-2.0",
       "dependencies": {
@@ -5823,8 +5234,6 @@
     },
     "node_modules/lightningcss-darwin-x64": {
       "version": "1.32.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz",
-      "integrity": "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==",
       "cpu": [
         "x64"
       ],
@@ -5892,6 +5301,9 @@
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -5913,6 +5325,9 @@
         "arm64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -5934,6 +5349,9 @@
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "glibc"
+      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -5955,6 +5373,9 @@
         "x64"
       ],
       "dev": true,
+      "libc": [
+        "musl"
+      ],
       "license": "MPL-2.0",
       "optional": true,
       "os": [
@@ -6012,8 +5433,6 @@
     },
     "node_modules/lilconfig": {
       "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
-      "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6025,8 +5444,6 @@
     },
     "node_modules/lint-staged": {
       "version": "15.4.3",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.4.3.tgz",
-      "integrity": "sha512-FoH1vOeouNh1pw+90S+cnuoFwRfUD9ijY2GKy5h7HS3OR7JVir2N2xrsa0+Twc1B7cW72L+88geG5cW4wIhn7g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6053,8 +5470,6 @@
     },
     "node_modules/lint-staged/node_modules/chalk": {
       "version": "5.6.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
-      "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6066,8 +5481,6 @@
     },
     "node_modules/lint-staged/node_modules/commander": {
       "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-13.1.0.tgz",
-      "integrity": "sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6076,8 +5489,6 @@
     },
     "node_modules/lint-staged/node_modules/execa": {
       "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
-      "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6100,8 +5511,6 @@
     },
     "node_modules/lint-staged/node_modules/get-stream": {
       "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz",
-      "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6113,8 +5522,6 @@
     },
     "node_modules/lint-staged/node_modules/human-signals": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
-      "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -6123,8 +5530,6 @@
     },
     "node_modules/lint-staged/node_modules/is-stream": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
-      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6136,8 +5541,6 @@
     },
     "node_modules/lint-staged/node_modules/mimic-fn": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
-      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6149,8 +5552,6 @@
     },
     "node_modules/lint-staged/node_modules/npm-run-path": {
       "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
-      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6165,8 +5566,6 @@
     },
     "node_modules/lint-staged/node_modules/onetime": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
-      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6181,8 +5580,6 @@
     },
     "node_modules/lint-staged/node_modules/path-key": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
-      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6194,8 +5591,6 @@
     },
     "node_modules/lint-staged/node_modules/strip-final-newline": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
-      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6207,8 +5602,6 @@
     },
     "node_modules/listr2": {
       "version": "8.2.5",
-      "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.5.tgz",
-      "integrity": "sha512-iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6225,8 +5618,6 @@
     },
     "node_modules/listr2/node_modules/ansi-regex": {
       "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
-      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6238,8 +5629,6 @@
     },
     "node_modules/listr2/node_modules/ansi-styles": {
       "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
-      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6251,22 +5640,16 @@
     },
     "node_modules/listr2/node_modules/colorette": {
       "version": "2.0.20",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/listr2/node_modules/emoji-regex": {
       "version": "10.6.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
-      "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/listr2/node_modules/string-width": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
-      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6283,8 +5666,6 @@
     },
     "node_modules/listr2/node_modules/strip-ansi": {
       "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
-      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6299,8 +5680,6 @@
     },
     "node_modules/listr2/node_modules/wrap-ansi": {
       "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz",
-      "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6317,8 +5696,6 @@
     },
     "node_modules/locate-path": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6330,15 +5707,11 @@
     },
     "node_modules/lodash.startcase": {
       "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz",
-      "integrity": "sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/log-update": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-6.1.0.tgz",
-      "integrity": "sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6357,8 +5730,6 @@
     },
     "node_modules/log-update/node_modules/ansi-escapes": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-7.0.0.tgz",
-      "integrity": "sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6373,8 +5744,6 @@
     },
     "node_modules/log-update/node_modules/ansi-regex": {
       "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
-      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6386,8 +5755,6 @@
     },
     "node_modules/log-update/node_modules/ansi-styles": {
       "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
-      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6399,15 +5766,11 @@
     },
     "node_modules/log-update/node_modules/emoji-regex": {
       "version": "10.6.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz",
-      "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/log-update/node_modules/is-fullwidth-code-point": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-5.1.0.tgz",
-      "integrity": "sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6422,8 +5785,6 @@
     },
     "node_modules/log-update/node_modules/slice-ansi": {
       "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-7.1.2.tgz",
-      "integrity": "sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6439,8 +5800,6 @@
     },
     "node_modules/log-update/node_modules/string-width": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
-      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6457,8 +5816,6 @@
     },
     "node_modules/log-update/node_modules/strip-ansi": {
       "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
-      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6473,8 +5830,6 @@
     },
     "node_modules/log-update/node_modules/wrap-ansi": {
       "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz",
-      "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6491,9 +5846,8 @@
     },
     "node_modules/longest-streak": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz",
-      "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
@@ -6501,8 +5855,6 @@
     },
     "node_modules/loose-envify": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6514,8 +5866,6 @@
     },
     "node_modules/lowdb": {
       "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/lowdb/-/lowdb-7.0.1.tgz",
-      "integrity": "sha512-neJAj8GwF0e8EpycYIDFqEPcx9Qz4GUho20jWFR7YiFeXzF1YMLdxB36PypcTSPMA+4+LvgyMacYhlr18Zlymw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6530,8 +5880,6 @@
     },
     "node_modules/lru-cache": {
       "version": "11.2.4",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.4.tgz",
-      "integrity": "sha512-B5Y16Jr9LB9dHVkh6ZevG+vAbOsNOYCX+sXvFWFu7B3Iz5mijW3zdbMyhsh8ANd2mSWBYdJgnqi+mL7/LrOPYg==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "engines": {
@@ -6540,15 +5888,11 @@
     },
     "node_modules/lunr": {
       "version": "2.3.9",
-      "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz",
-      "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/lz-string": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
-      "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -6558,8 +5902,6 @@
     },
     "node_modules/magic-string": {
       "version": "0.30.21",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
-      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6568,8 +5910,6 @@
     },
     "node_modules/magicast": {
       "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.5.3.tgz",
-      "integrity": "sha512-pVKE4UdSQ7DvHzivsCIFx2BJn1mHG6KsyrFcaxFx6tONdneEuThrDx0Cj3AMg58KyN4pzYT+LHOotxDQDjNvkw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6580,8 +5920,6 @@
     },
     "node_modules/make-dir": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6596,23 +5934,18 @@
     },
     "node_modules/make-error": {
       "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/mark.js": {
       "version": "8.11.1",
-      "resolved": "https://registry.npmjs.org/mark.js/-/mark.js-8.11.1.tgz",
-      "integrity": "sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/markdown-table": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz",
-      "integrity": "sha512-Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "repeat-string": "^1.0.0"
       },
@@ -6623,8 +5956,6 @@
     },
     "node_modules/marked": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz",
-      "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -6636,9 +5967,8 @@
     },
     "node_modules/mdast-util-find-and-replace": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-1.1.1.tgz",
-      "integrity": "sha512-9cKl33Y21lyckGzpSmEQnIDjEfeeWelN5s1kUW1LwdB0Fkuq2u+4GdqcGEygYxJE8GVqCl0741bYXHgamfWAZA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^4.0.0",
         "unist-util-is": "^4.0.0",
@@ -6651,9 +5981,8 @@
     },
     "node_modules/mdast-util-from-markdown": {
       "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz",
-      "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/mdast": "^3.0.0",
         "mdast-util-to-string": "^2.0.0",
@@ -6668,9 +5997,8 @@
     },
     "node_modules/mdast-util-gfm": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm/-/mdast-util-gfm-0.1.2.tgz",
-      "integrity": "sha512-NNkhDx/qYcuOWB7xHUGWZYVXvjPFFd6afg6/e2g+SV4r9q5XUcCbV4Wfa3DLYIiD+xAEZc6K4MGaE/m0KDcPwQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mdast-util-gfm-autolink-literal": "^0.1.0",
         "mdast-util-gfm-strikethrough": "^0.2.0",
@@ -6685,9 +6013,8 @@
     },
     "node_modules/mdast-util-gfm-autolink-literal": {
       "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-0.1.3.tgz",
-      "integrity": "sha512-GjmLjWrXg1wqMIO9+ZsRik/s7PLwTaeCHVB7vRxUwLntZc8mzmTsLVr6HW1yLokcnhfURsn5zmSVdi3/xWWu1A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ccount": "^1.0.0",
         "mdast-util-find-and-replace": "^1.1.0",
@@ -6700,9 +6027,8 @@
     },
     "node_modules/mdast-util-gfm-strikethrough": {
       "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-0.2.3.tgz",
-      "integrity": "sha512-5OQLXpt6qdbttcDG/UxYY7Yjj3e8P7X16LzvpX8pIQPYJ/C2Z1qFGMmcw+1PZMUM3Z8wt8NRfYTvCni93mgsgA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mdast-util-to-markdown": "^0.6.0"
       },
@@ -6713,9 +6039,8 @@
     },
     "node_modules/mdast-util-gfm-table": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-table/-/mdast-util-gfm-table-0.1.6.tgz",
-      "integrity": "sha512-j4yDxQ66AJSBwGkbpFEp9uG/LS1tZV3P33fN1gkyRB2LoRL+RR3f76m0HPHaby6F4Z5xr9Fv1URmATlRRUIpRQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "markdown-table": "^2.0.0",
         "mdast-util-to-markdown": "~0.6.0"
@@ -6727,9 +6052,8 @@
     },
     "node_modules/mdast-util-gfm-task-list-item": {
       "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-0.1.6.tgz",
-      "integrity": "sha512-/d51FFIfPsSmCIRNp7E6pozM9z1GYPIkSy1urQ8s/o4TC22BZ7DqfHFWiqBD23bc7J3vV1Fc9O4QIHBlfuit8A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mdast-util-to-markdown": "~0.6.0"
       },
@@ -6740,9 +6064,8 @@
     },
     "node_modules/mdast-util-to-markdown": {
       "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz",
-      "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/unist": "^2.0.0",
         "longest-streak": "^2.0.0",
@@ -6758,9 +6081,8 @@
     },
     "node_modules/mdast-util-to-string": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz",
-      "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
@@ -6768,21 +6090,16 @@
     },
     "node_modules/mdn-data": {
       "version": "2.12.2",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.12.2.tgz",
-      "integrity": "sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==",
       "dev": true,
       "license": "CC0-1.0"
     },
     "node_modules/merge-stream": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/merge2": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6791,8 +6108,6 @@
     },
     "node_modules/micromark": {
       "version": "2.11.4",
-      "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz",
-      "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==",
       "dev": true,
       "funding": [
         {
@@ -6804,6 +6119,7 @@
           "url": "https://opencollective.com/unified"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "debug": "^4.0.0",
         "parse-entities": "^2.0.0"
@@ -6811,9 +6127,8 @@
     },
     "node_modules/micromark-extension-gfm": {
       "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm/-/micromark-extension-gfm-0.3.3.tgz",
-      "integrity": "sha512-oVN4zv5/tAIA+l3GbMi7lWeYpJ14oQyJ3uEim20ktYFAcfX1x3LNlFGGlmrZHt7u9YlKExmyJdDGaTt6cMSR/A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "micromark": "~2.11.0",
         "micromark-extension-gfm-autolink-literal": "~0.5.0",
@@ -6829,9 +6144,8 @@
     },
     "node_modules/micromark-extension-gfm-autolink-literal": {
       "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-0.5.7.tgz",
-      "integrity": "sha512-ePiDGH0/lhcngCe8FtH4ARFoxKTUelMp4L7Gg2pujYD5CSMb9PbblnyL+AAMud/SNMyusbS2XDSiPIRcQoNFAw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "micromark": "~2.11.3"
       },
@@ -6842,9 +6156,8 @@
     },
     "node_modules/micromark-extension-gfm-strikethrough": {
       "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-0.6.5.tgz",
-      "integrity": "sha512-PpOKlgokpQRwUesRwWEp+fHjGGkZEejj83k9gU5iXCbDG+XBA92BqnRKYJdfqfkrRcZRgGuPuXb7DaK/DmxOhw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "micromark": "~2.11.0"
       },
@@ -6855,9 +6168,8 @@
     },
     "node_modules/micromark-extension-gfm-table": {
       "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-table/-/micromark-extension-gfm-table-0.4.3.tgz",
-      "integrity": "sha512-hVGvESPq0fk6ALWtomcwmgLvH8ZSVpcPjzi0AjPclB9FsVRgMtGZkUcpE0zgjOCFAznKepF4z3hX8z6e3HODdA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "micromark": "~2.11.0"
       },
@@ -6868,9 +6180,8 @@
     },
     "node_modules/micromark-extension-gfm-tagfilter": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-0.3.0.tgz",
-      "integrity": "sha512-9GU0xBatryXifL//FJH+tAZ6i240xQuFrSL7mYi8f4oZSbc+NvXjkrHemeYP0+L4ZUT+Ptz3b95zhUZnMtoi/Q==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
@@ -6878,9 +6189,8 @@
     },
     "node_modules/micromark-extension-gfm-task-list-item": {
       "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-0.3.3.tgz",
-      "integrity": "sha512-0zvM5iSLKrc/NQl84pZSjGo66aTGd57C1idmlWmE87lkMcXrTxg1uXa/nXomxJytoje9trP0NDLvw4bZ/Z/XCQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "micromark": "~2.11.0"
       },
@@ -6891,9 +6201,8 @@
     },
     "node_modules/micromatch": {
       "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
         "picomatch": "^2.3.1"
@@ -6904,8 +6213,6 @@
     },
     "node_modules/milliparsec": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/milliparsec/-/milliparsec-4.0.0.tgz",
-      "integrity": "sha512-/wk9d4Z6/9ZvoEH/6BI4TrTCgmkpZPuSRN/6fI9aUHOfXdNTuj/VhLS7d+NqG26bi6L9YmGXutVYvWC8zQ0qtA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6914,8 +6221,6 @@
     },
     "node_modules/mime": {
       "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-4.0.4.tgz",
-      "integrity": "sha512-v8yqInVjhXyqP6+Kw4fV3ZzeMRqEW6FotRsKXjRS5VMTNIuXsdRoAvklpoRgSqXm6o9VNH4/C0mgedko9DdLsQ==",
       "dev": true,
       "funding": [
         "https://github.com/sponsors/broofa"
@@ -6930,8 +6235,6 @@
     },
     "node_modules/mimic-function": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz",
-      "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6943,8 +6246,6 @@
     },
     "node_modules/minimatch": {
       "version": "10.2.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.4.tgz",
-      "integrity": "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==",
       "dev": true,
       "license": "BlueOak-1.0.0",
       "dependencies": {
@@ -6959,8 +6260,6 @@
     },
     "node_modules/minimatch/node_modules/balanced-match": {
       "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.3.tgz",
-      "integrity": "sha512-1pHv8LX9CpKut1Zp4EXey7Z8OfH11ONNH6Dhi2WDUt31VVZFXZzKwXcysBgqSumFCmR+0dqjMK5v5JiFHzi0+g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6969,8 +6268,6 @@
     },
     "node_modules/minimatch/node_modules/brace-expansion": {
       "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz",
-      "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6982,14 +6279,11 @@
     },
     "node_modules/minimist": {
       "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/minipass": {
       "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -6998,9 +6292,8 @@
     },
     "node_modules/mobx": {
       "version": "6.12.3",
-      "resolved": "https://registry.npmjs.org/mobx/-/mobx-6.12.3.tgz",
-      "integrity": "sha512-c8NKkO4R2lShkSXZ2Ongj1ycjugjzFFo/UswHBnS62y07DMcTc9Rvo03/3nRyszIvwPNljlkd4S828zIBv/piw==",
       "dev": true,
+      "license": "MIT",
       "peer": true,
       "funding": {
         "type": "opencollective",
@@ -7009,8 +6302,6 @@
     },
     "node_modules/mobx-react": {
       "version": "9.2.0",
-      "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-9.2.0.tgz",
-      "integrity": "sha512-dkGWCx+S0/1mfiuFfHRH8D9cplmwhxOV5CkXMp38u6rQGG2Pv3FWYztS0M7ncR6TyPRQKaTG/pnitInoYE9Vrw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7035,8 +6326,6 @@
     },
     "node_modules/mobx-react-lite": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-4.1.1.tgz",
-      "integrity": "sha512-iUxiMpsvNraCKXU+yPotsOncNNmyeS2B5DKL+TL6Tar/xm+wwNJAubJmtRSeAoYawdZqwv8Z/+5nPRHeQxTiXg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7061,17 +6350,14 @@
     },
     "node_modules/mri": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
-      "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/mrmime": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz",
-      "integrity": "sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7080,15 +6366,11 @@
     },
     "node_modules/ms": {
       "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/msw": {
       "version": "2.14.6",
-      "resolved": "https://registry.npmjs.org/msw/-/msw-2.14.6.tgz",
-      "integrity": "sha512-ALe+N10S72cyx94cMcy3Zs4HhXCj35sgeAL4c+WTvKi0zWnbd8/h0lcFqv0mb2P+aSgAdD7p9HzvA0DiUPxsyg==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -7132,8 +6414,6 @@
     },
     "node_modules/msw/node_modules/cliui": {
       "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -7147,8 +6427,6 @@
     },
     "node_modules/msw/node_modules/cookie": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.1.1.tgz",
-      "integrity": "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7161,8 +6439,6 @@
     },
     "node_modules/msw/node_modules/type-fest": {
       "version": "5.7.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-5.7.0.tgz",
-      "integrity": "sha512-1URUxUqfHFM1c+zfSPsa3gnkO7Aq21qyH75SIduNYz4SzY964rn1X2vCMQaHSHhktiw+0kPa2iyb6PUpXqB6Vg==",
       "dev": true,
       "license": "(MIT OR CC0-1.0)",
       "dependencies": {
@@ -7177,8 +6453,6 @@
     },
     "node_modules/msw/node_modules/yargs": {
       "version": "17.7.3",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.3.tgz",
-      "integrity": "sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7196,8 +6470,6 @@
     },
     "node_modules/msw/node_modules/yargs-parser": {
       "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -7206,8 +6478,6 @@
     },
     "node_modules/mute-stream": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-3.0.0.tgz",
-      "integrity": "sha512-dkEJPVvun4FryqBmZ5KhDo0K9iDXAwn08tMLDinNdRBNPcYEDiWYysLcc6k3mjTMlbP9KyylvRpd4wFtwrT9rw==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -7216,8 +6486,6 @@
     },
     "node_modules/nanoid": {
       "version": "3.3.12",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz",
-      "integrity": "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==",
       "dev": true,
       "funding": [
         {
@@ -7235,8 +6503,6 @@
     },
     "node_modules/negotiator": {
       "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
-      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7245,14 +6511,11 @@
     },
     "node_modules/neo-async": {
       "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/node-fetch": {
       "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7272,8 +6535,6 @@
     },
     "node_modules/node-fetch-h2": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/node-fetch-h2/-/node-fetch-h2-2.3.0.tgz",
-      "integrity": "sha512-ofRW94Ab0T4AOh5Fk8t0h8OBWrmjb0SSB20xh1H8YnPV9EJ+f5AMoYSUQ2zgJ4Iq2HAK0I2l5/Nequ8YzFS3Hg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7285,8 +6546,6 @@
     },
     "node_modules/node-readfiles": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/node-readfiles/-/node-readfiles-0.2.0.tgz",
-      "integrity": "sha512-SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7295,8 +6554,6 @@
     },
     "node_modules/node-releases": {
       "version": "2.0.47",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.47.tgz",
-      "integrity": "sha512-Uzmd6LXpouKo8EUK68IjH4+E01w/hXyV3R3g/geCJo+rXLNfh1xucB+LOzYEOQPSiUK3h/xZf0cQGcSsmyL2Og==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7305,8 +6562,6 @@
     },
     "node_modules/oas-kit-common": {
       "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/oas-kit-common/-/oas-kit-common-1.0.8.tgz",
-      "integrity": "sha512-pJTS2+T0oGIwgjGpw7sIRU8RQMcUoKCDWFLdBqKB2BNmGpbBMH2sdqAaOXUg8OzonZHU0L7vfJu1mJFEiYDWOQ==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -7315,8 +6570,6 @@
     },
     "node_modules/oas-linter": {
       "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/oas-linter/-/oas-linter-3.2.2.tgz",
-      "integrity": "sha512-KEGjPDVoU5K6swgo9hJVA/qYGlwfbFx+Kg2QB/kd7rzV5N8N5Mg6PlsoCMohVnQmo+pzJap/F610qTodKzecGQ==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -7330,8 +6583,6 @@
     },
     "node_modules/oas-linter/node_modules/yaml": {
       "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.3.tgz",
-      "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -7340,8 +6591,6 @@
     },
     "node_modules/oas-resolver": {
       "version": "2.5.6",
-      "resolved": "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.5.6.tgz",
-      "integrity": "sha512-Yx5PWQNZomfEhPPOphFbZKi9W93CocQj18NlD2Pa4GWZzdZpSJvYwoiuurRI7m3SpcChrnO08hkuQDL3FGsVFQ==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -7360,8 +6609,6 @@
     },
     "node_modules/oas-resolver/node_modules/yaml": {
       "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.3.tgz",
-      "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -7370,8 +6617,6 @@
     },
     "node_modules/oas-schema-walker": {
       "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/oas-schema-walker/-/oas-schema-walker-1.1.5.tgz",
-      "integrity": "sha512-2yucenq1a9YPmeNExoUa9Qwrt9RFkjqaMAA1X+U7sbb0AqBeTIdMHky9SQQ6iN94bO5NW0W4TRYXerG+BdAvAQ==",
       "dev": true,
       "license": "BSD-3-Clause",
       "funding": {
@@ -7380,8 +6625,6 @@
     },
     "node_modules/oas-validator": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/oas-validator/-/oas-validator-5.0.8.tgz",
-      "integrity": "sha512-cu20/HE5N5HKqVygs3dt94eYJfBi0TsZvPVXDhbXQHiEityDN+RROTleefoKRKKJ9dFAF2JBkDHgvWj0sjKGmw==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -7400,8 +6643,6 @@
     },
     "node_modules/oas-validator/node_modules/yaml": {
       "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.3.tgz",
-      "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -7410,8 +6651,6 @@
     },
     "node_modules/object-assign": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7420,8 +6659,6 @@
     },
     "node_modules/obug": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.1.tgz",
-      "integrity": "sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==",
       "dev": true,
       "funding": [
         "https://github.com/sponsors/sxzz",
@@ -7431,8 +6668,6 @@
     },
     "node_modules/onetime": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-7.0.0.tgz",
-      "integrity": "sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7447,8 +6682,6 @@
     },
     "node_modules/openapi-sampler": {
       "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.7.4.tgz",
-      "integrity": "sha512-CKS/rd5ucPCuEDbJnjGDXZTsuGWcmv53aCmQx7soZlPEONUGN4af0/dY5+THRFZraSEjeA78nlfzdFswC/N5SA==",
       "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.7",
@@ -7458,21 +6691,16 @@
     },
     "node_modules/outdent": {
       "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/outdent/-/outdent-0.7.1.tgz",
-      "integrity": "sha512-VjIzdUHunL74DdhcwMDt5FhNDQ8NYmTkuW0B+usIV2afS9aWT/1c9z1TsnFW349TP3nxmYeUl7Z++XpJRByvgg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/outvariant": {
       "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/outvariant/-/outvariant-1.4.3.tgz",
-      "integrity": "sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/oxfmt": {
       "version": "0.33.0",
-      "resolved": "https://registry.npmjs.org/oxfmt/-/oxfmt-0.33.0.tgz",
-      "integrity": "sha512-ogxBXA9R4BFeo8F1HeMIIxHr5kGnQwKTYZ5k131AEGOq1zLxInNhvYSpyRQ+xIXVMYfCN7yZHKff/lb5lp4auQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7511,8 +6739,6 @@
     },
     "node_modules/oxfmt/node_modules/tinypool": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-2.1.0.tgz",
-      "integrity": "sha512-Pugqs6M0m7Lv1I7FtxN4aoyToKg1C4tu+/381vH35y8oENM/Ai7f7C4StcoK4/+BSw9ebcS8jRiVrORFKCALLw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7521,8 +6747,6 @@
     },
     "node_modules/oxlint": {
       "version": "1.48.0",
-      "resolved": "https://registry.npmjs.org/oxlint/-/oxlint-1.48.0.tgz",
-      "integrity": "sha512-m5vyVBgPtPhVCJc3xI//8je9lRc8bYuYB4R/1PH3VPGOjA4vjVhkHtyJukdEjYEjwrw4Qf1eIf+pP9xvfhfMow==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -7566,8 +6790,6 @@
     },
     "node_modules/p-filter": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-filter/-/p-filter-2.1.0.tgz",
-      "integrity": "sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7579,8 +6801,6 @@
     },
     "node_modules/p-limit": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7595,8 +6815,6 @@
     },
     "node_modules/p-locate": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7608,8 +6826,6 @@
     },
     "node_modules/p-map": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7618,8 +6834,6 @@
     },
     "node_modules/p-try": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7628,15 +6842,13 @@
     },
     "node_modules/package-manager-detector": {
       "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-0.2.7.tgz",
-      "integrity": "sha512-g4+387DXDKlZzHkP+9FLt8yKj8+/3tOkPv7DVTJGGRm00RkEWgqbFstX1mXJ4M0VDYhUqsTOiISqNOJnhAu3PQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/parse-entities": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
-      "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "character-entities": "^1.0.0",
         "character-entities-legacy": "^1.0.0",
@@ -7652,8 +6864,6 @@
     },
     "node_modules/parse5": {
       "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-8.0.0.tgz",
-      "integrity": "sha512-9m4m5GSgXjL4AjumKzq1Fgfp3Z8rsvjRNbnkVwfu2ImRqE5D0LnY2QfDen18FSY9C573YU5XxSapdHZTZ2WolA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7665,15 +6875,11 @@
     },
     "node_modules/path-browserify": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
-      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/path-exists": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7682,8 +6888,6 @@
     },
     "node_modules/path-expression-matcher": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.5.0.tgz",
-      "integrity": "sha512-cbrerZV+6rvdQrrD+iGMcZFEiiSrbv9Tfdkvnusy6y0x0GKBXREFg/Y65GhIfm0tnLntThhzCnfKwp1WRjeCyQ==",
       "funding": [
         {
           "type": "github",
@@ -7697,24 +6901,19 @@
     },
     "node_modules/path-key": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/path-to-regexp": {
       "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
-      "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/path-type": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7723,15 +6922,11 @@
     },
     "node_modules/pathe": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
-      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/pegjs": {
       "version": "0.11.0-master.b7b87ea",
-      "resolved": "https://registry.npmjs.org/pegjs/-/pegjs-0.11.0-master.b7b87ea.tgz",
-      "integrity": "sha512-fwjzNiYHRUEUe/86Aaslb/ocbbsAupOcsJz+dlPYtgp3feCDRQOLChHO924XGh7fzSJBTdFCQTzmSOQaWjCTew==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -7743,20 +6938,15 @@
     },
     "node_modules/perfect-scrollbar": {
       "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.6.tgz",
-      "integrity": "sha512-rixgxw3SxyJbCaSpo1n35A/fwI1r2rdwMKOTCg/AcG+xOEyZcE8UHVjpZMFCVImzsFoCZeJTT+M/rdEIQYO2nw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/picocolors": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
+      "license": "ISC"
     },
     "node_modules/picomatch": {
       "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz",
-      "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7768,8 +6958,6 @@
     },
     "node_modules/pidtree": {
       "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/pidtree/-/pidtree-0.6.0.tgz",
-      "integrity": "sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -7781,8 +6969,6 @@
     },
     "node_modules/pify": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7791,16 +6977,13 @@
     },
     "node_modules/pluralize": {
       "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz",
-      "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/polished": {
       "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/polished/-/polished-4.3.1.tgz",
-      "integrity": "sha512-OBatVyC/N7SCW/FaDHrSd+vn0o5cS855TOmYi4OkdWUMSJCET/xip//ch8xGUvtr3i44X9LVyWwQlRMTN3pwSA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7812,8 +6995,6 @@
     },
     "node_modules/postcss": {
       "version": "8.5.15",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.15.tgz",
-      "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==",
       "dev": true,
       "funding": [
         {
@@ -7841,16 +7022,13 @@
     },
     "node_modules/postcss-value-parser": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/prettier": {
       "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
-      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "prettier": "bin-prettier.js"
       },
@@ -7863,8 +7041,6 @@
     },
     "node_modules/pretty-format": {
       "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz",
-      "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -7879,8 +7055,6 @@
     },
     "node_modules/pretty-format/node_modules/ansi-styles": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
       "license": "MIT",
       "peer": true,
@@ -7893,16 +7067,12 @@
     },
     "node_modules/pretty-format/node_modules/react-is": {
       "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
       "dev": true,
       "license": "MIT",
       "peer": true
     },
     "node_modules/prismjs": {
       "version": "1.30.0",
-      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.30.0.tgz",
-      "integrity": "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7911,8 +7081,6 @@
     },
     "node_modules/prop-types": {
       "version": "15.8.1",
-      "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7923,8 +7091,6 @@
     },
     "node_modules/punycode": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7933,8 +7099,6 @@
     },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true,
       "funding": [
         {
@@ -7949,12 +7113,11 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/react": {
       "version": "19.2.7",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.2.7.tgz",
-      "integrity": "sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7963,8 +7126,6 @@
     },
     "node_modules/react-dom": {
       "version": "19.2.7",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.7.tgz",
-      "integrity": "sha512-t0BRVXvbiE/o20Hfw669rLbMCDWtYZLvmJigy2f0MxsXF+71pxhR3xOkspmsO8h3ZlNzyibAmtCa3l4lYKk6gQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7976,15 +7137,11 @@
     },
     "node_modules/react-is": {
       "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/react-tabs": {
       "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/react-tabs/-/react-tabs-6.1.1.tgz",
-      "integrity": "sha512-CPiuKoMFf89B7QlbFfdBD9XmUWiE3qudQputMVZB8GQvPJZRX/gqjDaDWOPDwGinEfpJKEuBCkGt83Tt4efeyA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -7997,8 +7154,6 @@
     },
     "node_modules/read-yaml-file": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-yaml-file/-/read-yaml-file-1.1.0.tgz",
-      "integrity": "sha512-VIMnQi/Z4HT2Fxuwg5KrY174U1VdUIASQVWXXyqtNRtxSr9IYkn1rsI6Tb6HsrHCmB7gVpNwX6JxPTHcH6IoTA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8013,8 +7168,6 @@
     },
     "node_modules/read-yaml-file/node_modules/argparse": {
       "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8023,8 +7176,6 @@
     },
     "node_modules/read-yaml-file/node_modules/js-yaml": {
       "version": "3.14.2",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
-      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8037,8 +7188,6 @@
     },
     "node_modules/readdirp": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8051,8 +7200,6 @@
     },
     "node_modules/redoc": {
       "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/redoc/-/redoc-2.5.3.tgz",
-      "integrity": "sha512-bBbat+Sx6xKWdyoCGTtA0BWeTEW9Vs4VnEja7q7ZLOk4IM7cHQLrf+kDxWF6dKeKxT8kOBnoy/OsNXCeLttpyQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8092,8 +7239,6 @@
     },
     "node_modules/redoc/node_modules/@redocly/ajv": {
       "version": "8.11.2",
-      "resolved": "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.11.2.tgz",
-      "integrity": "sha512-io1JpnwtIcvojV7QKDUSIuMN/ikdOUd1ReEnUnMKGfDVridQZ31J0MmIuqwuRjWDZfmvr+Q0MqCcfHM2gTivOg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8109,15 +7254,11 @@
     },
     "node_modules/redoc/node_modules/@redocly/config": {
       "version": "0.22.0",
-      "resolved": "https://registry.npmjs.org/@redocly/config/-/config-0.22.0.tgz",
-      "integrity": "sha512-gAy93Ddo01Z3bHuVdPWfCwzgfaYgMdaZPcfL7JZ7hWJoK9V0lXDbigTWkhiPFAaLWzbOJ+kbUQG1+XwIm0KRGQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/redoc/node_modules/@redocly/openapi-core": {
       "version": "1.34.15",
-      "resolved": "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.34.15.tgz",
-      "integrity": "sha512-HAwCnNyKcs5XGQqms+9t7OdAPM/5TDstmhF+0i7tdCFato2QKuYIlyWETwkXd8c5zbltr1oB+6y9NTeQLr2d6Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8138,8 +7279,6 @@
     },
     "node_modules/redoc/node_modules/minimatch": {
       "version": "5.1.9",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz",
-      "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -8151,8 +7290,6 @@
     },
     "node_modules/reftools": {
       "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/reftools/-/reftools-1.1.9.tgz",
-      "integrity": "sha512-OVede/NQE13xBQ+ob5CKd5KyeJYU2YInb1bmV4nRoOfquZPkAkxuOXicSe1PvqIuZZ4kD13sPKBbR7UFDmli6w==",
       "dev": true,
       "license": "BSD-3-Clause",
       "funding": {
@@ -8161,8 +7298,6 @@
     },
     "node_modules/regexparam": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/regexparam/-/regexparam-2.0.2.tgz",
-      "integrity": "sha512-A1PeDEYMrkLrfyOwv2jwihXbo9qxdGD3atBYQA9JJgreAx8/7rC6IUkWOw2NQlOxLp2wL0ifQbh1HuidDfYA6w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8171,9 +7306,8 @@
     },
     "node_modules/remark-gfm": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/remark-gfm/-/remark-gfm-1.0.0.tgz",
-      "integrity": "sha512-KfexHJCiqvrdBZVbQ6RopMZGwaXz6wFJEfByIuEwGf0arvITHjiKKZ1dpXujjH9KZdm1//XJQwgfnJ3lmXaDPA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mdast-util-gfm": "^0.1.0",
         "micromark-extension-gfm": "^0.3.0"
@@ -8185,9 +7319,8 @@
     },
     "node_modules/remark-parse": {
       "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz",
-      "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mdast-util-from-markdown": "^0.8.0"
       },
@@ -8198,9 +7331,8 @@
     },
     "node_modules/remark-stringify": {
       "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz",
-      "integrity": "sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mdast-util-to-markdown": "^0.6.0"
       },
@@ -8211,34 +7343,29 @@
     },
     "node_modules/repeat-string": {
       "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10"
       }
     },
     "node_modules/require-directory": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/require-from-string": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/resolve-from": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8247,8 +7374,6 @@
     },
     "node_modules/restore-cursor": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-5.1.0.tgz",
-      "integrity": "sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8264,15 +7389,11 @@
     },
     "node_modules/rettime": {
       "version": "0.11.11",
-      "resolved": "https://registry.npmjs.org/rettime/-/rettime-0.11.11.tgz",
-      "integrity": "sha512-ILJRqVWBCTlg9r42fFgwVZx1gnFAcQF8mRoMkbgQfIrjEDf9nbBFDFx00oloOa+Q869FUtaYDXZvEfnecQSCoQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/reusify": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
-      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8282,15 +7403,11 @@
     },
     "node_modules/rfdc": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
-      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/rolldown": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.3.tgz",
-      "integrity": "sha512-i00lAJ2ks1BYr7rjNjKC7BcqAS7nVfiT3QX1SI5aY+AFHblCmaUf9OE9dbdzDvW6dJxbi2ZCZiy9v3CcwOiX3g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8323,8 +7440,6 @@
     },
     "node_modules/run-parallel": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
       "dev": true,
       "funding": [
         {
@@ -8347,14 +7462,11 @@
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/saxes": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
-      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -8366,15 +7478,11 @@
     },
     "node_modules/scheduler": {
       "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz",
-      "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/semver": {
       "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
-      "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -8386,16 +7494,13 @@
     },
     "node_modules/set-cookie-parser": {
       "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
-      "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/shebang-command": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -8405,17 +7510,14 @@
     },
     "node_modules/shebang-regex": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/should": {
       "version": "13.2.3",
-      "resolved": "https://registry.npmjs.org/should/-/should-13.2.3.tgz",
-      "integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8428,8 +7530,6 @@
     },
     "node_modules/should-equal": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz",
-      "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8438,8 +7538,6 @@
     },
     "node_modules/should-format": {
       "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz",
-      "integrity": "sha512-hZ58adtulAk0gKtua7QxevgUaXTTXxIi8t41L3zo9AHvjXO1/7sdLECuHeIN2SRtYXpNkmhoUP2pdeWgricQ+Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8449,15 +7547,11 @@
     },
     "node_modules/should-type": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz",
-      "integrity": "sha512-MdAsTu3n25yDbIe1NeN69G4n6mUnJGtSJHygX3+oN0ZbO3DTiATnf7XnYJdGT42JCXurTb1JI0qOBR65shvhPQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/should-type-adaptors": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz",
-      "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8467,22 +7561,16 @@
     },
     "node_modules/should-util": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.1.tgz",
-      "integrity": "sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/siginfo": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
-      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/signal-exit": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -8494,8 +7582,6 @@
     },
     "node_modules/sirv": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz",
-      "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8509,9 +7595,8 @@
     },
     "node_modules/slackify-markdown": {
       "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/slackify-markdown/-/slackify-markdown-4.3.1.tgz",
-      "integrity": "sha512-6Uktkq4rEB6JZlRguI/dpPDF6Rak6QXZm3Gv2IM0VMeYQRSufp+TLFfOylxwINnOeMRc9ciYRhsbt1hUFD+uuQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mdast-util-to-markdown": "^0.6.2",
         "remark-gfm": "^1.0.0",
@@ -8524,8 +7609,6 @@
     },
     "node_modules/slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8534,8 +7617,6 @@
     },
     "node_modules/slice-ansi": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz",
-      "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8551,8 +7632,6 @@
     },
     "node_modules/slice-ansi/node_modules/ansi-styles": {
       "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
-      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8564,8 +7643,6 @@
     },
     "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz",
-      "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8577,8 +7654,6 @@
     },
     "node_modules/slugify": {
       "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.4.7.tgz",
-      "integrity": "sha512-tf+h5W1IrjNm/9rKKj0JU2MDMruiopx0jjVA5zCdBtcGjfp0+c5rHw/zADLC3IeKlGHtVbHtpfzvYA0OYT+HKg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8587,8 +7662,6 @@
     },
     "node_modules/sort-on": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/sort-on/-/sort-on-6.1.0.tgz",
-      "integrity": "sha512-WTECP0nYNWO1n2g5bpsV0yZN9cBmZsF8ThHFbOqVN0HBFRoaQZLLEMvMmJlKHNPYQeVngeI5+jJzIfFqOIo1OA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8603,17 +7676,14 @@
     },
     "node_modules/source-map": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/source-map-js": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
       "dev": true,
       "license": "BSD-3-Clause",
       "engines": {
@@ -8622,8 +7692,6 @@
     },
     "node_modules/spawndamnit": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spawndamnit/-/spawndamnit-3.0.1.tgz",
-      "integrity": "sha512-MmnduQUuHCoFckZoWnXsTg7JaiLBJrKFj9UI2MbRPGaJeVpsLcVBu6P/IGZovziM/YBsellCmsprgNA+w0CzVg==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
@@ -8633,22 +7701,16 @@
     },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
       "dev": true,
       "license": "BSD-3-Clause"
     },
     "node_modules/stackback": {
       "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
-      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/statuses": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
-      "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8657,15 +7719,11 @@
     },
     "node_modules/std-env": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.1.0.tgz",
-      "integrity": "sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/steno": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/steno/-/steno-4.0.2.tgz",
-      "integrity": "sha512-yhPIQXjrlt1xv7dyPQg2P17URmXbuM5pdGkpiMB3RenprfiBlvK415Lctfe0eshk90oA7/tNq7WEiMK8RSP39A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8677,21 +7735,15 @@
     },
     "node_modules/stickyfill": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stickyfill/-/stickyfill-1.1.1.tgz",
-      "integrity": "sha512-GCp7vHAfpao+Qh/3Flh9DXEJ/qSi0KJwJw6zYlZOtRYXWUIpMM6mC2rIep/dK8RQqwW0KxGJIllmjPIBOGN8AA==",
       "dev": true
     },
     "node_modules/strict-event-emitter": {
       "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/strict-event-emitter/-/strict-event-emitter-0.5.1.tgz",
-      "integrity": "sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/string-argv": {
       "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.2.tgz",
-      "integrity": "sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8700,9 +7752,8 @@
     },
     "node_modules/string-width": {
       "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -8714,9 +7765,8 @@
     },
     "node_modules/strip-ansi": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -8726,8 +7776,6 @@
     },
     "node_modules/strip-bom": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8736,8 +7784,6 @@
     },
     "node_modules/strnum": {
       "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.3.tgz",
-      "integrity": "sha512-oKx6RUCuHfT3oyVjtnrmn19H1SiCqgJSg+54XqURKp5aCMbrXrhLjRN9TjuwMjiYstZ0MzDrHqkGZ5dFTKd+zg==",
       "funding": [
         {
           "type": "github",
@@ -8748,8 +7794,6 @@
     },
     "node_modules/styled-components": {
       "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.4.2.tgz",
-      "integrity": "sha512-xZBhBJsMtGqb+aKcwKgaT+BtuFums9VynX2JRvXJGTx5UfZzN12rk5r4nVdhXYvRw+hE7yiYxVrOqJZaK2+Txg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8785,15 +7829,12 @@
     },
     "node_modules/stylis": {
       "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.6.tgz",
-      "integrity": "sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -8803,8 +7844,6 @@
     },
     "node_modules/swagger2openapi": {
       "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-7.0.8.tgz",
-      "integrity": "sha512-upi/0ZGkYgEcLeGieoz8gT74oWHA0E7JivX7aN9mAf+Tc7BQoRBvnIGHoPDw+f9TXTW4s6kGYCZJtauP6OYp7g==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -8831,8 +7870,6 @@
     },
     "node_modules/swagger2openapi/node_modules/yaml": {
       "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.3.tgz",
-      "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==",
       "dev": true,
       "license": "ISC",
       "engines": {
@@ -8841,8 +7878,6 @@
     },
     "node_modules/swr": {
       "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/swr/-/swr-2.4.1.tgz",
-      "integrity": "sha512-2CC6CiKQtEwaEeNiqWTAw9PGykW8SR5zZX8MZk6TeAvEAnVS7Visz8WzphqgtQ8v2xz/4Q5K+j+SeMaKXeeQIA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8855,15 +7890,11 @@
     },
     "node_modules/symbol-tree": {
       "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/tagged-tag": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/tagged-tag/-/tagged-tag-1.0.0.tgz",
-      "integrity": "sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8875,9 +7906,8 @@
     },
     "node_modules/term-size": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz",
-      "integrity": "sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -8887,15 +7917,11 @@
     },
     "node_modules/tinybench": {
       "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
-      "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/tinyexec": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.2.4.tgz",
-      "integrity": "sha512-SHf/r48b7vOrjve9PxJo3MN5v5yuyjHvdUcrQffT3WXMUfnGmHDVbC4k3sHJaJTgZCwpUplIaAo5ANtMyp3YHg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8904,8 +7930,6 @@
     },
     "node_modules/tinyglobby": {
       "version": "0.2.17",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz",
-      "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8921,8 +7945,6 @@
     },
     "node_modules/tinyglobby/node_modules/fdir": {
       "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
-      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8939,8 +7961,6 @@
     },
     "node_modules/tinyglobby/node_modules/picomatch": {
       "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
-      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8952,8 +7972,6 @@
     },
     "node_modules/tinyrainbow": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.0.tgz",
-      "integrity": "sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -8962,8 +7980,6 @@
     },
     "node_modules/tldts": {
       "version": "7.0.19",
-      "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.19.tgz",
-      "integrity": "sha512-8PWx8tvC4jDB39BQw1m4x8y5MH1BcQ5xHeL2n7UVFulMPH/3Q0uiamahFJ3lXA0zO2SUyRXuVVbWSDmstlt9YA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8975,16 +7991,13 @@
     },
     "node_modules/tldts-core": {
       "version": "7.0.19",
-      "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.0.19.tgz",
-      "integrity": "sha512-lJX2dEWx0SGH4O6p+7FPwYmJ/bu1JbcGJ8RLaG9b7liIgZ85itUVEPbMtWRVrde/0fnDPEPHW10ZsKW3kVsE9A==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -8994,8 +8007,6 @@
     },
     "node_modules/totalist": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
-      "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9004,8 +8015,6 @@
     },
     "node_modules/tough-cookie": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.1.tgz",
-      "integrity": "sha512-LktZQb3IeoUWB9lqR5EWTHgW/VTITCXg4D21M+lvybRVdylLrRMnqaIONLVb5mav8vM19m44HIcGq4qASeu2Qw==",
       "dev": true,
       "license": "BSD-3-Clause",
       "dependencies": {
@@ -9017,16 +8026,13 @@
     },
     "node_modules/tr46": {
       "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/trough": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
-      "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
@@ -9034,14 +8040,11 @@
     },
     "node_modules/ts-algebra": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ts-algebra/-/ts-algebra-2.0.0.tgz",
-      "integrity": "sha512-FPAhNPFMrkwz76P7cdjdmiShwMynZYN6SgOujD1urY4oNm80Ou9oMdmbR45LotcKOXoy7wSmHkRFE6Mxbrhefw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/ts-node": {
       "version": "10.9.2",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
-      "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9092,8 +8095,6 @@
     },
     "node_modules/tsx": {
       "version": "4.22.4",
-      "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.22.4.tgz",
-      "integrity": "sha512-X8EX+XV4QR5xCsrgxaED954zTDfY8KqlDtskKEL0cHhyS/P8b4IFOvGDQpsC9Q1XnLq915wEfwwY/zzskCtmhg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9111,8 +8112,6 @@
     },
     "node_modules/type-fest": {
       "version": "4.26.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.26.0.tgz",
-      "integrity": "sha512-OduNjVJsFbifKb57UqZ2EMP1i4u64Xwow3NYXUtBbD4vIwJdQd4+xl8YDou1dlm4DVrtwT/7Ky8z8WyCULVfxw==",
       "dev": true,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
@@ -9124,8 +8123,6 @@
     },
     "node_modules/typescript": {
       "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.2.tgz",
-      "integrity": "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -9138,9 +8135,8 @@
     },
     "node_modules/uglify-js": {
       "version": "3.17.0",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.0.tgz",
-      "integrity": "sha512-aTeNPVmgIMPpm1cxXr2Q/nEbvkmV8yq66F3om7X3P/cvOXQ0TMQ64Wk63iyT1gPlmdmGzjGpyLh1f3y8MZWXGg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "optional": true,
       "bin": {
         "uglifyjs": "bin/uglifyjs"
@@ -9151,8 +8147,6 @@
     },
     "node_modules/ulid": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/ulid/-/ulid-3.0.2.tgz",
-      "integrity": "sha512-yu26mwteFYzBAot7KVMqFGCVpsF6g8wXfJzQUHvu1no3+rRRSFcSV2nKeYvNPLD2J4b08jYBDhHUjeH0ygIl9w==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -9161,16 +8155,13 @@
     },
     "node_modules/undici-types": {
       "version": "6.21.0",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/unified": {
       "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz",
-      "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "bail": "^1.0.0",
         "extend": "^3.0.0",
@@ -9186,18 +8177,16 @@
     },
     "node_modules/unified/node_modules/is-plain-obj": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/unist-util-is": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz",
-      "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/unified"
@@ -9205,9 +8194,8 @@
     },
     "node_modules/unist-util-remove": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-2.1.0.tgz",
-      "integrity": "sha512-J8NYPyBm4baYLdCbjmf1bhPu45Cr1MWTm77qd9istEkzWpnN6O9tMsEbB2JhNnBCqGENRqEWomQ+He6au0B27Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "unist-util-is": "^4.0.0"
       },
@@ -9218,9 +8206,8 @@
     },
     "node_modules/unist-util-stringify-position": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
-      "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/unist": "^2.0.2"
       },
@@ -9231,9 +8218,8 @@
     },
     "node_modules/unist-util-visit": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
-      "integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/unist": "^2.0.0",
         "unist-util-is": "^4.0.0",
@@ -9246,9 +8232,8 @@
     },
     "node_modules/unist-util-visit-parents": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
-      "integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/unist": "^2.0.0",
         "unist-util-is": "^4.0.0"
@@ -9260,8 +8245,6 @@
     },
     "node_modules/universalify": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9270,8 +8253,6 @@
     },
     "node_modules/until-async": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/until-async/-/until-async-3.0.2.tgz",
-      "integrity": "sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -9280,8 +8261,6 @@
     },
     "node_modules/update-browserslist-db": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
-      "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
       "dev": true,
       "funding": [
         {
@@ -9311,22 +8290,16 @@
     },
     "node_modules/uri-js-replace": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uri-js-replace/-/uri-js-replace-1.0.1.tgz",
-      "integrity": "sha512-W+C9NWNLFOoBI2QWDp4UT9pv65r2w5Cx+3sTYFvtMdDBxkKt1syCqsUdSFAChbEe1uK5TfS04wt/nGwmaeIQ0g==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/url-template": {
       "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz",
-      "integrity": "sha512-XdVKMF4SJ0nP/O7XIPB0JwAEuT9lDIYnNsK8yGVe43y0AWoKeJNdv3ZNWh7ksJ6KqQFjOO6ox/VEitLnaVNufw==",
       "dev": true,
       "license": "BSD"
     },
     "node_modules/use-sync-external-store": {
       "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
-      "integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -9335,16 +8308,13 @@
     },
     "node_modules/v8-compile-cache-lib": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/vfile": {
       "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
-      "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/unist": "^2.0.0",
         "is-buffer": "^2.0.0",
@@ -9358,9 +8328,8 @@
     },
     "node_modules/vfile-message": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
-      "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/unist": "^2.0.0",
         "unist-util-stringify-position": "^2.0.0"
@@ -9372,8 +8341,6 @@
     },
     "node_modules/vitest": {
       "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.8.tgz",
-      "integrity": "sha512-flY6ScbCIt9HThs+C5HS7jvGOB560DJtk/Z15IQROTA6zEy49Nh8T/dofWTQL+n3vswqn87sbJNiuqw1SDp5Ig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9462,8 +8429,6 @@
     },
     "node_modules/vitest/node_modules/@vitest/mocker": {
       "version": "4.1.8",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.8.tgz",
-      "integrity": "sha512-LEiN/xe4OSIbKe9HQIp5OC24agGD9J5CnmMgsLohVVoOPWL9a2sBoR6VBx43jQZb7Kr1l4RCuyCJzcAa0+dojw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9489,8 +8454,6 @@
     },
     "node_modules/vitest/node_modules/picomatch": {
       "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
-      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9502,8 +8465,6 @@
     },
     "node_modules/vitest/node_modules/vite": {
       "version": "8.0.16",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-8.0.16.tgz",
-      "integrity": "sha512-h9bXPmJichP5fLmVQo3PyaGSDE2n3aPuomeAlVRm0JLmt4rY6zmPKd59HYI4LNW8oTK7tlTsuC7l/m7awx9Jcw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9580,8 +8541,6 @@
     },
     "node_modules/w3c-xmlserializer": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz",
-      "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9593,15 +8552,11 @@
     },
     "node_modules/webidl-conversions": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
       "dev": true,
       "license": "BSD-2-Clause"
     },
     "node_modules/whatwg-encoding": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
-      "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9613,8 +8568,6 @@
     },
     "node_modules/whatwg-mimetype": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
-      "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9623,8 +8576,6 @@
     },
     "node_modules/whatwg-url": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9634,9 +8585,8 @@
     },
     "node_modules/which": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -9649,8 +8599,6 @@
     },
     "node_modules/why-is-node-running": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
-      "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -9666,15 +8614,13 @@
     },
     "node_modules/wordwrap": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -9689,8 +8635,6 @@
     },
     "node_modules/xml-name-validator": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz",
-      "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -9699,8 +8643,6 @@
     },
     "node_modules/xml-naming": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/xml-naming/-/xml-naming-0.1.0.tgz",
-      "integrity": "sha512-k8KO9hrMyNk6tUWqUfkTEZbezRRpONVOzUTnc97VnCvyj6Tf9lyUR9EDAIeiVLv56jsMcoXEwjW8Kv5yPY52lw==",
       "funding": [
         {
           "type": "github",
@@ -9714,31 +8656,24 @@
     },
     "node_modules/xmlchars": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
-      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/y18n": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/yallist": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/yaml": {
       "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz",
-      "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -9753,14 +8688,12 @@
     },
     "node_modules/yaml-ast-parser": {
       "version": "0.0.43",
-      "resolved": "https://registry.npmjs.org/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz",
-      "integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A=="
+      "license": "Apache-2.0"
     },
     "node_modules/yargs": {
       "version": "17.0.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.0.1.tgz",
-      "integrity": "sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
@@ -9776,17 +8709,14 @@
     },
     "node_modules/yargs-parser": {
       "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/yn": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -9795,8 +8725,6 @@
     },
     "node_modules/zod": {
       "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-4.4.3.tgz",
-      "integrity": "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==",
       "dev": true,
       "license": "MIT",
       "funding": {
@@ -9805,9 +8733,8 @@
     },
     "node_modules/zwitch": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
-      "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
@@ -9827,8 +8754,8 @@
         "@opentelemetry/sdk-trace-node": "2.8.0",
         "@opentelemetry/semantic-conventions": "1.41.1",
         "@redocly/cli-otel": "0.3.1",
+        "@redocly/client-generator": "0.0.0",
         "@redocly/openapi-core": "2.34.0",
-        "@redocly/openapi-typescript": "0.0.0",
         "@redocly/respect-core": "2.34.0",
         "@types/cookie": "0.6.0",
         "@types/har-format": "^1.2.16",
@@ -9862,14 +8789,30 @@
     },
     "packages/cli/node_modules/undici": {
       "version": "6.24.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-6.24.0.tgz",
-      "integrity": "sha512-lVLNosgqo5EkGqh5XUDhGfsMSoO8K0BAN0TyJLvwNRSl4xWGZlCVYsAIpa/OpA3TvmnM01GWcoKmc3ZWo5wKKA==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=18.17"
       }
     },
+    "packages/client-generator": {
+      "name": "@redocly/client-generator",
+      "version": "0.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@redocly/openapi-core": "2.34.0"
+      },
+      "devDependencies": {
+        "typescript": "6.0.2"
+      },
+      "engines": {
+        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
+        "npm": ">=10"
+      },
+      "peerDependencies": {
+        "typescript": ">=5.5.0"
+      }
+    },
     "packages/core": {
       "name": "@redocly/openapi-core",
       "version": "2.34.0",
@@ -9902,8 +8845,6 @@
     "packages/core/node_modules/ajv": {
       "name": "@redocly/ajv",
       "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.18.1.tgz",
-      "integrity": "sha512-Ifm/pP/tul1qmAecpbVxCBluVE32rKfjf8gYXH4xI2gCv9mRWFhJMHzkPDM4TXlxwPQYIFegymlsy8lXz7optA==",
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
@@ -9918,8 +8859,6 @@
     },
     "packages/core/node_modules/js-yaml": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz",
-      "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==",
       "funding": [
         {
           "type": "github",
@@ -9940,8 +8879,6 @@
     },
     "packages/core/node_modules/picomatch": {
       "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
-      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -9950,24 +8887,6 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "packages/openapi-typescript": {
-      "name": "@redocly/openapi-typescript",
-      "version": "0.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "@redocly/openapi-core": "2.34.0"
-      },
-      "devDependencies": {
-        "typescript": "6.0.2"
-      },
-      "engines": {
-        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
-        "npm": ">=10"
-      },
-      "peerDependencies": {
-        "typescript": ">=5.5.0"
-      }
-    },
     "packages/respect-core": {
       "name": "@redocly/respect-core",
       "version": "2.34.0",
@@ -9998,8 +8917,6 @@
     },
     "packages/respect-core/node_modules/@faker-js/faker": {
       "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/@faker-js/faker/-/faker-7.6.0.tgz",
-      "integrity": "sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw==",
       "license": "MIT",
       "engines": {
         "node": ">=14.0.0",
@@ -10009,8 +8926,6 @@
     "packages/respect-core/node_modules/ajv": {
       "name": "@redocly/ajv",
       "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.18.1.tgz",
-      "integrity": "sha512-Ifm/pP/tul1qmAecpbVxCBluVE32rKfjf8gYXH4xI2gCv9mRWFhJMHzkPDM4TXlxwPQYIFegymlsy8lXz7optA==",
       "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
@@ -10025,20 +8940,14 @@
     },
     "packages/respect-core/node_modules/colorette": {
       "version": "2.0.20",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
       "license": "MIT"
     },
     "packages/respect-core/node_modules/outdent": {
       "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/outdent/-/outdent-0.8.0.tgz",
-      "integrity": "sha512-KiOAIsdpUTcAXuykya5fnVVT+/5uS0Q1mrkRHcF89tpieSmY33O/tmc54CqwA+bfhbtEfZUNLHaPUiB9X3jt1A==",
       "license": "MIT"
     },
     "packages/respect-core/node_modules/picomatch": {
       "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
-      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 271f0027d4..2cce686ae9 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -46,7 +46,7 @@
     "@opentelemetry/semantic-conventions": "1.41.1",
     "@redocly/cli-otel": "0.3.1",
     "@redocly/openapi-core": "2.34.0",
-    "@redocly/openapi-typescript": "0.0.0",
+    "@redocly/client-generator": "0.0.0",
     "@redocly/respect-core": "2.34.0",
     "@types/cookie": "0.6.0",
     "@types/har-format": "^1.2.16",
diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index 8a513d5fb4..67a2713534 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -1,5 +1,5 @@
 import { type Config, HandledError, isPlainObject, logger } from '@redocly/openapi-core';
-import { type Config as OpenApiTsConfig } from '@redocly/openapi-typescript';
+import { type Config as OpenApiTsConfig } from '@redocly/client-generator';
 import { blue, gray, yellow } from 'colorette';
 import { dirname, isAbsolute, resolve as resolvePath } from 'node:path';
 
@@ -7,14 +7,14 @@ import { getAliasOrPath } from '../utils/miscellaneous.js';
 import { type CommandArgs } from '../wrapper.js';
 
 /**
- * Read generate-client settings from a `redocly.yaml`'s `x-openapi-typescript`
+ * Read generate-client settings from a `redocly.yaml`'s `x-client-generator`
  * extension block (the auto-discovered config, or the one at `--config`). Relative
  * `input`/`output` are resolved against the config file's directory so they mean the
  * same thing regardless of the current working directory. Returns `{}` when the block
  * is absent. (A URL/registry `input` is left untouched.)
  */
 function readRedoclyExtension(config: Config): Record<string, unknown> {
-  const raw = (config.resolvedConfig as Record<string, unknown>)['x-openapi-typescript'];
+  const raw = (config.resolvedConfig as Record<string, unknown>)['x-client-generator'];
   if (!isPlainObject(raw)) return {};
   const ext: Record<string, unknown> = { ...raw };
   const baseDir = config.configPath ? dirname(config.configPath) : undefined;
@@ -56,10 +56,10 @@ export async function handleGenerateClient({
   argv,
   config,
 }: CommandArgs<GenerateClientCommandArgv>) {
-  const { generateClient } = await import('@redocly/openapi-typescript');
-  const { mergeConfig } = await import('@redocly/openapi-typescript/config-file');
+  const { generateClient } = await import('@redocly/client-generator');
+  const { mergeConfig } = await import('@redocly/client-generator/config-file');
 
-  // Config sources, lowest → highest precedence: the `redocly.yaml` `x-openapi-typescript`
+  // Config sources, lowest → highest precedence: the `redocly.yaml` `x-client-generator`
   // block (located via the standard `--config` flag, else discovered in cwd) → CLI flags.
   const redoclyExtension = readRedoclyExtension(config);
   const merged = mergeConfig(redoclyExtension as Partial<OpenApiTsConfig>, {
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index 35e5e3ce14..c63ceea4c5 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -7,7 +7,7 @@
   "references": [
     { "path": "../core" },
     { "path": "../respect-core" },
-    { "path": "../openapi-typescript" }
+    { "path": "../client-generator" }
   ],
   "include": ["src/**/*.ts"],
   "exclude": ["lib", "**/__tests__", "**/*.test.ts"]
diff --git a/packages/openapi-typescript/ARCHITECTURE.md b/packages/client-generator/ARCHITECTURE.md
similarity index 95%
rename from packages/openapi-typescript/ARCHITECTURE.md
rename to packages/client-generator/ARCHITECTURE.md
index d185f1ce58..d0491d2145 100644
--- a/packages/openapi-typescript/ARCHITECTURE.md
+++ b/packages/client-generator/ARCHITECTURE.md
@@ -1,6 +1,6 @@
 # Client Generator — Architecture
 
-How `@redocly/openapi-typescript` is built.
+How `@redocly/client-generator` is built.
 This is a **descriptive** map of the current shape — the pipeline, the modules, and the seams.
 It says _what is_; the **why** (the significant decisions and their trade-offs) lives in the Architecture Decision Records under [`docs/adr/`](./docs/adr/), linked inline below.
 For the vocabulary used here (IR, emitter, writer, runtime, facade, output mode, …), see [CONTEXT.md](./CONTEXT.md).
@@ -48,7 +48,7 @@ flowchart LR
 
 | Area       | Files                                                                                                                                                                                                                                                                                                                                                                                                                       | Owns                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Depth                                                                                                                                                                         |
 | ---------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Entry      | `index.ts`, `types.ts`, `config.ts`, `config-file.ts`, `plugin.ts`                                                                                                                                                                                                                                                                                                                                                          | `generateClient` orchestration; public option/result types; config loading; the experimental `@redocly/openapi-typescript/plugin` entry (`defineGenerator` + IR types + codegen toolkit)                                                                                                                                                                                                                                                                                     | thin orchestrator                                                                                                                                                             |
+| Entry      | `index.ts`, `types.ts`, `config.ts`, `config-file.ts`, `plugin.ts`                                                                                                                                                                                                                                                                                                                                                          | `generateClient` orchestration; public option/result types; config loading; the experimental `@redocly/client-generator/plugin` entry (`defineGenerator` + IR types + codegen toolkit)                                                                                                                                                                                                                                                                                     | thin orchestrator                                                                                                                                                             |
 | Load       | `loader.ts`                                                                                                                                                                                                                                                                                                                                                                                                                 | bundle + `$ref` resolution, preserving internal refs                                                                                                                                                                                                                                                                                                                                                                                                                         | deep (hides `openapi-core`)                                                                                                                                                   |
 | IR         | `ir/build.ts`, `ir/model.ts`, `ir/refs.ts`, `ir/normalize-swagger2.ts`, `ir/sanitize-identifiers.ts`                                                                                                                                                                                                                                                                                                                        | OpenAPI → IR; the IR type model; ref collection; Swagger 2.0 → 3.x normalization; coerce document-derived names to safe unique identifiers (security boundary)                                                                                                                                                                                                                                                                                                               | deep (`buildApiModel` + `normalizeSwagger2` each one interface over a whole walk)                                                                                             |
 | Writers    | `writers/index.ts`, `single-file-writer.ts`, `split-writer.ts`, `tagged.ts`, `tags-writer.ts`, `tags-split-writer.ts`, `group-by-tag.ts`, `util.ts`, `types.ts`                                                                                                                                                                                                                                                             | file layout per output mode                                                                                                                                                                                                                                                                                                                                                                                                                                                  | thin adapters at the `getWriter` seam + `group-by-tag` (deep)                                                                                                                 |
@@ -66,7 +66,7 @@ Places where behavior varies without editing in place:
 - **The `getGenerator` seam** — a generator is `(input) => GeneratedFile[]` (`generators/types.ts`).
   `generateClient` resolves the configured selection (default `['sdk']`) via `resolveGenerators` (`generators/resolve.ts`) into a name→descriptor registry, then runs them through `collectGeneratedFiles` and merges their files (duplicate output paths throw).
   A selection entry is a built-in name, the `name` of an inline `customGenerators` entry, or a **plugin import specifier** (path or package, dynamically imported and validated).
-  This is the public, **experimental** extension point — authored with `defineGenerator` from `@redocly/openapi-typescript/plugin`, which also re-exports the IR types and the codegen toolkit.
+  This is the public, **experimental** extension point — authored with `defineGenerator` from `@redocly/client-generator/plugin`, which also re-exports the IR types and the codegen toolkit.
   Where new capabilities (zod, framework hooks) plug in.
   See [ADR-0004](./docs/adr/0004-registry-seams.md) and [ADR-0012](./docs/adr/0012-plugin-api.md).
 - **The `getWriter` seam** — `getWriter(outputMode)` maps an output mode to a `Writer`.
@@ -92,7 +92,7 @@ Places where behavior varies without editing in place:
 
 ## Configuration
 
-`generate-client` reads its options from an `x-openapi-typescript` block in `redocly.yaml` (auto-discovered), with a dedicated `*.config.ts` (`--config-file`) and CLI flags layering over it.
+`generate-client` reads its options from an `x-client-generator` block in `redocly.yaml` (auto-discovered), with a dedicated `*.config.ts` (`--config-file`) and CLI flags layering over it.
 The extraction lives in the CLI command, not this package's core.
 See [ADR-0008](./docs/adr/0008-redocly-yaml-config.md).
 
@@ -132,7 +132,7 @@ Compile (`npm run compile`) before running tests — they run against built outp
   See [ADR-0011](./docs/adr/0011-wrapper-generators.md).
 - **A new mock data source** — the `mock` generator's data comes from `emitters/sample.ts` (baked literals) or `emitters/faker.ts` (faker calls), selected by `--mock-data`; both walk the IR with the same cycle semantics.
   See [ADR-0010](./docs/adr/0010-mock-data-baked-vs-faker.md).
-- **A custom generator (plugin, experimental)** — author `{ name, run }` with `defineGenerator` from the `@redocly/openapi-typescript/plugin` entry (it also exports the IR types and the codegen toolkit); select it in `generators` by inline `customGenerators` name or by import specifier.
+- **A custom generator (plugin, experimental)** — author `{ name, run }` with `defineGenerator` from the `@redocly/client-generator/plugin` entry (it also exports the IR types and the codegen toolkit); select it in `generators` by inline `customGenerators` name or by import specifier.
   No core change is needed — `resolve.ts` loads and validates it.
   See [ADR-0012](./docs/adr/0012-plugin-api.md).
 
diff --git a/packages/openapi-typescript/CONTEXT.md b/packages/client-generator/CONTEXT.md
similarity index 99%
rename from packages/openapi-typescript/CONTEXT.md
rename to packages/client-generator/CONTEXT.md
index 56c86138b6..44707b2895 100644
--- a/packages/openapi-typescript/CONTEXT.md
+++ b/packages/client-generator/CONTEXT.md
@@ -1,6 +1,6 @@
 # Client Generator — Context
 
-The domain language of `@redocly/openapi-typescript`: the package that turns an OpenAPI description into a typed, zero-dependency TypeScript client.
+The domain language of `@redocly/client-generator`: the package that turns an OpenAPI description into a typed, zero-dependency TypeScript client.
 Use these terms exactly — in code, comments, commits, and reviews — so the vocabulary stays consistent.
 For _how the pieces fit together_, see [ARCHITECTURE.md](./ARCHITECTURE.md).
 
diff --git a/packages/openapi-typescript/README.md b/packages/client-generator/README.md
similarity index 97%
rename from packages/openapi-typescript/README.md
rename to packages/client-generator/README.md
index d6e44b6aa7..f218cd27e2 100644
--- a/packages/openapi-typescript/README.md
+++ b/packages/client-generator/README.md
@@ -1,4 +1,4 @@
-# @redocly/openapi-typescript
+# @redocly/client-generator
 
 > ⚠️ **Experimental.** This package and the client generator are released as **experimental**: the generated output, options, and the plugin API may change in any minor release until it is declared stable (see [ADR-0013](./docs/adr/0013-experimental-status.md)).
 > Pin your version if you depend on the output, and expect to regenerate when you upgrade.
@@ -45,7 +45,7 @@ Every add-on generator keeps the emitted client dependency-free; its peer librar
 `generateClient(options)` is the API behind the CLI command — it loads the spec, builds the client, and writes the files:
 
 ```ts
-import { generateClient } from '@redocly/openapi-typescript';
+import { generateClient } from '@redocly/client-generator';
 
 const result = await generateClient({
   input: 'openapi.yaml', // file path or URL
@@ -66,7 +66,7 @@ console.log(`Wrote ${result.files.length} file(s), ${result.bytes} bytes.`);
 For type-safe option authoring, `defineConfig` returns its argument unchanged:
 
 ```ts
-import { defineConfig } from '@redocly/openapi-typescript';
+import { defineConfig } from '@redocly/client-generator';
 
 export default defineConfig({
   input: './openapi.yaml',
@@ -308,7 +308,7 @@ Write a **custom generator**: it reads the same OpenAPI-derived model the built-
 
 ```ts
 // route-map-generator.ts
-import { defineGenerator } from '@redocly/openapi-typescript/plugin';
+import { defineGenerator } from '@redocly/client-generator/plugin';
 
 export default defineGenerator({
   name: 'route-map',
@@ -331,7 +331,7 @@ export default defineGenerator({
 Select it in `generators` by import specifier (a path or package), or register it inline and select it by `name`:
 
 ```ts
-import generateClient from '@redocly/openapi-typescript';
+import generateClient from '@redocly/client-generator';
 import routeMap from './tools/route-map-generator.ts';
 
 await generateClient({
@@ -342,7 +342,7 @@ await generateClient({
 });
 ```
 
-`@redocly/openapi-typescript/plugin` also exports the IR types and the codegen toolkit the built-ins use (`ts`, `printStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, …).
+`@redocly/client-generator/plugin` also exports the IR types and the codegen toolkit the built-ins use (`ts`, `printStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, …).
 A generator declares the same `requires`/`facades`/`errorModes`/`dateTypes` contract, validated up front.
 The generated client stays dependency-free.
 See `examples/custom-generator` for a runnable example.
diff --git a/packages/openapi-typescript/docs/adr/0001-ast-codegen.md b/packages/client-generator/docs/adr/0001-ast-codegen.md
similarity index 100%
rename from packages/openapi-typescript/docs/adr/0001-ast-codegen.md
rename to packages/client-generator/docs/adr/0001-ast-codegen.md
diff --git a/packages/openapi-typescript/docs/adr/0002-typescript-peer-dep.md b/packages/client-generator/docs/adr/0002-typescript-peer-dep.md
similarity index 97%
rename from packages/openapi-typescript/docs/adr/0002-typescript-peer-dep.md
rename to packages/client-generator/docs/adr/0002-typescript-peer-dep.md
index e0d62e1266..c997b24929 100644
--- a/packages/openapi-typescript/docs/adr/0002-typescript-peer-dep.md
+++ b/packages/client-generator/docs/adr/0002-typescript-peer-dep.md
@@ -10,7 +10,7 @@ We must decide how the package depends on it without (a) bloating installs for c
 
 ## Decision
 
-We declare `typescript` (`>=5.5.0`) as a **`peerDependency`** of `@redocly/openapi-typescript`.
+We declare `typescript` (`>=5.5.0`) as a **`peerDependency`** of `@redocly/client-generator`.
 The only real runtime `dependency` is `@redocly/openapi-core` (the input/document side).
 Package-in-code consumers (`import { generateClient }`) already have `typescript`; `@redocly/cli` declares it as a real `dependency` so the CLI works standalone (and transitively satisfies the peer).
 The codegen uses only stable `factory` / `createPrinter` / `createSourceFile` / `SyntaxKind` APIs, so the wide peer range is safe.
diff --git a/packages/openapi-typescript/docs/adr/0003-spec-agnostic-ir.md b/packages/client-generator/docs/adr/0003-spec-agnostic-ir.md
similarity index 100%
rename from packages/openapi-typescript/docs/adr/0003-spec-agnostic-ir.md
rename to packages/client-generator/docs/adr/0003-spec-agnostic-ir.md
diff --git a/packages/openapi-typescript/docs/adr/0004-registry-seams.md b/packages/client-generator/docs/adr/0004-registry-seams.md
similarity index 100%
rename from packages/openapi-typescript/docs/adr/0004-registry-seams.md
rename to packages/client-generator/docs/adr/0004-registry-seams.md
diff --git a/packages/openapi-typescript/docs/adr/0005-error-mode-terminals.md b/packages/client-generator/docs/adr/0005-error-mode-terminals.md
similarity index 100%
rename from packages/openapi-typescript/docs/adr/0005-error-mode-terminals.md
rename to packages/client-generator/docs/adr/0005-error-mode-terminals.md
diff --git a/packages/openapi-typescript/docs/adr/0006-sse-namespace.md b/packages/client-generator/docs/adr/0006-sse-namespace.md
similarity index 100%
rename from packages/openapi-typescript/docs/adr/0006-sse-namespace.md
rename to packages/client-generator/docs/adr/0006-sse-namespace.md
diff --git a/packages/openapi-typescript/docs/adr/0007-call-site-auth.md b/packages/client-generator/docs/adr/0007-call-site-auth.md
similarity index 100%
rename from packages/openapi-typescript/docs/adr/0007-call-site-auth.md
rename to packages/client-generator/docs/adr/0007-call-site-auth.md
diff --git a/packages/openapi-typescript/docs/adr/0008-redocly-yaml-config.md b/packages/client-generator/docs/adr/0008-redocly-yaml-config.md
similarity index 87%
rename from packages/openapi-typescript/docs/adr/0008-redocly-yaml-config.md
rename to packages/client-generator/docs/adr/0008-redocly-yaml-config.md
index b246e022f3..b7c905e924 100644
--- a/packages/openapi-typescript/docs/adr/0008-redocly-yaml-config.md
+++ b/packages/client-generator/docs/adr/0008-redocly-yaml-config.md
@@ -1,4 +1,4 @@
-# ADR 0008: `generate-client` config via `redocly.yaml` `x-openapi-typescript`
+# ADR 0008: `generate-client` config via `redocly.yaml` `x-client-generator`
 
 - Status: Accepted
 - Date: 2026-06-10
@@ -11,7 +11,7 @@ We want redocly.yaml-driven generation **now**, without blocking on that release
 
 ## Decision
 
-`generate-client` reads its options from an **`x-openapi-typescript` extension block** in `redocly.yaml`.
+`generate-client` reads its options from an **`x-client-generator` extension block** in `redocly.yaml`.
 The `x-` prefix is the tolerated-extension convention, so no `@redocly/config` schema change is needed — and `@redocly/openapi-core` already preserves the block verbatim in `config.resolvedConfig`.
 The CLI extracts it, resolving relative `input`/`output` against the redocly.yaml directory.
 Precedence, low → high: **`redocly.yaml` block → `--config-file` (the `*.config.ts`, retained) → CLI flags**.
diff --git a/packages/openapi-typescript/docs/adr/0009-per-instance-auth.md b/packages/client-generator/docs/adr/0009-per-instance-auth.md
similarity index 100%
rename from packages/openapi-typescript/docs/adr/0009-per-instance-auth.md
rename to packages/client-generator/docs/adr/0009-per-instance-auth.md
diff --git a/packages/openapi-typescript/docs/adr/0010-mock-data-baked-vs-faker.md b/packages/client-generator/docs/adr/0010-mock-data-baked-vs-faker.md
similarity index 100%
rename from packages/openapi-typescript/docs/adr/0010-mock-data-baked-vs-faker.md
rename to packages/client-generator/docs/adr/0010-mock-data-baked-vs-faker.md
diff --git a/packages/openapi-typescript/docs/adr/0011-wrapper-generators.md b/packages/client-generator/docs/adr/0011-wrapper-generators.md
similarity index 100%
rename from packages/openapi-typescript/docs/adr/0011-wrapper-generators.md
rename to packages/client-generator/docs/adr/0011-wrapper-generators.md
diff --git a/packages/openapi-typescript/docs/adr/0012-plugin-api.md b/packages/client-generator/docs/adr/0012-plugin-api.md
similarity index 85%
rename from packages/openapi-typescript/docs/adr/0012-plugin-api.md
rename to packages/client-generator/docs/adr/0012-plugin-api.md
index 93a412a37c..8eba8abce4 100644
--- a/packages/openapi-typescript/docs/adr/0012-plugin-api.md
+++ b/packages/client-generator/docs/adr/0012-plugin-api.md
@@ -16,7 +16,7 @@ Open the `getGenerator` registry as a **public, experimental** API for **custom
 A custom generator is the internal `GeneratorDescriptor` plus a `name`: `{ name, run, requires?, facades?, errorModes?, dateTypes? }`, where `run(input) => GeneratedFile[]` receives the same IR the built-ins do.
 
 - **Loading is dual.** A `generators` entry resolves as a built-in name, an inline `customGenerators` entry (from a `defineConfig` file — type-safe, no dynamic import), or an **import specifier** (a path resolved against the config dir, or an installed package) that is dynamically `import()`ed and default-exported (mirroring how config files load). A new `resolveGenerators` performs this before emission, producing a name→descriptor registry that `validateGenerators` and the run loop consume.
-- **Surface + stability.** A dedicated `@redocly/openapi-typescript/plugin` entry exports `defineGenerator`, the IR types, and a curated codegen toolkit (`ts`, `printStatements`, `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, `safeIdent`) — the same internals the built-in generators use, re-surfaced (no new logic). The whole surface is **`@experimental`**: it may change between minor versions until real plugins exercise it and it is stabilized.
+- **Surface + stability.** A dedicated `@redocly/client-generator/plugin` entry exports `defineGenerator`, the IR types, and a curated codegen toolkit (`ts`, `printStatements`, `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, `safeIdent`) — the same internals the built-in generators use, re-surfaced (no new logic). The whole surface is **`@experimental`**: it may change between minor versions until real plugins exercise it and it is stabilized.
 - **Fail fast.** Collisions (a custom name equal to a built-in or another custom), invalid exports, unloadable specifiers, and unmet `requires`/`facades`/`errorModes`/`dateTypes` all throw an actionable error before any file is written.
 
 ## Consequences
diff --git a/packages/openapi-typescript/docs/adr/0013-experimental-status.md b/packages/client-generator/docs/adr/0013-experimental-status.md
similarity index 75%
rename from packages/openapi-typescript/docs/adr/0013-experimental-status.md
rename to packages/client-generator/docs/adr/0013-experimental-status.md
index 6152d82711..6325f7d3fd 100644
--- a/packages/openapi-typescript/docs/adr/0013-experimental-status.md
+++ b/packages/client-generator/docs/adr/0013-experimental-status.md
@@ -5,7 +5,7 @@
 
 ## Context
 
-`generate-client` (and `@redocly/openapi-typescript`) ships a large public surface in one go: CLI flags, the **exact generated output**, the configuration schema, six generators, and a custom-generator plugin API that exposes the IR ([ADR-0012](./0012-plugin-api.md)).
+`generate-client` (and `@redocly/client-generator`) ships a large public surface in one go: CLI flags, the **exact generated output**, the configuration schema, six generators, and a custom-generator plugin API that exposes the IR ([ADR-0012](./0012-plugin-api.md)).
 Several of these are hard to walk back once committed to:
 
 - **Generated output is the real lock-in** — consumers commit the generated client to their repos and depend on its exact shape; changing it is a breaking change.
@@ -19,7 +19,7 @@ Committing all of this to semver-stable on day one is a promise we can't yet kee
 Release the **entire feature as experimental**.
 Its CLI flags, generated output, configuration, and the plugin API may change in any minor release until it is declared stable.
 
-- **Versioning:** `@redocly/openapi-typescript` is versioned **independently, starting at `0.x`** — it is **not** in the monorepo's `fixed` lockstep group (which keeps `@redocly/cli` / `@redocly/openapi-core` / `@redocly/respect-core` in step). A `0.x` version is the semver-native signal that the API may change, and it decouples the experimental package's churn from the stable CLI's version (the CLI bundles it and pins the exact version it ships). It graduates to `1.0.0` when declared stable.
+- **Versioning:** `@redocly/client-generator` is versioned **independently, starting at `0.x`** — it is **not** in the monorepo's `fixed` lockstep group (which keeps `@redocly/cli` / `@redocly/openapi-core` / `@redocly/respect-core` in step). A `0.x` version is the semver-native signal that the API may change, and it decouples the experimental package's churn from the stable CLI's version (the CLI bundles it and pins the exact version it ships). It graduates to `1.0.0` when declared stable.
 - **Disclosure:** the `0.x` version, the README banner, the command-doc admonition, the changeset entry, and this ADR all state the experimental status and link here.
 
 ### Stabilization criteria (what graduates it to stable)
@@ -28,7 +28,7 @@ The feature stays experimental until all of the following hold:
 
 1. **Validated against real-world specs** — exercised on a representative set of production OpenAPI descriptions (incl. internal consumers) with no output-shape surprises.
 2. **Generated-output shape frozen** — no pending changes to the emitted client/types that would break a committed, generated client.
-3. **Plugin IR committed to** — the IR and codegen toolkit re-exported from `@redocly/openapi-typescript/plugin` are reviewed and promoted from `@experimental` to stable.
+3. **Plugin IR committed to** — the IR and codegen toolkit re-exported from `@redocly/client-generator/plugin` are reviewed and promoted from `@experimental` to stable.
 4. **Deferrals decided** — `int64`→`bigint`, oauth2 token-flow helpers, and the formatting/pretty-print pass are each either implemented or explicitly declared out of scope.
 5. **Soak period** — a defined window of no breaking changes to flags/output/config before the flag is flipped.
 
diff --git a/packages/openapi-typescript/docs/adr/README.md b/packages/client-generator/docs/adr/README.md
similarity index 95%
rename from packages/openapi-typescript/docs/adr/README.md
rename to packages/client-generator/docs/adr/README.md
index 30e0493e3b..75c0e4f925 100644
--- a/packages/openapi-typescript/docs/adr/README.md
+++ b/packages/client-generator/docs/adr/README.md
@@ -1,6 +1,6 @@
 # Architecture Decision Records
 
-Immutable, point-in-time records of the significant, hard-to-reverse decisions behind `@redocly/openapi-typescript`.
+Immutable, point-in-time records of the significant, hard-to-reverse decisions behind `@redocly/client-generator`.
 Each ADR captures the **context**, the **decision**, and its **consequences** at the time it was made.
 ADRs are not edited as the code evolves — when a decision is revisited, add a new ADR that supersedes the old one (and mark the old one `Superseded by ADR-NNNN`).
 
@@ -18,7 +18,7 @@ ARCHITECTURE.md says _what is_; these ADRs say _why_.
 | [0005](./0005-error-mode-terminals.md)     | Error handling as a generate-time mode (throw vs result)           | Accepted                |
 | [0006](./0006-sse-namespace.md)            | SSE as a derived response kind under an `sse.*` namespace          | Accepted                |
 | [0007](./0007-call-site-auth.md)           | Auth resolved at the call site via async `__auth`                  | Accepted (ext. by 0009) |
-| [0008](./0008-redocly-yaml-config.md)      | `generate-client` config via `redocly.yaml` `x-openapi-typescript` | Accepted                |
+| [0008](./0008-redocly-yaml-config.md)      | `generate-client` config via `redocly.yaml` `x-client-generator` | Accepted                |
 | [0009](./0009-per-instance-auth.md)        | Per-instance auth via `ClientConfig.auth`                          | Accepted                |
 | [0010](./0010-mock-data-baked-vs-faker.md) | Mock data: baked literals by default, faker opt-in                 | Accepted                |
 | [0011](./0011-wrapper-generators.md)       | Data-fetching wrapper generators (`swr`, `tanstack-query`)         | Accepted                |
diff --git a/packages/openapi-typescript/examples/README.md b/packages/client-generator/examples/README.md
similarity index 88%
rename from packages/openapi-typescript/examples/README.md
rename to packages/client-generator/examples/README.md
index cd1d3f3780..0ffc137b96 100644
--- a/packages/openapi-typescript/examples/README.md
+++ b/packages/client-generator/examples/README.md
@@ -1,6 +1,6 @@
 # Examples
 
-Runnable examples of clients generated by `@redocly/openapi-typescript`. Each is standalone with its
+Runnable examples of clients generated by `@redocly/client-generator`. Each is standalone with its
 own dependencies; the generated client under `src/api/` is checked in and **drift-checked against the
 generator in CI** (`tests/e2e/examples.test.ts`). The first five are Vite apps that _consume_ a client
 generated via the `redocly generate-client` CLI (a `redocly.yaml`); `programmatic` _generates_ one with
@@ -18,10 +18,10 @@ the `generateClient(...)` API.
 ## Run one
 
 ```bash
-cd packages/openapi-typescript/examples/<name>
+cd packages/client-generator/examples/<name>
 npm install
 npm run dev        # the Vite apps; the `programmatic` example uses `npm run generate`
 ```
 
 To regenerate every example's client from the local generator, from the repo root:
-`npm run examples:regen -w @redocly/openapi-typescript`.
+`npm run examples:regen -w @redocly/client-generator`.
diff --git a/packages/openapi-typescript/examples/custom-generator/.gitignore b/packages/client-generator/examples/custom-generator/.gitignore
similarity index 100%
rename from packages/openapi-typescript/examples/custom-generator/.gitignore
rename to packages/client-generator/examples/custom-generator/.gitignore
diff --git a/packages/openapi-typescript/examples/custom-generator/README.md b/packages/client-generator/examples/custom-generator/README.md
similarity index 75%
rename from packages/openapi-typescript/examples/custom-generator/README.md
rename to packages/client-generator/examples/custom-generator/README.md
index e310d77804..c8711eea83 100644
--- a/packages/openapi-typescript/examples/custom-generator/README.md
+++ b/packages/client-generator/examples/custom-generator/README.md
@@ -8,7 +8,7 @@ generator runs alongside the built-in `sdk`, reading the same OpenAPI-derived IR
 - [`redocly.yaml`](./redocly.yaml) — `generators: [sdk, ./route-map-generator.mjs]`.
 - [`src/main.ts`](./src/main.ts) — imports both the client and the generated `routes` map.
 
-Regenerate from the repo root with `npm run examples:regen -w @redocly/openapi-typescript`; type-check
-with `npm run typecheck:examples -w @redocly/openapi-typescript`. See the "Custom generators" section
+Regenerate from the repo root with `npm run examples:regen -w @redocly/client-generator`; type-check
+with `npm run typecheck:examples -w @redocly/client-generator`. See the "Custom generators" section
 of the command reference for the
-authoring contract and the `@redocly/openapi-typescript/plugin` toolkit.
+authoring contract and the `@redocly/client-generator/plugin` toolkit.
diff --git a/packages/openapi-typescript/examples/custom-generator/index.html b/packages/client-generator/examples/custom-generator/index.html
similarity index 76%
rename from packages/openapi-typescript/examples/custom-generator/index.html
rename to packages/client-generator/examples/custom-generator/index.html
index d1621f420e..8c0c18b5ec 100644
--- a/packages/openapi-typescript/examples/custom-generator/index.html
+++ b/packages/client-generator/examples/custom-generator/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <title>Redocly openapi-typescript — zod example</title>
+    <title>Redocly client-generator — zod example</title>
   </head>
   <body>
     <pre id="out">Loading…</pre>
diff --git a/packages/openapi-typescript/examples/custom-generator/openapi.yaml b/packages/client-generator/examples/custom-generator/openapi.yaml
similarity index 100%
rename from packages/openapi-typescript/examples/custom-generator/openapi.yaml
rename to packages/client-generator/examples/custom-generator/openapi.yaml
diff --git a/packages/openapi-typescript/examples/custom-generator/package.json b/packages/client-generator/examples/custom-generator/package.json
similarity index 100%
rename from packages/openapi-typescript/examples/custom-generator/package.json
rename to packages/client-generator/examples/custom-generator/package.json
diff --git a/packages/openapi-typescript/examples/custom-generator/redocly.yaml b/packages/client-generator/examples/custom-generator/redocly.yaml
similarity index 94%
rename from packages/openapi-typescript/examples/custom-generator/redocly.yaml
rename to packages/client-generator/examples/custom-generator/redocly.yaml
index da045276ea..d2a20865cb 100644
--- a/packages/openapi-typescript/examples/custom-generator/redocly.yaml
+++ b/packages/client-generator/examples/custom-generator/redocly.yaml
@@ -1,7 +1,7 @@
 # redocly.yaml — drives `redocly generate-client` for this example.
 # The `generators` list mixes a built-in (`sdk`) with a custom generator referenced by path
 # (the experimental plugin API). The path is resolved against this file's directory.
-x-openapi-typescript:
+x-client-generator:
   input: ./openapi.yaml
   output: ./src/api/client.ts
   generators:
diff --git a/packages/openapi-typescript/examples/custom-generator/route-map-generator.mjs b/packages/client-generator/examples/custom-generator/route-map-generator.mjs
similarity index 93%
rename from packages/openapi-typescript/examples/custom-generator/route-map-generator.mjs
rename to packages/client-generator/examples/custom-generator/route-map-generator.mjs
index 0750f02200..d34fd49985 100644
--- a/packages/openapi-typescript/examples/custom-generator/route-map-generator.mjs
+++ b/packages/client-generator/examples/custom-generator/route-map-generator.mjs
@@ -4,7 +4,7 @@
 //
 // Plain ESM so the CLI imports it under bare `node`. Authored in TypeScript you would write:
 //
-//   import { defineGenerator } from '@redocly/openapi-typescript/plugin';
+//   import { defineGenerator } from '@redocly/client-generator/plugin';
 //   export default defineGenerator({ name: 'route-map', requires: ['sdk'], run({ model, outputPath }) { … } });
 //
 // `defineGenerator` is just an identity helper for types, so a plain object works too:
diff --git a/packages/openapi-typescript/examples/custom-generator/src/api/client.routes.ts b/packages/client-generator/examples/custom-generator/src/api/client.routes.ts
similarity index 100%
rename from packages/openapi-typescript/examples/custom-generator/src/api/client.routes.ts
rename to packages/client-generator/examples/custom-generator/src/api/client.routes.ts
diff --git a/packages/openapi-typescript/examples/custom-generator/src/api/client.ts b/packages/client-generator/examples/custom-generator/src/api/client.ts
similarity index 99%
rename from packages/openapi-typescript/examples/custom-generator/src/api/client.ts
rename to packages/client-generator/examples/custom-generator/src/api/client.ts
index 69068d44a4..d037db048b 100644
--- a/packages/openapi-typescript/examples/custom-generator/src/api/client.ts
+++ b/packages/client-generator/examples/custom-generator/src/api/client.ts
@@ -1,4 +1,4 @@
-// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Generated by @redocly/client-generator — do not edit by hand.
 // Source: OpenAPI document. Re-run `redocly generate-client` to update.
 
 /**
diff --git a/packages/openapi-typescript/examples/custom-generator/src/main.ts b/packages/client-generator/examples/custom-generator/src/main.ts
similarity index 100%
rename from packages/openapi-typescript/examples/custom-generator/src/main.ts
rename to packages/client-generator/examples/custom-generator/src/main.ts
diff --git a/packages/openapi-typescript/examples/custom-generator/tsconfig.json b/packages/client-generator/examples/custom-generator/tsconfig.json
similarity index 100%
rename from packages/openapi-typescript/examples/custom-generator/tsconfig.json
rename to packages/client-generator/examples/custom-generator/tsconfig.json
diff --git a/packages/openapi-typescript/examples/custom-generator/vite.config.ts b/packages/client-generator/examples/custom-generator/vite.config.ts
similarity index 100%
rename from packages/openapi-typescript/examples/custom-generator/vite.config.ts
rename to packages/client-generator/examples/custom-generator/vite.config.ts
diff --git a/packages/openapi-typescript/examples/fetch-functions/.gitignore b/packages/client-generator/examples/fetch-functions/.gitignore
similarity index 100%
rename from packages/openapi-typescript/examples/fetch-functions/.gitignore
rename to packages/client-generator/examples/fetch-functions/.gitignore
diff --git a/packages/openapi-typescript/examples/fetch-functions/README.md b/packages/client-generator/examples/fetch-functions/README.md
similarity index 100%
rename from packages/openapi-typescript/examples/fetch-functions/README.md
rename to packages/client-generator/examples/fetch-functions/README.md
diff --git a/packages/openapi-typescript/examples/service-class/index.html b/packages/client-generator/examples/fetch-functions/index.html
similarity index 76%
rename from packages/openapi-typescript/examples/service-class/index.html
rename to packages/client-generator/examples/fetch-functions/index.html
index 6476b9983e..2aafd8e6e1 100644
--- a/packages/openapi-typescript/examples/service-class/index.html
+++ b/packages/client-generator/examples/fetch-functions/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <title>Redocly openapi-typescript — service-class example</title>
+    <title>Redocly client-generator — fetch-functions example</title>
   </head>
   <body>
     <pre id="out">Loading…</pre>
diff --git a/packages/openapi-typescript/examples/fetch-functions/openapi.yaml b/packages/client-generator/examples/fetch-functions/openapi.yaml
similarity index 100%
rename from packages/openapi-typescript/examples/fetch-functions/openapi.yaml
rename to packages/client-generator/examples/fetch-functions/openapi.yaml
diff --git a/packages/openapi-typescript/examples/fetch-functions/package.json b/packages/client-generator/examples/fetch-functions/package.json
similarity index 100%
rename from packages/openapi-typescript/examples/fetch-functions/package.json
rename to packages/client-generator/examples/fetch-functions/package.json
diff --git a/packages/openapi-typescript/examples/fetch-functions/redocly.yaml b/packages/client-generator/examples/fetch-functions/redocly.yaml
similarity index 68%
rename from packages/openapi-typescript/examples/fetch-functions/redocly.yaml
rename to packages/client-generator/examples/fetch-functions/redocly.yaml
index 54c194c994..085d1f32bf 100644
--- a/packages/openapi-typescript/examples/fetch-functions/redocly.yaml
+++ b/packages/client-generator/examples/fetch-functions/redocly.yaml
@@ -1,7 +1,7 @@
 # redocly.yaml — drives `redocly generate-client` for this example.
-# generate-client settings live under the `x-openapi-typescript` extension for now
+# generate-client settings live under the `x-client-generator` extension for now
 # (first-class config support is planned in @redocly/config).
-x-openapi-typescript:
+x-client-generator:
   input: ./openapi.yaml
   output: ./src/api/client.ts
   generators:
diff --git a/packages/openapi-typescript/examples/fetch-functions/src/api/client.ts b/packages/client-generator/examples/fetch-functions/src/api/client.ts
similarity index 99%
rename from packages/openapi-typescript/examples/fetch-functions/src/api/client.ts
rename to packages/client-generator/examples/fetch-functions/src/api/client.ts
index 69068d44a4..d037db048b 100644
--- a/packages/openapi-typescript/examples/fetch-functions/src/api/client.ts
+++ b/packages/client-generator/examples/fetch-functions/src/api/client.ts
@@ -1,4 +1,4 @@
-// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Generated by @redocly/client-generator — do not edit by hand.
 // Source: OpenAPI document. Re-run `redocly generate-client` to update.
 
 /**
diff --git a/packages/openapi-typescript/examples/fetch-functions/src/main.ts b/packages/client-generator/examples/fetch-functions/src/main.ts
similarity index 100%
rename from packages/openapi-typescript/examples/fetch-functions/src/main.ts
rename to packages/client-generator/examples/fetch-functions/src/main.ts
diff --git a/packages/openapi-typescript/examples/fetch-functions/tsconfig.json b/packages/client-generator/examples/fetch-functions/tsconfig.json
similarity index 100%
rename from packages/openapi-typescript/examples/fetch-functions/tsconfig.json
rename to packages/client-generator/examples/fetch-functions/tsconfig.json
diff --git a/packages/openapi-typescript/examples/fetch-functions/vite.config.ts b/packages/client-generator/examples/fetch-functions/vite.config.ts
similarity index 100%
rename from packages/openapi-typescript/examples/fetch-functions/vite.config.ts
rename to packages/client-generator/examples/fetch-functions/vite.config.ts
diff --git a/packages/openapi-typescript/examples/mock/.gitignore b/packages/client-generator/examples/mock/.gitignore
similarity index 100%
rename from packages/openapi-typescript/examples/mock/.gitignore
rename to packages/client-generator/examples/mock/.gitignore
diff --git a/packages/openapi-typescript/examples/mock/README.md b/packages/client-generator/examples/mock/README.md
similarity index 100%
rename from packages/openapi-typescript/examples/mock/README.md
rename to packages/client-generator/examples/mock/README.md
diff --git a/packages/openapi-typescript/examples/zod/index.html b/packages/client-generator/examples/mock/index.html
similarity index 76%
rename from packages/openapi-typescript/examples/zod/index.html
rename to packages/client-generator/examples/mock/index.html
index d1621f420e..8c0c18b5ec 100644
--- a/packages/openapi-typescript/examples/zod/index.html
+++ b/packages/client-generator/examples/mock/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <title>Redocly openapi-typescript — zod example</title>
+    <title>Redocly client-generator — zod example</title>
   </head>
   <body>
     <pre id="out">Loading…</pre>
diff --git a/packages/openapi-typescript/examples/mock/openapi.yaml b/packages/client-generator/examples/mock/openapi.yaml
similarity index 100%
rename from packages/openapi-typescript/examples/mock/openapi.yaml
rename to packages/client-generator/examples/mock/openapi.yaml
diff --git a/packages/openapi-typescript/examples/mock/package.json b/packages/client-generator/examples/mock/package.json
similarity index 100%
rename from packages/openapi-typescript/examples/mock/package.json
rename to packages/client-generator/examples/mock/package.json
diff --git a/packages/openapi-typescript/examples/mock/public/mockServiceWorker.js b/packages/client-generator/examples/mock/public/mockServiceWorker.js
similarity index 100%
rename from packages/openapi-typescript/examples/mock/public/mockServiceWorker.js
rename to packages/client-generator/examples/mock/public/mockServiceWorker.js
diff --git a/packages/openapi-typescript/examples/mock/redocly.yaml b/packages/client-generator/examples/mock/redocly.yaml
similarity index 69%
rename from packages/openapi-typescript/examples/mock/redocly.yaml
rename to packages/client-generator/examples/mock/redocly.yaml
index 18f1fdc25f..c16fc57463 100644
--- a/packages/openapi-typescript/examples/mock/redocly.yaml
+++ b/packages/client-generator/examples/mock/redocly.yaml
@@ -1,7 +1,7 @@
 # redocly.yaml — drives `redocly generate-client` for this example.
-# generate-client settings live under the `x-openapi-typescript` extension for now
+# generate-client settings live under the `x-client-generator` extension for now
 # (first-class config support is planned in @redocly/config).
-x-openapi-typescript:
+x-client-generator:
   input: ./openapi.yaml
   output: ./src/api/client.ts
   generators:
diff --git a/packages/openapi-typescript/examples/mock/src/api/client.mocks.ts b/packages/client-generator/examples/mock/src/api/client.mocks.ts
similarity index 99%
rename from packages/openapi-typescript/examples/mock/src/api/client.mocks.ts
rename to packages/client-generator/examples/mock/src/api/client.mocks.ts
index d304ac3db8..7bfb6a9796 100644
--- a/packages/openapi-typescript/examples/mock/src/api/client.mocks.ts
+++ b/packages/client-generator/examples/mock/src/api/client.mocks.ts
@@ -1,4 +1,4 @@
-// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Generated by @redocly/client-generator — do not edit by hand.
 // Source: OpenAPI document. Re-run `redocly generate-client` to update.
 
 import { http, HttpResponse } from 'msw';
diff --git a/packages/openapi-typescript/examples/mock/src/api/client.ts b/packages/client-generator/examples/mock/src/api/client.ts
similarity index 99%
rename from packages/openapi-typescript/examples/mock/src/api/client.ts
rename to packages/client-generator/examples/mock/src/api/client.ts
index 69068d44a4..d037db048b 100644
--- a/packages/openapi-typescript/examples/mock/src/api/client.ts
+++ b/packages/client-generator/examples/mock/src/api/client.ts
@@ -1,4 +1,4 @@
-// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Generated by @redocly/client-generator — do not edit by hand.
 // Source: OpenAPI document. Re-run `redocly generate-client` to update.
 
 /**
diff --git a/packages/openapi-typescript/examples/mock/src/main.ts b/packages/client-generator/examples/mock/src/main.ts
similarity index 100%
rename from packages/openapi-typescript/examples/mock/src/main.ts
rename to packages/client-generator/examples/mock/src/main.ts
diff --git a/packages/openapi-typescript/examples/mock/src/node.ts b/packages/client-generator/examples/mock/src/node.ts
similarity index 100%
rename from packages/openapi-typescript/examples/mock/src/node.ts
rename to packages/client-generator/examples/mock/src/node.ts
diff --git a/packages/openapi-typescript/examples/mock/tsconfig.json b/packages/client-generator/examples/mock/tsconfig.json
similarity index 100%
rename from packages/openapi-typescript/examples/mock/tsconfig.json
rename to packages/client-generator/examples/mock/tsconfig.json
diff --git a/packages/openapi-typescript/examples/mock/vite.config.ts b/packages/client-generator/examples/mock/vite.config.ts
similarity index 100%
rename from packages/openapi-typescript/examples/mock/vite.config.ts
rename to packages/client-generator/examples/mock/vite.config.ts
diff --git a/packages/openapi-typescript/examples/programmatic/.gitignore b/packages/client-generator/examples/programmatic/.gitignore
similarity index 100%
rename from packages/openapi-typescript/examples/programmatic/.gitignore
rename to packages/client-generator/examples/programmatic/.gitignore
diff --git a/packages/openapi-typescript/examples/programmatic/README.md b/packages/client-generator/examples/programmatic/README.md
similarity index 82%
rename from packages/openapi-typescript/examples/programmatic/README.md
rename to packages/client-generator/examples/programmatic/README.md
index 3a99e6a4c9..8b50ca4abf 100644
--- a/packages/openapi-typescript/examples/programmatic/README.md
+++ b/packages/client-generator/examples/programmatic/README.md
@@ -1,7 +1,7 @@
 # programmatic example
 
 Generates the client **programmatically** with `generateClient(...)` from
-`@redocly/openapi-typescript` — the same API the `redocly generate-client` CLI uses — instead of a
+`@redocly/client-generator` — the same API the `redocly generate-client` CLI uses — instead of a
 `redocly.yaml`. See [`generate.ts`](./generate.ts). Useful when generation is part of a build script,
 codegen pipeline, or test setup.
 
diff --git a/packages/openapi-typescript/examples/programmatic/generate.ts b/packages/client-generator/examples/programmatic/generate.ts
similarity index 93%
rename from packages/openapi-typescript/examples/programmatic/generate.ts
rename to packages/client-generator/examples/programmatic/generate.ts
index a4ddc6ae7f..06aae6131a 100644
--- a/packages/openapi-typescript/examples/programmatic/generate.ts
+++ b/packages/client-generator/examples/programmatic/generate.ts
@@ -1,7 +1,7 @@
 // Generate the client *programmatically* with `generateClient(...)` — the API behind the
 // `redocly generate-client` CLI — instead of a `redocly.yaml`. Run: `npm run generate`.
 // (The CI drift-check sets `OUT` to redirect the output to a temp dir.)
-import { generateClient } from '@redocly/openapi-typescript';
+import { generateClient } from '@redocly/client-generator';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
diff --git a/packages/openapi-typescript/examples/programmatic/openapi.yaml b/packages/client-generator/examples/programmatic/openapi.yaml
similarity index 100%
rename from packages/openapi-typescript/examples/programmatic/openapi.yaml
rename to packages/client-generator/examples/programmatic/openapi.yaml
diff --git a/packages/openapi-typescript/examples/programmatic/package.json b/packages/client-generator/examples/programmatic/package.json
similarity index 84%
rename from packages/openapi-typescript/examples/programmatic/package.json
rename to packages/client-generator/examples/programmatic/package.json
index e2066df025..6d7561ef41 100644
--- a/packages/openapi-typescript/examples/programmatic/package.json
+++ b/packages/client-generator/examples/programmatic/package.json
@@ -7,7 +7,7 @@
     "generate": "tsx generate.ts"
   },
   "devDependencies": {
-    "@redocly/openapi-typescript": "latest",
+    "@redocly/client-generator": "latest",
     "tsx": "^4.0.0",
     "typescript": "^5.5.0"
   }
diff --git a/packages/openapi-typescript/examples/programmatic/src/api/client.ts b/packages/client-generator/examples/programmatic/src/api/client.ts
similarity index 99%
rename from packages/openapi-typescript/examples/programmatic/src/api/client.ts
rename to packages/client-generator/examples/programmatic/src/api/client.ts
index 69068d44a4..d037db048b 100644
--- a/packages/openapi-typescript/examples/programmatic/src/api/client.ts
+++ b/packages/client-generator/examples/programmatic/src/api/client.ts
@@ -1,4 +1,4 @@
-// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Generated by @redocly/client-generator — do not edit by hand.
 // Source: OpenAPI document. Re-run `redocly generate-client` to update.
 
 /**
diff --git a/packages/openapi-typescript/examples/programmatic/src/main.ts b/packages/client-generator/examples/programmatic/src/main.ts
similarity index 100%
rename from packages/openapi-typescript/examples/programmatic/src/main.ts
rename to packages/client-generator/examples/programmatic/src/main.ts
diff --git a/packages/openapi-typescript/examples/programmatic/tsconfig.json b/packages/client-generator/examples/programmatic/tsconfig.json
similarity index 100%
rename from packages/openapi-typescript/examples/programmatic/tsconfig.json
rename to packages/client-generator/examples/programmatic/tsconfig.json
diff --git a/packages/openapi-typescript/examples/service-class/.gitignore b/packages/client-generator/examples/service-class/.gitignore
similarity index 100%
rename from packages/openapi-typescript/examples/service-class/.gitignore
rename to packages/client-generator/examples/service-class/.gitignore
diff --git a/packages/openapi-typescript/examples/service-class/README.md b/packages/client-generator/examples/service-class/README.md
similarity index 100%
rename from packages/openapi-typescript/examples/service-class/README.md
rename to packages/client-generator/examples/service-class/README.md
diff --git a/packages/client-generator/examples/service-class/index.html b/packages/client-generator/examples/service-class/index.html
new file mode 100644
index 0000000000..1640e37378
--- /dev/null
+++ b/packages/client-generator/examples/service-class/index.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>Redocly client-generator — service-class example</title>
+  </head>
+  <body>
+    <pre id="out">Loading…</pre>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
diff --git a/packages/openapi-typescript/examples/service-class/openapi.yaml b/packages/client-generator/examples/service-class/openapi.yaml
similarity index 100%
rename from packages/openapi-typescript/examples/service-class/openapi.yaml
rename to packages/client-generator/examples/service-class/openapi.yaml
diff --git a/packages/openapi-typescript/examples/service-class/package.json b/packages/client-generator/examples/service-class/package.json
similarity index 100%
rename from packages/openapi-typescript/examples/service-class/package.json
rename to packages/client-generator/examples/service-class/package.json
diff --git a/packages/openapi-typescript/examples/service-class/redocly.yaml b/packages/client-generator/examples/service-class/redocly.yaml
similarity index 69%
rename from packages/openapi-typescript/examples/service-class/redocly.yaml
rename to packages/client-generator/examples/service-class/redocly.yaml
index 464630889c..638f09dda8 100644
--- a/packages/openapi-typescript/examples/service-class/redocly.yaml
+++ b/packages/client-generator/examples/service-class/redocly.yaml
@@ -1,7 +1,7 @@
 # redocly.yaml — drives `redocly generate-client` for this example.
-# generate-client settings live under the `x-openapi-typescript` extension for now
+# generate-client settings live under the `x-client-generator` extension for now
 # (first-class config support is planned in @redocly/config).
-x-openapi-typescript:
+x-client-generator:
   input: ./openapi.yaml
   output: ./src/api/client.ts
   generators:
diff --git a/packages/openapi-typescript/examples/service-class/src/api/client.ts b/packages/client-generator/examples/service-class/src/api/client.ts
similarity index 99%
rename from packages/openapi-typescript/examples/service-class/src/api/client.ts
rename to packages/client-generator/examples/service-class/src/api/client.ts
index f8ae077856..67d5bdfa23 100644
--- a/packages/openapi-typescript/examples/service-class/src/api/client.ts
+++ b/packages/client-generator/examples/service-class/src/api/client.ts
@@ -1,4 +1,4 @@
-// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Generated by @redocly/client-generator — do not edit by hand.
 // Source: OpenAPI document. Re-run `redocly generate-client` to update.
 
 /**
diff --git a/packages/openapi-typescript/examples/service-class/src/main.ts b/packages/client-generator/examples/service-class/src/main.ts
similarity index 100%
rename from packages/openapi-typescript/examples/service-class/src/main.ts
rename to packages/client-generator/examples/service-class/src/main.ts
diff --git a/packages/openapi-typescript/examples/service-class/tsconfig.json b/packages/client-generator/examples/service-class/tsconfig.json
similarity index 100%
rename from packages/openapi-typescript/examples/service-class/tsconfig.json
rename to packages/client-generator/examples/service-class/tsconfig.json
diff --git a/packages/openapi-typescript/examples/service-class/vite.config.ts b/packages/client-generator/examples/service-class/vite.config.ts
similarity index 100%
rename from packages/openapi-typescript/examples/service-class/vite.config.ts
rename to packages/client-generator/examples/service-class/vite.config.ts
diff --git a/packages/openapi-typescript/examples/tanstack-query/.gitignore b/packages/client-generator/examples/tanstack-query/.gitignore
similarity index 100%
rename from packages/openapi-typescript/examples/tanstack-query/.gitignore
rename to packages/client-generator/examples/tanstack-query/.gitignore
diff --git a/packages/openapi-typescript/examples/tanstack-query/README.md b/packages/client-generator/examples/tanstack-query/README.md
similarity index 100%
rename from packages/openapi-typescript/examples/tanstack-query/README.md
rename to packages/client-generator/examples/tanstack-query/README.md
diff --git a/packages/openapi-typescript/examples/tanstack-query/index.html b/packages/client-generator/examples/tanstack-query/index.html
similarity index 72%
rename from packages/openapi-typescript/examples/tanstack-query/index.html
rename to packages/client-generator/examples/tanstack-query/index.html
index 81fb887cbd..3e8b0cc40b 100644
--- a/packages/openapi-typescript/examples/tanstack-query/index.html
+++ b/packages/client-generator/examples/tanstack-query/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <title>Redocly openapi-typescript — tanstack-query example</title>
+    <title>Redocly client-generator — tanstack-query example</title>
   </head>
   <body>
     <div id="root"></div>
diff --git a/packages/openapi-typescript/examples/tanstack-query/openapi.yaml b/packages/client-generator/examples/tanstack-query/openapi.yaml
similarity index 100%
rename from packages/openapi-typescript/examples/tanstack-query/openapi.yaml
rename to packages/client-generator/examples/tanstack-query/openapi.yaml
diff --git a/packages/openapi-typescript/examples/tanstack-query/package.json b/packages/client-generator/examples/tanstack-query/package.json
similarity index 100%
rename from packages/openapi-typescript/examples/tanstack-query/package.json
rename to packages/client-generator/examples/tanstack-query/package.json
diff --git a/packages/openapi-typescript/examples/tanstack-query/redocly.yaml b/packages/client-generator/examples/tanstack-query/redocly.yaml
similarity index 70%
rename from packages/openapi-typescript/examples/tanstack-query/redocly.yaml
rename to packages/client-generator/examples/tanstack-query/redocly.yaml
index ea445f562e..2683884421 100644
--- a/packages/openapi-typescript/examples/tanstack-query/redocly.yaml
+++ b/packages/client-generator/examples/tanstack-query/redocly.yaml
@@ -1,7 +1,7 @@
 # redocly.yaml — drives `redocly generate-client` for this example.
-# generate-client settings live under the `x-openapi-typescript` extension for now
+# generate-client settings live under the `x-client-generator` extension for now
 # (first-class config support is planned in @redocly/config).
-x-openapi-typescript:
+x-client-generator:
   input: ./openapi.yaml
   output: ./src/api/client.ts
   generators:
diff --git a/packages/openapi-typescript/examples/tanstack-query/src/App.tsx b/packages/client-generator/examples/tanstack-query/src/App.tsx
similarity index 100%
rename from packages/openapi-typescript/examples/tanstack-query/src/App.tsx
rename to packages/client-generator/examples/tanstack-query/src/App.tsx
diff --git a/packages/openapi-typescript/examples/tanstack-query/src/api/client.tanstack.ts b/packages/client-generator/examples/tanstack-query/src/api/client.tanstack.ts
similarity index 98%
rename from packages/openapi-typescript/examples/tanstack-query/src/api/client.tanstack.ts
rename to packages/client-generator/examples/tanstack-query/src/api/client.tanstack.ts
index 1ac33abde9..700d8138fc 100644
--- a/packages/openapi-typescript/examples/tanstack-query/src/api/client.tanstack.ts
+++ b/packages/client-generator/examples/tanstack-query/src/api/client.tanstack.ts
@@ -1,4 +1,4 @@
-// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Generated by @redocly/client-generator — do not edit by hand.
 // Source: OpenAPI document. Re-run `redocly generate-client` to update.
 
 import { queryOptions } from "@tanstack/react-query";
diff --git a/packages/client-generator/examples/tanstack-query/src/api/client.ts b/packages/client-generator/examples/tanstack-query/src/api/client.ts
new file mode 100644
index 0000000000..d037db048b
--- /dev/null
+++ b/packages/client-generator/examples/tanstack-query/src/api/client.ts
@@ -0,0 +1,1518 @@
+// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Redocly Cafe (v1.0.0)
+ * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+ * Create API credentials and try it yourself in a realistic OpenAPI workflow.
+ * 
+ */
+
+export type Page = {
+    /**
+     * Use with the `after` query parameter to load the next page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    endCursor: string | null;
+    /**
+     * Use with the `before` query parameter to load the previous page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    startCursor: string | null;
+    /**
+     * Indicates if there is a next page with items.
+     */
+    hasNextPage: boolean;
+    /**
+     * Indicates if there is a previous page with items.
+     */
+    hasPrevPage: boolean;
+    /**
+     * Value showing how many items are in the page limit.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit: number;
+    /**
+     * Count of items across all pages.
+     * @minimum 0
+     */
+    total: number;
+};
+
+export type MenuBaseItem = {
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt: string;
+    /**
+     * Menu item ID. Unique identifier prefixed with `prd_`.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    readonly id: string;
+    /**
+     * Entity name.
+     */
+    readonly object: "menuItem";
+    /**
+     * Menu item name.
+     * @minLength 1
+     * @maxLength 50
+     */
+    name: string;
+    /**
+     * Price in cents.
+     * @minimum 0
+     */
+    price: number;
+    /**
+     * Photo of the menu item. Must be a PNG image and less than 1MB.
+     * @format binary
+     */
+    photo?: Blob | null;
+    /**
+     * Photo URL of the menu item.
+     * @format uri
+     */
+    readonly photoUrl?: string;
+    photoTextDescription?: string | null;
+};
+
+export type Beverage = {
+    /**
+     * Menu item category.
+     */
+    category: "beverage";
+    /**
+     * Size of the beverage in milliliters.
+     * @exclusiveMinimum 0
+     */
+    volume: number;
+    /**
+     * Indicates if the beverage contains caffeine.
+     */
+    containsCaffeine: boolean;
+} & MenuBaseItem;
+
+export type Dessert = {
+    /**
+     * Menu item category.
+     */
+    category: "dessert";
+    /**
+     * Amount of calories.
+     * @exclusiveMinimum 0
+     */
+    calories: number;
+} & MenuBaseItem;
+
+export type MenuItem = Beverage | Dessert;
+
+export type MenuItemList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: MenuItem[];
+};
+
+export type Error = {
+    /**
+     * URI reference that identifies the problem type.
+     * @format uri-reference
+     */
+    type: string;
+    /**
+     * Short summary of the problem type.
+     */
+    title: string;
+    /**
+     * HTTP status code generated by the origin server for this occurrence of the problem.
+     * @minimum 100
+     * @exclusiveMaximum 600
+     * @format int32
+     */
+    status: number;
+    /**
+     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+     * May be used to locate the root of this problem in the source code.
+     * @format uri-reference
+     */
+    instance?: string;
+    /**
+     * Additional error details.
+     */
+    details?: Record<string, unknown>;
+};
+
+/**
+ * Order status.
+ */
+export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
+
+export const OrderStatus = {
+    placed: "placed",
+    preparing: "preparing",
+    completed: "completed",
+    canceled: "canceled"
+} as const;
+
+export type Order = {
+    /**
+     * Order ID. Unique identifier prefixed with `ord_`.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     * @format ulid
+     */
+    readonly id?: string;
+    /**
+     * Entity name.
+     */
+    readonly object?: "order";
+    /**
+     * Name of the customer who placed the order.
+     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+     * @minLength 1
+     * @maxLength 100
+     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+     */
+    customerName: string;
+    readonly status?: OrderStatus;
+    /**
+     * Total order price in cents.
+     * @minimum 0
+     */
+    readonly totalPrice?: number;
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt?: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt?: string;
+    /**
+     * List of items to include in the order.
+     * @minItems 1
+     */
+    orderItems: {
+        /**
+         * ID of the menu item to add to the order.
+         * @format ulid
+         */
+        menuItemId: string;
+        /**
+         * Quantity of the menu item.
+         * @minimum 1
+         */
+        quantity: number;
+        /**
+         * Discount amount in cents (absolute value).
+         * @minimum 0
+         */
+        discount?: number;
+        /**
+         * Optional comment for the order item (e.g., "No sugar").
+         * @maxLength 500
+         */
+        comment?: string;
+    }[];
+};
+
+export type OrderList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: Order[];
+};
+
+export type OrderItem = {
+    /**
+     * ID of the menu item to add to the order.
+     */
+    menuItemId: string;
+    /**
+     * Menu item that is part of the order.
+     */
+    readonly menuItem?: MenuItem;
+    /**
+     * Quantity of the menu item.
+     * @minimum 1
+     */
+    quantity: number;
+    /**
+     * Discount amount in cents (absolute value).
+     * @minimum 0
+     */
+    discount?: number;
+    /**
+     * Optional comment for the order item (e.g., "No sugar").
+     * @maxLength 500
+     */
+    comment?: string;
+};
+
+/**
+ * Revenue statistics for a given date range.
+ */
+export type RevenueStatistics = {
+    /**
+     * Total revenue in cents from completed orders.
+     * @minimum 0
+     * @format float
+     */
+    revenue: number;
+    /**
+     * Average order amount in cents (calculated from completed orders only).
+     * @minimum 0
+     * @format float
+     */
+    averageOrderAmount: number;
+    /**
+     * Total number of orders (all statuses) in the date range.
+     * @minimum 0
+     */
+    totalOrders: number;
+    /**
+     * Number of placed orders.
+     * @minimum 0
+     */
+    placedOrders: number;
+    /**
+     * Number of preparing orders.
+     * @minimum 0
+     */
+    preparingOrders: number;
+    /**
+     * Number of completed orders.
+     * @minimum 0
+     */
+    completedOrders: number;
+    /**
+     * Number of canceled orders.
+     * @minimum 0
+     */
+    canceledOrders: number;
+    /**
+     * Start date of the revenue calculation period.
+     * @format date
+     */
+    startDate: string;
+    /**
+     * End date of the revenue calculation period.
+     * @format date
+     */
+    endDate: string;
+};
+
+export type RegisterClientObject = {
+    /**
+     * Client name.
+     */
+    name: string;
+    /**
+     * List of redirect URIs (optional, defaults to empty array).
+     */
+    redirectUris?: string[];
+    /**
+     * List of scopes.
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types.
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+/**
+ * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+ */
+export type OAuth2Client = {
+    /**
+     * Client identifier issued by the authorization server.
+     */
+    clientId: string;
+    /**
+     * Client secret issued by the authorization server.
+     */
+    clientSecret: string;
+    /**
+     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+     * @format int64
+     */
+    clientIdIssuedAt: number;
+    /**
+     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+     * @format int64
+     */
+    clientSecretExpiresAt: number;
+    /**
+     * Client name (registered metadata).
+     */
+    name?: string;
+    /**
+     * List of redirect URIs (registered metadata).
+     */
+    redirectUris?: string[];
+    /**
+     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
+     * @format uri
+     */
+    registrationClientUri: string;
+    /**
+     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+     */
+    registrationAccessToken: string;
+    /**
+     * List of scopes (registered metadata).
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types (registered metadata).
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+export type OrderNotification = {
+    /**
+     * Unique order identifier.
+     */
+    orderId: string;
+    orderStatus: OrderStatus;
+    /**
+     * When the event occurred.
+     * @format date-time
+     */
+    timestamp: string;
+};
+
+/**
+ * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
+ */
+export function isBeverage(value: MenuItem): value is Beverage {
+    return (value as Record<string, unknown>)["category"] === "beverage";
+}
+
+/**
+ * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
+ */
+export function isDessert(value: MenuItem): value is Dessert {
+    return (value as Record<string, unknown>)["category"] === "dessert";
+}
+
+/**
+ * Static metadata for every operation, keyed by operationId: the HTTP `method`
+ * and the `path` template (with `{param}` placeholders intact). Minification-safe
+ * — useful for building cache/query keys, tracing span names, and request logging
+ * without re-deriving them at each call site.
+ */
+export const OPERATIONS = {
+    listMenuItems: { method: "GET", path: "/menu" },
+    createMenuItem: { method: "POST", path: "/menu" },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
+    listOrders: { method: "GET", path: "/orders" },
+    createOrder: { method: "POST", path: "/orders" },
+    getOrderById: { method: "GET", path: "/orders/{orderId}" },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
+    listOrderItems: { method: "GET", path: "/order-items" },
+    getRevenue: { method: "GET", path: "/revenue" },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
+} as const;
+
+/**
+ * The operationId of any operation in this client.
+ */
+export type OperationId = keyof typeof OPERATIONS;
+
+/**
+ * Static metadata describing one operation: its HTTP method and path template.
+ */
+export type OperationMetadata = {
+    readonly method: string;
+    readonly path: string;
+};
+
+let BASE = "https://api.cafe.redocly.com";
+
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+export type RequestContext = {
+    url: string;
+    method: string;
+    headers: Record<string, string>;
+    body?: unknown;
+};
+
+/**
+ * Configuration and extension hooks for a client. Supplied per-instance via
+ * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
+ * (functions facade).
+ */
+export type ClientConfig = {
+    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    baseUrl?: string;
+    /** Extra headers merged into every request; a function is invoked per request. */
+    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+    /** Transport used to issue requests. Defaults to the global `fetch`. */
+    fetch?: typeof fetch;
+    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    /** Observe — or replace, by returning a `Response` — the response before parsing. */
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    /**
+     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
+     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
+     */
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
+    /**
+     * Composable interceptors run around every request, alongside the single
+     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
+     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
+     * the last-registered middleware wraps closest to the network. Register more at runtime
+     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
+     */
+    middleware?: Middleware[];
+    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
+    retry?: RetryConfig;
+    /**
+     * Per-instance auth credentials. When set, they override the module-global
+     * `set*` helpers for requests made through this config (each scheme falls back
+     * to its global slot when omitted here). Only the schemes an operation declares
+     * in its `security` are ever sent.
+     */
+    auth?: AuthCredentials;
+};
+
+/**
+ * A request interceptor; every field is optional, so a middleware can hook any subset of
+ * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
+ * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
+ * failure into the error to throw, threaded through each middleware in turn.
+ */
+export type Middleware = {
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/** Context handed to `retryOn` for the attempt that just failed. */
+export type RetryContext = {
+    /** 1-based number of the attempt that just failed. */
+    attempt: number;
+    /** The request that was attempted. */
+    request: RequestContext;
+    /** Present when the server returned a (non-ok) response. */
+    response?: Response;
+    /** Present when the transport threw (network error, DNS, connection reset). */
+    error?: unknown;
+};
+
+/** Retry policy; all fields optional with sensible defaults. */
+export type RetryConfig = {
+    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
+    retries?: number;
+    /** Base delay in milliseconds. Default 1000. */
+    retryDelay?: number;
+    /** Backoff shape. Default 'exponential'. */
+    retryStrategy?: RetryStrategy;
+    /** Apply full jitter over the computed delay. Default true. */
+    jitter?: boolean;
+    /**
+     * Decide whether to retry a failed attempt. Default: retry only idempotent
+     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
+     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
+     */
+    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
+};
+
+/**
+ * How the response body is read. `'auto'` negotiates from the content type (the
+ * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
+ */
+export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
+
+/**
+ * The trailing per-operation argument: standard `RequestInit` plus an optional
+ * per-call retry override and a `parseAs` escape hatch.
+ *
+ * `parseAs` forces how the response body is read; overrides the inferred kind.
+ * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
+ * override — the static return type is unchanged.
+ */
+export type RequestOptions = RequestInit & {
+    retry?: Partial<RetryConfig>;
+    parseAs?: ParseAs;
+};
+
+/**
+ * Override the base URL used by every generated operation. Useful when the
+ * runtime environment differs from the value declared in `servers[0].url`
+ * (e.g. dev / staging / prod toggles in a single-page app).
+ *
+ * Mutates a module-scoped binding shared by the functions facade. For multiple
+ * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ */
+export function setBaseUrl(url: string): void {
+    BASE = url;
+}
+
+/** The global config used by the functions facade (see `configure`). */
+const __config: ClientConfig = {};
+
+/**
+ * Merge `config` into the global configuration used by the functions facade —
+ * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
+ * hooks once for every free function. The service-class facade configures per
+ * instance instead (`new Client(config)`).
+ */
+export function configure(config: ClientConfig): void {
+    Object.assign(__config, config);
+}
+
+/**
+ * Append interceptors to the functions facade's global middleware chain (see
+ * `ClientConfig.middleware`). The service-class facade registers per instance via
+ * `<Client>.use(...)` instead.
+ */
+export function use(...middleware: Middleware[]): void {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    __config.middleware = [...(__config.middleware ?? []), ...middleware];
+}
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function __middleware(config: ClientConfig): Middleware[] {
+    const single = config.onRequest || config.onResponse || config.onError
+        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+        : [];
+    return [...single, ...(config.middleware ?? [])];
+}
+
+export class ApiError extends Error {
+    public readonly url: string;
+    public readonly status: number;
+    public readonly statusText: string;
+    public readonly body: unknown;
+    constructor(url: string, status: number, statusText: string, body: unknown) {
+        super(`Request failed with status ${status}`);
+        this.name = 'ApiError';
+        this.url = url;
+        this.status = status;
+        this.statusText = statusText;
+        this.body = body;
+    }
+}
+
+type QueryPrimitive = string | number | boolean;
+
+type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
+
+/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
+type QueryStyle = {
+    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+    explode: boolean;
+    allowReserved?: boolean;
+};
+
+/**
+ * Percent-encode `value` but leave the RFC-3986 reserved set
+ * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
+ */
+function __encodeReserved(value: string): string {
+    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
+}
+
+function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
+    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    if (!query)
+        return url;
+    const params = new URLSearchParams();
+    const raw: string[] = [];
+    for (const [key, value] of Object.entries(query)) {
+        if (value === undefined || value === null)
+            continue;
+        const spec = styles?.[key];
+        if (!spec) {
+            if (Array.isArray(value)) {
+                for (const v of value) {
+                    if (v !== undefined && v !== null)
+                        params.append(key, String(v));
+                }
+            }
+            else if (typeof value === 'object') {
+                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+                for (const [subKey, subValue] of Object.entries(value)) {
+                    if (subValue !== undefined && subValue !== null) {
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                    }
+                }
+            }
+            else {
+                params.append(key, String(value));
+            }
+            continue;
+        }
+        if (Array.isArray(value)) {
+            const items = value.filter((v) => v !== undefined && v !== null).map(String);
+            if (spec.style === 'form' && spec.explode) {
+                for (const v of items) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}=${__encodeReserved(v)}`);
+                    else
+                        params.append(key, v);
+                }
+            }
+            else {
+                // Delimited styles put the LITERAL delimiter on the wire; only the
+                // values are encoded. `%20` (not `+`) is the literal space delimiter.
+                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
+                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+            }
+        }
+        else if (typeof value === 'object') {
+            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+            for (const [subKey, subValue] of Object.entries(value)) {
+                if (subValue !== undefined && subValue !== null) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
+                    else
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                }
+            }
+        }
+        else if (spec.allowReserved) {
+            raw.push(`${key}=${__encodeReserved(String(value))}`);
+        }
+        else {
+            params.append(key, String(value));
+        }
+    }
+    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+    return qs ? `${url}?${qs}` : url;
+}
+
+async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+    response: Response;
+    context: RequestContext;
+}> {
+    const { retry: callRetry, ...fetchInit } = init;
+    const retry: RetryConfig = { ...config.retry, ...callRetry };
+    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+    const headers: Record<string, string> = {
+        Accept: 'application/json',
+        ...extra,
+        ...(fetchInit.headers as Record<string, string> | undefined),
+    };
+    let payload: BodyInit | undefined;
+    if (body !== undefined) {
+        const isBinary = body instanceof Blob ||
+            body instanceof ArrayBuffer ||
+            ArrayBuffer.isView(body as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
+        const isURLSearchParams = body instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
+            payload = body as BodyInit;
+        }
+        else {
+            payload = JSON.stringify(body);
+            if (!('Content-Type' in headers) && !('content-type' in headers)) {
+                headers['Content-Type'] = 'application/json';
+            }
+        }
+    }
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    const doFetch = config.fetch ?? fetch;
+    const maxAttempts = 1 + (retry.retries ?? 0);
+    const retryOn = retry.retryOn ?? __defaultRetryOn;
+    const signal = fetchInit.signal ?? undefined;
+    let attempt = 0;
+    while (true) {
+        attempt++;
+        if (signal?.aborted)
+            throw __abortError(signal);
+        let response: Response;
+        try {
+            response = await doFetch(context.url, {
+                ...fetchInit,
+                method: context.method,
+                headers: context.headers,
+                body: payload,
+            });
+        }
+        catch (error) {
+            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
+                await __sleep(__retryDelay(retry, attempt, null), signal);
+                continue;
+            }
+            throw error;
+        }
+        // Reverse order: the last-registered middleware wraps closest to the network (onion).
+        for (let i = middleware.length - 1; i >= 0; i--) {
+            const onResponse = middleware[i].onResponse;
+            if (onResponse) {
+                const replaced = await onResponse(response, context);
+                if (replaced)
+                    response = replaced;
+            }
+        }
+        if (!response.ok &&
+            attempt < maxAttempts &&
+            !signal?.aborted &&
+            (await retryOn({ attempt, request: context, response }))) {
+            const retryAfter = response.headers.get('retry-after');
+            // Drain the abandoned response body before the next attempt: an unread body
+            // keeps the connection checked out (and can stall the pool) under Node/undici
+            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+            await response.body?.cancel().catch(() => undefined);
+            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
+            continue;
+        }
+        return { response, context };
+    }
+}
+
+async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+    if (kind === 'void' || response.status === 204)
+        return undefined;
+    if (kind === 'stream')
+        return response.body;
+    if (kind === 'blob')
+        return response.blob();
+    if (kind === 'arrayBuffer')
+        return response.arrayBuffer();
+    if (kind === 'formData')
+        return response.formData();
+    if (kind === 'text')
+        return response.text();
+    if (kind === 'json')
+        return response.json();
+    // 'auto' — negotiate from the response's content type.
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json'))
+        return response.json();
+    if (contentType.startsWith('text/'))
+        return response.text();
+    return response.blob();
+}
+
+async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+    const { parseAs, ...sendInit } = init;
+    const { response, context } = await __send(config, url, sendInit, body);
+    if (!response.ok) {
+        const errorBody = await readError(response);
+        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
+        // Thread the error through each middleware's onError in turn (each may replace it).
+        for (const mw of __middleware(config)) {
+            if (mw.onError)
+                error = await mw.onError(error as ApiError, context);
+        }
+        throw error;
+    }
+    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
+    return (await __parse(response, kind)) as T;
+}
+
+async function readError(response: Response): Promise<unknown> {
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json')) {
+        return response.json().catch(() => undefined);
+    }
+    return response.text().catch(() => undefined);
+}
+
+const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+
+const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+function __defaultRetryOn(ctx: RetryContext): boolean {
+    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
+        return false;
+    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+    if (retryAfter) {
+        const seconds = Number(retryAfter);
+        if (!Number.isNaN(seconds))
+            return seconds * 1000;
+        const when = Date.parse(retryAfter);
+        if (!Number.isNaN(when))
+            return Math.max(0, when - Date.now());
+    }
+    const base = retry.retryDelay ?? 1000;
+    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+    return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
+    return new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject(__abortError(signal));
+            return;
+        }
+        const onAbort = () => {
+            clearTimeout(timer);
+            reject(__abortError(signal as AbortSignal));
+        };
+        const timer = setTimeout(() => {
+            if (signal)
+                signal.removeEventListener('abort', onAbort);
+            resolve();
+        }, ms);
+        if (signal)
+            signal.addEventListener('abort', onAbort, { once: true });
+    });
+}
+
+function __abortError(signal: AbortSignal): globalThis.Error {
+    const reason = (signal as {
+        reason?: unknown;
+    }).reason;
+    if (reason instanceof Error)
+        return reason;
+    return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * Normalize an operation's header-parameter object into a plain string record,
+ * dropping any `undefined` / `null` entries (optional headers the caller omitted)
+ * and stringifying the rest. Mirrors __buildUrl's handling of query values.
+ */
+function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
+    const out: Record<string, string> = {};
+    for (const [key, value] of Object.entries(values)) {
+        if (value !== undefined && value !== null)
+            out[key] = String(value);
+    }
+    return out;
+}
+
+/**
+ * A credential value, or a (possibly async) function that returns one per request.
+ */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/**
+ * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
+ * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
+ * to the global slots.
+ */
+export type AuthCredentials = {
+    bearer?: TokenProvider;
+    apiKey?: Record<string, TokenProvider>;
+};
+
+let __bearerToken: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
+ * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
+ * (possibly async) function resolved per request.
+ */
+export function setBearer(token: TokenProvider | null): void {
+    __bearerToken = token;
+}
+
+let __apiKey_ApiKey: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
+ * string or a (possibly async) function resolved per request.
+ */
+export function setApiKey(key: TokenProvider | null): void {
+    __apiKey_ApiKey = key;
+}
+
+/**
+ * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
+ */
+async function __resolve(slot: TokenProvider | null): Promise<string | null> {
+    if (slot === null)
+        return null;
+    return typeof slot === "function" ? slot() : slot;
+}
+
+/**
+ * Build the auth `headers` and `query` for an operation from the currently-set credentials.
+ * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
+ * can always override by passing their own `init.headers`.
+ */
+async function __auth(schemes: string[], config: ClientConfig): Promise<{
+    headers: Record<string, string>;
+    query: Record<string, string>;
+}> {
+    const headers: Record<string, string> = {};
+    const query: Record<string, string> = {};
+    const cookies: string[] = [];
+    for (const scheme of schemes) {
+        switch (scheme) {
+            case "OAuth2": {
+                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
+                if (v !== null)
+                    headers["Authorization"] = `Bearer ${v}`;
+                break;
+            }
+            case "ApiKey": {
+                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
+                if (v !== null)
+                    headers["X-API-Key"] = v;
+                break;
+            }
+        }
+    }
+    if (cookies.length > 0)
+        headers["Cookie"] = cookies.join("; ");
+    return { headers, query };
+}
+
+export type ListMenuItemsResult = MenuItemList;
+
+export type ListMenuItemsParams = {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+};
+
+export type ListMenuItemsVariables = {
+    params?: ListMenuItemsParams;
+};
+
+/**
+ * List all menu items
+ *
+ * Retrieve a collection of menu items with optional filtering and pagination.
+ */
+export async function listMenuItems(params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
+    return __request<MenuItemList>(__config, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
+}
+
+export type CreateMenuItemResult = MenuItem;
+
+export type CreateMenuItemBody = FormData;
+
+export type CreateMenuItemVariables = {
+    body: CreateMenuItemBody;
+};
+
+/**
+ * Create menu item
+ *
+ * Create a new menu item.
+ */
+export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<MenuItem>(__config, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type DeleteMenuItemResult = void;
+
+export type DeleteMenuItemVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+};
+
+/**
+ * Delete a menu item
+ *
+ * Delete an existing menu item.
+ */
+export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type GetMenuItemPhotoResult = Blob | string;
+
+export type GetMenuItemPhotoParams = {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+};
+
+export type GetMenuItemPhotoVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+    params?: GetMenuItemPhotoParams;
+};
+
+/**
+ * Retrieve a menu item photo
+ *
+ * Retrieve the product photo image for a specific menu item.
+ */
+export async function getMenuItemPhoto(menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}): Promise<Blob | string> {
+    return __request<Blob | string>(__config, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+}
+
+export type ListOrdersResult = OrderList;
+
+export type ListOrdersParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+};
+
+export type ListOrdersVariables = {
+    params?: ListOrdersParams;
+};
+
+/**
+ * List all orders
+ *
+ * Retrieve a collection of orders with optional filtering and pagination.
+ */
+export async function listOrders(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderList> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderList>(__config, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+/**
+ * Create order
+ *
+ * Create a new order.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    headers?: GetOrderByIdHeaders;
+};
+
+/**
+ * Retrieve an order
+ *
+ * Retrieve a single order by its ID.
+ */
+export async function getOrderById(orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+}
+
+export type DeleteOrderResult = void;
+
+export type DeleteOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+};
+
+/**
+ * Delete an order
+ *
+ * Delete the order.
+ * To keep the order history, the order should be canceled instead of deleted.
+ */
+export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type UpdateOrderResult = Order;
+
+export type UpdateOrderBody = {
+    status: OrderStatus;
+};
+
+export type UpdateOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    body?: UpdateOrderBody;
+};
+
+/**
+ * Partially update an order
+ *
+ * Update an existing order status.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function updateOrder(orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type ListOrderItemsResult = OrderItem[];
+
+export type ListOrderItemsParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+};
+
+export type ListOrderItemsVariables = {
+    params?: ListOrderItemsParams;
+};
+
+/**
+ * List all order items with menu item details
+ *
+ * Returns an array of order items for a specific order.
+ * Use the `filter` parameter to filter by order ID.
+ */
+export async function listOrderItems(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderItem[]>(__config, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+/**
+ * Get revenue statistics
+ *
+ * Retrieve revenue statistics for a configurable date range.
+ * Returns revenue, order counts, average order amount, and other useful statistics.
+ */
+export async function getRevenue(params: {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
+    const __a = await __auth(["ApiKey"], __config);
+    return __request<RevenueStatistics>(__config, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Create OAuth2 client
+ *
+ * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+ * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
+ *   `redirectUris` must be provided (per RFC 7591 Section 2).
+ * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+ * Returns the registered client information per RFC 7591, including:
+ * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+ */
+export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
+    return __request<OAuth2Client>(__config, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+}
diff --git a/packages/openapi-typescript/examples/tanstack-query/src/main.tsx b/packages/client-generator/examples/tanstack-query/src/main.tsx
similarity index 100%
rename from packages/openapi-typescript/examples/tanstack-query/src/main.tsx
rename to packages/client-generator/examples/tanstack-query/src/main.tsx
diff --git a/packages/openapi-typescript/examples/tanstack-query/tsconfig.json b/packages/client-generator/examples/tanstack-query/tsconfig.json
similarity index 100%
rename from packages/openapi-typescript/examples/tanstack-query/tsconfig.json
rename to packages/client-generator/examples/tanstack-query/tsconfig.json
diff --git a/packages/openapi-typescript/examples/tanstack-query/vite.config.ts b/packages/client-generator/examples/tanstack-query/vite.config.ts
similarity index 100%
rename from packages/openapi-typescript/examples/tanstack-query/vite.config.ts
rename to packages/client-generator/examples/tanstack-query/vite.config.ts
diff --git a/packages/openapi-typescript/examples/tsconfig.base.json b/packages/client-generator/examples/tsconfig.base.json
similarity index 100%
rename from packages/openapi-typescript/examples/tsconfig.base.json
rename to packages/client-generator/examples/tsconfig.base.json
diff --git a/packages/openapi-typescript/examples/zod/.gitignore b/packages/client-generator/examples/zod/.gitignore
similarity index 100%
rename from packages/openapi-typescript/examples/zod/.gitignore
rename to packages/client-generator/examples/zod/.gitignore
diff --git a/packages/openapi-typescript/examples/zod/README.md b/packages/client-generator/examples/zod/README.md
similarity index 100%
rename from packages/openapi-typescript/examples/zod/README.md
rename to packages/client-generator/examples/zod/README.md
diff --git a/packages/openapi-typescript/examples/mock/index.html b/packages/client-generator/examples/zod/index.html
similarity index 76%
rename from packages/openapi-typescript/examples/mock/index.html
rename to packages/client-generator/examples/zod/index.html
index d1621f420e..8c0c18b5ec 100644
--- a/packages/openapi-typescript/examples/mock/index.html
+++ b/packages/client-generator/examples/zod/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <title>Redocly openapi-typescript — zod example</title>
+    <title>Redocly client-generator — zod example</title>
   </head>
   <body>
     <pre id="out">Loading…</pre>
diff --git a/packages/openapi-typescript/examples/zod/openapi.yaml b/packages/client-generator/examples/zod/openapi.yaml
similarity index 100%
rename from packages/openapi-typescript/examples/zod/openapi.yaml
rename to packages/client-generator/examples/zod/openapi.yaml
diff --git a/packages/openapi-typescript/examples/zod/package.json b/packages/client-generator/examples/zod/package.json
similarity index 100%
rename from packages/openapi-typescript/examples/zod/package.json
rename to packages/client-generator/examples/zod/package.json
diff --git a/packages/openapi-typescript/examples/zod/redocly.yaml b/packages/client-generator/examples/zod/redocly.yaml
similarity index 69%
rename from packages/openapi-typescript/examples/zod/redocly.yaml
rename to packages/client-generator/examples/zod/redocly.yaml
index 9c95ea8a71..353f73636c 100644
--- a/packages/openapi-typescript/examples/zod/redocly.yaml
+++ b/packages/client-generator/examples/zod/redocly.yaml
@@ -1,7 +1,7 @@
 # redocly.yaml — drives `redocly generate-client` for this example.
-# generate-client settings live under the `x-openapi-typescript` extension for now
+# generate-client settings live under the `x-client-generator` extension for now
 # (first-class config support is planned in @redocly/config).
-x-openapi-typescript:
+x-client-generator:
   input: ./openapi.yaml
   output: ./src/api/client.ts
   generators:
diff --git a/packages/client-generator/examples/zod/src/api/client.ts b/packages/client-generator/examples/zod/src/api/client.ts
new file mode 100644
index 0000000000..d037db048b
--- /dev/null
+++ b/packages/client-generator/examples/zod/src/api/client.ts
@@ -0,0 +1,1518 @@
+// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Redocly Cafe (v1.0.0)
+ * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+ * Create API credentials and try it yourself in a realistic OpenAPI workflow.
+ * 
+ */
+
+export type Page = {
+    /**
+     * Use with the `after` query parameter to load the next page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    endCursor: string | null;
+    /**
+     * Use with the `before` query parameter to load the previous page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    startCursor: string | null;
+    /**
+     * Indicates if there is a next page with items.
+     */
+    hasNextPage: boolean;
+    /**
+     * Indicates if there is a previous page with items.
+     */
+    hasPrevPage: boolean;
+    /**
+     * Value showing how many items are in the page limit.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit: number;
+    /**
+     * Count of items across all pages.
+     * @minimum 0
+     */
+    total: number;
+};
+
+export type MenuBaseItem = {
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt: string;
+    /**
+     * Menu item ID. Unique identifier prefixed with `prd_`.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    readonly id: string;
+    /**
+     * Entity name.
+     */
+    readonly object: "menuItem";
+    /**
+     * Menu item name.
+     * @minLength 1
+     * @maxLength 50
+     */
+    name: string;
+    /**
+     * Price in cents.
+     * @minimum 0
+     */
+    price: number;
+    /**
+     * Photo of the menu item. Must be a PNG image and less than 1MB.
+     * @format binary
+     */
+    photo?: Blob | null;
+    /**
+     * Photo URL of the menu item.
+     * @format uri
+     */
+    readonly photoUrl?: string;
+    photoTextDescription?: string | null;
+};
+
+export type Beverage = {
+    /**
+     * Menu item category.
+     */
+    category: "beverage";
+    /**
+     * Size of the beverage in milliliters.
+     * @exclusiveMinimum 0
+     */
+    volume: number;
+    /**
+     * Indicates if the beverage contains caffeine.
+     */
+    containsCaffeine: boolean;
+} & MenuBaseItem;
+
+export type Dessert = {
+    /**
+     * Menu item category.
+     */
+    category: "dessert";
+    /**
+     * Amount of calories.
+     * @exclusiveMinimum 0
+     */
+    calories: number;
+} & MenuBaseItem;
+
+export type MenuItem = Beverage | Dessert;
+
+export type MenuItemList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: MenuItem[];
+};
+
+export type Error = {
+    /**
+     * URI reference that identifies the problem type.
+     * @format uri-reference
+     */
+    type: string;
+    /**
+     * Short summary of the problem type.
+     */
+    title: string;
+    /**
+     * HTTP status code generated by the origin server for this occurrence of the problem.
+     * @minimum 100
+     * @exclusiveMaximum 600
+     * @format int32
+     */
+    status: number;
+    /**
+     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+     * May be used to locate the root of this problem in the source code.
+     * @format uri-reference
+     */
+    instance?: string;
+    /**
+     * Additional error details.
+     */
+    details?: Record<string, unknown>;
+};
+
+/**
+ * Order status.
+ */
+export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
+
+export const OrderStatus = {
+    placed: "placed",
+    preparing: "preparing",
+    completed: "completed",
+    canceled: "canceled"
+} as const;
+
+export type Order = {
+    /**
+     * Order ID. Unique identifier prefixed with `ord_`.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     * @format ulid
+     */
+    readonly id?: string;
+    /**
+     * Entity name.
+     */
+    readonly object?: "order";
+    /**
+     * Name of the customer who placed the order.
+     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+     * @minLength 1
+     * @maxLength 100
+     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+     */
+    customerName: string;
+    readonly status?: OrderStatus;
+    /**
+     * Total order price in cents.
+     * @minimum 0
+     */
+    readonly totalPrice?: number;
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt?: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt?: string;
+    /**
+     * List of items to include in the order.
+     * @minItems 1
+     */
+    orderItems: {
+        /**
+         * ID of the menu item to add to the order.
+         * @format ulid
+         */
+        menuItemId: string;
+        /**
+         * Quantity of the menu item.
+         * @minimum 1
+         */
+        quantity: number;
+        /**
+         * Discount amount in cents (absolute value).
+         * @minimum 0
+         */
+        discount?: number;
+        /**
+         * Optional comment for the order item (e.g., "No sugar").
+         * @maxLength 500
+         */
+        comment?: string;
+    }[];
+};
+
+export type OrderList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: Order[];
+};
+
+export type OrderItem = {
+    /**
+     * ID of the menu item to add to the order.
+     */
+    menuItemId: string;
+    /**
+     * Menu item that is part of the order.
+     */
+    readonly menuItem?: MenuItem;
+    /**
+     * Quantity of the menu item.
+     * @minimum 1
+     */
+    quantity: number;
+    /**
+     * Discount amount in cents (absolute value).
+     * @minimum 0
+     */
+    discount?: number;
+    /**
+     * Optional comment for the order item (e.g., "No sugar").
+     * @maxLength 500
+     */
+    comment?: string;
+};
+
+/**
+ * Revenue statistics for a given date range.
+ */
+export type RevenueStatistics = {
+    /**
+     * Total revenue in cents from completed orders.
+     * @minimum 0
+     * @format float
+     */
+    revenue: number;
+    /**
+     * Average order amount in cents (calculated from completed orders only).
+     * @minimum 0
+     * @format float
+     */
+    averageOrderAmount: number;
+    /**
+     * Total number of orders (all statuses) in the date range.
+     * @minimum 0
+     */
+    totalOrders: number;
+    /**
+     * Number of placed orders.
+     * @minimum 0
+     */
+    placedOrders: number;
+    /**
+     * Number of preparing orders.
+     * @minimum 0
+     */
+    preparingOrders: number;
+    /**
+     * Number of completed orders.
+     * @minimum 0
+     */
+    completedOrders: number;
+    /**
+     * Number of canceled orders.
+     * @minimum 0
+     */
+    canceledOrders: number;
+    /**
+     * Start date of the revenue calculation period.
+     * @format date
+     */
+    startDate: string;
+    /**
+     * End date of the revenue calculation period.
+     * @format date
+     */
+    endDate: string;
+};
+
+export type RegisterClientObject = {
+    /**
+     * Client name.
+     */
+    name: string;
+    /**
+     * List of redirect URIs (optional, defaults to empty array).
+     */
+    redirectUris?: string[];
+    /**
+     * List of scopes.
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types.
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+/**
+ * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+ */
+export type OAuth2Client = {
+    /**
+     * Client identifier issued by the authorization server.
+     */
+    clientId: string;
+    /**
+     * Client secret issued by the authorization server.
+     */
+    clientSecret: string;
+    /**
+     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+     * @format int64
+     */
+    clientIdIssuedAt: number;
+    /**
+     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+     * @format int64
+     */
+    clientSecretExpiresAt: number;
+    /**
+     * Client name (registered metadata).
+     */
+    name?: string;
+    /**
+     * List of redirect URIs (registered metadata).
+     */
+    redirectUris?: string[];
+    /**
+     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
+     * @format uri
+     */
+    registrationClientUri: string;
+    /**
+     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+     */
+    registrationAccessToken: string;
+    /**
+     * List of scopes (registered metadata).
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types (registered metadata).
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+export type OrderNotification = {
+    /**
+     * Unique order identifier.
+     */
+    orderId: string;
+    orderStatus: OrderStatus;
+    /**
+     * When the event occurred.
+     * @format date-time
+     */
+    timestamp: string;
+};
+
+/**
+ * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
+ */
+export function isBeverage(value: MenuItem): value is Beverage {
+    return (value as Record<string, unknown>)["category"] === "beverage";
+}
+
+/**
+ * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
+ */
+export function isDessert(value: MenuItem): value is Dessert {
+    return (value as Record<string, unknown>)["category"] === "dessert";
+}
+
+/**
+ * Static metadata for every operation, keyed by operationId: the HTTP `method`
+ * and the `path` template (with `{param}` placeholders intact). Minification-safe
+ * — useful for building cache/query keys, tracing span names, and request logging
+ * without re-deriving them at each call site.
+ */
+export const OPERATIONS = {
+    listMenuItems: { method: "GET", path: "/menu" },
+    createMenuItem: { method: "POST", path: "/menu" },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
+    listOrders: { method: "GET", path: "/orders" },
+    createOrder: { method: "POST", path: "/orders" },
+    getOrderById: { method: "GET", path: "/orders/{orderId}" },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
+    listOrderItems: { method: "GET", path: "/order-items" },
+    getRevenue: { method: "GET", path: "/revenue" },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
+} as const;
+
+/**
+ * The operationId of any operation in this client.
+ */
+export type OperationId = keyof typeof OPERATIONS;
+
+/**
+ * Static metadata describing one operation: its HTTP method and path template.
+ */
+export type OperationMetadata = {
+    readonly method: string;
+    readonly path: string;
+};
+
+let BASE = "https://api.cafe.redocly.com";
+
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+export type RequestContext = {
+    url: string;
+    method: string;
+    headers: Record<string, string>;
+    body?: unknown;
+};
+
+/**
+ * Configuration and extension hooks for a client. Supplied per-instance via
+ * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
+ * (functions facade).
+ */
+export type ClientConfig = {
+    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    baseUrl?: string;
+    /** Extra headers merged into every request; a function is invoked per request. */
+    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+    /** Transport used to issue requests. Defaults to the global `fetch`. */
+    fetch?: typeof fetch;
+    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    /** Observe — or replace, by returning a `Response` — the response before parsing. */
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    /**
+     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
+     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
+     */
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
+    /**
+     * Composable interceptors run around every request, alongside the single
+     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
+     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
+     * the last-registered middleware wraps closest to the network. Register more at runtime
+     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
+     */
+    middleware?: Middleware[];
+    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
+    retry?: RetryConfig;
+    /**
+     * Per-instance auth credentials. When set, they override the module-global
+     * `set*` helpers for requests made through this config (each scheme falls back
+     * to its global slot when omitted here). Only the schemes an operation declares
+     * in its `security` are ever sent.
+     */
+    auth?: AuthCredentials;
+};
+
+/**
+ * A request interceptor; every field is optional, so a middleware can hook any subset of
+ * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
+ * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
+ * failure into the error to throw, threaded through each middleware in turn.
+ */
+export type Middleware = {
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/** Context handed to `retryOn` for the attempt that just failed. */
+export type RetryContext = {
+    /** 1-based number of the attempt that just failed. */
+    attempt: number;
+    /** The request that was attempted. */
+    request: RequestContext;
+    /** Present when the server returned a (non-ok) response. */
+    response?: Response;
+    /** Present when the transport threw (network error, DNS, connection reset). */
+    error?: unknown;
+};
+
+/** Retry policy; all fields optional with sensible defaults. */
+export type RetryConfig = {
+    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
+    retries?: number;
+    /** Base delay in milliseconds. Default 1000. */
+    retryDelay?: number;
+    /** Backoff shape. Default 'exponential'. */
+    retryStrategy?: RetryStrategy;
+    /** Apply full jitter over the computed delay. Default true. */
+    jitter?: boolean;
+    /**
+     * Decide whether to retry a failed attempt. Default: retry only idempotent
+     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
+     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
+     */
+    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
+};
+
+/**
+ * How the response body is read. `'auto'` negotiates from the content type (the
+ * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
+ */
+export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
+
+/**
+ * The trailing per-operation argument: standard `RequestInit` plus an optional
+ * per-call retry override and a `parseAs` escape hatch.
+ *
+ * `parseAs` forces how the response body is read; overrides the inferred kind.
+ * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
+ * override — the static return type is unchanged.
+ */
+export type RequestOptions = RequestInit & {
+    retry?: Partial<RetryConfig>;
+    parseAs?: ParseAs;
+};
+
+/**
+ * Override the base URL used by every generated operation. Useful when the
+ * runtime environment differs from the value declared in `servers[0].url`
+ * (e.g. dev / staging / prod toggles in a single-page app).
+ *
+ * Mutates a module-scoped binding shared by the functions facade. For multiple
+ * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ */
+export function setBaseUrl(url: string): void {
+    BASE = url;
+}
+
+/** The global config used by the functions facade (see `configure`). */
+const __config: ClientConfig = {};
+
+/**
+ * Merge `config` into the global configuration used by the functions facade —
+ * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
+ * hooks once for every free function. The service-class facade configures per
+ * instance instead (`new Client(config)`).
+ */
+export function configure(config: ClientConfig): void {
+    Object.assign(__config, config);
+}
+
+/**
+ * Append interceptors to the functions facade's global middleware chain (see
+ * `ClientConfig.middleware`). The service-class facade registers per instance via
+ * `<Client>.use(...)` instead.
+ */
+export function use(...middleware: Middleware[]): void {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    __config.middleware = [...(__config.middleware ?? []), ...middleware];
+}
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function __middleware(config: ClientConfig): Middleware[] {
+    const single = config.onRequest || config.onResponse || config.onError
+        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+        : [];
+    return [...single, ...(config.middleware ?? [])];
+}
+
+export class ApiError extends Error {
+    public readonly url: string;
+    public readonly status: number;
+    public readonly statusText: string;
+    public readonly body: unknown;
+    constructor(url: string, status: number, statusText: string, body: unknown) {
+        super(`Request failed with status ${status}`);
+        this.name = 'ApiError';
+        this.url = url;
+        this.status = status;
+        this.statusText = statusText;
+        this.body = body;
+    }
+}
+
+type QueryPrimitive = string | number | boolean;
+
+type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
+
+/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
+type QueryStyle = {
+    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+    explode: boolean;
+    allowReserved?: boolean;
+};
+
+/**
+ * Percent-encode `value` but leave the RFC-3986 reserved set
+ * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
+ */
+function __encodeReserved(value: string): string {
+    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
+}
+
+function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
+    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    if (!query)
+        return url;
+    const params = new URLSearchParams();
+    const raw: string[] = [];
+    for (const [key, value] of Object.entries(query)) {
+        if (value === undefined || value === null)
+            continue;
+        const spec = styles?.[key];
+        if (!spec) {
+            if (Array.isArray(value)) {
+                for (const v of value) {
+                    if (v !== undefined && v !== null)
+                        params.append(key, String(v));
+                }
+            }
+            else if (typeof value === 'object') {
+                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+                for (const [subKey, subValue] of Object.entries(value)) {
+                    if (subValue !== undefined && subValue !== null) {
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                    }
+                }
+            }
+            else {
+                params.append(key, String(value));
+            }
+            continue;
+        }
+        if (Array.isArray(value)) {
+            const items = value.filter((v) => v !== undefined && v !== null).map(String);
+            if (spec.style === 'form' && spec.explode) {
+                for (const v of items) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}=${__encodeReserved(v)}`);
+                    else
+                        params.append(key, v);
+                }
+            }
+            else {
+                // Delimited styles put the LITERAL delimiter on the wire; only the
+                // values are encoded. `%20` (not `+`) is the literal space delimiter.
+                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
+                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+            }
+        }
+        else if (typeof value === 'object') {
+            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+            for (const [subKey, subValue] of Object.entries(value)) {
+                if (subValue !== undefined && subValue !== null) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
+                    else
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                }
+            }
+        }
+        else if (spec.allowReserved) {
+            raw.push(`${key}=${__encodeReserved(String(value))}`);
+        }
+        else {
+            params.append(key, String(value));
+        }
+    }
+    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+    return qs ? `${url}?${qs}` : url;
+}
+
+async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+    response: Response;
+    context: RequestContext;
+}> {
+    const { retry: callRetry, ...fetchInit } = init;
+    const retry: RetryConfig = { ...config.retry, ...callRetry };
+    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+    const headers: Record<string, string> = {
+        Accept: 'application/json',
+        ...extra,
+        ...(fetchInit.headers as Record<string, string> | undefined),
+    };
+    let payload: BodyInit | undefined;
+    if (body !== undefined) {
+        const isBinary = body instanceof Blob ||
+            body instanceof ArrayBuffer ||
+            ArrayBuffer.isView(body as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
+        const isURLSearchParams = body instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
+            payload = body as BodyInit;
+        }
+        else {
+            payload = JSON.stringify(body);
+            if (!('Content-Type' in headers) && !('content-type' in headers)) {
+                headers['Content-Type'] = 'application/json';
+            }
+        }
+    }
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    const doFetch = config.fetch ?? fetch;
+    const maxAttempts = 1 + (retry.retries ?? 0);
+    const retryOn = retry.retryOn ?? __defaultRetryOn;
+    const signal = fetchInit.signal ?? undefined;
+    let attempt = 0;
+    while (true) {
+        attempt++;
+        if (signal?.aborted)
+            throw __abortError(signal);
+        let response: Response;
+        try {
+            response = await doFetch(context.url, {
+                ...fetchInit,
+                method: context.method,
+                headers: context.headers,
+                body: payload,
+            });
+        }
+        catch (error) {
+            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
+                await __sleep(__retryDelay(retry, attempt, null), signal);
+                continue;
+            }
+            throw error;
+        }
+        // Reverse order: the last-registered middleware wraps closest to the network (onion).
+        for (let i = middleware.length - 1; i >= 0; i--) {
+            const onResponse = middleware[i].onResponse;
+            if (onResponse) {
+                const replaced = await onResponse(response, context);
+                if (replaced)
+                    response = replaced;
+            }
+        }
+        if (!response.ok &&
+            attempt < maxAttempts &&
+            !signal?.aborted &&
+            (await retryOn({ attempt, request: context, response }))) {
+            const retryAfter = response.headers.get('retry-after');
+            // Drain the abandoned response body before the next attempt: an unread body
+            // keeps the connection checked out (and can stall the pool) under Node/undici
+            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+            await response.body?.cancel().catch(() => undefined);
+            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
+            continue;
+        }
+        return { response, context };
+    }
+}
+
+async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+    if (kind === 'void' || response.status === 204)
+        return undefined;
+    if (kind === 'stream')
+        return response.body;
+    if (kind === 'blob')
+        return response.blob();
+    if (kind === 'arrayBuffer')
+        return response.arrayBuffer();
+    if (kind === 'formData')
+        return response.formData();
+    if (kind === 'text')
+        return response.text();
+    if (kind === 'json')
+        return response.json();
+    // 'auto' — negotiate from the response's content type.
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json'))
+        return response.json();
+    if (contentType.startsWith('text/'))
+        return response.text();
+    return response.blob();
+}
+
+async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+    const { parseAs, ...sendInit } = init;
+    const { response, context } = await __send(config, url, sendInit, body);
+    if (!response.ok) {
+        const errorBody = await readError(response);
+        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
+        // Thread the error through each middleware's onError in turn (each may replace it).
+        for (const mw of __middleware(config)) {
+            if (mw.onError)
+                error = await mw.onError(error as ApiError, context);
+        }
+        throw error;
+    }
+    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
+    return (await __parse(response, kind)) as T;
+}
+
+async function readError(response: Response): Promise<unknown> {
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json')) {
+        return response.json().catch(() => undefined);
+    }
+    return response.text().catch(() => undefined);
+}
+
+const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+
+const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+function __defaultRetryOn(ctx: RetryContext): boolean {
+    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
+        return false;
+    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+    if (retryAfter) {
+        const seconds = Number(retryAfter);
+        if (!Number.isNaN(seconds))
+            return seconds * 1000;
+        const when = Date.parse(retryAfter);
+        if (!Number.isNaN(when))
+            return Math.max(0, when - Date.now());
+    }
+    const base = retry.retryDelay ?? 1000;
+    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+    return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
+    return new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject(__abortError(signal));
+            return;
+        }
+        const onAbort = () => {
+            clearTimeout(timer);
+            reject(__abortError(signal as AbortSignal));
+        };
+        const timer = setTimeout(() => {
+            if (signal)
+                signal.removeEventListener('abort', onAbort);
+            resolve();
+        }, ms);
+        if (signal)
+            signal.addEventListener('abort', onAbort, { once: true });
+    });
+}
+
+function __abortError(signal: AbortSignal): globalThis.Error {
+    const reason = (signal as {
+        reason?: unknown;
+    }).reason;
+    if (reason instanceof Error)
+        return reason;
+    return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * Normalize an operation's header-parameter object into a plain string record,
+ * dropping any `undefined` / `null` entries (optional headers the caller omitted)
+ * and stringifying the rest. Mirrors __buildUrl's handling of query values.
+ */
+function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
+    const out: Record<string, string> = {};
+    for (const [key, value] of Object.entries(values)) {
+        if (value !== undefined && value !== null)
+            out[key] = String(value);
+    }
+    return out;
+}
+
+/**
+ * A credential value, or a (possibly async) function that returns one per request.
+ */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/**
+ * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
+ * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
+ * to the global slots.
+ */
+export type AuthCredentials = {
+    bearer?: TokenProvider;
+    apiKey?: Record<string, TokenProvider>;
+};
+
+let __bearerToken: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
+ * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
+ * (possibly async) function resolved per request.
+ */
+export function setBearer(token: TokenProvider | null): void {
+    __bearerToken = token;
+}
+
+let __apiKey_ApiKey: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
+ * string or a (possibly async) function resolved per request.
+ */
+export function setApiKey(key: TokenProvider | null): void {
+    __apiKey_ApiKey = key;
+}
+
+/**
+ * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
+ */
+async function __resolve(slot: TokenProvider | null): Promise<string | null> {
+    if (slot === null)
+        return null;
+    return typeof slot === "function" ? slot() : slot;
+}
+
+/**
+ * Build the auth `headers` and `query` for an operation from the currently-set credentials.
+ * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
+ * can always override by passing their own `init.headers`.
+ */
+async function __auth(schemes: string[], config: ClientConfig): Promise<{
+    headers: Record<string, string>;
+    query: Record<string, string>;
+}> {
+    const headers: Record<string, string> = {};
+    const query: Record<string, string> = {};
+    const cookies: string[] = [];
+    for (const scheme of schemes) {
+        switch (scheme) {
+            case "OAuth2": {
+                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
+                if (v !== null)
+                    headers["Authorization"] = `Bearer ${v}`;
+                break;
+            }
+            case "ApiKey": {
+                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
+                if (v !== null)
+                    headers["X-API-Key"] = v;
+                break;
+            }
+        }
+    }
+    if (cookies.length > 0)
+        headers["Cookie"] = cookies.join("; ");
+    return { headers, query };
+}
+
+export type ListMenuItemsResult = MenuItemList;
+
+export type ListMenuItemsParams = {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+};
+
+export type ListMenuItemsVariables = {
+    params?: ListMenuItemsParams;
+};
+
+/**
+ * List all menu items
+ *
+ * Retrieve a collection of menu items with optional filtering and pagination.
+ */
+export async function listMenuItems(params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
+    return __request<MenuItemList>(__config, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
+}
+
+export type CreateMenuItemResult = MenuItem;
+
+export type CreateMenuItemBody = FormData;
+
+export type CreateMenuItemVariables = {
+    body: CreateMenuItemBody;
+};
+
+/**
+ * Create menu item
+ *
+ * Create a new menu item.
+ */
+export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<MenuItem>(__config, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type DeleteMenuItemResult = void;
+
+export type DeleteMenuItemVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+};
+
+/**
+ * Delete a menu item
+ *
+ * Delete an existing menu item.
+ */
+export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type GetMenuItemPhotoResult = Blob | string;
+
+export type GetMenuItemPhotoParams = {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+};
+
+export type GetMenuItemPhotoVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+    params?: GetMenuItemPhotoParams;
+};
+
+/**
+ * Retrieve a menu item photo
+ *
+ * Retrieve the product photo image for a specific menu item.
+ */
+export async function getMenuItemPhoto(menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}): Promise<Blob | string> {
+    return __request<Blob | string>(__config, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+}
+
+export type ListOrdersResult = OrderList;
+
+export type ListOrdersParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+};
+
+export type ListOrdersVariables = {
+    params?: ListOrdersParams;
+};
+
+/**
+ * List all orders
+ *
+ * Retrieve a collection of orders with optional filtering and pagination.
+ */
+export async function listOrders(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderList> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderList>(__config, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+/**
+ * Create order
+ *
+ * Create a new order.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    headers?: GetOrderByIdHeaders;
+};
+
+/**
+ * Retrieve an order
+ *
+ * Retrieve a single order by its ID.
+ */
+export async function getOrderById(orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+}
+
+export type DeleteOrderResult = void;
+
+export type DeleteOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+};
+
+/**
+ * Delete an order
+ *
+ * Delete the order.
+ * To keep the order history, the order should be canceled instead of deleted.
+ */
+export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type UpdateOrderResult = Order;
+
+export type UpdateOrderBody = {
+    status: OrderStatus;
+};
+
+export type UpdateOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    body?: UpdateOrderBody;
+};
+
+/**
+ * Partially update an order
+ *
+ * Update an existing order status.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function updateOrder(orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type ListOrderItemsResult = OrderItem[];
+
+export type ListOrderItemsParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+};
+
+export type ListOrderItemsVariables = {
+    params?: ListOrderItemsParams;
+};
+
+/**
+ * List all order items with menu item details
+ *
+ * Returns an array of order items for a specific order.
+ * Use the `filter` parameter to filter by order ID.
+ */
+export async function listOrderItems(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderItem[]>(__config, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+/**
+ * Get revenue statistics
+ *
+ * Retrieve revenue statistics for a configurable date range.
+ * Returns revenue, order counts, average order amount, and other useful statistics.
+ */
+export async function getRevenue(params: {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
+    const __a = await __auth(["ApiKey"], __config);
+    return __request<RevenueStatistics>(__config, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Create OAuth2 client
+ *
+ * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+ * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
+ *   `redirectUris` must be provided (per RFC 7591 Section 2).
+ * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+ * Returns the registered client information per RFC 7591, including:
+ * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+ */
+export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
+    return __request<OAuth2Client>(__config, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+}
diff --git a/packages/openapi-typescript/examples/zod/src/api/client.zod.ts b/packages/client-generator/examples/zod/src/api/client.zod.ts
similarity index 98%
rename from packages/openapi-typescript/examples/zod/src/api/client.zod.ts
rename to packages/client-generator/examples/zod/src/api/client.zod.ts
index 7e8295f73d..309411d9f5 100644
--- a/packages/openapi-typescript/examples/zod/src/api/client.zod.ts
+++ b/packages/client-generator/examples/zod/src/api/client.zod.ts
@@ -1,4 +1,4 @@
-// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Generated by @redocly/client-generator — do not edit by hand.
 // Source: OpenAPI document. Re-run `redocly generate-client` to update.
 
 import { z } from "zod";
diff --git a/packages/openapi-typescript/examples/zod/src/main.ts b/packages/client-generator/examples/zod/src/main.ts
similarity index 100%
rename from packages/openapi-typescript/examples/zod/src/main.ts
rename to packages/client-generator/examples/zod/src/main.ts
diff --git a/packages/openapi-typescript/examples/zod/tsconfig.json b/packages/client-generator/examples/zod/tsconfig.json
similarity index 100%
rename from packages/openapi-typescript/examples/zod/tsconfig.json
rename to packages/client-generator/examples/zod/tsconfig.json
diff --git a/packages/openapi-typescript/examples/zod/vite.config.ts b/packages/client-generator/examples/zod/vite.config.ts
similarity index 100%
rename from packages/openapi-typescript/examples/zod/vite.config.ts
rename to packages/client-generator/examples/zod/vite.config.ts
diff --git a/packages/openapi-typescript/package.json b/packages/client-generator/package.json
similarity index 97%
rename from packages/openapi-typescript/package.json
rename to packages/client-generator/package.json
index 6da3c59fc7..8d21a6aa4c 100644
--- a/packages/openapi-typescript/package.json
+++ b/packages/client-generator/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@redocly/openapi-typescript",
+  "name": "@redocly/client-generator",
   "version": "0.0.0",
   "description": "Generate TypeScript clients (types, fetch, service-class) from OpenAPI descriptions.",
   "type": "module",
diff --git a/packages/openapi-typescript/scripts/regenerate-examples.mjs b/packages/client-generator/scripts/regenerate-examples.mjs
similarity index 91%
rename from packages/openapi-typescript/scripts/regenerate-examples.mjs
rename to packages/client-generator/scripts/regenerate-examples.mjs
index dea7ca7ba4..ac76970b1e 100644
--- a/packages/openapi-typescript/scripts/regenerate-examples.mjs
+++ b/packages/client-generator/scripts/regenerate-examples.mjs
@@ -4,7 +4,7 @@ import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 // Regenerate each example's client in place. A `redocly.yaml` example uses the CLI
-// (auto-discovering its `x-openapi-typescript` block); the programmatic example runs
+// (auto-discovering its `x-client-generator` block); the programmatic example runs
 // its own `generate.ts`.
 const pkgRoot = join(dirname(fileURLToPath(import.meta.url)), '..');
 const repoRoot = join(pkgRoot, '..', '..');
diff --git a/packages/openapi-typescript/scripts/typecheck-examples.mjs b/packages/client-generator/scripts/typecheck-examples.mjs
similarity index 100%
rename from packages/openapi-typescript/scripts/typecheck-examples.mjs
rename to packages/client-generator/scripts/typecheck-examples.mjs
diff --git a/packages/openapi-typescript/src/__tests__/config-file.test.ts b/packages/client-generator/src/__tests__/config-file.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/__tests__/config-file.test.ts
rename to packages/client-generator/src/__tests__/config-file.test.ts
diff --git a/packages/openapi-typescript/src/__tests__/errors.test.ts b/packages/client-generator/src/__tests__/errors.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/__tests__/errors.test.ts
rename to packages/client-generator/src/__tests__/errors.test.ts
diff --git a/packages/openapi-typescript/src/__tests__/index.test.ts b/packages/client-generator/src/__tests__/index.test.ts
similarity index 98%
rename from packages/openapi-typescript/src/__tests__/index.test.ts
rename to packages/client-generator/src/__tests__/index.test.ts
index 88cc66c873..34738902e9 100644
--- a/packages/openapi-typescript/src/__tests__/index.test.ts
+++ b/packages/client-generator/src/__tests__/index.test.ts
@@ -81,7 +81,7 @@ paths:
 
     const contents = await readFile(output, 'utf-8');
     expect(contents).toContain('export async function ping(');
-    expect(contents).toContain('// Generated by @redocly/openapi-typescript');
+    expect(contents).toContain('// Generated by @redocly/client-generator');
     // bytes should match what we wrote.
     expect(result.bytes).toBe(Buffer.byteLength(contents, 'utf-8'));
   });
diff --git a/packages/openapi-typescript/src/__tests__/loader.test.ts b/packages/client-generator/src/__tests__/loader.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/__tests__/loader.test.ts
rename to packages/client-generator/src/__tests__/loader.test.ts
diff --git a/packages/openapi-typescript/src/__tests__/plugin.test.ts b/packages/client-generator/src/__tests__/plugin.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/__tests__/plugin.test.ts
rename to packages/client-generator/src/__tests__/plugin.test.ts
diff --git a/packages/openapi-typescript/src/config-file.ts b/packages/client-generator/src/config-file.ts
similarity index 78%
rename from packages/openapi-typescript/src/config-file.ts
rename to packages/client-generator/src/config-file.ts
index eac72d1137..4fcbad8752 100644
--- a/packages/openapi-typescript/src/config-file.ts
+++ b/packages/client-generator/src/config-file.ts
@@ -1,8 +1,8 @@
-// packages/openapi-typescript/src/config-file.ts
+// packages/client-generator/src/config-file.ts
 import type { Config } from './config.js';
 
 /**
- * Merge a base config (the `redocly.yaml` `x-openapi-typescript` block) with CLI
+ * Merge a base config (the `redocly.yaml` `x-client-generator` block) with CLI
  * overrides. Defined keys in `overrides` win; `undefined` override values are ignored
  * so absent flags don't clobber the base values.
  */
diff --git a/packages/openapi-typescript/src/config.ts b/packages/client-generator/src/config.ts
similarity index 96%
rename from packages/openapi-typescript/src/config.ts
rename to packages/client-generator/src/config.ts
index cbc6ad9839..af22321de1 100644
--- a/packages/openapi-typescript/src/config.ts
+++ b/packages/client-generator/src/config.ts
@@ -1,5 +1,5 @@
 import type { ArgsStyle, Facade } from './emitters/client.js';
-// packages/openapi-typescript/src/config.ts
+// packages/client-generator/src/config.ts
 import type { CustomGenerator } from './generators/types.js';
 import type { OutputMode } from './writers/types.js';
 
@@ -50,7 +50,7 @@ export type Config = {
   generators?: string[];
   /**
    * Inline custom generators (the experimental plugin API), registered so they can be selected in
-   * `generators` by `name`. Authored with `defineGenerator` from `@redocly/openapi-typescript/plugin`.
+   * `generators` by `name`. Authored with `defineGenerator` from `@redocly/client-generator/plugin`.
    */
   customGenerators?: CustomGenerator[];
 };
diff --git a/packages/openapi-typescript/src/emitters/__tests__/auth.test.ts b/packages/client-generator/src/emitters/__tests__/auth.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/__tests__/auth.test.ts
rename to packages/client-generator/src/emitters/__tests__/auth.test.ts
diff --git a/packages/openapi-typescript/src/emitters/__tests__/client.test.ts b/packages/client-generator/src/emitters/__tests__/client.test.ts
similarity index 99%
rename from packages/openapi-typescript/src/emitters/__tests__/client.test.ts
rename to packages/client-generator/src/emitters/__tests__/client.test.ts
index 8eb9880727..c8c5b0479c 100644
--- a/packages/openapi-typescript/src/emitters/__tests__/client.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/client.test.ts
@@ -31,7 +31,7 @@ function sseModel(overrides: Partial<ApiModel> = {}): ApiModel {
 describe('emitSingleFile — top-level layout', () => {
   it('includes the generated-by header and ends with a newline', () => {
     const out = emitSingleFile(apiModel());
-    expect(out.startsWith('// Generated by @redocly/openapi-typescript')).toBe(true);
+    expect(out.startsWith('// Generated by @redocly/client-generator')).toBe(true);
     expect(out.endsWith('\n')).toBe(true);
   });
 
diff --git a/packages/openapi-typescript/src/emitters/__tests__/faker.test.ts b/packages/client-generator/src/emitters/__tests__/faker.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/__tests__/faker.test.ts
rename to packages/client-generator/src/emitters/__tests__/faker.test.ts
diff --git a/packages/openapi-typescript/src/emitters/__tests__/fixtures.ts b/packages/client-generator/src/emitters/__tests__/fixtures.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/__tests__/fixtures.ts
rename to packages/client-generator/src/emitters/__tests__/fixtures.ts
diff --git a/packages/openapi-typescript/src/emitters/__tests__/identifier.test.ts b/packages/client-generator/src/emitters/__tests__/identifier.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/__tests__/identifier.test.ts
rename to packages/client-generator/src/emitters/__tests__/identifier.test.ts
diff --git a/packages/openapi-typescript/src/emitters/__tests__/mock.test.ts b/packages/client-generator/src/emitters/__tests__/mock.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/__tests__/mock.test.ts
rename to packages/client-generator/src/emitters/__tests__/mock.test.ts
diff --git a/packages/openapi-typescript/src/emitters/__tests__/operation-signature.test.ts b/packages/client-generator/src/emitters/__tests__/operation-signature.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/__tests__/operation-signature.test.ts
rename to packages/client-generator/src/emitters/__tests__/operation-signature.test.ts
diff --git a/packages/openapi-typescript/src/emitters/__tests__/operations.test.ts b/packages/client-generator/src/emitters/__tests__/operations.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/__tests__/operations.test.ts
rename to packages/client-generator/src/emitters/__tests__/operations.test.ts
diff --git a/packages/openapi-typescript/src/emitters/__tests__/runtime.test.ts b/packages/client-generator/src/emitters/__tests__/runtime.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/__tests__/runtime.test.ts
rename to packages/client-generator/src/emitters/__tests__/runtime.test.ts
diff --git a/packages/openapi-typescript/src/emitters/__tests__/sample.test.ts b/packages/client-generator/src/emitters/__tests__/sample.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/__tests__/sample.test.ts
rename to packages/client-generator/src/emitters/__tests__/sample.test.ts
diff --git a/packages/openapi-typescript/src/emitters/__tests__/sse.deletion.test.ts b/packages/client-generator/src/emitters/__tests__/sse.deletion.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/__tests__/sse.deletion.test.ts
rename to packages/client-generator/src/emitters/__tests__/sse.deletion.test.ts
diff --git a/packages/openapi-typescript/src/emitters/__tests__/sse.test.ts b/packages/client-generator/src/emitters/__tests__/sse.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/__tests__/sse.test.ts
rename to packages/client-generator/src/emitters/__tests__/sse.test.ts
diff --git a/packages/openapi-typescript/src/emitters/__tests__/swr.test.ts b/packages/client-generator/src/emitters/__tests__/swr.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/__tests__/swr.test.ts
rename to packages/client-generator/src/emitters/__tests__/swr.test.ts
diff --git a/packages/openapi-typescript/src/emitters/__tests__/tanstack-query.test.ts b/packages/client-generator/src/emitters/__tests__/tanstack-query.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/__tests__/tanstack-query.test.ts
rename to packages/client-generator/src/emitters/__tests__/tanstack-query.test.ts
diff --git a/packages/openapi-typescript/src/emitters/__tests__/transformers.test.ts b/packages/client-generator/src/emitters/__tests__/transformers.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/__tests__/transformers.test.ts
rename to packages/client-generator/src/emitters/__tests__/transformers.test.ts
diff --git a/packages/openapi-typescript/src/emitters/__tests__/ts.test.ts b/packages/client-generator/src/emitters/__tests__/ts.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/__tests__/ts.test.ts
rename to packages/client-generator/src/emitters/__tests__/ts.test.ts
diff --git a/packages/openapi-typescript/src/emitters/__tests__/type-guards.test.ts b/packages/client-generator/src/emitters/__tests__/type-guards.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/__tests__/type-guards.test.ts
rename to packages/client-generator/src/emitters/__tests__/type-guards.test.ts
diff --git a/packages/openapi-typescript/src/emitters/__tests__/types.test.ts b/packages/client-generator/src/emitters/__tests__/types.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/__tests__/types.test.ts
rename to packages/client-generator/src/emitters/__tests__/types.test.ts
diff --git a/packages/openapi-typescript/src/emitters/__tests__/zod.test.ts b/packages/client-generator/src/emitters/__tests__/zod.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/__tests__/zod.test.ts
rename to packages/client-generator/src/emitters/__tests__/zod.test.ts
diff --git a/packages/openapi-typescript/src/emitters/auth.ts b/packages/client-generator/src/emitters/auth.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/auth.ts
rename to packages/client-generator/src/emitters/auth.ts
diff --git a/packages/openapi-typescript/src/emitters/client.ts b/packages/client-generator/src/emitters/client.ts
similarity index 99%
rename from packages/openapi-typescript/src/emitters/client.ts
rename to packages/client-generator/src/emitters/client.ts
index 0cb92a23be..dd57407fc6 100644
--- a/packages/openapi-typescript/src/emitters/client.ts
+++ b/packages/client-generator/src/emitters/client.ts
@@ -26,7 +26,7 @@ export type { ArgsStyle, Facade } from './operations.js';
 const { factory } = ts;
 
 /** The generated-by banner prepended to every emitted module. */
-export const HEADER = `// Generated by @redocly/openapi-typescript — do not edit by hand.
+export const HEADER = `// Generated by @redocly/client-generator — do not edit by hand.
 // Source: OpenAPI document. Re-run \`redocly generate-client\` to update.`;
 
 /** The security-scheme keys whose credential is injected as a URL query param. */
diff --git a/packages/openapi-typescript/src/emitters/faker.ts b/packages/client-generator/src/emitters/faker.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/faker.ts
rename to packages/client-generator/src/emitters/faker.ts
diff --git a/packages/openapi-typescript/src/emitters/identifier.ts b/packages/client-generator/src/emitters/identifier.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/identifier.ts
rename to packages/client-generator/src/emitters/identifier.ts
diff --git a/packages/openapi-typescript/src/emitters/jsdoc.ts b/packages/client-generator/src/emitters/jsdoc.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/jsdoc.ts
rename to packages/client-generator/src/emitters/jsdoc.ts
diff --git a/packages/openapi-typescript/src/emitters/mock.ts b/packages/client-generator/src/emitters/mock.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/mock.ts
rename to packages/client-generator/src/emitters/mock.ts
diff --git a/packages/openapi-typescript/src/emitters/operation-aliases.ts b/packages/client-generator/src/emitters/operation-aliases.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/operation-aliases.ts
rename to packages/client-generator/src/emitters/operation-aliases.ts
diff --git a/packages/openapi-typescript/src/emitters/operation-signature.ts b/packages/client-generator/src/emitters/operation-signature.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/operation-signature.ts
rename to packages/client-generator/src/emitters/operation-signature.ts
diff --git a/packages/openapi-typescript/src/emitters/operation-types.ts b/packages/client-generator/src/emitters/operation-types.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/operation-types.ts
rename to packages/client-generator/src/emitters/operation-types.ts
diff --git a/packages/openapi-typescript/src/emitters/operations.ts b/packages/client-generator/src/emitters/operations.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/operations.ts
rename to packages/client-generator/src/emitters/operations.ts
diff --git a/packages/openapi-typescript/src/emitters/runtime.ts b/packages/client-generator/src/emitters/runtime.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/runtime.ts
rename to packages/client-generator/src/emitters/runtime.ts
diff --git a/packages/openapi-typescript/src/emitters/sample.ts b/packages/client-generator/src/emitters/sample.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/sample.ts
rename to packages/client-generator/src/emitters/sample.ts
diff --git a/packages/openapi-typescript/src/emitters/sse.ts b/packages/client-generator/src/emitters/sse.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/sse.ts
rename to packages/client-generator/src/emitters/sse.ts
diff --git a/packages/openapi-typescript/src/emitters/support.ts b/packages/client-generator/src/emitters/support.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/support.ts
rename to packages/client-generator/src/emitters/support.ts
diff --git a/packages/openapi-typescript/src/emitters/swr.ts b/packages/client-generator/src/emitters/swr.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/swr.ts
rename to packages/client-generator/src/emitters/swr.ts
diff --git a/packages/openapi-typescript/src/emitters/tanstack-query.ts b/packages/client-generator/src/emitters/tanstack-query.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/tanstack-query.ts
rename to packages/client-generator/src/emitters/tanstack-query.ts
diff --git a/packages/openapi-typescript/src/emitters/transformers.ts b/packages/client-generator/src/emitters/transformers.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/transformers.ts
rename to packages/client-generator/src/emitters/transformers.ts
diff --git a/packages/openapi-typescript/src/emitters/ts.ts b/packages/client-generator/src/emitters/ts.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/ts.ts
rename to packages/client-generator/src/emitters/ts.ts
diff --git a/packages/openapi-typescript/src/emitters/type-guards.ts b/packages/client-generator/src/emitters/type-guards.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/type-guards.ts
rename to packages/client-generator/src/emitters/type-guards.ts
diff --git a/packages/openapi-typescript/src/emitters/types.ts b/packages/client-generator/src/emitters/types.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/types.ts
rename to packages/client-generator/src/emitters/types.ts
diff --git a/packages/openapi-typescript/src/emitters/wrapper-support.ts b/packages/client-generator/src/emitters/wrapper-support.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/wrapper-support.ts
rename to packages/client-generator/src/emitters/wrapper-support.ts
diff --git a/packages/openapi-typescript/src/emitters/zod.ts b/packages/client-generator/src/emitters/zod.ts
similarity index 100%
rename from packages/openapi-typescript/src/emitters/zod.ts
rename to packages/client-generator/src/emitters/zod.ts
diff --git a/packages/openapi-typescript/src/errors.ts b/packages/client-generator/src/errors.ts
similarity index 100%
rename from packages/openapi-typescript/src/errors.ts
rename to packages/client-generator/src/errors.ts
diff --git a/packages/openapi-typescript/src/generators/__tests__/fixtures/empty-plugin.ts b/packages/client-generator/src/generators/__tests__/fixtures/empty-plugin.ts
similarity index 100%
rename from packages/openapi-typescript/src/generators/__tests__/fixtures/empty-plugin.ts
rename to packages/client-generator/src/generators/__tests__/fixtures/empty-plugin.ts
diff --git a/packages/openapi-typescript/src/generators/__tests__/fixtures/route-map-plugin.ts b/packages/client-generator/src/generators/__tests__/fixtures/route-map-plugin.ts
similarity index 100%
rename from packages/openapi-typescript/src/generators/__tests__/fixtures/route-map-plugin.ts
rename to packages/client-generator/src/generators/__tests__/fixtures/route-map-plugin.ts
diff --git a/packages/openapi-typescript/src/generators/__tests__/index.test.ts b/packages/client-generator/src/generators/__tests__/index.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/generators/__tests__/index.test.ts
rename to packages/client-generator/src/generators/__tests__/index.test.ts
diff --git a/packages/openapi-typescript/src/generators/__tests__/mock.test.ts b/packages/client-generator/src/generators/__tests__/mock.test.ts
similarity index 91%
rename from packages/openapi-typescript/src/generators/__tests__/mock.test.ts
rename to packages/client-generator/src/generators/__tests__/mock.test.ts
index 865c19d249..4573c50f09 100644
--- a/packages/openapi-typescript/src/generators/__tests__/mock.test.ts
+++ b/packages/client-generator/src/generators/__tests__/mock.test.ts
@@ -22,7 +22,7 @@ describe('mockGenerator', () => {
     });
     expect(result).toHaveLength(1);
     expect(result[0].path).toBe('/out/client.mocks.ts');
-    expect(result[0].content).toContain('Generated by @redocly/openapi-typescript');
+    expect(result[0].content).toContain('Generated by @redocly/client-generator');
     expect(result[0].content).toContain("import { http, HttpResponse } from 'msw'");
   });
 });
diff --git a/packages/openapi-typescript/src/generators/__tests__/resolve.test.ts b/packages/client-generator/src/generators/__tests__/resolve.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/generators/__tests__/resolve.test.ts
rename to packages/client-generator/src/generators/__tests__/resolve.test.ts
diff --git a/packages/openapi-typescript/src/generators/__tests__/sdk.test.ts b/packages/client-generator/src/generators/__tests__/sdk.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/generators/__tests__/sdk.test.ts
rename to packages/client-generator/src/generators/__tests__/sdk.test.ts
diff --git a/packages/openapi-typescript/src/generators/__tests__/swr.test.ts b/packages/client-generator/src/generators/__tests__/swr.test.ts
similarity index 98%
rename from packages/openapi-typescript/src/generators/__tests__/swr.test.ts
rename to packages/client-generator/src/generators/__tests__/swr.test.ts
index 295a9722b4..5761ec8a30 100644
--- a/packages/openapi-typescript/src/generators/__tests__/swr.test.ts
+++ b/packages/client-generator/src/generators/__tests__/swr.test.ts
@@ -22,7 +22,7 @@ describe('swrGenerator', () => {
     });
     expect(files).toHaveLength(1);
     expect(files[0].path).toBe('/tmp/out/client.swr.ts');
-    expect(files[0].content).toContain('// Generated by @redocly/openapi-typescript');
+    expect(files[0].content).toContain('// Generated by @redocly/client-generator');
     expect(files[0].content).toContain('import useSWR from "swr"');
     expect(files[0].content).toContain('import useSWRMutation from "swr/mutation"');
     expect(files[0].content).toContain('export function useGetPet');
diff --git a/packages/openapi-typescript/src/generators/__tests__/tanstack-query.test.ts b/packages/client-generator/src/generators/__tests__/tanstack-query.test.ts
similarity index 98%
rename from packages/openapi-typescript/src/generators/__tests__/tanstack-query.test.ts
rename to packages/client-generator/src/generators/__tests__/tanstack-query.test.ts
index 8c7774e0e2..e4d968d43a 100644
--- a/packages/openapi-typescript/src/generators/__tests__/tanstack-query.test.ts
+++ b/packages/client-generator/src/generators/__tests__/tanstack-query.test.ts
@@ -22,7 +22,7 @@ describe('tanstackQueryGenerator', () => {
     });
     expect(files).toHaveLength(1);
     expect(files[0].path).toBe('/tmp/out/client.tanstack.ts');
-    expect(files[0].content).toContain('// Generated by @redocly/openapi-typescript');
+    expect(files[0].content).toContain('// Generated by @redocly/client-generator');
     expect(files[0].content).toContain('import { queryOptions } from "@tanstack/react-query"');
     expect(files[0].content).toContain('export const getPetOptions');
     expect(files[0].content).toContain('export const createPetMutation');
diff --git a/packages/openapi-typescript/src/generators/__tests__/transformers.test.ts b/packages/client-generator/src/generators/__tests__/transformers.test.ts
similarity index 98%
rename from packages/openapi-typescript/src/generators/__tests__/transformers.test.ts
rename to packages/client-generator/src/generators/__tests__/transformers.test.ts
index 28fa3cae32..617c57d92c 100644
--- a/packages/openapi-typescript/src/generators/__tests__/transformers.test.ts
+++ b/packages/client-generator/src/generators/__tests__/transformers.test.ts
@@ -28,7 +28,7 @@ describe('transformersGenerator', () => {
     });
     expect(files).toHaveLength(1);
     expect(files[0].path).toBe('/tmp/out/client.transformers.ts');
-    expect(files[0].content).toContain('// Generated by @redocly/openapi-typescript');
+    expect(files[0].content).toContain('// Generated by @redocly/client-generator');
     expect(files[0].content).toContain('import type {');
     expect(files[0].content).toContain('from "./client.js"');
     expect(files[0].content).toContain('export const transformEvent');
diff --git a/packages/openapi-typescript/src/generators/__tests__/zod.test.ts b/packages/client-generator/src/generators/__tests__/zod.test.ts
similarity index 98%
rename from packages/openapi-typescript/src/generators/__tests__/zod.test.ts
rename to packages/client-generator/src/generators/__tests__/zod.test.ts
index 683ed5a888..314381615a 100644
--- a/packages/openapi-typescript/src/generators/__tests__/zod.test.ts
+++ b/packages/client-generator/src/generators/__tests__/zod.test.ts
@@ -16,7 +16,7 @@ describe('zodGenerator', () => {
     });
     expect(files).toHaveLength(1);
     expect(files[0].path).toBe('/tmp/out/client.zod.ts');
-    expect(files[0].content).toContain('// Generated by @redocly/openapi-typescript');
+    expect(files[0].content).toContain('// Generated by @redocly/client-generator');
     expect(files[0].content).toContain('import { z } from "zod"');
     expect(files[0].content).toContain('export const PetSchema = z.object(');
   });
diff --git a/packages/openapi-typescript/src/generators/index.ts b/packages/client-generator/src/generators/index.ts
similarity index 100%
rename from packages/openapi-typescript/src/generators/index.ts
rename to packages/client-generator/src/generators/index.ts
diff --git a/packages/openapi-typescript/src/generators/mock.ts b/packages/client-generator/src/generators/mock.ts
similarity index 100%
rename from packages/openapi-typescript/src/generators/mock.ts
rename to packages/client-generator/src/generators/mock.ts
diff --git a/packages/openapi-typescript/src/generators/resolve.ts b/packages/client-generator/src/generators/resolve.ts
similarity index 100%
rename from packages/openapi-typescript/src/generators/resolve.ts
rename to packages/client-generator/src/generators/resolve.ts
diff --git a/packages/openapi-typescript/src/generators/sdk.ts b/packages/client-generator/src/generators/sdk.ts
similarity index 100%
rename from packages/openapi-typescript/src/generators/sdk.ts
rename to packages/client-generator/src/generators/sdk.ts
diff --git a/packages/openapi-typescript/src/generators/swr.ts b/packages/client-generator/src/generators/swr.ts
similarity index 100%
rename from packages/openapi-typescript/src/generators/swr.ts
rename to packages/client-generator/src/generators/swr.ts
diff --git a/packages/openapi-typescript/src/generators/tanstack-query.ts b/packages/client-generator/src/generators/tanstack-query.ts
similarity index 100%
rename from packages/openapi-typescript/src/generators/tanstack-query.ts
rename to packages/client-generator/src/generators/tanstack-query.ts
diff --git a/packages/openapi-typescript/src/generators/transformers.ts b/packages/client-generator/src/generators/transformers.ts
similarity index 100%
rename from packages/openapi-typescript/src/generators/transformers.ts
rename to packages/client-generator/src/generators/transformers.ts
diff --git a/packages/openapi-typescript/src/generators/types.ts b/packages/client-generator/src/generators/types.ts
similarity index 94%
rename from packages/openapi-typescript/src/generators/types.ts
rename to packages/client-generator/src/generators/types.ts
index ba063bb192..89643e6c04 100644
--- a/packages/openapi-typescript/src/generators/types.ts
+++ b/packages/client-generator/src/generators/types.ts
@@ -1,4 +1,4 @@
-// packages/openapi-typescript/src/generators/types.ts
+// packages/client-generator/src/generators/types.ts
 import type { EmitOptions } from '../emitters/client.js';
 import type { ErrorMode, Facade } from '../emitters/operations.js';
 import type { DateType } from '../emitters/types.js';
@@ -52,7 +52,7 @@ export type GeneratorDescriptor = {
  * A user-authored generator (the public, experimental plugin contract): a `GeneratorDescriptor`
  * plus a unique `name` used to select it in `generators`, to satisfy other generators' `requires`,
  * and to detect collisions. Authors build one via `defineGenerator` from the
- * `@redocly/openapi-typescript/plugin` entry; the resolver registers it under `name`.
+ * `@redocly/client-generator/plugin` entry; the resolver registers it under `name`.
  */
 export type CustomGenerator = GeneratorDescriptor & {
   /** Unique name, used in `generators` selection, `requires`, and collision detection. */
diff --git a/packages/openapi-typescript/src/generators/zod.ts b/packages/client-generator/src/generators/zod.ts
similarity index 100%
rename from packages/openapi-typescript/src/generators/zod.ts
rename to packages/client-generator/src/generators/zod.ts
diff --git a/packages/openapi-typescript/src/index.ts b/packages/client-generator/src/index.ts
similarity index 100%
rename from packages/openapi-typescript/src/index.ts
rename to packages/client-generator/src/index.ts
diff --git a/packages/openapi-typescript/src/ir/__tests__/build.test.ts b/packages/client-generator/src/ir/__tests__/build.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/ir/__tests__/build.test.ts
rename to packages/client-generator/src/ir/__tests__/build.test.ts
diff --git a/packages/openapi-typescript/src/ir/__tests__/normalize-swagger2.test.ts b/packages/client-generator/src/ir/__tests__/normalize-swagger2.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/ir/__tests__/normalize-swagger2.test.ts
rename to packages/client-generator/src/ir/__tests__/normalize-swagger2.test.ts
diff --git a/packages/openapi-typescript/src/ir/__tests__/refs.test.ts b/packages/client-generator/src/ir/__tests__/refs.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/ir/__tests__/refs.test.ts
rename to packages/client-generator/src/ir/__tests__/refs.test.ts
diff --git a/packages/openapi-typescript/src/ir/__tests__/sanitize-identifiers.test.ts b/packages/client-generator/src/ir/__tests__/sanitize-identifiers.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/ir/__tests__/sanitize-identifiers.test.ts
rename to packages/client-generator/src/ir/__tests__/sanitize-identifiers.test.ts
diff --git a/packages/openapi-typescript/src/ir/build.ts b/packages/client-generator/src/ir/build.ts
similarity index 100%
rename from packages/openapi-typescript/src/ir/build.ts
rename to packages/client-generator/src/ir/build.ts
diff --git a/packages/openapi-typescript/src/ir/model.ts b/packages/client-generator/src/ir/model.ts
similarity index 100%
rename from packages/openapi-typescript/src/ir/model.ts
rename to packages/client-generator/src/ir/model.ts
diff --git a/packages/openapi-typescript/src/ir/normalize-swagger2.ts b/packages/client-generator/src/ir/normalize-swagger2.ts
similarity index 100%
rename from packages/openapi-typescript/src/ir/normalize-swagger2.ts
rename to packages/client-generator/src/ir/normalize-swagger2.ts
diff --git a/packages/openapi-typescript/src/ir/refs.ts b/packages/client-generator/src/ir/refs.ts
similarity index 100%
rename from packages/openapi-typescript/src/ir/refs.ts
rename to packages/client-generator/src/ir/refs.ts
diff --git a/packages/openapi-typescript/src/ir/sanitize-identifiers.ts b/packages/client-generator/src/ir/sanitize-identifiers.ts
similarity index 100%
rename from packages/openapi-typescript/src/ir/sanitize-identifiers.ts
rename to packages/client-generator/src/ir/sanitize-identifiers.ts
diff --git a/packages/openapi-typescript/src/loader.ts b/packages/client-generator/src/loader.ts
similarity index 100%
rename from packages/openapi-typescript/src/loader.ts
rename to packages/client-generator/src/loader.ts
diff --git a/packages/openapi-typescript/src/plugin.ts b/packages/client-generator/src/plugin.ts
similarity index 98%
rename from packages/openapi-typescript/src/plugin.ts
rename to packages/client-generator/src/plugin.ts
index 664a1b1100..344d1fd7c5 100644
--- a/packages/openapi-typescript/src/plugin.ts
+++ b/packages/client-generator/src/plugin.ts
@@ -11,7 +11,7 @@
 // libraries are peers of the consumer's app, never of the client.
 //
 //   // my-generator.ts
-//   import { defineGenerator, ts, printStatements } from '@redocly/openapi-typescript/plugin';
+//   import { defineGenerator, ts, printStatements } from '@redocly/client-generator/plugin';
 //   export default defineGenerator({
 //     name: 'route-map',
 //     requires: ['sdk'],
diff --git a/packages/openapi-typescript/src/types.ts b/packages/client-generator/src/types.ts
similarity index 98%
rename from packages/openapi-typescript/src/types.ts
rename to packages/client-generator/src/types.ts
index f494841e1c..9725f5783b 100644
--- a/packages/openapi-typescript/src/types.ts
+++ b/packages/client-generator/src/types.ts
@@ -85,7 +85,7 @@ export type GenerateClientOptions = {
   /**
    * Inline custom generators (the experimental plugin API), registered before resolution so they
    * can be selected in `generators` by `name`. Authored with `defineGenerator` from
-   * `@redocly/openapi-typescript/plugin`. Path/package specifiers in `generators` don't need this.
+   * `@redocly/client-generator/plugin`. Path/package specifiers in `generators` don't need this.
    */
   customGenerators?: CustomGenerator[];
   /**
diff --git a/packages/openapi-typescript/src/writers/__tests__/group-by-tag.test.ts b/packages/client-generator/src/writers/__tests__/group-by-tag.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/writers/__tests__/group-by-tag.test.ts
rename to packages/client-generator/src/writers/__tests__/group-by-tag.test.ts
diff --git a/packages/openapi-typescript/src/writers/__tests__/index.test.ts b/packages/client-generator/src/writers/__tests__/index.test.ts
similarity index 98%
rename from packages/openapi-typescript/src/writers/__tests__/index.test.ts
rename to packages/client-generator/src/writers/__tests__/index.test.ts
index 67b70a4864..a6dafeb78f 100644
--- a/packages/openapi-typescript/src/writers/__tests__/index.test.ts
+++ b/packages/client-generator/src/writers/__tests__/index.test.ts
@@ -60,6 +60,6 @@ describe('singleFileWriter', () => {
     expect(files).toHaveLength(1);
     expect(files[0].path).toBe('/out/api.ts');
     expect(files[0].content).toContain('export async function ping(');
-    expect(files[0].content).toContain('// Generated by @redocly/openapi-typescript');
+    expect(files[0].content).toContain('// Generated by @redocly/client-generator');
   });
 });
diff --git a/packages/openapi-typescript/src/writers/__tests__/split-writer.test.ts b/packages/client-generator/src/writers/__tests__/split-writer.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/writers/__tests__/split-writer.test.ts
rename to packages/client-generator/src/writers/__tests__/split-writer.test.ts
diff --git a/packages/openapi-typescript/src/writers/__tests__/tags-split-writer.test.ts b/packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/writers/__tests__/tags-split-writer.test.ts
rename to packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts
diff --git a/packages/openapi-typescript/src/writers/__tests__/tags-writer.test.ts b/packages/client-generator/src/writers/__tests__/tags-writer.test.ts
similarity index 100%
rename from packages/openapi-typescript/src/writers/__tests__/tags-writer.test.ts
rename to packages/client-generator/src/writers/__tests__/tags-writer.test.ts
diff --git a/packages/openapi-typescript/src/writers/group-by-tag.ts b/packages/client-generator/src/writers/group-by-tag.ts
similarity index 100%
rename from packages/openapi-typescript/src/writers/group-by-tag.ts
rename to packages/client-generator/src/writers/group-by-tag.ts
diff --git a/packages/openapi-typescript/src/writers/index.ts b/packages/client-generator/src/writers/index.ts
similarity index 100%
rename from packages/openapi-typescript/src/writers/index.ts
rename to packages/client-generator/src/writers/index.ts
diff --git a/packages/openapi-typescript/src/writers/single-file-writer.ts b/packages/client-generator/src/writers/single-file-writer.ts
similarity index 100%
rename from packages/openapi-typescript/src/writers/single-file-writer.ts
rename to packages/client-generator/src/writers/single-file-writer.ts
diff --git a/packages/openapi-typescript/src/writers/split-writer.ts b/packages/client-generator/src/writers/split-writer.ts
similarity index 100%
rename from packages/openapi-typescript/src/writers/split-writer.ts
rename to packages/client-generator/src/writers/split-writer.ts
diff --git a/packages/openapi-typescript/src/writers/tagged.ts b/packages/client-generator/src/writers/tagged.ts
similarity index 100%
rename from packages/openapi-typescript/src/writers/tagged.ts
rename to packages/client-generator/src/writers/tagged.ts
diff --git a/packages/openapi-typescript/src/writers/tags-split-writer.ts b/packages/client-generator/src/writers/tags-split-writer.ts
similarity index 100%
rename from packages/openapi-typescript/src/writers/tags-split-writer.ts
rename to packages/client-generator/src/writers/tags-split-writer.ts
diff --git a/packages/openapi-typescript/src/writers/tags-writer.ts b/packages/client-generator/src/writers/tags-writer.ts
similarity index 100%
rename from packages/openapi-typescript/src/writers/tags-writer.ts
rename to packages/client-generator/src/writers/tags-writer.ts
diff --git a/packages/openapi-typescript/src/writers/types.ts b/packages/client-generator/src/writers/types.ts
similarity index 100%
rename from packages/openapi-typescript/src/writers/types.ts
rename to packages/client-generator/src/writers/types.ts
diff --git a/packages/openapi-typescript/src/writers/util.ts b/packages/client-generator/src/writers/util.ts
similarity index 100%
rename from packages/openapi-typescript/src/writers/util.ts
rename to packages/client-generator/src/writers/util.ts
diff --git a/packages/openapi-typescript/tsconfig.json b/packages/client-generator/tsconfig.json
similarity index 100%
rename from packages/openapi-typescript/tsconfig.json
rename to packages/client-generator/tsconfig.json
diff --git a/packages/openapi-typescript/examples/fetch-functions/index.html b/packages/openapi-typescript/examples/fetch-functions/index.html
deleted file mode 100644
index ae59e015b2..0000000000
--- a/packages/openapi-typescript/examples/fetch-functions/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <title>Redocly openapi-typescript — fetch-functions example</title>
-  </head>
-  <body>
-    <pre id="out">Loading…</pre>
-    <script type="module" src="/src/main.ts"></script>
-  </body>
-</html>
diff --git a/packages/openapi-typescript/examples/tanstack-query/src/api/client.ts b/packages/openapi-typescript/examples/tanstack-query/src/api/client.ts
deleted file mode 100644
index 69068d44a4..0000000000
--- a/packages/openapi-typescript/examples/tanstack-query/src/api/client.ts
+++ /dev/null
@@ -1,1518 +0,0 @@
-// Generated by @redocly/openapi-typescript — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Redocly Cafe (v1.0.0)
- * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
- * Create API credentials and try it yourself in a realistic OpenAPI workflow.
- * 
- */
-
-export type Page = {
-    /**
-     * Use with the `after` query parameter to load the next page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    endCursor: string | null;
-    /**
-     * Use with the `before` query parameter to load the previous page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    startCursor: string | null;
-    /**
-     * Indicates if there is a next page with items.
-     */
-    hasNextPage: boolean;
-    /**
-     * Indicates if there is a previous page with items.
-     */
-    hasPrevPage: boolean;
-    /**
-     * Value showing how many items are in the page limit.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit: number;
-    /**
-     * Count of items across all pages.
-     * @minimum 0
-     */
-    total: number;
-};
-
-export type MenuBaseItem = {
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt: string;
-    /**
-     * Menu item ID. Unique identifier prefixed with `prd_`.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    readonly id: string;
-    /**
-     * Entity name.
-     */
-    readonly object: "menuItem";
-    /**
-     * Menu item name.
-     * @minLength 1
-     * @maxLength 50
-     */
-    name: string;
-    /**
-     * Price in cents.
-     * @minimum 0
-     */
-    price: number;
-    /**
-     * Photo of the menu item. Must be a PNG image and less than 1MB.
-     * @format binary
-     */
-    photo?: Blob | null;
-    /**
-     * Photo URL of the menu item.
-     * @format uri
-     */
-    readonly photoUrl?: string;
-    photoTextDescription?: string | null;
-};
-
-export type Beverage = {
-    /**
-     * Menu item category.
-     */
-    category: "beverage";
-    /**
-     * Size of the beverage in milliliters.
-     * @exclusiveMinimum 0
-     */
-    volume: number;
-    /**
-     * Indicates if the beverage contains caffeine.
-     */
-    containsCaffeine: boolean;
-} & MenuBaseItem;
-
-export type Dessert = {
-    /**
-     * Menu item category.
-     */
-    category: "dessert";
-    /**
-     * Amount of calories.
-     * @exclusiveMinimum 0
-     */
-    calories: number;
-} & MenuBaseItem;
-
-export type MenuItem = Beverage | Dessert;
-
-export type MenuItemList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: MenuItem[];
-};
-
-export type Error = {
-    /**
-     * URI reference that identifies the problem type.
-     * @format uri-reference
-     */
-    type: string;
-    /**
-     * Short summary of the problem type.
-     */
-    title: string;
-    /**
-     * HTTP status code generated by the origin server for this occurrence of the problem.
-     * @minimum 100
-     * @exclusiveMaximum 600
-     * @format int32
-     */
-    status: number;
-    /**
-     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-     * May be used to locate the root of this problem in the source code.
-     * @format uri-reference
-     */
-    instance?: string;
-    /**
-     * Additional error details.
-     */
-    details?: Record<string, unknown>;
-};
-
-/**
- * Order status.
- */
-export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
-
-export const OrderStatus = {
-    placed: "placed",
-    preparing: "preparing",
-    completed: "completed",
-    canceled: "canceled"
-} as const;
-
-export type Order = {
-    /**
-     * Order ID. Unique identifier prefixed with `ord_`.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     * @format ulid
-     */
-    readonly id?: string;
-    /**
-     * Entity name.
-     */
-    readonly object?: "order";
-    /**
-     * Name of the customer who placed the order.
-     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-     * @minLength 1
-     * @maxLength 100
-     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-     */
-    customerName: string;
-    readonly status?: OrderStatus;
-    /**
-     * Total order price in cents.
-     * @minimum 0
-     */
-    readonly totalPrice?: number;
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt?: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt?: string;
-    /**
-     * List of items to include in the order.
-     * @minItems 1
-     */
-    orderItems: {
-        /**
-         * ID of the menu item to add to the order.
-         * @format ulid
-         */
-        menuItemId: string;
-        /**
-         * Quantity of the menu item.
-         * @minimum 1
-         */
-        quantity: number;
-        /**
-         * Discount amount in cents (absolute value).
-         * @minimum 0
-         */
-        discount?: number;
-        /**
-         * Optional comment for the order item (e.g., "No sugar").
-         * @maxLength 500
-         */
-        comment?: string;
-    }[];
-};
-
-export type OrderList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: Order[];
-};
-
-export type OrderItem = {
-    /**
-     * ID of the menu item to add to the order.
-     */
-    menuItemId: string;
-    /**
-     * Menu item that is part of the order.
-     */
-    readonly menuItem?: MenuItem;
-    /**
-     * Quantity of the menu item.
-     * @minimum 1
-     */
-    quantity: number;
-    /**
-     * Discount amount in cents (absolute value).
-     * @minimum 0
-     */
-    discount?: number;
-    /**
-     * Optional comment for the order item (e.g., "No sugar").
-     * @maxLength 500
-     */
-    comment?: string;
-};
-
-/**
- * Revenue statistics for a given date range.
- */
-export type RevenueStatistics = {
-    /**
-     * Total revenue in cents from completed orders.
-     * @minimum 0
-     * @format float
-     */
-    revenue: number;
-    /**
-     * Average order amount in cents (calculated from completed orders only).
-     * @minimum 0
-     * @format float
-     */
-    averageOrderAmount: number;
-    /**
-     * Total number of orders (all statuses) in the date range.
-     * @minimum 0
-     */
-    totalOrders: number;
-    /**
-     * Number of placed orders.
-     * @minimum 0
-     */
-    placedOrders: number;
-    /**
-     * Number of preparing orders.
-     * @minimum 0
-     */
-    preparingOrders: number;
-    /**
-     * Number of completed orders.
-     * @minimum 0
-     */
-    completedOrders: number;
-    /**
-     * Number of canceled orders.
-     * @minimum 0
-     */
-    canceledOrders: number;
-    /**
-     * Start date of the revenue calculation period.
-     * @format date
-     */
-    startDate: string;
-    /**
-     * End date of the revenue calculation period.
-     * @format date
-     */
-    endDate: string;
-};
-
-export type RegisterClientObject = {
-    /**
-     * Client name.
-     */
-    name: string;
-    /**
-     * List of redirect URIs (optional, defaults to empty array).
-     */
-    redirectUris?: string[];
-    /**
-     * List of scopes.
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types.
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-/**
- * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
- */
-export type OAuth2Client = {
-    /**
-     * Client identifier issued by the authorization server.
-     */
-    clientId: string;
-    /**
-     * Client secret issued by the authorization server.
-     */
-    clientSecret: string;
-    /**
-     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-     * @format int64
-     */
-    clientIdIssuedAt: number;
-    /**
-     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-     * @format int64
-     */
-    clientSecretExpiresAt: number;
-    /**
-     * Client name (registered metadata).
-     */
-    name?: string;
-    /**
-     * List of redirect URIs (registered metadata).
-     */
-    redirectUris?: string[];
-    /**
-     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
-     * @format uri
-     */
-    registrationClientUri: string;
-    /**
-     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-     */
-    registrationAccessToken: string;
-    /**
-     * List of scopes (registered metadata).
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types (registered metadata).
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-export type OrderNotification = {
-    /**
-     * Unique order identifier.
-     */
-    orderId: string;
-    orderStatus: OrderStatus;
-    /**
-     * When the event occurred.
-     * @format date-time
-     */
-    timestamp: string;
-};
-
-/**
- * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
- */
-export function isBeverage(value: MenuItem): value is Beverage {
-    return (value as Record<string, unknown>)["category"] === "beverage";
-}
-
-/**
- * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
- */
-export function isDessert(value: MenuItem): value is Dessert {
-    return (value as Record<string, unknown>)["category"] === "dessert";
-}
-
-/**
- * Static metadata for every operation, keyed by operationId: the HTTP `method`
- * and the `path` template (with `{param}` placeholders intact). Minification-safe
- * — useful for building cache/query keys, tracing span names, and request logging
- * without re-deriving them at each call site.
- */
-export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu" },
-    createMenuItem: { method: "POST", path: "/menu" },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
-    listOrders: { method: "GET", path: "/orders" },
-    createOrder: { method: "POST", path: "/orders" },
-    getOrderById: { method: "GET", path: "/orders/{orderId}" },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
-    listOrderItems: { method: "GET", path: "/order-items" },
-    getRevenue: { method: "GET", path: "/revenue" },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
-} as const;
-
-/**
- * The operationId of any operation in this client.
- */
-export type OperationId = keyof typeof OPERATIONS;
-
-/**
- * Static metadata describing one operation: its HTTP method and path template.
- */
-export type OperationMetadata = {
-    readonly method: string;
-    readonly path: string;
-};
-
-let BASE = "https://api.cafe.redocly.com";
-
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
-export type RequestContext = {
-    url: string;
-    method: string;
-    headers: Record<string, string>;
-    body?: unknown;
-};
-
-/**
- * Configuration and extension hooks for a client. Supplied per-instance via
- * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
- * (functions facade).
- */
-export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
-    baseUrl?: string;
-    /** Extra headers merged into every request; a function is invoked per request. */
-    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
-    /** Transport used to issue requests. Defaults to the global `fetch`. */
-    fetch?: typeof fetch;
-    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    /** Observe — or replace, by returning a `Response` — the response before parsing. */
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    /**
-     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
-     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
-     */
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
-    /**
-     * Composable interceptors run around every request, alongside the single
-     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
-     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
-     * the last-registered middleware wraps closest to the network. Register more at runtime
-     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
-     */
-    middleware?: Middleware[];
-    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
-    retry?: RetryConfig;
-    /**
-     * Per-instance auth credentials. When set, they override the module-global
-     * `set*` helpers for requests made through this config (each scheme falls back
-     * to its global slot when omitted here). Only the schemes an operation declares
-     * in its `security` are ever sent.
-     */
-    auth?: AuthCredentials;
-};
-
-/**
- * A request interceptor; every field is optional, so a middleware can hook any subset of
- * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
- * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
- * failure into the error to throw, threaded through each middleware in turn.
- */
-export type Middleware = {
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/** Context handed to `retryOn` for the attempt that just failed. */
-export type RetryContext = {
-    /** 1-based number of the attempt that just failed. */
-    attempt: number;
-    /** The request that was attempted. */
-    request: RequestContext;
-    /** Present when the server returned a (non-ok) response. */
-    response?: Response;
-    /** Present when the transport threw (network error, DNS, connection reset). */
-    error?: unknown;
-};
-
-/** Retry policy; all fields optional with sensible defaults. */
-export type RetryConfig = {
-    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
-    retries?: number;
-    /** Base delay in milliseconds. Default 1000. */
-    retryDelay?: number;
-    /** Backoff shape. Default 'exponential'. */
-    retryStrategy?: RetryStrategy;
-    /** Apply full jitter over the computed delay. Default true. */
-    jitter?: boolean;
-    /**
-     * Decide whether to retry a failed attempt. Default: retry only idempotent
-     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
-     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
-     */
-    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
-};
-
-/**
- * How the response body is read. `'auto'` negotiates from the content type (the
- * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
- */
-export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
-
-/**
- * The trailing per-operation argument: standard `RequestInit` plus an optional
- * per-call retry override and a `parseAs` escape hatch.
- *
- * `parseAs` forces how the response body is read; overrides the inferred kind.
- * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
- * override — the static return type is unchanged.
- */
-export type RequestOptions = RequestInit & {
-    retry?: Partial<RetryConfig>;
-    parseAs?: ParseAs;
-};
-
-/**
- * Override the base URL used by every generated operation. Useful when the
- * runtime environment differs from the value declared in `servers[0].url`
- * (e.g. dev / staging / prod toggles in a single-page app).
- *
- * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ baseUrl })`.
- */
-export function setBaseUrl(url: string): void {
-    BASE = url;
-}
-
-/** The global config used by the functions facade (see `configure`). */
-const __config: ClientConfig = {};
-
-/**
- * Merge `config` into the global configuration used by the functions facade —
- * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
- * hooks once for every free function. The service-class facade configures per
- * instance instead (`new Client(config)`).
- */
-export function configure(config: ClientConfig): void {
-    Object.assign(__config, config);
-}
-
-/**
- * Append interceptors to the functions facade's global middleware chain (see
- * `ClientConfig.middleware`). The service-class facade registers per instance via
- * `<Client>.use(...)` instead.
- */
-export function use(...middleware: Middleware[]): void {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    __config.middleware = [...(__config.middleware ?? []), ...middleware];
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function __middleware(config: ClientConfig): Middleware[] {
-    const single = config.onRequest || config.onResponse || config.onError
-        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-        : [];
-    return [...single, ...(config.middleware ?? [])];
-}
-
-export class ApiError extends Error {
-    public readonly url: string;
-    public readonly status: number;
-    public readonly statusText: string;
-    public readonly body: unknown;
-    constructor(url: string, status: number, statusText: string, body: unknown) {
-        super(`Request failed with status ${status}`);
-        this.name = 'ApiError';
-        this.url = url;
-        this.status = status;
-        this.statusText = statusText;
-        this.body = body;
-    }
-}
-
-type QueryPrimitive = string | number | boolean;
-
-type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
-
-/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
-type QueryStyle = {
-    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-    explode: boolean;
-    allowReserved?: boolean;
-};
-
-/**
- * Percent-encode `value` but leave the RFC-3986 reserved set
- * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
- */
-function __encodeReserved(value: string): string {
-    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
-}
-
-function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
-    if (!query)
-        return url;
-    const params = new URLSearchParams();
-    const raw: string[] = [];
-    for (const [key, value] of Object.entries(query)) {
-        if (value === undefined || value === null)
-            continue;
-        const spec = styles?.[key];
-        if (!spec) {
-            if (Array.isArray(value)) {
-                for (const v of value) {
-                    if (v !== undefined && v !== null)
-                        params.append(key, String(v));
-                }
-            }
-            else if (typeof value === 'object') {
-                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-                for (const [subKey, subValue] of Object.entries(value)) {
-                    if (subValue !== undefined && subValue !== null) {
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                    }
-                }
-            }
-            else {
-                params.append(key, String(value));
-            }
-            continue;
-        }
-        if (Array.isArray(value)) {
-            const items = value.filter((v) => v !== undefined && v !== null).map(String);
-            if (spec.style === 'form' && spec.explode) {
-                for (const v of items) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}=${__encodeReserved(v)}`);
-                    else
-                        params.append(key, v);
-                }
-            }
-            else {
-                // Delimited styles put the LITERAL delimiter on the wire; only the
-                // values are encoded. `%20` (not `+`) is the literal space delimiter.
-                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
-                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-            }
-        }
-        else if (typeof value === 'object') {
-            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-            for (const [subKey, subValue] of Object.entries(value)) {
-                if (subValue !== undefined && subValue !== null) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
-                    else
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                }
-            }
-        }
-        else if (spec.allowReserved) {
-            raw.push(`${key}=${__encodeReserved(String(value))}`);
-        }
-        else {
-            params.append(key, String(value));
-        }
-    }
-    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-    return qs ? `${url}?${qs}` : url;
-}
-
-async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
-    response: Response;
-    context: RequestContext;
-}> {
-    const { retry: callRetry, ...fetchInit } = init;
-    const retry: RetryConfig = { ...config.retry, ...callRetry };
-    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-    const headers: Record<string, string> = {
-        Accept: 'application/json',
-        ...extra,
-        ...(fetchInit.headers as Record<string, string> | undefined),
-    };
-    let payload: BodyInit | undefined;
-    if (body !== undefined) {
-        const isBinary = body instanceof Blob ||
-            body instanceof ArrayBuffer ||
-            ArrayBuffer.isView(body as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
-        const isURLSearchParams = body instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
-            payload = body as BodyInit;
-        }
-        else {
-            payload = JSON.stringify(body);
-            if (!('Content-Type' in headers) && !('content-type' in headers)) {
-                headers['Content-Type'] = 'application/json';
-            }
-        }
-    }
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
-    const doFetch = config.fetch ?? fetch;
-    const maxAttempts = 1 + (retry.retries ?? 0);
-    const retryOn = retry.retryOn ?? __defaultRetryOn;
-    const signal = fetchInit.signal ?? undefined;
-    let attempt = 0;
-    while (true) {
-        attempt++;
-        if (signal?.aborted)
-            throw __abortError(signal);
-        let response: Response;
-        try {
-            response = await doFetch(context.url, {
-                ...fetchInit,
-                method: context.method,
-                headers: context.headers,
-                body: payload,
-            });
-        }
-        catch (error) {
-            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
-                await __sleep(__retryDelay(retry, attempt, null), signal);
-                continue;
-            }
-            throw error;
-        }
-        // Reverse order: the last-registered middleware wraps closest to the network (onion).
-        for (let i = middleware.length - 1; i >= 0; i--) {
-            const onResponse = middleware[i].onResponse;
-            if (onResponse) {
-                const replaced = await onResponse(response, context);
-                if (replaced)
-                    response = replaced;
-            }
-        }
-        if (!response.ok &&
-            attempt < maxAttempts &&
-            !signal?.aborted &&
-            (await retryOn({ attempt, request: context, response }))) {
-            const retryAfter = response.headers.get('retry-after');
-            // Drain the abandoned response body before the next attempt: an unread body
-            // keeps the connection checked out (and can stall the pool) under Node/undici
-            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-            await response.body?.cancel().catch(() => undefined);
-            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
-            continue;
-        }
-        return { response, context };
-    }
-}
-
-async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-    if (kind === 'void' || response.status === 204)
-        return undefined;
-    if (kind === 'stream')
-        return response.body;
-    if (kind === 'blob')
-        return response.blob();
-    if (kind === 'arrayBuffer')
-        return response.arrayBuffer();
-    if (kind === 'formData')
-        return response.formData();
-    if (kind === 'text')
-        return response.text();
-    if (kind === 'json')
-        return response.json();
-    // 'auto' — negotiate from the response's content type.
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json'))
-        return response.json();
-    if (contentType.startsWith('text/'))
-        return response.text();
-    return response.blob();
-}
-
-async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
-    const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, url, sendInit, body);
-    if (!response.ok) {
-        const errorBody = await readError(response);
-        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
-        // Thread the error through each middleware's onError in turn (each may replace it).
-        for (const mw of __middleware(config)) {
-            if (mw.onError)
-                error = await mw.onError(error as ApiError, context);
-        }
-        throw error;
-    }
-    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
-    return (await __parse(response, kind)) as T;
-}
-
-async function readError(response: Response): Promise<unknown> {
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json')) {
-        return response.json().catch(() => undefined);
-    }
-    return response.text().catch(() => undefined);
-}
-
-const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-
-const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-function __defaultRetryOn(ctx: RetryContext): boolean {
-    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
-        return false;
-    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-    if (retryAfter) {
-        const seconds = Number(retryAfter);
-        if (!Number.isNaN(seconds))
-            return seconds * 1000;
-        const when = Date.parse(retryAfter);
-        if (!Number.isNaN(when))
-            return Math.max(0, when - Date.now());
-    }
-    const base = retry.retryDelay ?? 1000;
-    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-    return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
-    return new Promise((resolve, reject) => {
-        if (signal?.aborted) {
-            reject(__abortError(signal));
-            return;
-        }
-        const onAbort = () => {
-            clearTimeout(timer);
-            reject(__abortError(signal as AbortSignal));
-        };
-        const timer = setTimeout(() => {
-            if (signal)
-                signal.removeEventListener('abort', onAbort);
-            resolve();
-        }, ms);
-        if (signal)
-            signal.addEventListener('abort', onAbort, { once: true });
-    });
-}
-
-function __abortError(signal: AbortSignal): globalThis.Error {
-    const reason = (signal as {
-        reason?: unknown;
-    }).reason;
-    if (reason instanceof Error)
-        return reason;
-    return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * Normalize an operation's header-parameter object into a plain string record,
- * dropping any `undefined` / `null` entries (optional headers the caller omitted)
- * and stringifying the rest. Mirrors __buildUrl's handling of query values.
- */
-function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
-    const out: Record<string, string> = {};
-    for (const [key, value] of Object.entries(values)) {
-        if (value !== undefined && value !== null)
-            out[key] = String(value);
-    }
-    return out;
-}
-
-/**
- * A credential value, or a (possibly async) function that returns one per request.
- */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/**
- * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
- * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
- * to the global slots.
- */
-export type AuthCredentials = {
-    bearer?: TokenProvider;
-    apiKey?: Record<string, TokenProvider>;
-};
-
-let __bearerToken: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
- * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
- * (possibly async) function resolved per request.
- */
-export function setBearer(token: TokenProvider | null): void {
-    __bearerToken = token;
-}
-
-let __apiKey_ApiKey: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
- * string or a (possibly async) function resolved per request.
- */
-export function setApiKey(key: TokenProvider | null): void {
-    __apiKey_ApiKey = key;
-}
-
-/**
- * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
- */
-async function __resolve(slot: TokenProvider | null): Promise<string | null> {
-    if (slot === null)
-        return null;
-    return typeof slot === "function" ? slot() : slot;
-}
-
-/**
- * Build the auth `headers` and `query` for an operation from the currently-set credentials.
- * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
- * can always override by passing their own `init.headers`.
- */
-async function __auth(schemes: string[], config: ClientConfig): Promise<{
-    headers: Record<string, string>;
-    query: Record<string, string>;
-}> {
-    const headers: Record<string, string> = {};
-    const query: Record<string, string> = {};
-    const cookies: string[] = [];
-    for (const scheme of schemes) {
-        switch (scheme) {
-            case "OAuth2": {
-                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
-                if (v !== null)
-                    headers["Authorization"] = `Bearer ${v}`;
-                break;
-            }
-            case "ApiKey": {
-                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
-                if (v !== null)
-                    headers["X-API-Key"] = v;
-                break;
-            }
-        }
-    }
-    if (cookies.length > 0)
-        headers["Cookie"] = cookies.join("; ");
-    return { headers, query };
-}
-
-export type ListMenuItemsResult = MenuItemList;
-
-export type ListMenuItemsParams = {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-};
-
-export type ListMenuItemsVariables = {
-    params?: ListMenuItemsParams;
-};
-
-/**
- * List all menu items
- *
- * Retrieve a collection of menu items with optional filtering and pagination.
- */
-export async function listMenuItems(params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-    return __request<MenuItemList>(__config, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
-}
-
-export type CreateMenuItemResult = MenuItem;
-
-export type CreateMenuItemBody = FormData;
-
-export type CreateMenuItemVariables = {
-    body: CreateMenuItemBody;
-};
-
-/**
- * Create menu item
- *
- * Create a new menu item.
- */
-export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<MenuItem>(__config, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
-export type DeleteMenuItemResult = void;
-
-export type DeleteMenuItemVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-};
-
-/**
- * Delete a menu item
- *
- * Delete an existing menu item.
- */
-export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
-export type GetMenuItemPhotoResult = Blob | string;
-
-export type GetMenuItemPhotoParams = {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-};
-
-export type GetMenuItemPhotoVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-    params?: GetMenuItemPhotoParams;
-};
-
-/**
- * Retrieve a menu item photo
- *
- * Retrieve the product photo image for a specific menu item.
- */
-export async function getMenuItemPhoto(menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}): Promise<Blob | string> {
-    return __request<Blob | string>(__config, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
-}
-
-export type ListOrdersResult = OrderList;
-
-export type ListOrdersParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-};
-
-export type ListOrdersVariables = {
-    params?: ListOrdersParams;
-};
-
-/**
- * List all orders
- *
- * Retrieve a collection of orders with optional filtering and pagination.
- */
-export async function listOrders(params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderList> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderList>(__config, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-/**
- * Create order
- *
- * Create a new order.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    headers?: GetOrderByIdHeaders;
-};
-
-/**
- * Retrieve an order
- *
- * Retrieve a single order by its ID.
- */
-export async function getOrderById(orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
-}
-
-export type DeleteOrderResult = void;
-
-export type DeleteOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-};
-
-/**
- * Delete an order
- *
- * Delete the order.
- * To keep the order history, the order should be canceled instead of deleted.
- */
-export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
-export type UpdateOrderResult = Order;
-
-export type UpdateOrderBody = {
-    status: OrderStatus;
-};
-
-export type UpdateOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    body?: UpdateOrderBody;
-};
-
-/**
- * Partially update an order
- *
- * Update an existing order status.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function updateOrder(orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
-export type ListOrderItemsResult = OrderItem[];
-
-export type ListOrderItemsParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-};
-
-export type ListOrderItemsVariables = {
-    params?: ListOrderItemsParams;
-};
-
-/**
- * List all order items with menu item details
- *
- * Returns an array of order items for a specific order.
- * Use the `filter` parameter to filter by order ID.
- */
-export async function listOrderItems(params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderItem[]>(__config, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-/**
- * Get revenue statistics
- *
- * Retrieve revenue statistics for a configurable date range.
- * Returns revenue, order counts, average order amount, and other useful statistics.
- */
-export async function getRevenue(params: {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
-    const __a = await __auth(["ApiKey"], __config);
-    return __request<RevenueStatistics>(__config, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Create OAuth2 client
- *
- * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
- * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
- *   `redirectUris` must be provided (per RFC 7591 Section 2).
- * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
- * Returns the registered client information per RFC 7591, including:
- * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
- */
-export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-    return __request<OAuth2Client>(__config, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
-}
diff --git a/packages/openapi-typescript/examples/zod/src/api/client.ts b/packages/openapi-typescript/examples/zod/src/api/client.ts
deleted file mode 100644
index 69068d44a4..0000000000
--- a/packages/openapi-typescript/examples/zod/src/api/client.ts
+++ /dev/null
@@ -1,1518 +0,0 @@
-// Generated by @redocly/openapi-typescript — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Redocly Cafe (v1.0.0)
- * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
- * Create API credentials and try it yourself in a realistic OpenAPI workflow.
- * 
- */
-
-export type Page = {
-    /**
-     * Use with the `after` query parameter to load the next page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    endCursor: string | null;
-    /**
-     * Use with the `before` query parameter to load the previous page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    startCursor: string | null;
-    /**
-     * Indicates if there is a next page with items.
-     */
-    hasNextPage: boolean;
-    /**
-     * Indicates if there is a previous page with items.
-     */
-    hasPrevPage: boolean;
-    /**
-     * Value showing how many items are in the page limit.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit: number;
-    /**
-     * Count of items across all pages.
-     * @minimum 0
-     */
-    total: number;
-};
-
-export type MenuBaseItem = {
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt: string;
-    /**
-     * Menu item ID. Unique identifier prefixed with `prd_`.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    readonly id: string;
-    /**
-     * Entity name.
-     */
-    readonly object: "menuItem";
-    /**
-     * Menu item name.
-     * @minLength 1
-     * @maxLength 50
-     */
-    name: string;
-    /**
-     * Price in cents.
-     * @minimum 0
-     */
-    price: number;
-    /**
-     * Photo of the menu item. Must be a PNG image and less than 1MB.
-     * @format binary
-     */
-    photo?: Blob | null;
-    /**
-     * Photo URL of the menu item.
-     * @format uri
-     */
-    readonly photoUrl?: string;
-    photoTextDescription?: string | null;
-};
-
-export type Beverage = {
-    /**
-     * Menu item category.
-     */
-    category: "beverage";
-    /**
-     * Size of the beverage in milliliters.
-     * @exclusiveMinimum 0
-     */
-    volume: number;
-    /**
-     * Indicates if the beverage contains caffeine.
-     */
-    containsCaffeine: boolean;
-} & MenuBaseItem;
-
-export type Dessert = {
-    /**
-     * Menu item category.
-     */
-    category: "dessert";
-    /**
-     * Amount of calories.
-     * @exclusiveMinimum 0
-     */
-    calories: number;
-} & MenuBaseItem;
-
-export type MenuItem = Beverage | Dessert;
-
-export type MenuItemList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: MenuItem[];
-};
-
-export type Error = {
-    /**
-     * URI reference that identifies the problem type.
-     * @format uri-reference
-     */
-    type: string;
-    /**
-     * Short summary of the problem type.
-     */
-    title: string;
-    /**
-     * HTTP status code generated by the origin server for this occurrence of the problem.
-     * @minimum 100
-     * @exclusiveMaximum 600
-     * @format int32
-     */
-    status: number;
-    /**
-     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-     * May be used to locate the root of this problem in the source code.
-     * @format uri-reference
-     */
-    instance?: string;
-    /**
-     * Additional error details.
-     */
-    details?: Record<string, unknown>;
-};
-
-/**
- * Order status.
- */
-export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
-
-export const OrderStatus = {
-    placed: "placed",
-    preparing: "preparing",
-    completed: "completed",
-    canceled: "canceled"
-} as const;
-
-export type Order = {
-    /**
-     * Order ID. Unique identifier prefixed with `ord_`.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     * @format ulid
-     */
-    readonly id?: string;
-    /**
-     * Entity name.
-     */
-    readonly object?: "order";
-    /**
-     * Name of the customer who placed the order.
-     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-     * @minLength 1
-     * @maxLength 100
-     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-     */
-    customerName: string;
-    readonly status?: OrderStatus;
-    /**
-     * Total order price in cents.
-     * @minimum 0
-     */
-    readonly totalPrice?: number;
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt?: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt?: string;
-    /**
-     * List of items to include in the order.
-     * @minItems 1
-     */
-    orderItems: {
-        /**
-         * ID of the menu item to add to the order.
-         * @format ulid
-         */
-        menuItemId: string;
-        /**
-         * Quantity of the menu item.
-         * @minimum 1
-         */
-        quantity: number;
-        /**
-         * Discount amount in cents (absolute value).
-         * @minimum 0
-         */
-        discount?: number;
-        /**
-         * Optional comment for the order item (e.g., "No sugar").
-         * @maxLength 500
-         */
-        comment?: string;
-    }[];
-};
-
-export type OrderList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: Order[];
-};
-
-export type OrderItem = {
-    /**
-     * ID of the menu item to add to the order.
-     */
-    menuItemId: string;
-    /**
-     * Menu item that is part of the order.
-     */
-    readonly menuItem?: MenuItem;
-    /**
-     * Quantity of the menu item.
-     * @minimum 1
-     */
-    quantity: number;
-    /**
-     * Discount amount in cents (absolute value).
-     * @minimum 0
-     */
-    discount?: number;
-    /**
-     * Optional comment for the order item (e.g., "No sugar").
-     * @maxLength 500
-     */
-    comment?: string;
-};
-
-/**
- * Revenue statistics for a given date range.
- */
-export type RevenueStatistics = {
-    /**
-     * Total revenue in cents from completed orders.
-     * @minimum 0
-     * @format float
-     */
-    revenue: number;
-    /**
-     * Average order amount in cents (calculated from completed orders only).
-     * @minimum 0
-     * @format float
-     */
-    averageOrderAmount: number;
-    /**
-     * Total number of orders (all statuses) in the date range.
-     * @minimum 0
-     */
-    totalOrders: number;
-    /**
-     * Number of placed orders.
-     * @minimum 0
-     */
-    placedOrders: number;
-    /**
-     * Number of preparing orders.
-     * @minimum 0
-     */
-    preparingOrders: number;
-    /**
-     * Number of completed orders.
-     * @minimum 0
-     */
-    completedOrders: number;
-    /**
-     * Number of canceled orders.
-     * @minimum 0
-     */
-    canceledOrders: number;
-    /**
-     * Start date of the revenue calculation period.
-     * @format date
-     */
-    startDate: string;
-    /**
-     * End date of the revenue calculation period.
-     * @format date
-     */
-    endDate: string;
-};
-
-export type RegisterClientObject = {
-    /**
-     * Client name.
-     */
-    name: string;
-    /**
-     * List of redirect URIs (optional, defaults to empty array).
-     */
-    redirectUris?: string[];
-    /**
-     * List of scopes.
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types.
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-/**
- * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
- */
-export type OAuth2Client = {
-    /**
-     * Client identifier issued by the authorization server.
-     */
-    clientId: string;
-    /**
-     * Client secret issued by the authorization server.
-     */
-    clientSecret: string;
-    /**
-     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-     * @format int64
-     */
-    clientIdIssuedAt: number;
-    /**
-     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-     * @format int64
-     */
-    clientSecretExpiresAt: number;
-    /**
-     * Client name (registered metadata).
-     */
-    name?: string;
-    /**
-     * List of redirect URIs (registered metadata).
-     */
-    redirectUris?: string[];
-    /**
-     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
-     * @format uri
-     */
-    registrationClientUri: string;
-    /**
-     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-     */
-    registrationAccessToken: string;
-    /**
-     * List of scopes (registered metadata).
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types (registered metadata).
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-export type OrderNotification = {
-    /**
-     * Unique order identifier.
-     */
-    orderId: string;
-    orderStatus: OrderStatus;
-    /**
-     * When the event occurred.
-     * @format date-time
-     */
-    timestamp: string;
-};
-
-/**
- * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
- */
-export function isBeverage(value: MenuItem): value is Beverage {
-    return (value as Record<string, unknown>)["category"] === "beverage";
-}
-
-/**
- * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
- */
-export function isDessert(value: MenuItem): value is Dessert {
-    return (value as Record<string, unknown>)["category"] === "dessert";
-}
-
-/**
- * Static metadata for every operation, keyed by operationId: the HTTP `method`
- * and the `path` template (with `{param}` placeholders intact). Minification-safe
- * — useful for building cache/query keys, tracing span names, and request logging
- * without re-deriving them at each call site.
- */
-export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu" },
-    createMenuItem: { method: "POST", path: "/menu" },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
-    listOrders: { method: "GET", path: "/orders" },
-    createOrder: { method: "POST", path: "/orders" },
-    getOrderById: { method: "GET", path: "/orders/{orderId}" },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
-    listOrderItems: { method: "GET", path: "/order-items" },
-    getRevenue: { method: "GET", path: "/revenue" },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
-} as const;
-
-/**
- * The operationId of any operation in this client.
- */
-export type OperationId = keyof typeof OPERATIONS;
-
-/**
- * Static metadata describing one operation: its HTTP method and path template.
- */
-export type OperationMetadata = {
-    readonly method: string;
-    readonly path: string;
-};
-
-let BASE = "https://api.cafe.redocly.com";
-
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
-export type RequestContext = {
-    url: string;
-    method: string;
-    headers: Record<string, string>;
-    body?: unknown;
-};
-
-/**
- * Configuration and extension hooks for a client. Supplied per-instance via
- * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
- * (functions facade).
- */
-export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
-    baseUrl?: string;
-    /** Extra headers merged into every request; a function is invoked per request. */
-    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
-    /** Transport used to issue requests. Defaults to the global `fetch`. */
-    fetch?: typeof fetch;
-    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    /** Observe — or replace, by returning a `Response` — the response before parsing. */
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    /**
-     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
-     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
-     */
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
-    /**
-     * Composable interceptors run around every request, alongside the single
-     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
-     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
-     * the last-registered middleware wraps closest to the network. Register more at runtime
-     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
-     */
-    middleware?: Middleware[];
-    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
-    retry?: RetryConfig;
-    /**
-     * Per-instance auth credentials. When set, they override the module-global
-     * `set*` helpers for requests made through this config (each scheme falls back
-     * to its global slot when omitted here). Only the schemes an operation declares
-     * in its `security` are ever sent.
-     */
-    auth?: AuthCredentials;
-};
-
-/**
- * A request interceptor; every field is optional, so a middleware can hook any subset of
- * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
- * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
- * failure into the error to throw, threaded through each middleware in turn.
- */
-export type Middleware = {
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/** Context handed to `retryOn` for the attempt that just failed. */
-export type RetryContext = {
-    /** 1-based number of the attempt that just failed. */
-    attempt: number;
-    /** The request that was attempted. */
-    request: RequestContext;
-    /** Present when the server returned a (non-ok) response. */
-    response?: Response;
-    /** Present when the transport threw (network error, DNS, connection reset). */
-    error?: unknown;
-};
-
-/** Retry policy; all fields optional with sensible defaults. */
-export type RetryConfig = {
-    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
-    retries?: number;
-    /** Base delay in milliseconds. Default 1000. */
-    retryDelay?: number;
-    /** Backoff shape. Default 'exponential'. */
-    retryStrategy?: RetryStrategy;
-    /** Apply full jitter over the computed delay. Default true. */
-    jitter?: boolean;
-    /**
-     * Decide whether to retry a failed attempt. Default: retry only idempotent
-     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
-     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
-     */
-    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
-};
-
-/**
- * How the response body is read. `'auto'` negotiates from the content type (the
- * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
- */
-export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
-
-/**
- * The trailing per-operation argument: standard `RequestInit` plus an optional
- * per-call retry override and a `parseAs` escape hatch.
- *
- * `parseAs` forces how the response body is read; overrides the inferred kind.
- * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
- * override — the static return type is unchanged.
- */
-export type RequestOptions = RequestInit & {
-    retry?: Partial<RetryConfig>;
-    parseAs?: ParseAs;
-};
-
-/**
- * Override the base URL used by every generated operation. Useful when the
- * runtime environment differs from the value declared in `servers[0].url`
- * (e.g. dev / staging / prod toggles in a single-page app).
- *
- * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ baseUrl })`.
- */
-export function setBaseUrl(url: string): void {
-    BASE = url;
-}
-
-/** The global config used by the functions facade (see `configure`). */
-const __config: ClientConfig = {};
-
-/**
- * Merge `config` into the global configuration used by the functions facade —
- * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
- * hooks once for every free function. The service-class facade configures per
- * instance instead (`new Client(config)`).
- */
-export function configure(config: ClientConfig): void {
-    Object.assign(__config, config);
-}
-
-/**
- * Append interceptors to the functions facade's global middleware chain (see
- * `ClientConfig.middleware`). The service-class facade registers per instance via
- * `<Client>.use(...)` instead.
- */
-export function use(...middleware: Middleware[]): void {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    __config.middleware = [...(__config.middleware ?? []), ...middleware];
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function __middleware(config: ClientConfig): Middleware[] {
-    const single = config.onRequest || config.onResponse || config.onError
-        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-        : [];
-    return [...single, ...(config.middleware ?? [])];
-}
-
-export class ApiError extends Error {
-    public readonly url: string;
-    public readonly status: number;
-    public readonly statusText: string;
-    public readonly body: unknown;
-    constructor(url: string, status: number, statusText: string, body: unknown) {
-        super(`Request failed with status ${status}`);
-        this.name = 'ApiError';
-        this.url = url;
-        this.status = status;
-        this.statusText = statusText;
-        this.body = body;
-    }
-}
-
-type QueryPrimitive = string | number | boolean;
-
-type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
-
-/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
-type QueryStyle = {
-    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-    explode: boolean;
-    allowReserved?: boolean;
-};
-
-/**
- * Percent-encode `value` but leave the RFC-3986 reserved set
- * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
- */
-function __encodeReserved(value: string): string {
-    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
-}
-
-function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
-    if (!query)
-        return url;
-    const params = new URLSearchParams();
-    const raw: string[] = [];
-    for (const [key, value] of Object.entries(query)) {
-        if (value === undefined || value === null)
-            continue;
-        const spec = styles?.[key];
-        if (!spec) {
-            if (Array.isArray(value)) {
-                for (const v of value) {
-                    if (v !== undefined && v !== null)
-                        params.append(key, String(v));
-                }
-            }
-            else if (typeof value === 'object') {
-                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-                for (const [subKey, subValue] of Object.entries(value)) {
-                    if (subValue !== undefined && subValue !== null) {
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                    }
-                }
-            }
-            else {
-                params.append(key, String(value));
-            }
-            continue;
-        }
-        if (Array.isArray(value)) {
-            const items = value.filter((v) => v !== undefined && v !== null).map(String);
-            if (spec.style === 'form' && spec.explode) {
-                for (const v of items) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}=${__encodeReserved(v)}`);
-                    else
-                        params.append(key, v);
-                }
-            }
-            else {
-                // Delimited styles put the LITERAL delimiter on the wire; only the
-                // values are encoded. `%20` (not `+`) is the literal space delimiter.
-                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
-                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-            }
-        }
-        else if (typeof value === 'object') {
-            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-            for (const [subKey, subValue] of Object.entries(value)) {
-                if (subValue !== undefined && subValue !== null) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
-                    else
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                }
-            }
-        }
-        else if (spec.allowReserved) {
-            raw.push(`${key}=${__encodeReserved(String(value))}`);
-        }
-        else {
-            params.append(key, String(value));
-        }
-    }
-    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-    return qs ? `${url}?${qs}` : url;
-}
-
-async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
-    response: Response;
-    context: RequestContext;
-}> {
-    const { retry: callRetry, ...fetchInit } = init;
-    const retry: RetryConfig = { ...config.retry, ...callRetry };
-    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-    const headers: Record<string, string> = {
-        Accept: 'application/json',
-        ...extra,
-        ...(fetchInit.headers as Record<string, string> | undefined),
-    };
-    let payload: BodyInit | undefined;
-    if (body !== undefined) {
-        const isBinary = body instanceof Blob ||
-            body instanceof ArrayBuffer ||
-            ArrayBuffer.isView(body as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
-        const isURLSearchParams = body instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
-            payload = body as BodyInit;
-        }
-        else {
-            payload = JSON.stringify(body);
-            if (!('Content-Type' in headers) && !('content-type' in headers)) {
-                headers['Content-Type'] = 'application/json';
-            }
-        }
-    }
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
-    const doFetch = config.fetch ?? fetch;
-    const maxAttempts = 1 + (retry.retries ?? 0);
-    const retryOn = retry.retryOn ?? __defaultRetryOn;
-    const signal = fetchInit.signal ?? undefined;
-    let attempt = 0;
-    while (true) {
-        attempt++;
-        if (signal?.aborted)
-            throw __abortError(signal);
-        let response: Response;
-        try {
-            response = await doFetch(context.url, {
-                ...fetchInit,
-                method: context.method,
-                headers: context.headers,
-                body: payload,
-            });
-        }
-        catch (error) {
-            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
-                await __sleep(__retryDelay(retry, attempt, null), signal);
-                continue;
-            }
-            throw error;
-        }
-        // Reverse order: the last-registered middleware wraps closest to the network (onion).
-        for (let i = middleware.length - 1; i >= 0; i--) {
-            const onResponse = middleware[i].onResponse;
-            if (onResponse) {
-                const replaced = await onResponse(response, context);
-                if (replaced)
-                    response = replaced;
-            }
-        }
-        if (!response.ok &&
-            attempt < maxAttempts &&
-            !signal?.aborted &&
-            (await retryOn({ attempt, request: context, response }))) {
-            const retryAfter = response.headers.get('retry-after');
-            // Drain the abandoned response body before the next attempt: an unread body
-            // keeps the connection checked out (and can stall the pool) under Node/undici
-            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-            await response.body?.cancel().catch(() => undefined);
-            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
-            continue;
-        }
-        return { response, context };
-    }
-}
-
-async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-    if (kind === 'void' || response.status === 204)
-        return undefined;
-    if (kind === 'stream')
-        return response.body;
-    if (kind === 'blob')
-        return response.blob();
-    if (kind === 'arrayBuffer')
-        return response.arrayBuffer();
-    if (kind === 'formData')
-        return response.formData();
-    if (kind === 'text')
-        return response.text();
-    if (kind === 'json')
-        return response.json();
-    // 'auto' — negotiate from the response's content type.
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json'))
-        return response.json();
-    if (contentType.startsWith('text/'))
-        return response.text();
-    return response.blob();
-}
-
-async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
-    const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, url, sendInit, body);
-    if (!response.ok) {
-        const errorBody = await readError(response);
-        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
-        // Thread the error through each middleware's onError in turn (each may replace it).
-        for (const mw of __middleware(config)) {
-            if (mw.onError)
-                error = await mw.onError(error as ApiError, context);
-        }
-        throw error;
-    }
-    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
-    return (await __parse(response, kind)) as T;
-}
-
-async function readError(response: Response): Promise<unknown> {
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json')) {
-        return response.json().catch(() => undefined);
-    }
-    return response.text().catch(() => undefined);
-}
-
-const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-
-const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-function __defaultRetryOn(ctx: RetryContext): boolean {
-    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
-        return false;
-    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-    if (retryAfter) {
-        const seconds = Number(retryAfter);
-        if (!Number.isNaN(seconds))
-            return seconds * 1000;
-        const when = Date.parse(retryAfter);
-        if (!Number.isNaN(when))
-            return Math.max(0, when - Date.now());
-    }
-    const base = retry.retryDelay ?? 1000;
-    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-    return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
-    return new Promise((resolve, reject) => {
-        if (signal?.aborted) {
-            reject(__abortError(signal));
-            return;
-        }
-        const onAbort = () => {
-            clearTimeout(timer);
-            reject(__abortError(signal as AbortSignal));
-        };
-        const timer = setTimeout(() => {
-            if (signal)
-                signal.removeEventListener('abort', onAbort);
-            resolve();
-        }, ms);
-        if (signal)
-            signal.addEventListener('abort', onAbort, { once: true });
-    });
-}
-
-function __abortError(signal: AbortSignal): globalThis.Error {
-    const reason = (signal as {
-        reason?: unknown;
-    }).reason;
-    if (reason instanceof Error)
-        return reason;
-    return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * Normalize an operation's header-parameter object into a plain string record,
- * dropping any `undefined` / `null` entries (optional headers the caller omitted)
- * and stringifying the rest. Mirrors __buildUrl's handling of query values.
- */
-function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
-    const out: Record<string, string> = {};
-    for (const [key, value] of Object.entries(values)) {
-        if (value !== undefined && value !== null)
-            out[key] = String(value);
-    }
-    return out;
-}
-
-/**
- * A credential value, or a (possibly async) function that returns one per request.
- */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/**
- * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
- * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
- * to the global slots.
- */
-export type AuthCredentials = {
-    bearer?: TokenProvider;
-    apiKey?: Record<string, TokenProvider>;
-};
-
-let __bearerToken: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
- * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
- * (possibly async) function resolved per request.
- */
-export function setBearer(token: TokenProvider | null): void {
-    __bearerToken = token;
-}
-
-let __apiKey_ApiKey: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
- * string or a (possibly async) function resolved per request.
- */
-export function setApiKey(key: TokenProvider | null): void {
-    __apiKey_ApiKey = key;
-}
-
-/**
- * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
- */
-async function __resolve(slot: TokenProvider | null): Promise<string | null> {
-    if (slot === null)
-        return null;
-    return typeof slot === "function" ? slot() : slot;
-}
-
-/**
- * Build the auth `headers` and `query` for an operation from the currently-set credentials.
- * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
- * can always override by passing their own `init.headers`.
- */
-async function __auth(schemes: string[], config: ClientConfig): Promise<{
-    headers: Record<string, string>;
-    query: Record<string, string>;
-}> {
-    const headers: Record<string, string> = {};
-    const query: Record<string, string> = {};
-    const cookies: string[] = [];
-    for (const scheme of schemes) {
-        switch (scheme) {
-            case "OAuth2": {
-                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
-                if (v !== null)
-                    headers["Authorization"] = `Bearer ${v}`;
-                break;
-            }
-            case "ApiKey": {
-                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
-                if (v !== null)
-                    headers["X-API-Key"] = v;
-                break;
-            }
-        }
-    }
-    if (cookies.length > 0)
-        headers["Cookie"] = cookies.join("; ");
-    return { headers, query };
-}
-
-export type ListMenuItemsResult = MenuItemList;
-
-export type ListMenuItemsParams = {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-};
-
-export type ListMenuItemsVariables = {
-    params?: ListMenuItemsParams;
-};
-
-/**
- * List all menu items
- *
- * Retrieve a collection of menu items with optional filtering and pagination.
- */
-export async function listMenuItems(params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-    return __request<MenuItemList>(__config, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
-}
-
-export type CreateMenuItemResult = MenuItem;
-
-export type CreateMenuItemBody = FormData;
-
-export type CreateMenuItemVariables = {
-    body: CreateMenuItemBody;
-};
-
-/**
- * Create menu item
- *
- * Create a new menu item.
- */
-export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<MenuItem>(__config, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
-export type DeleteMenuItemResult = void;
-
-export type DeleteMenuItemVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-};
-
-/**
- * Delete a menu item
- *
- * Delete an existing menu item.
- */
-export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
-export type GetMenuItemPhotoResult = Blob | string;
-
-export type GetMenuItemPhotoParams = {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-};
-
-export type GetMenuItemPhotoVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-    params?: GetMenuItemPhotoParams;
-};
-
-/**
- * Retrieve a menu item photo
- *
- * Retrieve the product photo image for a specific menu item.
- */
-export async function getMenuItemPhoto(menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}): Promise<Blob | string> {
-    return __request<Blob | string>(__config, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
-}
-
-export type ListOrdersResult = OrderList;
-
-export type ListOrdersParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-};
-
-export type ListOrdersVariables = {
-    params?: ListOrdersParams;
-};
-
-/**
- * List all orders
- *
- * Retrieve a collection of orders with optional filtering and pagination.
- */
-export async function listOrders(params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderList> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderList>(__config, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-/**
- * Create order
- *
- * Create a new order.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    headers?: GetOrderByIdHeaders;
-};
-
-/**
- * Retrieve an order
- *
- * Retrieve a single order by its ID.
- */
-export async function getOrderById(orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
-}
-
-export type DeleteOrderResult = void;
-
-export type DeleteOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-};
-
-/**
- * Delete an order
- *
- * Delete the order.
- * To keep the order history, the order should be canceled instead of deleted.
- */
-export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
-export type UpdateOrderResult = Order;
-
-export type UpdateOrderBody = {
-    status: OrderStatus;
-};
-
-export type UpdateOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    body?: UpdateOrderBody;
-};
-
-/**
- * Partially update an order
- *
- * Update an existing order status.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function updateOrder(orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
-export type ListOrderItemsResult = OrderItem[];
-
-export type ListOrderItemsParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-};
-
-export type ListOrderItemsVariables = {
-    params?: ListOrderItemsParams;
-};
-
-/**
- * List all order items with menu item details
- *
- * Returns an array of order items for a specific order.
- * Use the `filter` parameter to filter by order ID.
- */
-export async function listOrderItems(params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderItem[]>(__config, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-/**
- * Get revenue statistics
- *
- * Retrieve revenue statistics for a configurable date range.
- * Returns revenue, order counts, average order amount, and other useful statistics.
- */
-export async function getRevenue(params: {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
-    const __a = await __auth(["ApiKey"], __config);
-    return __request<RevenueStatistics>(__config, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Create OAuth2 client
- *
- * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
- * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
- *   `redirectUris` must be provided (per RFC 7591 Section 2).
- * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
- * Returns the registered client information per RFC 7591, including:
- * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
- */
-export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-    return __request<OAuth2Client>(__config, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
-}
diff --git a/tests/e2e/generate-client/base-consumer/api.ts b/tests/e2e/generate-client/base-consumer/api.ts
index 351dda22ee..51133c1a6c 100644
--- a/tests/e2e/generate-client/base-consumer/api.ts
+++ b/tests/e2e/generate-client/base-consumer/api.ts
@@ -1,4 +1,4 @@
-// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Generated by @redocly/client-generator — do not edit by hand.
 // Source: OpenAPI document. Re-run `redocly generate-client` to update.
 
 /**
diff --git a/tests/e2e/generate-client/cafe-consumer/api.ts b/tests/e2e/generate-client/cafe-consumer/api.ts
index c1cc11db87..8b7ee2ca1f 100644
--- a/tests/e2e/generate-client/cafe-consumer/api.ts
+++ b/tests/e2e/generate-client/cafe-consumer/api.ts
@@ -1,4 +1,4 @@
-// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Generated by @redocly/client-generator — do not edit by hand.
 // Source: OpenAPI document. Re-run `redocly generate-client` to update.
 
 /**
diff --git a/tests/e2e/generate-client/cafe.snapshot.ts b/tests/e2e/generate-client/cafe.snapshot.ts
index 69068d44a4..d037db048b 100644
--- a/tests/e2e/generate-client/cafe.snapshot.ts
+++ b/tests/e2e/generate-client/cafe.snapshot.ts
@@ -1,4 +1,4 @@
-// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Generated by @redocly/client-generator — do not edit by hand.
 // Source: OpenAPI document. Re-run `redocly generate-client` to update.
 
 /**
diff --git a/tests/e2e/generate-client/examples.test.ts b/tests/e2e/generate-client/examples.test.ts
index 0b7556a9cd..05725e0f86 100644
--- a/tests/e2e/generate-client/examples.test.ts
+++ b/tests/e2e/generate-client/examples.test.ts
@@ -8,7 +8,7 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
 const repoRoot = resolve(__dirname, '../../..');
 const cli = join(repoRoot, 'packages/cli/lib/index.js');
 const tsx = join(repoRoot, 'node_modules/.bin/tsx');
-const examplesDir = join(repoRoot, 'packages/openapi-typescript/examples');
+const examplesDir = join(repoRoot, 'packages/client-generator/examples');
 
 const EXAMPLES = [
   'fetch-functions',
@@ -21,7 +21,7 @@ const EXAMPLES = [
 
 /**
  * Regenerate an example's client into `outFile`. A `redocly.yaml` example uses the CLI
- * (auto-discovering its `x-openapi-typescript` block); the programmatic example runs its
+ * (auto-discovering its `x-client-generator` block); the programmatic example runs its
  * `generate.ts` with `OUT` redirecting the output.
  */
 function regenerate(
@@ -69,7 +69,7 @@ describe('examples are in sync with the generator', () => {
         for (const rel of committedFiles) {
           expect(
             readFileSync(join(tmp, rel), 'utf-8'),
-            `${name}/src/api/${rel} is stale — run \`npm run examples:regen -w @redocly/openapi-typescript\``
+            `${name}/src/api/${rel} is stale — run \`npm run examples:regen -w @redocly/client-generator\``
           ).toBe(readFileSync(join(committed, rel), 'utf-8'));
         }
       } finally {
diff --git a/tests/e2e/generate-client/parse-as.test.ts b/tests/e2e/generate-client/parse-as.test.ts
index 5cc785ff2c..3a0b2ce58b 100644
--- a/tests/e2e/generate-client/parse-as.test.ts
+++ b/tests/e2e/generate-client/parse-as.test.ts
@@ -7,7 +7,7 @@
 // that proves the option is accepted by the generated operation signatures.
 //
 // No mock-server behavioral assertion here: `parseAs` is a pure runtime branch in
-// `__parse` (covered by the openapi-typescript unit suite) and the cafe-consumer
+// `__parse` (covered by the client-generator unit suite) and the cafe-consumer
 // harness already exercises the default decoding path. Strict-tsc + string +
 // type-usage assertions are sufficient and keep this test process-light.
 import { spawnSync } from 'node:child_process';
diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
index 7e36b165c5..384e62412c 100644
--- a/tests/e2e/generate-client/redocly-config.test.ts
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -1,4 +1,4 @@
-// generate-client reads its settings from a `redocly.yaml` `x-openapi-typescript`
+// generate-client reads its settings from a `redocly.yaml` `x-client-generator`
 // block (discovered in the cwd, or located via `--config`), with CLI flags overriding it.
 // This is the only declarative config surface — the examples use it.
 import { spawnSync } from 'node:child_process';
@@ -23,11 +23,11 @@ const fixture = join(__dirname, 'fixtures', 'cafe.yaml');
 function project(xConfig: string): string {
   const dir = mkdtempSync(join(tmpdir(), 'ots-redocly-'));
   copyFileSync(fixture, join(dir, 'openapi.yaml'));
-  writeFileSync(join(dir, 'redocly.yaml'), `x-openapi-typescript:\n${xConfig}`, 'utf-8');
+  writeFileSync(join(dir, 'redocly.yaml'), `x-client-generator:\n${xConfig}`, 'utf-8');
   return dir;
 }
 
-describe('generate-client redocly.yaml config (x-openapi-typescript)', () => {
+describe('generate-client redocly.yaml config (x-client-generator)', () => {
   it('generates from the redocly.yaml block with no flags', () => {
     const dir = project(
       [
diff --git a/tests/e2e/generate-client/sse-consumer/api.ts b/tests/e2e/generate-client/sse-consumer/api.ts
index 411f59e0de..4d14dd8cab 100644
--- a/tests/e2e/generate-client/sse-consumer/api.ts
+++ b/tests/e2e/generate-client/sse-consumer/api.ts
@@ -1,4 +1,4 @@
-// Generated by @redocly/openapi-typescript — do not edit by hand.
+// Generated by @redocly/client-generator — do not edit by hand.
 // Source: OpenAPI document. Re-run `redocly generate-client` to update.
 
 /**
diff --git a/tsconfig.build.json b/tsconfig.build.json
index f1a56b898e..233febd62f 100644
--- a/tsconfig.build.json
+++ b/tsconfig.build.json
@@ -3,6 +3,6 @@
   "references": [
     { "path": "packages/core" },
     { "path": "packages/respect-core" },
-    { "path": "packages/openapi-typescript" }
+    { "path": "packages/client-generator" }
   ]
 }
diff --git a/tsconfig.json b/tsconfig.json
index 8fa9f1147d..c89e48dd81 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -23,5 +23,5 @@
     "moduleResolution": "nodenext",
     "esModuleInterop": true
   },
-  "exclude": ["packages/openapi-typescript/examples"]
+  "exclude": ["packages/client-generator/examples"]
 }
diff --git a/vitest.config.ts b/vitest.config.ts
index 46045af663..fdbbb0ccd4 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -12,7 +12,7 @@ const configExtension: { [key: string]: ViteUserConfig } = {
           'packages/cli/src/**/*.ts',
           'packages/core/src/**/*.ts',
           'packages/respect-core/src/**/*.ts',
-          'packages/openapi-typescript/src/**/*.ts',
+          'packages/client-generator/src/**/*.ts',
         ],
         provider: 'istanbul',
         exclude: [

From 977e19dc66c832aa6d37253f89588e1e5653f8fe Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 30 Jun 2026 14:47:15 +0300
Subject: [PATCH 029/134] fix(client-generator): serialize request body after
 the onRequest chain

The generated client's `__send` built the request payload from `body` *before*
running the `onRequest` middleware chain, so a middleware that mutated `ctx.body`
(enveloping, signing, camel/snake conversion) had its change silently dropped.

Move serialization to after `onRequest`, reading `context.body`/`context.headers`
so mutations take effect. `RequestContext` is documented as `body`-mutable, and a
new middleware e2e asserts a mutated body is what gets sent. Regenerated all
committed clients (the change is in the inlined runtime).
---
 .changeset/serialize-body-after-onrequest.md  |  6 ++++
 .../custom-generator/src/api/client.ts        | 36 ++++++++++---------
 .../fetch-functions/src/api/client.ts         | 36 ++++++++++---------
 .../examples/mock/src/api/client.ts           | 36 ++++++++++---------
 .../examples/programmatic/src/api/client.ts   | 36 ++++++++++---------
 .../examples/service-class/src/api/client.ts  | 36 ++++++++++---------
 .../examples/tanstack-query/src/api/client.ts | 36 ++++++++++---------
 .../examples/zod/src/api/client.ts            | 36 ++++++++++---------
 .../client-generator/src/emitters/runtime.ts  | 32 +++++++++--------
 .../e2e/generate-client/base-consumer/api.ts  | 36 ++++++++++---------
 .../e2e/generate-client/cafe-consumer/api.ts  | 36 ++++++++++---------
 tests/e2e/generate-client/cafe.snapshot.ts    | 36 ++++++++++---------
 tests/e2e/generate-client/middleware.test.ts  | 19 ++++++++++
 tests/e2e/generate-client/sse-consumer/api.ts | 36 ++++++++++---------
 14 files changed, 251 insertions(+), 202 deletions(-)
 create mode 100644 .changeset/serialize-body-after-onrequest.md

diff --git a/.changeset/serialize-body-after-onrequest.md b/.changeset/serialize-body-after-onrequest.md
new file mode 100644
index 0000000000..3f16af40cb
--- /dev/null
+++ b/.changeset/serialize-body-after-onrequest.md
@@ -0,0 +1,6 @@
+---
+'@redocly/client-generator': patch
+'@redocly/cli': patch
+---
+
+`generate-client`: the generated client now serializes the request body **after** the `onRequest` middleware chain runs, so a middleware that mutates `ctx.body` (enveloping, signing, case conversion) has its change sent. Previously the body was serialized before `onRequest`, silently dropping such mutations.
diff --git a/packages/client-generator/examples/custom-generator/src/api/client.ts b/packages/client-generator/examples/custom-generator/src/api/client.ts
index d037db048b..a56ece2a42 100644
--- a/packages/client-generator/examples/custom-generator/src/api/client.ts
+++ b/packages/client-generator/examples/custom-generator/src/api/client.ts
@@ -448,7 +448,7 @@ export type OperationMetadata = {
 
 let BASE = "https://api.cafe.redocly.com";
 
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
@@ -723,28 +723,30 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
     let payload: BodyInit | undefined;
-    if (body !== undefined) {
-        const isBinary = body instanceof Blob ||
-            body instanceof ArrayBuffer ||
-            ArrayBuffer.isView(body as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
-        const isURLSearchParams = body instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
-            payload = body as BodyInit;
+    if (context.body !== undefined) {
+        const value = context.body;
+        const isBinary = value instanceof Blob ||
+            value instanceof ArrayBuffer ||
+            ArrayBuffer.isView(value as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+        const isURLSearchParams = value instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+            payload = value as BodyInit;
         }
         else {
-            payload = JSON.stringify(body);
-            if (!('Content-Type' in headers) && !('content-type' in headers)) {
-                headers['Content-Type'] = 'application/json';
+            payload = JSON.stringify(value);
+            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+                context.headers['Content-Type'] = 'application/json';
             }
         }
     }
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
     const doFetch = config.fetch ?? fetch;
     const maxAttempts = 1 + (retry.retries ?? 0);
     const retryOn = retry.retryOn ?? __defaultRetryOn;
diff --git a/packages/client-generator/examples/fetch-functions/src/api/client.ts b/packages/client-generator/examples/fetch-functions/src/api/client.ts
index d037db048b..a56ece2a42 100644
--- a/packages/client-generator/examples/fetch-functions/src/api/client.ts
+++ b/packages/client-generator/examples/fetch-functions/src/api/client.ts
@@ -448,7 +448,7 @@ export type OperationMetadata = {
 
 let BASE = "https://api.cafe.redocly.com";
 
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
@@ -723,28 +723,30 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
     let payload: BodyInit | undefined;
-    if (body !== undefined) {
-        const isBinary = body instanceof Blob ||
-            body instanceof ArrayBuffer ||
-            ArrayBuffer.isView(body as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
-        const isURLSearchParams = body instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
-            payload = body as BodyInit;
+    if (context.body !== undefined) {
+        const value = context.body;
+        const isBinary = value instanceof Blob ||
+            value instanceof ArrayBuffer ||
+            ArrayBuffer.isView(value as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+        const isURLSearchParams = value instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+            payload = value as BodyInit;
         }
         else {
-            payload = JSON.stringify(body);
-            if (!('Content-Type' in headers) && !('content-type' in headers)) {
-                headers['Content-Type'] = 'application/json';
+            payload = JSON.stringify(value);
+            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+                context.headers['Content-Type'] = 'application/json';
             }
         }
     }
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
     const doFetch = config.fetch ?? fetch;
     const maxAttempts = 1 + (retry.retries ?? 0);
     const retryOn = retry.retryOn ?? __defaultRetryOn;
diff --git a/packages/client-generator/examples/mock/src/api/client.ts b/packages/client-generator/examples/mock/src/api/client.ts
index d037db048b..a56ece2a42 100644
--- a/packages/client-generator/examples/mock/src/api/client.ts
+++ b/packages/client-generator/examples/mock/src/api/client.ts
@@ -448,7 +448,7 @@ export type OperationMetadata = {
 
 let BASE = "https://api.cafe.redocly.com";
 
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
@@ -723,28 +723,30 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
     let payload: BodyInit | undefined;
-    if (body !== undefined) {
-        const isBinary = body instanceof Blob ||
-            body instanceof ArrayBuffer ||
-            ArrayBuffer.isView(body as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
-        const isURLSearchParams = body instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
-            payload = body as BodyInit;
+    if (context.body !== undefined) {
+        const value = context.body;
+        const isBinary = value instanceof Blob ||
+            value instanceof ArrayBuffer ||
+            ArrayBuffer.isView(value as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+        const isURLSearchParams = value instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+            payload = value as BodyInit;
         }
         else {
-            payload = JSON.stringify(body);
-            if (!('Content-Type' in headers) && !('content-type' in headers)) {
-                headers['Content-Type'] = 'application/json';
+            payload = JSON.stringify(value);
+            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+                context.headers['Content-Type'] = 'application/json';
             }
         }
     }
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
     const doFetch = config.fetch ?? fetch;
     const maxAttempts = 1 + (retry.retries ?? 0);
     const retryOn = retry.retryOn ?? __defaultRetryOn;
diff --git a/packages/client-generator/examples/programmatic/src/api/client.ts b/packages/client-generator/examples/programmatic/src/api/client.ts
index d037db048b..a56ece2a42 100644
--- a/packages/client-generator/examples/programmatic/src/api/client.ts
+++ b/packages/client-generator/examples/programmatic/src/api/client.ts
@@ -448,7 +448,7 @@ export type OperationMetadata = {
 
 let BASE = "https://api.cafe.redocly.com";
 
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
@@ -723,28 +723,30 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
     let payload: BodyInit | undefined;
-    if (body !== undefined) {
-        const isBinary = body instanceof Blob ||
-            body instanceof ArrayBuffer ||
-            ArrayBuffer.isView(body as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
-        const isURLSearchParams = body instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
-            payload = body as BodyInit;
+    if (context.body !== undefined) {
+        const value = context.body;
+        const isBinary = value instanceof Blob ||
+            value instanceof ArrayBuffer ||
+            ArrayBuffer.isView(value as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+        const isURLSearchParams = value instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+            payload = value as BodyInit;
         }
         else {
-            payload = JSON.stringify(body);
-            if (!('Content-Type' in headers) && !('content-type' in headers)) {
-                headers['Content-Type'] = 'application/json';
+            payload = JSON.stringify(value);
+            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+                context.headers['Content-Type'] = 'application/json';
             }
         }
     }
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
     const doFetch = config.fetch ?? fetch;
     const maxAttempts = 1 + (retry.retries ?? 0);
     const retryOn = retry.retryOn ?? __defaultRetryOn;
diff --git a/packages/client-generator/examples/service-class/src/api/client.ts b/packages/client-generator/examples/service-class/src/api/client.ts
index 67d5bdfa23..41afcde2bc 100644
--- a/packages/client-generator/examples/service-class/src/api/client.ts
+++ b/packages/client-generator/examples/service-class/src/api/client.ts
@@ -448,7 +448,7 @@ export type OperationMetadata = {
 
 let BASE = "https://api.cafe.redocly.com";
 
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
@@ -723,28 +723,30 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
     let payload: BodyInit | undefined;
-    if (body !== undefined) {
-        const isBinary = body instanceof Blob ||
-            body instanceof ArrayBuffer ||
-            ArrayBuffer.isView(body as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
-        const isURLSearchParams = body instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
-            payload = body as BodyInit;
+    if (context.body !== undefined) {
+        const value = context.body;
+        const isBinary = value instanceof Blob ||
+            value instanceof ArrayBuffer ||
+            ArrayBuffer.isView(value as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+        const isURLSearchParams = value instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+            payload = value as BodyInit;
         }
         else {
-            payload = JSON.stringify(body);
-            if (!('Content-Type' in headers) && !('content-type' in headers)) {
-                headers['Content-Type'] = 'application/json';
+            payload = JSON.stringify(value);
+            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+                context.headers['Content-Type'] = 'application/json';
             }
         }
     }
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
     const doFetch = config.fetch ?? fetch;
     const maxAttempts = 1 + (retry.retries ?? 0);
     const retryOn = retry.retryOn ?? __defaultRetryOn;
diff --git a/packages/client-generator/examples/tanstack-query/src/api/client.ts b/packages/client-generator/examples/tanstack-query/src/api/client.ts
index d037db048b..a56ece2a42 100644
--- a/packages/client-generator/examples/tanstack-query/src/api/client.ts
+++ b/packages/client-generator/examples/tanstack-query/src/api/client.ts
@@ -448,7 +448,7 @@ export type OperationMetadata = {
 
 let BASE = "https://api.cafe.redocly.com";
 
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
@@ -723,28 +723,30 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
     let payload: BodyInit | undefined;
-    if (body !== undefined) {
-        const isBinary = body instanceof Blob ||
-            body instanceof ArrayBuffer ||
-            ArrayBuffer.isView(body as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
-        const isURLSearchParams = body instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
-            payload = body as BodyInit;
+    if (context.body !== undefined) {
+        const value = context.body;
+        const isBinary = value instanceof Blob ||
+            value instanceof ArrayBuffer ||
+            ArrayBuffer.isView(value as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+        const isURLSearchParams = value instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+            payload = value as BodyInit;
         }
         else {
-            payload = JSON.stringify(body);
-            if (!('Content-Type' in headers) && !('content-type' in headers)) {
-                headers['Content-Type'] = 'application/json';
+            payload = JSON.stringify(value);
+            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+                context.headers['Content-Type'] = 'application/json';
             }
         }
     }
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
     const doFetch = config.fetch ?? fetch;
     const maxAttempts = 1 + (retry.retries ?? 0);
     const retryOn = retry.retryOn ?? __defaultRetryOn;
diff --git a/packages/client-generator/examples/zod/src/api/client.ts b/packages/client-generator/examples/zod/src/api/client.ts
index d037db048b..a56ece2a42 100644
--- a/packages/client-generator/examples/zod/src/api/client.ts
+++ b/packages/client-generator/examples/zod/src/api/client.ts
@@ -448,7 +448,7 @@ export type OperationMetadata = {
 
 let BASE = "https://api.cafe.redocly.com";
 
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
@@ -723,28 +723,30 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
     let payload: BodyInit | undefined;
-    if (body !== undefined) {
-        const isBinary = body instanceof Blob ||
-            body instanceof ArrayBuffer ||
-            ArrayBuffer.isView(body as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
-        const isURLSearchParams = body instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
-            payload = body as BodyInit;
+    if (context.body !== undefined) {
+        const value = context.body;
+        const isBinary = value instanceof Blob ||
+            value instanceof ArrayBuffer ||
+            ArrayBuffer.isView(value as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+        const isURLSearchParams = value instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+            payload = value as BodyInit;
         }
         else {
-            payload = JSON.stringify(body);
-            if (!('Content-Type' in headers) && !('content-type' in headers)) {
-                headers['Content-Type'] = 'application/json';
+            payload = JSON.stringify(value);
+            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+                context.headers['Content-Type'] = 'application/json';
             }
         }
     }
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
     const doFetch = config.fetch ?? fetch;
     const maxAttempts = 1 + (retry.retries ?? 0);
     const retryOn = retry.retryOn ?? __defaultRetryOn;
diff --git a/packages/client-generator/src/emitters/runtime.ts b/packages/client-generator/src/emitters/runtime.ts
index 1f467f3da7..757b61df06 100644
--- a/packages/client-generator/src/emitters/runtime.ts
+++ b/packages/client-generator/src/emitters/runtime.ts
@@ -322,7 +322,7 @@ ${ex}async function __requestResult<TData, TError>(
     : '';
   return `let BASE = ${base};
 
-/** The mutable request context handed to \`onRequest\` (mutate \`url\`/\`method\`/\`headers\`). */
+/** The mutable request context handed to \`onRequest\` (mutate \`url\`/\`method\`/\`headers\`/\`body\`). */
 export type RequestContext = {
   url: string;
   method: string;
@@ -589,26 +589,28 @@ ${ex}async function __send(
     ...extra,
     ...(fetchInit.headers as Record<string, string> | undefined),
   };
+  const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+  const middleware = __middleware(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
   let payload: BodyInit | undefined;
-  if (body !== undefined) {
+  if (context.body !== undefined) {
+    const value = context.body;
     const isBinary =
-      body instanceof Blob ||
-      body instanceof ArrayBuffer ||
-      ArrayBuffer.isView(body as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
-    const isURLSearchParams = body instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
-      payload = body as BodyInit;
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
     } else {
-      payload = JSON.stringify(body);
-      if (!('Content-Type' in headers) && !('content-type' in headers)) {
-        headers['Content-Type'] = 'application/json';
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
       }
     }
   }
-  const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
-  const middleware = __middleware(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
   const doFetch = config.fetch ?? fetch;
   const maxAttempts = 1 + (retry.retries ?? 0);
   const retryOn = retry.retryOn ?? __defaultRetryOn;
diff --git a/tests/e2e/generate-client/base-consumer/api.ts b/tests/e2e/generate-client/base-consumer/api.ts
index 51133c1a6c..76c1e16832 100644
--- a/tests/e2e/generate-client/base-consumer/api.ts
+++ b/tests/e2e/generate-client/base-consumer/api.ts
@@ -126,7 +126,7 @@ export type OperationMetadata = {
 
 let BASE = "http://localhost:3102";
 
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
@@ -394,28 +394,30 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
     let payload: BodyInit | undefined;
-    if (body !== undefined) {
-        const isBinary = body instanceof Blob ||
-            body instanceof ArrayBuffer ||
-            ArrayBuffer.isView(body as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
-        const isURLSearchParams = body instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
-            payload = body as BodyInit;
+    if (context.body !== undefined) {
+        const value = context.body;
+        const isBinary = value instanceof Blob ||
+            value instanceof ArrayBuffer ||
+            ArrayBuffer.isView(value as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+        const isURLSearchParams = value instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+            payload = value as BodyInit;
         }
         else {
-            payload = JSON.stringify(body);
-            if (!('Content-Type' in headers) && !('content-type' in headers)) {
-                headers['Content-Type'] = 'application/json';
+            payload = JSON.stringify(value);
+            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+                context.headers['Content-Type'] = 'application/json';
             }
         }
     }
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
     const doFetch = config.fetch ?? fetch;
     const maxAttempts = 1 + (retry.retries ?? 0);
     const retryOn = retry.retryOn ?? __defaultRetryOn;
diff --git a/tests/e2e/generate-client/cafe-consumer/api.ts b/tests/e2e/generate-client/cafe-consumer/api.ts
index 8b7ee2ca1f..6c7c245a7b 100644
--- a/tests/e2e/generate-client/cafe-consumer/api.ts
+++ b/tests/e2e/generate-client/cafe-consumer/api.ts
@@ -448,7 +448,7 @@ export type OperationMetadata = {
 
 let BASE = "http://127.0.0.1:3101";
 
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
@@ -723,28 +723,30 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
     let payload: BodyInit | undefined;
-    if (body !== undefined) {
-        const isBinary = body instanceof Blob ||
-            body instanceof ArrayBuffer ||
-            ArrayBuffer.isView(body as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
-        const isURLSearchParams = body instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
-            payload = body as BodyInit;
+    if (context.body !== undefined) {
+        const value = context.body;
+        const isBinary = value instanceof Blob ||
+            value instanceof ArrayBuffer ||
+            ArrayBuffer.isView(value as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+        const isURLSearchParams = value instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+            payload = value as BodyInit;
         }
         else {
-            payload = JSON.stringify(body);
-            if (!('Content-Type' in headers) && !('content-type' in headers)) {
-                headers['Content-Type'] = 'application/json';
+            payload = JSON.stringify(value);
+            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+                context.headers['Content-Type'] = 'application/json';
             }
         }
     }
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
     const doFetch = config.fetch ?? fetch;
     const maxAttempts = 1 + (retry.retries ?? 0);
     const retryOn = retry.retryOn ?? __defaultRetryOn;
diff --git a/tests/e2e/generate-client/cafe.snapshot.ts b/tests/e2e/generate-client/cafe.snapshot.ts
index d037db048b..a56ece2a42 100644
--- a/tests/e2e/generate-client/cafe.snapshot.ts
+++ b/tests/e2e/generate-client/cafe.snapshot.ts
@@ -448,7 +448,7 @@ export type OperationMetadata = {
 
 let BASE = "https://api.cafe.redocly.com";
 
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
@@ -723,28 +723,30 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
     let payload: BodyInit | undefined;
-    if (body !== undefined) {
-        const isBinary = body instanceof Blob ||
-            body instanceof ArrayBuffer ||
-            ArrayBuffer.isView(body as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
-        const isURLSearchParams = body instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
-            payload = body as BodyInit;
+    if (context.body !== undefined) {
+        const value = context.body;
+        const isBinary = value instanceof Blob ||
+            value instanceof ArrayBuffer ||
+            ArrayBuffer.isView(value as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+        const isURLSearchParams = value instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+            payload = value as BodyInit;
         }
         else {
-            payload = JSON.stringify(body);
-            if (!('Content-Type' in headers) && !('content-type' in headers)) {
-                headers['Content-Type'] = 'application/json';
+            payload = JSON.stringify(value);
+            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+                context.headers['Content-Type'] = 'application/json';
             }
         }
     }
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
     const doFetch = config.fetch ?? fetch;
     const maxAttempts = 1 + (retry.retries ?? 0);
     const retryOn = retry.retryOn ?? __defaultRetryOn;
diff --git a/tests/e2e/generate-client/middleware.test.ts b/tests/e2e/generate-client/middleware.test.ts
index d3dd4f4c1e..4cc2432b38 100644
--- a/tests/e2e/generate-client/middleware.test.ts
+++ b/tests/e2e/generate-client/middleware.test.ts
@@ -54,6 +54,25 @@ describe('middleware — functions facade (use)', () => {
     if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
   });
 
+  test('onRequest can mutate ctx.body and the change is sent', () => {
+    const captured = runConsumer(
+      dir,
+      `
+import { configure, use, createPet } from './client.ts';
+
+let sent = '';
+configure({
+  fetch: (async (_url: string, init: RequestInit) => { sent = init.body as string; return ${OK}; }) as unknown as typeof fetch,
+});
+use({ onRequest: (ctx) => { (ctx.body as { name: string }).name = 'Mutated'; } });
+await createPet({ name: 'Rex' });
+console.log(JSON.stringify({ sent }));
+`
+    ) as { sent: string };
+
+    expect(JSON.parse(captured.sent)).toEqual({ name: 'Mutated' });
+  }, 60_000);
+
   test('use() registers middleware: onRequest runs in order, onResponse in reverse (onion)', () => {
     const captured = runConsumer(
       dir,
diff --git a/tests/e2e/generate-client/sse-consumer/api.ts b/tests/e2e/generate-client/sse-consumer/api.ts
index 4d14dd8cab..8f9e8801c0 100644
--- a/tests/e2e/generate-client/sse-consumer/api.ts
+++ b/tests/e2e/generate-client/sse-consumer/api.ts
@@ -42,7 +42,7 @@ export type OperationMetadata = {
 
 let BASE = "http://localhost:3104";
 
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`). */
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
@@ -310,28 +310,30 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
     let payload: BodyInit | undefined;
-    if (body !== undefined) {
-        const isBinary = body instanceof Blob ||
-            body instanceof ArrayBuffer ||
-            ArrayBuffer.isView(body as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && body instanceof FormData;
-        const isURLSearchParams = body instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof body === 'string') {
-            payload = body as BodyInit;
+    if (context.body !== undefined) {
+        const value = context.body;
+        const isBinary = value instanceof Blob ||
+            value instanceof ArrayBuffer ||
+            ArrayBuffer.isView(value as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+        const isURLSearchParams = value instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+            payload = value as BodyInit;
         }
         else {
-            payload = JSON.stringify(body);
-            if (!('Content-Type' in headers) && !('content-type' in headers)) {
-                headers['Content-Type'] = 'application/json';
+            payload = JSON.stringify(value);
+            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+                context.headers['Content-Type'] = 'application/json';
             }
         }
     }
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
     const doFetch = config.fetch ?? fetch;
     const maxAttempts = 1 + (retry.retries ?? 0);
     const retryOn = retry.retryOn ?? __defaultRetryOn;

From 448a59284e77f3f07dbfa877965f924b14220287 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 30 Jun 2026 15:07:59 +0300
Subject: [PATCH 030/134] feat(client-generator): operation context on requests
 + baked publisher setup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Two related additions to the generated client:

- **Operation context.** `RequestContext` now carries `operation: { id, path, tags }`
  — the operationId, path *template* (stable across interpolation), and tags — so
  middleware/`onRequest` can target requests semantically (tracing span names,
  per-operation auth, metrics labels) instead of reverse-mapping an interpolated URL.
  `ctx.operation.{id,path,tags}` and the `OPERATIONS` map are typed as literal unions
  (`OperationId`/`OperationPath`/`OperationTag`, all exported) for autocomplete and
  compile-time typo-checking; `OPERATIONS` entries gained `tags`.

- **Baked publisher setup.** A `--setup` flag bakes a publisher-authored
  `defineClientSetup({ config, middleware })` module into the generated client (all
  output modes, both facades), so a published SDK ships its request/response defaults
  built in. The package exports the runtime-contract types + `defineClientSetup`.

New `customization` and `baked-setup` examples, ADRs 0014/0015, and e2e coverage
(operation-types, setup). Regenerated all committed clients.
---
 .changeset/client-generator.md                |    6 +
 docs/@v2/commands/generate-client.md          |   74 +-
 packages/cli/src/commands/generate-client.ts  |    6 +
 packages/cli/src/index.ts                     |    6 +
 packages/client-generator/README.md           |   65 +-
 .../0014-request-response-customization.md    |   46 +
 .../docs/adr/0015-publisher-setup-bake-in.md  |   44 +
 packages/client-generator/docs/adr/README.md  |    2 +
 packages/client-generator/examples/README.md  |    2 +
 .../examples/baked-setup/.gitignore           |    2 +
 .../examples/baked-setup/README.md            |   35 +
 .../examples/baked-setup/client-setup.ts      |   18 +
 .../examples/baked-setup/index.html           |   11 +
 .../examples/baked-setup/openapi.yaml         | 1163 ++++++++++++
 .../examples/baked-setup/package.json         |   16 +
 .../examples/baked-setup/redocly.yaml         |    9 +
 .../examples/baked-setup/src/api/client.ts    | 1551 +++++++++++++++++
 .../examples/baked-setup/src/main.ts          |   12 +
 .../examples/baked-setup/tsconfig.json        |    4 +
 .../examples/baked-setup/vite.config.ts       |    3 +
 .../custom-generator/src/api/client.ts        |   72 +-
 .../examples/customization/.gitignore         |    2 +
 .../examples/customization/README.md          |   20 +
 .../examples/customization/index.html         |   11 +
 .../examples/customization/openapi.yaml       | 1163 ++++++++++++
 .../examples/customization/package.json       |   16 +
 .../examples/customization/redocly.yaml       |    9 +
 .../examples/customization/src/api/client.ts  | 1534 ++++++++++++++++
 .../examples/customization/src/main.ts        |   64 +
 .../examples/customization/tsconfig.json      |    4 +
 .../examples/customization/vite.config.ts     |    3 +
 .../fetch-functions/src/api/client.ts         |   72 +-
 .../examples/mock/src/api/client.ts           |   72 +-
 .../examples/programmatic/src/api/client.ts   |   72 +-
 .../examples/service-class/src/api/client.ts  |   72 +-
 .../examples/tanstack-query/src/api/client.ts |   72 +-
 .../examples/zod/src/api/client.ts            |   72 +-
 .../scripts/regenerate-examples.mjs           |    2 +
 .../scripts/typecheck-examples.mjs            |    2 +
 .../src/__tests__/runtime-contract.test.ts    |   26 +
 packages/client-generator/src/config.ts       |    6 +
 .../src/emitters/__tests__/client.test.ts     |   86 +-
 .../src/emitters/__tests__/operations.test.ts |   36 +-
 .../src/emitters/__tests__/runtime.test.ts    |   39 +-
 .../src/emitters/__tests__/setup-bake.test.ts |   49 +
 .../client-generator/src/emitters/client.ts   |  100 +-
 .../src/emitters/operations.ts                |  186 +-
 .../client-generator/src/emitters/runtime.ts  |   45 +-
 .../src/emitters/setup-bake.ts                |   69 +
 packages/client-generator/src/index.ts        |   23 +-
 .../client-generator/src/runtime-contract.ts  |   70 +
 packages/client-generator/src/types.ts        |    6 +
 .../writers/__tests__/split-writer.test.ts    |   10 +-
 .../__tests__/tags-split-writer.test.ts       |    4 +-
 .../src/writers/__tests__/tags-writer.test.ts |    6 +-
 .../src/writers/split-writer.ts               |    2 +-
 .../client-generator/src/writers/tagged.ts    |    2 +-
 .../e2e/generate-client/base-consumer/api.ts  |   50 +-
 .../e2e/generate-client/cafe-consumer/api.ts  |   72 +-
 tests/e2e/generate-client/cafe.snapshot.ts    |   72 +-
 tests/e2e/generate-client/cafe.test.ts        |   10 +-
 tests/e2e/generate-client/examples.test.ts    |    2 +
 tests/e2e/generate-client/middleware.test.ts  |   84 +-
 .../generate-client/operation-types.test.ts   |   80 +
 tests/e2e/generate-client/setup.test.ts       |  147 ++
 tests/e2e/generate-client/sse-consumer/api.ts |   44 +-
 66 files changed, 7343 insertions(+), 392 deletions(-)
 create mode 100644 packages/client-generator/docs/adr/0014-request-response-customization.md
 create mode 100644 packages/client-generator/docs/adr/0015-publisher-setup-bake-in.md
 create mode 100644 packages/client-generator/examples/baked-setup/.gitignore
 create mode 100644 packages/client-generator/examples/baked-setup/README.md
 create mode 100644 packages/client-generator/examples/baked-setup/client-setup.ts
 create mode 100644 packages/client-generator/examples/baked-setup/index.html
 create mode 100644 packages/client-generator/examples/baked-setup/openapi.yaml
 create mode 100644 packages/client-generator/examples/baked-setup/package.json
 create mode 100644 packages/client-generator/examples/baked-setup/redocly.yaml
 create mode 100644 packages/client-generator/examples/baked-setup/src/api/client.ts
 create mode 100644 packages/client-generator/examples/baked-setup/src/main.ts
 create mode 100644 packages/client-generator/examples/baked-setup/tsconfig.json
 create mode 100644 packages/client-generator/examples/baked-setup/vite.config.ts
 create mode 100644 packages/client-generator/examples/customization/.gitignore
 create mode 100644 packages/client-generator/examples/customization/README.md
 create mode 100644 packages/client-generator/examples/customization/index.html
 create mode 100644 packages/client-generator/examples/customization/openapi.yaml
 create mode 100644 packages/client-generator/examples/customization/package.json
 create mode 100644 packages/client-generator/examples/customization/redocly.yaml
 create mode 100644 packages/client-generator/examples/customization/src/api/client.ts
 create mode 100644 packages/client-generator/examples/customization/src/main.ts
 create mode 100644 packages/client-generator/examples/customization/tsconfig.json
 create mode 100644 packages/client-generator/examples/customization/vite.config.ts
 create mode 100644 packages/client-generator/src/__tests__/runtime-contract.test.ts
 create mode 100644 packages/client-generator/src/emitters/__tests__/setup-bake.test.ts
 create mode 100644 packages/client-generator/src/emitters/setup-bake.ts
 create mode 100644 packages/client-generator/src/runtime-contract.ts
 create mode 100644 tests/e2e/generate-client/operation-types.test.ts
 create mode 100644 tests/e2e/generate-client/setup.test.ts

diff --git a/.changeset/client-generator.md b/.changeset/client-generator.md
index a162ba178b..dd769dd061 100644
--- a/.changeset/client-generator.md
+++ b/.changeset/client-generator.md
@@ -4,3 +4,9 @@
 ---
 
 Added an **experimental** `generate-client` command that generates a typed, zero-dependency TypeScript client from an OpenAPI description.
+
+The generated client exposes the operation's identity (`ctx.operation.{id,path,tags}`) on `RequestContext` so middleware can target requests by operationId/tags. A new `customization` example shows the request/response extension points.
+
+A `--setup` flag bakes a publisher-authored `defineClientSetup({ config, middleware })` module into the generated client (all output modes, both facades), so a published SDK ships its request/response defaults built in. The package now exports the runtime contract types + `defineClientSetup` from its main entry.
+
+`ctx.operation.{id,path,tags}` and the `OPERATIONS` map are now typed as literal unions (`OperationId`/`OperationPath`/`OperationTag`, all exported), so middleware gets autocomplete and compile-time typo-checking; `OPERATIONS` entries now include `tags`.
diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index c1963fd133..630059885a 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -144,6 +144,12 @@ redocly generate-client cafe -o src/client.ts
 
 ---
 
+- `--setup`
+- `string`
+- Path to a publisher setup module (`export default defineClientSetup({ config, middleware })`) baked into the generated client, so a published SDK ships its request/response defaults built in. Works across all output modes and both facades. See [Baking defaults into a published SDK](#baking-defaults-into-a-published-sdk-setup).
+
+---
+
 - `--config`
 - `string`
 - Path to the `redocly.yaml` configuration file (where the `x-client-generator` block lives).
@@ -367,19 +373,23 @@ redocly generate-client openapi.yaml --output src/client.ts --error-mode result
 
 ## Operation metadata
 
-Alongside the operations, the client exports an `OPERATIONS` map keyed by operationId, holding each operation's HTTP method and path template (with `{param}` placeholders intact):
+Alongside the operations, the client exports an `OPERATIONS` map keyed by operationId, holding each operation's HTTP method, path template (with `{param}` placeholders intact), and tags:
 
 ```ts
 export const OPERATIONS = {
-  listMenuItems: { method: 'GET', path: '/menu' },
-  getOrderById: { method: 'GET', path: '/orders/{orderId}' },
+  listMenuItems: { method: 'GET', path: '/menu', tags: ['Products'] },
+  getOrderById: { method: 'GET', path: '/orders/{orderId}', tags: ['Orders'] },
   // …
 } as const;
 
 export type OperationId = keyof typeof OPERATIONS;
-export type OperationMetadata = { readonly method: string; readonly path: string };
+export type OperationPath = (typeof OPERATIONS)[OperationId]['path'];
+export type OperationTag = (typeof OPERATIONS)[OperationId]['tags'][number];
+export type OperationMetadata = { readonly method: string; readonly path: string; readonly tags: readonly string[] };
 ```
 
+These same `OperationId` / `OperationPath` / `OperationTag` unions type `ctx.operation` in middleware (above), so you get autocomplete and typo-checking there too.
+
 Because the keys and values are plain string literals — not function or method names — they survive bundling and minification.
 That makes `OPERATIONS` the stable handle to reach for when building cache/query keys, tracing span names, or request log labels, instead of reflecting over a function (`fn.name` / `fn.toString()`), which a minifier can rename:
 
@@ -464,7 +474,23 @@ client.use(logging); // …or imperatively (chainable)
 
 `onRequest` runs in registration order; `onResponse` runs in **reverse** — an onion, so the last-registered middleware wraps closest to the network.
 `onError` (throw mode only) is threaded through each middleware in turn, so any can map the failure.
-`onRequest` may mutate the request context (`url` / `method` / `headers`); `onResponse` may return a replacement `Response`.
+`onRequest` may mutate the request context (`url` / `method` / `headers` / `body` — body edits are serialized and sent); `onResponse` may return a replacement `Response`.
+
+Each `RequestContext` also carries `operation: { id, path, tags }` — the operationId, path template, and tags — so middleware can **target by operation identity** instead of brittle URL matching. All three are typed literal unions (`OperationId` / `OperationPath` / `OperationTag`), so the comparisons below autocomplete and reject typos at compile time:
+
+```ts
+use({
+  onRequest: (ctx) => {
+    if (ctx.operation.id === 'createOrder' || ctx.operation.tags.includes('Orders')) {
+      ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
+      (ctx.body as { source?: string }).source = 'web'; // mutate the body in flight
+    }
+  },
+});
+```
+
+A header for a single call instead goes in that operation's trailing `RequestOptions` argument (`await listMenuItems({}, { headers: { 'X-Request-Id': '42' } })`).
+See the [`customization` example](https://github.com/Redocly/redocly-cli/tree/main/packages/client-generator/examples/customization) for a runnable end-to-end version.
 
 `onRequest` and `onResponse` run for every request — under both `throw` and `result` error modes, and around each Server-Sent-Events connect/reconnect.
 `onError` only fires when a non-2xx response would be **thrown**, so it is a no-op in `result` mode (inspect `result.error` instead) and for SSE (which throws its own `ApiError`).
@@ -475,6 +501,44 @@ The `onRequest` / `onResponse` / `onError` fields on `ClientConfig` still work 
 `use()` simply appends to the same chain (`ClientConfig.middleware`), so existing code is unaffected.
 {% /admonition %}
 
+## Baking defaults into a published SDK (`--setup`)
+
+The middleware above is composed by the **consumer**. If you **publish an SDK** and want those defaults already active for *your* users, bake them in at generation time with `--setup <file>`.
+
+The setup module imports its contract from `@redocly/client-generator` (so it resolves and is unit-testable before the client is generated) and returns a `defineClientSetup({ config, middleware })`:
+
+```ts
+// client-setup.ts
+import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
+
+export default defineClientSetup({
+  config: { baseUrl: 'https://api.acme.com', retry: { retries: 3 } },
+  middleware: [
+    {
+      onRequest: (ctx: RequestContext) => {
+        ctx.headers['X-Acme-SDK'] = '1.4.0';
+        if (ctx.operation.tags.includes('Orders')) ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
+      },
+    },
+  ],
+});
+```
+
+```sh
+redocly generate-client openapi.yaml --output src/api/client.ts --setup ./client-setup.ts
+```
+
+The generator bakes the `config`/`middleware` into the generated client, so the published package applies them on import. It works across **all output modes and both facades** (functions: the global `configure`/`use`; service-class: `new Client()` merges the baked defaults). Downstream users call operations with no setup of their own and can still customize on top — the baked block runs first, then theirs:
+
+- **Config values** (`fetch`/transport, `baseUrl`, `headers`, `retry`, single hooks) are last-write-wins, so a consumer **overrides** the baked default — a consumer `config.fetch` *replaces* a baked transport rather than wrapping it.
+- **Middleware** (`use`) **composes** — baked middleware runs first, then the consumer's (`onRequest` in order, `onResponse` reversed). A publisher who needs un-bypassable behavior should express it as middleware, not a baked `fetch`.
+
+{% admonition type="warning" name="Constraints" %}
+A setup file may import **only** from `@redocly/client-generator`, keeping the client zero-dependency.
+{% /admonition %}
+
+See the [`baked-setup` example](https://github.com/Redocly/redocly-cli/tree/main/packages/client-generator/examples/baked-setup) and ADR-0015.
+
 ## Retries
 
 The generated client can retry transient failures.
diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index 67a2713534..97165e8190 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -29,6 +29,9 @@ function readRedoclyExtension(config: Config): Record<string, unknown> {
     if (typeof ext.output === 'string' && !isAbsolute(ext.output)) {
       ext.output = resolvePath(baseDir, ext.output);
     }
+    if (typeof ext.setup === 'string' && !isAbsolute(ext.setup)) {
+      ext.setup = resolvePath(baseDir, ext.setup);
+    }
   }
   return ext;
 }
@@ -50,6 +53,8 @@ export type GenerateClientCommandArgv = {
   name?: string;
   // Built-in names, inline custom-generator names, or plugin import specifiers (path/package).
   generators?: string[];
+  // Path to a publisher setup module baked into the generated client.
+  setup?: string;
 };
 
 export async function handleGenerateClient({
@@ -77,6 +82,7 @@ export async function handleGenerateClient({
     mockSeed: argv['mock-seed'],
     name: argv.name,
     generators: argv.generators,
+    setup: argv.setup,
   });
 
   if (!merged.input)
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index d6a2cbe0cf..2bd131a041 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -890,6 +890,12 @@ yargs(hideBin(process.argv))
             choices: ['single', 'split', 'tags', 'tags-split'] as const,
             requiresArg: true,
           },
+          setup: {
+            describe:
+              'Path to a publisher setup module (export default defineClientSetup({ config, middleware })) baked into the generated client, so a published SDK ships its request/response defaults built in. Works across all output modes and both facades.',
+            type: 'string',
+            requiresArg: true,
+          },
           facade: {
             describe:
               'Developer-facing operation shape: `functions` (default) emits standalone async functions; `service-class` groups operations as class methods (one `Client` class in single/split, one service class per tag in tags/tags-split).',
diff --git a/packages/client-generator/README.md b/packages/client-generator/README.md
index f218cd27e2..f562eaef88 100644
--- a/packages/client-generator/README.md
+++ b/packages/client-generator/README.md
@@ -150,8 +150,8 @@ else console.log(data.id); // `data` is the success body
 
 Transport/abort failures still throw in both modes.
 
-The client also exports an `OPERATIONS` map (operationId → `{ method, path }`) plus `OperationId` / `OperationMetadata` types.
-The string-literal keys and path templates survive minification, so they're the stable handle for cache/query keys, tracing span names, and request logging:
+The client also exports an `OPERATIONS` map (operationId → `{ method, path, tags }`) plus the `OperationId` / `OperationPath` / `OperationTag` / `OperationMetadata` types.
+The string-literal keys, path templates, and tags survive minification, so they're the stable handle for cache/query keys, tracing span names, and request logging:
 
 ```ts
 import { OPERATIONS, getOrderById } from './client.ts';
@@ -159,6 +159,67 @@ import { OPERATIONS, getOrderById } from './client.ts';
 const queryKey = [OPERATIONS.getOrderById.path, orderId]; // "/orders/{orderId}"
 ```
 
+### Customizing requests and responses
+
+You shape requests and responses from your own code — never by editing the generated client, so changes survive regeneration.
+Middleware (`use(...)` for the functions facade, `client.use(...)` per instance for the service-class facade) hooks the request lifecycle, and each `RequestContext` carries the operation's identity so you can target by operationId or tag instead of brittle URL matching.
+`onRequest` may mutate `ctx.url` / `ctx.method` / `ctx.headers` **and `ctx.body`**; `onResponse` may observe or replace the `Response`:
+
+```ts
+import { configure, use, listMenuItems } from './client.ts';
+
+// A custom transport — proxy, instrument, or (here) swap fetch entirely.
+configure({ fetch: myFetch });
+
+use({
+  onRequest: (ctx) => {
+    // Target specific operations by identity, not URL shape.
+    if (ctx.operation.id === 'createOrder' || ctx.operation.tags.includes('Orders')) {
+      ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
+      (ctx.body as { source?: string }).source = 'web'; // body edits are sent
+    }
+  },
+  onResponse: (response, ctx) => {
+    console.debug(ctx.operation.id, response.status);
+  },
+});
+
+// A header for one call only goes in the trailing RequestOptions.
+await listMenuItems({}, { headers: { 'X-Request-Id': '42' } });
+```
+
+`ctx.operation` is `{ id, path, tags }` — the operationId, the path template (`{param}` placeholders intact), and the operation's tags. All three are **typed literal unions** (`OperationId` / `OperationPath` / `OperationTag`, exported alongside the `OPERATIONS` map), so `ctx.operation.id === '…'` and `ctx.operation.tags.includes('…')` autocomplete and reject typos at compile time.
+See the [`customization` example](./examples/customization) for a runnable end-to-end version, and [ADR-0014](./docs/adr/0014-request-response-customization.md) for the rationale.
+
+### Baking defaults into a published SDK
+
+The customization above is composed by the **consumer**. If you instead **publish an SDK** and want those defaults already active for *your* users, bake them in at generation time with `--setup <file>`. The setup module imports its contract from `@redocly/client-generator` (so it resolves and is unit-testable before the client is generated) and returns a `defineClientSetup({ config, middleware })`:
+
+```ts
+// client-setup.ts
+import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
+
+export default defineClientSetup({
+  config: { baseUrl: 'https://api.acme.com', retry: { retries: 3 } },
+  middleware: [
+    {
+      onRequest: (ctx: RequestContext) => {
+        ctx.headers['X-Acme-SDK'] = '1.4.0';
+        if (ctx.operation.tags.includes('Orders')) ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
+      },
+    },
+  ],
+});
+```
+
+```sh
+redocly generate-client openapi.yaml --output src/api/client.ts --setup ./client-setup.ts
+```
+
+The generator bakes the `config`/`middleware` into the generated client, so the published package applies them on import — your users call operations with no setup of their own, and can still override (their `configure`/`use` run after the baked ones). Works across all output modes and both facades (functions and service-class — `new Client()` picks up the baked defaults). A setup file may import **only** from `@redocly/client-generator`, keeping the client zero-dependency.
+
+See the [`baked-setup` example](./examples/baked-setup) and [ADR-0015](./docs/adr/0015-publisher-setup-bake-in.md).
+
 ## Testing the generated client
 
 The client is plain `fetch` code, so you test it like any HTTP code — there is no special harness.
diff --git a/packages/client-generator/docs/adr/0014-request-response-customization.md b/packages/client-generator/docs/adr/0014-request-response-customization.md
new file mode 100644
index 0000000000..6c77d98e48
--- /dev/null
+++ b/packages/client-generator/docs/adr/0014-request-response-customization.md
@@ -0,0 +1,46 @@
+# ADR 0014: Request/response customization as a runtime contract
+
+- Status: Accepted
+- Date: 2026-06-26
+
+## Context
+
+Consumers need to shape requests and responses the generator cannot know about: add a header to some endpoints, attach a trace/idempotency key, swap the transport, retry differently, map errors to domain types, rewrite a URL behind a gateway, log and measure.
+The naive path — hand-editing the generated client — loses every change on the next regenerate, which defeats codegen.
+
+The generated client already ships a runtime extension surface for most of this ([ADR-0001](./0001-ast-codegen.md) emits it verbatim into every client):
+
+- `ClientConfig` — `baseUrl`, `headers` (static or per-request function), `fetch` (transport), `onRequest` / `onResponse` / `onError` hooks, a composable `middleware[]` onion, and `retry`.
+- `RequestContext` — `{ url, method, headers, body }` handed to `onRequest`; `url`/`method`/`headers` are mutable.
+- `RequestOptions` — the trailing per-call argument (`RequestInit & { retry, parseAs }`), merged over the global config.
+- `configure()` / `use()` for the functions facade; `new Client(config)` / `client.use()` per instance for the service-class facade.
+- Auth is its own resolved seam ([ADR-0007](./0007-call-site-auth.md), [ADR-0009](./0009-per-instance-auth.md)); response validation is the `zod` generator; framework glue is the wrapper generators ([ADR-0011](./0011-wrapper-generators.md)).
+
+The question this ADR settles is **where customization lives** — and which of the remaining gaps we close.
+The codegen-time alternatives considered (a dedicated plugin, extending the `transformers` generator, or an `--extension custom.ts` flag that stitches consumer code into the output) all push runtime, per-environment behavior into generate time and re-introduce the regenerate coupling we are trying to remove.
+
+Auditing the surface against real needs leaves three genuine gaps:
+
+1. **Targeting by operation identity.** Middleware can only match on `ctx.url` / `ctx.method`, so "all `admin`-tagged operations" or "the `createOrder` operation" can only be expressed as brittle URL regexes — `RequestContext` carries no `operationId`, `tags`, or path template.
+2. **Request body mutation is silently ignored.** The body is serialized into the fetch payload *before* `onRequest` runs, and the fetch sends that payload — not `ctx.body`. So mutating `ctx.body` (case conversion, enveloping, signing) is a footgun: it type-checks and does nothing.
+3. **Typed-result enrichment.** Middleware sees only the raw `Response`, not the deserialized value, so enriching the typed result is impossible without reconstructing a `Response`.
+
+## Decision
+
+**Request/response customization is a runtime contract — the `ClientConfig` hooks, the `middleware[]` onion, and the per-call `RequestOptions` — never a codegen-time seam.** We will not add a customization plugin, extend `transformers` for it, or add a flag that merges consumer code into the generated output. The generated client stays a pure projection of the spec; everything spec-independent is composed from the outside by consumer-owned modules that survive regeneration.
+
+We close the prioritized gaps by **extending the same runtime contract**, additively:
+
+1. **Operation metadata in `RequestContext`.** Thread the operation's identity into the context the runtime builds — at minimum `operationId`, plus `tags` and the path template (the `path` before parameter interpolation). Middleware then targets requests semantically (`ctx.operationId === 'createOrder'`, `ctx.tags.includes('admin')`) instead of by URL shape. Emitted into every client; the existing `url`/`method`/`headers` fields are unchanged.
+2. **Make the request body mutable in `onRequest`.** Serialize the payload from `ctx.body` *after* the `onRequest` chain runs, so body transforms take effect. The default behavior (JSON-encode a plain object, pass through `Blob`/`FormData`/string) is unchanged when no hook touches the body.
+
+We **defer typed-result enrichment** (gap 3): it weakens the contract's type safety and has no concrete demand — the raw-`Response` `onResponse` hook covers the asked-for cases. Revisit only on a real need.
+
+## Consequences
+
+- The customization story is one consumer-owned setup module (`configure`/`use` or `new Client`), not a generator feature — no merge step, no regenerate loss, no new CLI surface.
+- Operation metadata makes "some requests" first-class and stable across path changes, and is purely additive — existing middleware keeps working.
+- Fixing body mutation removes a silent footgun and unlocks request-body transforms (case conversion, enveloping, signing) without a new hook.
+- Emitting operation metadata adds a small per-request object and slightly larger output; acceptable for the targeting it enables. It is always emitted (not gated), keeping the contract uniform across clients.
+- Deferring typed-result enrichment keeps the response hook honest (raw `Response` in, raw `Response` out) and leaves type safety intact; consumers needing a derived field compute it at the call site for now.
+- Query serialization beyond OpenAPI `style`/`explode` remains out of scope — rewrite `ctx.url` in `onRequest` if needed; not worth a dedicated hook absent demand.
diff --git a/packages/client-generator/docs/adr/0015-publisher-setup-bake-in.md b/packages/client-generator/docs/adr/0015-publisher-setup-bake-in.md
new file mode 100644
index 0000000000..6834729281
--- /dev/null
+++ b/packages/client-generator/docs/adr/0015-publisher-setup-bake-in.md
@@ -0,0 +1,44 @@
+# ADR 0015: Publisher setup bake-in via `--setup`
+
+- Status: Accepted
+- Date: 2026-06-26
+
+## Context
+
+[ADR-0014](./0014-request-response-customization.md) settled request/response customization as a **runtime** contract a *consumer* composes (`configure`/`use` from their own module), and deliberately ruled out stitching consumer code into the generated output.
+
+But an API provider **publishing an SDK on npm** has a different need: they want the generated client to ship with *their* cross-cutting defaults already wired in — base URL, retry, a header injector, an idempotency-key middleware — so their downstream users `npm install` it and call operations with no `configure`/`use` of their own. Today only `baseUrl` can be baked (it is inlined); everything else is runtime-only.
+
+The obvious shape — a setup file that imports `configure`/`use` from `./client` and calls them — fails twice: the generated client does not exist when the setup is authored (the import will not resolve), and side-effecting calls against a per-client `configure`/`use` cannot be meaningfully unit-tested. The publisher actor is therefore a distinct, opt-in **build-time** concern, and must not break the zero-dependency guarantee ([ADR-0002](./0002-typescript-peer-dep.md)).
+
+## Decision
+
+Add a `--setup <file>` flag (config key `setup`) that **bakes a publisher setup module into the single-file client**.
+
+The setup module imports its contract — `defineClientSetup` plus the runtime types (`RequestContext`, `Middleware`, `ClientSetupConfig`, …) — from the package's main entry `@redocly/client-generator`, and **returns** an inspectable object rather than calling side-effecting functions:
+
+```ts
+export default defineClientSetup({ config: { baseUrl: '…', retry: { … } }, middleware: [ … ] });
+```
+
+This resolves the chicken-and-egg (the contract lives in the package, not the not-yet-generated client) and makes the setup **unit-testable in isolation** (its middleware are plain functions on an object). To support it, the package now exports a canonical, spec-independent **runtime-contract module**, kept in lockstep with the emitted runtime types by a test.
+
+The baker (`setup-bake.ts`) parses the module, **rejects any import other than `@redocly/client-generator`** (preserving zero-dep), strips the (type-only) package import, extracts the `defineClientSetup` argument, and emits a collision-safe `{ … }` block — `configure(config)` + `use(...middleware)` — appended to the single-file client after `configure`/`use` are defined. Baked calls run first on import; a consumer's own `configure`/`use` merge/append on top, so defaults stay overridable.
+
+`--setup` applies across **all output modes and both facades**, via a single source of truth — a module-scoped `__redoclySetup` object (emitted in the shared http module in multi-file layouts, exported so per-tag service classes can import it):
+
+- **Functions facade**: after `configure`/`use` are defined, the emitter applies `configure(__redoclySetup.config ?? {})` + `use(...(__redoclySetup.middleware ?? []))`. In multi-file this lives in the http module, which the entry imports, so it runs on load for every layout.
+- **Service-class facade**: the generated class constructor merges `__redoclySetup` into its per-instance `this.config` (`{ ...baked, ...passed }`, baked middleware first), so `new Client()` gets the defaults and `new Client(override)` merges on top.
+
+This **refines** ADR-0014 (it does not supersede it): ADR-0014's "no stitching consumer code" governs *consumer self-customization*; publisher bake-in is a separate, explicit build-time seam.
+
+**Override semantics.** The baked block runs first (at import). A consumer's own customization then layers on with two distinct rules: scalar `ClientConfig` fields (`fetch`/transport, `baseUrl`, `headers`, `retry`, the single hooks) are a single slot set via `configure` (`Object.assign`) — **last write wins, so the consumer overrides the baked default** (a consumer `config.fetch` *replaces* a baked transport rather than wrapping it). Middleware registered via `use` **composes** — baked middleware appended first, consumer middleware after; both run (`onRequest` in order, `onResponse` reversed). A publisher who needs un-bypassable behavior should express it as middleware, not a baked `config.fetch`.
+
+## Consequences
+
+- A published SDK can ship its request/response defaults built in; downstream users get them with zero setup and can still override.
+- The package gains a real, documented home for the runtime contract types (`@redocly/client-generator` main entry) — overdue, and the basis for testable setup modules.
+- Zero-dependency output is preserved: the import allowlist forbids third-party imports in a setup file, and the `defineClientSetup` helper is stripped at bake time (never imported by the generated client).
+- The setup contract (`defineClientSetup` + the runtime types) is now public surface that must stay in lockstep with the emitted runtime; a unit test guards the spec-independent types against drift.
+- Works across all output modes and both facades from one `__redoclySetup` source of truth: in multi-file layouts it lives in the shared http module (exported for service-class so per-tag classes import it), so non-setup clients stay byte-identical.
+- Top-level `await` in a setup file is unsupported (the baked block is synchronous); revisit only on demand.
diff --git a/packages/client-generator/docs/adr/README.md b/packages/client-generator/docs/adr/README.md
index 75c0e4f925..e31de902c3 100644
--- a/packages/client-generator/docs/adr/README.md
+++ b/packages/client-generator/docs/adr/README.md
@@ -24,6 +24,8 @@ ARCHITECTURE.md says _what is_; these ADRs say _why_.
 | [0011](./0011-wrapper-generators.md)       | Data-fetching wrapper generators (`swr`, `tanstack-query`)         | Accepted                |
 | [0012](./0012-plugin-api.md)               | Experimental custom-generator (plugin) API                         | Accepted (experimental) |
 | [0013](./0013-experimental-status.md)      | Experimental release status & stabilization criteria               | Accepted                |
+| [0014](./0014-request-response-customization.md) | Request/response customization as a runtime contract         | Accepted                |
+| [0015](./0015-publisher-setup-bake-in.md)  | Publisher setup bake-in via `--setup`                              | Accepted                |
 
 ## Template
 
diff --git a/packages/client-generator/examples/README.md b/packages/client-generator/examples/README.md
index 0ffc137b96..c590e89b8e 100644
--- a/packages/client-generator/examples/README.md
+++ b/packages/client-generator/examples/README.md
@@ -9,6 +9,8 @@ the `generateClient(...)` API.
 | Example                              | How it's generated            | Shows                                           |
 | ------------------------------------ | ----------------------------- | ----------------------------------------------- |
 | [fetch-functions](./fetch-functions) | CLI · `sdk`, functions        | free functions + `ApiError`                     |
+| [customization](./customization)     | CLI · `sdk`, functions        | request/response middleware, `ctx.operation` targeting, body mutation, custom transport |
+| [baked-setup](./baked-setup)         | CLI · `sdk`, functions        | publisher defaults baked into the client via `--setup` (`defineClientSetup`) |
 | [service-class](./service-class)     | CLI · `sdk`, service-class    | `new Client({ baseUrl })`, per-instance `auth`  |
 | [zod](./zod)                         | CLI · `sdk`, `zod`            | validating responses with generated zod schemas |
 | [tanstack-query](./tanstack-query)   | CLI · `sdk`, `tanstack-query` | React `useQuery(<op>Options())`                 |
diff --git a/packages/client-generator/examples/baked-setup/.gitignore b/packages/client-generator/examples/baked-setup/.gitignore
new file mode 100644
index 0000000000..f06235c460
--- /dev/null
+++ b/packages/client-generator/examples/baked-setup/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+dist
diff --git a/packages/client-generator/examples/baked-setup/README.md b/packages/client-generator/examples/baked-setup/README.md
new file mode 100644
index 0000000000..1c40bf079f
--- /dev/null
+++ b/packages/client-generator/examples/baked-setup/README.md
@@ -0,0 +1,35 @@
+# baked-setup
+
+Shows the **publisher** story: an SDK that ships request/response defaults *built into* the generated
+client, so downstream users call operations with no setup of their own (see
+[ADR-0015](../../docs/adr/0015-publisher-setup-bake-in.md)).
+
+- `client-setup.ts` — the publisher's `defineClientSetup({ config, middleware })`, importing the
+  contract from `@redocly/client-generator` (so it resolves and is unit-testable before the client exists).
+- `redocly.yaml` — `setup: ./client-setup.ts` bakes it into `src/api/client.ts` at generation time.
+- `src/main.ts` — a consumer that just calls operations; the defaults are already active.
+
+Because the setup imports its contract from the package (not the not-yet-generated client), it is
+**unit-testable in isolation** — its middleware are plain functions on an inspectable object:
+
+```ts
+import setup from './client-setup.ts';
+
+const ctx = {
+  url: '/orders',
+  method: 'POST',
+  headers: {} as Record<string, string>,
+  operation: { id: 'createOrder', path: '/orders', tags: ['Orders'] },
+};
+setup.middleware![0].onRequest!(ctx as never);
+// ctx.headers['X-Idempotency-Key'] is now set; ctx.headers['X-Cafe-SDK'] === '1.0.0'
+```
+
+The generated client under `src/api/` is checked in and drift-checked in CI.
+
+## Run
+
+```bash
+npm install
+npm run dev
+```
diff --git a/packages/client-generator/examples/baked-setup/client-setup.ts b/packages/client-generator/examples/baked-setup/client-setup.ts
new file mode 100644
index 0000000000..e48be0dd85
--- /dev/null
+++ b/packages/client-generator/examples/baked-setup/client-setup.ts
@@ -0,0 +1,18 @@
+import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
+
+// Defaults every downstream user of this SDK gets for free — baked into the client at publish time
+// by `setup:` in redocly.yaml. Imports the contract from the package (not the generated client),
+// so this file resolves and is unit-testable before the client even exists.
+export default defineClientSetup({
+  config: { baseUrl: 'https://api.cafe.redocly.com', retry: { retries: 2 } },
+  middleware: [
+    {
+      onRequest: (ctx: RequestContext) => {
+        ctx.headers['X-Cafe-SDK'] = '1.0.0';
+        if (ctx.operation.tags.includes('Orders')) {
+          ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
+        }
+      },
+    },
+  ],
+});
diff --git a/packages/client-generator/examples/baked-setup/index.html b/packages/client-generator/examples/baked-setup/index.html
new file mode 100644
index 0000000000..2aafd8e6e1
--- /dev/null
+++ b/packages/client-generator/examples/baked-setup/index.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>Redocly client-generator — fetch-functions example</title>
+  </head>
+  <body>
+    <pre id="out">Loading…</pre>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
diff --git a/packages/client-generator/examples/baked-setup/openapi.yaml b/packages/client-generator/examples/baked-setup/openapi.yaml
new file mode 100644
index 0000000000..a255b72a20
--- /dev/null
+++ b/packages/client-generator/examples/baked-setup/openapi.yaml
@@ -0,0 +1,1163 @@
+openapi: 3.2.0
+info:
+  title: Redocly Cafe
+  description: |
+    Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+    Create API credentials and try it yourself in a realistic OpenAPI workflow.
+  version: 1.0.0
+  contact:
+    email: team@redocly.com
+    url: https://redocly.com/contact-us/
+  license:
+    name: MIT
+    url: https://opensource.org/licenses/MIT
+  termsOfService: https://redocly.com/subscription-agreement
+servers:
+  - url: https://api.cafe.redocly.com
+    description: Live server.
+tags:
+  - name: Authorization
+    description: Create a client to demo the API.
+  - name: Products
+    description: Operations related to products.
+  - name: Orders
+    description: Order management operations.
+  - name: Statistics
+    description: Statistics operations.
+paths:
+  /menu:
+    get:
+      tags:
+        - Products
+      summary: List all menu items
+      description: Retrieve a collection of menu items with optional filtering and pagination.
+      operationId: listMenuItems
+      security: []
+      parameters:
+        - $ref: '#/components/parameters/After'
+        - $ref: '#/components/parameters/Before'
+        - $ref: '#/components/parameters/Sort'
+        - $ref: '#/components/parameters/Filter'
+        - $ref: '#/components/parameters/Search'
+        - $ref: '#/components/parameters/Limit'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItemList'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    post:
+      tags:
+        - Products
+      summary: Create menu item
+      description: Create a new menu item.
+      operationId: createMenuItem
+      security:
+        - OAuth2:
+            - menu:write
+      requestBody:
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              $ref: '#/components/schemas/MenuItem'
+      responses:
+        '201':
+          description: Menu item created successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItem'
+              examples:
+                MenuItemResponse:
+                  value:
+                    id: prd_01khr487f7qm7p44xn427m43vb
+                    object: menuItem
+                    name: coffee
+                    price: 4000
+                    category: beverage
+                    createdAt: '2026-02-18T10:20:38.228Z'
+                    updatedAt: '2026-02-18T10:20:38.228Z'
+                    volume: 600
+                    containsCaffeine: false
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '409':
+          $ref: '#/components/responses/Conflict'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /menu/{menuItemId}:
+    parameters:
+      - $ref: '#/components/parameters/MenuItemId'
+    delete:
+      tags:
+        - Products
+      summary: Delete a menu item
+      description: Delete an existing menu item.
+      operationId: deleteMenuItem
+      security:
+        - OAuth2:
+            - menu:write
+      responses:
+        '204':
+          description: Menu item deleted successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /menu-item-images/{menuItemId}:
+    parameters:
+      - $ref: '#/components/parameters/MenuItemId'
+    get:
+      operationId: getMenuItemPhoto
+      summary: Retrieve a menu item photo
+      description: Retrieve the product photo image for a specific menu item.
+      security: []
+      tags:
+        - Products
+      parameters:
+        - $ref: '#/components/parameters/PhotoSize'
+      responses:
+        '200':
+          description: Menu item photo retrieved successfully.
+          content:
+            image/png:
+              schema:
+                type: string
+                format: binary
+            text/plain:
+              schema:
+                description: Alternative image text.
+                type: string
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /orders:
+    get:
+      tags:
+        - Orders
+      summary: List all orders
+      description: Retrieve a collection of orders with optional filtering and pagination.
+      operationId: listOrders
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/Filter'
+        - $ref: '#/components/parameters/Sort'
+        - $ref: '#/components/parameters/Limit'
+        - $ref: '#/components/parameters/After'
+        - $ref: '#/components/parameters/Before'
+        - $ref: '#/components/parameters/Search'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OrderList'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    post:
+      tags:
+        - Orders
+      summary: Create order
+      description: |
+        Create a new order.
+        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+      operationId: createOrder
+      security:
+        - OAuth2:
+            - orders:write
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Order'
+            examples:
+              OrderRequest:
+                dataValue:
+                  customerName: Mary Ann
+                  orderItems:
+                    - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                      quantity: 2
+                      comment: No sugar!
+                      discount: 0
+      responses:
+        '201':
+          description: Order placed successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: placed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /orders/{orderId}:
+    get:
+      tags:
+        - Orders
+      summary: Retrieve an order
+      description: Retrieve a single order by its ID.
+      operationId: getOrderById
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+        - name: X-Request-Id
+          in: header
+          required: false
+          description: |
+            Optional client-supplied correlation ID, echoed in logs and traces.
+          schema:
+            type: string
+            format: uuid
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: placed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    patch:
+      tags:
+        - Orders
+      summary: Partially update an order
+      description: |
+        Update an existing order status.
+        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+      operationId: updateOrder
+      security:
+        - OAuth2:
+            - orders:write
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              description: |
+                Partial order update using JSON Merge Patch - only include fields to update.
+              properties:
+                status:
+                  $ref: '#/components/schemas/OrderStatus'
+              required:
+                - status
+      responses:
+        '200':
+          description: Order updated successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: completed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    delete:
+      tags:
+        - Orders
+      summary: Delete an order
+      description: |
+        Delete the order.
+        To keep the order history, the order should be canceled instead of deleted.
+      operationId: deleteOrder
+      security:
+        - OAuth2:
+            - orders:write
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+      responses:
+        '204':
+          description: Order deleted successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /order-items:
+    get:
+      tags:
+        - Orders
+      summary: List all order items with menu item details
+      description: |
+        Returns an array of order items for a specific order.
+        Use the `filter` parameter to filter by order ID.
+      operationId: listOrderItems
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/Filter'
+          required: true
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                type: array
+                description: List of menu items that are part of the order.
+                items:
+                  $ref: '#/components/schemas/OrderItem'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /revenue:
+    get:
+      tags:
+        - Statistics
+      summary: Get revenue statistics
+      description: |
+        Retrieve revenue statistics for a configurable date range.
+        Returns revenue, order counts, average order amount, and other useful statistics.
+      operationId: getRevenue
+      security:
+        - ApiKey: []
+      parameters:
+        - name: startDate
+          in: query
+          required: false
+          description: |
+            Start date for the revenue calculation period (ISO 8601 datetime format).
+            Defaults to 30 days ago if not provided.
+          schema:
+            type: string
+            format: date
+          example: '2026-01-01'
+        - name: endDate
+          in: query
+          required: false
+          description: |
+            End date for the revenue calculation period (ISO 8601 datetime format).
+            Defaults to current time if not provided.
+          schema:
+            type: string
+            format: date
+          example: '2026-01-31'
+      responses:
+        '200':
+          description: Revenue statistics retrieved successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RevenueStatistics'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /oauth2/register:
+    post:
+      tags:
+        - Authorization
+      summary: Create OAuth2 client
+      description: |
+        Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+        - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type, 
+          `redirectUris` must be provided (per RFC 7591 Section 2).
+        - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+        Returns the registered client information per RFC 7591, including:
+        - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+      operationId: registerOAuth2Client
+      security: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/RegisterClientObject'
+      responses:
+        '201':
+          description: OAuth2 client registered successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OAuth2Client'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+webhooks:
+  order-notification:
+    post:
+      tags:
+        - Orders
+      operationId: orderNotificationWebhook
+      security: []
+      summary: Order notification webhook
+      description: Webhook triggered when a new order is placed.
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/OrderNotification'
+      responses:
+        '200':
+          description: Webhook received successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+components:
+  securitySchemes:
+    OAuth2:
+      type: oauth2
+      description: OAuth2 authorization for API access.
+      flows:
+        authorizationCode:
+          authorizationUrl: https://api.cafe.redocly.com/oauth2/authorize
+          tokenUrl: https://api.cafe.redocly.com/oauth2/token
+          scopes:
+            menu:read: Read access to menu items and images
+            menu:write: Write access to menu items (create, delete)
+            orders:read: Read access to orders
+            orders:write: Write access to orders (create, update, delete)
+        clientCredentials:
+          tokenUrl: https://api.cafe.redocly.com/oauth2/token
+          scopes:
+            menu:read: Read access to menu items and images
+            menu:write: Write access to menu items (create, delete)
+            orders:read: Read access to orders
+            orders:write: Write access to orders (create, update, delete)
+    ApiKey:
+      type: apiKey
+      name: X-API-Key
+      in: header
+      description: API key for internal operations.
+  parameters:
+    After:
+      name: after
+      in: query
+      required: false
+      description: Use the `endCursor` as a value for the `after` parameter to get the next page.
+      schema:
+        type: string
+      example: a25fgaksjf23la==
+    Before:
+      name: before
+      in: query
+      required: false
+      description: |
+        Use the `startCursor` as a value for the `before` parameter to get the next page.
+      schema:
+        type: string
+      example: bfg23aksjf23zb1==
+    Sort:
+      name: sort
+      description: |-
+        To sort by id in descending order use `-id`.
+        To sort by id in ascending order use `id`.
+      in: query
+      required: false
+      schema:
+        type: string
+      example: '-name'
+    Filter:
+      name: filter
+      description: |-
+        Filters the collection items using space-separated `field:value` pairs.
+
+        **Format:** `field1:value1 field2:value2`
+
+        **Supported operators:**
+        - `field:value` - Exact match
+        - `field:value1,value2` - Match any of the comma-separated values (OR)
+        - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+
+        **Examples:**
+        - `status:placed` - Filter by single status.
+        - `status:placed,completed` - Filter by multiple statuses.
+        - `createdAt:30d` - Filter orders created in the last 30 days.
+        - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+        - `status:placed createdAt:7d` - Combine multiple filters.
+      in: query
+      required: false
+      schema:
+        type: string
+      example: orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7
+    Search:
+      name: search
+      in: query
+      description: |-
+        Performs a case-insensitive text search across relevant fields in the collection.
+
+        **Fields searched depend on the endpoint:**
+        - **Menu items:** `name`, `photoTextDescription`
+        - **Orders:** `customerName`, `id`
+
+        Returns items where any of the searchable fields contain the search term as a substring.
+      required: false
+      schema:
+        type: string
+      example: coffee
+    Limit:
+      name: limit
+      description: |
+        Use to return a number of results per page.
+        If there is more data, use in combination with `after` to page through the data.
+      in: query
+      required: false
+      schema:
+        type: integer
+        minimum: 1
+        maximum: 100
+        default: 10
+      example: 10
+    MenuItemId:
+      name: menuItemId
+      in: path
+      description: ID of the menu item to retrieve.
+      required: true
+      schema:
+        type: string
+        pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+      example: prd_01h1s5z6vf2mm1mz3hevnn9va7
+    PhotoSize:
+      name: photoSize
+      in: query
+      description: Photo size to retrieve.
+      required: false
+      schema:
+        type: string
+        enum:
+          - thumbnail
+          - medium
+          - large
+        default: medium
+    OrderId:
+      name: orderId
+      in: path
+      description: ID of the order to retrieve.
+      required: true
+      schema:
+        type: string
+        pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+      example: ord_01h1s5z6vf2mm1mz3hevnn9va7
+  schemas:
+    Page:
+      type: object
+      properties:
+        endCursor:
+          type:
+            - string
+            - 'null'
+          description: |-
+            Use with the `after` query parameter to load the next page of data.
+            When `null`, there is no data.
+            The cursor is opaque and internal structure is subject to change.
+        startCursor:
+          type:
+            - string
+            - 'null'
+          description: |-
+            Use with the `before` query parameter to load the previous page of data.
+            When `null`, there is no data.
+            The cursor is opaque and internal structure is subject to change.
+        hasNextPage:
+          type: boolean
+          description: Indicates if there is a next page with items.
+        hasPrevPage:
+          type: boolean
+          description: Indicates if there is a previous page with items.
+        limit:
+          type: integer
+          minimum: 1
+          maximum: 100
+          default: 10
+          description: Value showing how many items are in the page limit.
+        total:
+          type: integer
+          description: Count of items across all pages.
+          minimum: 0
+      required:
+        - endCursor
+        - startCursor
+        - hasNextPage
+        - hasPrevPage
+        - limit
+        - total
+    MenuBaseItem:
+      type: object
+      properties:
+        createdAt:
+          description: Created date.
+          type: string
+          format: date-time
+          readOnly: true
+        updatedAt:
+          description: Updated date.
+          type: string
+          format: date-time
+          readOnly: true
+        id:
+          description: Menu item ID. Unique identifier prefixed with `prd_`.
+          type: string
+          readOnly: true
+          pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+          example: prd_01h1s5z6vf2mm1mz3hevnn9va7
+        object:
+          description: Entity name.
+          type: string
+          const: menuItem
+          readOnly: true
+        name:
+          description: Menu item name.
+          type: string
+          minLength: 1
+          maxLength: 50
+        price:
+          description: Price in cents.
+          type: integer
+          minimum: 0
+        photo:
+          writeOnly: true
+          type:
+            - string
+            - 'null'
+          format: binary
+          description: Photo of the menu item. Must be a PNG image and less than 1MB.
+        photoUrl:
+          readOnly: true
+          type: string
+          format: uri
+          description: Photo URL of the menu item.
+        photoTextDescription:
+          type:
+            - string
+            - 'null'
+      required:
+        - id
+        - name
+        - price
+        - createdAt
+        - updatedAt
+        - object
+    Beverage:
+      allOf:
+        - type: object
+          properties:
+            category:
+              description: Menu item category.
+              type: string
+              const: beverage
+            volume:
+              type: number
+              description: Size of the beverage in milliliters.
+              exclusiveMinimum: 0
+            containsCaffeine:
+              type: boolean
+              description: Indicates if the beverage contains caffeine.
+          required:
+            - category
+            - volume
+            - containsCaffeine
+        - $ref: '#/components/schemas/MenuBaseItem'
+    Dessert:
+      allOf:
+        - type: object
+          properties:
+            category:
+              description: Menu item category.
+              type: string
+              const: dessert
+            calories:
+              type: number
+              exclusiveMinimum: 0
+              description: Amount of calories.
+          required:
+            - category
+            - calories
+        - $ref: '#/components/schemas/MenuBaseItem'
+    MenuItem:
+      discriminator:
+        propertyName: category
+        mapping:
+          beverage: '#/components/schemas/Beverage'
+          dessert: '#/components/schemas/Dessert'
+      oneOf:
+        - $ref: '#/components/schemas/Beverage'
+        - $ref: '#/components/schemas/Dessert'
+      required:
+        - category
+    MenuItemList:
+      type: object
+      properties:
+        object:
+          type: string
+          const: list
+          description: Entity name.
+        page:
+          $ref: '#/components/schemas/Page'
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/MenuItem'
+      required:
+        - object
+        - page
+        - items
+    Error:
+      type: object
+      properties:
+        type:
+          type: string
+          format: uri-reference
+          description: URI reference that identifies the problem type.
+          default: about:blank
+        title:
+          type: string
+          description: Short summary of the problem type.
+        status:
+          type: integer
+          format: int32
+          description: |
+            HTTP status code generated by the origin server for this occurrence of the problem.
+          minimum: 100
+          exclusiveMaximum: 600
+        instance:
+          type: string
+          format: uri-reference
+          description: |
+            URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+            May be used to locate the root of this problem in the source code.
+          example: /some/uri-reference#specific-occurrence-context
+        details:
+          description: Additional error details.
+          type: object
+          additionalProperties: true
+      required:
+        - type
+        - title
+        - status
+    OrderStatus:
+      type: string
+      description: Order status.
+      enum:
+        - placed
+        - preparing
+        - completed
+        - canceled
+    Order:
+      type: object
+      title: Order
+      properties:
+        id:
+          description: Order ID. Unique identifier prefixed with `ord_`.
+          type: string
+          format: ulid
+          readOnly: true
+          pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+          example: ord_01h1s5z6vf2mm1mz3hevnn9va7
+        object:
+          description: Entity name.
+          type: string
+          const: order
+          readOnly: true
+        customerName:
+          description: |
+            Name of the customer who placed the order.
+            Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+          type: string
+          pattern: ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+          minLength: 1
+          maxLength: 100
+        status:
+          allOf:
+            - $ref: '#/components/schemas/OrderStatus'
+          readOnly: true
+        totalPrice:
+          description: Total order price in cents.
+          type: integer
+          minimum: 0
+          readOnly: true
+        createdAt:
+          description: Created date.
+          type: string
+          format: date-time
+          readOnly: true
+        updatedAt:
+          description: Updated date.
+          type: string
+          format: date-time
+          readOnly: true
+        orderItems:
+          type: array
+          description: List of items to include in the order.
+          minItems: 1
+          items:
+            type: object
+            properties:
+              menuItemId:
+                type: string
+                format: ulid
+                description: ID of the menu item to add to the order.
+              quantity:
+                type: integer
+                minimum: 1
+                description: Quantity of the menu item.
+              discount:
+                type: integer
+                minimum: 0
+                description: Discount amount in cents (absolute value).
+                default: 0
+              comment:
+                type: string
+                maxLength: 500
+                description: Optional comment for the order item (e.g., "No sugar").
+            required:
+              - menuItemId
+              - quantity
+      required:
+        - customerName
+        - orderItems
+    OrderList:
+      type: object
+      properties:
+        object:
+          type: string
+          const: list
+          description: Entity name.
+        page:
+          $ref: '#/components/schemas/Page'
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/Order'
+      required:
+        - object
+        - page
+        - items
+    OrderItem:
+      type: object
+      properties:
+        menuItemId:
+          type: string
+          description: ID of the menu item to add to the order.
+          writeOnly: true
+        menuItem:
+          allOf:
+            - $ref: '#/components/schemas/MenuItem'
+          description: Menu item that is part of the order.
+          readOnly: true
+        quantity:
+          type: integer
+          minimum: 1
+          description: Quantity of the menu item.
+        discount:
+          type: integer
+          minimum: 0
+          description: Discount amount in cents (absolute value).
+          default: 0
+        comment:
+          type: string
+          maxLength: 500
+          description: Optional comment for the order item (e.g., "No sugar").
+      required:
+        - menuItemId
+        - quantity
+    RevenueStatistics:
+      type: object
+      description: Revenue statistics for a given date range.
+      properties:
+        revenue:
+          type: number
+          format: float
+          description: Total revenue in cents from completed orders.
+          minimum: 0
+        averageOrderAmount:
+          type: number
+          format: float
+          description: Average order amount in cents (calculated from completed orders only).
+          minimum: 0
+        totalOrders:
+          type: integer
+          description: Total number of orders (all statuses) in the date range.
+          minimum: 0
+        placedOrders:
+          type: integer
+          description: Number of placed orders.
+          minimum: 0
+        preparingOrders:
+          type: integer
+          description: Number of preparing orders.
+          minimum: 0
+        completedOrders:
+          type: integer
+          description: Number of completed orders.
+          minimum: 0
+        canceledOrders:
+          type: integer
+          description: Number of canceled orders.
+          minimum: 0
+        startDate:
+          type: string
+          format: date
+          description: Start date of the revenue calculation period.
+        endDate:
+          type: string
+          format: date
+          description: End date of the revenue calculation period.
+      required:
+        - revenue
+        - averageOrderAmount
+        - totalOrders
+        - placedOrders
+        - preparingOrders
+        - completedOrders
+        - canceledOrders
+        - startDate
+        - endDate
+    RegisterClientObject:
+      type: object
+      properties:
+        name:
+          type: string
+          description: Client name.
+        redirectUris:
+          type: array
+          items:
+            type: string
+            format: uri
+          description: List of redirect URIs (optional, defaults to empty array).
+        scopes:
+          type: array
+          items:
+            type: string
+            enum:
+              - menu:read
+              - menu:write
+              - orders:read
+              - orders:write
+          description: List of scopes.
+        grantTypes:
+          type: array
+          items:
+            type: string
+            enum:
+              - authorization_code
+              - client_credentials
+          description: List of grant types.
+      required:
+        - name
+    OAuth2Client:
+      type: object
+      description: OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+      properties:
+        clientId:
+          type: string
+          description: Client identifier issued by the authorization server.
+        clientSecret:
+          type: string
+          description: Client secret issued by the authorization server.
+        clientIdIssuedAt:
+          type: integer
+          format: int64
+          description: Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+        clientSecretExpiresAt:
+          type: integer
+          format: int64
+          description: Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+        name:
+          type: string
+          description: Client name (registered metadata).
+        redirectUris:
+          type: array
+          items:
+            type: string
+            format: uri
+          description: List of redirect URIs (registered metadata).
+        registrationClientUri:
+          type: string
+          format: uri
+          description: URL of the client configuration endpoint for managing this client registration (RFC 7592).
+        registrationAccessToken:
+          type: string
+          description: Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+        scopes:
+          type: array
+          items:
+            type: string
+            enum:
+              - menu:read
+              - menu:write
+              - orders:read
+              - orders:write
+          description: List of scopes (registered metadata).
+        grantTypes:
+          type: array
+          items:
+            type: string
+            enum:
+              - authorization_code
+              - client_credentials
+          description: List of grant types (registered metadata).
+      required:
+        - clientId
+        - clientSecret
+        - clientIdIssuedAt
+        - clientSecretExpiresAt
+        - registrationClientUri
+        - registrationAccessToken
+    OrderNotification:
+      type: object
+      required:
+        - orderId
+        - orderStatus
+        - timestamp
+      properties:
+        orderId:
+          type: string
+          description: Unique order identifier.
+        orderStatus:
+          $ref: '#/components/schemas/OrderStatus'
+        timestamp:
+          type: string
+          format: date-time
+          description: When the event occurred.
+  responses:
+    BadRequest:
+      description: Bad request - invalid input parameters.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    InternalServerError:
+      description: Internal server error.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Unauthorized:
+      description: Unauthorized - authorization required.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Forbidden:
+      description: Forbidden - insufficient permissions.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Conflict:
+      description: Conflict - entity already exists.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    NotFound:
+      description: Resource not found.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
diff --git a/packages/client-generator/examples/baked-setup/package.json b/packages/client-generator/examples/baked-setup/package.json
new file mode 100644
index 0000000000..e8b68c2510
--- /dev/null
+++ b/packages/client-generator/examples/baked-setup/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "@redocly-examples/baked-setup",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "generate": "redocly generate-client",
+    "dev": "vite",
+    "build": "vite build"
+  },
+  "devDependencies": {
+    "@redocly/cli": "latest",
+    "typescript": "^5.5.0",
+    "vite": "^5.4.0"
+  }
+}
diff --git a/packages/client-generator/examples/baked-setup/redocly.yaml b/packages/client-generator/examples/baked-setup/redocly.yaml
new file mode 100644
index 0000000000..2533f39fee
--- /dev/null
+++ b/packages/client-generator/examples/baked-setup/redocly.yaml
@@ -0,0 +1,9 @@
+# redocly.yaml — drives `redocly generate-client` for this example.
+# `setup` bakes the publisher's defineClientSetup module into the generated client.
+x-client-generator:
+  input: ./openapi.yaml
+  output: ./src/api/client.ts
+  generators:
+    - sdk
+  facade: functions
+  setup: ./client-setup.ts
diff --git a/packages/client-generator/examples/baked-setup/src/api/client.ts b/packages/client-generator/examples/baked-setup/src/api/client.ts
new file mode 100644
index 0000000000..784ba6a735
--- /dev/null
+++ b/packages/client-generator/examples/baked-setup/src/api/client.ts
@@ -0,0 +1,1551 @@
+// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Redocly Cafe (v1.0.0)
+ * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+ * Create API credentials and try it yourself in a realistic OpenAPI workflow.
+ * 
+ */
+
+export type Page = {
+    /**
+     * Use with the `after` query parameter to load the next page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    endCursor: string | null;
+    /**
+     * Use with the `before` query parameter to load the previous page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    startCursor: string | null;
+    /**
+     * Indicates if there is a next page with items.
+     */
+    hasNextPage: boolean;
+    /**
+     * Indicates if there is a previous page with items.
+     */
+    hasPrevPage: boolean;
+    /**
+     * Value showing how many items are in the page limit.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit: number;
+    /**
+     * Count of items across all pages.
+     * @minimum 0
+     */
+    total: number;
+};
+
+export type MenuBaseItem = {
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt: string;
+    /**
+     * Menu item ID. Unique identifier prefixed with `prd_`.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    readonly id: string;
+    /**
+     * Entity name.
+     */
+    readonly object: "menuItem";
+    /**
+     * Menu item name.
+     * @minLength 1
+     * @maxLength 50
+     */
+    name: string;
+    /**
+     * Price in cents.
+     * @minimum 0
+     */
+    price: number;
+    /**
+     * Photo of the menu item. Must be a PNG image and less than 1MB.
+     * @format binary
+     */
+    photo?: Blob | null;
+    /**
+     * Photo URL of the menu item.
+     * @format uri
+     */
+    readonly photoUrl?: string;
+    photoTextDescription?: string | null;
+};
+
+export type Beverage = {
+    /**
+     * Menu item category.
+     */
+    category: "beverage";
+    /**
+     * Size of the beverage in milliliters.
+     * @exclusiveMinimum 0
+     */
+    volume: number;
+    /**
+     * Indicates if the beverage contains caffeine.
+     */
+    containsCaffeine: boolean;
+} & MenuBaseItem;
+
+export type Dessert = {
+    /**
+     * Menu item category.
+     */
+    category: "dessert";
+    /**
+     * Amount of calories.
+     * @exclusiveMinimum 0
+     */
+    calories: number;
+} & MenuBaseItem;
+
+export type MenuItem = Beverage | Dessert;
+
+export type MenuItemList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: MenuItem[];
+};
+
+export type Error = {
+    /**
+     * URI reference that identifies the problem type.
+     * @format uri-reference
+     */
+    type: string;
+    /**
+     * Short summary of the problem type.
+     */
+    title: string;
+    /**
+     * HTTP status code generated by the origin server for this occurrence of the problem.
+     * @minimum 100
+     * @exclusiveMaximum 600
+     * @format int32
+     */
+    status: number;
+    /**
+     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+     * May be used to locate the root of this problem in the source code.
+     * @format uri-reference
+     */
+    instance?: string;
+    /**
+     * Additional error details.
+     */
+    details?: Record<string, unknown>;
+};
+
+/**
+ * Order status.
+ */
+export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
+
+export const OrderStatus = {
+    placed: "placed",
+    preparing: "preparing",
+    completed: "completed",
+    canceled: "canceled"
+} as const;
+
+export type Order = {
+    /**
+     * Order ID. Unique identifier prefixed with `ord_`.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     * @format ulid
+     */
+    readonly id?: string;
+    /**
+     * Entity name.
+     */
+    readonly object?: "order";
+    /**
+     * Name of the customer who placed the order.
+     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+     * @minLength 1
+     * @maxLength 100
+     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+     */
+    customerName: string;
+    readonly status?: OrderStatus;
+    /**
+     * Total order price in cents.
+     * @minimum 0
+     */
+    readonly totalPrice?: number;
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt?: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt?: string;
+    /**
+     * List of items to include in the order.
+     * @minItems 1
+     */
+    orderItems: {
+        /**
+         * ID of the menu item to add to the order.
+         * @format ulid
+         */
+        menuItemId: string;
+        /**
+         * Quantity of the menu item.
+         * @minimum 1
+         */
+        quantity: number;
+        /**
+         * Discount amount in cents (absolute value).
+         * @minimum 0
+         */
+        discount?: number;
+        /**
+         * Optional comment for the order item (e.g., "No sugar").
+         * @maxLength 500
+         */
+        comment?: string;
+    }[];
+};
+
+export type OrderList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: Order[];
+};
+
+export type OrderItem = {
+    /**
+     * ID of the menu item to add to the order.
+     */
+    menuItemId: string;
+    /**
+     * Menu item that is part of the order.
+     */
+    readonly menuItem?: MenuItem;
+    /**
+     * Quantity of the menu item.
+     * @minimum 1
+     */
+    quantity: number;
+    /**
+     * Discount amount in cents (absolute value).
+     * @minimum 0
+     */
+    discount?: number;
+    /**
+     * Optional comment for the order item (e.g., "No sugar").
+     * @maxLength 500
+     */
+    comment?: string;
+};
+
+/**
+ * Revenue statistics for a given date range.
+ */
+export type RevenueStatistics = {
+    /**
+     * Total revenue in cents from completed orders.
+     * @minimum 0
+     * @format float
+     */
+    revenue: number;
+    /**
+     * Average order amount in cents (calculated from completed orders only).
+     * @minimum 0
+     * @format float
+     */
+    averageOrderAmount: number;
+    /**
+     * Total number of orders (all statuses) in the date range.
+     * @minimum 0
+     */
+    totalOrders: number;
+    /**
+     * Number of placed orders.
+     * @minimum 0
+     */
+    placedOrders: number;
+    /**
+     * Number of preparing orders.
+     * @minimum 0
+     */
+    preparingOrders: number;
+    /**
+     * Number of completed orders.
+     * @minimum 0
+     */
+    completedOrders: number;
+    /**
+     * Number of canceled orders.
+     * @minimum 0
+     */
+    canceledOrders: number;
+    /**
+     * Start date of the revenue calculation period.
+     * @format date
+     */
+    startDate: string;
+    /**
+     * End date of the revenue calculation period.
+     * @format date
+     */
+    endDate: string;
+};
+
+export type RegisterClientObject = {
+    /**
+     * Client name.
+     */
+    name: string;
+    /**
+     * List of redirect URIs (optional, defaults to empty array).
+     */
+    redirectUris?: string[];
+    /**
+     * List of scopes.
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types.
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+/**
+ * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+ */
+export type OAuth2Client = {
+    /**
+     * Client identifier issued by the authorization server.
+     */
+    clientId: string;
+    /**
+     * Client secret issued by the authorization server.
+     */
+    clientSecret: string;
+    /**
+     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+     * @format int64
+     */
+    clientIdIssuedAt: number;
+    /**
+     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+     * @format int64
+     */
+    clientSecretExpiresAt: number;
+    /**
+     * Client name (registered metadata).
+     */
+    name?: string;
+    /**
+     * List of redirect URIs (registered metadata).
+     */
+    redirectUris?: string[];
+    /**
+     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
+     * @format uri
+     */
+    registrationClientUri: string;
+    /**
+     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+     */
+    registrationAccessToken: string;
+    /**
+     * List of scopes (registered metadata).
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types (registered metadata).
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+export type OrderNotification = {
+    /**
+     * Unique order identifier.
+     */
+    orderId: string;
+    orderStatus: OrderStatus;
+    /**
+     * When the event occurred.
+     * @format date-time
+     */
+    timestamp: string;
+};
+
+/**
+ * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
+ */
+export function isBeverage(value: MenuItem): value is Beverage {
+    return (value as Record<string, unknown>)["category"] === "beverage";
+}
+
+/**
+ * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
+ */
+export function isDessert(value: MenuItem): value is Dessert {
+    return (value as Record<string, unknown>)["category"] === "dessert";
+}
+
+/**
+ * Static metadata for every operation, keyed by operationId: the HTTP `method`
+ * and the `path` template (with `{param}` placeholders intact). Minification-safe
+ * — useful for building cache/query keys, tracing span names, and request logging
+ * without re-deriving them at each call site.
+ */
+export const OPERATIONS = {
+    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
+    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
+    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
+    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
+    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
+    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
+    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
+} as const;
+
+/**
+ * The operationId of any operation in this client.
+ */
+export type OperationId = keyof typeof OPERATIONS;
+
+/**
+ * Static metadata describing one operation: its HTTP method, path template, and tags.
+ */
+export type OperationMetadata = {
+    readonly method: string;
+    readonly path: string;
+    readonly tags: readonly string[];
+};
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
+
+let BASE = "https://api.cafe.redocly.com";
+
+/** Identity of the operation a request belongs to. Stable across path interpolation. */
+export type OperationContext = {
+    id: OperationId;
+    path: OperationPath;
+    tags: OperationTag[];
+};
+
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
+export type RequestContext = {
+    url: string;
+    method: string;
+    headers: Record<string, string>;
+    body?: unknown;
+    /** The operation being called: its id (operationId), path template, and tags. */
+    operation: OperationContext;
+};
+
+/**
+ * Configuration and extension hooks for a client. Supplied per-instance via
+ * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
+ * (functions facade).
+ */
+export type ClientConfig = {
+    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    baseUrl?: string;
+    /** Extra headers merged into every request; a function is invoked per request. */
+    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+    /** Transport used to issue requests. Defaults to the global `fetch`. */
+    fetch?: typeof fetch;
+    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    /** Observe — or replace, by returning a `Response` — the response before parsing. */
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    /**
+     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
+     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
+     */
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
+    /**
+     * Composable interceptors run around every request, alongside the single
+     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
+     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
+     * the last-registered middleware wraps closest to the network. Register more at runtime
+     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
+     */
+    middleware?: Middleware[];
+    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
+    retry?: RetryConfig;
+    /**
+     * Per-instance auth credentials. When set, they override the module-global
+     * `set*` helpers for requests made through this config (each scheme falls back
+     * to its global slot when omitted here). Only the schemes an operation declares
+     * in its `security` are ever sent.
+     */
+    auth?: AuthCredentials;
+};
+
+/**
+ * A request interceptor; every field is optional, so a middleware can hook any subset of
+ * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
+ * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
+ * failure into the error to throw, threaded through each middleware in turn.
+ */
+export type Middleware = {
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/** Context handed to `retryOn` for the attempt that just failed. */
+export type RetryContext = {
+    /** 1-based number of the attempt that just failed. */
+    attempt: number;
+    /** The request that was attempted. */
+    request: RequestContext;
+    /** Present when the server returned a (non-ok) response. */
+    response?: Response;
+    /** Present when the transport threw (network error, DNS, connection reset). */
+    error?: unknown;
+};
+
+/** Retry policy; all fields optional with sensible defaults. */
+export type RetryConfig = {
+    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
+    retries?: number;
+    /** Base delay in milliseconds. Default 1000. */
+    retryDelay?: number;
+    /** Backoff shape. Default 'exponential'. */
+    retryStrategy?: RetryStrategy;
+    /** Apply full jitter over the computed delay. Default true. */
+    jitter?: boolean;
+    /**
+     * Decide whether to retry a failed attempt. Default: retry only idempotent
+     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
+     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
+     */
+    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
+};
+
+/**
+ * How the response body is read. `'auto'` negotiates from the content type (the
+ * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
+ */
+export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
+
+/**
+ * The trailing per-operation argument: standard `RequestInit` plus an optional
+ * per-call retry override and a `parseAs` escape hatch.
+ *
+ * `parseAs` forces how the response body is read; overrides the inferred kind.
+ * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
+ * override — the static return type is unchanged.
+ */
+export type RequestOptions = RequestInit & {
+    retry?: Partial<RetryConfig>;
+    parseAs?: ParseAs;
+};
+
+/**
+ * Override the base URL used by every generated operation. Useful when the
+ * runtime environment differs from the value declared in `servers[0].url`
+ * (e.g. dev / staging / prod toggles in a single-page app).
+ *
+ * Mutates a module-scoped binding shared by the functions facade. For multiple
+ * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ */
+export function setBaseUrl(url: string): void {
+    BASE = url;
+}
+
+/** The global config used by the functions facade (see `configure`). */
+const __config: ClientConfig = {};
+
+/**
+ * Merge `config` into the global configuration used by the functions facade —
+ * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
+ * hooks once for every free function. The service-class facade configures per
+ * instance instead (`new Client(config)`).
+ */
+export function configure(config: ClientConfig): void {
+    Object.assign(__config, config);
+}
+
+/**
+ * Append interceptors to the functions facade's global middleware chain (see
+ * `ClientConfig.middleware`). The service-class facade registers per instance via
+ * `<Client>.use(...)` instead.
+ */
+export function use(...middleware: Middleware[]): void {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    __config.middleware = [...(__config.middleware ?? []), ...middleware];
+}
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function __middleware(config: ClientConfig): Middleware[] {
+    const single = config.onRequest || config.onResponse || config.onError
+        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+        : [];
+    return [...single, ...(config.middleware ?? [])];
+}
+
+export class ApiError extends Error {
+    public readonly url: string;
+    public readonly status: number;
+    public readonly statusText: string;
+    public readonly body: unknown;
+    constructor(url: string, status: number, statusText: string, body: unknown) {
+        super(`Request failed with status ${status}`);
+        this.name = 'ApiError';
+        this.url = url;
+        this.status = status;
+        this.statusText = statusText;
+        this.body = body;
+    }
+}
+
+type QueryPrimitive = string | number | boolean;
+
+type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
+
+/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
+type QueryStyle = {
+    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+    explode: boolean;
+    allowReserved?: boolean;
+};
+
+/**
+ * Percent-encode `value` but leave the RFC-3986 reserved set
+ * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
+ */
+function __encodeReserved(value: string): string {
+    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
+}
+
+function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
+    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    if (!query)
+        return url;
+    const params = new URLSearchParams();
+    const raw: string[] = [];
+    for (const [key, value] of Object.entries(query)) {
+        if (value === undefined || value === null)
+            continue;
+        const spec = styles?.[key];
+        if (!spec) {
+            if (Array.isArray(value)) {
+                for (const v of value) {
+                    if (v !== undefined && v !== null)
+                        params.append(key, String(v));
+                }
+            }
+            else if (typeof value === 'object') {
+                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+                for (const [subKey, subValue] of Object.entries(value)) {
+                    if (subValue !== undefined && subValue !== null) {
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                    }
+                }
+            }
+            else {
+                params.append(key, String(value));
+            }
+            continue;
+        }
+        if (Array.isArray(value)) {
+            const items = value.filter((v) => v !== undefined && v !== null).map(String);
+            if (spec.style === 'form' && spec.explode) {
+                for (const v of items) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}=${__encodeReserved(v)}`);
+                    else
+                        params.append(key, v);
+                }
+            }
+            else {
+                // Delimited styles put the LITERAL delimiter on the wire; only the
+                // values are encoded. `%20` (not `+`) is the literal space delimiter.
+                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
+                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+            }
+        }
+        else if (typeof value === 'object') {
+            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+            for (const [subKey, subValue] of Object.entries(value)) {
+                if (subValue !== undefined && subValue !== null) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
+                    else
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                }
+            }
+        }
+        else if (spec.allowReserved) {
+            raw.push(`${key}=${__encodeReserved(String(value))}`);
+        }
+        else {
+            params.append(key, String(value));
+        }
+    }
+    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+    return qs ? `${url}?${qs}` : url;
+}
+
+async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
+    response: Response;
+    context: RequestContext;
+}> {
+    const { retry: callRetry, ...fetchInit } = init;
+    const retry: RetryConfig = { ...config.retry, ...callRetry };
+    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+    const headers: Record<string, string> = {
+        Accept: 'application/json',
+        ...extra,
+        ...(fetchInit.headers as Record<string, string> | undefined),
+    };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+    let payload: BodyInit | undefined;
+    if (context.body !== undefined) {
+        const value = context.body;
+        const isBinary = value instanceof Blob ||
+            value instanceof ArrayBuffer ||
+            ArrayBuffer.isView(value as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+        const isURLSearchParams = value instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+            payload = value as BodyInit;
+        }
+        else {
+            payload = JSON.stringify(value);
+            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+                context.headers['Content-Type'] = 'application/json';
+            }
+        }
+    }
+    const doFetch = config.fetch ?? fetch;
+    const maxAttempts = 1 + (retry.retries ?? 0);
+    const retryOn = retry.retryOn ?? __defaultRetryOn;
+    const signal = fetchInit.signal ?? undefined;
+    let attempt = 0;
+    while (true) {
+        attempt++;
+        if (signal?.aborted)
+            throw __abortError(signal);
+        let response: Response;
+        try {
+            response = await doFetch(context.url, {
+                ...fetchInit,
+                method: context.method,
+                headers: context.headers,
+                body: payload,
+            });
+        }
+        catch (error) {
+            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
+                await __sleep(__retryDelay(retry, attempt, null), signal);
+                continue;
+            }
+            throw error;
+        }
+        // Reverse order: the last-registered middleware wraps closest to the network (onion).
+        for (let i = middleware.length - 1; i >= 0; i--) {
+            const onResponse = middleware[i].onResponse;
+            if (onResponse) {
+                const replaced = await onResponse(response, context);
+                if (replaced)
+                    response = replaced;
+            }
+        }
+        if (!response.ok &&
+            attempt < maxAttempts &&
+            !signal?.aborted &&
+            (await retryOn({ attempt, request: context, response }))) {
+            const retryAfter = response.headers.get('retry-after');
+            // Drain the abandoned response body before the next attempt: an unread body
+            // keeps the connection checked out (and can stall the pool) under Node/undici
+            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+            await response.body?.cancel().catch(() => undefined);
+            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
+            continue;
+        }
+        return { response, context };
+    }
+}
+
+async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+    if (kind === 'void' || response.status === 204)
+        return undefined;
+    if (kind === 'stream')
+        return response.body;
+    if (kind === 'blob')
+        return response.blob();
+    if (kind === 'arrayBuffer')
+        return response.arrayBuffer();
+    if (kind === 'formData')
+        return response.formData();
+    if (kind === 'text')
+        return response.text();
+    if (kind === 'json')
+        return response.json();
+    // 'auto' — negotiate from the response's content type.
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json'))
+        return response.json();
+    if (contentType.startsWith('text/'))
+        return response.text();
+    return response.blob();
+}
+
+async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+    const { parseAs, ...sendInit } = init;
+    const { response, context } = await __send(config, op, url, sendInit, body);
+    if (!response.ok) {
+        const errorBody = await readError(response);
+        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
+        // Thread the error through each middleware's onError in turn (each may replace it).
+        for (const mw of __middleware(config)) {
+            if (mw.onError)
+                error = await mw.onError(error as ApiError, context);
+        }
+        throw error;
+    }
+    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
+    return (await __parse(response, kind)) as T;
+}
+
+async function readError(response: Response): Promise<unknown> {
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json')) {
+        return response.json().catch(() => undefined);
+    }
+    return response.text().catch(() => undefined);
+}
+
+const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+
+const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+function __defaultRetryOn(ctx: RetryContext): boolean {
+    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
+        return false;
+    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+    if (retryAfter) {
+        const seconds = Number(retryAfter);
+        if (!Number.isNaN(seconds))
+            return seconds * 1000;
+        const when = Date.parse(retryAfter);
+        if (!Number.isNaN(when))
+            return Math.max(0, when - Date.now());
+    }
+    const base = retry.retryDelay ?? 1000;
+    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+    return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
+    return new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject(__abortError(signal));
+            return;
+        }
+        const onAbort = () => {
+            clearTimeout(timer);
+            reject(__abortError(signal as AbortSignal));
+        };
+        const timer = setTimeout(() => {
+            if (signal)
+                signal.removeEventListener('abort', onAbort);
+            resolve();
+        }, ms);
+        if (signal)
+            signal.addEventListener('abort', onAbort, { once: true });
+    });
+}
+
+function __abortError(signal: AbortSignal): globalThis.Error {
+    const reason = (signal as {
+        reason?: unknown;
+    }).reason;
+    if (reason instanceof Error)
+        return reason;
+    return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * Normalize an operation's header-parameter object into a plain string record,
+ * dropping any `undefined` / `null` entries (optional headers the caller omitted)
+ * and stringifying the rest. Mirrors __buildUrl's handling of query values.
+ */
+function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
+    const out: Record<string, string> = {};
+    for (const [key, value] of Object.entries(values)) {
+        if (value !== undefined && value !== null)
+            out[key] = String(value);
+    }
+    return out;
+}
+
+/**
+ * A credential value, or a (possibly async) function that returns one per request.
+ */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/**
+ * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
+ * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
+ * to the global slots.
+ */
+export type AuthCredentials = {
+    bearer?: TokenProvider;
+    apiKey?: Record<string, TokenProvider>;
+};
+
+let __bearerToken: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
+ * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
+ * (possibly async) function resolved per request.
+ */
+export function setBearer(token: TokenProvider | null): void {
+    __bearerToken = token;
+}
+
+let __apiKey_ApiKey: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
+ * string or a (possibly async) function resolved per request.
+ */
+export function setApiKey(key: TokenProvider | null): void {
+    __apiKey_ApiKey = key;
+}
+
+/**
+ * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
+ */
+async function __resolve(slot: TokenProvider | null): Promise<string | null> {
+    if (slot === null)
+        return null;
+    return typeof slot === "function" ? slot() : slot;
+}
+
+/**
+ * Build the auth `headers` and `query` for an operation from the currently-set credentials.
+ * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
+ * can always override by passing their own `init.headers`.
+ */
+async function __auth(schemes: string[], config: ClientConfig): Promise<{
+    headers: Record<string, string>;
+    query: Record<string, string>;
+}> {
+    const headers: Record<string, string> = {};
+    const query: Record<string, string> = {};
+    const cookies: string[] = [];
+    for (const scheme of schemes) {
+        switch (scheme) {
+            case "OAuth2": {
+                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
+                if (v !== null)
+                    headers["Authorization"] = `Bearer ${v}`;
+                break;
+            }
+            case "ApiKey": {
+                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
+                if (v !== null)
+                    headers["X-API-Key"] = v;
+                break;
+            }
+        }
+    }
+    if (cookies.length > 0)
+        headers["Cookie"] = cookies.join("; ");
+    return { headers, query };
+}
+
+export type ListMenuItemsResult = MenuItemList;
+
+export type ListMenuItemsParams = {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+};
+
+export type ListMenuItemsVariables = {
+    params?: ListMenuItemsParams;
+};
+
+/**
+ * List all menu items
+ *
+ * Retrieve a collection of menu items with optional filtering and pagination.
+ */
+export async function listMenuItems(params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
+    return __request<MenuItemList>(__config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
+}
+
+export type CreateMenuItemResult = MenuItem;
+
+export type CreateMenuItemBody = FormData;
+
+export type CreateMenuItemVariables = {
+    body: CreateMenuItemBody;
+};
+
+/**
+ * Create menu item
+ *
+ * Create a new menu item.
+ */
+export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<MenuItem>(__config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type DeleteMenuItemResult = void;
+
+export type DeleteMenuItemVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+};
+
+/**
+ * Delete a menu item
+ *
+ * Delete an existing menu item.
+ */
+export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type GetMenuItemPhotoResult = Blob | string;
+
+export type GetMenuItemPhotoParams = {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+};
+
+export type GetMenuItemPhotoVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+    params?: GetMenuItemPhotoParams;
+};
+
+/**
+ * Retrieve a menu item photo
+ *
+ * Retrieve the product photo image for a specific menu item.
+ */
+export async function getMenuItemPhoto(menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}): Promise<Blob | string> {
+    return __request<Blob | string>(__config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+}
+
+export type ListOrdersResult = OrderList;
+
+export type ListOrdersParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+};
+
+export type ListOrdersVariables = {
+    params?: ListOrdersParams;
+};
+
+/**
+ * List all orders
+ *
+ * Retrieve a collection of orders with optional filtering and pagination.
+ */
+export async function listOrders(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderList> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderList>(__config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+/**
+ * Create order
+ *
+ * Create a new order.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    headers?: GetOrderByIdHeaders;
+};
+
+/**
+ * Retrieve an order
+ *
+ * Retrieve a single order by its ID.
+ */
+export async function getOrderById(orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+}
+
+export type DeleteOrderResult = void;
+
+export type DeleteOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+};
+
+/**
+ * Delete an order
+ *
+ * Delete the order.
+ * To keep the order history, the order should be canceled instead of deleted.
+ */
+export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type UpdateOrderResult = Order;
+
+export type UpdateOrderBody = {
+    status: OrderStatus;
+};
+
+export type UpdateOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    body?: UpdateOrderBody;
+};
+
+/**
+ * Partially update an order
+ *
+ * Update an existing order status.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function updateOrder(orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type ListOrderItemsResult = OrderItem[];
+
+export type ListOrderItemsParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+};
+
+export type ListOrderItemsVariables = {
+    params?: ListOrderItemsParams;
+};
+
+/**
+ * List all order items with menu item details
+ *
+ * Returns an array of order items for a specific order.
+ * Use the `filter` parameter to filter by order ID.
+ */
+export async function listOrderItems(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderItem[]>(__config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+/**
+ * Get revenue statistics
+ *
+ * Retrieve revenue statistics for a configurable date range.
+ * Returns revenue, order counts, average order amount, and other useful statistics.
+ */
+export async function getRevenue(params: {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
+    const __a = await __auth(["ApiKey"], __config);
+    return __request<RevenueStatistics>(__config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Create OAuth2 client
+ *
+ * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+ * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
+ *   `redirectUris` must be provided (per RFC 7591 Section 2).
+ * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+ * Returns the registered client information per RFC 7591, including:
+ * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+ */
+export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
+    return __request<OAuth2Client>(__config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+}
+
+// ─── Baked-in setup (--setup) ───
+const __redoclySetup: { config?: ClientConfig; middleware?: Middleware[] } = {
+  config: { baseUrl: 'https://api.cafe.redocly.com', retry: { retries: 2 } },
+  middleware: [
+    {
+      onRequest: (ctx: RequestContext) => {
+        ctx.headers['X-Cafe-SDK'] = '1.0.0';
+        if (ctx.operation.tags.includes('Orders')) {
+          ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
+        }
+      },
+    },
+  ],
+};
+configure(__redoclySetup.config ?? {});
+use(...(__redoclySetup.middleware ?? []));
diff --git a/packages/client-generator/examples/baked-setup/src/main.ts b/packages/client-generator/examples/baked-setup/src/main.ts
new file mode 100644
index 0000000000..79ff349ea8
--- /dev/null
+++ b/packages/client-generator/examples/baked-setup/src/main.ts
@@ -0,0 +1,12 @@
+import { listMenuItems } from './api/client.js';
+
+const out = document.querySelector<HTMLPreElement>('#out')!;
+
+// No configure()/use() here — the base URL, retry, and headers were baked into the client at
+// generation time (see ../client-setup.ts). A downstream consumer just calls operations.
+async function main() {
+  const menu = await listMenuItems({});
+  out.textContent = JSON.stringify(menu, null, 2);
+}
+
+void main();
diff --git a/packages/client-generator/examples/baked-setup/tsconfig.json b/packages/client-generator/examples/baked-setup/tsconfig.json
new file mode 100644
index 0000000000..72270fb4ed
--- /dev/null
+++ b/packages/client-generator/examples/baked-setup/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../tsconfig.base.json",
+  "include": ["src", "client-setup.ts"]
+}
diff --git a/packages/client-generator/examples/baked-setup/vite.config.ts b/packages/client-generator/examples/baked-setup/vite.config.ts
new file mode 100644
index 0000000000..c049f46e10
--- /dev/null
+++ b/packages/client-generator/examples/baked-setup/vite.config.ts
@@ -0,0 +1,3 @@
+import { defineConfig } from 'vite';
+
+export default defineConfig({});
diff --git a/packages/client-generator/examples/custom-generator/src/api/client.ts b/packages/client-generator/examples/custom-generator/src/api/client.ts
index a56ece2a42..241ef5fac7 100644
--- a/packages/client-generator/examples/custom-generator/src/api/client.ts
+++ b/packages/client-generator/examples/custom-generator/src/api/client.ts
@@ -419,18 +419,18 @@ export function isDessert(value: MenuItem): value is Dessert {
  * without re-deriving them at each call site.
  */
 export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu" },
-    createMenuItem: { method: "POST", path: "/menu" },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
-    listOrders: { method: "GET", path: "/orders" },
-    createOrder: { method: "POST", path: "/orders" },
-    getOrderById: { method: "GET", path: "/orders/{orderId}" },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
-    listOrderItems: { method: "GET", path: "/order-items" },
-    getRevenue: { method: "GET", path: "/revenue" },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
+    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
+    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
+    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
+    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
+    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
+    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
+    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
 } as const;
 
 /**
@@ -439,21 +439,35 @@ export const OPERATIONS = {
 export type OperationId = keyof typeof OPERATIONS;
 
 /**
- * Static metadata describing one operation: its HTTP method and path template.
+ * Static metadata describing one operation: its HTTP method, path template, and tags.
  */
 export type OperationMetadata = {
     readonly method: string;
     readonly path: string;
+    readonly tags: readonly string[];
 };
 
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
+
 let BASE = "https://api.cafe.redocly.com";
 
+/** Identity of the operation a request belongs to. Stable across path interpolation. */
+export type OperationContext = {
+    id: OperationId;
+    path: OperationPath;
+    tags: OperationTag[];
+};
+
 /** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
     headers: Record<string, string>;
     body?: unknown;
+    /** The operation being called: its id (operationId), path template, and tags. */
+    operation: OperationContext;
 };
 
 /**
@@ -711,7 +725,7 @@ function __buildUrl(config: ClientConfig, path: string, query?: Record<string, Q
     return qs ? `${url}?${qs}` : url;
 }
 
-async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
     response: Response;
     context: RequestContext;
 }> {
@@ -723,7 +737,7 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
     const middleware = __middleware(config);
     for (const mw of middleware)
         if (mw.onRequest)
@@ -821,9 +835,9 @@ async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unkn
     return response.blob();
 }
 
-async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
     const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, url, sendInit, body);
+    const { response, context } = await __send(config, op, url, sendInit, body);
     if (!response.ok) {
         const errorBody = await readError(response);
         let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
@@ -1103,7 +1117,7 @@ export async function listMenuItems(params: {
      */
     limit?: number;
 } = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-    return __request<MenuItemList>(__config, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
+    return __request<MenuItemList>(__config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
 }
 
 export type CreateMenuItemResult = MenuItem;
@@ -1121,7 +1135,7 @@ export type CreateMenuItemVariables = {
  */
 export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<MenuItem>(__config, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<MenuItem>(__config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type DeleteMenuItemResult = void;
@@ -1141,7 +1155,7 @@ export type DeleteMenuItemVariables = {
  */
 export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+    return __request<void>(__config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
 }
 
 export type GetMenuItemPhotoResult = Blob | string;
@@ -1173,7 +1187,7 @@ export async function getMenuItemPhoto(menuItemId: string, params: {
      */
     photoSize?: "thumbnail" | "medium" | "large";
 } = {}, init: RequestOptions = {}): Promise<Blob | string> {
-    return __request<Blob | string>(__config, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+    return __request<Blob | string>(__config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
 }
 
 export type ListOrdersResult = OrderList;
@@ -1289,7 +1303,7 @@ export async function listOrders(params: {
     search?: string;
 } = {}, init: RequestOptions = {}): Promise<OrderList> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderList>(__config, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<OrderList>(__config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type CreateOrderResult = Order;
@@ -1308,7 +1322,7 @@ export type CreateOrderVariables = {
  */
 export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<Order>(__config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type GetOrderByIdResult = Order;
@@ -1343,7 +1357,7 @@ export async function getOrderById(orderId: string, headers: {
     "X-Request-Id"?: string;
 } = {}, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+    return __request<Order>(__config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
 }
 
 export type DeleteOrderResult = void;
@@ -1364,7 +1378,7 @@ export type DeleteOrderVariables = {
  */
 export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+    return __request<void>(__config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
 }
 
 export type UpdateOrderResult = Order;
@@ -1392,7 +1406,7 @@ export async function updateOrder(orderId: string, body?: {
     status: OrderStatus;
 }, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<Order>(__config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type ListOrderItemsResult = OrderItem[];
@@ -1449,7 +1463,7 @@ export async function listOrderItems(params: {
     filter?: string;
 } = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderItem[]>(__config, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<OrderItem[]>(__config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type GetRevenueResult = RevenueStatistics;
@@ -1494,7 +1508,7 @@ export async function getRevenue(params: {
     endDate?: string;
 } = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
     const __a = await __auth(["ApiKey"], __config);
-    return __request<RevenueStatistics>(__config, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<RevenueStatistics>(__config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type RegisterOAuth2ClientResult = OAuth2Client;
@@ -1516,5 +1530,5 @@ export type RegisterOAuth2ClientVariables = {
  * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
  */
 export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-    return __request<OAuth2Client>(__config, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+    return __request<OAuth2Client>(__config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
 }
diff --git a/packages/client-generator/examples/customization/.gitignore b/packages/client-generator/examples/customization/.gitignore
new file mode 100644
index 0000000000..f06235c460
--- /dev/null
+++ b/packages/client-generator/examples/customization/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+dist
diff --git a/packages/client-generator/examples/customization/README.md b/packages/client-generator/examples/customization/README.md
new file mode 100644
index 0000000000..235720acc3
--- /dev/null
+++ b/packages/client-generator/examples/customization/README.md
@@ -0,0 +1,20 @@
+# customization
+
+Demonstrates customizing requests and responses **without editing the generated client** — every
+mechanism composes from the hand-written `src/main.ts`, so it survives regeneration
+(see [ADR-0014](../../docs/adr/0014-request-response-customization.md)):
+
+1. **Custom transport** — `configure({ fetch })` (here a canned fetch, so the demo runs offline).
+2. **Operation-targeted middleware** — `use({ onRequest })` matching on `ctx.operation.id` / `ctx.operation.tags`.
+3. **Request-body mutation** — `onRequest` edits `ctx.body`, and the mutated body is sent.
+4. **Raw-Response handling** — `onResponse` observes or replaces the `Response`.
+5. **Per-call headers** — the trailing `RequestOptions` argument.
+
+The generated client under `src/api/` is checked in and **drift-checked against the generator in CI**.
+
+## Run
+
+```bash
+npm install
+npm run dev
+```
diff --git a/packages/client-generator/examples/customization/index.html b/packages/client-generator/examples/customization/index.html
new file mode 100644
index 0000000000..2aafd8e6e1
--- /dev/null
+++ b/packages/client-generator/examples/customization/index.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>Redocly client-generator — fetch-functions example</title>
+  </head>
+  <body>
+    <pre id="out">Loading…</pre>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
diff --git a/packages/client-generator/examples/customization/openapi.yaml b/packages/client-generator/examples/customization/openapi.yaml
new file mode 100644
index 0000000000..a255b72a20
--- /dev/null
+++ b/packages/client-generator/examples/customization/openapi.yaml
@@ -0,0 +1,1163 @@
+openapi: 3.2.0
+info:
+  title: Redocly Cafe
+  description: |
+    Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+    Create API credentials and try it yourself in a realistic OpenAPI workflow.
+  version: 1.0.0
+  contact:
+    email: team@redocly.com
+    url: https://redocly.com/contact-us/
+  license:
+    name: MIT
+    url: https://opensource.org/licenses/MIT
+  termsOfService: https://redocly.com/subscription-agreement
+servers:
+  - url: https://api.cafe.redocly.com
+    description: Live server.
+tags:
+  - name: Authorization
+    description: Create a client to demo the API.
+  - name: Products
+    description: Operations related to products.
+  - name: Orders
+    description: Order management operations.
+  - name: Statistics
+    description: Statistics operations.
+paths:
+  /menu:
+    get:
+      tags:
+        - Products
+      summary: List all menu items
+      description: Retrieve a collection of menu items with optional filtering and pagination.
+      operationId: listMenuItems
+      security: []
+      parameters:
+        - $ref: '#/components/parameters/After'
+        - $ref: '#/components/parameters/Before'
+        - $ref: '#/components/parameters/Sort'
+        - $ref: '#/components/parameters/Filter'
+        - $ref: '#/components/parameters/Search'
+        - $ref: '#/components/parameters/Limit'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItemList'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    post:
+      tags:
+        - Products
+      summary: Create menu item
+      description: Create a new menu item.
+      operationId: createMenuItem
+      security:
+        - OAuth2:
+            - menu:write
+      requestBody:
+        required: true
+        content:
+          multipart/form-data:
+            schema:
+              $ref: '#/components/schemas/MenuItem'
+      responses:
+        '201':
+          description: Menu item created successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItem'
+              examples:
+                MenuItemResponse:
+                  value:
+                    id: prd_01khr487f7qm7p44xn427m43vb
+                    object: menuItem
+                    name: coffee
+                    price: 4000
+                    category: beverage
+                    createdAt: '2026-02-18T10:20:38.228Z'
+                    updatedAt: '2026-02-18T10:20:38.228Z'
+                    volume: 600
+                    containsCaffeine: false
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '409':
+          $ref: '#/components/responses/Conflict'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /menu/{menuItemId}:
+    parameters:
+      - $ref: '#/components/parameters/MenuItemId'
+    delete:
+      tags:
+        - Products
+      summary: Delete a menu item
+      description: Delete an existing menu item.
+      operationId: deleteMenuItem
+      security:
+        - OAuth2:
+            - menu:write
+      responses:
+        '204':
+          description: Menu item deleted successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /menu-item-images/{menuItemId}:
+    parameters:
+      - $ref: '#/components/parameters/MenuItemId'
+    get:
+      operationId: getMenuItemPhoto
+      summary: Retrieve a menu item photo
+      description: Retrieve the product photo image for a specific menu item.
+      security: []
+      tags:
+        - Products
+      parameters:
+        - $ref: '#/components/parameters/PhotoSize'
+      responses:
+        '200':
+          description: Menu item photo retrieved successfully.
+          content:
+            image/png:
+              schema:
+                type: string
+                format: binary
+            text/plain:
+              schema:
+                description: Alternative image text.
+                type: string
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /orders:
+    get:
+      tags:
+        - Orders
+      summary: List all orders
+      description: Retrieve a collection of orders with optional filtering and pagination.
+      operationId: listOrders
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/Filter'
+        - $ref: '#/components/parameters/Sort'
+        - $ref: '#/components/parameters/Limit'
+        - $ref: '#/components/parameters/After'
+        - $ref: '#/components/parameters/Before'
+        - $ref: '#/components/parameters/Search'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OrderList'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    post:
+      tags:
+        - Orders
+      summary: Create order
+      description: |
+        Create a new order.
+        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+      operationId: createOrder
+      security:
+        - OAuth2:
+            - orders:write
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/Order'
+            examples:
+              OrderRequest:
+                dataValue:
+                  customerName: Mary Ann
+                  orderItems:
+                    - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                      quantity: 2
+                      comment: No sugar!
+                      discount: 0
+      responses:
+        '201':
+          description: Order placed successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: placed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /orders/{orderId}:
+    get:
+      tags:
+        - Orders
+      summary: Retrieve an order
+      description: Retrieve a single order by its ID.
+      operationId: getOrderById
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+        - name: X-Request-Id
+          in: header
+          required: false
+          description: |
+            Optional client-supplied correlation ID, echoed in logs and traces.
+          schema:
+            type: string
+            format: uuid
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: placed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    patch:
+      tags:
+        - Orders
+      summary: Partially update an order
+      description: |
+        Update an existing order status.
+        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+      operationId: updateOrder
+      security:
+        - OAuth2:
+            - orders:write
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              description: |
+                Partial order update using JSON Merge Patch - only include fields to update.
+              properties:
+                status:
+                  $ref: '#/components/schemas/OrderStatus'
+              required:
+                - status
+      responses:
+        '200':
+          description: Order updated successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+              examples:
+                OrderResponse:
+                  dataValue:
+                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
+                    customerName: Mary Ann
+                    orderItems:
+                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
+                        quantity: 2
+                        comment: No sugar!
+                        discount: 0
+                    object: order
+                    status: completed
+                    totalPrice: 200
+                    createdAt: '2026-08-24T14:15:22Z'
+                    updatedAt: '2026-08-24T14:15:22Z'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+    delete:
+      tags:
+        - Orders
+      summary: Delete an order
+      description: |
+        Delete the order.
+        To keep the order history, the order should be canceled instead of deleted.
+      operationId: deleteOrder
+      security:
+        - OAuth2:
+            - orders:write
+      parameters:
+        - $ref: '#/components/parameters/OrderId'
+      responses:
+        '204':
+          description: Order deleted successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /order-items:
+    get:
+      tags:
+        - Orders
+      summary: List all order items with menu item details
+      description: |
+        Returns an array of order items for a specific order.
+        Use the `filter` parameter to filter by order ID.
+      operationId: listOrderItems
+      security:
+        - OAuth2:
+            - orders:read
+      parameters:
+        - $ref: '#/components/parameters/Filter'
+          required: true
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                type: array
+                description: List of menu items that are part of the order.
+                items:
+                  $ref: '#/components/schemas/OrderItem'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '404':
+          $ref: '#/components/responses/NotFound'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /revenue:
+    get:
+      tags:
+        - Statistics
+      summary: Get revenue statistics
+      description: |
+        Retrieve revenue statistics for a configurable date range.
+        Returns revenue, order counts, average order amount, and other useful statistics.
+      operationId: getRevenue
+      security:
+        - ApiKey: []
+      parameters:
+        - name: startDate
+          in: query
+          required: false
+          description: |
+            Start date for the revenue calculation period (ISO 8601 datetime format).
+            Defaults to 30 days ago if not provided.
+          schema:
+            type: string
+            format: date
+          example: '2026-01-01'
+        - name: endDate
+          in: query
+          required: false
+          description: |
+            End date for the revenue calculation period (ISO 8601 datetime format).
+            Defaults to current time if not provided.
+          schema:
+            type: string
+            format: date
+          example: '2026-01-31'
+      responses:
+        '200':
+          description: Revenue statistics retrieved successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RevenueStatistics'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '403':
+          $ref: '#/components/responses/Forbidden'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+  /oauth2/register:
+    post:
+      tags:
+        - Authorization
+      summary: Create OAuth2 client
+      description: |
+        Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+        - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type, 
+          `redirectUris` must be provided (per RFC 7591 Section 2).
+        - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+        Returns the registered client information per RFC 7591, including:
+        - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+      operationId: registerOAuth2Client
+      security: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/RegisterClientObject'
+      responses:
+        '201':
+          description: OAuth2 client registered successfully.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OAuth2Client'
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '401':
+          $ref: '#/components/responses/Unauthorized'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+webhooks:
+  order-notification:
+    post:
+      tags:
+        - Orders
+      operationId: orderNotificationWebhook
+      security: []
+      summary: Order notification webhook
+      description: Webhook triggered when a new order is placed.
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/OrderNotification'
+      responses:
+        '200':
+          description: Webhook received successfully.
+        '400':
+          $ref: '#/components/responses/BadRequest'
+        '500':
+          $ref: '#/components/responses/InternalServerError'
+components:
+  securitySchemes:
+    OAuth2:
+      type: oauth2
+      description: OAuth2 authorization for API access.
+      flows:
+        authorizationCode:
+          authorizationUrl: https://api.cafe.redocly.com/oauth2/authorize
+          tokenUrl: https://api.cafe.redocly.com/oauth2/token
+          scopes:
+            menu:read: Read access to menu items and images
+            menu:write: Write access to menu items (create, delete)
+            orders:read: Read access to orders
+            orders:write: Write access to orders (create, update, delete)
+        clientCredentials:
+          tokenUrl: https://api.cafe.redocly.com/oauth2/token
+          scopes:
+            menu:read: Read access to menu items and images
+            menu:write: Write access to menu items (create, delete)
+            orders:read: Read access to orders
+            orders:write: Write access to orders (create, update, delete)
+    ApiKey:
+      type: apiKey
+      name: X-API-Key
+      in: header
+      description: API key for internal operations.
+  parameters:
+    After:
+      name: after
+      in: query
+      required: false
+      description: Use the `endCursor` as a value for the `after` parameter to get the next page.
+      schema:
+        type: string
+      example: a25fgaksjf23la==
+    Before:
+      name: before
+      in: query
+      required: false
+      description: |
+        Use the `startCursor` as a value for the `before` parameter to get the next page.
+      schema:
+        type: string
+      example: bfg23aksjf23zb1==
+    Sort:
+      name: sort
+      description: |-
+        To sort by id in descending order use `-id`.
+        To sort by id in ascending order use `id`.
+      in: query
+      required: false
+      schema:
+        type: string
+      example: '-name'
+    Filter:
+      name: filter
+      description: |-
+        Filters the collection items using space-separated `field:value` pairs.
+
+        **Format:** `field1:value1 field2:value2`
+
+        **Supported operators:**
+        - `field:value` - Exact match
+        - `field:value1,value2` - Match any of the comma-separated values (OR)
+        - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+
+        **Examples:**
+        - `status:placed` - Filter by single status.
+        - `status:placed,completed` - Filter by multiple statuses.
+        - `createdAt:30d` - Filter orders created in the last 30 days.
+        - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+        - `status:placed createdAt:7d` - Combine multiple filters.
+      in: query
+      required: false
+      schema:
+        type: string
+      example: orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7
+    Search:
+      name: search
+      in: query
+      description: |-
+        Performs a case-insensitive text search across relevant fields in the collection.
+
+        **Fields searched depend on the endpoint:**
+        - **Menu items:** `name`, `photoTextDescription`
+        - **Orders:** `customerName`, `id`
+
+        Returns items where any of the searchable fields contain the search term as a substring.
+      required: false
+      schema:
+        type: string
+      example: coffee
+    Limit:
+      name: limit
+      description: |
+        Use to return a number of results per page.
+        If there is more data, use in combination with `after` to page through the data.
+      in: query
+      required: false
+      schema:
+        type: integer
+        minimum: 1
+        maximum: 100
+        default: 10
+      example: 10
+    MenuItemId:
+      name: menuItemId
+      in: path
+      description: ID of the menu item to retrieve.
+      required: true
+      schema:
+        type: string
+        pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+      example: prd_01h1s5z6vf2mm1mz3hevnn9va7
+    PhotoSize:
+      name: photoSize
+      in: query
+      description: Photo size to retrieve.
+      required: false
+      schema:
+        type: string
+        enum:
+          - thumbnail
+          - medium
+          - large
+        default: medium
+    OrderId:
+      name: orderId
+      in: path
+      description: ID of the order to retrieve.
+      required: true
+      schema:
+        type: string
+        pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+      example: ord_01h1s5z6vf2mm1mz3hevnn9va7
+  schemas:
+    Page:
+      type: object
+      properties:
+        endCursor:
+          type:
+            - string
+            - 'null'
+          description: |-
+            Use with the `after` query parameter to load the next page of data.
+            When `null`, there is no data.
+            The cursor is opaque and internal structure is subject to change.
+        startCursor:
+          type:
+            - string
+            - 'null'
+          description: |-
+            Use with the `before` query parameter to load the previous page of data.
+            When `null`, there is no data.
+            The cursor is opaque and internal structure is subject to change.
+        hasNextPage:
+          type: boolean
+          description: Indicates if there is a next page with items.
+        hasPrevPage:
+          type: boolean
+          description: Indicates if there is a previous page with items.
+        limit:
+          type: integer
+          minimum: 1
+          maximum: 100
+          default: 10
+          description: Value showing how many items are in the page limit.
+        total:
+          type: integer
+          description: Count of items across all pages.
+          minimum: 0
+      required:
+        - endCursor
+        - startCursor
+        - hasNextPage
+        - hasPrevPage
+        - limit
+        - total
+    MenuBaseItem:
+      type: object
+      properties:
+        createdAt:
+          description: Created date.
+          type: string
+          format: date-time
+          readOnly: true
+        updatedAt:
+          description: Updated date.
+          type: string
+          format: date-time
+          readOnly: true
+        id:
+          description: Menu item ID. Unique identifier prefixed with `prd_`.
+          type: string
+          readOnly: true
+          pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+          example: prd_01h1s5z6vf2mm1mz3hevnn9va7
+        object:
+          description: Entity name.
+          type: string
+          const: menuItem
+          readOnly: true
+        name:
+          description: Menu item name.
+          type: string
+          minLength: 1
+          maxLength: 50
+        price:
+          description: Price in cents.
+          type: integer
+          minimum: 0
+        photo:
+          writeOnly: true
+          type:
+            - string
+            - 'null'
+          format: binary
+          description: Photo of the menu item. Must be a PNG image and less than 1MB.
+        photoUrl:
+          readOnly: true
+          type: string
+          format: uri
+          description: Photo URL of the menu item.
+        photoTextDescription:
+          type:
+            - string
+            - 'null'
+      required:
+        - id
+        - name
+        - price
+        - createdAt
+        - updatedAt
+        - object
+    Beverage:
+      allOf:
+        - type: object
+          properties:
+            category:
+              description: Menu item category.
+              type: string
+              const: beverage
+            volume:
+              type: number
+              description: Size of the beverage in milliliters.
+              exclusiveMinimum: 0
+            containsCaffeine:
+              type: boolean
+              description: Indicates if the beverage contains caffeine.
+          required:
+            - category
+            - volume
+            - containsCaffeine
+        - $ref: '#/components/schemas/MenuBaseItem'
+    Dessert:
+      allOf:
+        - type: object
+          properties:
+            category:
+              description: Menu item category.
+              type: string
+              const: dessert
+            calories:
+              type: number
+              exclusiveMinimum: 0
+              description: Amount of calories.
+          required:
+            - category
+            - calories
+        - $ref: '#/components/schemas/MenuBaseItem'
+    MenuItem:
+      discriminator:
+        propertyName: category
+        mapping:
+          beverage: '#/components/schemas/Beverage'
+          dessert: '#/components/schemas/Dessert'
+      oneOf:
+        - $ref: '#/components/schemas/Beverage'
+        - $ref: '#/components/schemas/Dessert'
+      required:
+        - category
+    MenuItemList:
+      type: object
+      properties:
+        object:
+          type: string
+          const: list
+          description: Entity name.
+        page:
+          $ref: '#/components/schemas/Page'
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/MenuItem'
+      required:
+        - object
+        - page
+        - items
+    Error:
+      type: object
+      properties:
+        type:
+          type: string
+          format: uri-reference
+          description: URI reference that identifies the problem type.
+          default: about:blank
+        title:
+          type: string
+          description: Short summary of the problem type.
+        status:
+          type: integer
+          format: int32
+          description: |
+            HTTP status code generated by the origin server for this occurrence of the problem.
+          minimum: 100
+          exclusiveMaximum: 600
+        instance:
+          type: string
+          format: uri-reference
+          description: |
+            URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+            May be used to locate the root of this problem in the source code.
+          example: /some/uri-reference#specific-occurrence-context
+        details:
+          description: Additional error details.
+          type: object
+          additionalProperties: true
+      required:
+        - type
+        - title
+        - status
+    OrderStatus:
+      type: string
+      description: Order status.
+      enum:
+        - placed
+        - preparing
+        - completed
+        - canceled
+    Order:
+      type: object
+      title: Order
+      properties:
+        id:
+          description: Order ID. Unique identifier prefixed with `ord_`.
+          type: string
+          format: ulid
+          readOnly: true
+          pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+          example: ord_01h1s5z6vf2mm1mz3hevnn9va7
+        object:
+          description: Entity name.
+          type: string
+          const: order
+          readOnly: true
+        customerName:
+          description: |
+            Name of the customer who placed the order.
+            Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+          type: string
+          pattern: ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+          minLength: 1
+          maxLength: 100
+        status:
+          allOf:
+            - $ref: '#/components/schemas/OrderStatus'
+          readOnly: true
+        totalPrice:
+          description: Total order price in cents.
+          type: integer
+          minimum: 0
+          readOnly: true
+        createdAt:
+          description: Created date.
+          type: string
+          format: date-time
+          readOnly: true
+        updatedAt:
+          description: Updated date.
+          type: string
+          format: date-time
+          readOnly: true
+        orderItems:
+          type: array
+          description: List of items to include in the order.
+          minItems: 1
+          items:
+            type: object
+            properties:
+              menuItemId:
+                type: string
+                format: ulid
+                description: ID of the menu item to add to the order.
+              quantity:
+                type: integer
+                minimum: 1
+                description: Quantity of the menu item.
+              discount:
+                type: integer
+                minimum: 0
+                description: Discount amount in cents (absolute value).
+                default: 0
+              comment:
+                type: string
+                maxLength: 500
+                description: Optional comment for the order item (e.g., "No sugar").
+            required:
+              - menuItemId
+              - quantity
+      required:
+        - customerName
+        - orderItems
+    OrderList:
+      type: object
+      properties:
+        object:
+          type: string
+          const: list
+          description: Entity name.
+        page:
+          $ref: '#/components/schemas/Page'
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/Order'
+      required:
+        - object
+        - page
+        - items
+    OrderItem:
+      type: object
+      properties:
+        menuItemId:
+          type: string
+          description: ID of the menu item to add to the order.
+          writeOnly: true
+        menuItem:
+          allOf:
+            - $ref: '#/components/schemas/MenuItem'
+          description: Menu item that is part of the order.
+          readOnly: true
+        quantity:
+          type: integer
+          minimum: 1
+          description: Quantity of the menu item.
+        discount:
+          type: integer
+          minimum: 0
+          description: Discount amount in cents (absolute value).
+          default: 0
+        comment:
+          type: string
+          maxLength: 500
+          description: Optional comment for the order item (e.g., "No sugar").
+      required:
+        - menuItemId
+        - quantity
+    RevenueStatistics:
+      type: object
+      description: Revenue statistics for a given date range.
+      properties:
+        revenue:
+          type: number
+          format: float
+          description: Total revenue in cents from completed orders.
+          minimum: 0
+        averageOrderAmount:
+          type: number
+          format: float
+          description: Average order amount in cents (calculated from completed orders only).
+          minimum: 0
+        totalOrders:
+          type: integer
+          description: Total number of orders (all statuses) in the date range.
+          minimum: 0
+        placedOrders:
+          type: integer
+          description: Number of placed orders.
+          minimum: 0
+        preparingOrders:
+          type: integer
+          description: Number of preparing orders.
+          minimum: 0
+        completedOrders:
+          type: integer
+          description: Number of completed orders.
+          minimum: 0
+        canceledOrders:
+          type: integer
+          description: Number of canceled orders.
+          minimum: 0
+        startDate:
+          type: string
+          format: date
+          description: Start date of the revenue calculation period.
+        endDate:
+          type: string
+          format: date
+          description: End date of the revenue calculation period.
+      required:
+        - revenue
+        - averageOrderAmount
+        - totalOrders
+        - placedOrders
+        - preparingOrders
+        - completedOrders
+        - canceledOrders
+        - startDate
+        - endDate
+    RegisterClientObject:
+      type: object
+      properties:
+        name:
+          type: string
+          description: Client name.
+        redirectUris:
+          type: array
+          items:
+            type: string
+            format: uri
+          description: List of redirect URIs (optional, defaults to empty array).
+        scopes:
+          type: array
+          items:
+            type: string
+            enum:
+              - menu:read
+              - menu:write
+              - orders:read
+              - orders:write
+          description: List of scopes.
+        grantTypes:
+          type: array
+          items:
+            type: string
+            enum:
+              - authorization_code
+              - client_credentials
+          description: List of grant types.
+      required:
+        - name
+    OAuth2Client:
+      type: object
+      description: OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+      properties:
+        clientId:
+          type: string
+          description: Client identifier issued by the authorization server.
+        clientSecret:
+          type: string
+          description: Client secret issued by the authorization server.
+        clientIdIssuedAt:
+          type: integer
+          format: int64
+          description: Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+        clientSecretExpiresAt:
+          type: integer
+          format: int64
+          description: Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+        name:
+          type: string
+          description: Client name (registered metadata).
+        redirectUris:
+          type: array
+          items:
+            type: string
+            format: uri
+          description: List of redirect URIs (registered metadata).
+        registrationClientUri:
+          type: string
+          format: uri
+          description: URL of the client configuration endpoint for managing this client registration (RFC 7592).
+        registrationAccessToken:
+          type: string
+          description: Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+        scopes:
+          type: array
+          items:
+            type: string
+            enum:
+              - menu:read
+              - menu:write
+              - orders:read
+              - orders:write
+          description: List of scopes (registered metadata).
+        grantTypes:
+          type: array
+          items:
+            type: string
+            enum:
+              - authorization_code
+              - client_credentials
+          description: List of grant types (registered metadata).
+      required:
+        - clientId
+        - clientSecret
+        - clientIdIssuedAt
+        - clientSecretExpiresAt
+        - registrationClientUri
+        - registrationAccessToken
+    OrderNotification:
+      type: object
+      required:
+        - orderId
+        - orderStatus
+        - timestamp
+      properties:
+        orderId:
+          type: string
+          description: Unique order identifier.
+        orderStatus:
+          $ref: '#/components/schemas/OrderStatus'
+        timestamp:
+          type: string
+          format: date-time
+          description: When the event occurred.
+  responses:
+    BadRequest:
+      description: Bad request - invalid input parameters.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    InternalServerError:
+      description: Internal server error.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Unauthorized:
+      description: Unauthorized - authorization required.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Forbidden:
+      description: Forbidden - insufficient permissions.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    Conflict:
+      description: Conflict - entity already exists.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
+    NotFound:
+      description: Resource not found.
+      content:
+        application/problem+json:
+          schema:
+            $ref: '#/components/schemas/Error'
diff --git a/packages/client-generator/examples/customization/package.json b/packages/client-generator/examples/customization/package.json
new file mode 100644
index 0000000000..f0c588cedf
--- /dev/null
+++ b/packages/client-generator/examples/customization/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "@redocly-examples/customization",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "generate": "redocly generate-client",
+    "dev": "vite",
+    "build": "vite build"
+  },
+  "devDependencies": {
+    "@redocly/cli": "latest",
+    "typescript": "^5.5.0",
+    "vite": "^5.4.0"
+  }
+}
diff --git a/packages/client-generator/examples/customization/redocly.yaml b/packages/client-generator/examples/customization/redocly.yaml
new file mode 100644
index 0000000000..085d1f32bf
--- /dev/null
+++ b/packages/client-generator/examples/customization/redocly.yaml
@@ -0,0 +1,9 @@
+# redocly.yaml — drives `redocly generate-client` for this example.
+# generate-client settings live under the `x-client-generator` extension for now
+# (first-class config support is planned in @redocly/config).
+x-client-generator:
+  input: ./openapi.yaml
+  output: ./src/api/client.ts
+  generators:
+    - sdk
+  facade: functions
diff --git a/packages/client-generator/examples/customization/src/api/client.ts b/packages/client-generator/examples/customization/src/api/client.ts
new file mode 100644
index 0000000000..241ef5fac7
--- /dev/null
+++ b/packages/client-generator/examples/customization/src/api/client.ts
@@ -0,0 +1,1534 @@
+// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Redocly Cafe (v1.0.0)
+ * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+ * Create API credentials and try it yourself in a realistic OpenAPI workflow.
+ * 
+ */
+
+export type Page = {
+    /**
+     * Use with the `after` query parameter to load the next page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    endCursor: string | null;
+    /**
+     * Use with the `before` query parameter to load the previous page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    startCursor: string | null;
+    /**
+     * Indicates if there is a next page with items.
+     */
+    hasNextPage: boolean;
+    /**
+     * Indicates if there is a previous page with items.
+     */
+    hasPrevPage: boolean;
+    /**
+     * Value showing how many items are in the page limit.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit: number;
+    /**
+     * Count of items across all pages.
+     * @minimum 0
+     */
+    total: number;
+};
+
+export type MenuBaseItem = {
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt: string;
+    /**
+     * Menu item ID. Unique identifier prefixed with `prd_`.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    readonly id: string;
+    /**
+     * Entity name.
+     */
+    readonly object: "menuItem";
+    /**
+     * Menu item name.
+     * @minLength 1
+     * @maxLength 50
+     */
+    name: string;
+    /**
+     * Price in cents.
+     * @minimum 0
+     */
+    price: number;
+    /**
+     * Photo of the menu item. Must be a PNG image and less than 1MB.
+     * @format binary
+     */
+    photo?: Blob | null;
+    /**
+     * Photo URL of the menu item.
+     * @format uri
+     */
+    readonly photoUrl?: string;
+    photoTextDescription?: string | null;
+};
+
+export type Beverage = {
+    /**
+     * Menu item category.
+     */
+    category: "beverage";
+    /**
+     * Size of the beverage in milliliters.
+     * @exclusiveMinimum 0
+     */
+    volume: number;
+    /**
+     * Indicates if the beverage contains caffeine.
+     */
+    containsCaffeine: boolean;
+} & MenuBaseItem;
+
+export type Dessert = {
+    /**
+     * Menu item category.
+     */
+    category: "dessert";
+    /**
+     * Amount of calories.
+     * @exclusiveMinimum 0
+     */
+    calories: number;
+} & MenuBaseItem;
+
+export type MenuItem = Beverage | Dessert;
+
+export type MenuItemList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: MenuItem[];
+};
+
+export type Error = {
+    /**
+     * URI reference that identifies the problem type.
+     * @format uri-reference
+     */
+    type: string;
+    /**
+     * Short summary of the problem type.
+     */
+    title: string;
+    /**
+     * HTTP status code generated by the origin server for this occurrence of the problem.
+     * @minimum 100
+     * @exclusiveMaximum 600
+     * @format int32
+     */
+    status: number;
+    /**
+     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+     * May be used to locate the root of this problem in the source code.
+     * @format uri-reference
+     */
+    instance?: string;
+    /**
+     * Additional error details.
+     */
+    details?: Record<string, unknown>;
+};
+
+/**
+ * Order status.
+ */
+export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
+
+export const OrderStatus = {
+    placed: "placed",
+    preparing: "preparing",
+    completed: "completed",
+    canceled: "canceled"
+} as const;
+
+export type Order = {
+    /**
+     * Order ID. Unique identifier prefixed with `ord_`.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     * @format ulid
+     */
+    readonly id?: string;
+    /**
+     * Entity name.
+     */
+    readonly object?: "order";
+    /**
+     * Name of the customer who placed the order.
+     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+     * @minLength 1
+     * @maxLength 100
+     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+     */
+    customerName: string;
+    readonly status?: OrderStatus;
+    /**
+     * Total order price in cents.
+     * @minimum 0
+     */
+    readonly totalPrice?: number;
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt?: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt?: string;
+    /**
+     * List of items to include in the order.
+     * @minItems 1
+     */
+    orderItems: {
+        /**
+         * ID of the menu item to add to the order.
+         * @format ulid
+         */
+        menuItemId: string;
+        /**
+         * Quantity of the menu item.
+         * @minimum 1
+         */
+        quantity: number;
+        /**
+         * Discount amount in cents (absolute value).
+         * @minimum 0
+         */
+        discount?: number;
+        /**
+         * Optional comment for the order item (e.g., "No sugar").
+         * @maxLength 500
+         */
+        comment?: string;
+    }[];
+};
+
+export type OrderList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: Order[];
+};
+
+export type OrderItem = {
+    /**
+     * ID of the menu item to add to the order.
+     */
+    menuItemId: string;
+    /**
+     * Menu item that is part of the order.
+     */
+    readonly menuItem?: MenuItem;
+    /**
+     * Quantity of the menu item.
+     * @minimum 1
+     */
+    quantity: number;
+    /**
+     * Discount amount in cents (absolute value).
+     * @minimum 0
+     */
+    discount?: number;
+    /**
+     * Optional comment for the order item (e.g., "No sugar").
+     * @maxLength 500
+     */
+    comment?: string;
+};
+
+/**
+ * Revenue statistics for a given date range.
+ */
+export type RevenueStatistics = {
+    /**
+     * Total revenue in cents from completed orders.
+     * @minimum 0
+     * @format float
+     */
+    revenue: number;
+    /**
+     * Average order amount in cents (calculated from completed orders only).
+     * @minimum 0
+     * @format float
+     */
+    averageOrderAmount: number;
+    /**
+     * Total number of orders (all statuses) in the date range.
+     * @minimum 0
+     */
+    totalOrders: number;
+    /**
+     * Number of placed orders.
+     * @minimum 0
+     */
+    placedOrders: number;
+    /**
+     * Number of preparing orders.
+     * @minimum 0
+     */
+    preparingOrders: number;
+    /**
+     * Number of completed orders.
+     * @minimum 0
+     */
+    completedOrders: number;
+    /**
+     * Number of canceled orders.
+     * @minimum 0
+     */
+    canceledOrders: number;
+    /**
+     * Start date of the revenue calculation period.
+     * @format date
+     */
+    startDate: string;
+    /**
+     * End date of the revenue calculation period.
+     * @format date
+     */
+    endDate: string;
+};
+
+export type RegisterClientObject = {
+    /**
+     * Client name.
+     */
+    name: string;
+    /**
+     * List of redirect URIs (optional, defaults to empty array).
+     */
+    redirectUris?: string[];
+    /**
+     * List of scopes.
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types.
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+/**
+ * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+ */
+export type OAuth2Client = {
+    /**
+     * Client identifier issued by the authorization server.
+     */
+    clientId: string;
+    /**
+     * Client secret issued by the authorization server.
+     */
+    clientSecret: string;
+    /**
+     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+     * @format int64
+     */
+    clientIdIssuedAt: number;
+    /**
+     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+     * @format int64
+     */
+    clientSecretExpiresAt: number;
+    /**
+     * Client name (registered metadata).
+     */
+    name?: string;
+    /**
+     * List of redirect URIs (registered metadata).
+     */
+    redirectUris?: string[];
+    /**
+     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
+     * @format uri
+     */
+    registrationClientUri: string;
+    /**
+     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+     */
+    registrationAccessToken: string;
+    /**
+     * List of scopes (registered metadata).
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types (registered metadata).
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+export type OrderNotification = {
+    /**
+     * Unique order identifier.
+     */
+    orderId: string;
+    orderStatus: OrderStatus;
+    /**
+     * When the event occurred.
+     * @format date-time
+     */
+    timestamp: string;
+};
+
+/**
+ * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
+ */
+export function isBeverage(value: MenuItem): value is Beverage {
+    return (value as Record<string, unknown>)["category"] === "beverage";
+}
+
+/**
+ * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
+ */
+export function isDessert(value: MenuItem): value is Dessert {
+    return (value as Record<string, unknown>)["category"] === "dessert";
+}
+
+/**
+ * Static metadata for every operation, keyed by operationId: the HTTP `method`
+ * and the `path` template (with `{param}` placeholders intact). Minification-safe
+ * — useful for building cache/query keys, tracing span names, and request logging
+ * without re-deriving them at each call site.
+ */
+export const OPERATIONS = {
+    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
+    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
+    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
+    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
+    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
+    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
+    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
+} as const;
+
+/**
+ * The operationId of any operation in this client.
+ */
+export type OperationId = keyof typeof OPERATIONS;
+
+/**
+ * Static metadata describing one operation: its HTTP method, path template, and tags.
+ */
+export type OperationMetadata = {
+    readonly method: string;
+    readonly path: string;
+    readonly tags: readonly string[];
+};
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
+
+let BASE = "https://api.cafe.redocly.com";
+
+/** Identity of the operation a request belongs to. Stable across path interpolation. */
+export type OperationContext = {
+    id: OperationId;
+    path: OperationPath;
+    tags: OperationTag[];
+};
+
+/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
+export type RequestContext = {
+    url: string;
+    method: string;
+    headers: Record<string, string>;
+    body?: unknown;
+    /** The operation being called: its id (operationId), path template, and tags. */
+    operation: OperationContext;
+};
+
+/**
+ * Configuration and extension hooks for a client. Supplied per-instance via
+ * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
+ * (functions facade).
+ */
+export type ClientConfig = {
+    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    baseUrl?: string;
+    /** Extra headers merged into every request; a function is invoked per request. */
+    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
+    /** Transport used to issue requests. Defaults to the global `fetch`. */
+    fetch?: typeof fetch;
+    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    /** Observe — or replace, by returning a `Response` — the response before parsing. */
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    /**
+     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
+     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
+     */
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
+    /**
+     * Composable interceptors run around every request, alongside the single
+     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
+     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
+     * the last-registered middleware wraps closest to the network. Register more at runtime
+     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
+     */
+    middleware?: Middleware[];
+    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
+    retry?: RetryConfig;
+    /**
+     * Per-instance auth credentials. When set, they override the module-global
+     * `set*` helpers for requests made through this config (each scheme falls back
+     * to its global slot when omitted here). Only the schemes an operation declares
+     * in its `security` are ever sent.
+     */
+    auth?: AuthCredentials;
+};
+
+/**
+ * A request interceptor; every field is optional, so a middleware can hook any subset of
+ * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
+ * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
+ * failure into the error to throw, threaded through each middleware in turn.
+ */
+export type Middleware = {
+    onRequest?: (ctx: RequestContext) => void | Promise<void>;
+    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
+    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
+    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/** Context handed to `retryOn` for the attempt that just failed. */
+export type RetryContext = {
+    /** 1-based number of the attempt that just failed. */
+    attempt: number;
+    /** The request that was attempted. */
+    request: RequestContext;
+    /** Present when the server returned a (non-ok) response. */
+    response?: Response;
+    /** Present when the transport threw (network error, DNS, connection reset). */
+    error?: unknown;
+};
+
+/** Retry policy; all fields optional with sensible defaults. */
+export type RetryConfig = {
+    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
+    retries?: number;
+    /** Base delay in milliseconds. Default 1000. */
+    retryDelay?: number;
+    /** Backoff shape. Default 'exponential'. */
+    retryStrategy?: RetryStrategy;
+    /** Apply full jitter over the computed delay. Default true. */
+    jitter?: boolean;
+    /**
+     * Decide whether to retry a failed attempt. Default: retry only idempotent
+     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
+     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
+     */
+    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
+};
+
+/**
+ * How the response body is read. `'auto'` negotiates from the content type (the
+ * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
+ */
+export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
+
+/**
+ * The trailing per-operation argument: standard `RequestInit` plus an optional
+ * per-call retry override and a `parseAs` escape hatch.
+ *
+ * `parseAs` forces how the response body is read; overrides the inferred kind.
+ * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
+ * override — the static return type is unchanged.
+ */
+export type RequestOptions = RequestInit & {
+    retry?: Partial<RetryConfig>;
+    parseAs?: ParseAs;
+};
+
+/**
+ * Override the base URL used by every generated operation. Useful when the
+ * runtime environment differs from the value declared in `servers[0].url`
+ * (e.g. dev / staging / prod toggles in a single-page app).
+ *
+ * Mutates a module-scoped binding shared by the functions facade. For multiple
+ * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ */
+export function setBaseUrl(url: string): void {
+    BASE = url;
+}
+
+/** The global config used by the functions facade (see `configure`). */
+const __config: ClientConfig = {};
+
+/**
+ * Merge `config` into the global configuration used by the functions facade —
+ * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
+ * hooks once for every free function. The service-class facade configures per
+ * instance instead (`new Client(config)`).
+ */
+export function configure(config: ClientConfig): void {
+    Object.assign(__config, config);
+}
+
+/**
+ * Append interceptors to the functions facade's global middleware chain (see
+ * `ClientConfig.middleware`). The service-class facade registers per instance via
+ * `<Client>.use(...)` instead.
+ */
+export function use(...middleware: Middleware[]): void {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    __config.middleware = [...(__config.middleware ?? []), ...middleware];
+}
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function __middleware(config: ClientConfig): Middleware[] {
+    const single = config.onRequest || config.onResponse || config.onError
+        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+        : [];
+    return [...single, ...(config.middleware ?? [])];
+}
+
+export class ApiError extends Error {
+    public readonly url: string;
+    public readonly status: number;
+    public readonly statusText: string;
+    public readonly body: unknown;
+    constructor(url: string, status: number, statusText: string, body: unknown) {
+        super(`Request failed with status ${status}`);
+        this.name = 'ApiError';
+        this.url = url;
+        this.status = status;
+        this.statusText = statusText;
+        this.body = body;
+    }
+}
+
+type QueryPrimitive = string | number | boolean;
+
+type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
+
+/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
+type QueryStyle = {
+    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+    explode: boolean;
+    allowReserved?: boolean;
+};
+
+/**
+ * Percent-encode `value` but leave the RFC-3986 reserved set
+ * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
+ */
+function __encodeReserved(value: string): string {
+    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
+}
+
+function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
+    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    if (!query)
+        return url;
+    const params = new URLSearchParams();
+    const raw: string[] = [];
+    for (const [key, value] of Object.entries(query)) {
+        if (value === undefined || value === null)
+            continue;
+        const spec = styles?.[key];
+        if (!spec) {
+            if (Array.isArray(value)) {
+                for (const v of value) {
+                    if (v !== undefined && v !== null)
+                        params.append(key, String(v));
+                }
+            }
+            else if (typeof value === 'object') {
+                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+                for (const [subKey, subValue] of Object.entries(value)) {
+                    if (subValue !== undefined && subValue !== null) {
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                    }
+                }
+            }
+            else {
+                params.append(key, String(value));
+            }
+            continue;
+        }
+        if (Array.isArray(value)) {
+            const items = value.filter((v) => v !== undefined && v !== null).map(String);
+            if (spec.style === 'form' && spec.explode) {
+                for (const v of items) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}=${__encodeReserved(v)}`);
+                    else
+                        params.append(key, v);
+                }
+            }
+            else {
+                // Delimited styles put the LITERAL delimiter on the wire; only the
+                // values are encoded. `%20` (not `+`) is the literal space delimiter.
+                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
+                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+            }
+        }
+        else if (typeof value === 'object') {
+            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+            for (const [subKey, subValue] of Object.entries(value)) {
+                if (subValue !== undefined && subValue !== null) {
+                    if (spec.allowReserved)
+                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
+                    else
+                        params.append(`${key}[${subKey}]`, String(subValue));
+                }
+            }
+        }
+        else if (spec.allowReserved) {
+            raw.push(`${key}=${__encodeReserved(String(value))}`);
+        }
+        else {
+            params.append(key, String(value));
+        }
+    }
+    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+    return qs ? `${url}?${qs}` : url;
+}
+
+async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
+    response: Response;
+    context: RequestContext;
+}> {
+    const { retry: callRetry, ...fetchInit } = init;
+    const retry: RetryConfig = { ...config.retry, ...callRetry };
+    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+    const headers: Record<string, string> = {
+        Accept: 'application/json',
+        ...extra,
+        ...(fetchInit.headers as Record<string, string> | undefined),
+    };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
+    const middleware = __middleware(config);
+    for (const mw of middleware)
+        if (mw.onRequest)
+            await mw.onRequest(context);
+    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+    let payload: BodyInit | undefined;
+    if (context.body !== undefined) {
+        const value = context.body;
+        const isBinary = value instanceof Blob ||
+            value instanceof ArrayBuffer ||
+            ArrayBuffer.isView(value as ArrayBufferView);
+        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+        const isURLSearchParams = value instanceof URLSearchParams;
+        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+            payload = value as BodyInit;
+        }
+        else {
+            payload = JSON.stringify(value);
+            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+                context.headers['Content-Type'] = 'application/json';
+            }
+        }
+    }
+    const doFetch = config.fetch ?? fetch;
+    const maxAttempts = 1 + (retry.retries ?? 0);
+    const retryOn = retry.retryOn ?? __defaultRetryOn;
+    const signal = fetchInit.signal ?? undefined;
+    let attempt = 0;
+    while (true) {
+        attempt++;
+        if (signal?.aborted)
+            throw __abortError(signal);
+        let response: Response;
+        try {
+            response = await doFetch(context.url, {
+                ...fetchInit,
+                method: context.method,
+                headers: context.headers,
+                body: payload,
+            });
+        }
+        catch (error) {
+            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
+                await __sleep(__retryDelay(retry, attempt, null), signal);
+                continue;
+            }
+            throw error;
+        }
+        // Reverse order: the last-registered middleware wraps closest to the network (onion).
+        for (let i = middleware.length - 1; i >= 0; i--) {
+            const onResponse = middleware[i].onResponse;
+            if (onResponse) {
+                const replaced = await onResponse(response, context);
+                if (replaced)
+                    response = replaced;
+            }
+        }
+        if (!response.ok &&
+            attempt < maxAttempts &&
+            !signal?.aborted &&
+            (await retryOn({ attempt, request: context, response }))) {
+            const retryAfter = response.headers.get('retry-after');
+            // Drain the abandoned response body before the next attempt: an unread body
+            // keeps the connection checked out (and can stall the pool) under Node/undici
+            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+            await response.body?.cancel().catch(() => undefined);
+            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
+            continue;
+        }
+        return { response, context };
+    }
+}
+
+async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+    if (kind === 'void' || response.status === 204)
+        return undefined;
+    if (kind === 'stream')
+        return response.body;
+    if (kind === 'blob')
+        return response.blob();
+    if (kind === 'arrayBuffer')
+        return response.arrayBuffer();
+    if (kind === 'formData')
+        return response.formData();
+    if (kind === 'text')
+        return response.text();
+    if (kind === 'json')
+        return response.json();
+    // 'auto' — negotiate from the response's content type.
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json'))
+        return response.json();
+    if (contentType.startsWith('text/'))
+        return response.text();
+    return response.blob();
+}
+
+async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+    const { parseAs, ...sendInit } = init;
+    const { response, context } = await __send(config, op, url, sendInit, body);
+    if (!response.ok) {
+        const errorBody = await readError(response);
+        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
+        // Thread the error through each middleware's onError in turn (each may replace it).
+        for (const mw of __middleware(config)) {
+            if (mw.onError)
+                error = await mw.onError(error as ApiError, context);
+        }
+        throw error;
+    }
+    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
+    return (await __parse(response, kind)) as T;
+}
+
+async function readError(response: Response): Promise<unknown> {
+    const contentType = response.headers.get('content-type') ?? '';
+    if (contentType.toLowerCase().includes('json')) {
+        return response.json().catch(() => undefined);
+    }
+    return response.text().catch(() => undefined);
+}
+
+const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+
+const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+function __defaultRetryOn(ctx: RetryContext): boolean {
+    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
+        return false;
+    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+    if (retryAfter) {
+        const seconds = Number(retryAfter);
+        if (!Number.isNaN(seconds))
+            return seconds * 1000;
+        const when = Date.parse(retryAfter);
+        if (!Number.isNaN(when))
+            return Math.max(0, when - Date.now());
+    }
+    const base = retry.retryDelay ?? 1000;
+    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+    return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
+    return new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject(__abortError(signal));
+            return;
+        }
+        const onAbort = () => {
+            clearTimeout(timer);
+            reject(__abortError(signal as AbortSignal));
+        };
+        const timer = setTimeout(() => {
+            if (signal)
+                signal.removeEventListener('abort', onAbort);
+            resolve();
+        }, ms);
+        if (signal)
+            signal.addEventListener('abort', onAbort, { once: true });
+    });
+}
+
+function __abortError(signal: AbortSignal): globalThis.Error {
+    const reason = (signal as {
+        reason?: unknown;
+    }).reason;
+    if (reason instanceof Error)
+        return reason;
+    return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * Normalize an operation's header-parameter object into a plain string record,
+ * dropping any `undefined` / `null` entries (optional headers the caller omitted)
+ * and stringifying the rest. Mirrors __buildUrl's handling of query values.
+ */
+function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
+    const out: Record<string, string> = {};
+    for (const [key, value] of Object.entries(values)) {
+        if (value !== undefined && value !== null)
+            out[key] = String(value);
+    }
+    return out;
+}
+
+/**
+ * A credential value, or a (possibly async) function that returns one per request.
+ */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/**
+ * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
+ * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
+ * to the global slots.
+ */
+export type AuthCredentials = {
+    bearer?: TokenProvider;
+    apiKey?: Record<string, TokenProvider>;
+};
+
+let __bearerToken: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
+ * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
+ * (possibly async) function resolved per request.
+ */
+export function setBearer(token: TokenProvider | null): void {
+    __bearerToken = token;
+}
+
+let __apiKey_ApiKey: TokenProvider | null = null;
+
+/**
+ * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
+ * string or a (possibly async) function resolved per request.
+ */
+export function setApiKey(key: TokenProvider | null): void {
+    __apiKey_ApiKey = key;
+}
+
+/**
+ * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
+ */
+async function __resolve(slot: TokenProvider | null): Promise<string | null> {
+    if (slot === null)
+        return null;
+    return typeof slot === "function" ? slot() : slot;
+}
+
+/**
+ * Build the auth `headers` and `query` for an operation from the currently-set credentials.
+ * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
+ * can always override by passing their own `init.headers`.
+ */
+async function __auth(schemes: string[], config: ClientConfig): Promise<{
+    headers: Record<string, string>;
+    query: Record<string, string>;
+}> {
+    const headers: Record<string, string> = {};
+    const query: Record<string, string> = {};
+    const cookies: string[] = [];
+    for (const scheme of schemes) {
+        switch (scheme) {
+            case "OAuth2": {
+                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
+                if (v !== null)
+                    headers["Authorization"] = `Bearer ${v}`;
+                break;
+            }
+            case "ApiKey": {
+                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
+                if (v !== null)
+                    headers["X-API-Key"] = v;
+                break;
+            }
+        }
+    }
+    if (cookies.length > 0)
+        headers["Cookie"] = cookies.join("; ");
+    return { headers, query };
+}
+
+export type ListMenuItemsResult = MenuItemList;
+
+export type ListMenuItemsParams = {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+};
+
+export type ListMenuItemsVariables = {
+    params?: ListMenuItemsParams;
+};
+
+/**
+ * List all menu items
+ *
+ * Retrieve a collection of menu items with optional filtering and pagination.
+ */
+export async function listMenuItems(params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
+    return __request<MenuItemList>(__config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
+}
+
+export type CreateMenuItemResult = MenuItem;
+
+export type CreateMenuItemBody = FormData;
+
+export type CreateMenuItemVariables = {
+    body: CreateMenuItemBody;
+};
+
+/**
+ * Create menu item
+ *
+ * Create a new menu item.
+ */
+export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<MenuItem>(__config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type DeleteMenuItemResult = void;
+
+export type DeleteMenuItemVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+};
+
+/**
+ * Delete a menu item
+ *
+ * Delete an existing menu item.
+ */
+export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type GetMenuItemPhotoResult = Blob | string;
+
+export type GetMenuItemPhotoParams = {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+};
+
+export type GetMenuItemPhotoVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+    params?: GetMenuItemPhotoParams;
+};
+
+/**
+ * Retrieve a menu item photo
+ *
+ * Retrieve the product photo image for a specific menu item.
+ */
+export async function getMenuItemPhoto(menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}): Promise<Blob | string> {
+    return __request<Blob | string>(__config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+}
+
+export type ListOrdersResult = OrderList;
+
+export type ListOrdersParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+};
+
+export type ListOrdersVariables = {
+    params?: ListOrdersParams;
+};
+
+/**
+ * List all orders
+ *
+ * Retrieve a collection of orders with optional filtering and pagination.
+ */
+export async function listOrders(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderList> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderList>(__config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+/**
+ * Create order
+ *
+ * Create a new order.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    headers?: GetOrderByIdHeaders;
+};
+
+/**
+ * Retrieve an order
+ *
+ * Retrieve a single order by its ID.
+ */
+export async function getOrderById(orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+}
+
+export type DeleteOrderResult = void;
+
+export type DeleteOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+};
+
+/**
+ * Delete an order
+ *
+ * Delete the order.
+ * To keep the order history, the order should be canceled instead of deleted.
+ */
+export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<void>(__config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+}
+
+export type UpdateOrderResult = Order;
+
+export type UpdateOrderBody = {
+    status: OrderStatus;
+};
+
+export type UpdateOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    body?: UpdateOrderBody;
+};
+
+/**
+ * Partially update an order
+ *
+ * Update an existing order status.
+ * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
+ */
+export async function updateOrder(orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}): Promise<Order> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<Order>(__config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+}
+
+export type ListOrderItemsResult = OrderItem[];
+
+export type ListOrderItemsParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+};
+
+export type ListOrderItemsVariables = {
+    params?: ListOrderItemsParams;
+};
+
+/**
+ * List all order items with menu item details
+ *
+ * Returns an array of order items for a specific order.
+ * Use the `filter` parameter to filter by order ID.
+ */
+export async function listOrderItems(params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
+    const __a = await __auth(["OAuth2"], __config);
+    return __request<OrderItem[]>(__config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+/**
+ * Get revenue statistics
+ *
+ * Retrieve revenue statistics for a configurable date range.
+ * Returns revenue, order counts, average order amount, and other useful statistics.
+ */
+export async function getRevenue(params: {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
+    const __a = await __auth(["ApiKey"], __config);
+    return __request<RevenueStatistics>(__config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+}
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Create OAuth2 client
+ *
+ * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
+ * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
+ *   `redirectUris` must be provided (per RFC 7591 Section 2).
+ * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
+ * Returns the registered client information per RFC 7591, including:
+ * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+ */
+export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
+    return __request<OAuth2Client>(__config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+}
diff --git a/packages/client-generator/examples/customization/src/main.ts b/packages/client-generator/examples/customization/src/main.ts
new file mode 100644
index 0000000000..c769461544
--- /dev/null
+++ b/packages/client-generator/examples/customization/src/main.ts
@@ -0,0 +1,64 @@
+import {
+  configure,
+  use,
+  listMenuItems,
+  listOrders,
+  createOrder,
+  type RequestContext,
+} from './api/client.js';
+
+// `ctx.operation.{id,path,tags}` are typed literal unions (OperationId / OperationPath / OperationTag),
+// so the `id`/`tag` comparisons below autocomplete and a typo is a compile error — not a silent miss.
+
+const out = document.querySelector<HTMLPreElement>('#out')!;
+const log: string[] = [];
+
+// 1. Custom transport: a canned `fetch` so this example runs offline (and avoids the CORS
+//    preflight a browser triggers for custom request headers against the live API).
+configure({
+  fetch: (async (_url: string, init: RequestInit) => {
+    const isPost = init.method === 'POST';
+    const payload = isPost
+      ? { id: 'ord_demo', object: 'order', status: 'created', ...JSON.parse(String(init.body)) }
+      : { data: [{ id: 'prd_1', object: 'menuItem', name: 'Espresso', price: 300 }] };
+    return new Response(JSON.stringify(payload), {
+      status: isPost ? 201 : 200,
+      headers: { 'content-type': 'application/json' },
+    });
+  }) as unknown as typeof fetch,
+});
+
+// 2. Operation-targeted middleware — match by operation identity (id or tag), not brittle URL regex.
+// 3. Request-body mutation — `onRequest` may now edit `ctx.body`, and the change is sent.
+// 4. Raw-Response handling — `onResponse` observes (or could replace) the Response before parsing.
+use({
+  onRequest: (ctx: RequestContext) => {
+    if (ctx.operation.id === 'listMenuItems' || ctx.operation.tags.includes('Products')) {
+      ctx.headers['X-Trace-Id'] = 'demo-trace';
+    }
+    if (ctx.operation.id === 'createOrder') {
+      (ctx.body as { source?: string }).source = 'web';
+    }
+    // `[traced]` marks requests the guard above actually touched — untargeted operations show none.
+    const traced = 'X-Trace-Id' in ctx.headers ? ' [traced]' : '';
+    log.push(`-> ${ctx.operation.id} ${ctx.method} ${ctx.operation.path}${traced}`);
+  },
+  onResponse: (response) => {
+    log.push(`<- ${response.status}`);
+  },
+});
+
+async function main() {
+  // 5. Per-call header via the trailing `RequestOptions` argument.
+  const menu = await listMenuItems({}, { headers: { 'X-Request-Id': '42' } });
+  const order = await createOrder({
+    customerName: 'Mary Ann',
+    orderItems: [{ menuItemId: 'prd_1', quantity: 2 }],
+  });
+  // An untargeted operation (not `listMenuItems`/`Products`, not `createOrder`): the middleware
+  // only observes it — no header is added and the body is left as-is. It shows no `[traced]` mark.
+  const orders = await listOrders();
+  out.textContent = [...log, '', JSON.stringify({ menu, order, orders }, null, 2)].join('\n');
+}
+
+void main();
diff --git a/packages/client-generator/examples/customization/tsconfig.json b/packages/client-generator/examples/customization/tsconfig.json
new file mode 100644
index 0000000000..4bd6962d40
--- /dev/null
+++ b/packages/client-generator/examples/customization/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../tsconfig.base.json",
+  "include": ["src"]
+}
diff --git a/packages/client-generator/examples/customization/vite.config.ts b/packages/client-generator/examples/customization/vite.config.ts
new file mode 100644
index 0000000000..c049f46e10
--- /dev/null
+++ b/packages/client-generator/examples/customization/vite.config.ts
@@ -0,0 +1,3 @@
+import { defineConfig } from 'vite';
+
+export default defineConfig({});
diff --git a/packages/client-generator/examples/fetch-functions/src/api/client.ts b/packages/client-generator/examples/fetch-functions/src/api/client.ts
index a56ece2a42..241ef5fac7 100644
--- a/packages/client-generator/examples/fetch-functions/src/api/client.ts
+++ b/packages/client-generator/examples/fetch-functions/src/api/client.ts
@@ -419,18 +419,18 @@ export function isDessert(value: MenuItem): value is Dessert {
  * without re-deriving them at each call site.
  */
 export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu" },
-    createMenuItem: { method: "POST", path: "/menu" },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
-    listOrders: { method: "GET", path: "/orders" },
-    createOrder: { method: "POST", path: "/orders" },
-    getOrderById: { method: "GET", path: "/orders/{orderId}" },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
-    listOrderItems: { method: "GET", path: "/order-items" },
-    getRevenue: { method: "GET", path: "/revenue" },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
+    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
+    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
+    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
+    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
+    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
+    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
+    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
 } as const;
 
 /**
@@ -439,21 +439,35 @@ export const OPERATIONS = {
 export type OperationId = keyof typeof OPERATIONS;
 
 /**
- * Static metadata describing one operation: its HTTP method and path template.
+ * Static metadata describing one operation: its HTTP method, path template, and tags.
  */
 export type OperationMetadata = {
     readonly method: string;
     readonly path: string;
+    readonly tags: readonly string[];
 };
 
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
+
 let BASE = "https://api.cafe.redocly.com";
 
+/** Identity of the operation a request belongs to. Stable across path interpolation. */
+export type OperationContext = {
+    id: OperationId;
+    path: OperationPath;
+    tags: OperationTag[];
+};
+
 /** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
     headers: Record<string, string>;
     body?: unknown;
+    /** The operation being called: its id (operationId), path template, and tags. */
+    operation: OperationContext;
 };
 
 /**
@@ -711,7 +725,7 @@ function __buildUrl(config: ClientConfig, path: string, query?: Record<string, Q
     return qs ? `${url}?${qs}` : url;
 }
 
-async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
     response: Response;
     context: RequestContext;
 }> {
@@ -723,7 +737,7 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
     const middleware = __middleware(config);
     for (const mw of middleware)
         if (mw.onRequest)
@@ -821,9 +835,9 @@ async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unkn
     return response.blob();
 }
 
-async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
     const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, url, sendInit, body);
+    const { response, context } = await __send(config, op, url, sendInit, body);
     if (!response.ok) {
         const errorBody = await readError(response);
         let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
@@ -1103,7 +1117,7 @@ export async function listMenuItems(params: {
      */
     limit?: number;
 } = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-    return __request<MenuItemList>(__config, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
+    return __request<MenuItemList>(__config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
 }
 
 export type CreateMenuItemResult = MenuItem;
@@ -1121,7 +1135,7 @@ export type CreateMenuItemVariables = {
  */
 export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<MenuItem>(__config, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<MenuItem>(__config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type DeleteMenuItemResult = void;
@@ -1141,7 +1155,7 @@ export type DeleteMenuItemVariables = {
  */
 export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+    return __request<void>(__config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
 }
 
 export type GetMenuItemPhotoResult = Blob | string;
@@ -1173,7 +1187,7 @@ export async function getMenuItemPhoto(menuItemId: string, params: {
      */
     photoSize?: "thumbnail" | "medium" | "large";
 } = {}, init: RequestOptions = {}): Promise<Blob | string> {
-    return __request<Blob | string>(__config, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+    return __request<Blob | string>(__config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
 }
 
 export type ListOrdersResult = OrderList;
@@ -1289,7 +1303,7 @@ export async function listOrders(params: {
     search?: string;
 } = {}, init: RequestOptions = {}): Promise<OrderList> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderList>(__config, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<OrderList>(__config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type CreateOrderResult = Order;
@@ -1308,7 +1322,7 @@ export type CreateOrderVariables = {
  */
 export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<Order>(__config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type GetOrderByIdResult = Order;
@@ -1343,7 +1357,7 @@ export async function getOrderById(orderId: string, headers: {
     "X-Request-Id"?: string;
 } = {}, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+    return __request<Order>(__config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
 }
 
 export type DeleteOrderResult = void;
@@ -1364,7 +1378,7 @@ export type DeleteOrderVariables = {
  */
 export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+    return __request<void>(__config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
 }
 
 export type UpdateOrderResult = Order;
@@ -1392,7 +1406,7 @@ export async function updateOrder(orderId: string, body?: {
     status: OrderStatus;
 }, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<Order>(__config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type ListOrderItemsResult = OrderItem[];
@@ -1449,7 +1463,7 @@ export async function listOrderItems(params: {
     filter?: string;
 } = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderItem[]>(__config, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<OrderItem[]>(__config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type GetRevenueResult = RevenueStatistics;
@@ -1494,7 +1508,7 @@ export async function getRevenue(params: {
     endDate?: string;
 } = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
     const __a = await __auth(["ApiKey"], __config);
-    return __request<RevenueStatistics>(__config, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<RevenueStatistics>(__config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type RegisterOAuth2ClientResult = OAuth2Client;
@@ -1516,5 +1530,5 @@ export type RegisterOAuth2ClientVariables = {
  * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
  */
 export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-    return __request<OAuth2Client>(__config, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+    return __request<OAuth2Client>(__config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
 }
diff --git a/packages/client-generator/examples/mock/src/api/client.ts b/packages/client-generator/examples/mock/src/api/client.ts
index a56ece2a42..241ef5fac7 100644
--- a/packages/client-generator/examples/mock/src/api/client.ts
+++ b/packages/client-generator/examples/mock/src/api/client.ts
@@ -419,18 +419,18 @@ export function isDessert(value: MenuItem): value is Dessert {
  * without re-deriving them at each call site.
  */
 export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu" },
-    createMenuItem: { method: "POST", path: "/menu" },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
-    listOrders: { method: "GET", path: "/orders" },
-    createOrder: { method: "POST", path: "/orders" },
-    getOrderById: { method: "GET", path: "/orders/{orderId}" },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
-    listOrderItems: { method: "GET", path: "/order-items" },
-    getRevenue: { method: "GET", path: "/revenue" },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
+    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
+    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
+    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
+    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
+    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
+    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
+    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
 } as const;
 
 /**
@@ -439,21 +439,35 @@ export const OPERATIONS = {
 export type OperationId = keyof typeof OPERATIONS;
 
 /**
- * Static metadata describing one operation: its HTTP method and path template.
+ * Static metadata describing one operation: its HTTP method, path template, and tags.
  */
 export type OperationMetadata = {
     readonly method: string;
     readonly path: string;
+    readonly tags: readonly string[];
 };
 
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
+
 let BASE = "https://api.cafe.redocly.com";
 
+/** Identity of the operation a request belongs to. Stable across path interpolation. */
+export type OperationContext = {
+    id: OperationId;
+    path: OperationPath;
+    tags: OperationTag[];
+};
+
 /** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
     headers: Record<string, string>;
     body?: unknown;
+    /** The operation being called: its id (operationId), path template, and tags. */
+    operation: OperationContext;
 };
 
 /**
@@ -711,7 +725,7 @@ function __buildUrl(config: ClientConfig, path: string, query?: Record<string, Q
     return qs ? `${url}?${qs}` : url;
 }
 
-async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
     response: Response;
     context: RequestContext;
 }> {
@@ -723,7 +737,7 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
     const middleware = __middleware(config);
     for (const mw of middleware)
         if (mw.onRequest)
@@ -821,9 +835,9 @@ async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unkn
     return response.blob();
 }
 
-async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
     const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, url, sendInit, body);
+    const { response, context } = await __send(config, op, url, sendInit, body);
     if (!response.ok) {
         const errorBody = await readError(response);
         let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
@@ -1103,7 +1117,7 @@ export async function listMenuItems(params: {
      */
     limit?: number;
 } = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-    return __request<MenuItemList>(__config, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
+    return __request<MenuItemList>(__config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
 }
 
 export type CreateMenuItemResult = MenuItem;
@@ -1121,7 +1135,7 @@ export type CreateMenuItemVariables = {
  */
 export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<MenuItem>(__config, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<MenuItem>(__config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type DeleteMenuItemResult = void;
@@ -1141,7 +1155,7 @@ export type DeleteMenuItemVariables = {
  */
 export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+    return __request<void>(__config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
 }
 
 export type GetMenuItemPhotoResult = Blob | string;
@@ -1173,7 +1187,7 @@ export async function getMenuItemPhoto(menuItemId: string, params: {
      */
     photoSize?: "thumbnail" | "medium" | "large";
 } = {}, init: RequestOptions = {}): Promise<Blob | string> {
-    return __request<Blob | string>(__config, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+    return __request<Blob | string>(__config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
 }
 
 export type ListOrdersResult = OrderList;
@@ -1289,7 +1303,7 @@ export async function listOrders(params: {
     search?: string;
 } = {}, init: RequestOptions = {}): Promise<OrderList> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderList>(__config, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<OrderList>(__config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type CreateOrderResult = Order;
@@ -1308,7 +1322,7 @@ export type CreateOrderVariables = {
  */
 export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<Order>(__config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type GetOrderByIdResult = Order;
@@ -1343,7 +1357,7 @@ export async function getOrderById(orderId: string, headers: {
     "X-Request-Id"?: string;
 } = {}, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+    return __request<Order>(__config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
 }
 
 export type DeleteOrderResult = void;
@@ -1364,7 +1378,7 @@ export type DeleteOrderVariables = {
  */
 export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+    return __request<void>(__config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
 }
 
 export type UpdateOrderResult = Order;
@@ -1392,7 +1406,7 @@ export async function updateOrder(orderId: string, body?: {
     status: OrderStatus;
 }, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<Order>(__config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type ListOrderItemsResult = OrderItem[];
@@ -1449,7 +1463,7 @@ export async function listOrderItems(params: {
     filter?: string;
 } = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderItem[]>(__config, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<OrderItem[]>(__config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type GetRevenueResult = RevenueStatistics;
@@ -1494,7 +1508,7 @@ export async function getRevenue(params: {
     endDate?: string;
 } = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
     const __a = await __auth(["ApiKey"], __config);
-    return __request<RevenueStatistics>(__config, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<RevenueStatistics>(__config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type RegisterOAuth2ClientResult = OAuth2Client;
@@ -1516,5 +1530,5 @@ export type RegisterOAuth2ClientVariables = {
  * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
  */
 export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-    return __request<OAuth2Client>(__config, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+    return __request<OAuth2Client>(__config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
 }
diff --git a/packages/client-generator/examples/programmatic/src/api/client.ts b/packages/client-generator/examples/programmatic/src/api/client.ts
index a56ece2a42..241ef5fac7 100644
--- a/packages/client-generator/examples/programmatic/src/api/client.ts
+++ b/packages/client-generator/examples/programmatic/src/api/client.ts
@@ -419,18 +419,18 @@ export function isDessert(value: MenuItem): value is Dessert {
  * without re-deriving them at each call site.
  */
 export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu" },
-    createMenuItem: { method: "POST", path: "/menu" },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
-    listOrders: { method: "GET", path: "/orders" },
-    createOrder: { method: "POST", path: "/orders" },
-    getOrderById: { method: "GET", path: "/orders/{orderId}" },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
-    listOrderItems: { method: "GET", path: "/order-items" },
-    getRevenue: { method: "GET", path: "/revenue" },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
+    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
+    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
+    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
+    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
+    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
+    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
+    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
 } as const;
 
 /**
@@ -439,21 +439,35 @@ export const OPERATIONS = {
 export type OperationId = keyof typeof OPERATIONS;
 
 /**
- * Static metadata describing one operation: its HTTP method and path template.
+ * Static metadata describing one operation: its HTTP method, path template, and tags.
  */
 export type OperationMetadata = {
     readonly method: string;
     readonly path: string;
+    readonly tags: readonly string[];
 };
 
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
+
 let BASE = "https://api.cafe.redocly.com";
 
+/** Identity of the operation a request belongs to. Stable across path interpolation. */
+export type OperationContext = {
+    id: OperationId;
+    path: OperationPath;
+    tags: OperationTag[];
+};
+
 /** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
     headers: Record<string, string>;
     body?: unknown;
+    /** The operation being called: its id (operationId), path template, and tags. */
+    operation: OperationContext;
 };
 
 /**
@@ -711,7 +725,7 @@ function __buildUrl(config: ClientConfig, path: string, query?: Record<string, Q
     return qs ? `${url}?${qs}` : url;
 }
 
-async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
     response: Response;
     context: RequestContext;
 }> {
@@ -723,7 +737,7 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
     const middleware = __middleware(config);
     for (const mw of middleware)
         if (mw.onRequest)
@@ -821,9 +835,9 @@ async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unkn
     return response.blob();
 }
 
-async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
     const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, url, sendInit, body);
+    const { response, context } = await __send(config, op, url, sendInit, body);
     if (!response.ok) {
         const errorBody = await readError(response);
         let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
@@ -1103,7 +1117,7 @@ export async function listMenuItems(params: {
      */
     limit?: number;
 } = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-    return __request<MenuItemList>(__config, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
+    return __request<MenuItemList>(__config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
 }
 
 export type CreateMenuItemResult = MenuItem;
@@ -1121,7 +1135,7 @@ export type CreateMenuItemVariables = {
  */
 export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<MenuItem>(__config, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<MenuItem>(__config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type DeleteMenuItemResult = void;
@@ -1141,7 +1155,7 @@ export type DeleteMenuItemVariables = {
  */
 export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+    return __request<void>(__config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
 }
 
 export type GetMenuItemPhotoResult = Blob | string;
@@ -1173,7 +1187,7 @@ export async function getMenuItemPhoto(menuItemId: string, params: {
      */
     photoSize?: "thumbnail" | "medium" | "large";
 } = {}, init: RequestOptions = {}): Promise<Blob | string> {
-    return __request<Blob | string>(__config, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+    return __request<Blob | string>(__config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
 }
 
 export type ListOrdersResult = OrderList;
@@ -1289,7 +1303,7 @@ export async function listOrders(params: {
     search?: string;
 } = {}, init: RequestOptions = {}): Promise<OrderList> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderList>(__config, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<OrderList>(__config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type CreateOrderResult = Order;
@@ -1308,7 +1322,7 @@ export type CreateOrderVariables = {
  */
 export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<Order>(__config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type GetOrderByIdResult = Order;
@@ -1343,7 +1357,7 @@ export async function getOrderById(orderId: string, headers: {
     "X-Request-Id"?: string;
 } = {}, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+    return __request<Order>(__config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
 }
 
 export type DeleteOrderResult = void;
@@ -1364,7 +1378,7 @@ export type DeleteOrderVariables = {
  */
 export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+    return __request<void>(__config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
 }
 
 export type UpdateOrderResult = Order;
@@ -1392,7 +1406,7 @@ export async function updateOrder(orderId: string, body?: {
     status: OrderStatus;
 }, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<Order>(__config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type ListOrderItemsResult = OrderItem[];
@@ -1449,7 +1463,7 @@ export async function listOrderItems(params: {
     filter?: string;
 } = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderItem[]>(__config, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<OrderItem[]>(__config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type GetRevenueResult = RevenueStatistics;
@@ -1494,7 +1508,7 @@ export async function getRevenue(params: {
     endDate?: string;
 } = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
     const __a = await __auth(["ApiKey"], __config);
-    return __request<RevenueStatistics>(__config, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<RevenueStatistics>(__config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type RegisterOAuth2ClientResult = OAuth2Client;
@@ -1516,5 +1530,5 @@ export type RegisterOAuth2ClientVariables = {
  * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
  */
 export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-    return __request<OAuth2Client>(__config, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+    return __request<OAuth2Client>(__config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
 }
diff --git a/packages/client-generator/examples/service-class/src/api/client.ts b/packages/client-generator/examples/service-class/src/api/client.ts
index 41afcde2bc..0f1e428367 100644
--- a/packages/client-generator/examples/service-class/src/api/client.ts
+++ b/packages/client-generator/examples/service-class/src/api/client.ts
@@ -419,18 +419,18 @@ export function isDessert(value: MenuItem): value is Dessert {
  * without re-deriving them at each call site.
  */
 export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu" },
-    createMenuItem: { method: "POST", path: "/menu" },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
-    listOrders: { method: "GET", path: "/orders" },
-    createOrder: { method: "POST", path: "/orders" },
-    getOrderById: { method: "GET", path: "/orders/{orderId}" },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
-    listOrderItems: { method: "GET", path: "/order-items" },
-    getRevenue: { method: "GET", path: "/revenue" },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
+    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
+    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
+    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
+    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
+    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
+    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
+    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
 } as const;
 
 /**
@@ -439,21 +439,35 @@ export const OPERATIONS = {
 export type OperationId = keyof typeof OPERATIONS;
 
 /**
- * Static metadata describing one operation: its HTTP method and path template.
+ * Static metadata describing one operation: its HTTP method, path template, and tags.
  */
 export type OperationMetadata = {
     readonly method: string;
     readonly path: string;
+    readonly tags: readonly string[];
 };
 
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
+
 let BASE = "https://api.cafe.redocly.com";
 
+/** Identity of the operation a request belongs to. Stable across path interpolation. */
+export type OperationContext = {
+    id: OperationId;
+    path: OperationPath;
+    tags: OperationTag[];
+};
+
 /** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
     headers: Record<string, string>;
     body?: unknown;
+    /** The operation being called: its id (operationId), path template, and tags. */
+    operation: OperationContext;
 };
 
 /**
@@ -711,7 +725,7 @@ function __buildUrl(config: ClientConfig, path: string, query?: Record<string, Q
     return qs ? `${url}?${qs}` : url;
 }
 
-async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
     response: Response;
     context: RequestContext;
 }> {
@@ -723,7 +737,7 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
     const middleware = __middleware(config);
     for (const mw of middleware)
         if (mw.onRequest)
@@ -821,9 +835,9 @@ async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unkn
     return response.blob();
 }
 
-async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
     const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, url, sendInit, body);
+    const { response, context } = await __send(config, op, url, sendInit, body);
     if (!response.ok) {
         const errorBody = await readError(response);
         let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
@@ -1313,7 +1327,7 @@ export class Client {
          */
         limit?: number;
     } = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-        return __request<MenuItemList>(this.config, __buildUrl(this.config, `/menu`, params), { method: "GET", ...init });
+        return __request<MenuItemList>(this.config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(this.config, `/menu`, params), { method: "GET", ...init });
     }
     /**
      * Create menu item
@@ -1322,7 +1336,7 @@ export class Client {
      */
     async createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
         const __a = await __auth(["OAuth2"], this.config);
-        return __request<MenuItem>(this.config, __buildUrl(this.config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+        return __request<MenuItem>(this.config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(this.config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
     }
     /**
      * Delete a menu item
@@ -1331,7 +1345,7 @@ export class Client {
      */
     async deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
         const __a = await __auth(["OAuth2"], this.config);
-        return __request<void>(this.config, __buildUrl(this.config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+        return __request<void>(this.config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(this.config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
     }
     /**
      * Retrieve a menu item photo
@@ -1344,7 +1358,7 @@ export class Client {
          */
         photoSize?: "thumbnail" | "medium" | "large";
     } = {}, init: RequestOptions = {}): Promise<Blob | string> {
-        return __request<Blob | string>(this.config, __buildUrl(this.config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+        return __request<Blob | string>(this.config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(this.config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
     }
     /**
      * List all orders
@@ -1402,7 +1416,7 @@ export class Client {
         search?: string;
     } = {}, init: RequestOptions = {}): Promise<OrderList> {
         const __a = await __auth(["OAuth2"], this.config);
-        return __request<OrderList>(this.config, __buildUrl(this.config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+        return __request<OrderList>(this.config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(this.config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
     }
     /**
      * Create order
@@ -1412,7 +1426,7 @@ export class Client {
      */
     async createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
         const __a = await __auth(["OAuth2"], this.config);
-        return __request<Order>(this.config, __buildUrl(this.config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+        return __request<Order>(this.config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(this.config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
     }
     /**
      * Retrieve an order
@@ -1427,7 +1441,7 @@ export class Client {
         "X-Request-Id"?: string;
     } = {}, init: RequestOptions = {}): Promise<Order> {
         const __a = await __auth(["OAuth2"], this.config);
-        return __request<Order>(this.config, __buildUrl(this.config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+        return __request<Order>(this.config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(this.config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
     }
     /**
      * Delete an order
@@ -1437,7 +1451,7 @@ export class Client {
      */
     async deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
         const __a = await __auth(["OAuth2"], this.config);
-        return __request<void>(this.config, __buildUrl(this.config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+        return __request<void>(this.config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(this.config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
     }
     /**
      * Partially update an order
@@ -1449,7 +1463,7 @@ export class Client {
         status: OrderStatus;
     }, init: RequestOptions = {}): Promise<Order> {
         const __a = await __auth(["OAuth2"], this.config);
-        return __request<Order>(this.config, __buildUrl(this.config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+        return __request<Order>(this.config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(this.config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
     }
     /**
      * List all order items with menu item details
@@ -1478,7 +1492,7 @@ export class Client {
         filter?: string;
     } = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
         const __a = await __auth(["OAuth2"], this.config);
-        return __request<OrderItem[]>(this.config, __buildUrl(this.config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+        return __request<OrderItem[]>(this.config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(this.config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
     }
     /**
      * Get revenue statistics
@@ -1501,7 +1515,7 @@ export class Client {
         endDate?: string;
     } = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
         const __a = await __auth(["ApiKey"], this.config);
-        return __request<RevenueStatistics>(this.config, __buildUrl(this.config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+        return __request<RevenueStatistics>(this.config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(this.config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
     }
     /**
      * Create OAuth2 client
@@ -1514,6 +1528,6 @@ export class Client {
      * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
      */
     async registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-        return __request<OAuth2Client>(this.config, __buildUrl(this.config, `/oauth2/register`), { method: "POST", ...init }, body);
+        return __request<OAuth2Client>(this.config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(this.config, `/oauth2/register`), { method: "POST", ...init }, body);
     }
 }
diff --git a/packages/client-generator/examples/tanstack-query/src/api/client.ts b/packages/client-generator/examples/tanstack-query/src/api/client.ts
index a56ece2a42..241ef5fac7 100644
--- a/packages/client-generator/examples/tanstack-query/src/api/client.ts
+++ b/packages/client-generator/examples/tanstack-query/src/api/client.ts
@@ -419,18 +419,18 @@ export function isDessert(value: MenuItem): value is Dessert {
  * without re-deriving them at each call site.
  */
 export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu" },
-    createMenuItem: { method: "POST", path: "/menu" },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
-    listOrders: { method: "GET", path: "/orders" },
-    createOrder: { method: "POST", path: "/orders" },
-    getOrderById: { method: "GET", path: "/orders/{orderId}" },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
-    listOrderItems: { method: "GET", path: "/order-items" },
-    getRevenue: { method: "GET", path: "/revenue" },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
+    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
+    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
+    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
+    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
+    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
+    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
+    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
 } as const;
 
 /**
@@ -439,21 +439,35 @@ export const OPERATIONS = {
 export type OperationId = keyof typeof OPERATIONS;
 
 /**
- * Static metadata describing one operation: its HTTP method and path template.
+ * Static metadata describing one operation: its HTTP method, path template, and tags.
  */
 export type OperationMetadata = {
     readonly method: string;
     readonly path: string;
+    readonly tags: readonly string[];
 };
 
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
+
 let BASE = "https://api.cafe.redocly.com";
 
+/** Identity of the operation a request belongs to. Stable across path interpolation. */
+export type OperationContext = {
+    id: OperationId;
+    path: OperationPath;
+    tags: OperationTag[];
+};
+
 /** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
     headers: Record<string, string>;
     body?: unknown;
+    /** The operation being called: its id (operationId), path template, and tags. */
+    operation: OperationContext;
 };
 
 /**
@@ -711,7 +725,7 @@ function __buildUrl(config: ClientConfig, path: string, query?: Record<string, Q
     return qs ? `${url}?${qs}` : url;
 }
 
-async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
     response: Response;
     context: RequestContext;
 }> {
@@ -723,7 +737,7 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
     const middleware = __middleware(config);
     for (const mw of middleware)
         if (mw.onRequest)
@@ -821,9 +835,9 @@ async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unkn
     return response.blob();
 }
 
-async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
     const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, url, sendInit, body);
+    const { response, context } = await __send(config, op, url, sendInit, body);
     if (!response.ok) {
         const errorBody = await readError(response);
         let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
@@ -1103,7 +1117,7 @@ export async function listMenuItems(params: {
      */
     limit?: number;
 } = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-    return __request<MenuItemList>(__config, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
+    return __request<MenuItemList>(__config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
 }
 
 export type CreateMenuItemResult = MenuItem;
@@ -1121,7 +1135,7 @@ export type CreateMenuItemVariables = {
  */
 export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<MenuItem>(__config, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<MenuItem>(__config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type DeleteMenuItemResult = void;
@@ -1141,7 +1155,7 @@ export type DeleteMenuItemVariables = {
  */
 export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+    return __request<void>(__config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
 }
 
 export type GetMenuItemPhotoResult = Blob | string;
@@ -1173,7 +1187,7 @@ export async function getMenuItemPhoto(menuItemId: string, params: {
      */
     photoSize?: "thumbnail" | "medium" | "large";
 } = {}, init: RequestOptions = {}): Promise<Blob | string> {
-    return __request<Blob | string>(__config, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+    return __request<Blob | string>(__config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
 }
 
 export type ListOrdersResult = OrderList;
@@ -1289,7 +1303,7 @@ export async function listOrders(params: {
     search?: string;
 } = {}, init: RequestOptions = {}): Promise<OrderList> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderList>(__config, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<OrderList>(__config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type CreateOrderResult = Order;
@@ -1308,7 +1322,7 @@ export type CreateOrderVariables = {
  */
 export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<Order>(__config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type GetOrderByIdResult = Order;
@@ -1343,7 +1357,7 @@ export async function getOrderById(orderId: string, headers: {
     "X-Request-Id"?: string;
 } = {}, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+    return __request<Order>(__config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
 }
 
 export type DeleteOrderResult = void;
@@ -1364,7 +1378,7 @@ export type DeleteOrderVariables = {
  */
 export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+    return __request<void>(__config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
 }
 
 export type UpdateOrderResult = Order;
@@ -1392,7 +1406,7 @@ export async function updateOrder(orderId: string, body?: {
     status: OrderStatus;
 }, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<Order>(__config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type ListOrderItemsResult = OrderItem[];
@@ -1449,7 +1463,7 @@ export async function listOrderItems(params: {
     filter?: string;
 } = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderItem[]>(__config, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<OrderItem[]>(__config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type GetRevenueResult = RevenueStatistics;
@@ -1494,7 +1508,7 @@ export async function getRevenue(params: {
     endDate?: string;
 } = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
     const __a = await __auth(["ApiKey"], __config);
-    return __request<RevenueStatistics>(__config, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<RevenueStatistics>(__config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type RegisterOAuth2ClientResult = OAuth2Client;
@@ -1516,5 +1530,5 @@ export type RegisterOAuth2ClientVariables = {
  * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
  */
 export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-    return __request<OAuth2Client>(__config, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+    return __request<OAuth2Client>(__config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
 }
diff --git a/packages/client-generator/examples/zod/src/api/client.ts b/packages/client-generator/examples/zod/src/api/client.ts
index a56ece2a42..241ef5fac7 100644
--- a/packages/client-generator/examples/zod/src/api/client.ts
+++ b/packages/client-generator/examples/zod/src/api/client.ts
@@ -419,18 +419,18 @@ export function isDessert(value: MenuItem): value is Dessert {
  * without re-deriving them at each call site.
  */
 export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu" },
-    createMenuItem: { method: "POST", path: "/menu" },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
-    listOrders: { method: "GET", path: "/orders" },
-    createOrder: { method: "POST", path: "/orders" },
-    getOrderById: { method: "GET", path: "/orders/{orderId}" },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
-    listOrderItems: { method: "GET", path: "/order-items" },
-    getRevenue: { method: "GET", path: "/revenue" },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
+    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
+    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
+    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
+    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
+    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
+    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
+    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
 } as const;
 
 /**
@@ -439,21 +439,35 @@ export const OPERATIONS = {
 export type OperationId = keyof typeof OPERATIONS;
 
 /**
- * Static metadata describing one operation: its HTTP method and path template.
+ * Static metadata describing one operation: its HTTP method, path template, and tags.
  */
 export type OperationMetadata = {
     readonly method: string;
     readonly path: string;
+    readonly tags: readonly string[];
 };
 
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
+
 let BASE = "https://api.cafe.redocly.com";
 
+/** Identity of the operation a request belongs to. Stable across path interpolation. */
+export type OperationContext = {
+    id: OperationId;
+    path: OperationPath;
+    tags: OperationTag[];
+};
+
 /** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
     headers: Record<string, string>;
     body?: unknown;
+    /** The operation being called: its id (operationId), path template, and tags. */
+    operation: OperationContext;
 };
 
 /**
@@ -711,7 +725,7 @@ function __buildUrl(config: ClientConfig, path: string, query?: Record<string, Q
     return qs ? `${url}?${qs}` : url;
 }
 
-async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
     response: Response;
     context: RequestContext;
 }> {
@@ -723,7 +737,7 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
     const middleware = __middleware(config);
     for (const mw of middleware)
         if (mw.onRequest)
@@ -821,9 +835,9 @@ async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unkn
     return response.blob();
 }
 
-async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
     const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, url, sendInit, body);
+    const { response, context } = await __send(config, op, url, sendInit, body);
     if (!response.ok) {
         const errorBody = await readError(response);
         let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
@@ -1103,7 +1117,7 @@ export async function listMenuItems(params: {
      */
     limit?: number;
 } = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-    return __request<MenuItemList>(__config, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
+    return __request<MenuItemList>(__config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
 }
 
 export type CreateMenuItemResult = MenuItem;
@@ -1121,7 +1135,7 @@ export type CreateMenuItemVariables = {
  */
 export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<MenuItem>(__config, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<MenuItem>(__config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type DeleteMenuItemResult = void;
@@ -1141,7 +1155,7 @@ export type DeleteMenuItemVariables = {
  */
 export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+    return __request<void>(__config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
 }
 
 export type GetMenuItemPhotoResult = Blob | string;
@@ -1173,7 +1187,7 @@ export async function getMenuItemPhoto(menuItemId: string, params: {
      */
     photoSize?: "thumbnail" | "medium" | "large";
 } = {}, init: RequestOptions = {}): Promise<Blob | string> {
-    return __request<Blob | string>(__config, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+    return __request<Blob | string>(__config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
 }
 
 export type ListOrdersResult = OrderList;
@@ -1289,7 +1303,7 @@ export async function listOrders(params: {
     search?: string;
 } = {}, init: RequestOptions = {}): Promise<OrderList> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderList>(__config, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<OrderList>(__config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type CreateOrderResult = Order;
@@ -1308,7 +1322,7 @@ export type CreateOrderVariables = {
  */
 export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<Order>(__config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type GetOrderByIdResult = Order;
@@ -1343,7 +1357,7 @@ export async function getOrderById(orderId: string, headers: {
     "X-Request-Id"?: string;
 } = {}, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+    return __request<Order>(__config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
 }
 
 export type DeleteOrderResult = void;
@@ -1364,7 +1378,7 @@ export type DeleteOrderVariables = {
  */
 export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+    return __request<void>(__config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
 }
 
 export type UpdateOrderResult = Order;
@@ -1392,7 +1406,7 @@ export async function updateOrder(orderId: string, body?: {
     status: OrderStatus;
 }, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<Order>(__config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type ListOrderItemsResult = OrderItem[];
@@ -1449,7 +1463,7 @@ export async function listOrderItems(params: {
     filter?: string;
 } = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderItem[]>(__config, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<OrderItem[]>(__config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type GetRevenueResult = RevenueStatistics;
@@ -1494,7 +1508,7 @@ export async function getRevenue(params: {
     endDate?: string;
 } = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
     const __a = await __auth(["ApiKey"], __config);
-    return __request<RevenueStatistics>(__config, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<RevenueStatistics>(__config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type RegisterOAuth2ClientResult = OAuth2Client;
@@ -1516,5 +1530,5 @@ export type RegisterOAuth2ClientVariables = {
  * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
  */
 export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-    return __request<OAuth2Client>(__config, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+    return __request<OAuth2Client>(__config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
 }
diff --git a/packages/client-generator/scripts/regenerate-examples.mjs b/packages/client-generator/scripts/regenerate-examples.mjs
index ac76970b1e..4d76c5ab37 100644
--- a/packages/client-generator/scripts/regenerate-examples.mjs
+++ b/packages/client-generator/scripts/regenerate-examples.mjs
@@ -12,6 +12,8 @@ const cli = join(repoRoot, 'packages/cli/lib/index.js');
 const tsx = join(repoRoot, 'node_modules/.bin/tsx');
 const examples = [
   'fetch-functions',
+  'customization',
+  'baked-setup',
   'service-class',
   'zod',
   'mock',
diff --git a/packages/client-generator/scripts/typecheck-examples.mjs b/packages/client-generator/scripts/typecheck-examples.mjs
index 7e84943937..ed66519711 100644
--- a/packages/client-generator/scripts/typecheck-examples.mjs
+++ b/packages/client-generator/scripts/typecheck-examples.mjs
@@ -12,6 +12,8 @@ const tsc = join(repoRoot, 'node_modules/.bin/tsc');
 const examplesDir = join(pkgRoot, 'examples');
 const examples = [
   'fetch-functions',
+  'customization',
+  'baked-setup',
   'service-class',
   'zod',
   'tanstack-query',
diff --git a/packages/client-generator/src/__tests__/runtime-contract.test.ts b/packages/client-generator/src/__tests__/runtime-contract.test.ts
new file mode 100644
index 0000000000..68e1a39afb
--- /dev/null
+++ b/packages/client-generator/src/__tests__/runtime-contract.test.ts
@@ -0,0 +1,26 @@
+import { defineClientSetup } from '../runtime-contract.js';
+import { renderRuntime } from '../emitters/runtime.js';
+
+describe('defineClientSetup', () => {
+  it('returns its argument unchanged (identity helper)', () => {
+    const setup = { config: { baseUrl: 'https://x' }, middleware: [] };
+    expect(defineClientSetup(setup)).toBe(setup);
+  });
+});
+
+describe('contract types stay in lockstep with the emitted runtime', () => {
+  // Drift alarm: these spec-independent shapes are emitted verbatim into every client.
+  // If one changes here, update src/runtime-contract.ts to match (and vice-versa). The
+  // emitted types are re-printed by the TS printer (multi-line), so we assert on the
+  // distinctive field signatures rather than a one-line form.
+  const out = renderRuntime('https://x', false, false);
+  it.each([
+    ['OperationContext', 'export type OperationContext = {'],
+    ['OperationContext.tags', 'tags: string[];'],
+    ['RequestContext.operation', 'operation: OperationContext;'],
+    ['Middleware.onRequest', 'onRequest?: (ctx: RequestContext) => void | Promise<void>;'],
+    ['RetryStrategy', "export type RetryStrategy = 'fixed' | 'exponential';"],
+  ])('emits %s', (_name, signature) => {
+    expect(out).toContain(signature);
+  });
+});
diff --git a/packages/client-generator/src/config.ts b/packages/client-generator/src/config.ts
index af22321de1..a732dd8057 100644
--- a/packages/client-generator/src/config.ts
+++ b/packages/client-generator/src/config.ts
@@ -53,4 +53,10 @@ export type Config = {
    * `generators` by `name`. Authored with `defineGenerator` from `@redocly/client-generator/plugin`.
    */
   customGenerators?: CustomGenerator[];
+  /**
+   * Path to a publisher setup module (`export default defineClientSetup({ config, middleware })`)
+   * baked into the generated client, so a published SDK ships its request/response defaults built
+   * in. Resolved against the config dir. Works across all output modes and both facades.
+   */
+  setup?: string;
 };
diff --git a/packages/client-generator/src/emitters/__tests__/client.test.ts b/packages/client-generator/src/emitters/__tests__/client.test.ts
index c8c5b0479c..540cf2514c 100644
--- a/packages/client-generator/src/emitters/__tests__/client.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/client.test.ts
@@ -1,7 +1,76 @@
 import type { ApiModel, OperationModel } from '../../ir/model.js';
-import { emitModules, emitSingleFile } from '../client.js';
+import { emitModules, emitSingleFile, setupApply } from '../client.js';
 import { apiModel, emitWithOp, namedSchema, operation, param } from './fixtures.js';
 
+describe('typed ctx.operation (OperationContext narrowing)', () => {
+  const tagged = apiModel({
+    services: [
+      { name: 'Default', operations: [operation({ name: 'listPets', path: '/pets', tags: ['Pets'] })] },
+    ],
+  });
+
+  it('single-file narrows OperationContext to the operation unions', () => {
+    const out = emitSingleFile(tagged, {});
+    // The TS printer expands the type literal across lines.
+    expect(out).toContain('id: OperationId;');
+    expect(out).toContain('path: OperationPath;');
+    expect(out).toContain('tags: OperationTag[];');
+  });
+
+  it('multi-file http module type-imports the operation unions from schemas', () => {
+    const mods = emitModules(tagged, {});
+    expect(mods.http('client')).toContain(
+      'import type { OperationId, OperationPath, OperationTag } from "./client.schemas.js";'
+    );
+  });
+
+  it('falls back to all-string OperationContext (and no import) when there are no operations', () => {
+    const out = emitSingleFile(apiModel(), {});
+    expect(out).toContain('id: string;');
+    expect(out).toContain('tags: string[];');
+    expect(out).not.toContain('id: OperationId;');
+    expect(emitModules(apiModel(), {}).http('client')).not.toContain('from "./client.schemas.js"');
+  });
+});
+
+describe('setupApply — baked publisher setup (--setup)', () => {
+  const EXPR = '{ config: { baseUrl: "https://x" }, middleware: [] }';
+
+  it('functions facade: declares __redoclySetup then applies it via configure/use', () => {
+    const out = setupApply(EXPR, 'functions', false);
+    expect(out).toContain(
+      'const __redoclySetup: { config?: ClientConfig; middleware?: Middleware[] } = ' + EXPR + ';'
+    );
+    expect(out).toContain('configure(__redoclySetup.config ?? {});');
+    expect(out).toContain('use(...(__redoclySetup.middleware ?? []));');
+    expect(out).not.toContain('export const');
+  });
+
+  it('service-class facade: declaration only (no configure/use); exported when asked', () => {
+    const out = setupApply(EXPR, 'service-class', true);
+    expect(out).toContain('export const __redoclySetup');
+    expect(out).not.toContain('configure(');
+    expect(out).not.toContain('use(...');
+  });
+
+  it('single-file service-class constructor merges __redoclySetup into this.config', () => {
+    const out = emitSingleFile(apiModel(), { facade: 'service-class', setup: EXPR });
+    expect(out).toContain('...__redoclySetup.config');
+    expect(out).toContain('this.config = {');
+  });
+
+  it('single-file functions facade appends the configure/use application', () => {
+    const out = emitSingleFile(apiModel(), { setup: EXPR });
+    expect(out).toContain('configure(__redoclySetup.config ?? {});');
+  });
+
+  it('multi-file: the http module carries the baked setup', () => {
+    const mods = emitModules(apiModel(), { setup: EXPR });
+    expect(mods.http('client')).toContain('const __redoclySetup');
+    expect(mods.http('client')).toContain('configure(__redoclySetup.config ?? {});');
+  });
+});
+
 /** An SSE operation streaming `Message` events (event-stream success + itemSchema $ref). */
 function sseOperation(overrides: Partial<OperationModel> = {}): OperationModel {
   return operation({
@@ -98,7 +167,7 @@ describe('emitSingleFile — service-class facade', () => {
     const cls = emitModules(model, { facade: 'service-class' });
     // The facade changes only the endpoints; the shared http (runtime + auth) and
     // schemas (types + guards) modules are byte-identical across facades.
-    expect(cls.http).toBe(fns.http);
+    expect(cls.http('client')).toBe(fns.http('client'));
     expect(cls.schemas).toBe(fns.schemas);
   });
 });
@@ -120,6 +189,11 @@ describe('extension contract (ClientConfig)', () => {
     expect(out).toContain('return __request<void>(__config,');
   });
 
+  it('passes the operation { id, path, tags } literal into the runtime call', () => {
+    const out = emitWithOp({ name: 'ping', path: '/p' });
+    expect(out).toContain('__request<void>(__config, { id: "ping", path: "/p", tags: [] }');
+  });
+
   it('runtime resolves config.baseUrl ?? BASE and config.fetch ?? fetch', () => {
     const out = emitSingleFile(apiModel());
     expect(out).toContain('(config.baseUrl ?? BASE)');
@@ -199,8 +273,8 @@ describe('renderRuntime contents (smoke)', () => {
 describe('emitModules — writer-facing module interface', () => {
   it('exposes the http module (runtime + auth helpers exported) and the endpoints', () => {
     const m = emitModules(apiModel({ services: [{ name: 'Default', operations: [operation()] }] }));
-    expect(m.http).toContain('export function __buildUrl(');
-    expect(m.http).toContain('export async function __request<T>(');
+    expect(m.http('client')).toContain('export function __buildUrl(');
+    expect(m.http('client')).toContain('export async function __request<T>(');
     expect(m.operations).toContain('export async function op(');
   });
 
@@ -261,7 +335,7 @@ describe('emitModules — writer-facing module interface', () => {
     const m = emitModules(apiModel());
     const reexport = m.publicReexport('client');
     expect(reexport).toContain(
-      'export { ApiError, configure, setBaseUrl } from "./client.http.js";'
+      'export { ApiError, configure, setBaseUrl, use } from "./client.http.js";'
     );
     expect(reexport).toContain('export type {');
   });
@@ -284,7 +358,7 @@ describe('SSE plumbing (single + multi-file)', () => {
 
   it('emitModules http exports the __sse generator for an SSE model', () => {
     const m = emitModules(sseModel());
-    expect(m.http).toContain('export async function* __sse');
+    expect(m.http('client')).toContain('export async function* __sse');
   });
 
   it('publicReexport re-exports ServerSentEvent + SseOptions only for an SSE model', () => {
diff --git a/packages/client-generator/src/emitters/__tests__/operations.test.ts b/packages/client-generator/src/emitters/__tests__/operations.test.ts
index 24aa72b999..2c818906c5 100644
--- a/packages/client-generator/src/emitters/__tests__/operations.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/operations.test.ts
@@ -8,6 +8,28 @@ import { emitSingleFile } from '../client.js';
 import { renderOperationsBlock, renderOperationsMeta, serviceClassName } from '../operations.js';
 import { SCALAR, apiModel, emitWithOp, namedSchema, operation, param } from './fixtures.js';
 
+describe('OPERATIONS carries tags + derived path/tag unions', () => {
+  it('emits tags on each entry and the derived OperationPath/OperationTag', () => {
+    const out = renderOperationsMeta([
+      operation({ name: 'listPets', method: 'get', path: '/pets', tags: ['Pets'] }),
+    ]);
+    expect(out).toContain('tags: ["Pets"]');
+    expect(out).toContain('export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];');
+    expect(out).toContain(
+      'export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];'
+    );
+    expect(out).toContain('readonly tags: readonly string[];');
+  });
+
+  it('omits OperationTag when no operation has a tag (avoids never)', () => {
+    const out = renderOperationsMeta([
+      operation({ name: 'ping', method: 'get', path: '/p', tags: [] }),
+    ]);
+    expect(out).toContain('tags: []');
+    expect(out).not.toContain('export type OperationTag');
+  });
+});
+
 describe('serviceClassName', () => {
   it('PascalCases the label and appends Service', () => {
     expect(serviceClassName('products')).toBe('ProductsService');
@@ -602,7 +624,7 @@ describe('auth — await __auth, spread headers, merge query', () => {
     expect(out).not.toContain('__a');
     expect(out).not.toContain('__auth');
     expect(out).toContain(
-      'return __request<void>(__config, __buildUrl(__config, `/p`), { method: "GET", ...init }, undefined, "void");'
+      'return __request<void>(__config, { id: "op", path: "/p", tags: [] }, __buildUrl(__config, `/p`), { method: "GET", ...init }, undefined, "void");'
     );
   });
 });
@@ -1850,9 +1872,11 @@ describe('renderOperationsMeta — OPERATIONS metadata map', () => {
       }),
     ]);
     expect(out).toContain(
-      'getProjectById: { method: "GET", path: "/orgs/{orgId}/projects/{projectId}" }'
+      'getProjectById: { method: "GET", path: "/orgs/{orgId}/projects/{projectId}", tags: [] }'
+    );
+    expect(out).toContain(
+      'createProject: { method: "POST", path: "/orgs/{orgId}/projects", tags: [] }'
     );
-    expect(out).toContain('createProject: { method: "POST", path: "/orgs/{orgId}/projects" }');
   });
 
   it('emits the OperationId and OperationMetadata helper types', () => {
@@ -1861,13 +1885,13 @@ describe('renderOperationsMeta — OPERATIONS metadata map', () => {
     expect(out).toContain('} as const;');
     expect(out).toContain('export type OperationId = keyof typeof OPERATIONS;');
     expect(out).toMatch(
-      /export type OperationMetadata = \{\n {4}readonly method: string;\n {4}readonly path: string;\n\};/
+      /export type OperationMetadata = \{\n {4}readonly method: string;\n {4}readonly path: string;\n {4}readonly tags: readonly string\[\];\n\};/
     );
   });
 
   it('quotes operationIds that are not bare identifiers', () => {
     const out = renderOperationsMeta([operation({ name: 'weird-op', path: '/w' })]);
-    expect(out).toContain('"weird-op": { method: "GET", path: "/w" }');
+    expect(out).toContain('"weird-op": { method: "GET", path: "/w", tags: [] }');
   });
 
   it('is included in single-file output between the type guards and the runtime', () => {
@@ -1877,7 +1901,7 @@ describe('renderOperationsMeta — OPERATIONS metadata map', () => {
       path: '/things',
     });
     expect(out).toContain('export const OPERATIONS = {');
-    expect(out).toContain('listThings: { method: "GET", path: "/things" }');
+    expect(out).toContain('listThings: { method: "GET", path: "/things", tags: [] }');
     // Metadata is declarative data, so it precedes the runtime (`let BASE`).
     expect(out.indexOf('export const OPERATIONS = {')).toBeLessThan(out.indexOf('let BASE ='));
   });
diff --git a/packages/client-generator/src/emitters/__tests__/runtime.test.ts b/packages/client-generator/src/emitters/__tests__/runtime.test.ts
index eb36b59439..b1f67ff07a 100644
--- a/packages/client-generator/src/emitters/__tests__/runtime.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/runtime.test.ts
@@ -2,6 +2,41 @@ import { renderRuntime, runtimeStatements, PUBLIC_RUNTIME_TYPES } from '../runti
 import { printStatements } from '../ts.js';
 
 describe('renderRuntime — shared core + terminal selection', () => {
+  describe('operation context', () => {
+    it('emits OperationContext, the operation field, and threads op through __send', () => {
+      const out = renderRuntime('https://api.example.com', false, false);
+      expect(out).toContain('export type OperationContext = {');
+      expect(out).toContain('tags: string[];');
+      expect(out).toContain('operation: op');
+      expect(out).toContain('op: OperationContext,');
+    });
+
+    it('lists OperationContext in PUBLIC_RUNTIME_TYPES', () => {
+      expect(PUBLIC_RUNTIME_TYPES).toContain('OperationContext');
+    });
+
+    it('narrows OperationContext field types when given operation-union types', () => {
+      const out = renderRuntime('https://x', false, false, 'throw', false, false, false, {
+        id: 'OperationId',
+        path: 'OperationPath',
+        tags: 'OperationTag[]',
+      });
+      expect(out).toContain('id: OperationId;');
+      expect(out).toContain('path: OperationPath;');
+      expect(out).toContain('tags: OperationTag[];');
+    });
+
+    it('serializes the body from context.body after the onRequest chain', () => {
+      const out = renderRuntime('https://api.example.com', false, false);
+      const sendStart = out.indexOf('async function __send(');
+      const onReq = out.indexOf('mw.onRequest(context)', sendStart);
+      const serialize = out.indexOf('payload = JSON.stringify(value)', sendStart);
+      expect(onReq).toBeGreaterThan(-1);
+      // Serialization must happen after the onRequest hook so body mutations are sent.
+      expect(serialize).toBeGreaterThan(onReq);
+    });
+  });
+
   describe('throw mode (default)', () => {
     it('emits __send, __parse, and __request<T> and no result terminal', () => {
       const out = renderRuntime('https://api.example.com', false, false);
@@ -178,12 +213,12 @@ describe('renderRuntime — shared core + terminal selection', () => {
       [
         'throw',
         renderRuntime('https://api.example.com', false, false, 'throw'),
-        'const { response, context } = await __send(config, url, sendInit, body);',
+        'const { response, context } = await __send(config, op, url, sendInit, body);',
       ],
       [
         'result',
         renderRuntime('https://api.example.com', false, true, 'result'),
-        'const { response } = await __send(config, url, sendInit, body);',
+        'const { response } = await __send(config, op, url, sendInit, body);',
       ],
     ];
     it.each(terminals)(
diff --git a/packages/client-generator/src/emitters/__tests__/setup-bake.test.ts b/packages/client-generator/src/emitters/__tests__/setup-bake.test.ts
new file mode 100644
index 0000000000..d272d6d2bc
--- /dev/null
+++ b/packages/client-generator/src/emitters/__tests__/setup-bake.test.ts
@@ -0,0 +1,49 @@
+import { bakeSetup } from '../setup-bake.js';
+
+const FILE = `
+import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
+export default defineClientSetup({
+  config: { baseUrl: 'https://api.acme.com', retry: { retries: 3 } },
+  middleware: [{ onRequest: (ctx: RequestContext) => { ctx.headers['X-Acme'] = '1'; } }],
+});
+`;
+
+describe('bakeSetup', () => {
+  it('returns the setup expression with the package import stripped', () => {
+    const out = bakeSetup(FILE);
+    expect(out).not.toContain("from '@redocly/client-generator'");
+    expect(out).not.toContain('defineClientSetup');
+    expect(out).toContain("baseUrl: 'https://api.acme.com'");
+    expect(out).toContain("ctx.headers['X-Acme'] = '1'");
+    // No facade-specific application — that is the emitter's job.
+    expect(out).not.toContain('configure(');
+    expect(out).not.toContain('use(');
+  });
+
+  it('rejects a setup file importing anything but @redocly/client-generator', () => {
+    expect(() => bakeSetup(`import x from 'axios';\nexport default x;`)).toThrow(
+      /may only import from "@redocly\/client-generator"/
+    );
+  });
+
+  it('errors when there is no default export', () => {
+    expect(() => bakeSetup(`const x = 1;`)).toThrow(/export default/);
+  });
+
+  it('accepts a bare default-exported object (no defineClientSetup wrapper)', () => {
+    const out = bakeSetup(`export default { config: { baseUrl: 'https://x' } };`);
+    expect(out).toBe("{ config: { baseUrl: 'https://x' } }");
+  });
+
+  it('wraps file-level helper declarations in an IIFE so they are preserved and scoped', () => {
+    const out = bakeSetup(
+      `import { defineClientSetup } from '@redocly/client-generator';
+const VERSION = '9.9';
+export default defineClientSetup({ config: { headers: { 'X-V': VERSION } } });`
+    );
+    expect(out.startsWith('(() => {')).toBe(true);
+    expect(out).toContain("const VERSION = '9.9'");
+    expect(out).toContain("'X-V': VERSION");
+    expect(out).toContain('return ');
+  });
+});
diff --git a/packages/client-generator/src/emitters/client.ts b/packages/client-generator/src/emitters/client.ts
index dd57407fc6..f63b2677d8 100644
--- a/packages/client-generator/src/emitters/client.ts
+++ b/packages/client-generator/src/emitters/client.ts
@@ -9,7 +9,7 @@ import {
   operationsMetaStatements,
   serviceClassName,
 } from './operations.js';
-import { PUBLIC_RUNTIME_TYPES, runtimeStatements } from './runtime.js';
+import { PUBLIC_RUNTIME_TYPES, runtimeStatements, type OperationContextTypes } from './runtime.js';
 import { isSseOp, sseFragmentName } from './sse.js';
 import { splitLines } from './support.js';
 import { escapeJsDoc, printNodes, printStatements, ts } from './ts.js';
@@ -82,6 +82,11 @@ export type EmitOptions = {
   mockData?: 'baked' | 'faker';
   /** Seed for faker-mode mocks: emits a top-level `faker.seed(<n>)` so runs reproduce. */
   mockSeed?: number;
+  /**
+   * A pre-baked publisher setup block (from `bakeSetup`) appended at the end of the single-file
+   * client, after the runtime + `configure`/`use` definitions. Absent when no `--setup` is given.
+   */
+  setup?: string;
 };
 
 /**
@@ -106,6 +111,32 @@ type ClientFragments = {
   operations: ts.Statement[];
 };
 
+/**
+ * The operation-union wiring derived from the model: `opCtx` narrows the runtime's `OperationContext`
+ * field types, and `opNames` is the type-only import list the http module pulls from the schemas
+ * module in multi-file layouts. Falls back to all-`string` (and no import) when the spec has no
+ * operations; tags fall back to `string[]` (no `OperationTag`) when no operation is tagged.
+ */
+function operationUnionInfo(allOps: OperationModel[]): {
+  opCtx: OperationContextTypes;
+  opNames: string[];
+} {
+  const hasOps = allOps.length > 0;
+  const hasTags = allOps.some((op) => op.tags.length > 0);
+  return {
+    opCtx: {
+      id: hasOps ? 'OperationId' : 'string',
+      path: hasOps ? 'OperationPath' : 'string',
+      tags: hasTags ? 'OperationTag[]' : 'string[]',
+    },
+    opNames: hasOps
+      ? hasTags
+        ? ['OperationId', 'OperationPath', 'OperationTag']
+        : ['OperationId', 'OperationPath']
+      : [],
+  };
+}
+
 function renderFragments(
   model: ApiModel,
   options: EmitOptions,
@@ -142,7 +173,8 @@ function renderFragments(
       errorMode,
       needsSse,
       authConfig,
-      needsMultipart
+      needsMultipart,
+      operationUnionInfo(allOps).opCtx
     ),
     auth: authStatements(model.securitySchemes, needsAuthHelper, exportHelpers),
     operations: operationsBlockStatements(allOps, {
@@ -153,6 +185,7 @@ function renderFragments(
       dateType,
       queryAuthKeys: queryAuthKeysFor(model.securitySchemes),
       schemaNames: new Set(model.schemas.map((s) => s.name)),
+      bakedSetup: !!options.setup,
     }),
   };
 }
@@ -170,9 +203,28 @@ export function emitSingleFile(model: ApiModel, options: EmitOptions = {}): stri
       ...f.auth,
       ...f.operations,
     ]),
+    // Publisher setup baked in last, so `configure`/`use` are already defined when it runs.
+    ...(options.setup ? [setupApply(options.setup, options.facade ?? 'functions', false)] : []),
   ]);
 }
 
+/**
+ * Render the baked publisher setup (`--setup`). `setupExpr` is the neutral expression from
+ * `bakeSetup`; it becomes a module-scoped `const __redoclySetup`. Applied per facade:
+ * - `functions`: also call `configure`/`use` so the global config + middleware chain are set.
+ * - `service-class`: declaration only — the generated class constructor merges `__redoclySetup`
+ *   into each instance's `config`. `exported` re-exports it from the http module so per-tag service
+ *   classes in multi-file layouts can import it.
+ */
+export function setupApply(setupExpr: string, facade: Facade, exported: boolean): string {
+  // Annotated so `.config`/`.middleware` are always accessible (a setup with only `config` would
+  // otherwise infer a type without a `middleware` property, breaking the service-class merge).
+  const decl = `${exported ? 'export ' : ''}const __redoclySetup: { config?: ClientConfig; middleware?: Middleware[] } = ${setupExpr};`;
+  const header = '// ─── Baked-in setup (--setup) ───';
+  if (facade === 'service-class') return `${header}\n${decl}`;
+  return `${header}\n${decl}\nconfigure(__redoclySetup.config ?? {});\nuse(...(__redoclySetup.middleware ?? []));`;
+}
+
 /**
  * Assemble file content from a header banner and a printed body: the leading
  * `// Generated by …` comment and the `/** title *​/` block are structural
@@ -193,8 +245,12 @@ function banner(sections: string[]): string {
 export type ClientModules = {
   /** The generated-by header comment, prepended to every emitted file. */
   header: string;
-  /** Shared http module: runtime + auth state + public setters. */
-  http: string;
+  /**
+   * Shared http module: runtime + auth state + public setters. A method (not a string) because the
+   * narrowed `OperationContext` type-imports `OperationId`/`OperationPath`/`OperationTag` from the
+   * `<stem>.schemas` module, so the content depends on the writer's chosen stem.
+   */
+  http(stem: string): string;
   /** Shared schemas module: model types + type guards + operation metadata. */
   schemas: string;
   /** Whether the schemas module exports anything (else its file + re-export are skipped). */
@@ -231,10 +287,12 @@ export function emitModules(model: ApiModel, options: EmitOptions = {}): ClientM
   const dateType: DateType = options.dateType ?? 'string';
   const queryAuthKeys = queryAuthKeysFor(model.securitySchemes);
   const schemaNames = new Set(model.schemas.map((s) => s.name));
-  const hasSse = model.services.flatMap((s) => s.operations).some(isSseOp);
+  const allOps = model.services.flatMap((s) => s.operations);
+  const hasSse = allOps.some(isSseOp);
+  const { opNames } = operationUnionInfo(allOps);
   return {
     header: HEADER,
-    http: httpModuleContent(f),
+    http: (stem) => httpModuleContent(f, options, stem, opNames),
     schemas: schemasModuleContent(f),
     hasSchemas: hasSchemas(f),
     operations: printStatements(f.operations),
@@ -248,13 +306,14 @@ export function emitModules(model: ApiModel, options: EmitOptions = {}): ClientM
           dateType,
           queryAuthKeys,
           schemaNames,
+          bakedSetup: !!options.setup,
           // Per-tag SSE aggregates carry the class-derived name so the barrel can
           // re-merge them without collisions.
           sseExportName: sseFragmentName(className),
         })
       ),
     endpointImports: (ops, stem, prefix) =>
-      printNodes(endpointImportNodes(ops, stem, facade, errorMode, prefix)),
+      printNodes(endpointImportNodes(ops, stem, facade, errorMode, prefix, !!options.setup)),
     publicReexport: (stem) =>
       printNodes(publicReexportNodes(stem, model.securitySchemes, options.errorMode, hasSse)),
     sseBarrel: (groups) => {
@@ -284,8 +343,24 @@ export function moduleSpecifier(stem: string, kind: 'schemas' | 'http', prefix =
 }
 
 /** The shared http module's content: runtime + auth state + public setters. */
-function httpModuleContent(f: ClientFragments): string {
-  return banner([HEADER, printStatements([...f.runtime, ...f.auth])]);
+function httpModuleContent(
+  f: ClientFragments,
+  options: EmitOptions,
+  stem: string,
+  opNames: string[]
+): string {
+  const facade = options.facade ?? 'functions';
+  // The narrowed `OperationContext` references the operation unions, which live in the schemas
+  // module; pull them in type-only (erased, zero-dep, acyclic). Empty when the spec has no operations.
+  const importLine =
+    opNames.length > 0
+      ? `import type { ${opNames.join(', ')} } from "${moduleSpecifier(stem, 'schemas')}";`
+      : '';
+  // The baked setup lives in the shared http module: `configure`/`use` are defined here, and every
+  // layout's entry imports it, so it runs on load. Service-class exports `__redoclySetup` so each
+  // per-tag class module can import and merge it.
+  const setup = options.setup ? [setupApply(options.setup, facade, facade === 'service-class')] : [];
+  return banner([HEADER, importLine, printStatements([...f.runtime, ...f.auth]), ...setup].filter(Boolean));
 }
 
 /** The shared schemas module's content: model types + type guards + operation metadata. */
@@ -339,11 +414,14 @@ function endpointImportNodes(
   stem: string,
   facade: Facade,
   errorMode: 'throw' | 'result',
-  prefix = './'
+  prefix = './',
+  bakedSetup = false
 ): ts.ImportDeclaration[] {
   const typeNames = typeNamesFor(ops, errorMode);
   const httpValues = helperNamesFor(ops, errorMode);
   if (facade === 'functions') httpValues.push('__config');
+  // A service-class constructor merges the baked `__redoclySetup` (exported from the http module).
+  if (facade === 'service-class' && bakedSetup) httpValues.push('__redoclySetup');
   httpValues.sort();
   // The class constructor needs the `ClientConfig` *type*; pull it from the http
   // module via an inline `type` modifier so the value/type imports stay one
@@ -393,7 +471,7 @@ function publicReexportNodes(
   errorMode: 'throw' | 'result' | undefined,
   hasSse: boolean
 ): ts.ExportDeclaration[] {
-  const values = ['ApiError', 'configure', 'setBaseUrl', ...authSetterNames(schemes)].sort();
+  const values = ['ApiError', 'configure', 'use', 'setBaseUrl', ...authSetterNames(schemes)].sort();
   const types = [
     ...PUBLIC_RUNTIME_TYPES,
     ...authTypeNames(schemes),
diff --git a/packages/client-generator/src/emitters/operations.ts b/packages/client-generator/src/emitters/operations.ts
index 128f680b68..75558e9357 100644
--- a/packages/client-generator/src/emitters/operations.ts
+++ b/packages/client-generator/src/emitters/operations.ts
@@ -13,7 +13,7 @@ import {
 } from './operation-types.js';
 import { isSseOp, partitionOps, sseDataKind, sseEventType } from './sse.js';
 import { pascalCase, splitLines } from './support.js';
-import { jsdoc, printStatements, ts } from './ts.js';
+import { jsdoc, parseStatements, printStatements, ts } from './ts.js';
 import { type DateType, schemaToTypeNode } from './types.js';
 
 // `isTypedMultipart` lives in operation-types now; re-export it so existing importers
@@ -75,6 +75,15 @@ export function operationsMetaStatements(ops: OperationModel[]): ts.Statement[]
             factory.createStringLiteral(op.method.toUpperCase())
           ),
           factory.createPropertyAssignment('path', factory.createStringLiteral(op.path)),
+          // No inner `as const`: the enclosing `OPERATIONS … as const` already makes this a
+          // readonly tuple of string literals, which is what `["tags"][number]` needs.
+          factory.createPropertyAssignment(
+            'tags',
+            factory.createArrayLiteralExpression(
+              op.tags.map((t) => factory.createStringLiteral(t)),
+              false
+            )
+          ),
         ],
         false
       )
@@ -123,12 +132,35 @@ export function operationsMetaStatements(ops: OperationModel[]): ts.Statement[]
       [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
       'OperationMetadata',
       undefined,
-      factory.createTypeLiteralNode([readonlyStringProp('method'), readonlyStringProp('path')])
+      factory.createTypeLiteralNode([
+        readonlyStringProp('method'),
+        readonlyStringProp('path'),
+        factory.createPropertySignature(
+          [factory.createModifier(ts.SyntaxKind.ReadonlyKeyword)],
+          'tags',
+          undefined,
+          factory.createTypeOperatorNode(
+            ts.SyntaxKind.ReadonlyKeyword,
+            factory.createArrayTypeNode(factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword))
+          )
+        ),
+      ])
     ),
-    'Static metadata describing one operation: its HTTP method and path template.'
+    'Static metadata describing one operation: its HTTP method, path template, and tags.'
   );
 
-  return [operations, operationId, operationMetadata];
+  // Derived literal unions of every path template and tag — used to narrow `RequestContext.operation`.
+  // `OperationTag` is omitted when no operation has a tag (its `["tags"][number]` would be `never`),
+  // so the narrowed `tags` field falls back to `string[]`.
+  const hasTags = ops.some((op) => op.tags.length > 0);
+  const derived = parseStatements(
+    'export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];' +
+      (hasTags
+        ? '\nexport type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];'
+        : '')
+  );
+
+  return [operations, operationId, operationMetadata, ...derived];
 }
 
 /** A `readonly <name>: string` property signature for the `OperationMetadata` type. */
@@ -171,6 +203,12 @@ export type OperationsBlockOptions = {
    * per-tag SSE bundles from colliding.
    */
   sseExportName?: string;
+  /**
+   * Whether a publisher `--setup` was baked in. When true, the service-class constructor merges the
+   * module-scoped `__redoclySetup` ({@link setupApply}) into each instance's config. Functions-facade
+   * blocks are unaffected (the setup applies globally via `configure`/`use`).
+   */
+  bakedSetup?: boolean;
 };
 
 /**
@@ -188,6 +226,8 @@ export type EmitContext = {
   queryAuthKeys: Set<string>;
   /** Names of every exported schema, used for `<Op>*` alias collision suppression. */
   schemaNames: Set<string>;
+  /** Whether a publisher `--setup` was baked in (service-class constructor merges `__redoclySetup`). */
+  bakedSetup: boolean;
 };
 
 export function renderOperationsBlock(
@@ -208,6 +248,7 @@ export function operationsBlockStatements(
     dateType: options.dateType ?? 'string',
     queryAuthKeys: options.queryAuthKeys ?? new Set<string>(),
     schemaNames: options.schemaNames ?? new Set<string>(),
+    bakedSetup: options.bakedSetup ?? false,
   };
   const sseExportName = options.sseExportName ?? 'sse';
   if (options.facade === 'service-class')
@@ -375,30 +416,113 @@ function serviceUseMethod(): ts.ClassElement {
  * `this.config` to the runtime, so each instance is independently configured.
  * With no config it falls back to the global `BASE` + auth (back-compat).
  */
-function serviceClassStatements(
-  ops: OperationModel[],
-  className: string,
-  ctx: EmitContext
-): ts.Statement[] {
-  const aliases: ts.Statement[] = [];
-  const members: ts.ClassElement[] = [
+/**
+ * The service-class constructor (+ its `config` field). Without a baked setup it is the historical
+ * parameter-property form (`private readonly config: ClientConfig = {}`) — byte-identical. With a
+ * baked setup, the constructor merges the module-scoped `__redoclySetup` into each instance's config:
+ * `{ ...__redoclySetup.config, ...config, middleware: [...baked, ...passed] }` — so `new Client()`
+ * gets the publisher defaults and a passed `config` overrides them (consumer wins; baked middleware
+ * runs first).
+ */
+function constructorMembers(bakedSetup: boolean): ts.ClassElement[] {
+  const configType = factory.createTypeReferenceNode('ClientConfig');
+  if (!bakedSetup) {
+    return [
+      factory.createConstructorDeclaration(
+        undefined,
+        [
+          factory.createParameterDeclaration(
+            [
+              factory.createModifier(ts.SyntaxKind.PrivateKeyword),
+              factory.createModifier(ts.SyntaxKind.ReadonlyKeyword),
+            ],
+            undefined,
+            'config',
+            undefined,
+            configType,
+            factory.createObjectLiteralExpression([], false)
+          ),
+        ],
+        factory.createBlock([], false)
+      ),
+    ];
+  }
+
+  const id = (n: string) => factory.createIdentifier(n);
+  const setupMember = (name: string) =>
+    factory.createPropertyAccessExpression(id('__redoclySetup'), name);
+  const orEmptyArray = (e: ts.Expression) =>
+    factory.createBinaryExpression(
+      e,
+      factory.createToken(ts.SyntaxKind.QuestionQuestionToken),
+      factory.createArrayLiteralExpression([], false)
+    );
+  const merged = factory.createObjectLiteralExpression(
+    [
+      factory.createSpreadAssignment(setupMember('config')),
+      factory.createSpreadAssignment(id('config')),
+      factory.createPropertyAssignment(
+        'middleware',
+        factory.createArrayLiteralExpression(
+          [
+            factory.createSpreadElement(orEmptyArray(setupMember('middleware'))),
+            factory.createSpreadElement(
+              orEmptyArray(factory.createPropertyAccessExpression(id('config'), 'middleware'))
+            ),
+          ],
+          false
+        )
+      ),
+    ],
+    true
+  );
+  return [
+    factory.createPropertyDeclaration(
+      [
+        factory.createModifier(ts.SyntaxKind.PrivateKeyword),
+        factory.createModifier(ts.SyntaxKind.ReadonlyKeyword),
+      ],
+      'config',
+      undefined,
+      configType,
+      undefined
+    ),
     factory.createConstructorDeclaration(
       undefined,
       [
         factory.createParameterDeclaration(
-          [
-            factory.createModifier(ts.SyntaxKind.PrivateKeyword),
-            factory.createModifier(ts.SyntaxKind.ReadonlyKeyword),
-          ],
+          undefined,
           undefined,
           'config',
           undefined,
-          factory.createTypeReferenceNode('ClientConfig'),
+          configType,
           factory.createObjectLiteralExpression([], false)
         ),
       ],
-      factory.createBlock([], false)
+      factory.createBlock(
+        [
+          factory.createExpressionStatement(
+            factory.createBinaryExpression(
+              factory.createPropertyAccessExpression(factory.createThis(), 'config'),
+              factory.createToken(ts.SyntaxKind.EqualsToken),
+              merged
+            )
+          ),
+        ],
+        true
+      )
     ),
+  ];
+}
+
+function serviceClassStatements(
+  ops: OperationModel[],
+  className: string,
+  ctx: EmitContext
+): ts.Statement[] {
+  const aliases: ts.Statement[] = [];
+  const members: ts.ClassElement[] = [
+    ...constructorMembers(ctx.bakedSetup),
     serviceUseMethod(),
   ];
 
@@ -577,7 +701,13 @@ function renderOperationParts(
           factory.createCallExpression(
             factory.createIdentifier('__sse'),
             [eventType],
-            [configExpr(configRef), urlExpr, initExpr, factory.createStringLiteral(sseDataKind(op))]
+            [
+              configExpr(configRef),
+              operationMetaExpr(op),
+              urlExpr,
+              initExpr,
+              factory.createStringLiteral(sseDataKind(op)),
+            ]
           )
         )
       )
@@ -944,6 +1074,24 @@ function headersHelperCall(op: OperationModel, groupedMode: boolean): ts.Express
  * still passes `undefined` as the body placeholder so the kind lands in the right
  * position.
  */
+/** The `{ id, path, tags }` literal passed to the runtime as the operation's identity. */
+function operationMetaExpr(op: OperationModel): ts.Expression {
+  return factory.createObjectLiteralExpression(
+    [
+      factory.createPropertyAssignment('id', factory.createStringLiteral(op.name)),
+      factory.createPropertyAssignment('path', factory.createStringLiteral(op.path)),
+      factory.createPropertyAssignment(
+        'tags',
+        factory.createArrayLiteralExpression(
+          op.tags.map((t) => factory.createStringLiteral(t)),
+          false
+        )
+      ),
+    ],
+    false
+  );
+}
+
 function renderRequestArgs(
   op: OperationModel,
   configRef: string,
@@ -952,7 +1100,7 @@ function renderRequestArgs(
   groupedMode: boolean,
   responseKind: 'json' | 'blob' | 'text' | 'void'
 ): ts.Expression[] {
-  const args: ts.Expression[] = [configExpr(configRef), urlExpr, initExpr];
+  const args: ts.Expression[] = [configExpr(configRef), operationMetaExpr(op), urlExpr, initExpr];
   if (op.requestBody) {
     const bodyExpr = groupedMode
       ? factory.createPropertyAccessExpression(factory.createIdentifier('vars'), 'body')
diff --git a/packages/client-generator/src/emitters/runtime.ts b/packages/client-generator/src/emitters/runtime.ts
index 757b61df06..259ebc26a4 100644
--- a/packages/client-generator/src/emitters/runtime.ts
+++ b/packages/client-generator/src/emitters/runtime.ts
@@ -20,6 +20,7 @@
 export const PUBLIC_RUNTIME_TYPES = [
   'ClientConfig',
   'Middleware',
+  'OperationContext',
   'ParseAs',
   'RequestContext',
   'RequestOptions',
@@ -30,6 +31,18 @@ export const PUBLIC_RUNTIME_TYPES = [
 
 import { printStatements, parseStatements, type ts } from './ts.js';
 
+/**
+ * TS *type* source strings for the `RequestContext.operation` fields. Defaults to the spec-agnostic
+ * all-`string` form; the emitter narrows them to the client's `OperationId`/`OperationPath`/
+ * `OperationTag` literal unions when the spec has operations (and tags).
+ */
+export type OperationContextTypes = { id: string; path: string; tags: string };
+const DEFAULT_OPERATION_CONTEXT: OperationContextTypes = {
+  id: 'string',
+  path: 'string',
+  tags: 'string[]',
+};
+
 export function renderRuntime(
   baseUrl: string,
   needsHeaderHelper: boolean,
@@ -37,7 +50,8 @@ export function renderRuntime(
   errorMode: 'throw' | 'result' = 'throw',
   needsSse: boolean = false,
   authConfig: boolean = false,
-  needsMultipart: boolean = false
+  needsMultipart: boolean = false,
+  opCtx: OperationContextTypes = DEFAULT_OPERATION_CONTEXT
 ): string {
   return printStatements(
     runtimeStatements(
@@ -47,7 +61,8 @@ export function renderRuntime(
       errorMode,
       needsSse,
       authConfig,
-      needsMultipart
+      needsMultipart,
+      opCtx
     )
   );
 }
@@ -64,7 +79,8 @@ export function runtimeStatements(
   errorMode: 'throw' | 'result' = 'throw',
   needsSse: boolean = false,
   authConfig: boolean = false,
-  needsMultipart: boolean = false
+  needsMultipart: boolean = false,
+  opCtx: OperationContextTypes = DEFAULT_OPERATION_CONTEXT
 ): ts.Statement[] {
   return parseStatements(
     runtimeSource(
@@ -74,7 +90,8 @@ export function runtimeStatements(
       errorMode,
       needsSse,
       authConfig,
-      needsMultipart
+      needsMultipart,
+      opCtx
     )
   );
 }
@@ -86,7 +103,8 @@ function runtimeSource(
   errorMode: 'throw' | 'result',
   needsSse: boolean,
   authConfig: boolean,
-  needsMultipart: boolean
+  needsMultipart: boolean,
+  opCtx: OperationContextTypes
 ): string {
   const base = JSON.stringify(baseUrl);
   const ex = exportHelpers ? 'export ' : '';
@@ -146,6 +164,7 @@ export type SseOptions = RequestInit & {
 
 ${ex}async function* __sse<T>(
   config: ClientConfig,
+  op: OperationContext,
   url: string,
   init: SseOptions,
   dataKind: 'json' | 'text' = 'text'
@@ -163,7 +182,7 @@ ${ex}async function* __sse<T>(
     if (signal?.aborted) return;
     const sendHeaders = lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
     try {
-      const { response } = await __send(config, url, { ...rest, method: rest.method ?? 'GET', headers: sendHeaders });
+      const { response } = await __send(config, op, url, { ...rest, method: rest.method ?? 'GET', headers: sendHeaders });
       if (!response.ok) {
         const errorBody = await readError(response);
         throw new ApiError(url, response.status, response.statusText, errorBody);
@@ -270,13 +289,14 @@ export type Result<TData, TError> =
 
 ${ex}async function __requestResult<TData, TError>(
   config: ClientConfig,
+  op: OperationContext,
   url: string,
   init: RequestOptions,
   body?: unknown,
   responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'
 ): Promise<Result<TData, TError>> {
   const { parseAs, ...sendInit } = init;
-  const { response } = await __send(config, url, sendInit, body);
+  const { response } = await __send(config, op, url, sendInit, body);
   if (!response.ok) {
     const error = (await readError(response)) as TError;
     return { data: undefined, error, response };
@@ -287,13 +307,14 @@ ${ex}async function __requestResult<TData, TError>(
 }`
       : `${ex}async function __request<T>(
   config: ClientConfig,
+  op: OperationContext,
   url: string,
   init: RequestOptions,
   body?: unknown,
   responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'
 ): Promise<T> {
   const { parseAs, ...sendInit } = init;
-  const { response, context } = await __send(config, url, sendInit, body);
+  const { response, context } = await __send(config, op, url, sendInit, body);
   if (!response.ok) {
     const errorBody = await readError(response);
     let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
@@ -322,12 +343,17 @@ ${ex}async function __requestResult<TData, TError>(
     : '';
   return `let BASE = ${base};
 
+/** Identity of the operation a request belongs to. Stable across path interpolation. */
+export type OperationContext = { id: ${opCtx.id}; path: ${opCtx.path}; tags: ${opCtx.tags} };
+
 /** The mutable request context handed to \`onRequest\` (mutate \`url\`/\`method\`/\`headers\`/\`body\`). */
 export type RequestContext = {
   url: string;
   method: string;
   headers: Record<string, string>;
   body?: unknown;
+  /** The operation being called: its id (operationId), path template, and tags. */
+  operation: OperationContext;
 };
 
 /**
@@ -577,6 +603,7 @@ ${ex}function __buildUrl(
 
 ${ex}async function __send(
   config: ClientConfig,
+  op: OperationContext,
   url: string,
   init: RequestOptions,
   body?: unknown
@@ -589,7 +616,7 @@ ${ex}async function __send(
     ...extra,
     ...(fetchInit.headers as Record<string, string> | undefined),
   };
-  const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+  const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
   const middleware = __middleware(config);
   for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
   // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
diff --git a/packages/client-generator/src/emitters/setup-bake.ts b/packages/client-generator/src/emitters/setup-bake.ts
new file mode 100644
index 0000000000..3a6d6f5c29
--- /dev/null
+++ b/packages/client-generator/src/emitters/setup-bake.ts
@@ -0,0 +1,69 @@
+import { NotSupportedError } from '../errors.js';
+import { ts } from './ts.js';
+
+const SETUP_IMPORT = '@redocly/client-generator';
+
+/**
+ * Transform a publisher `--setup` module into the neutral **setup expression** the emitters splice
+ * into a client as `const __redoclySetup = <expr>` — applied per-facade (functions → `configure`/
+ * `use`; service-class → constructor merge). Strips the (package-only) imports, extracts the default
+ * export's `defineClientSetup({ config, middleware })` argument, and — when the file declares
+ * helpers — wraps them in an IIFE so they are preserved yet scoped (only `__redoclySetup` lands in
+ * module scope, avoiding collisions):
+ *
+ *   (() => { <file helpers…> return <arg>; })()
+ *
+ * The transform is textual (`node.getText()`): re-printing parsed nodes through the TS printer
+ * loses string-literal text, so we preserve the publisher's exact source for each kept node.
+ */
+export function bakeSetup(source: string): string {
+  const sf = ts.createSourceFile(
+    'setup.ts',
+    source,
+    ts.ScriptTarget.Latest,
+    true,
+    ts.ScriptKind.TS
+  );
+  const kept: string[] = [];
+  let argText: string | undefined;
+
+  for (const stmt of sf.statements) {
+    if (ts.isImportDeclaration(stmt)) {
+      const spec = (stmt.moduleSpecifier as ts.StringLiteral).text;
+      if (spec !== SETUP_IMPORT) {
+        throw new NotSupportedError(
+          `A --setup file may only import from "${SETUP_IMPORT}"; found "${spec}". ` +
+            `Setup code may use web globals and the client contract only (keeps the client zero-dependency).`
+        );
+      }
+      continue; // drop — the symbols resolve in the baked client's own scope
+    }
+    if (ts.isExportAssignment(stmt) && !stmt.isExportEquals) {
+      argText = unwrap(stmt.expression).getText(sf);
+      continue;
+    }
+    kept.push(stmt.getText(sf));
+  }
+
+  if (argText === undefined) {
+    throw new NotSupportedError(
+      'A --setup file must `export default defineClientSetup({ config, middleware })` (or a setup object).'
+    );
+  }
+
+  if (kept.length === 0) return argText;
+  return `(() => {\n${kept.join('\n')}\nreturn ${argText};\n})()`;
+}
+
+/** `defineClientSetup(<arg>)` → `<arg>`; a bare object literal passes through unchanged. */
+function unwrap(expr: ts.Expression): ts.Expression {
+  if (
+    ts.isCallExpression(expr) &&
+    ts.isIdentifier(expr.expression) &&
+    expr.expression.text === 'defineClientSetup' &&
+    expr.arguments.length === 1
+  ) {
+    return expr.arguments[0];
+  }
+  return expr;
+}
diff --git a/packages/client-generator/src/index.ts b/packages/client-generator/src/index.ts
index 71ec6de8b4..7e7f086a12 100644
--- a/packages/client-generator/src/index.ts
+++ b/packages/client-generator/src/index.ts
@@ -1,7 +1,8 @@
-import { mkdir, writeFile } from 'node:fs/promises';
+import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import { dirname, resolve } from 'node:path';
 
 import type { EmitOptions } from './emitters/client.js';
+import { bakeSetup } from './emitters/setup-bake.js';
 import { builtinGenerators, validateGenerators } from './generators/index.js';
 import { resolveGenerators } from './generators/resolve.js';
 import type { GeneratorDescriptor } from './generators/types.js';
@@ -13,6 +14,17 @@ import type { GenerateClientOptions, GenerateClientResult } from './types.js';
 import type { GeneratedFile, OutputMode } from './writers/types.js';
 
 export { NotSupportedError } from './errors.js';
+export { defineClientSetup } from './runtime-contract.js';
+export type {
+  ClientSetup,
+  ClientSetupConfig,
+  Middleware,
+  OperationContext,
+  RequestContext,
+  RetryConfig,
+  RetryContext,
+  RetryStrategy,
+} from './runtime-contract.js';
 export type { Config } from './config.js';
 export type { Generator, GeneratorInput, GeneratorName } from './generators/index.js';
 export type {
@@ -82,6 +94,14 @@ export async function generateClient(
       : document;
   const model = buildApiModel(normalized);
 
+  // A publisher `--setup` module is read, validated, and transformed into the neutral setup
+  // expression baked into the client. Applied per facade and across all output modes by the emitter.
+  let setupBlock: string | undefined;
+  if (options.setup) {
+    const setupPath = resolve(options.configDir ?? process.cwd(), options.setup);
+    setupBlock = bakeSetup(await readFile(setupPath, 'utf-8'));
+  }
+
   // Resolve the selection into a registry: built-in names pass through, inline `customGenerators`
   // register, and any other entry is imported as a plugin specifier (path/package).
   // An empty list (e.g. `generators: []` in config, or `--generators ,`) means
@@ -106,6 +126,7 @@ export async function generateClient(
       queryFramework: options.queryFramework,
       mockData: options.mockData,
       mockSeed: options.mockSeed,
+      setup: setupBlock,
     },
     generators: selected,
     registry,
diff --git a/packages/client-generator/src/runtime-contract.ts b/packages/client-generator/src/runtime-contract.ts
new file mode 100644
index 0000000000..34079a660e
--- /dev/null
+++ b/packages/client-generator/src/runtime-contract.ts
@@ -0,0 +1,70 @@
+// The public, spec-independent runtime contract a publisher's `--setup` file imports.
+// These MUST stay byte-identical to the spec-independent types emitted into every client
+// (see emitters/runtime.ts); a lockstep test guards against drift.
+
+export type OperationContext = { id: string; path: string; tags: string[] };
+
+export type RequestContext = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: OperationContext;
+};
+
+export type Middleware = {
+  onRequest?: (ctx: RequestContext) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext
+  ) => Response | void | Promise<Response | void>;
+  onError?: (error: Error, ctx: RequestContext) => Error | Promise<Error>;
+};
+
+export type RetryStrategy = 'fixed' | 'exponential';
+
+export type RetryContext = {
+  attempt: number;
+  request: RequestContext;
+  response?: Response;
+  error?: unknown;
+};
+
+export type RetryConfig = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
+};
+
+/**
+ * The spec-independent subset of a client's `ClientConfig` a publisher may bake in
+ * (everything except the spec-derived `auth`).
+ */
+export type ClientSetupConfig = {
+  baseUrl?: string;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  fetch?: typeof fetch;
+  onRequest?: (ctx: RequestContext) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext
+  ) => Response | void | Promise<Response | void>;
+  onError?: (error: Error, ctx: RequestContext) => Error;
+  retry?: RetryConfig;
+};
+
+export type ClientSetup = { config?: ClientSetupConfig; middleware?: Middleware[] };
+
+/**
+ * Identity helper for authoring a `--setup` module: gives full type inference and a stable
+ * call the baker recognises. `export default defineClientSetup({ config, middleware })`.
+ *
+ * @experimental The setup API may change between minor versions until stabilized.
+ */
+export function defineClientSetup(setup: ClientSetup): ClientSetup {
+  return setup;
+}
diff --git a/packages/client-generator/src/types.ts b/packages/client-generator/src/types.ts
index 9725f5783b..139008c716 100644
--- a/packages/client-generator/src/types.ts
+++ b/packages/client-generator/src/types.ts
@@ -93,6 +93,12 @@ export type GenerateClientOptions = {
    * location). Defaults to the current working directory.
    */
   configDir?: string;
+  /**
+   * Path to a publisher setup module (`export default defineClientSetup({ config, middleware })`)
+   * baked into the generated client. Resolved against `configDir`. Works across all output modes
+   * and both facades (functions: global `configure`/`use`; service-class: constructor merge).
+   */
+  setup?: string;
 };
 
 export type GenerateClientResult = {
diff --git a/packages/client-generator/src/writers/__tests__/split-writer.test.ts b/packages/client-generator/src/writers/__tests__/split-writer.test.ts
index 0b33ccb8b9..57ceebd0e0 100644
--- a/packages/client-generator/src/writers/__tests__/split-writer.test.ts
+++ b/packages/client-generator/src/writers/__tests__/split-writer.test.ts
@@ -126,10 +126,10 @@ describe('splitWriter — entry imports & re-exports', () => {
     );
     expect(entry.content).toContain("export * from './client.schemas.js';");
     expect(entry.content).toContain(
-      'export { ApiError, configure, setBaseUrl } from "./client.http.js";'
+      'export { ApiError, configure, setBaseUrl, use } from "./client.http.js";'
     );
     expect(entry.content).toContain(
-      'export type { ClientConfig, Middleware, ParseAs, RequestContext, RequestOptions, RetryConfig, RetryContext, RetryStrategy } from "./client.http.js";'
+      'export type { ClientConfig, Middleware, OperationContext, ParseAs, RequestContext, RequestOptions, RetryConfig, RetryContext, RetryStrategy } from "./client.http.js";'
     );
     expect(entry.content).toContain('export async function getPet(');
     // No auth/header helpers used by this operation.
@@ -166,7 +166,7 @@ describe('splitWriter — entry imports & re-exports', () => {
       'import { __auth, __buildUrl, __config, __headers, __request, type RequestOptions } from "./client.http.js";'
     );
     expect(entry.content).toContain(
-      'export { ApiError, configure, setBaseUrl, setBearer } from "./client.http.js";'
+      'export { ApiError, configure, setBaseUrl, setBearer, use } from "./client.http.js";'
     );
     expect(http.content).toContain('export async function __auth(');
     expect(http.content).toContain('export function setBearer(');
@@ -186,7 +186,7 @@ describe('splitWriter — entry imports & re-exports', () => {
     const { entry } = run(model());
     expect(entry.content).not.toContain('.schemas.js');
     expect(entry.content).toContain(
-      'export { ApiError, configure, setBaseUrl } from "./client.http.js";'
+      'export { ApiError, configure, setBaseUrl, use } from "./client.http.js";'
     );
   });
 
@@ -203,7 +203,7 @@ describe('splitWriter — entry imports & re-exports', () => {
     );
     // No named schemas, but the metadata map still belongs in the schemas module…
     expect(schemas.content).toContain('export const OPERATIONS = {');
-    expect(schemas.content).toContain('ping: { method: "GET", path: "/ping" }');
+    expect(schemas.content).toContain('ping: { method: "GET", path: "/ping", tags: [] }');
     expect(schemas.content).not.toContain('export type Pet');
     // …so the barrel re-exports it, while the endpoint file imports no named types.
     expect(entry.content).toContain("export * from './client.schemas.js';");
diff --git a/packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts b/packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts
index d5ef77ac01..65004dd6cf 100644
--- a/packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts
+++ b/packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts
@@ -138,10 +138,10 @@ describe('tagsSplitWriter', () => {
     );
     const entry = find('/out/client.ts')!;
     expect(entry.content).toContain(
-      'export { ApiError, configure, setBaseUrl, setBearer } from "./client.http.js";'
+      'export { ApiError, configure, setBaseUrl, setBearer, use } from "./client.http.js";'
     );
     expect(entry.content).toContain(
-      'export type { AuthCredentials, ClientConfig, Middleware, ParseAs, RequestContext, RequestOptions, RetryConfig, RetryContext, RetryStrategy, TokenProvider } from "./client.http.js";'
+      'export type { AuthCredentials, ClientConfig, Middleware, OperationContext, ParseAs, RequestContext, RequestOptions, RetryConfig, RetryContext, RetryStrategy, TokenProvider } from "./client.http.js";'
     );
     expect(entry.content).toContain("export * from './pets/client.js';");
   });
diff --git a/packages/client-generator/src/writers/__tests__/tags-writer.test.ts b/packages/client-generator/src/writers/__tests__/tags-writer.test.ts
index afb8e1b7ed..55a00ea2b2 100644
--- a/packages/client-generator/src/writers/__tests__/tags-writer.test.ts
+++ b/packages/client-generator/src/writers/__tests__/tags-writer.test.ts
@@ -157,10 +157,10 @@ describe('tagsWriter', () => {
     const entry = find('/out/client.ts')!;
     expect(entry.content).toContain("export * from './client.schemas.js';");
     expect(entry.content).toContain(
-      'export { ApiError, configure, setBaseUrl, setBearer } from "./client.http.js";'
+      'export { ApiError, configure, setBaseUrl, setBearer, use } from "./client.http.js";'
     );
     expect(entry.content).toContain(
-      'export type { AuthCredentials, ClientConfig, Middleware, ParseAs, RequestContext, RequestOptions, RetryConfig, RetryContext, RetryStrategy, TokenProvider } from "./client.http.js";'
+      'export type { AuthCredentials, ClientConfig, Middleware, OperationContext, ParseAs, RequestContext, RequestOptions, RetryConfig, RetryContext, RetryStrategy, TokenProvider } from "./client.http.js";'
     );
     expect(entry.content).toContain("export * from './pets.js';");
   });
@@ -239,7 +239,7 @@ describe('tagsWriter', () => {
     const entry = find('/out/client.ts')!;
     expect(entry.content).not.toContain("export * from './client.schemas.js';");
     expect(entry.content).toContain(
-      'export { ApiError, configure, setBaseUrl } from "./client.http.js";'
+      'export { ApiError, configure, setBaseUrl, use } from "./client.http.js";'
     );
   });
 });
diff --git a/packages/client-generator/src/writers/split-writer.ts b/packages/client-generator/src/writers/split-writer.ts
index b162edb4ba..6b013c098d 100644
--- a/packages/client-generator/src/writers/split-writer.ts
+++ b/packages/client-generator/src/writers/split-writer.ts
@@ -33,7 +33,7 @@ export const splitWriter: Writer = ({ model, outputPath, emit }) => {
   ]);
 
   return [
-    { path: join(dir, `${stem}.http.ts`), content: m.http },
+    { path: join(dir, `${stem}.http.ts`), content: m.http(stem) },
     { path: join(dir, `${stem}.schemas.ts`), content: m.schemas },
     { path: outputPath, content: entryContent },
   ];
diff --git a/packages/client-generator/src/writers/tagged.ts b/packages/client-generator/src/writers/tagged.ts
index 411bc2230f..062bddf709 100644
--- a/packages/client-generator/src/writers/tagged.ts
+++ b/packages/client-generator/src/writers/tagged.ts
@@ -28,7 +28,7 @@ export function buildTaggedClient(
   const importPrefix = nested ? '../' : './';
 
   const files: GeneratedFile[] = [
-    { path: join(dir, `${stem}.http.ts`), content: m.http },
+    { path: join(dir, `${stem}.http.ts`), content: m.http(stem) },
     { path: join(dir, `${stem}.schemas.ts`), content: m.schemas },
   ];
 
diff --git a/tests/e2e/generate-client/base-consumer/api.ts b/tests/e2e/generate-client/base-consumer/api.ts
index 76c1e16832..8c9fa2a7aa 100644
--- a/tests/e2e/generate-client/base-consumer/api.ts
+++ b/tests/e2e/generate-client/base-consumer/api.ts
@@ -102,13 +102,13 @@ export function isPetBulkErrorItem(value: PetBulkSuccessItem | PetBulkErrorItem)
  * without re-deriving them at each call site.
  */
 export const OPERATIONS = {
-    getPetById: { method: "GET", path: "/pets/{id}" },
-    listPets: { method: "GET", path: "/pets" },
-    createPet: { method: "POST", path: "/pets" },
-    getSlowPet: { method: "GET", path: "/pets/{id}/cancel-test" },
-    search: { method: "POST", path: "/search" },
-    bulkUpsertPets: { method: "POST", path: "/pets/bulk" },
-    getStatus: { method: "GET", path: "/status" }
+    getPetById: { method: "GET", path: "/pets/{id}", tags: [] },
+    listPets: { method: "GET", path: "/pets", tags: [] },
+    createPet: { method: "POST", path: "/pets", tags: [] },
+    getSlowPet: { method: "GET", path: "/pets/{id}/cancel-test", tags: [] },
+    search: { method: "POST", path: "/search", tags: [] },
+    bulkUpsertPets: { method: "POST", path: "/pets/bulk", tags: [] },
+    getStatus: { method: "GET", path: "/status", tags: [] }
 } as const;
 
 /**
@@ -117,21 +117,33 @@ export const OPERATIONS = {
 export type OperationId = keyof typeof OPERATIONS;
 
 /**
- * Static metadata describing one operation: its HTTP method and path template.
+ * Static metadata describing one operation: its HTTP method, path template, and tags.
  */
 export type OperationMetadata = {
     readonly method: string;
     readonly path: string;
+    readonly tags: readonly string[];
 };
 
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
 let BASE = "http://localhost:3102";
 
+/** Identity of the operation a request belongs to. Stable across path interpolation. */
+export type OperationContext = {
+    id: OperationId;
+    path: OperationPath;
+    tags: string[];
+};
+
 /** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
     headers: Record<string, string>;
     body?: unknown;
+    /** The operation being called: its id (operationId), path template, and tags. */
+    operation: OperationContext;
 };
 
 /**
@@ -382,7 +394,7 @@ function __buildUrl(config: ClientConfig, path: string, query?: Record<string, Q
     return qs ? `${url}?${qs}` : url;
 }
 
-async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
     response: Response;
     context: RequestContext;
 }> {
@@ -394,7 +406,7 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
     const middleware = __middleware(config);
     for (const mw of middleware)
         if (mw.onRequest)
@@ -492,9 +504,9 @@ async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unkn
     return response.blob();
 }
 
-async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
     const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, url, sendInit, body);
+    const { response, context } = await __send(config, op, url, sendInit, body);
     if (!response.ok) {
         const errorBody = await readError(response);
         let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
@@ -577,7 +589,7 @@ export type GetPetByIdVariables = {
 };
 
 export async function getPetById(id: number, init: RequestOptions = {}): Promise<Pet> {
-    return __request<Pet>(__config, __buildUrl(__config, `/pets/${encodeURIComponent(String(id))}`), { method: "GET", ...init });
+    return __request<Pet>(__config, { id: "getPetById", path: "/pets/{id}", tags: [] }, __buildUrl(__config, `/pets/${encodeURIComponent(String(id))}`), { method: "GET", ...init });
 }
 
 export type ListPetsResult = Pet[];
@@ -599,7 +611,7 @@ export async function listPets(params: {
      */
     filter?: PetFilter;
 } = {}, init: RequestOptions = {}): Promise<Pet[]> {
-    return __request<Pet[]>(__config, __buildUrl(__config, `/pets`, params, { "filter": { style: "deepObject", explode: true } }), { method: "GET", ...init });
+    return __request<Pet[]>(__config, { id: "listPets", path: "/pets", tags: [] }, __buildUrl(__config, `/pets`, params, { "filter": { style: "deepObject", explode: true } }), { method: "GET", ...init });
 }
 
 export type CreatePetResult = Pet;
@@ -611,7 +623,7 @@ export type CreatePetVariables = {
 };
 
 export async function createPet(body: Omit<Pet, "id">, init: RequestOptions = {}): Promise<Pet> {
-    return __request<Pet>(__config, __buildUrl(__config, `/pets`), { method: "POST", ...init }, body);
+    return __request<Pet>(__config, { id: "createPet", path: "/pets", tags: [] }, __buildUrl(__config, `/pets`), { method: "POST", ...init }, body);
 }
 
 export type GetSlowPetResult = Pet;
@@ -621,7 +633,7 @@ export type GetSlowPetVariables = {
 };
 
 export async function getSlowPet(id: number, init: RequestOptions = {}): Promise<Pet> {
-    return __request<Pet>(__config, __buildUrl(__config, `/pets/${encodeURIComponent(String(id))}/cancel-test`), { method: "GET", ...init });
+    return __request<Pet>(__config, { id: "getSlowPet", path: "/pets/{id}/cancel-test", tags: [] }, __buildUrl(__config, `/pets/${encodeURIComponent(String(id))}/cancel-test`), { method: "GET", ...init });
 }
 
 export type SearchBody = PetFilter;
@@ -636,7 +648,7 @@ export type SearchVariables = {
  * self-referential alias (TS2440/TS2308 in multi-file output).
  */
 export async function search(body: PetFilter, init: RequestOptions = {}): Promise<SearchResult> {
-    return __request<SearchResult>(__config, __buildUrl(__config, `/search`), { method: "POST", ...init }, body);
+    return __request<SearchResult>(__config, { id: "search", path: "/search", tags: [] }, __buildUrl(__config, `/search`), { method: "POST", ...init }, body);
 }
 
 export type BulkUpsertPetsResult = PetBulkResult;
@@ -653,7 +665,7 @@ export type BulkUpsertPetsVariables = {
  * union, narrowing the items to the named member types.
  */
 export async function bulkUpsertPets(body: Pet[], init: RequestOptions = {}): Promise<PetBulkResult> {
-    return __request<PetBulkResult>(__config, __buildUrl(__config, `/pets/bulk`), { method: "POST", ...init }, body);
+    return __request<PetBulkResult>(__config, { id: "bulkUpsertPets", path: "/pets/bulk", tags: [] }, __buildUrl(__config, `/pets/bulk`), { method: "POST", ...init }, body);
 }
 
 /**
@@ -663,5 +675,5 @@ export async function bulkUpsertPets(body: Pet[], init: RequestOptions = {}): Pr
  * (a duplicate-identifier error).
  */
 export async function getStatus(init: RequestOptions = {}): Promise<Pet> {
-    return __request<Pet>(__config, __buildUrl(__config, `/status`), { method: "GET", ...init });
+    return __request<Pet>(__config, { id: "getStatus", path: "/status", tags: [] }, __buildUrl(__config, `/status`), { method: "GET", ...init });
 }
diff --git a/tests/e2e/generate-client/cafe-consumer/api.ts b/tests/e2e/generate-client/cafe-consumer/api.ts
index 6c7c245a7b..c93d4aee62 100644
--- a/tests/e2e/generate-client/cafe-consumer/api.ts
+++ b/tests/e2e/generate-client/cafe-consumer/api.ts
@@ -419,18 +419,18 @@ export function isDessert(value: MenuItem): value is Dessert {
  * without re-deriving them at each call site.
  */
 export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu" },
-    createMenuItem: { method: "POST", path: "/menu" },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
-    listOrders: { method: "GET", path: "/orders" },
-    createOrder: { method: "POST", path: "/orders" },
-    getOrderById: { method: "GET", path: "/orders/{orderId}" },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
-    listOrderItems: { method: "GET", path: "/order-items" },
-    getRevenue: { method: "GET", path: "/revenue" },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
+    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
+    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
+    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
+    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
+    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
+    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
+    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
 } as const;
 
 /**
@@ -439,21 +439,35 @@ export const OPERATIONS = {
 export type OperationId = keyof typeof OPERATIONS;
 
 /**
- * Static metadata describing one operation: its HTTP method and path template.
+ * Static metadata describing one operation: its HTTP method, path template, and tags.
  */
 export type OperationMetadata = {
     readonly method: string;
     readonly path: string;
+    readonly tags: readonly string[];
 };
 
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
+
 let BASE = "http://127.0.0.1:3101";
 
+/** Identity of the operation a request belongs to. Stable across path interpolation. */
+export type OperationContext = {
+    id: OperationId;
+    path: OperationPath;
+    tags: OperationTag[];
+};
+
 /** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
     headers: Record<string, string>;
     body?: unknown;
+    /** The operation being called: its id (operationId), path template, and tags. */
+    operation: OperationContext;
 };
 
 /**
@@ -711,7 +725,7 @@ function __buildUrl(config: ClientConfig, path: string, query?: Record<string, Q
     return qs ? `${url}?${qs}` : url;
 }
 
-async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
     response: Response;
     context: RequestContext;
 }> {
@@ -723,7 +737,7 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
     const middleware = __middleware(config);
     for (const mw of middleware)
         if (mw.onRequest)
@@ -821,9 +835,9 @@ async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unkn
     return response.blob();
 }
 
-async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
     const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, url, sendInit, body);
+    const { response, context } = await __send(config, op, url, sendInit, body);
     if (!response.ok) {
         const errorBody = await readError(response);
         let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
@@ -1103,7 +1117,7 @@ export async function listMenuItems(params: {
      */
     limit?: number;
 } = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-    return __request<MenuItemList>(__config, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
+    return __request<MenuItemList>(__config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
 }
 
 export type CreateMenuItemResult = MenuItem;
@@ -1121,7 +1135,7 @@ export type CreateMenuItemVariables = {
  */
 export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<MenuItem>(__config, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<MenuItem>(__config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type DeleteMenuItemResult = void;
@@ -1141,7 +1155,7 @@ export type DeleteMenuItemVariables = {
  */
 export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+    return __request<void>(__config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
 }
 
 export type GetMenuItemPhotoResult = Blob | string;
@@ -1173,7 +1187,7 @@ export async function getMenuItemPhoto(menuItemId: string, params: {
      */
     photoSize?: "thumbnail" | "medium" | "large";
 } = {}, init: RequestOptions = {}): Promise<Blob | string> {
-    return __request<Blob | string>(__config, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+    return __request<Blob | string>(__config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
 }
 
 export type ListOrdersResult = OrderList;
@@ -1289,7 +1303,7 @@ export async function listOrders(params: {
     search?: string;
 } = {}, init: RequestOptions = {}): Promise<OrderList> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderList>(__config, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<OrderList>(__config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type CreateOrderResult = Order;
@@ -1308,7 +1322,7 @@ export type CreateOrderVariables = {
  */
 export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<Order>(__config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type GetOrderByIdResult = Order;
@@ -1343,7 +1357,7 @@ export async function getOrderById(orderId: string, headers: {
     "X-Request-Id"?: string;
 } = {}, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+    return __request<Order>(__config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
 }
 
 export type DeleteOrderResult = void;
@@ -1364,7 +1378,7 @@ export type DeleteOrderVariables = {
  */
 export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+    return __request<void>(__config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
 }
 
 export type UpdateOrderResult = Order;
@@ -1392,7 +1406,7 @@ export async function updateOrder(orderId: string, body?: {
     status: OrderStatus;
 }, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<Order>(__config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type ListOrderItemsResult = OrderItem[];
@@ -1449,7 +1463,7 @@ export async function listOrderItems(params: {
     filter?: string;
 } = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderItem[]>(__config, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<OrderItem[]>(__config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type GetRevenueResult = RevenueStatistics;
@@ -1494,7 +1508,7 @@ export async function getRevenue(params: {
     endDate?: string;
 } = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
     const __a = await __auth(["ApiKey"], __config);
-    return __request<RevenueStatistics>(__config, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<RevenueStatistics>(__config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type RegisterOAuth2ClientResult = OAuth2Client;
@@ -1516,5 +1530,5 @@ export type RegisterOAuth2ClientVariables = {
  * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
  */
 export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-    return __request<OAuth2Client>(__config, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+    return __request<OAuth2Client>(__config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
 }
diff --git a/tests/e2e/generate-client/cafe.snapshot.ts b/tests/e2e/generate-client/cafe.snapshot.ts
index a56ece2a42..241ef5fac7 100644
--- a/tests/e2e/generate-client/cafe.snapshot.ts
+++ b/tests/e2e/generate-client/cafe.snapshot.ts
@@ -419,18 +419,18 @@ export function isDessert(value: MenuItem): value is Dessert {
  * without re-deriving them at each call site.
  */
 export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu" },
-    createMenuItem: { method: "POST", path: "/menu" },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}" },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}" },
-    listOrders: { method: "GET", path: "/orders" },
-    createOrder: { method: "POST", path: "/orders" },
-    getOrderById: { method: "GET", path: "/orders/{orderId}" },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}" },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}" },
-    listOrderItems: { method: "GET", path: "/order-items" },
-    getRevenue: { method: "GET", path: "/revenue" },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register" }
+    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
+    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
+    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
+    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
+    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
+    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
+    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
+    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
+    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
+    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
+    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
+    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
 } as const;
 
 /**
@@ -439,21 +439,35 @@ export const OPERATIONS = {
 export type OperationId = keyof typeof OPERATIONS;
 
 /**
- * Static metadata describing one operation: its HTTP method and path template.
+ * Static metadata describing one operation: its HTTP method, path template, and tags.
  */
 export type OperationMetadata = {
     readonly method: string;
     readonly path: string;
+    readonly tags: readonly string[];
 };
 
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
+
 let BASE = "https://api.cafe.redocly.com";
 
+/** Identity of the operation a request belongs to. Stable across path interpolation. */
+export type OperationContext = {
+    id: OperationId;
+    path: OperationPath;
+    tags: OperationTag[];
+};
+
 /** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
     headers: Record<string, string>;
     body?: unknown;
+    /** The operation being called: its id (operationId), path template, and tags. */
+    operation: OperationContext;
 };
 
 /**
@@ -711,7 +725,7 @@ function __buildUrl(config: ClientConfig, path: string, query?: Record<string, Q
     return qs ? `${url}?${qs}` : url;
 }
 
-async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
     response: Response;
     context: RequestContext;
 }> {
@@ -723,7 +737,7 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
     const middleware = __middleware(config);
     for (const mw of middleware)
         if (mw.onRequest)
@@ -821,9 +835,9 @@ async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unkn
     return response.blob();
 }
 
-async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
     const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, url, sendInit, body);
+    const { response, context } = await __send(config, op, url, sendInit, body);
     if (!response.ok) {
         const errorBody = await readError(response);
         let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
@@ -1103,7 +1117,7 @@ export async function listMenuItems(params: {
      */
     limit?: number;
 } = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-    return __request<MenuItemList>(__config, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
+    return __request<MenuItemList>(__config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
 }
 
 export type CreateMenuItemResult = MenuItem;
@@ -1121,7 +1135,7 @@ export type CreateMenuItemVariables = {
  */
 export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<MenuItem>(__config, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<MenuItem>(__config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type DeleteMenuItemResult = void;
@@ -1141,7 +1155,7 @@ export type DeleteMenuItemVariables = {
  */
 export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+    return __request<void>(__config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
 }
 
 export type GetMenuItemPhotoResult = Blob | string;
@@ -1173,7 +1187,7 @@ export async function getMenuItemPhoto(menuItemId: string, params: {
      */
     photoSize?: "thumbnail" | "medium" | "large";
 } = {}, init: RequestOptions = {}): Promise<Blob | string> {
-    return __request<Blob | string>(__config, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
+    return __request<Blob | string>(__config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
 }
 
 export type ListOrdersResult = OrderList;
@@ -1289,7 +1303,7 @@ export async function listOrders(params: {
     search?: string;
 } = {}, init: RequestOptions = {}): Promise<OrderList> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderList>(__config, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<OrderList>(__config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type CreateOrderResult = Order;
@@ -1308,7 +1322,7 @@ export type CreateOrderVariables = {
  */
 export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<Order>(__config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type GetOrderByIdResult = Order;
@@ -1343,7 +1357,7 @@ export async function getOrderById(orderId: string, headers: {
     "X-Request-Id"?: string;
 } = {}, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
+    return __request<Order>(__config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
 }
 
 export type DeleteOrderResult = void;
@@ -1364,7 +1378,7 @@ export type DeleteOrderVariables = {
  */
 export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
+    return __request<void>(__config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
 }
 
 export type UpdateOrderResult = Order;
@@ -1392,7 +1406,7 @@ export async function updateOrder(orderId: string, body?: {
     status: OrderStatus;
 }, init: RequestOptions = {}): Promise<Order> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
+    return __request<Order>(__config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
 }
 
 export type ListOrderItemsResult = OrderItem[];
@@ -1449,7 +1463,7 @@ export async function listOrderItems(params: {
     filter?: string;
 } = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
     const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderItem[]>(__config, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<OrderItem[]>(__config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type GetRevenueResult = RevenueStatistics;
@@ -1494,7 +1508,7 @@ export async function getRevenue(params: {
     endDate?: string;
 } = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
     const __a = await __auth(["ApiKey"], __config);
-    return __request<RevenueStatistics>(__config, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
+    return __request<RevenueStatistics>(__config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
 }
 
 export type RegisterOAuth2ClientResult = OAuth2Client;
@@ -1516,5 +1530,5 @@ export type RegisterOAuth2ClientVariables = {
  * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
  */
 export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-    return __request<OAuth2Client>(__config, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+    return __request<OAuth2Client>(__config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
 }
diff --git a/tests/e2e/generate-client/cafe.test.ts b/tests/e2e/generate-client/cafe.test.ts
index 2260e5a14a..caa1f4890f 100644
--- a/tests/e2e/generate-client/cafe.test.ts
+++ b/tests/e2e/generate-client/cafe.test.ts
@@ -193,12 +193,12 @@ describe('generate-client end-to-end (cafe.yaml)', () => {
     expect(generated).toContain('} as const;');
     expect(generated).toContain('export type OperationId = keyof typeof OPERATIONS;');
     expect(generated).toMatch(
-      /export type OperationMetadata = \{\s*readonly method: string;\s*readonly path: string;\s*\};/
+      /export type OperationMetadata = \{\s*readonly method: string;\s*readonly path: string;\s*readonly tags: readonly string\[\];\s*\};/
     );
-    // A path-param operation keeps its `{param}` template and uppercased method.
-    expect(generated).toContain('getOrderById: { method: "GET", path: "/orders/{orderId}" }');
-    expect(generated).toContain('updateOrder: { method: "PATCH", path: "/orders/{orderId}" }');
-    expect(generated).toContain('createOrder: { method: "POST", path: "/orders" }');
+    // A path-param operation keeps its `{param}` template, uppercased method, and tags.
+    expect(generated).toContain('getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] }');
+    expect(generated).toContain('updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] }');
+    expect(generated).toContain('createOrder: { method: "POST", path: "/orders", tags: ["Orders"] }');
   });
 
   test('generated file uses ergonomic signatures (positional path params + params object + body)', () => {
diff --git a/tests/e2e/generate-client/examples.test.ts b/tests/e2e/generate-client/examples.test.ts
index 05725e0f86..9f8f00f291 100644
--- a/tests/e2e/generate-client/examples.test.ts
+++ b/tests/e2e/generate-client/examples.test.ts
@@ -12,6 +12,8 @@ const examplesDir = join(repoRoot, 'packages/client-generator/examples');
 
 const EXAMPLES = [
   'fetch-functions',
+  'customization',
+  'baked-setup',
   'service-class',
   'zod',
   'mock',
diff --git a/tests/e2e/generate-client/middleware.test.ts b/tests/e2e/generate-client/middleware.test.ts
index 4cc2432b38..b588c72cc0 100644
--- a/tests/e2e/generate-client/middleware.test.ts
+++ b/tests/e2e/generate-client/middleware.test.ts
@@ -54,25 +54,6 @@ describe('middleware — functions facade (use)', () => {
     if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
   });
 
-  test('onRequest can mutate ctx.body and the change is sent', () => {
-    const captured = runConsumer(
-      dir,
-      `
-import { configure, use, createPet } from './client.ts';
-
-let sent = '';
-configure({
-  fetch: (async (_url: string, init: RequestInit) => { sent = init.body as string; return ${OK}; }) as unknown as typeof fetch,
-});
-use({ onRequest: (ctx) => { (ctx.body as { name: string }).name = 'Mutated'; } });
-await createPet({ name: 'Rex' });
-console.log(JSON.stringify({ sent }));
-`
-    ) as { sent: string };
-
-    expect(JSON.parse(captured.sent)).toEqual({ name: 'Mutated' });
-  }, 60_000);
-
   test('use() registers middleware: onRequest runs in order, onResponse in reverse (onion)', () => {
     const captured = runConsumer(
       dir,
@@ -164,6 +145,71 @@ console.log(JSON.stringify({ order }));
 
     expect(captured.order).toEqual(['config', 'mw']);
   }, 60_000);
+
+  test('onRequest sees ctx.operation { id, path, tags }', () => {
+    const captured = runConsumer(
+      dir,
+      `
+import { configure, use, createPet } from './client.ts';
+
+let op: unknown;
+configure({ fetch: (async () => ${OK}) as unknown as typeof fetch });
+use({ onRequest: (ctx) => { op = ctx.operation; } });
+await createPet({ name: 'Rex' });
+console.log(JSON.stringify({ op }));
+`
+    ) as { op: { id: string; path: string; tags: string[] } };
+
+    expect(captured.op.id).toBe('createPet');
+    expect(captured.op.path).toBe('/pets');
+    expect(Array.isArray(captured.op.tags)).toBe(true);
+  }, 60_000);
+
+  test('onRequest can mutate ctx.body and the change is sent', () => {
+    const captured = runConsumer(
+      dir,
+      `
+import { configure, use, createPet } from './client.ts';
+
+let sent = '';
+configure({
+  fetch: (async (_url: string, init: RequestInit) => { sent = init.body as string; return ${OK}; }) as unknown as typeof fetch,
+});
+use({ onRequest: (ctx) => { (ctx.body as { name: string }).name = 'Mutated'; } });
+await createPet({ name: 'Rex' });
+console.log(JSON.stringify({ sent }));
+`
+    ) as { sent: string };
+
+    expect(JSON.parse(captured.sent)).toEqual({ name: 'Mutated' });
+  }, 60_000);
+});
+
+describe('middleware — multi-file output (split)', () => {
+  let dir = '';
+  beforeAll(() => {
+    dir = mkdtempSync(join(tmpdir(), 'mw-split-'));
+    generate(dir, ['--output-mode', 'split']);
+  }, 60_000);
+  afterAll(() => {
+    if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
+  });
+
+  test('configure() and use() are re-exported by the entry barrel and affect operations', () => {
+    const captured = runConsumer(
+      dir,
+      `
+import { configure, use, listPets } from './client.ts';
+let url = '', header = '';
+configure({ baseUrl: 'https://multi.example.com', fetch: (async (u: string, init: RequestInit) => { url = u; header = (init.headers as Record<string,string>)['X-MW']; return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } }); }) as unknown as typeof fetch });
+use({ onRequest: (ctx) => { ctx.headers['X-MW'] = 'yes'; } });
+await listPets();
+console.log(JSON.stringify({ url, header }));
+`
+    ) as { url: string; header: string };
+    expect(captured.url.startsWith('https://multi.example.com')).toBe(true);
+    expect(captured.header).toBe('yes');
+  }, 60_000);
 });
 
 describe('middleware — result error mode', () => {
diff --git a/tests/e2e/generate-client/operation-types.test.ts b/tests/e2e/generate-client/operation-types.test.ts
new file mode 100644
index 0000000000..c9c03f5f05
--- /dev/null
+++ b/tests/e2e/generate-client/operation-types.test.ts
@@ -0,0 +1,80 @@
+/**
+ * Proves the generated client types `ctx.operation.{id,path,tags}` as literal unions: a valid
+ * comparison compiles, a misspelled operationId/tag does NOT. The whole point of the feature is
+ * compile-time typo-catching, so it gets a dedicated strict-`tsc` check.
+ */
+import { spawnSync } from 'node:child_process';
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const tsc = join(repoRoot, 'node_modules/.bin/tsc');
+const fixture = join(__dirname, 'fixtures/base.yaml');
+
+function gen(dir: string): void {
+  const r = spawnSync('node', [cli, 'generate-client', fixture, '--output', join(dir, 'client.ts')], {
+    cwd: repoRoot,
+    encoding: 'utf-8',
+  });
+  if (r.status !== 0) throw new Error(r.stderr);
+  writeFileSync(
+    join(dir, 'tsconfig.json'),
+    JSON.stringify({
+      compilerOptions: {
+        strict: true,
+        target: 'ES2022',
+        module: 'NodeNext',
+        moduleResolution: 'NodeNext',
+        noEmit: true,
+        allowImportingTsExtensions: true,
+        lib: ['ES2022', 'DOM'],
+        skipLibCheck: true,
+      },
+      include: ['*.ts'],
+    }),
+    'utf-8'
+  );
+}
+function typechecks(dir: string, consumer: string): boolean {
+  writeFileSync(join(dir, 'consumer.ts'), consumer, 'utf-8');
+  return spawnSync(tsc, ['-p', join(dir, 'tsconfig.json')], { cwd: dir, encoding: 'utf-8' }).status === 0;
+}
+
+describe('typed ctx.operation rejects typos at compile time', () => {
+  let dir = '';
+  beforeAll(() => {
+    dir = mkdtempSync(join(tmpdir(), 'optypes-'));
+    gen(dir);
+  }, 60_000);
+  afterAll(() => {
+    if (dir) rmSync(dir, { recursive: true, force: true });
+  });
+
+  test('a valid operationId/path comparison compiles', () => {
+    expect(
+      typechecks(
+        dir,
+        `
+import { use, type RequestContext } from './client.ts';
+use({ onRequest: (ctx: RequestContext) => { if (ctx.operation.id === 'listPets' || ctx.operation.path === '/pets') {} } });
+`
+      )
+    ).toBe(true);
+  }, 60_000);
+
+  test('a misspelled operationId fails to compile', () => {
+    expect(
+      typechecks(
+        dir,
+        `
+import { use, type RequestContext } from './client.ts';
+use({ onRequest: (ctx: RequestContext) => { if (ctx.operation.id === 'listPetss') {} } });
+`
+      )
+    ).toBe(false);
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/setup.test.ts b/tests/e2e/generate-client/setup.test.ts
new file mode 100644
index 0000000000..9c811b5ce8
--- /dev/null
+++ b/tests/e2e/generate-client/setup.test.ts
@@ -0,0 +1,147 @@
+/**
+ * Behavioral e2e for `--setup`: a publisher setup module baked into the single-file client.
+ * Generates a client with `--setup`, then drives the baked runtime in a real consumer to prove
+ * the defaults apply with no consumer `configure`/`use`, that a consumer can still override, and
+ * that combining `--setup` with a multi-file output mode fails fast.
+ */
+import { spawnSync } from 'node:child_process';
+import { existsSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
+const fixture = join(__dirname, 'fixtures/base.yaml');
+const tsxBin = join(repoRoot, 'node_modules/.bin/tsx');
+
+const SETUP = `
+import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
+export default defineClientSetup({
+  config: { baseUrl: 'https://baked.example.com' },
+  middleware: [{ onRequest: (ctx: RequestContext) => { ctx.headers['X-Baked'] = 'yes'; } }],
+});
+`;
+
+function generate(dir: string, extraArgs: string[] = []): { status: number | null; stderr: string } {
+  writeFileSync(join(dir, 'package.json'), JSON.stringify({ type: 'module' }), 'utf-8');
+  writeFileSync(join(dir, 'setup.ts'), SETUP, 'utf-8');
+  return spawnSync(
+    'node',
+    [
+      cliEntry,
+      'generate-client',
+      fixture,
+      '--output',
+      join(dir, 'client.ts'),
+      '--setup',
+      join(dir, 'setup.ts'),
+      ...extraArgs,
+    ],
+    { encoding: 'utf-8', cwd: repoRoot }
+  );
+}
+
+function runConsumer(dir: string, script: string): unknown {
+  writeFileSync(join(dir, 'consumer.ts'), script, 'utf-8');
+  const r = spawnSync(tsxBin, [join(dir, 'consumer.ts')], { encoding: 'utf-8', cwd: repoRoot });
+  if (r.status !== 0) throw new Error(`consumer failed:\n${r.stdout}\n${r.stderr}`);
+  return JSON.parse(r.stdout.trim());
+}
+
+describe('--setup bakes publisher defaults into the single-file client', () => {
+  let dir = '';
+  beforeAll(() => {
+    dir = mkdtempSync(join(tmpdir(), 'setup-'));
+    const r = generate(dir);
+    if (r.status !== 0) throw new Error(`generate failed:\n${r.stderr}`);
+  }, 60_000);
+  afterAll(() => {
+    if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
+  });
+
+  test('a consumer with no configure/use still sends the baked URL + header', () => {
+    const captured = runConsumer(
+      dir,
+      `
+import { listPets } from './client.ts';
+let url = '', header = '';
+globalThis.fetch = (async (u: string, init: RequestInit) => {
+  url = u; header = (init.headers as Record<string,string>)['X-Baked'];
+  return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
+}) as unknown as typeof fetch;
+await listPets();
+console.log(JSON.stringify({ url, header }));
+`
+    ) as { url: string; header: string };
+    expect(captured.url.startsWith('https://baked.example.com')).toBe(true);
+    expect(captured.header).toBe('yes');
+  }, 60_000);
+
+  test('a consumer configure() overrides the baked default', () => {
+    const captured = runConsumer(
+      dir,
+      `
+import { configure, listPets } from './client.ts';
+let url = '';
+configure({ baseUrl: 'https://override.example.com', fetch: (async (u: string) => { url = u; return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } }); }) as unknown as typeof fetch });
+await listPets();
+console.log(JSON.stringify({ url }));
+`
+    ) as { url: string };
+    expect(captured.url.startsWith('https://override.example.com')).toBe(true);
+  }, 60_000);
+
+  test('applies in a multi-file layout (split) with no consumer setup', () => {
+    const dir2 = mkdtempSync(join(tmpdir(), 'setup-split-'));
+    try {
+      const r = generate(dir2, ['--output-mode', 'split']);
+      expect(r.status, r.stderr).toBe(0);
+      const captured = runConsumer(
+        dir2,
+        `
+import { listPets } from './client.ts';
+let url = '', header = '';
+globalThis.fetch = (async (u: string, init: RequestInit) => { url = u; header = (init.headers as Record<string,string>)['X-Baked']; return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } }); }) as unknown as typeof fetch;
+await listPets();
+console.log(JSON.stringify({ url, header }));
+`
+      ) as { url: string; header: string };
+      expect(captured.url.startsWith('https://baked.example.com')).toBe(true);
+      expect(captured.header).toBe('yes');
+    } finally {
+      rmSync(dir2, { recursive: true, force: true });
+    }
+  }, 60_000);
+});
+
+describe('--setup with the service-class facade', () => {
+  let dir = '';
+  beforeAll(() => {
+    dir = mkdtempSync(join(tmpdir(), 'setup-sc-'));
+    const r = generate(dir, ['--facade', 'service-class', '--name', 'PetClient']);
+    if (r.status !== 0) throw new Error(`generate failed:\n${r.stderr}`);
+  }, 60_000);
+  afterAll(() => {
+    if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
+  });
+
+  test('new Client() with no args picks up the baked defaults; a passed config overrides', () => {
+    const captured = runConsumer(
+      dir,
+      `
+import { PetClient } from './client.ts';
+const fetchSpy = (sink: { url: string; header: string }) => (async (u: string, init: RequestInit) => { sink.url = u; sink.header = (init.headers as Record<string,string>)['X-Baked']; return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } }); }) as unknown as typeof fetch;
+const baked = { url: '', header: '' };
+await new PetClient({ fetch: fetchSpy(baked) }).listPets();
+const overridden = { url: '', header: '' };
+await new PetClient({ baseUrl: 'https://override.example.com', fetch: fetchSpy(overridden) }).listPets();
+console.log(JSON.stringify({ baked, overridden }));
+`
+    ) as { baked: { url: string; header: string }; overridden: { url: string } };
+    expect(captured.baked.url.startsWith('https://baked.example.com')).toBe(true);
+    expect(captured.baked.header).toBe('yes');
+    expect(captured.overridden.url.startsWith('https://override.example.com')).toBe(true);
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/sse-consumer/api.ts b/tests/e2e/generate-client/sse-consumer/api.ts
index 8f9e8801c0..9325a189db 100644
--- a/tests/e2e/generate-client/sse-consumer/api.ts
+++ b/tests/e2e/generate-client/sse-consumer/api.ts
@@ -21,10 +21,10 @@ export type Message = {
  * without re-deriving them at each call site.
  */
 export const OPERATIONS = {
-    getHealth: { method: "GET", path: "/health" },
-    streamMessages: { method: "GET", path: "/messages" },
-    streamAbort: { method: "GET", path: "/abort-messages" },
-    streamTicks: { method: "GET", path: "/ticks" }
+    getHealth: { method: "GET", path: "/health", tags: ["Health"] },
+    streamMessages: { method: "GET", path: "/messages", tags: ["Messages"] },
+    streamAbort: { method: "GET", path: "/abort-messages", tags: ["Messages"] },
+    streamTicks: { method: "GET", path: "/ticks", tags: ["Ticks"] }
 } as const;
 
 /**
@@ -33,21 +33,35 @@ export const OPERATIONS = {
 export type OperationId = keyof typeof OPERATIONS;
 
 /**
- * Static metadata describing one operation: its HTTP method and path template.
+ * Static metadata describing one operation: its HTTP method, path template, and tags.
  */
 export type OperationMetadata = {
     readonly method: string;
     readonly path: string;
+    readonly tags: readonly string[];
 };
 
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
+
 let BASE = "http://localhost:3104";
 
+/** Identity of the operation a request belongs to. Stable across path interpolation. */
+export type OperationContext = {
+    id: OperationId;
+    path: OperationPath;
+    tags: OperationTag[];
+};
+
 /** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
 export type RequestContext = {
     url: string;
     method: string;
     headers: Record<string, string>;
     body?: unknown;
+    /** The operation being called: its id (operationId), path template, and tags. */
+    operation: OperationContext;
 };
 
 /**
@@ -298,7 +312,7 @@ function __buildUrl(config: ClientConfig, path: string, query?: Record<string, Q
     return qs ? `${url}?${qs}` : url;
 }
 
-async function __send(config: ClientConfig, url: string, init: RequestOptions, body?: unknown): Promise<{
+async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
     response: Response;
     context: RequestContext;
 }> {
@@ -310,7 +324,7 @@ async function __send(config: ClientConfig, url: string, init: RequestOptions, b
         ...extra,
         ...(fetchInit.headers as Record<string, string> | undefined),
     };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body };
+    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
     const middleware = __middleware(config);
     for (const mw of middleware)
         if (mw.onRequest)
@@ -408,9 +422,9 @@ async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unkn
     return response.blob();
 }
 
-async function __request<T>(config: ClientConfig, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
+async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
     const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, url, sendInit, body);
+    const { response, context } = await __send(config, op, url, sendInit, body);
     if (!response.ok) {
         const errorBody = await readError(response);
         let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
@@ -502,7 +516,7 @@ export type SseOptions = RequestInit & {
     reconnectDelay?: number;
 };
 
-async function* __sse<T>(config: ClientConfig, url: string, init: SseOptions, dataKind: 'json' | 'text' = 'text'): AsyncGenerator<ServerSentEvent<T>> {
+async function* __sse<T>(config: ClientConfig, op: OperationContext, url: string, init: SseOptions, dataKind: 'json' | 'text' = 'text'): AsyncGenerator<ServerSentEvent<T>> {
     const { reconnect = true, reconnectDelay, ...rest } = init;
     const signal = rest.signal ?? undefined;
     const headers: Record<string, string> = {
@@ -517,7 +531,7 @@ async function* __sse<T>(config: ClientConfig, url: string, init: SseOptions, da
             return;
         const sendHeaders = lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
         try {
-            const { response } = await __send(config, url, { ...rest, method: rest.method ?? 'GET', headers: sendHeaders });
+            const { response } = await __send(config, op, url, { ...rest, method: rest.method ?? 'GET', headers: sendHeaders });
             if (!response.ok) {
                 const errorBody = await readError(response);
                 throw new ApiError(url, response.status, response.statusText, errorBody);
@@ -636,19 +650,19 @@ function __parseSseFrame(raw: string, dataKind: 'json' | 'text'): ServerSentEven
 export type GetHealthResult = Health;
 
 export async function getHealth(init: RequestOptions = {}): Promise<Health> {
-    return __request<Health>(__config, __buildUrl(__config, `/health`), { method: "GET", ...init });
+    return __request<Health>(__config, { id: "getHealth", path: "/health", tags: ["Health"] }, __buildUrl(__config, `/health`), { method: "GET", ...init });
 }
 
 async function* streamMessages(init: SseOptions = {}): AsyncGenerator<ServerSentEvent<Message>> {
-    yield* __sse<Message>(__config, __buildUrl(__config, `/messages`), { method: "GET", ...init }, "json");
+    yield* __sse<Message>(__config, { id: "streamMessages", path: "/messages", tags: ["Messages"] }, __buildUrl(__config, `/messages`), { method: "GET", ...init }, "json");
 }
 
 async function* streamAbort(init: SseOptions = {}): AsyncGenerator<ServerSentEvent<Message>> {
-    yield* __sse<Message>(__config, __buildUrl(__config, `/abort-messages`), { method: "GET", ...init }, "json");
+    yield* __sse<Message>(__config, { id: "streamAbort", path: "/abort-messages", tags: ["Messages"] }, __buildUrl(__config, `/abort-messages`), { method: "GET", ...init }, "json");
 }
 
 async function* streamTicks(init: SseOptions = {}): AsyncGenerator<ServerSentEvent<string>> {
-    yield* __sse<string>(__config, __buildUrl(__config, `/ticks`), { method: "GET", ...init }, "text");
+    yield* __sse<string>(__config, { id: "streamTicks", path: "/ticks", tags: ["Ticks"] }, __buildUrl(__config, `/ticks`), { method: "GET", ...init }, "text");
 }
 
 export const sse = { streamMessages, streamAbort, streamTicks };

From b4930f20aa8148d859665b7a630b08a50e499de3 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 30 Jun 2026 15:27:42 +0300
Subject: [PATCH 031/134] fix: formatting

---
 docs/@v2/commands/generate-client.md          | 13 ++++---
 packages/cli/src/commands/generate-client.ts  |  2 +-
 packages/client-generator/ARCHITECTURE.md     |  2 +-
 packages/client-generator/README.md           |  5 +--
 .../0014-request-response-customization.md    |  4 +--
 .../docs/adr/0015-publisher-setup-bake-in.md  |  8 ++---
 packages/client-generator/docs/adr/README.md  | 34 +++++++++----------
 packages/client-generator/examples/README.md  | 18 +++++-----
 .../examples/baked-setup/README.md            |  2 +-
 .../src/__tests__/runtime-contract.test.ts    |  2 +-
 .../src/emitters/__tests__/client.test.ts     |  5 ++-
 .../client-generator/src/emitters/client.ts   |  8 +++--
 .../src/emitters/operations.ts                |  5 +--
 tests/e2e/generate-client/cafe.test.ts        | 12 +++++--
 .../generate-client/operation-types.test.ts   | 16 ++++++---
 tests/e2e/generate-client/setup.test.ts       |  5 ++-
 16 files changed, 83 insertions(+), 58 deletions(-)

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index 630059885a..42c1a49633 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -385,7 +385,11 @@ export const OPERATIONS = {
 export type OperationId = keyof typeof OPERATIONS;
 export type OperationPath = (typeof OPERATIONS)[OperationId]['path'];
 export type OperationTag = (typeof OPERATIONS)[OperationId]['tags'][number];
-export type OperationMetadata = { readonly method: string; readonly path: string; readonly tags: readonly string[] };
+export type OperationMetadata = {
+  readonly method: string;
+  readonly path: string;
+  readonly tags: readonly string[];
+};
 ```
 
 These same `OperationId` / `OperationPath` / `OperationTag` unions type `ctx.operation` in middleware (above), so you get autocomplete and typo-checking there too.
@@ -503,7 +507,7 @@ The `onRequest` / `onResponse` / `onError` fields on `ClientConfig` still work 
 
 ## Baking defaults into a published SDK (`--setup`)
 
-The middleware above is composed by the **consumer**. If you **publish an SDK** and want those defaults already active for *your* users, bake them in at generation time with `--setup <file>`.
+The middleware above is composed by the **consumer**. If you **publish an SDK** and want those defaults already active for _your_ users, bake them in at generation time with `--setup <file>`.
 
 The setup module imports its contract from `@redocly/client-generator` (so it resolves and is unit-testable before the client is generated) and returns a `defineClientSetup({ config, middleware })`:
 
@@ -517,7 +521,8 @@ export default defineClientSetup({
     {
       onRequest: (ctx: RequestContext) => {
         ctx.headers['X-Acme-SDK'] = '1.4.0';
-        if (ctx.operation.tags.includes('Orders')) ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
+        if (ctx.operation.tags.includes('Orders'))
+          ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
       },
     },
   ],
@@ -530,7 +535,7 @@ redocly generate-client openapi.yaml --output src/api/client.ts --setup ./client
 
 The generator bakes the `config`/`middleware` into the generated client, so the published package applies them on import. It works across **all output modes and both facades** (functions: the global `configure`/`use`; service-class: `new Client()` merges the baked defaults). Downstream users call operations with no setup of their own and can still customize on top — the baked block runs first, then theirs:
 
-- **Config values** (`fetch`/transport, `baseUrl`, `headers`, `retry`, single hooks) are last-write-wins, so a consumer **overrides** the baked default — a consumer `config.fetch` *replaces* a baked transport rather than wrapping it.
+- **Config values** (`fetch`/transport, `baseUrl`, `headers`, `retry`, single hooks) are last-write-wins, so a consumer **overrides** the baked default — a consumer `config.fetch` _replaces_ a baked transport rather than wrapping it.
 - **Middleware** (`use`) **composes** — baked middleware runs first, then the consumer's (`onRequest` in order, `onResponse` reversed). A publisher who needs un-bypassable behavior should express it as middleware, not a baked `fetch`.
 
 {% admonition type="warning" name="Constraints" %}
diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index 97165e8190..576541e58f 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -1,5 +1,5 @@
-import { type Config, HandledError, isPlainObject, logger } from '@redocly/openapi-core';
 import { type Config as OpenApiTsConfig } from '@redocly/client-generator';
+import { type Config, HandledError, isPlainObject, logger } from '@redocly/openapi-core';
 import { blue, gray, yellow } from 'colorette';
 import { dirname, isAbsolute, resolve as resolvePath } from 'node:path';
 
diff --git a/packages/client-generator/ARCHITECTURE.md b/packages/client-generator/ARCHITECTURE.md
index d0491d2145..ce825dd25b 100644
--- a/packages/client-generator/ARCHITECTURE.md
+++ b/packages/client-generator/ARCHITECTURE.md
@@ -48,7 +48,7 @@ flowchart LR
 
 | Area       | Files                                                                                                                                                                                                                                                                                                                                                                                                                       | Owns                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Depth                                                                                                                                                                         |
 | ---------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Entry      | `index.ts`, `types.ts`, `config.ts`, `config-file.ts`, `plugin.ts`                                                                                                                                                                                                                                                                                                                                                          | `generateClient` orchestration; public option/result types; config loading; the experimental `@redocly/client-generator/plugin` entry (`defineGenerator` + IR types + codegen toolkit)                                                                                                                                                                                                                                                                                     | thin orchestrator                                                                                                                                                             |
+| Entry      | `index.ts`, `types.ts`, `config.ts`, `config-file.ts`, `plugin.ts`                                                                                                                                                                                                                                                                                                                                                          | `generateClient` orchestration; public option/result types; config loading; the experimental `@redocly/client-generator/plugin` entry (`defineGenerator` + IR types + codegen toolkit)                                                                                                                                                                                                                                                                                       | thin orchestrator                                                                                                                                                             |
 | Load       | `loader.ts`                                                                                                                                                                                                                                                                                                                                                                                                                 | bundle + `$ref` resolution, preserving internal refs                                                                                                                                                                                                                                                                                                                                                                                                                         | deep (hides `openapi-core`)                                                                                                                                                   |
 | IR         | `ir/build.ts`, `ir/model.ts`, `ir/refs.ts`, `ir/normalize-swagger2.ts`, `ir/sanitize-identifiers.ts`                                                                                                                                                                                                                                                                                                                        | OpenAPI → IR; the IR type model; ref collection; Swagger 2.0 → 3.x normalization; coerce document-derived names to safe unique identifiers (security boundary)                                                                                                                                                                                                                                                                                                               | deep (`buildApiModel` + `normalizeSwagger2` each one interface over a whole walk)                                                                                             |
 | Writers    | `writers/index.ts`, `single-file-writer.ts`, `split-writer.ts`, `tagged.ts`, `tags-writer.ts`, `tags-split-writer.ts`, `group-by-tag.ts`, `util.ts`, `types.ts`                                                                                                                                                                                                                                                             | file layout per output mode                                                                                                                                                                                                                                                                                                                                                                                                                                                  | thin adapters at the `getWriter` seam + `group-by-tag` (deep)                                                                                                                 |
diff --git a/packages/client-generator/README.md b/packages/client-generator/README.md
index f562eaef88..907055d71b 100644
--- a/packages/client-generator/README.md
+++ b/packages/client-generator/README.md
@@ -193,7 +193,7 @@ See the [`customization` example](./examples/customization) for a runnable end-t
 
 ### Baking defaults into a published SDK
 
-The customization above is composed by the **consumer**. If you instead **publish an SDK** and want those defaults already active for *your* users, bake them in at generation time with `--setup <file>`. The setup module imports its contract from `@redocly/client-generator` (so it resolves and is unit-testable before the client is generated) and returns a `defineClientSetup({ config, middleware })`:
+The customization above is composed by the **consumer**. If you instead **publish an SDK** and want those defaults already active for _your_ users, bake them in at generation time with `--setup <file>`. The setup module imports its contract from `@redocly/client-generator` (so it resolves and is unit-testable before the client is generated) and returns a `defineClientSetup({ config, middleware })`:
 
 ```ts
 // client-setup.ts
@@ -205,7 +205,8 @@ export default defineClientSetup({
     {
       onRequest: (ctx: RequestContext) => {
         ctx.headers['X-Acme-SDK'] = '1.4.0';
-        if (ctx.operation.tags.includes('Orders')) ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
+        if (ctx.operation.tags.includes('Orders'))
+          ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
       },
     },
   ],
diff --git a/packages/client-generator/docs/adr/0014-request-response-customization.md b/packages/client-generator/docs/adr/0014-request-response-customization.md
index 6c77d98e48..f439aa3e44 100644
--- a/packages/client-generator/docs/adr/0014-request-response-customization.md
+++ b/packages/client-generator/docs/adr/0014-request-response-customization.md
@@ -22,7 +22,7 @@ The codegen-time alternatives considered (a dedicated plugin, extending the `tra
 Auditing the surface against real needs leaves three genuine gaps:
 
 1. **Targeting by operation identity.** Middleware can only match on `ctx.url` / `ctx.method`, so "all `admin`-tagged operations" or "the `createOrder` operation" can only be expressed as brittle URL regexes — `RequestContext` carries no `operationId`, `tags`, or path template.
-2. **Request body mutation is silently ignored.** The body is serialized into the fetch payload *before* `onRequest` runs, and the fetch sends that payload — not `ctx.body`. So mutating `ctx.body` (case conversion, enveloping, signing) is a footgun: it type-checks and does nothing.
+2. **Request body mutation is silently ignored.** The body is serialized into the fetch payload _before_ `onRequest` runs, and the fetch sends that payload — not `ctx.body`. So mutating `ctx.body` (case conversion, enveloping, signing) is a footgun: it type-checks and does nothing.
 3. **Typed-result enrichment.** Middleware sees only the raw `Response`, not the deserialized value, so enriching the typed result is impossible without reconstructing a `Response`.
 
 ## Decision
@@ -32,7 +32,7 @@ Auditing the surface against real needs leaves three genuine gaps:
 We close the prioritized gaps by **extending the same runtime contract**, additively:
 
 1. **Operation metadata in `RequestContext`.** Thread the operation's identity into the context the runtime builds — at minimum `operationId`, plus `tags` and the path template (the `path` before parameter interpolation). Middleware then targets requests semantically (`ctx.operationId === 'createOrder'`, `ctx.tags.includes('admin')`) instead of by URL shape. Emitted into every client; the existing `url`/`method`/`headers` fields are unchanged.
-2. **Make the request body mutable in `onRequest`.** Serialize the payload from `ctx.body` *after* the `onRequest` chain runs, so body transforms take effect. The default behavior (JSON-encode a plain object, pass through `Blob`/`FormData`/string) is unchanged when no hook touches the body.
+2. **Make the request body mutable in `onRequest`.** Serialize the payload from `ctx.body` _after_ the `onRequest` chain runs, so body transforms take effect. The default behavior (JSON-encode a plain object, pass through `Blob`/`FormData`/string) is unchanged when no hook touches the body.
 
 We **defer typed-result enrichment** (gap 3): it weakens the contract's type safety and has no concrete demand — the raw-`Response` `onResponse` hook covers the asked-for cases. Revisit only on a real need.
 
diff --git a/packages/client-generator/docs/adr/0015-publisher-setup-bake-in.md b/packages/client-generator/docs/adr/0015-publisher-setup-bake-in.md
index 6834729281..bc4fbf9326 100644
--- a/packages/client-generator/docs/adr/0015-publisher-setup-bake-in.md
+++ b/packages/client-generator/docs/adr/0015-publisher-setup-bake-in.md
@@ -5,9 +5,9 @@
 
 ## Context
 
-[ADR-0014](./0014-request-response-customization.md) settled request/response customization as a **runtime** contract a *consumer* composes (`configure`/`use` from their own module), and deliberately ruled out stitching consumer code into the generated output.
+[ADR-0014](./0014-request-response-customization.md) settled request/response customization as a **runtime** contract a _consumer_ composes (`configure`/`use` from their own module), and deliberately ruled out stitching consumer code into the generated output.
 
-But an API provider **publishing an SDK on npm** has a different need: they want the generated client to ship with *their* cross-cutting defaults already wired in — base URL, retry, a header injector, an idempotency-key middleware — so their downstream users `npm install` it and call operations with no `configure`/`use` of their own. Today only `baseUrl` can be baked (it is inlined); everything else is runtime-only.
+But an API provider **publishing an SDK on npm** has a different need: they want the generated client to ship with _their_ cross-cutting defaults already wired in — base URL, retry, a header injector, an idempotency-key middleware — so their downstream users `npm install` it and call operations with no `configure`/`use` of their own. Today only `baseUrl` can be baked (it is inlined); everything else is runtime-only.
 
 The obvious shape — a setup file that imports `configure`/`use` from `./client` and calls them — fails twice: the generated client does not exist when the setup is authored (the import will not resolve), and side-effecting calls against a per-client `configure`/`use` cannot be meaningfully unit-tested. The publisher actor is therefore a distinct, opt-in **build-time** concern, and must not break the zero-dependency guarantee ([ADR-0002](./0002-typescript-peer-dep.md)).
 
@@ -30,9 +30,9 @@ The baker (`setup-bake.ts`) parses the module, **rejects any import other than `
 - **Functions facade**: after `configure`/`use` are defined, the emitter applies `configure(__redoclySetup.config ?? {})` + `use(...(__redoclySetup.middleware ?? []))`. In multi-file this lives in the http module, which the entry imports, so it runs on load for every layout.
 - **Service-class facade**: the generated class constructor merges `__redoclySetup` into its per-instance `this.config` (`{ ...baked, ...passed }`, baked middleware first), so `new Client()` gets the defaults and `new Client(override)` merges on top.
 
-This **refines** ADR-0014 (it does not supersede it): ADR-0014's "no stitching consumer code" governs *consumer self-customization*; publisher bake-in is a separate, explicit build-time seam.
+This **refines** ADR-0014 (it does not supersede it): ADR-0014's "no stitching consumer code" governs _consumer self-customization_; publisher bake-in is a separate, explicit build-time seam.
 
-**Override semantics.** The baked block runs first (at import). A consumer's own customization then layers on with two distinct rules: scalar `ClientConfig` fields (`fetch`/transport, `baseUrl`, `headers`, `retry`, the single hooks) are a single slot set via `configure` (`Object.assign`) — **last write wins, so the consumer overrides the baked default** (a consumer `config.fetch` *replaces* a baked transport rather than wrapping it). Middleware registered via `use` **composes** — baked middleware appended first, consumer middleware after; both run (`onRequest` in order, `onResponse` reversed). A publisher who needs un-bypassable behavior should express it as middleware, not a baked `config.fetch`.
+**Override semantics.** The baked block runs first (at import). A consumer's own customization then layers on with two distinct rules: scalar `ClientConfig` fields (`fetch`/transport, `baseUrl`, `headers`, `retry`, the single hooks) are a single slot set via `configure` (`Object.assign`) — **last write wins, so the consumer overrides the baked default** (a consumer `config.fetch` _replaces_ a baked transport rather than wrapping it). Middleware registered via `use` **composes** — baked middleware appended first, consumer middleware after; both run (`onRequest` in order, `onResponse` reversed). A publisher who needs un-bypassable behavior should express it as middleware, not a baked `config.fetch`.
 
 ## Consequences
 
diff --git a/packages/client-generator/docs/adr/README.md b/packages/client-generator/docs/adr/README.md
index e31de902c3..b8bddf076a 100644
--- a/packages/client-generator/docs/adr/README.md
+++ b/packages/client-generator/docs/adr/README.md
@@ -9,23 +9,23 @@ ARCHITECTURE.md says _what is_; these ADRs say _why_.
 
 ## Index
 
-| #                                          | Decision                                                           | Status                  |
-| ------------------------------------------ | ------------------------------------------------------------------ | ----------------------- |
-| [0001](./0001-ast-codegen.md)              | Generate TypeScript via the TS AST (`ts.factory`), not strings     | Accepted                |
-| [0002](./0002-typescript-peer-dep.md)      | `typescript` as a peer dep; zero-runtime-dependency output         | Accepted                |
-| [0003](./0003-spec-agnostic-ir.md)         | A spec-agnostic IR as the builder↔emitter contract                 | Accepted                |
-| [0004](./0004-registry-seams.md)           | First-party `getGenerator` / `getWriter` registry seams            | Accepted                |
-| [0005](./0005-error-mode-terminals.md)     | Error handling as a generate-time mode (throw vs result)           | Accepted                |
-| [0006](./0006-sse-namespace.md)            | SSE as a derived response kind under an `sse.*` namespace          | Accepted                |
-| [0007](./0007-call-site-auth.md)           | Auth resolved at the call site via async `__auth`                  | Accepted (ext. by 0009) |
-| [0008](./0008-redocly-yaml-config.md)      | `generate-client` config via `redocly.yaml` `x-client-generator` | Accepted                |
-| [0009](./0009-per-instance-auth.md)        | Per-instance auth via `ClientConfig.auth`                          | Accepted                |
-| [0010](./0010-mock-data-baked-vs-faker.md) | Mock data: baked literals by default, faker opt-in                 | Accepted                |
-| [0011](./0011-wrapper-generators.md)       | Data-fetching wrapper generators (`swr`, `tanstack-query`)         | Accepted                |
-| [0012](./0012-plugin-api.md)               | Experimental custom-generator (plugin) API                         | Accepted (experimental) |
-| [0013](./0013-experimental-status.md)      | Experimental release status & stabilization criteria               | Accepted                |
-| [0014](./0014-request-response-customization.md) | Request/response customization as a runtime contract         | Accepted                |
-| [0015](./0015-publisher-setup-bake-in.md)  | Publisher setup bake-in via `--setup`                              | Accepted                |
+| #                                                | Decision                                                         | Status                  |
+| ------------------------------------------------ | ---------------------------------------------------------------- | ----------------------- |
+| [0001](./0001-ast-codegen.md)                    | Generate TypeScript via the TS AST (`ts.factory`), not strings   | Accepted                |
+| [0002](./0002-typescript-peer-dep.md)            | `typescript` as a peer dep; zero-runtime-dependency output       | Accepted                |
+| [0003](./0003-spec-agnostic-ir.md)               | A spec-agnostic IR as the builder↔emitter contract               | Accepted                |
+| [0004](./0004-registry-seams.md)                 | First-party `getGenerator` / `getWriter` registry seams          | Accepted                |
+| [0005](./0005-error-mode-terminals.md)           | Error handling as a generate-time mode (throw vs result)         | Accepted                |
+| [0006](./0006-sse-namespace.md)                  | SSE as a derived response kind under an `sse.*` namespace        | Accepted                |
+| [0007](./0007-call-site-auth.md)                 | Auth resolved at the call site via async `__auth`                | Accepted (ext. by 0009) |
+| [0008](./0008-redocly-yaml-config.md)            | `generate-client` config via `redocly.yaml` `x-client-generator` | Accepted                |
+| [0009](./0009-per-instance-auth.md)              | Per-instance auth via `ClientConfig.auth`                        | Accepted                |
+| [0010](./0010-mock-data-baked-vs-faker.md)       | Mock data: baked literals by default, faker opt-in               | Accepted                |
+| [0011](./0011-wrapper-generators.md)             | Data-fetching wrapper generators (`swr`, `tanstack-query`)       | Accepted                |
+| [0012](./0012-plugin-api.md)                     | Experimental custom-generator (plugin) API                       | Accepted (experimental) |
+| [0013](./0013-experimental-status.md)            | Experimental release status & stabilization criteria             | Accepted                |
+| [0014](./0014-request-response-customization.md) | Request/response customization as a runtime contract             | Accepted                |
+| [0015](./0015-publisher-setup-bake-in.md)        | Publisher setup bake-in via `--setup`                            | Accepted                |
 
 ## Template
 
diff --git a/packages/client-generator/examples/README.md b/packages/client-generator/examples/README.md
index c590e89b8e..d0aaa79ccd 100644
--- a/packages/client-generator/examples/README.md
+++ b/packages/client-generator/examples/README.md
@@ -6,16 +6,16 @@ generator in CI** (`tests/e2e/examples.test.ts`). The first five are Vite apps t
 generated via the `redocly generate-client` CLI (a `redocly.yaml`); `programmatic` _generates_ one with
 the `generateClient(...)` API.
 
-| Example                              | How it's generated            | Shows                                           |
-| ------------------------------------ | ----------------------------- | ----------------------------------------------- |
-| [fetch-functions](./fetch-functions) | CLI · `sdk`, functions        | free functions + `ApiError`                     |
+| Example                              | How it's generated            | Shows                                                                                   |
+| ------------------------------------ | ----------------------------- | --------------------------------------------------------------------------------------- |
+| [fetch-functions](./fetch-functions) | CLI · `sdk`, functions        | free functions + `ApiError`                                                             |
 | [customization](./customization)     | CLI · `sdk`, functions        | request/response middleware, `ctx.operation` targeting, body mutation, custom transport |
-| [baked-setup](./baked-setup)         | CLI · `sdk`, functions        | publisher defaults baked into the client via `--setup` (`defineClientSetup`) |
-| [service-class](./service-class)     | CLI · `sdk`, service-class    | `new Client({ baseUrl })`, per-instance `auth`  |
-| [zod](./zod)                         | CLI · `sdk`, `zod`            | validating responses with generated zod schemas |
-| [tanstack-query](./tanstack-query)   | CLI · `sdk`, `tanstack-query` | React `useQuery(<op>Options())`                 |
-| [mock](./mock)                       | CLI · `sdk`, `mock`           | MSW handlers from generated `handlers`          |
-| [programmatic](./programmatic)       | `generateClient(...)` API     | generating the client from a Node script        |
+| [baked-setup](./baked-setup)         | CLI · `sdk`, functions        | publisher defaults baked into the client via `--setup` (`defineClientSetup`)            |
+| [service-class](./service-class)     | CLI · `sdk`, service-class    | `new Client({ baseUrl })`, per-instance `auth`                                          |
+| [zod](./zod)                         | CLI · `sdk`, `zod`            | validating responses with generated zod schemas                                         |
+| [tanstack-query](./tanstack-query)   | CLI · `sdk`, `tanstack-query` | React `useQuery(<op>Options())`                                                         |
+| [mock](./mock)                       | CLI · `sdk`, `mock`           | MSW handlers from generated `handlers`                                                  |
+| [programmatic](./programmatic)       | `generateClient(...)` API     | generating the client from a Node script                                                |
 
 ## Run one
 
diff --git a/packages/client-generator/examples/baked-setup/README.md b/packages/client-generator/examples/baked-setup/README.md
index 1c40bf079f..c9869f0a59 100644
--- a/packages/client-generator/examples/baked-setup/README.md
+++ b/packages/client-generator/examples/baked-setup/README.md
@@ -1,6 +1,6 @@
 # baked-setup
 
-Shows the **publisher** story: an SDK that ships request/response defaults *built into* the generated
+Shows the **publisher** story: an SDK that ships request/response defaults _built into_ the generated
 client, so downstream users call operations with no setup of their own (see
 [ADR-0015](../../docs/adr/0015-publisher-setup-bake-in.md)).
 
diff --git a/packages/client-generator/src/__tests__/runtime-contract.test.ts b/packages/client-generator/src/__tests__/runtime-contract.test.ts
index 68e1a39afb..4110a76a29 100644
--- a/packages/client-generator/src/__tests__/runtime-contract.test.ts
+++ b/packages/client-generator/src/__tests__/runtime-contract.test.ts
@@ -1,5 +1,5 @@
-import { defineClientSetup } from '../runtime-contract.js';
 import { renderRuntime } from '../emitters/runtime.js';
+import { defineClientSetup } from '../runtime-contract.js';
 
 describe('defineClientSetup', () => {
   it('returns its argument unchanged (identity helper)', () => {
diff --git a/packages/client-generator/src/emitters/__tests__/client.test.ts b/packages/client-generator/src/emitters/__tests__/client.test.ts
index 540cf2514c..4319fae587 100644
--- a/packages/client-generator/src/emitters/__tests__/client.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/client.test.ts
@@ -5,7 +5,10 @@ import { apiModel, emitWithOp, namedSchema, operation, param } from './fixtures.
 describe('typed ctx.operation (OperationContext narrowing)', () => {
   const tagged = apiModel({
     services: [
-      { name: 'Default', operations: [operation({ name: 'listPets', path: '/pets', tags: ['Pets'] })] },
+      {
+        name: 'Default',
+        operations: [operation({ name: 'listPets', path: '/pets', tags: ['Pets'] })],
+      },
     ],
   });
 
diff --git a/packages/client-generator/src/emitters/client.ts b/packages/client-generator/src/emitters/client.ts
index f63b2677d8..7aa203fd13 100644
--- a/packages/client-generator/src/emitters/client.ts
+++ b/packages/client-generator/src/emitters/client.ts
@@ -359,8 +359,12 @@ function httpModuleContent(
   // The baked setup lives in the shared http module: `configure`/`use` are defined here, and every
   // layout's entry imports it, so it runs on load. Service-class exports `__redoclySetup` so each
   // per-tag class module can import and merge it.
-  const setup = options.setup ? [setupApply(options.setup, facade, facade === 'service-class')] : [];
-  return banner([HEADER, importLine, printStatements([...f.runtime, ...f.auth]), ...setup].filter(Boolean));
+  const setup = options.setup
+    ? [setupApply(options.setup, facade, facade === 'service-class')]
+    : [];
+  return banner(
+    [HEADER, importLine, printStatements([...f.runtime, ...f.auth]), ...setup].filter(Boolean)
+  );
 }
 
 /** The shared schemas module's content: model types + type guards + operation metadata. */
diff --git a/packages/client-generator/src/emitters/operations.ts b/packages/client-generator/src/emitters/operations.ts
index 75558e9357..aab8d00ab6 100644
--- a/packages/client-generator/src/emitters/operations.ts
+++ b/packages/client-generator/src/emitters/operations.ts
@@ -521,10 +521,7 @@ function serviceClassStatements(
   ctx: EmitContext
 ): ts.Statement[] {
   const aliases: ts.Statement[] = [];
-  const members: ts.ClassElement[] = [
-    ...constructorMembers(ctx.bakedSetup),
-    serviceUseMethod(),
-  ];
+  const members: ts.ClassElement[] = [...constructorMembers(ctx.bakedSetup), serviceUseMethod()];
 
   const { regular, sse } = partitionOps(ops);
   for (const op of regular) {
diff --git a/tests/e2e/generate-client/cafe.test.ts b/tests/e2e/generate-client/cafe.test.ts
index caa1f4890f..f2443cbf67 100644
--- a/tests/e2e/generate-client/cafe.test.ts
+++ b/tests/e2e/generate-client/cafe.test.ts
@@ -196,9 +196,15 @@ describe('generate-client end-to-end (cafe.yaml)', () => {
       /export type OperationMetadata = \{\s*readonly method: string;\s*readonly path: string;\s*readonly tags: readonly string\[\];\s*\};/
     );
     // A path-param operation keeps its `{param}` template, uppercased method, and tags.
-    expect(generated).toContain('getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] }');
-    expect(generated).toContain('updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] }');
-    expect(generated).toContain('createOrder: { method: "POST", path: "/orders", tags: ["Orders"] }');
+    expect(generated).toContain(
+      'getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] }'
+    );
+    expect(generated).toContain(
+      'updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] }'
+    );
+    expect(generated).toContain(
+      'createOrder: { method: "POST", path: "/orders", tags: ["Orders"] }'
+    );
   });
 
   test('generated file uses ergonomic signatures (positional path params + params object + body)', () => {
diff --git a/tests/e2e/generate-client/operation-types.test.ts b/tests/e2e/generate-client/operation-types.test.ts
index c9c03f5f05..eed5dfa343 100644
--- a/tests/e2e/generate-client/operation-types.test.ts
+++ b/tests/e2e/generate-client/operation-types.test.ts
@@ -16,10 +16,14 @@ const tsc = join(repoRoot, 'node_modules/.bin/tsc');
 const fixture = join(__dirname, 'fixtures/base.yaml');
 
 function gen(dir: string): void {
-  const r = spawnSync('node', [cli, 'generate-client', fixture, '--output', join(dir, 'client.ts')], {
-    cwd: repoRoot,
-    encoding: 'utf-8',
-  });
+  const r = spawnSync(
+    'node',
+    [cli, 'generate-client', fixture, '--output', join(dir, 'client.ts')],
+    {
+      cwd: repoRoot,
+      encoding: 'utf-8',
+    }
+  );
   if (r.status !== 0) throw new Error(r.stderr);
   writeFileSync(
     join(dir, 'tsconfig.json'),
@@ -41,7 +45,9 @@ function gen(dir: string): void {
 }
 function typechecks(dir: string, consumer: string): boolean {
   writeFileSync(join(dir, 'consumer.ts'), consumer, 'utf-8');
-  return spawnSync(tsc, ['-p', join(dir, 'tsconfig.json')], { cwd: dir, encoding: 'utf-8' }).status === 0;
+  return (
+    spawnSync(tsc, ['-p', join(dir, 'tsconfig.json')], { cwd: dir, encoding: 'utf-8' }).status === 0
+  );
 }
 
 describe('typed ctx.operation rejects typos at compile time', () => {
diff --git a/tests/e2e/generate-client/setup.test.ts b/tests/e2e/generate-client/setup.test.ts
index 9c811b5ce8..a2a281b4ab 100644
--- a/tests/e2e/generate-client/setup.test.ts
+++ b/tests/e2e/generate-client/setup.test.ts
@@ -24,7 +24,10 @@ export default defineClientSetup({
 });
 `;
 
-function generate(dir: string, extraArgs: string[] = []): { status: number | null; stderr: string } {
+function generate(
+  dir: string,
+  extraArgs: string[] = []
+): { status: number | null; stderr: string } {
   writeFileSync(join(dir, 'package.json'), JSON.stringify({ type: 'module' }), 'utf-8');
   writeFileSync(join(dir, 'setup.ts'), SETUP, 'utf-8');
   return spawnSync(

From 18fe9c38fbcaa79b945e49d888f100c2fdd13346 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 30 Jun 2026 15:39:32 +0300
Subject: [PATCH 032/134] fix(client-generator): resolve CodeQL alerts (ReDoS,
 URL/stack-trace, cat)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Bound the path-template regex inner class to [^{}] so it can't backtrack
  quadratically on adversarial spec paths (operation-signature, mock, operations).
  Output is unchanged — param names can't contain braces.
- Assert request URLs by parsed origin instead of startsWith() in the
  setup/middleware e2e tests (incomplete URL substring sanitization).
- Stop echoing error.message into the mock-server 500 responses.
- Read the generated client with readFileSync instead of spawning cat.
---
 packages/client-generator/src/emitters/mock.ts         |  2 +-
 .../src/emitters/operation-signature.ts                |  2 +-
 packages/client-generator/src/emitters/operations.ts   |  2 +-
 tests/e2e/generate-client/base-consumer/server.ts      |  7 +------
 tests/e2e/generate-client/cafe-consumer/server.ts      |  7 +------
 tests/e2e/generate-client/middleware.test.ts           |  2 +-
 tests/e2e/generate-client/path-param-idents.test.ts    |  4 ++--
 tests/e2e/generate-client/setup.test.ts                | 10 +++++-----
 8 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/packages/client-generator/src/emitters/mock.ts b/packages/client-generator/src/emitters/mock.ts
index 9175b4c5f6..3a1409ccc6 100644
--- a/packages/client-generator/src/emitters/mock.ts
+++ b/packages/client-generator/src/emitters/mock.ts
@@ -401,7 +401,7 @@ function spreadOverrides(value: ts.Expression, spreadName: string): ts.Expressio
 
 /** `/pets/{petId}` → `*​/pets/:petId` — MSW path with a wildcard origin and `:param` segments. */
 function mswPath(path: string): string {
-  return `*${path.replace(/\{([^}]+)\}/g, ':$1')}`;
+  return `*${path.replace(/\{([^{}]+)\}/g, ':$1')}`;
 }
 
 /** Recursively print a sampled JS value as a TypeScript literal expression. */
diff --git a/packages/client-generator/src/emitters/operation-signature.ts b/packages/client-generator/src/emitters/operation-signature.ts
index 54b45e36c2..3160ef483c 100644
--- a/packages/client-generator/src/emitters/operation-signature.ts
+++ b/packages/client-generator/src/emitters/operation-signature.ts
@@ -31,7 +31,7 @@ export type OperationSignature = {
 export function operationSignature(op: OperationModel): OperationSignature {
   const byName = new Map(op.pathParams.map((p) => [p.name, p] as const));
   const ordered: ParamModel[] = [];
-  for (const match of op.path.matchAll(/\{([^}]+)\}/g)) {
+  for (const match of op.path.matchAll(/\{([^{}]+)\}/g)) {
     const p = byName.get(match[1]);
     if (p) ordered.push(p);
   }
diff --git a/packages/client-generator/src/emitters/operations.ts b/packages/client-generator/src/emitters/operations.ts
index aab8d00ab6..5bdd19e66f 100644
--- a/packages/client-generator/src/emitters/operations.ts
+++ b/packages/client-generator/src/emitters/operations.ts
@@ -953,7 +953,7 @@ function pathTemplate(
   const exprs: ts.Expression[] = [];
   let buffer = '';
   let last = 0;
-  for (const match of path.matchAll(/\{([^}]+)\}/g)) {
+  for (const match of path.matchAll(/\{([^{}]+)\}/g)) {
     const ident = pathParamIdent.get(match[1]);
     if (!ident) continue;
     buffer += path.slice(last, match.index);
diff --git a/tests/e2e/generate-client/base-consumer/server.ts b/tests/e2e/generate-client/base-consumer/server.ts
index d41f9349e6..77e1c19fe0 100644
--- a/tests/e2e/generate-client/base-consumer/server.ts
+++ b/tests/e2e/generate-client/base-consumer/server.ts
@@ -87,12 +87,7 @@ const server = http.createServer(async (req, res) => {
     res.end(response.body);
   } catch (error) {
     res.writeHead(500, { 'Content-Type': 'application/json; charset=utf-8' });
-    res.end(
-      JSON.stringify({
-        error: 'mock-server failed',
-        message: error instanceof Error ? error.message : String(error),
-      })
-    );
+    res.end(JSON.stringify({ error: 'mock-server failed' }));
   }
 });
 
diff --git a/tests/e2e/generate-client/cafe-consumer/server.ts b/tests/e2e/generate-client/cafe-consumer/server.ts
index b663c02275..fce4fa3806 100644
--- a/tests/e2e/generate-client/cafe-consumer/server.ts
+++ b/tests/e2e/generate-client/cafe-consumer/server.ts
@@ -121,12 +121,7 @@ const server = http.createServer(async (req, res) => {
     res.end(response.body);
   } catch (error) {
     res.writeHead(500, { 'Content-Type': 'application/json; charset=utf-8' });
-    res.end(
-      JSON.stringify({
-        error: 'mock-server failed',
-        message: error instanceof Error ? error.message : String(error),
-      })
-    );
+    res.end(JSON.stringify({ error: 'mock-server failed' }));
   }
 });
 
diff --git a/tests/e2e/generate-client/middleware.test.ts b/tests/e2e/generate-client/middleware.test.ts
index b588c72cc0..54dc745dd3 100644
--- a/tests/e2e/generate-client/middleware.test.ts
+++ b/tests/e2e/generate-client/middleware.test.ts
@@ -207,7 +207,7 @@ await listPets();
 console.log(JSON.stringify({ url, header }));
 `
     ) as { url: string; header: string };
-    expect(captured.url.startsWith('https://multi.example.com')).toBe(true);
+    expect(new URL(captured.url).origin).toBe('https://multi.example.com');
     expect(captured.header).toBe('yes');
   }, 60_000);
 });
diff --git a/tests/e2e/generate-client/path-param-idents.test.ts b/tests/e2e/generate-client/path-param-idents.test.ts
index d4921c0d79..6062b860fc 100644
--- a/tests/e2e/generate-client/path-param-idents.test.ts
+++ b/tests/e2e/generate-client/path-param-idents.test.ts
@@ -11,7 +11,7 @@
  * built from the argument value).
  */
 import { spawnSync } from 'node:child_process';
-import { existsSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -103,7 +103,7 @@ describe('non-identifier path parameters', () => {
   });
 
   test('emits safe argument names and matching URL substitutions', () => {
-    const client = spawnSync('cat', [join(dir, 'client.ts')], { encoding: 'utf-8' }).stdout;
+    const client = readFileSync(join(dir, 'client.ts'), 'utf-8');
     // `widget-id` → `widget_id`; the URL uses the same identifier, not a literal.
     expect(client).toContain('widget_id: string');
     expect(client).toContain('${encodeURIComponent(String(widget_id))}');
diff --git a/tests/e2e/generate-client/setup.test.ts b/tests/e2e/generate-client/setup.test.ts
index a2a281b4ab..7a6a312e59 100644
--- a/tests/e2e/generate-client/setup.test.ts
+++ b/tests/e2e/generate-client/setup.test.ts
@@ -78,7 +78,7 @@ await listPets();
 console.log(JSON.stringify({ url, header }));
 `
     ) as { url: string; header: string };
-    expect(captured.url.startsWith('https://baked.example.com')).toBe(true);
+    expect(new URL(captured.url).origin).toBe('https://baked.example.com');
     expect(captured.header).toBe('yes');
   }, 60_000);
 
@@ -93,7 +93,7 @@ await listPets();
 console.log(JSON.stringify({ url }));
 `
     ) as { url: string };
-    expect(captured.url.startsWith('https://override.example.com')).toBe(true);
+    expect(new URL(captured.url).origin).toBe('https://override.example.com');
   }, 60_000);
 
   test('applies in a multi-file layout (split) with no consumer setup', () => {
@@ -111,7 +111,7 @@ await listPets();
 console.log(JSON.stringify({ url, header }));
 `
       ) as { url: string; header: string };
-      expect(captured.url.startsWith('https://baked.example.com')).toBe(true);
+      expect(new URL(captured.url).origin).toBe('https://baked.example.com');
       expect(captured.header).toBe('yes');
     } finally {
       rmSync(dir2, { recursive: true, force: true });
@@ -143,8 +143,8 @@ await new PetClient({ baseUrl: 'https://override.example.com', fetch: fetchSpy(o
 console.log(JSON.stringify({ baked, overridden }));
 `
     ) as { baked: { url: string; header: string }; overridden: { url: string } };
-    expect(captured.baked.url.startsWith('https://baked.example.com')).toBe(true);
+    expect(new URL(captured.baked.url).origin).toBe('https://baked.example.com');
     expect(captured.baked.header).toBe('yes');
-    expect(captured.overridden.url.startsWith('https://override.example.com')).toBe(true);
+    expect(new URL(captured.overridden.url).origin).toBe('https://override.example.com');
   }, 60_000);
 });

From ee13cb5d51c73286bb805d0d074637a532ba97c4 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 30 Jun 2026 15:44:54 +0300
Subject: [PATCH 033/134] docs(client-generator): fix --setup section link
 fragment (MD051)

---
 docs/@v2/commands/generate-client.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index 42c1a49633..dfb572c8e2 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -146,7 +146,7 @@ redocly generate-client cafe -o src/client.ts
 
 - `--setup`
 - `string`
-- Path to a publisher setup module (`export default defineClientSetup({ config, middleware })`) baked into the generated client, so a published SDK ships its request/response defaults built in. Works across all output modes and both facades. See [Baking defaults into a published SDK](#baking-defaults-into-a-published-sdk-setup).
+- Path to a publisher setup module (`export default defineClientSetup({ config, middleware })`) baked into the generated client, so a published SDK ships its request/response defaults built in. Works across all output modes and both facades. See [Baking defaults into a published SDK](#baking-defaults-into-a-published-sdk---setup).
 
 ---
 

From 4b7b44a2d55cbf5a4e238fd0cf36a0f0afc7da51 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 30 Jun 2026 15:46:09 +0300
Subject: [PATCH 034/134] docs(client-generator): use imperative --setup
 heading (Vale HeaderGerunds)

---
 docs/@v2/commands/generate-client.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index dfb572c8e2..8c4154e52a 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -146,7 +146,7 @@ redocly generate-client cafe -o src/client.ts
 
 - `--setup`
 - `string`
-- Path to a publisher setup module (`export default defineClientSetup({ config, middleware })`) baked into the generated client, so a published SDK ships its request/response defaults built in. Works across all output modes and both facades. See [Baking defaults into a published SDK](#baking-defaults-into-a-published-sdk---setup).
+- Path to a publisher setup module (`export default defineClientSetup({ config, middleware })`) baked into the generated client, so a published SDK ships its request/response defaults built in. Works across all output modes and both facades. See [Bake defaults into a published SDK](#bake-defaults-into-a-published-sdk---setup).
 
 ---
 
@@ -505,7 +505,7 @@ The `onRequest` / `onResponse` / `onError` fields on `ClientConfig` still work 
 `use()` simply appends to the same chain (`ClientConfig.middleware`), so existing code is unaffected.
 {% /admonition %}
 
-## Baking defaults into a published SDK (`--setup`)
+## Bake defaults into a published SDK (`--setup`)
 
 The middleware above is composed by the **consumer**. If you **publish an SDK** and want those defaults already active for _your_ users, bake them in at generation time with `--setup <file>`.
 

From 7dbd311703272cf2d6308ea2abcfa4f9c414d68d Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 30 Jun 2026 16:02:40 +0300
Subject: [PATCH 035/134] fix(client-generator): accept relative base-url;
 resolve CLI --setup from cwd
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- --base-url now accepts relative values (e.g. /v1) that OpenAPI allows for
  servers[].url and that the runtime concatenates with paths. Validation uses
  new URL(value, 'http://localhost') so absolute URLs still parse and truly
  malformed values are still rejected.
- A relative --setup is resolved against the cwd in the command handler (like
  --output) before reaching generateClient, instead of generateClient resolving
  it against the redocly.yaml directory — so sibling --output/--setup paths
  resolve consistently when --config points outside the cwd.
---
 packages/cli/src/commands/generate-client.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index 576541e58f..1777339f61 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -94,6 +94,10 @@ export async function handleGenerateClient({
   // alias's `root`, relative to the config dir); a plain path/URL passes through.
   const input = getAliasOrPath(config, merged.input).path;
   const outputPath = resolvePath(merged.output);
+  // A relative `--setup` resolves against the cwd, like `--output` (a config-file
+  // `setup` was already resolved against the config dir in readRedoclyExtension);
+  // passing an absolute path makes generateClient's own resolution a no-op.
+  const setupPath = merged.setup === undefined ? undefined : resolvePath(merged.setup);
 
   // Relative-path generator specifiers (and inline plugins) resolve against the
   // `redocly.yaml` directory (the config's location), else the working directory.
@@ -106,10 +110,13 @@ export async function handleGenerateClient({
   }
   if (merged.baseUrl !== undefined) {
     try {
-      new URL(merged.baseUrl);
+      // Accept absolute URLs (https://api.example.com) and relative bases (/v1):
+      // OpenAPI allows relative `servers[].url`, and the runtime concatenates
+      // baseUrl + path, so a relative base needs no absolute origin.
+      new URL(merged.baseUrl, 'http://localhost');
     } catch {
       throw new HandledError(
-        `\n❌  --base-url must be a valid URL (parseable by \`new URL(...)\`).\n   Got: ${merged.baseUrl}\n`
+        `\n❌  --base-url must be a valid URL — absolute (https://api.example.com) or relative (/v1).\n   Got: ${merged.baseUrl}\n`
       );
     }
   }
@@ -120,6 +127,7 @@ export async function handleGenerateClient({
       ...merged,
       input,
       output: outputPath,
+      setup: setupPath,
       config,
       configDir,
     });

From b55d39407985a813fd3985045e71e4d0d2b49acd Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 30 Jun 2026 16:47:58 +0300
Subject: [PATCH 036/134] fix(client-generator): serialize multipart body after
 the onRequest chain
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A typed multipart/form-data body was serialized to FormData at the call site,
before middleware ran, so onRequest saw FormData (not the plain object) and a
middleware that mutated or replaced ctx.body had its change dropped — contrary to
the documented body-mutation contract and to the JSON path, which already
serializes after onRequest.

The call site now passes the plain object plus a multipart flag, threaded through
__request/__requestResult into __send, which builds the FormData after the
onRequest chain. Everything is gated on needsMultipart, so non-multipart clients
are byte-identical.
---
 .../src/emitters/__tests__/operations.test.ts |  8 ++--
 .../src/emitters/__tests__/runtime.test.ts    | 24 ++++++++++
 .../src/emitters/operations.ts                | 20 ++++-----
 .../client-generator/src/emitters/runtime.ts  | 12 ++---
 tests/e2e/generate-client/multipart.test.ts   | 45 ++++++++++++++++++-
 5 files changed, 89 insertions(+), 20 deletions(-)

diff --git a/packages/client-generator/src/emitters/__tests__/operations.test.ts b/packages/client-generator/src/emitters/__tests__/operations.test.ts
index 2c818906c5..47ed754c0a 100644
--- a/packages/client-generator/src/emitters/__tests__/operations.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/operations.test.ts
@@ -329,15 +329,17 @@ describe('renderOperationsBlock — facade seam', () => {
       },
     });
 
-    it('emits a typed body (binary→Blob) instead of raw FormData, serialized via __toFormData', () => {
+    it('emits a typed body (binary→Blob) and defers FormData serialization to the runtime', () => {
       const out = renderOperationsBlock([uploadOp], { facade: 'functions', className: 'C' });
       expect(out).toContain('export type UploadBody = {');
       expect(out).toContain('file: Blob;');
       expect(out).toContain('orgId: string;');
       expect(out).toContain('tags?: string[];');
       expect(out).not.toContain('UploadBody = FormData');
-      // The typed object is serialized to FormData at the call site.
-      expect(out).toContain('__toFormData(body)');
+      // The call passes the plain object plus the multipart flag (trailing `true`); __send
+      // serializes it to FormData AFTER onRequest, so there is no inline __toFormData here.
+      expect(out).not.toContain('__toFormData');
+      expect(out).toContain('body, "void", true);');
     });
 
     it('falls back to raw FormData when the multipart schema is not an object', () => {
diff --git a/packages/client-generator/src/emitters/__tests__/runtime.test.ts b/packages/client-generator/src/emitters/__tests__/runtime.test.ts
index b1f67ff07a..af838c5636 100644
--- a/packages/client-generator/src/emitters/__tests__/runtime.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/runtime.test.ts
@@ -272,4 +272,28 @@ describe('renderRuntime — shared core + terminal selection', () => {
       expect(out).not.toContain('export async function __parseSseFrame');
     });
   });
+
+  describe('multipart runtime (gated on needsMultipart)', () => {
+    it('omits the __toFormData helper and the multipart serialization path when false', () => {
+      const out = renderRuntime('https://api.example.com', false, false, 'throw', false, false, false);
+      expect(out).not.toContain('__toFormData');
+      expect(out).not.toContain('multipart: boolean');
+    });
+
+    it('emits __toFormData, the multipart flag, and the FormData serialization branch when true', () => {
+      const out = renderRuntime('https://api.example.com', false, false, 'throw', false, false, true);
+      expect(out).toContain('function __toFormData(');
+      // The body-serializing helpers thread a `multipart` flag through to __send.
+      expect(out).toContain('multipart: boolean = false');
+      // __send converts a plain body to FormData AFTER onRequest when the flag is set.
+      expect(out).toContain('else if (multipart) {');
+      expect(out).toContain('__toFormData(value as Record<string, unknown>)');
+    });
+
+    it('threads the multipart flag through the result-mode request helper too', () => {
+      const out = renderRuntime('https://api.example.com', false, false, 'result', false, false, true);
+      expect(out).toContain('multipart: boolean = false');
+      expect(out).toContain('__send(config, op, url, sendInit, body, multipart)');
+    });
+  });
 });
diff --git a/packages/client-generator/src/emitters/operations.ts b/packages/client-generator/src/emitters/operations.ts
index 5bdd19e66f..7e9c1afaa3 100644
--- a/packages/client-generator/src/emitters/operations.ts
+++ b/packages/client-generator/src/emitters/operations.ts
@@ -1098,22 +1098,22 @@ function renderRequestArgs(
   responseKind: 'json' | 'blob' | 'text' | 'void'
 ): ts.Expression[] {
   const args: ts.Expression[] = [configExpr(configRef), operationMetaExpr(op), urlExpr, initExpr];
+  const multipart = !!op.requestBody && isTypedMultipart(op.requestBody);
   if (op.requestBody) {
-    const bodyExpr = groupedMode
-      ? factory.createPropertyAccessExpression(factory.createIdentifier('vars'), 'body')
-      : factory.createIdentifier('body');
-    // A typed multipart body is a plain object; serialize it to FormData on the way out.
+    // Pass the plain body object; __send serializes it (JSON or, for a typed multipart
+    // body, FormData) AFTER the onRequest chain, so a middleware that mutates or replaces
+    // ctx.body has its change sent.
     args.push(
-      isTypedMultipart(op.requestBody)
-        ? factory.createCallExpression(factory.createIdentifier('__toFormData'), undefined, [
-            bodyExpr,
-          ])
-        : bodyExpr
+      groupedMode
+        ? factory.createPropertyAccessExpression(factory.createIdentifier('vars'), 'body')
+        : factory.createIdentifier('body')
     );
   } else if (responseKind !== 'json') {
     args.push(factory.createIdentifier('undefined'));
   }
-  if (responseKind !== 'json') args.push(factory.createStringLiteral(responseKind));
+  // responseKind must be present (even when 'json') when the multipart flag follows it.
+  if (responseKind !== 'json' || multipart) args.push(factory.createStringLiteral(responseKind));
+  if (multipart) args.push(factory.createTrue());
   return args;
 }
 
diff --git a/packages/client-generator/src/emitters/runtime.ts b/packages/client-generator/src/emitters/runtime.ts
index 259ebc26a4..c7894330eb 100644
--- a/packages/client-generator/src/emitters/runtime.ts
+++ b/packages/client-generator/src/emitters/runtime.ts
@@ -293,10 +293,10 @@ ${ex}async function __requestResult<TData, TError>(
   url: string,
   init: RequestOptions,
   body?: unknown,
-  responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'
+  responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'${needsMultipart ? ',\n  multipart: boolean = false' : ''}
 ): Promise<Result<TData, TError>> {
   const { parseAs, ...sendInit } = init;
-  const { response } = await __send(config, op, url, sendInit, body);
+  const { response } = await __send(config, op, url, sendInit, body${needsMultipart ? ', multipart' : ''});
   if (!response.ok) {
     const error = (await readError(response)) as TError;
     return { data: undefined, error, response };
@@ -311,10 +311,10 @@ ${ex}async function __requestResult<TData, TError>(
   url: string,
   init: RequestOptions,
   body?: unknown,
-  responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'
+  responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'${needsMultipart ? ',\n  multipart: boolean = false' : ''}
 ): Promise<T> {
   const { parseAs, ...sendInit } = init;
-  const { response, context } = await __send(config, op, url, sendInit, body);
+  const { response, context } = await __send(config, op, url, sendInit, body${needsMultipart ? ', multipart' : ''});
   if (!response.ok) {
     const errorBody = await readError(response);
     let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
@@ -606,7 +606,7 @@ ${ex}async function __send(
   op: OperationContext,
   url: string,
   init: RequestOptions,
-  body?: unknown
+  body?: unknown${needsMultipart ? ',\n  multipart: boolean = false' : ''}
 ): Promise<{ response: Response; context: RequestContext }> {
   const { retry: callRetry, ...fetchInit } = init;
   const retry: RetryConfig = { ...config.retry, ...callRetry };
@@ -631,7 +631,7 @@ ${ex}async function __send(
     const isURLSearchParams = value instanceof URLSearchParams;
     if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
       payload = value as BodyInit;
-    } else {
+    }${needsMultipart ? ' else if (multipart) {\n      payload = __toFormData(value as Record<string, unknown>);\n    }' : ''} else {
       payload = JSON.stringify(value);
       if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
         context.headers['Content-Type'] = 'application/json';
diff --git a/tests/e2e/generate-client/multipart.test.ts b/tests/e2e/generate-client/multipart.test.ts
index d84eeeae83..24f1515587 100644
--- a/tests/e2e/generate-client/multipart.test.ts
+++ b/tests/e2e/generate-client/multipart.test.ts
@@ -102,7 +102,50 @@ console.log(JSON.stringify({
     expect(result.meta).toBe('{"k":"v"}'); // nested object → JSON part
   }, 60_000);
 
-  it('compiles in multi-file output (the __toFormData helper is imported into the endpoints module)', () => {
+  it('serializes the multipart body AFTER onRequest, so middleware can mutate it', () => {
+    dir = mkdtempSync(join(tmpdir(), 'ots-multipart-mw-'));
+    writeFileSync(join(dir, 'package.json'), JSON.stringify({ type: 'module' }), 'utf-8');
+    writeFileSync(join(dir, 'api.yaml'), SPEC, 'utf-8');
+    const out = join(dir, 'client.ts');
+    const gen = spawnSync('node', [cli, 'generate-client', join(dir, 'api.yaml'), '--output', out], {
+      encoding: 'utf-8',
+      cwd: repoRoot,
+    });
+    expect(gen.status, gen.stderr).toBe(0);
+
+    writeFileSync(
+      join(dir, 'consumer.ts'),
+      `
+import { configure, use, upload } from './client.ts';
+
+let body: unknown;
+configure({
+  fetch: (async (_url: string, init: RequestInit) => {
+    body = init.body;
+    return new Response('', { status: 200 });
+  }) as unknown as typeof fetch,
+});
+// A multipart op must expose the plain body object to onRequest (not pre-built FormData);
+// mutating it has to be reflected in the FormData that __send serializes afterwards.
+use({ onRequest: (ctx) => { (ctx.body as { orgId: string }).orgId = 'mutated'; } });
+
+const file = new Blob(['hi'], { type: 'text/plain' });
+await upload({ file, orgId: 'org_1' });
+
+const fd = body as FormData;
+console.log(JSON.stringify({ isFormData: fd instanceof FormData, orgId: fd.get('orgId') }));
+`,
+      'utf-8'
+    );
+    const run = spawnSync(tsxBin, [join(dir, 'consumer.ts')], { encoding: 'utf-8', cwd: repoRoot });
+    expect(run.status, `${run.stdout}\n${run.stderr}`).toBe(0);
+    const result = JSON.parse(run.stdout.trim()) as Record<string, unknown>;
+
+    expect(result.isFormData).toBe(true);
+    expect(result.orgId).toBe('mutated');
+  }, 60_000);
+
+  it('compiles in multi-file output (multipart serialization lives in the shared runtime)', () => {
     dir = mkdtempSync(join(tmpdir(), 'ots-multipart-tags-'));
     writeFileSync(join(dir, 'api.yaml'), SPEC, 'utf-8');
     const gen = spawnSync(

From 994680384be23f44492d7cfbd482ed1d0d096676 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 30 Jun 2026 16:47:58 +0300
Subject: [PATCH 037/134] fix(client-generator): resolve generateClient setup
 path from cwd, like output

generateClient resolved a relative setup path against configDir while output
resolved against cwd, so with --config pointing outside the cwd a relative
--setup and --output resolved against different bases. Resolve setup against cwd
to match output; the CLI already pre-resolves --setup (cwd, like --output) and a
config-file setup is pre-resolved against the config dir, so both arrive absolute.
---
 packages/client-generator/src/index.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/client-generator/src/index.ts b/packages/client-generator/src/index.ts
index 7e7f086a12..0fdfb67ec9 100644
--- a/packages/client-generator/src/index.ts
+++ b/packages/client-generator/src/index.ts
@@ -98,7 +98,10 @@ export async function generateClient(
   // expression baked into the client. Applied per facade and across all output modes by the emitter.
   let setupBlock: string | undefined;
   if (options.setup) {
-    const setupPath = resolve(options.configDir ?? process.cwd(), options.setup);
+    // Resolve a relative setup path against the cwd, consistent with `output` above.
+    // The CLI pre-resolves it (relative to cwd, like --output) and a config-file
+    // `setup` is pre-resolved against the config dir, so both arrive absolute here.
+    const setupPath = resolve(options.setup);
     setupBlock = bakeSetup(await readFile(setupPath, 'utf-8'));
   }
 

From 18705f946eb6a9460df87d4533efecfd255bd6b0 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 30 Jun 2026 16:52:45 +0300
Subject: [PATCH 038/134] fix: formatting

---
 .../src/emitters/__tests__/runtime.test.ts    | 30 +++++++++++++++++--
 tests/e2e/generate-client/multipart.test.ts   | 12 +++++---
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/packages/client-generator/src/emitters/__tests__/runtime.test.ts b/packages/client-generator/src/emitters/__tests__/runtime.test.ts
index af838c5636..016321a41d 100644
--- a/packages/client-generator/src/emitters/__tests__/runtime.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/runtime.test.ts
@@ -275,13 +275,29 @@ describe('renderRuntime — shared core + terminal selection', () => {
 
   describe('multipart runtime (gated on needsMultipart)', () => {
     it('omits the __toFormData helper and the multipart serialization path when false', () => {
-      const out = renderRuntime('https://api.example.com', false, false, 'throw', false, false, false);
+      const out = renderRuntime(
+        'https://api.example.com',
+        false,
+        false,
+        'throw',
+        false,
+        false,
+        false
+      );
       expect(out).not.toContain('__toFormData');
       expect(out).not.toContain('multipart: boolean');
     });
 
     it('emits __toFormData, the multipart flag, and the FormData serialization branch when true', () => {
-      const out = renderRuntime('https://api.example.com', false, false, 'throw', false, false, true);
+      const out = renderRuntime(
+        'https://api.example.com',
+        false,
+        false,
+        'throw',
+        false,
+        false,
+        true
+      );
       expect(out).toContain('function __toFormData(');
       // The body-serializing helpers thread a `multipart` flag through to __send.
       expect(out).toContain('multipart: boolean = false');
@@ -291,7 +307,15 @@ describe('renderRuntime — shared core + terminal selection', () => {
     });
 
     it('threads the multipart flag through the result-mode request helper too', () => {
-      const out = renderRuntime('https://api.example.com', false, false, 'result', false, false, true);
+      const out = renderRuntime(
+        'https://api.example.com',
+        false,
+        false,
+        'result',
+        false,
+        false,
+        true
+      );
       expect(out).toContain('multipart: boolean = false');
       expect(out).toContain('__send(config, op, url, sendInit, body, multipart)');
     });
diff --git a/tests/e2e/generate-client/multipart.test.ts b/tests/e2e/generate-client/multipart.test.ts
index 24f1515587..914bdf72a3 100644
--- a/tests/e2e/generate-client/multipart.test.ts
+++ b/tests/e2e/generate-client/multipart.test.ts
@@ -107,10 +107,14 @@ console.log(JSON.stringify({
     writeFileSync(join(dir, 'package.json'), JSON.stringify({ type: 'module' }), 'utf-8');
     writeFileSync(join(dir, 'api.yaml'), SPEC, 'utf-8');
     const out = join(dir, 'client.ts');
-    const gen = spawnSync('node', [cli, 'generate-client', join(dir, 'api.yaml'), '--output', out], {
-      encoding: 'utf-8',
-      cwd: repoRoot,
-    });
+    const gen = spawnSync(
+      'node',
+      [cli, 'generate-client', join(dir, 'api.yaml'), '--output', out],
+      {
+        encoding: 'utf-8',
+        cwd: repoRoot,
+      }
+    );
     expect(gen.status, gen.stderr).toBe(0);
 
     writeFileSync(

From 58573fd98180e4384b938fca5d6e8bcd796df531 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Wed, 1 Jul 2026 14:53:44 +0300
Subject: [PATCH 039/134] refactor(client-generator): move examples under
 tests/e2e/generate-client

The examples are effectively e2e fixtures (the drift test already lives in
tests/e2e/generate-client), so co-locate them there. The root tsconfig exclude is
repointed to the new path rather than removed: the root `npm run typecheck` globs
the whole repo and the examples compile under their own browser/JSX/bundler config,
so they must stay out of the Node-targeted pass wherever they live. Updated the
regen/typecheck scripts, oxlint/oxfmt ignores, the drift test path, and the doc
links.
---
 .oxfmtrc.json                                 |    2 +-
 .oxlintrc.json                                |    4 +-
 docs/@v2/commands/generate-client.md          |    6 +-
 .../scripts/regenerate-examples.mjs           |    2 +-
 .../scripts/typecheck-examples.mjs            |    2 +-
 tests/e2e/generate-client/examples.test.ts    |    2 +-
 .../e2e/generate-client}/examples/README.md   |    4 +-
 .../examples/baked-setup/.gitignore           |    0
 .../examples/baked-setup/README.md            |    0
 .../examples/baked-setup/client-setup.ts      |    0
 .../examples/baked-setup/index.html           |    0
 .../examples/baked-setup/openapi.yaml         |    0
 .../examples/baked-setup/package.json         |    0
 .../examples/baked-setup/redocly.yaml         |    0
 .../examples/baked-setup/src/api/client.ts    |    0
 .../examples/baked-setup/src/main.ts          |    0
 .../examples/baked-setup/tsconfig.json        |    0
 .../examples/baked-setup/vite.config.ts       |    0
 .../examples/custom-generator/.gitignore      |    0
 .../examples/custom-generator/README.md       |    0
 .../examples/custom-generator/index.html      |    0
 .../examples/custom-generator/openapi.yaml    |    0
 .../examples/custom-generator/package.json    |    0
 .../examples/custom-generator/redocly.yaml    |    0
 .../custom-generator/route-map-generator.mjs  |    0
 .../custom-generator/src/api/client.routes.ts |    0
 .../custom-generator/src/api/client.ts        |    0
 .../examples/custom-generator/src/main.ts     |    0
 .../examples/custom-generator/tsconfig.json   |    0
 .../examples/custom-generator/vite.config.ts  |    0
 .../examples/customization/.gitignore         |    0
 .../examples/customization/README.md          |    0
 .../examples/customization/index.html         |    0
 .../examples/customization/openapi.yaml       |    0
 .../examples/customization/package.json       |    0
 .../examples/customization/redocly.yaml       |    0
 .../examples/customization/src/api/client.ts  |    0
 .../examples/customization/src/main.ts        |    0
 .../examples/customization/tsconfig.json      |    0
 .../examples/customization/vite.config.ts     |    0
 .../examples/fetch-functions/.gitignore       |    0
 .../examples/fetch-functions/README.md        |    0
 .../examples/fetch-functions/index.html       |    0
 .../examples/fetch-functions/openapi.yaml     |    0
 .../examples/fetch-functions/package.json     |    0
 .../examples/fetch-functions/redocly.yaml     |    0
 .../fetch-functions/src/api/client.ts         |    0
 .../examples/fetch-functions/src/main.ts      |    0
 .../examples/fetch-functions/tsconfig.json    |    0
 .../examples/fetch-functions/vite.config.ts   |    0
 .../generate-client}/examples/mock/.gitignore |    0
 .../generate-client}/examples/mock/README.md  |    0
 .../generate-client}/examples/mock/index.html |    0
 .../examples/mock/openapi.yaml                |    0
 .../examples/mock/package-lock.json           | 1686 ++++++++
 .../examples/mock/package.json                |    0
 .../examples/mock/public/mockServiceWorker.js |    0
 .../examples/mock/redocly.yaml                |    0
 .../examples/mock/src/api/client.mocks.ts     |    0
 .../examples/mock/src/api/client.ts           |    0
 .../examples/mock/src/main.ts                 |    0
 .../examples/mock/src/node.ts                 |    0
 .../examples/mock/tsconfig.json               |    0
 .../examples/mock/vite.config.ts              |    0
 .../examples/programmatic/.gitignore          |    0
 .../examples/programmatic/README.md           |    0
 .../examples/programmatic/generate.ts         |    0
 .../examples/programmatic/openapi.yaml        |    0
 .../examples/programmatic/package-lock.json   |  809 ++++
 .../examples/programmatic/package.json        |    0
 .../examples/programmatic/src/api/client.ts   |    0
 .../examples/programmatic/src/main.ts         |    0
 .../examples/programmatic/tsconfig.json       |    0
 .../examples/service-class/.gitignore         |    0
 .../examples/service-class/README.md          |    0
 .../examples/service-class/index.html         |    0
 .../examples/service-class/openapi.yaml       |    0
 .../examples/service-class/package-lock.json  | 3504 ++++++++++++++++
 .../examples/service-class/package.json       |    0
 .../examples/service-class/redocly.yaml       |    0
 .../examples/service-class/src/api/client.ts  |    0
 .../examples/service-class/src/main.ts        |    0
 .../examples/service-class/tsconfig.json      |    0
 .../examples/service-class/vite.config.ts     |    0
 .../examples/tanstack-query/.gitignore        |    0
 .../examples/tanstack-query/README.md         |    0
 .../examples/tanstack-query/index.html        |    0
 .../examples/tanstack-query/openapi.yaml      |    0
 .../examples/tanstack-query/package-lock.json | 1814 +++++++++
 .../examples/tanstack-query/package.json      |    0
 .../examples/tanstack-query/redocly.yaml      |    0
 .../examples/tanstack-query/src/App.tsx       |    0
 .../tanstack-query/src/api/client.tanstack.ts |    0
 .../examples/tanstack-query/src/api/client.ts |    0
 .../examples/tanstack-query/src/main.tsx      |    0
 .../examples/tanstack-query/tsconfig.json     |    0
 .../examples/tanstack-query/vite.config.ts    |    0
 .../examples/tsconfig.base.json               |    0
 .../generate-client}/examples/zod/.gitignore  |    0
 .../generate-client}/examples/zod/README.md   |    0
 .../generate-client}/examples/zod/index.html  |    0
 .../examples/zod/openapi.yaml                 |    0
 .../examples/zod/package-lock.json            | 3515 +++++++++++++++++
 .../examples/zod/package.json                 |    0
 .../examples/zod/redocly.yaml                 |    0
 .../examples/zod/src/api/client.ts            |    0
 .../examples/zod/src/api/client.zod.ts        |    0
 .../generate-client}/examples/zod/src/main.ts |    0
 .../examples/zod/tsconfig.json                |    0
 .../examples/zod/vite.config.ts               |    0
 tsconfig.json                                 |    2 +-
 111 files changed, 11340 insertions(+), 12 deletions(-)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/README.md (93%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/baked-setup/.gitignore (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/baked-setup/README.md (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/baked-setup/client-setup.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/baked-setup/index.html (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/baked-setup/openapi.yaml (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/baked-setup/package.json (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/baked-setup/redocly.yaml (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/baked-setup/src/api/client.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/baked-setup/src/main.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/baked-setup/tsconfig.json (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/baked-setup/vite.config.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/custom-generator/.gitignore (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/custom-generator/README.md (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/custom-generator/index.html (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/custom-generator/openapi.yaml (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/custom-generator/package.json (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/custom-generator/redocly.yaml (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/custom-generator/route-map-generator.mjs (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/custom-generator/src/api/client.routes.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/custom-generator/src/api/client.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/custom-generator/src/main.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/custom-generator/tsconfig.json (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/custom-generator/vite.config.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/customization/.gitignore (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/customization/README.md (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/customization/index.html (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/customization/openapi.yaml (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/customization/package.json (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/customization/redocly.yaml (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/customization/src/api/client.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/customization/src/main.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/customization/tsconfig.json (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/customization/vite.config.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/fetch-functions/.gitignore (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/fetch-functions/README.md (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/fetch-functions/index.html (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/fetch-functions/openapi.yaml (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/fetch-functions/package.json (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/fetch-functions/redocly.yaml (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/fetch-functions/src/api/client.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/fetch-functions/src/main.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/fetch-functions/tsconfig.json (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/fetch-functions/vite.config.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/mock/.gitignore (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/mock/README.md (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/mock/index.html (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/mock/openapi.yaml (100%)
 create mode 100644 tests/e2e/generate-client/examples/mock/package-lock.json
 rename {packages/client-generator => tests/e2e/generate-client}/examples/mock/package.json (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/mock/public/mockServiceWorker.js (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/mock/redocly.yaml (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/mock/src/api/client.mocks.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/mock/src/api/client.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/mock/src/main.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/mock/src/node.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/mock/tsconfig.json (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/mock/vite.config.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/programmatic/.gitignore (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/programmatic/README.md (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/programmatic/generate.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/programmatic/openapi.yaml (100%)
 create mode 100644 tests/e2e/generate-client/examples/programmatic/package-lock.json
 rename {packages/client-generator => tests/e2e/generate-client}/examples/programmatic/package.json (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/programmatic/src/api/client.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/programmatic/src/main.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/programmatic/tsconfig.json (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/service-class/.gitignore (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/service-class/README.md (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/service-class/index.html (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/service-class/openapi.yaml (100%)
 create mode 100644 tests/e2e/generate-client/examples/service-class/package-lock.json
 rename {packages/client-generator => tests/e2e/generate-client}/examples/service-class/package.json (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/service-class/redocly.yaml (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/service-class/src/api/client.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/service-class/src/main.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/service-class/tsconfig.json (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/service-class/vite.config.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/tanstack-query/.gitignore (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/tanstack-query/README.md (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/tanstack-query/index.html (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/tanstack-query/openapi.yaml (100%)
 create mode 100644 tests/e2e/generate-client/examples/tanstack-query/package-lock.json
 rename {packages/client-generator => tests/e2e/generate-client}/examples/tanstack-query/package.json (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/tanstack-query/redocly.yaml (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/tanstack-query/src/App.tsx (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/tanstack-query/src/api/client.tanstack.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/tanstack-query/src/api/client.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/tanstack-query/src/main.tsx (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/tanstack-query/tsconfig.json (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/tanstack-query/vite.config.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/tsconfig.base.json (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/zod/.gitignore (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/zod/README.md (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/zod/index.html (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/zod/openapi.yaml (100%)
 create mode 100644 tests/e2e/generate-client/examples/zod/package-lock.json
 rename {packages/client-generator => tests/e2e/generate-client}/examples/zod/package.json (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/zod/redocly.yaml (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/zod/src/api/client.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/zod/src/api/client.zod.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/zod/src/main.ts (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/zod/tsconfig.json (100%)
 rename {packages/client-generator => tests/e2e/generate-client}/examples/zod/vite.config.ts (100%)

diff --git a/.oxfmtrc.json b/.oxfmtrc.json
index 9900c1d513..125a6bafa8 100644
--- a/.oxfmtrc.json
+++ b/.oxfmtrc.json
@@ -5,7 +5,7 @@
   "experimentalSortPackageJson": false,
   "ignorePatterns": [
     "coverage/",
-    "packages/client-generator/examples/*/src/api/",
+    "tests/e2e/generate-client/examples/*/src/api/",
     "lib/",
     "output/",
     "packages/respect-core/src/modules/runtime-expressions/abnf-parser.js",
diff --git a/.oxlintrc.json b/.oxlintrc.json
index 94f1826bcd..e9c734a6c8 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -11,8 +11,8 @@
   },
   "ignorePatterns": [
     "packages/*/lib/**",
-    "packages/client-generator/examples/*/src/api/**",
-    "packages/client-generator/examples/*/generate.ts",
+    "tests/e2e/generate-client/examples/*/src/api/**",
+    "tests/e2e/generate-client/examples/*/generate.ts",
     "*.js",
     "*.cjs",
     "tests/e2e/generate-client/*.snapshot.ts",
diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index 8c4154e52a..8875973c75 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -494,7 +494,7 @@ use({
 ```
 
 A header for a single call instead goes in that operation's trailing `RequestOptions` argument (`await listMenuItems({}, { headers: { 'X-Request-Id': '42' } })`).
-See the [`customization` example](https://github.com/Redocly/redocly-cli/tree/main/packages/client-generator/examples/customization) for a runnable end-to-end version.
+See the [`customization` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/customization) for a runnable end-to-end version.
 
 `onRequest` and `onResponse` run for every request — under both `throw` and `result` error modes, and around each Server-Sent-Events connect/reconnect.
 `onError` only fires when a non-2xx response would be **thrown**, so it is a no-op in `result` mode (inspect `result.error` instead) and for SSE (which throws its own `ApiError`).
@@ -542,7 +542,7 @@ The generator bakes the `config`/`middleware` into the generated client, so the
 A setup file may import **only** from `@redocly/client-generator`, keeping the client zero-dependency.
 {% /admonition %}
 
-See the [`baked-setup` example](https://github.com/Redocly/redocly-cli/tree/main/packages/client-generator/examples/baked-setup) and ADR-0015.
+See the [`baked-setup` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/baked-setup) and ADR-0015.
 
 ## Retries
 
@@ -995,7 +995,7 @@ await generateClient({
 });
 ```
 
-A worked example lives in [`examples/custom-generator`](https://github.com/Redocly/redocly-cli/tree/main/packages/client-generator/examples/custom-generator).
+A worked example lives in [`examples/custom-generator`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/custom-generator).
 
 {% admonition type="info" name="Compatibility & trust" %}
 A custom generator declares the same `requires` / `facades` / `errorModes` / `dateTypes` contract as the built-ins, validated up front — an incompatible selection, a name that collides with another generator, or an unloadable specifier fails fast with an actionable message.
diff --git a/packages/client-generator/scripts/regenerate-examples.mjs b/packages/client-generator/scripts/regenerate-examples.mjs
index 4d76c5ab37..0f81f1c490 100644
--- a/packages/client-generator/scripts/regenerate-examples.mjs
+++ b/packages/client-generator/scripts/regenerate-examples.mjs
@@ -23,7 +23,7 @@ const examples = [
 ];
 
 for (const name of examples) {
-  const cwd = join(pkgRoot, 'examples', name);
+  const cwd = join(repoRoot, 'tests/e2e/generate-client/examples', name);
   const res = existsSync(join(cwd, 'redocly.yaml'))
     ? spawnSync('node', [cli, 'generate-client'], { cwd, stdio: 'inherit' })
     : spawnSync(tsx, [join(cwd, 'generate.ts')], { cwd, stdio: 'inherit' });
diff --git a/packages/client-generator/scripts/typecheck-examples.mjs b/packages/client-generator/scripts/typecheck-examples.mjs
index ed66519711..f029149c37 100644
--- a/packages/client-generator/scripts/typecheck-examples.mjs
+++ b/packages/client-generator/scripts/typecheck-examples.mjs
@@ -9,7 +9,7 @@ import { fileURLToPath } from 'node:url';
 const pkgRoot = join(dirname(fileURLToPath(import.meta.url)), '..');
 const repoRoot = join(pkgRoot, '..', '..');
 const tsc = join(repoRoot, 'node_modules/.bin/tsc');
-const examplesDir = join(pkgRoot, 'examples');
+const examplesDir = join(repoRoot, 'tests/e2e/generate-client/examples');
 const examples = [
   'fetch-functions',
   'customization',
diff --git a/tests/e2e/generate-client/examples.test.ts b/tests/e2e/generate-client/examples.test.ts
index 9f8f00f291..edd95b5e29 100644
--- a/tests/e2e/generate-client/examples.test.ts
+++ b/tests/e2e/generate-client/examples.test.ts
@@ -8,7 +8,7 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
 const repoRoot = resolve(__dirname, '../../..');
 const cli = join(repoRoot, 'packages/cli/lib/index.js');
 const tsx = join(repoRoot, 'node_modules/.bin/tsx');
-const examplesDir = join(repoRoot, 'packages/client-generator/examples');
+const examplesDir = join(__dirname, 'examples');
 
 const EXAMPLES = [
   'fetch-functions',
diff --git a/packages/client-generator/examples/README.md b/tests/e2e/generate-client/examples/README.md
similarity index 93%
rename from packages/client-generator/examples/README.md
rename to tests/e2e/generate-client/examples/README.md
index d0aaa79ccd..a9ec576853 100644
--- a/packages/client-generator/examples/README.md
+++ b/tests/e2e/generate-client/examples/README.md
@@ -2,7 +2,7 @@
 
 Runnable examples of clients generated by `@redocly/client-generator`. Each is standalone with its
 own dependencies; the generated client under `src/api/` is checked in and **drift-checked against the
-generator in CI** (`tests/e2e/examples.test.ts`). The first five are Vite apps that _consume_ a client
+generator in CI** (`tests/e2e/generate-client/examples.test.ts`). The first five are Vite apps that _consume_ a client
 generated via the `redocly generate-client` CLI (a `redocly.yaml`); `programmatic` _generates_ one with
 the `generateClient(...)` API.
 
@@ -20,7 +20,7 @@ the `generateClient(...)` API.
 ## Run one
 
 ```bash
-cd packages/client-generator/examples/<name>
+cd tests/e2e/generate-client/examples/<name>
 npm install
 npm run dev        # the Vite apps; the `programmatic` example uses `npm run generate`
 ```
diff --git a/packages/client-generator/examples/baked-setup/.gitignore b/tests/e2e/generate-client/examples/baked-setup/.gitignore
similarity index 100%
rename from packages/client-generator/examples/baked-setup/.gitignore
rename to tests/e2e/generate-client/examples/baked-setup/.gitignore
diff --git a/packages/client-generator/examples/baked-setup/README.md b/tests/e2e/generate-client/examples/baked-setup/README.md
similarity index 100%
rename from packages/client-generator/examples/baked-setup/README.md
rename to tests/e2e/generate-client/examples/baked-setup/README.md
diff --git a/packages/client-generator/examples/baked-setup/client-setup.ts b/tests/e2e/generate-client/examples/baked-setup/client-setup.ts
similarity index 100%
rename from packages/client-generator/examples/baked-setup/client-setup.ts
rename to tests/e2e/generate-client/examples/baked-setup/client-setup.ts
diff --git a/packages/client-generator/examples/baked-setup/index.html b/tests/e2e/generate-client/examples/baked-setup/index.html
similarity index 100%
rename from packages/client-generator/examples/baked-setup/index.html
rename to tests/e2e/generate-client/examples/baked-setup/index.html
diff --git a/packages/client-generator/examples/baked-setup/openapi.yaml b/tests/e2e/generate-client/examples/baked-setup/openapi.yaml
similarity index 100%
rename from packages/client-generator/examples/baked-setup/openapi.yaml
rename to tests/e2e/generate-client/examples/baked-setup/openapi.yaml
diff --git a/packages/client-generator/examples/baked-setup/package.json b/tests/e2e/generate-client/examples/baked-setup/package.json
similarity index 100%
rename from packages/client-generator/examples/baked-setup/package.json
rename to tests/e2e/generate-client/examples/baked-setup/package.json
diff --git a/packages/client-generator/examples/baked-setup/redocly.yaml b/tests/e2e/generate-client/examples/baked-setup/redocly.yaml
similarity index 100%
rename from packages/client-generator/examples/baked-setup/redocly.yaml
rename to tests/e2e/generate-client/examples/baked-setup/redocly.yaml
diff --git a/packages/client-generator/examples/baked-setup/src/api/client.ts b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
similarity index 100%
rename from packages/client-generator/examples/baked-setup/src/api/client.ts
rename to tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
diff --git a/packages/client-generator/examples/baked-setup/src/main.ts b/tests/e2e/generate-client/examples/baked-setup/src/main.ts
similarity index 100%
rename from packages/client-generator/examples/baked-setup/src/main.ts
rename to tests/e2e/generate-client/examples/baked-setup/src/main.ts
diff --git a/packages/client-generator/examples/baked-setup/tsconfig.json b/tests/e2e/generate-client/examples/baked-setup/tsconfig.json
similarity index 100%
rename from packages/client-generator/examples/baked-setup/tsconfig.json
rename to tests/e2e/generate-client/examples/baked-setup/tsconfig.json
diff --git a/packages/client-generator/examples/baked-setup/vite.config.ts b/tests/e2e/generate-client/examples/baked-setup/vite.config.ts
similarity index 100%
rename from packages/client-generator/examples/baked-setup/vite.config.ts
rename to tests/e2e/generate-client/examples/baked-setup/vite.config.ts
diff --git a/packages/client-generator/examples/custom-generator/.gitignore b/tests/e2e/generate-client/examples/custom-generator/.gitignore
similarity index 100%
rename from packages/client-generator/examples/custom-generator/.gitignore
rename to tests/e2e/generate-client/examples/custom-generator/.gitignore
diff --git a/packages/client-generator/examples/custom-generator/README.md b/tests/e2e/generate-client/examples/custom-generator/README.md
similarity index 100%
rename from packages/client-generator/examples/custom-generator/README.md
rename to tests/e2e/generate-client/examples/custom-generator/README.md
diff --git a/packages/client-generator/examples/custom-generator/index.html b/tests/e2e/generate-client/examples/custom-generator/index.html
similarity index 100%
rename from packages/client-generator/examples/custom-generator/index.html
rename to tests/e2e/generate-client/examples/custom-generator/index.html
diff --git a/packages/client-generator/examples/custom-generator/openapi.yaml b/tests/e2e/generate-client/examples/custom-generator/openapi.yaml
similarity index 100%
rename from packages/client-generator/examples/custom-generator/openapi.yaml
rename to tests/e2e/generate-client/examples/custom-generator/openapi.yaml
diff --git a/packages/client-generator/examples/custom-generator/package.json b/tests/e2e/generate-client/examples/custom-generator/package.json
similarity index 100%
rename from packages/client-generator/examples/custom-generator/package.json
rename to tests/e2e/generate-client/examples/custom-generator/package.json
diff --git a/packages/client-generator/examples/custom-generator/redocly.yaml b/tests/e2e/generate-client/examples/custom-generator/redocly.yaml
similarity index 100%
rename from packages/client-generator/examples/custom-generator/redocly.yaml
rename to tests/e2e/generate-client/examples/custom-generator/redocly.yaml
diff --git a/packages/client-generator/examples/custom-generator/route-map-generator.mjs b/tests/e2e/generate-client/examples/custom-generator/route-map-generator.mjs
similarity index 100%
rename from packages/client-generator/examples/custom-generator/route-map-generator.mjs
rename to tests/e2e/generate-client/examples/custom-generator/route-map-generator.mjs
diff --git a/packages/client-generator/examples/custom-generator/src/api/client.routes.ts b/tests/e2e/generate-client/examples/custom-generator/src/api/client.routes.ts
similarity index 100%
rename from packages/client-generator/examples/custom-generator/src/api/client.routes.ts
rename to tests/e2e/generate-client/examples/custom-generator/src/api/client.routes.ts
diff --git a/packages/client-generator/examples/custom-generator/src/api/client.ts b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
similarity index 100%
rename from packages/client-generator/examples/custom-generator/src/api/client.ts
rename to tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
diff --git a/packages/client-generator/examples/custom-generator/src/main.ts b/tests/e2e/generate-client/examples/custom-generator/src/main.ts
similarity index 100%
rename from packages/client-generator/examples/custom-generator/src/main.ts
rename to tests/e2e/generate-client/examples/custom-generator/src/main.ts
diff --git a/packages/client-generator/examples/custom-generator/tsconfig.json b/tests/e2e/generate-client/examples/custom-generator/tsconfig.json
similarity index 100%
rename from packages/client-generator/examples/custom-generator/tsconfig.json
rename to tests/e2e/generate-client/examples/custom-generator/tsconfig.json
diff --git a/packages/client-generator/examples/custom-generator/vite.config.ts b/tests/e2e/generate-client/examples/custom-generator/vite.config.ts
similarity index 100%
rename from packages/client-generator/examples/custom-generator/vite.config.ts
rename to tests/e2e/generate-client/examples/custom-generator/vite.config.ts
diff --git a/packages/client-generator/examples/customization/.gitignore b/tests/e2e/generate-client/examples/customization/.gitignore
similarity index 100%
rename from packages/client-generator/examples/customization/.gitignore
rename to tests/e2e/generate-client/examples/customization/.gitignore
diff --git a/packages/client-generator/examples/customization/README.md b/tests/e2e/generate-client/examples/customization/README.md
similarity index 100%
rename from packages/client-generator/examples/customization/README.md
rename to tests/e2e/generate-client/examples/customization/README.md
diff --git a/packages/client-generator/examples/customization/index.html b/tests/e2e/generate-client/examples/customization/index.html
similarity index 100%
rename from packages/client-generator/examples/customization/index.html
rename to tests/e2e/generate-client/examples/customization/index.html
diff --git a/packages/client-generator/examples/customization/openapi.yaml b/tests/e2e/generate-client/examples/customization/openapi.yaml
similarity index 100%
rename from packages/client-generator/examples/customization/openapi.yaml
rename to tests/e2e/generate-client/examples/customization/openapi.yaml
diff --git a/packages/client-generator/examples/customization/package.json b/tests/e2e/generate-client/examples/customization/package.json
similarity index 100%
rename from packages/client-generator/examples/customization/package.json
rename to tests/e2e/generate-client/examples/customization/package.json
diff --git a/packages/client-generator/examples/customization/redocly.yaml b/tests/e2e/generate-client/examples/customization/redocly.yaml
similarity index 100%
rename from packages/client-generator/examples/customization/redocly.yaml
rename to tests/e2e/generate-client/examples/customization/redocly.yaml
diff --git a/packages/client-generator/examples/customization/src/api/client.ts b/tests/e2e/generate-client/examples/customization/src/api/client.ts
similarity index 100%
rename from packages/client-generator/examples/customization/src/api/client.ts
rename to tests/e2e/generate-client/examples/customization/src/api/client.ts
diff --git a/packages/client-generator/examples/customization/src/main.ts b/tests/e2e/generate-client/examples/customization/src/main.ts
similarity index 100%
rename from packages/client-generator/examples/customization/src/main.ts
rename to tests/e2e/generate-client/examples/customization/src/main.ts
diff --git a/packages/client-generator/examples/customization/tsconfig.json b/tests/e2e/generate-client/examples/customization/tsconfig.json
similarity index 100%
rename from packages/client-generator/examples/customization/tsconfig.json
rename to tests/e2e/generate-client/examples/customization/tsconfig.json
diff --git a/packages/client-generator/examples/customization/vite.config.ts b/tests/e2e/generate-client/examples/customization/vite.config.ts
similarity index 100%
rename from packages/client-generator/examples/customization/vite.config.ts
rename to tests/e2e/generate-client/examples/customization/vite.config.ts
diff --git a/packages/client-generator/examples/fetch-functions/.gitignore b/tests/e2e/generate-client/examples/fetch-functions/.gitignore
similarity index 100%
rename from packages/client-generator/examples/fetch-functions/.gitignore
rename to tests/e2e/generate-client/examples/fetch-functions/.gitignore
diff --git a/packages/client-generator/examples/fetch-functions/README.md b/tests/e2e/generate-client/examples/fetch-functions/README.md
similarity index 100%
rename from packages/client-generator/examples/fetch-functions/README.md
rename to tests/e2e/generate-client/examples/fetch-functions/README.md
diff --git a/packages/client-generator/examples/fetch-functions/index.html b/tests/e2e/generate-client/examples/fetch-functions/index.html
similarity index 100%
rename from packages/client-generator/examples/fetch-functions/index.html
rename to tests/e2e/generate-client/examples/fetch-functions/index.html
diff --git a/packages/client-generator/examples/fetch-functions/openapi.yaml b/tests/e2e/generate-client/examples/fetch-functions/openapi.yaml
similarity index 100%
rename from packages/client-generator/examples/fetch-functions/openapi.yaml
rename to tests/e2e/generate-client/examples/fetch-functions/openapi.yaml
diff --git a/packages/client-generator/examples/fetch-functions/package.json b/tests/e2e/generate-client/examples/fetch-functions/package.json
similarity index 100%
rename from packages/client-generator/examples/fetch-functions/package.json
rename to tests/e2e/generate-client/examples/fetch-functions/package.json
diff --git a/packages/client-generator/examples/fetch-functions/redocly.yaml b/tests/e2e/generate-client/examples/fetch-functions/redocly.yaml
similarity index 100%
rename from packages/client-generator/examples/fetch-functions/redocly.yaml
rename to tests/e2e/generate-client/examples/fetch-functions/redocly.yaml
diff --git a/packages/client-generator/examples/fetch-functions/src/api/client.ts b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
similarity index 100%
rename from packages/client-generator/examples/fetch-functions/src/api/client.ts
rename to tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
diff --git a/packages/client-generator/examples/fetch-functions/src/main.ts b/tests/e2e/generate-client/examples/fetch-functions/src/main.ts
similarity index 100%
rename from packages/client-generator/examples/fetch-functions/src/main.ts
rename to tests/e2e/generate-client/examples/fetch-functions/src/main.ts
diff --git a/packages/client-generator/examples/fetch-functions/tsconfig.json b/tests/e2e/generate-client/examples/fetch-functions/tsconfig.json
similarity index 100%
rename from packages/client-generator/examples/fetch-functions/tsconfig.json
rename to tests/e2e/generate-client/examples/fetch-functions/tsconfig.json
diff --git a/packages/client-generator/examples/fetch-functions/vite.config.ts b/tests/e2e/generate-client/examples/fetch-functions/vite.config.ts
similarity index 100%
rename from packages/client-generator/examples/fetch-functions/vite.config.ts
rename to tests/e2e/generate-client/examples/fetch-functions/vite.config.ts
diff --git a/packages/client-generator/examples/mock/.gitignore b/tests/e2e/generate-client/examples/mock/.gitignore
similarity index 100%
rename from packages/client-generator/examples/mock/.gitignore
rename to tests/e2e/generate-client/examples/mock/.gitignore
diff --git a/packages/client-generator/examples/mock/README.md b/tests/e2e/generate-client/examples/mock/README.md
similarity index 100%
rename from packages/client-generator/examples/mock/README.md
rename to tests/e2e/generate-client/examples/mock/README.md
diff --git a/packages/client-generator/examples/mock/index.html b/tests/e2e/generate-client/examples/mock/index.html
similarity index 100%
rename from packages/client-generator/examples/mock/index.html
rename to tests/e2e/generate-client/examples/mock/index.html
diff --git a/packages/client-generator/examples/mock/openapi.yaml b/tests/e2e/generate-client/examples/mock/openapi.yaml
similarity index 100%
rename from packages/client-generator/examples/mock/openapi.yaml
rename to tests/e2e/generate-client/examples/mock/openapi.yaml
diff --git a/tests/e2e/generate-client/examples/mock/package-lock.json b/tests/e2e/generate-client/examples/mock/package-lock.json
new file mode 100644
index 0000000000..bc105d0ea8
--- /dev/null
+++ b/tests/e2e/generate-client/examples/mock/package-lock.json
@@ -0,0 +1,1686 @@
+{
+  "name": "@redocly-examples/mock",
+  "version": "0.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "@redocly-examples/mock",
+      "version": "0.0.0",
+      "devDependencies": {
+        "@redocly/cli": "2.34.0-local-2026-06-23.1",
+        "msw": "^2.0.0",
+        "typescript": "^5.5.0",
+        "vite": "^5.4.0"
+      }
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@inquirer/ansi": {
+      "version": "2.0.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@inquirer/ansi/-/ansi-2.0.7.tgz",
+      "integrity": "sha512-3eTuUO1vH2cZm2ZKHeQxnOqlTi9EfZDGgIe3BL3I4u+rJHocr9Fz86M4fjYABPvFnQG/gGK551HqDiIcETwU6Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=23.5.0 || ^22.13.0 || ^20.17.0"
+      }
+    },
+    "node_modules/@inquirer/confirm": {
+      "version": "6.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@inquirer/confirm/-/confirm-6.1.1.tgz",
+      "integrity": "sha512-eb8DBZcz/2qHWQda4rk2JiQk5h9QV/cVHi1yjt0f69WFZMRFn0sJTye3EAP8icut8UDMjQPsaH5KbcOogefrFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/core": "^11.2.1",
+        "@inquirer/type": "^4.0.7"
+      },
+      "engines": {
+        "node": ">=23.5.0 || ^22.13.0 || ^20.17.0"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/core": {
+      "version": "11.2.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@inquirer/core/-/core-11.2.1.tgz",
+      "integrity": "sha512-Qd6GJT1yVyrZZCfN8W2qKF5ApmqryXRhRKCuip8h01x2w/esJQ2XIYc6f9abMIHgKQdBfFTSOdbHRLAhuM09UA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/ansi": "^2.0.7",
+        "@inquirer/figures": "^2.0.7",
+        "@inquirer/type": "^4.0.7",
+        "cli-width": "^4.1.0",
+        "fast-wrap-ansi": "^0.2.0",
+        "mute-stream": "^3.0.0",
+        "signal-exit": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=23.5.0 || ^22.13.0 || ^20.17.0"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@inquirer/figures": {
+      "version": "2.0.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@inquirer/figures/-/figures-2.0.7.tgz",
+      "integrity": "sha512-aJ8TBPOGB6f/2qziPfElISTCEd5XOYTFckA2SGjhNmiKzfK/u4ot3v0DUzGVdUnKjN10EqnnEPck36BkyfLnJw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=23.5.0 || ^22.13.0 || ^20.17.0"
+      }
+    },
+    "node_modules/@inquirer/type": {
+      "version": "4.0.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@inquirer/type/-/type-4.0.7.tgz",
+      "integrity": "sha512-t28inv14nMQ1PhKpsJPY+kEs/c00qzeCOS2gTNRyTjG5d6qsVA2fItxW4hkvGZ5lvanGLdtCzVIx5dwdRpN1+g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=23.5.0 || ^22.13.0 || ^20.17.0"
+      },
+      "peerDependencies": {
+        "@types/node": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@mswjs/interceptors": {
+      "version": "0.41.9",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@mswjs/interceptors/-/interceptors-0.41.9.tgz",
+      "integrity": "sha512-VVPPgHyQ6ShqnrmDWuxjmUIsO9gWyOZFmuOfLd9LfBGQJwZfy0gvv9pbHSJuoFNIYC7ZDX9aoFwowjcdSC4E8w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@open-draft/deferred-promise": "^2.2.0",
+        "@open-draft/logger": "^0.3.0",
+        "@open-draft/until": "^2.0.0",
+        "is-node-process": "^1.2.0",
+        "outvariant": "^1.4.3",
+        "strict-event-emitter": "^0.5.1"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@mswjs/interceptors/node_modules/@open-draft/deferred-promise": {
+      "version": "2.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@open-draft/deferred-promise/-/deferred-promise-2.2.0.tgz",
+      "integrity": "sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@open-draft/deferred-promise": {
+      "version": "3.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@open-draft/deferred-promise/-/deferred-promise-3.0.0.tgz",
+      "integrity": "sha512-XW375UK8/9SqUVNVa6M0yEy8+iTi4QN5VZ7aZuRFQmy76LRwI9wy5F4YIBU6T+eTe2/DNDo8tqu8RHlwLHM6RA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@open-draft/logger": {
+      "version": "0.3.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@open-draft/logger/-/logger-0.3.0.tgz",
+      "integrity": "sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-node-process": "^1.2.0",
+        "outvariant": "^1.4.0"
+      }
+    },
+    "node_modules/@open-draft/until": {
+      "version": "2.1.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@open-draft/until/-/until-2.1.0.tgz",
+      "integrity": "sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@redocly/cli": {
+      "version": "2.34.0-local-2026-06-23.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/cli/-/cli-2.34.0-local-2026-06-23.1.tgz",
+      "integrity": "sha512-F3WnkO5Jn51H6hPzdH3Vde1nQq0eb0k7I7X0UEfkQ6paWGQBLnlOc4cudsU6y1Cz8unD+svmcl8SzaGMwTH6OQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "openapi": "bin/cli.js",
+        "redocly": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
+        "npm": ">=10"
+      }
+    },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.62.2.tgz",
+      "integrity": "sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.62.2.tgz",
+      "integrity": "sha512-BaH7BllCACHoH1LguOU56UItGfUWjujlO65kS9LAodViaN4bwIKd7oeW/ZHJ/4ljr/7MIiENnNy3HJ0zXv8Zkw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.62.2.tgz",
+      "integrity": "sha512-v39RCCvj4He82I9sFmk+M1VZ0PLM9sfsLVikjfx2hYBNALhrrOR2D3JjQA6AhlaSOgcR+RzrKY7e1+bT6SUO/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.62.2.tgz",
+      "integrity": "sha512-yl0y2vq3S3lHeuXhEdss6TWfKW8vkujImO12tn4ZkG/4oghr09LvdYm2RElVjokTQiUvDUGXLGsYeLqUMCKpGA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.62.2.tgz",
+      "integrity": "sha512-tT4pvt4qXD+vEoezupCWi+a1F0vvDiksiHc+PxRlYTOH1I6/X4id9jPxTP+Fg+545euaFT1jJVs4CEdHZAU1vw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.62.2.tgz",
+      "integrity": "sha512-6nU5F2wCW+qvCBhTn1pdIU3bzsIoF7EUwsCDRxilWGprQR6yd508YnH9+OKFCwpfS8pjZqDUmnCAr7exax0XCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.62.2.tgz",
+      "integrity": "sha512-n1GJHPOvpIfhi3TmrCeh6S6URt9BFCt0KQE3qvexyGCTAKpR4Lg+eWvNZEqu7epxwus/8ElT3hacYEucm49SZg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.62.2.tgz",
+      "integrity": "sha512-JqgflS8wEB+UXV/vS1RpRbifGBeN4D5lz8D8oOFbFZw4vedvdOgCFAjfBmIMdW3yL10XpQQ0Ambepw6MXrhOnA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.62.2.tgz",
+      "integrity": "sha512-wnFJkogWvN4jm/hQRF2UBaeUmk20j5+DmHvoyWii2b8HJDyvz1MF2OU/6ynXt2KR63rbZLWkFpoytpdc/yBuSA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.62.2.tgz",
+      "integrity": "sha512-HVu2bp0zhvJ8xHEV9+UUs7S90VadmBSY3LcIMvozbPo4AuMGDWlz3ymHLHZPX4hR67TKTt8Qp5PJ5RBg/i+RMQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.62.2.tgz",
+      "integrity": "sha512-mQqqAV8QaoSgr9I2fKDLY2BAVvmKjWoGiu/cSYQonsLvtqwEn1E4QYfnCOcp5zoEqNhsDYin1s6jx/VJmrxlZg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-musl": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.62.2.tgz",
+      "integrity": "sha512-IxKLoxCQ2IWi6bT2akyDUBGsOImDKB+sPp4EsTmwFQ/fMwpCKm8uLSSgP/Kx/QYUgKis6SEZ5/Nlhup0DIA0PQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.62.2.tgz",
+      "integrity": "sha512-Mk5ha2RQSgyFfmYYLkBpPnUk8D8FriBxesO1u9O75X0mHgXL1UQcH5Itl2lurWL2tj0RxV9b9tJgipac0hRY9A==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-musl": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.62.2.tgz",
+      "integrity": "sha512-CjvEnqJL/0/TQ3TXX3OPIJ/kmBellrWd4heXUmHeJlTnmwjKpSJzoehLaL6Xk0ZnMHBu9dZuFADNOrtjF4v+2w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.62.2.tgz",
+      "integrity": "sha512-1SiZbzwdkaDURsew/tSOrooKiYy7EQGT6m8ufavAi9NEyQb/6VuIxFXAL1fqa4iZe3g4NbNk4P7J32z2tw5Mgg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.62.2.tgz",
+      "integrity": "sha512-nQts12zJ3NQRoE6uYljOH89v7szzLDvG2JD/vsX+vGXU8w/At1GowTZ5/7qeFQ8m7L55rpR8Okugnuo5bgjy2Q==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.62.2.tgz",
+      "integrity": "sha512-E9/ll019jhPIJgpzfZoIkBGhcz+kKNgVWYRY0zr9srBdPPFVpvOKW8VaJKUbeK+eZXyQF9ltME+Kk6affeaPgg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.62.2.tgz",
+      "integrity": "sha512-5BqxR/pshjey51iliyzTD5Xi3EN0aLmQ2lZ3lvefVV9c82BvrLo2/6OT55iifpWBufs6kdwWbuOKS841DrmK9A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.62.2.tgz",
+      "integrity": "sha512-uNN83XxQrRAh/w0/pmAfibcwyb6YWt4gP+dpnQKPVJshAloQ785ii8CT8ZCIxkGg9opVsvAlGhFitSm6D1Jjpg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-openbsd-x64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.62.2.tgz",
+      "integrity": "sha512-srjEIxSH3LRnJN6THczDHWQplqEMFiAJrTab0msUryh9kwNpkICf3Ea6q6MN/2cZwRFUNx5w+h6Hpi4QuHS6Zg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.62.2.tgz",
+      "integrity": "sha512-8hOJnxgbyObnCm5AlRA3A931xX19xq80RjVTKgJOvEKWqJruP/Uf12IbAOaDjjEXYRewwHLfmF0YRIdK3OwKWA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.62.2.tgz",
+      "integrity": "sha512-mmF4AY1i0hG/bLWUctUq59gtmgaSIRa3cu/A3JFRp/sCNEme2bgDEiDS22P9FbnJB8NJNF4jPJiSP5RHQpUTDg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.62.2.tgz",
+      "integrity": "sha512-DZgkknc6jhHrk46V25vbAM0zZkyP0nSDkJB8/dRkLTxv470dOmWDqGoEJl/9A0dFfS7yE3REOwNDxpHwSLSt0Q==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.62.2.tgz",
+      "integrity": "sha512-T6xr6ucWSFto+VGajA8YH26LdpHRuP4YLHEKAtCWvJDOlnmWcDZVCI2Jmjr+IFHDlt2zRaTAKE4tfjTaWLgJBg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.62.2.tgz",
+      "integrity": "sha512-BfzEnDJOt9T8M989/lA37EcJgat01wLRnoi5dQf3QzOH7jzpqTAzdDbVfRljVr5r+jzKqpbHeyOfAaXxAd0PAA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.9",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/estree/-/estree-1.0.9.tgz",
+      "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "26.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/node/-/node-26.0.0.tgz",
+      "integrity": "sha512-vf2YFi1iY9lHGwNJMs01biZFbKJkrZR1T6/MlzjhJLPdntOHLhTrDSnSVcdtvjihi4VQNlrFRIxLsDBlQpAipA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~8.3.0"
+      }
+    },
+    "node_modules/@types/set-cookie-parser": {
+      "version": "2.4.10",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/set-cookie-parser/-/set-cookie-parser-2.4.10.tgz",
+      "integrity": "sha512-GGmQVGpQWUe5qglJozEjZV/5dyxbOOZ0LHe/lqyWssB88Y4svNfst0uqBVscdDeIKl5Jy5+aPSvy7mI9tYRguw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/statuses": {
+      "version": "2.0.6",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/statuses/-/statuses-2.0.6.tgz",
+      "integrity": "sha512-xMAgYwceFhRA2zY+XbEA7mxYbA093wdiW8Vu6gZPGWy9cmOyU9XesH1tNcEWsKFd5Vzrqx5T3D38PWx1FIIXkA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/cli-width": {
+      "version": "4.1.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/cli-width/-/cli-width-4.1.0.tgz",
+      "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/esbuild": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/fast-string-truncated-width": {
+      "version": "3.0.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-string-truncated-width/-/fast-string-truncated-width-3.0.3.tgz",
+      "integrity": "sha512-0jjjIEL6+0jag3l2XWWizO64/aZVtpiGE3t0Zgqxv0DPuxiMjvB3M24fCyhZUO4KomJQPj3LTSUnDP3GpdwC0g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-string-width": {
+      "version": "3.0.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-string-width/-/fast-string-width-3.0.2.tgz",
+      "integrity": "sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-string-truncated-width": "^3.0.2"
+      }
+    },
+    "node_modules/fast-wrap-ansi": {
+      "version": "0.2.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-wrap-ansi/-/fast-wrap-ansi-0.2.2.tgz",
+      "integrity": "sha512-7F2Fl+TjRSenLqlU3UjSH0iyqopqoZIu7eZVpEirP2g1GtWa2G/ecEmBdgz31+Mxr+ELclgg6sokpSFIQiZ02Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-string-width": "^3.0.2"
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/graphql": {
+      "version": "16.14.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/graphql/-/graphql-16.14.2.tgz",
+      "integrity": "sha512-Chq1s4CY7jmh8gO2qvLIJyfCDIN+EHLFW/9iShnp1z8FjBQMoodWP1kDC36VAMXXIvAjj4ARa7ntfAV2BrjsbA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
+      }
+    },
+    "node_modules/headers-polyfill": {
+      "version": "5.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/headers-polyfill/-/headers-polyfill-5.0.1.tgz",
+      "integrity": "sha512-1TJ6Fih/b8h5TIcv+1+Hw0PDQWJTKDKzFZzcKOiW1wJza3XoAQlkCuXLbymPYB8+ZQyw8mHvdw560e8zVFIWyA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/set-cookie-parser": "^2.4.10",
+        "set-cookie-parser": "^3.0.1"
+      }
+    },
+    "node_modules/headers-polyfill/node_modules/set-cookie-parser": {
+      "version": "3.1.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/set-cookie-parser/-/set-cookie-parser-3.1.0.tgz",
+      "integrity": "sha512-kjnC1DXBHcxaOaOXBHBeRtltsDG2nUiUni+jP92M9gYdW12rsmx92UsfpH7o5tDRs7I1ZZPSQJQGv3UaRfCiuw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-node-process": {
+      "version": "1.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/is-node-process/-/is-node-process-1.2.0.tgz",
+      "integrity": "sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/msw": {
+      "version": "2.14.6",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/msw/-/msw-2.14.6.tgz",
+      "integrity": "sha512-ALe+N10S72cyx94cMcy3Zs4HhXCj35sgeAL4c+WTvKi0zWnbd8/h0lcFqv0mb2P+aSgAdD7p9HzvA0DiUPxsyg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "dependencies": {
+        "@inquirer/confirm": "^6.0.11",
+        "@mswjs/interceptors": "^0.41.3",
+        "@open-draft/deferred-promise": "^3.0.0",
+        "@types/statuses": "^2.0.6",
+        "cookie": "^1.1.1",
+        "graphql": "^16.13.2",
+        "headers-polyfill": "^5.0.1",
+        "is-node-process": "^1.2.0",
+        "outvariant": "^1.4.3",
+        "path-to-regexp": "^6.3.0",
+        "picocolors": "^1.1.1",
+        "rettime": "^0.11.11",
+        "statuses": "^2.0.2",
+        "strict-event-emitter": "^0.5.1",
+        "tough-cookie": "^6.0.1",
+        "type-fest": "^5.5.0",
+        "until-async": "^3.0.2",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "msw": "cli/index.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mswjs"
+      },
+      "peerDependencies": {
+        "typescript": ">= 4.8.x"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/msw/node_modules/cliui": {
+      "version": "8.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/cliui/-/cliui-8.0.1.tgz",
+      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/msw/node_modules/cookie": {
+      "version": "1.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/cookie/-/cookie-1.1.1.tgz",
+      "integrity": "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
+      }
+    },
+    "node_modules/msw/node_modules/yargs": {
+      "version": "17.7.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/yargs/-/yargs-17.7.3.tgz",
+      "integrity": "sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^8.0.1",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/msw/node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/mute-stream": {
+      "version": "3.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/mute-stream/-/mute-stream-3.0.0.tgz",
+      "integrity": "sha512-dkEJPVvun4FryqBmZ5KhDo0K9iDXAwn08tMLDinNdRBNPcYEDiWYysLcc6k3mjTMlbP9KyylvRpd4wFtwrT9rw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "^20.17.0 || >=22.9.0"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.15",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/nanoid/-/nanoid-3.3.15.tgz",
+      "integrity": "sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/outvariant": {
+      "version": "1.4.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/outvariant/-/outvariant-1.4.3.tgz",
+      "integrity": "sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/path-to-regexp": {
+      "version": "6.3.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
+      "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/postcss": {
+      "version": "8.5.15",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/postcss/-/postcss-8.5.15.tgz",
+      "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.12",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rettime": {
+      "version": "0.11.11",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/rettime/-/rettime-0.11.11.tgz",
+      "integrity": "sha512-ILJRqVWBCTlg9r42fFgwVZx1gnFAcQF8mRoMkbgQfIrjEDf9nbBFDFx00oloOa+Q869FUtaYDXZvEfnecQSCoQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/rollup": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/rollup/-/rollup-4.62.2.tgz",
+      "integrity": "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "1.0.9"
+      },
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.62.2",
+        "@rollup/rollup-android-arm64": "4.62.2",
+        "@rollup/rollup-darwin-arm64": "4.62.2",
+        "@rollup/rollup-darwin-x64": "4.62.2",
+        "@rollup/rollup-freebsd-arm64": "4.62.2",
+        "@rollup/rollup-freebsd-x64": "4.62.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.62.2",
+        "@rollup/rollup-linux-arm-musleabihf": "4.62.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.62.2",
+        "@rollup/rollup-linux-arm64-musl": "4.62.2",
+        "@rollup/rollup-linux-loong64-gnu": "4.62.2",
+        "@rollup/rollup-linux-loong64-musl": "4.62.2",
+        "@rollup/rollup-linux-ppc64-gnu": "4.62.2",
+        "@rollup/rollup-linux-ppc64-musl": "4.62.2",
+        "@rollup/rollup-linux-riscv64-gnu": "4.62.2",
+        "@rollup/rollup-linux-riscv64-musl": "4.62.2",
+        "@rollup/rollup-linux-s390x-gnu": "4.62.2",
+        "@rollup/rollup-linux-x64-gnu": "4.62.2",
+        "@rollup/rollup-linux-x64-musl": "4.62.2",
+        "@rollup/rollup-openbsd-x64": "4.62.2",
+        "@rollup/rollup-openharmony-arm64": "4.62.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.62.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.62.2",
+        "@rollup/rollup-win32-x64-gnu": "4.62.2",
+        "@rollup/rollup-win32-x64-msvc": "4.62.2",
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/statuses": {
+      "version": "2.0.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/statuses/-/statuses-2.0.2.tgz",
+      "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/strict-event-emitter": {
+      "version": "0.5.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/strict-event-emitter/-/strict-event-emitter-0.5.1.tgz",
+      "integrity": "sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tagged-tag": {
+      "version": "1.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/tagged-tag/-/tagged-tag-1.0.0.tgz",
+      "integrity": "sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/tldts": {
+      "version": "7.4.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/tldts/-/tldts-7.4.4.tgz",
+      "integrity": "sha512-kFXFK7O4WPextIUAOk8qtnw9dxR9UIXP9CjuH1cTBVBZMDeQcUPgr/IazGiw1B0Yiw5L75gHLWeW4iD793r90g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tldts-core": "^7.4.4"
+      },
+      "bin": {
+        "tldts": "bin/cli.js"
+      }
+    },
+    "node_modules/tldts-core": {
+      "version": "7.4.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/tldts-core/-/tldts-core-7.4.4.tgz",
+      "integrity": "sha512-vwVLJVvvpslm7vqAH7+XNj/neA/Ynq7DT2EEcMuwc5YzN5XaMyRAqxwU+uX3azZ1FQtB2gvrvnLnAEkvYlVdfg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tough-cookie": {
+      "version": "6.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/tough-cookie/-/tough-cookie-6.0.1.tgz",
+      "integrity": "sha512-LktZQb3IeoUWB9lqR5EWTHgW/VTITCXg4D21M+lvybRVdylLrRMnqaIONLVb5mav8vM19m44HIcGq4qASeu2Qw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "tldts": "^7.0.5"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "5.7.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/type-fest/-/type-fest-5.7.0.tgz",
+      "integrity": "sha512-1URUxUqfHFM1c+zfSPsa3gnkO7Aq21qyH75SIduNYz4SzY964rn1X2vCMQaHSHhktiw+0kPa2iyb6PUpXqB6Vg==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "dependencies": {
+        "tagged-tag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.9.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "8.3.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/undici-types/-/undici-types-8.3.0.tgz",
+      "integrity": "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/until-async": {
+      "version": "3.0.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/until-async/-/until-async-3.0.2.tgz",
+      "integrity": "sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/kettanaito"
+      }
+    },
+    "node_modules/vite": {
+      "version": "5.4.21",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/vite/-/vite-5.4.21.tgz",
+      "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "sass-embedded": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    }
+  }
+}
diff --git a/packages/client-generator/examples/mock/package.json b/tests/e2e/generate-client/examples/mock/package.json
similarity index 100%
rename from packages/client-generator/examples/mock/package.json
rename to tests/e2e/generate-client/examples/mock/package.json
diff --git a/packages/client-generator/examples/mock/public/mockServiceWorker.js b/tests/e2e/generate-client/examples/mock/public/mockServiceWorker.js
similarity index 100%
rename from packages/client-generator/examples/mock/public/mockServiceWorker.js
rename to tests/e2e/generate-client/examples/mock/public/mockServiceWorker.js
diff --git a/packages/client-generator/examples/mock/redocly.yaml b/tests/e2e/generate-client/examples/mock/redocly.yaml
similarity index 100%
rename from packages/client-generator/examples/mock/redocly.yaml
rename to tests/e2e/generate-client/examples/mock/redocly.yaml
diff --git a/packages/client-generator/examples/mock/src/api/client.mocks.ts b/tests/e2e/generate-client/examples/mock/src/api/client.mocks.ts
similarity index 100%
rename from packages/client-generator/examples/mock/src/api/client.mocks.ts
rename to tests/e2e/generate-client/examples/mock/src/api/client.mocks.ts
diff --git a/packages/client-generator/examples/mock/src/api/client.ts b/tests/e2e/generate-client/examples/mock/src/api/client.ts
similarity index 100%
rename from packages/client-generator/examples/mock/src/api/client.ts
rename to tests/e2e/generate-client/examples/mock/src/api/client.ts
diff --git a/packages/client-generator/examples/mock/src/main.ts b/tests/e2e/generate-client/examples/mock/src/main.ts
similarity index 100%
rename from packages/client-generator/examples/mock/src/main.ts
rename to tests/e2e/generate-client/examples/mock/src/main.ts
diff --git a/packages/client-generator/examples/mock/src/node.ts b/tests/e2e/generate-client/examples/mock/src/node.ts
similarity index 100%
rename from packages/client-generator/examples/mock/src/node.ts
rename to tests/e2e/generate-client/examples/mock/src/node.ts
diff --git a/packages/client-generator/examples/mock/tsconfig.json b/tests/e2e/generate-client/examples/mock/tsconfig.json
similarity index 100%
rename from packages/client-generator/examples/mock/tsconfig.json
rename to tests/e2e/generate-client/examples/mock/tsconfig.json
diff --git a/packages/client-generator/examples/mock/vite.config.ts b/tests/e2e/generate-client/examples/mock/vite.config.ts
similarity index 100%
rename from packages/client-generator/examples/mock/vite.config.ts
rename to tests/e2e/generate-client/examples/mock/vite.config.ts
diff --git a/packages/client-generator/examples/programmatic/.gitignore b/tests/e2e/generate-client/examples/programmatic/.gitignore
similarity index 100%
rename from packages/client-generator/examples/programmatic/.gitignore
rename to tests/e2e/generate-client/examples/programmatic/.gitignore
diff --git a/packages/client-generator/examples/programmatic/README.md b/tests/e2e/generate-client/examples/programmatic/README.md
similarity index 100%
rename from packages/client-generator/examples/programmatic/README.md
rename to tests/e2e/generate-client/examples/programmatic/README.md
diff --git a/packages/client-generator/examples/programmatic/generate.ts b/tests/e2e/generate-client/examples/programmatic/generate.ts
similarity index 100%
rename from packages/client-generator/examples/programmatic/generate.ts
rename to tests/e2e/generate-client/examples/programmatic/generate.ts
diff --git a/packages/client-generator/examples/programmatic/openapi.yaml b/tests/e2e/generate-client/examples/programmatic/openapi.yaml
similarity index 100%
rename from packages/client-generator/examples/programmatic/openapi.yaml
rename to tests/e2e/generate-client/examples/programmatic/openapi.yaml
diff --git a/tests/e2e/generate-client/examples/programmatic/package-lock.json b/tests/e2e/generate-client/examples/programmatic/package-lock.json
new file mode 100644
index 0000000000..d3256a21f1
--- /dev/null
+++ b/tests/e2e/generate-client/examples/programmatic/package-lock.json
@@ -0,0 +1,809 @@
+{
+  "name": "@redocly-examples/programmatic",
+  "version": "0.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "@redocly-examples/programmatic",
+      "version": "0.0.0",
+      "devDependencies": {
+        "@redocly/openapi-typescript": "0.1.0-local-local",
+        "tsx": "^4.0.0",
+        "typescript": "^5.5.0"
+      }
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/runtime/-/runtime-7.29.7.tgz",
+      "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/aix-ppc64/-/aix-ppc64-0.28.1.tgz",
+      "integrity": "sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-arm/-/android-arm-0.28.1.tgz",
+      "integrity": "sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-arm64/-/android-arm64-0.28.1.tgz",
+      "integrity": "sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-x64/-/android-x64-0.28.1.tgz",
+      "integrity": "sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/darwin-arm64/-/darwin-arm64-0.28.1.tgz",
+      "integrity": "sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/darwin-x64/-/darwin-x64-0.28.1.tgz",
+      "integrity": "sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.1.tgz",
+      "integrity": "sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/freebsd-x64/-/freebsd-x64-0.28.1.tgz",
+      "integrity": "sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-arm/-/linux-arm-0.28.1.tgz",
+      "integrity": "sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-arm64/-/linux-arm64-0.28.1.tgz",
+      "integrity": "sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-ia32/-/linux-ia32-0.28.1.tgz",
+      "integrity": "sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-loong64/-/linux-loong64-0.28.1.tgz",
+      "integrity": "sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-mips64el/-/linux-mips64el-0.28.1.tgz",
+      "integrity": "sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-ppc64/-/linux-ppc64-0.28.1.tgz",
+      "integrity": "sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-riscv64/-/linux-riscv64-0.28.1.tgz",
+      "integrity": "sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-s390x/-/linux-s390x-0.28.1.tgz",
+      "integrity": "sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-x64/-/linux-x64-0.28.1.tgz",
+      "integrity": "sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.1.tgz",
+      "integrity": "sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/netbsd-x64/-/netbsd-x64-0.28.1.tgz",
+      "integrity": "sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.1.tgz",
+      "integrity": "sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/openbsd-x64/-/openbsd-x64-0.28.1.tgz",
+      "integrity": "sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.1.tgz",
+      "integrity": "sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/sunos-x64/-/sunos-x64-0.28.1.tgz",
+      "integrity": "sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-arm64/-/win32-arm64-0.28.1.tgz",
+      "integrity": "sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-ia32/-/win32-ia32-0.28.1.tgz",
+      "integrity": "sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-x64/-/win32-x64-0.28.1.tgz",
+      "integrity": "sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@redocly/ajv": {
+      "version": "8.18.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/ajv/-/ajv-8.18.3.tgz",
+      "integrity": "sha512-l42u0of3hY98sN2A+M4qTX1O/KrpgGH32Hu9kP2GtHyD5Dfqq86PKFLe5dwaD8DEnNmlOlll2BAmeEtf0DaySg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@redocly/config": {
+      "version": "0.49.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/config/-/config-0.49.0.tgz",
+      "integrity": "sha512-OI/rpEffX3fKUuy+OuBHPRspRI/S30b9aiqxfZLMpSWZzDncEGPxSEP1O2LrBVshnDX4hLjVjLvCZ4YT85+1rw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "json-schema-to-ts": "2.7.2"
+      }
+    },
+    "node_modules/@redocly/openapi-core": {
+      "version": "2.31.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/openapi-core/-/openapi-core-2.31.4.tgz",
+      "integrity": "sha512-ne2e5NduK9MHnu42LoPXgfKhyCFG5Mc2Cwh3wNfLdoieYvhKtl37rW7p4p+GDMEJmlI9t6fagQbGPAKic2+3Pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@redocly/ajv": "^8.18.1",
+        "@redocly/config": "^0.49.0",
+        "ajv": "npm:@redocly/ajv@8.18.1",
+        "ajv-formats": "^3.0.1",
+        "colorette": "^1.2.0",
+        "js-levenshtein": "^1.1.6",
+        "js-yaml": "^4.1.0",
+        "picomatch": "^4.0.4",
+        "pluralize": "^8.0.0",
+        "yaml-ast-parser": "0.0.43"
+      },
+      "engines": {
+        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
+        "npm": ">=10"
+      }
+    },
+    "node_modules/@redocly/openapi-typescript": {
+      "version": "0.1.0-local-local",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/openapi-typescript/-/openapi-typescript-0.1.0-local-local.tgz",
+      "integrity": "sha512-BJRV89BoYdEyECFGRB8t2dzWnOGNe1/oQ7DZoC662kv4NRJhxz5qw3exl24+M+1WCpGdRtPps5GIy+vPqauJUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@redocly/openapi-core": "2.31.4"
+      },
+      "engines": {
+        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
+        "npm": ">=10"
+      },
+      "peerDependencies": {
+        "typescript": ">=5.5.0"
+      }
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ajv": {
+      "name": "@redocly/ajv",
+      "version": "8.18.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/ajv/-/ajv-8.18.1.tgz",
+      "integrity": "sha512-Ifm/pP/tul1qmAecpbVxCBluVE32rKfjf8gYXH4xI2gCv9mRWFhJMHzkPDM4TXlxwPQYIFegymlsy8lXz7optA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats": {
+      "version": "3.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ajv-formats/-/ajv-formats-3.0.1.tgz",
+      "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/colorette": {
+      "version": "1.4.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/colorette/-/colorette-1.4.0.tgz",
+      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/esbuild": {
+      "version": "0.28.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/esbuild/-/esbuild-0.28.1.tgz",
+      "integrity": "sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.28.1",
+        "@esbuild/android-arm": "0.28.1",
+        "@esbuild/android-arm64": "0.28.1",
+        "@esbuild/android-x64": "0.28.1",
+        "@esbuild/darwin-arm64": "0.28.1",
+        "@esbuild/darwin-x64": "0.28.1",
+        "@esbuild/freebsd-arm64": "0.28.1",
+        "@esbuild/freebsd-x64": "0.28.1",
+        "@esbuild/linux-arm": "0.28.1",
+        "@esbuild/linux-arm64": "0.28.1",
+        "@esbuild/linux-ia32": "0.28.1",
+        "@esbuild/linux-loong64": "0.28.1",
+        "@esbuild/linux-mips64el": "0.28.1",
+        "@esbuild/linux-ppc64": "0.28.1",
+        "@esbuild/linux-riscv64": "0.28.1",
+        "@esbuild/linux-s390x": "0.28.1",
+        "@esbuild/linux-x64": "0.28.1",
+        "@esbuild/netbsd-arm64": "0.28.1",
+        "@esbuild/netbsd-x64": "0.28.1",
+        "@esbuild/openbsd-arm64": "0.28.1",
+        "@esbuild/openbsd-x64": "0.28.1",
+        "@esbuild/openharmony-arm64": "0.28.1",
+        "@esbuild/sunos-x64": "0.28.1",
+        "@esbuild/win32-arm64": "0.28.1",
+        "@esbuild/win32-ia32": "0.28.1",
+        "@esbuild/win32-x64": "0.28.1"
+      }
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-uri": {
+      "version": "3.1.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-uri/-/fast-uri-3.1.2.tgz",
+      "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/js-levenshtein": {
+      "version": "1.1.6",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
+      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/js-yaml": {
+      "version": "4.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/js-yaml/-/js-yaml-4.2.0.tgz",
+      "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/puzrin"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/nodeca"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/json-schema-to-ts": {
+      "version": "2.7.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/json-schema-to-ts/-/json-schema-to-ts-2.7.2.tgz",
+      "integrity": "sha512-R1JfqKqbBR4qE8UyBR56Ms30LL62/nlhoz+1UkfI/VE7p54Awu919FZ6ZUPG8zIa3XB65usPJgr1ONVncUGSaQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.18.3",
+        "@types/json-schema": "^7.0.9",
+        "ts-algebra": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/picomatch": {
+      "version": "4.0.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pluralize": {
+      "version": "8.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/pluralize/-/pluralize-8.0.0.tgz",
+      "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ts-algebra": {
+      "version": "1.2.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ts-algebra/-/ts-algebra-1.2.2.tgz",
+      "integrity": "sha512-kloPhf1hq3JbCPOTYoOWDKxebWjNb2o/LKnNfkWhxVVisFFmMJPPdJeGoGmM+iRLyoXAR61e08Pb+vUXINg8aA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tsx": {
+      "version": "4.22.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/tsx/-/tsx-4.22.4.tgz",
+      "integrity": "sha512-X8EX+XV4QR5xCsrgxaED954zTDfY8KqlDtskKEL0cHhyS/P8b4IFOvGDQpsC9Q1XnLq915wEfwwY/zzskCtmhg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "~0.28.0"
+      },
+      "bin": {
+        "tsx": "dist/cli.mjs"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.9.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/yaml-ast-parser": {
+      "version": "0.0.43",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz",
+      "integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==",
+      "dev": true,
+      "license": "Apache-2.0"
+    }
+  }
+}
diff --git a/packages/client-generator/examples/programmatic/package.json b/tests/e2e/generate-client/examples/programmatic/package.json
similarity index 100%
rename from packages/client-generator/examples/programmatic/package.json
rename to tests/e2e/generate-client/examples/programmatic/package.json
diff --git a/packages/client-generator/examples/programmatic/src/api/client.ts b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
similarity index 100%
rename from packages/client-generator/examples/programmatic/src/api/client.ts
rename to tests/e2e/generate-client/examples/programmatic/src/api/client.ts
diff --git a/packages/client-generator/examples/programmatic/src/main.ts b/tests/e2e/generate-client/examples/programmatic/src/main.ts
similarity index 100%
rename from packages/client-generator/examples/programmatic/src/main.ts
rename to tests/e2e/generate-client/examples/programmatic/src/main.ts
diff --git a/packages/client-generator/examples/programmatic/tsconfig.json b/tests/e2e/generate-client/examples/programmatic/tsconfig.json
similarity index 100%
rename from packages/client-generator/examples/programmatic/tsconfig.json
rename to tests/e2e/generate-client/examples/programmatic/tsconfig.json
diff --git a/packages/client-generator/examples/service-class/.gitignore b/tests/e2e/generate-client/examples/service-class/.gitignore
similarity index 100%
rename from packages/client-generator/examples/service-class/.gitignore
rename to tests/e2e/generate-client/examples/service-class/.gitignore
diff --git a/packages/client-generator/examples/service-class/README.md b/tests/e2e/generate-client/examples/service-class/README.md
similarity index 100%
rename from packages/client-generator/examples/service-class/README.md
rename to tests/e2e/generate-client/examples/service-class/README.md
diff --git a/packages/client-generator/examples/service-class/index.html b/tests/e2e/generate-client/examples/service-class/index.html
similarity index 100%
rename from packages/client-generator/examples/service-class/index.html
rename to tests/e2e/generate-client/examples/service-class/index.html
diff --git a/packages/client-generator/examples/service-class/openapi.yaml b/tests/e2e/generate-client/examples/service-class/openapi.yaml
similarity index 100%
rename from packages/client-generator/examples/service-class/openapi.yaml
rename to tests/e2e/generate-client/examples/service-class/openapi.yaml
diff --git a/tests/e2e/generate-client/examples/service-class/package-lock.json b/tests/e2e/generate-client/examples/service-class/package-lock.json
new file mode 100644
index 0000000000..5e911b1f1e
--- /dev/null
+++ b/tests/e2e/generate-client/examples/service-class/package-lock.json
@@ -0,0 +1,3504 @@
+{
+  "name": "@redocly-examples/service-class",
+  "version": "0.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "@redocly-examples/service-class",
+      "version": "0.0.0",
+      "devDependencies": {
+        "@redocly/cli": "2.31.4-local-06-22",
+        "typescript": "^5.5.0",
+        "vite": "^5.4.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/code-frame/-/code-frame-7.29.7.tgz",
+      "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.29.7",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
+      "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/runtime/-/runtime-7.29.7.tgz",
+      "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@emotion/is-prop-valid": {
+      "version": "1.4.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@emotion/is-prop-valid/-/is-prop-valid-1.4.0.tgz",
+      "integrity": "sha512-QgD4fyscGcbbKwJmqNvUMSE02OsHUa+lAWKdEUIJKgqe5IwRSKd7+KhibEWdaKwgjLj0DRSHA9biAIqGBk05lw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@emotion/memoize": "^0.9.0"
+      }
+    },
+    "node_modules/@emotion/memoize": {
+      "version": "0.9.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@emotion/memoize/-/memoize-0.9.0.tgz",
+      "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@exodus/schemasafe": {
+      "version": "1.3.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@exodus/schemasafe/-/schemasafe-1.3.0.tgz",
+      "integrity": "sha512-5Aap/GaRupgNx/feGBwLLTVv8OQFfv3pq2lPRzPg9R+IOBnDgghTGW7l7EuVXOvg5cc/xSAlRW8rBrjIC3Nvqw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@faker-js/faker": {
+      "version": "7.6.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@faker-js/faker/-/faker-7.6.0.tgz",
+      "integrity": "sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0",
+        "npm": ">=6.0.0"
+      }
+    },
+    "node_modules/@humanwhocodes/momoa": {
+      "version": "2.0.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@humanwhocodes/momoa/-/momoa-2.0.4.tgz",
+      "integrity": "sha512-RE815I4arJFtt+FVeU1Tgp9/Xvecacji8w/V6XtXsWWH/wz/eNkNbhb+ny/+PlVZjV0rxQpRSQKNKE3lcktHEA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@noble/hashes": {
+      "version": "1.8.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@noble/hashes/-/hashes-1.8.0.tgz",
+      "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14.21.3 || >=16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@nodable/entities": {
+      "version": "2.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@nodable/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-9uGyhaQavEUMC8AIddIjau4NsnsXhou+j5sBAGojCM1oxmQpVKTWR/9JxABD6UAv12vpIms55fPZKFQEhG6uBg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/nodable"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/@opentelemetry/api": {
+      "version": "1.9.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/api/-/api-1.9.1.tgz",
+      "integrity": "sha512-gLyJlPHPZYdAk1JENA9LeHejZe1Ti77/pTeFm/nMXmQH/HFZlcS/O2XJB+L8fkbrNSqhdtlvjBVjxwUYanNH5Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/api-logs": {
+      "version": "0.214.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/api-logs/-/api-logs-0.214.0.tgz",
+      "integrity": "sha512-40lSJeqYO8Uz2Yj7u94/SJWE/wONa7rmMKjI1ZcIjgf3MHNHv1OZUCrCETGuaRF62d5pQD1wKIW+L4lmSMTzZA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/context-async-hooks": {
+      "version": "2.6.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/context-async-hooks/-/context-async-hooks-2.6.1.tgz",
+      "integrity": "sha512-XHzhwRNkBpeP8Fs/qjGrAf9r9PRv67wkJQ/7ZPaBQQ68DYlTBBx5MF9LvPx7mhuXcDessKK2b+DcxqwpgkcivQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.0.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/core": {
+      "version": "2.6.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/core/-/core-2.6.1.tgz",
+      "integrity": "sha512-8xHSGWpJP9wBxgBpnqGL0R3PbdWQndL1Qp50qrg71+B28zK5OQmUgcDKLJgzyAAV38t4tOyLMGDD60LneR5W8g==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/semantic-conventions": "^1.29.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.0.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/exporter-trace-otlp-http": {
+      "version": "0.214.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.214.0.tgz",
+      "integrity": "sha512-kIN8nTBMgV2hXzV/a20BCFilPZdAIMYYJGSgfMMRm/Xa+07y5hRDS2Vm12A/z8Cdu3Sq++ZvJfElokX2rkgGgw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "2.6.1",
+        "@opentelemetry/otlp-exporter-base": "0.214.0",
+        "@opentelemetry/otlp-transformer": "0.214.0",
+        "@opentelemetry/resources": "2.6.1",
+        "@opentelemetry/sdk-trace-base": "2.6.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/otlp-exporter-base": {
+      "version": "0.214.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.214.0.tgz",
+      "integrity": "sha512-u1Gdv0/E9wP+apqWf7Wv2npXmgJtxsW2XL0TEv9FZloTZRuMBKmu8cYVXwS4Hm3q/f/3FuCnPTgiwYvIqRSpRg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "2.6.1",
+        "@opentelemetry/otlp-transformer": "0.214.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/otlp-transformer": {
+      "version": "0.214.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/otlp-transformer/-/otlp-transformer-0.214.0.tgz",
+      "integrity": "sha512-DSaYcuBRh6uozfsWN3R8HsN0yDhCuWP7tOFdkUOVaWD1KVJg8m4qiLUsg/tNhTLS9HUYUcwNpwL2eroLtsZZ/w==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.214.0",
+        "@opentelemetry/core": "2.6.1",
+        "@opentelemetry/resources": "2.6.1",
+        "@opentelemetry/sdk-logs": "0.214.0",
+        "@opentelemetry/sdk-metrics": "2.6.1",
+        "@opentelemetry/sdk-trace-base": "2.6.1",
+        "protobufjs": "^7.0.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/resources": {
+      "version": "2.6.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/resources/-/resources-2.6.1.tgz",
+      "integrity": "sha512-lID/vxSuKWXM55XhAKNoYXu9Cutoq5hFdkbTdI/zDKQktXzcWBVhNsOkiZFTMU9UtEWuGRNe0HUgmsFldIdxVA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "2.6.1",
+        "@opentelemetry/semantic-conventions": "^1.29.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.3.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/sdk-logs": {
+      "version": "0.214.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/sdk-logs/-/sdk-logs-0.214.0.tgz",
+      "integrity": "sha512-zf6acnScjhsaBUU22zXZ/sLWim1dfhUAbGXdMmHmNG3LfBnQ3DKsOCITb2IZwoUsNNMTogqFKBnlIPPftUgGwA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.214.0",
+        "@opentelemetry/core": "2.6.1",
+        "@opentelemetry/resources": "2.6.1",
+        "@opentelemetry/semantic-conventions": "^1.29.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.4.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/sdk-metrics": {
+      "version": "2.6.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/sdk-metrics/-/sdk-metrics-2.6.1.tgz",
+      "integrity": "sha512-9t9hJHX15meBy2NmTJxL+NJfXmnausR2xUDvE19XQce0Qi/GBtDGamU8nS1RMbdgDmhgpm3VaOu2+fiS/SfTpQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "2.6.1",
+        "@opentelemetry/resources": "2.6.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.9.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/sdk-trace-base": {
+      "version": "2.6.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.6.1.tgz",
+      "integrity": "sha512-r86ut4T1e8vNwB35CqCcKd45yzqH6/6Wzvpk2/cZB8PsPLlZFTvrh8yfOS3CYZYcUmAx4hHTZJ8AO8Dj8nrdhw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "2.6.1",
+        "@opentelemetry/resources": "2.6.1",
+        "@opentelemetry/semantic-conventions": "^1.29.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.3.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/sdk-trace-node": {
+      "version": "2.6.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/sdk-trace-node/-/sdk-trace-node-2.6.1.tgz",
+      "integrity": "sha512-Hh2i4FwHWRFhnO2Q/p6svMxy8MPsNCG0uuzUY3glqm0rwM0nQvbTO1dXSp9OqQoTKXcQzaz9q1f65fsurmOhNw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/context-async-hooks": "2.6.1",
+        "@opentelemetry/core": "2.6.1",
+        "@opentelemetry/sdk-trace-base": "2.6.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.0.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/semantic-conventions": {
+      "version": "1.40.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/semantic-conventions/-/semantic-conventions-1.40.0.tgz",
+      "integrity": "sha512-cifvXDhcqMwwTlTK04GBNeIe7yyo28Mfby85QXFe1Yk8nmi36Ab/5UQwptOx84SsoGNRg+EVSjwzfSZMy6pmlw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@protobufjs/aspromise": {
+      "version": "1.1.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/base64": {
+      "version": "1.1.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/codegen": {
+      "version": "2.0.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/codegen/-/codegen-2.0.5.tgz",
+      "integrity": "sha512-zgXFLzW3Ap33e6d0Wlj4MGIm6Ce8O89n/apUaGNB/jx+hw+ruWEp7EwGUshdLKVRCxZW12fp9r40E1mQrf/34g==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/eventemitter": {
+      "version": "1.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/eventemitter/-/eventemitter-1.1.1.tgz",
+      "integrity": "sha512-vW1GmwMZNnL+gMRaovlh9yZX74kc+TTU3FObkkurpMaRtBfLP3ldjS9KQWlwZgraRE0+dheEEoAxdzcJQ8eXZg==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/fetch": {
+      "version": "1.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/fetch/-/fetch-1.1.1.tgz",
+      "integrity": "sha512-GpptLrs57adMSuHi3VNj0mAF8dwh36LMaYF6XyJ6JMWlVsc+t42tm1HSEDmOs3A8fC9yyeisgLhsTVQokOZ0zw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@protobufjs/aspromise": "^1.1.1"
+      }
+    },
+    "node_modules/@protobufjs/float": {
+      "version": "1.0.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/float/-/float-1.0.2.tgz",
+      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/path": {
+      "version": "1.1.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/path/-/path-1.1.2.tgz",
+      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/pool": {
+      "version": "1.1.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/pool/-/pool-1.1.0.tgz",
+      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/utf8": {
+      "version": "1.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/utf8/-/utf8-1.1.1.tgz",
+      "integrity": "sha512-oOAWABowe8EAbMyWKM0tYDKi8Yaox52D+HWZhAIJqQXbqe0xI/GV7FhLWqlEKreMkfDjshR5FKgi3mnle0h6Eg==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@redocly/ajv": {
+      "version": "8.18.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/ajv/-/ajv-8.18.3.tgz",
+      "integrity": "sha512-l42u0of3hY98sN2A+M4qTX1O/KrpgGH32Hu9kP2GtHyD5Dfqq86PKFLe5dwaD8DEnNmlOlll2BAmeEtf0DaySg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@redocly/cli": {
+      "version": "2.31.4-local-06-22",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/cli/-/cli-2.31.4-local-06-22.tgz",
+      "integrity": "sha512-VZrw8d0vCWNll6ZWnG7Iwp5yeuesWRUb8WCc+KFNnQxpxeJZ4WwPvOyMlb+wOeC5wHWNDwhHRteOaflA+yT6Dg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@opentelemetry/exporter-trace-otlp-http": "0.214.0",
+        "@opentelemetry/resources": "2.6.1",
+        "@opentelemetry/sdk-trace-node": "2.6.1",
+        "@opentelemetry/semantic-conventions": "1.40.0",
+        "@redocly/cli-otel": "0.3.1",
+        "@redocly/openapi-core": "2.31.4",
+        "@redocly/openapi-typescript": "0.1.0-local-local",
+        "@redocly/respect-core": "2.31.4",
+        "ajv": "npm:@redocly/ajv@8.18.1",
+        "ajv-formats": "^3.0.1",
+        "colorette": "^1.2.0",
+        "cookie": "^0.7.2",
+        "dotenv": "16.4.7",
+        "glob": "^13.0.5",
+        "handlebars": "^4.7.9",
+        "https-proxy-agent": "^7.0.5",
+        "mobx": "^6.0.4",
+        "picomatch": "^4.0.4",
+        "pluralize": "^8.0.0",
+        "react": "^17.0.0 || ^18.2.0 || ^19.2.1",
+        "react-dom": "^17.0.0 || ^18.2.0 || ^19.2.1",
+        "redoc": "2.5.1",
+        "semver": "^7.5.2",
+        "set-cookie-parser": "^2.3.5",
+        "simple-websocket": "^9.0.0",
+        "styled-components": "6.4.1",
+        "typescript": "6.0.2",
+        "ulid": "^3.0.1",
+        "undici": "6.24.0",
+        "yargs": "17.0.1"
+      },
+      "bin": {
+        "openapi": "bin/cli.js",
+        "redocly": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
+        "npm": ">=10"
+      }
+    },
+    "node_modules/@redocly/cli-otel": {
+      "version": "0.3.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/cli-otel/-/cli-otel-0.3.1.tgz",
+      "integrity": "sha512-TbC4bK2zLtU/O9I2pszHPP0rtJOvFhQmEwQ/FHxERPu71fgKG8POUDP2jSiGmsXE7NdGSHBKqnf+y9Acn2jq5g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ulid": "^2.3.0"
+      }
+    },
+    "node_modules/@redocly/cli-otel/node_modules/ulid": {
+      "version": "2.4.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ulid/-/ulid-2.4.0.tgz",
+      "integrity": "sha512-fIRiVTJNcSRmXKPZtGzFQv9WRrZ3M9eoptl/teFJvjOzmpU+/K/JH6HZ8deBfb5vMEpicJcLn7JmvdknlMq7Zg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "ulid": "bin/cli.js"
+      }
+    },
+    "node_modules/@redocly/cli/node_modules/typescript": {
+      "version": "6.0.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/typescript/-/typescript-6.0.2.tgz",
+      "integrity": "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/@redocly/config": {
+      "version": "0.49.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/config/-/config-0.49.0.tgz",
+      "integrity": "sha512-OI/rpEffX3fKUuy+OuBHPRspRI/S30b9aiqxfZLMpSWZzDncEGPxSEP1O2LrBVshnDX4hLjVjLvCZ4YT85+1rw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "json-schema-to-ts": "2.7.2"
+      }
+    },
+    "node_modules/@redocly/openapi-core": {
+      "version": "2.31.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/openapi-core/-/openapi-core-2.31.4.tgz",
+      "integrity": "sha512-ne2e5NduK9MHnu42LoPXgfKhyCFG5Mc2Cwh3wNfLdoieYvhKtl37rW7p4p+GDMEJmlI9t6fagQbGPAKic2+3Pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@redocly/ajv": "^8.18.1",
+        "@redocly/config": "^0.49.0",
+        "ajv": "npm:@redocly/ajv@8.18.1",
+        "ajv-formats": "^3.0.1",
+        "colorette": "^1.2.0",
+        "js-levenshtein": "^1.1.6",
+        "js-yaml": "^4.1.0",
+        "picomatch": "^4.0.4",
+        "pluralize": "^8.0.0",
+        "yaml-ast-parser": "0.0.43"
+      },
+      "engines": {
+        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
+        "npm": ">=10"
+      }
+    },
+    "node_modules/@redocly/openapi-typescript": {
+      "version": "0.1.0-local-local",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/openapi-typescript/-/openapi-typescript-0.1.0-local-local.tgz",
+      "integrity": "sha512-BJRV89BoYdEyECFGRB8t2dzWnOGNe1/oQ7DZoC662kv4NRJhxz5qw3exl24+M+1WCpGdRtPps5GIy+vPqauJUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@redocly/openapi-core": "2.31.4"
+      },
+      "engines": {
+        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
+        "npm": ">=10"
+      },
+      "peerDependencies": {
+        "typescript": ">=5.5.0"
+      }
+    },
+    "node_modules/@redocly/respect-core": {
+      "version": "2.31.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/respect-core/-/respect-core-2.31.4.tgz",
+      "integrity": "sha512-ezdsZap+vmwkv94Gf7a5j+SVcxGDRWm78hxKh7Xb4XNYUxHfAqmC0eDpEfkiJU61LP7tOQeZcckxdFCIVEqI8w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@faker-js/faker": "^7.6.0",
+        "@noble/hashes": "^1.8.0",
+        "@redocly/ajv": "^8.18.1",
+        "@redocly/openapi-core": "2.31.4",
+        "ajv": "npm:@redocly/ajv@8.18.1",
+        "better-ajv-errors": "^2.0.3",
+        "colorette": "^2.0.20",
+        "json-pointer": "^0.6.2",
+        "jsonpath-rfc9535": "1.3.0",
+        "openapi-sampler": "^1.7.1",
+        "outdent": "^0.8.0",
+        "picomatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
+        "npm": ">=10"
+      }
+    },
+    "node_modules/@redocly/respect-core/node_modules/colorette": {
+      "version": "2.0.20",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.62.2.tgz",
+      "integrity": "sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.62.2.tgz",
+      "integrity": "sha512-BaH7BllCACHoH1LguOU56UItGfUWjujlO65kS9LAodViaN4bwIKd7oeW/ZHJ/4ljr/7MIiENnNy3HJ0zXv8Zkw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.62.2.tgz",
+      "integrity": "sha512-v39RCCvj4He82I9sFmk+M1VZ0PLM9sfsLVikjfx2hYBNALhrrOR2D3JjQA6AhlaSOgcR+RzrKY7e1+bT6SUO/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.62.2.tgz",
+      "integrity": "sha512-yl0y2vq3S3lHeuXhEdss6TWfKW8vkujImO12tn4ZkG/4oghr09LvdYm2RElVjokTQiUvDUGXLGsYeLqUMCKpGA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.62.2.tgz",
+      "integrity": "sha512-tT4pvt4qXD+vEoezupCWi+a1F0vvDiksiHc+PxRlYTOH1I6/X4id9jPxTP+Fg+545euaFT1jJVs4CEdHZAU1vw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.62.2.tgz",
+      "integrity": "sha512-6nU5F2wCW+qvCBhTn1pdIU3bzsIoF7EUwsCDRxilWGprQR6yd508YnH9+OKFCwpfS8pjZqDUmnCAr7exax0XCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.62.2.tgz",
+      "integrity": "sha512-n1GJHPOvpIfhi3TmrCeh6S6URt9BFCt0KQE3qvexyGCTAKpR4Lg+eWvNZEqu7epxwus/8ElT3hacYEucm49SZg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.62.2.tgz",
+      "integrity": "sha512-JqgflS8wEB+UXV/vS1RpRbifGBeN4D5lz8D8oOFbFZw4vedvdOgCFAjfBmIMdW3yL10XpQQ0Ambepw6MXrhOnA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.62.2.tgz",
+      "integrity": "sha512-wnFJkogWvN4jm/hQRF2UBaeUmk20j5+DmHvoyWii2b8HJDyvz1MF2OU/6ynXt2KR63rbZLWkFpoytpdc/yBuSA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.62.2.tgz",
+      "integrity": "sha512-HVu2bp0zhvJ8xHEV9+UUs7S90VadmBSY3LcIMvozbPo4AuMGDWlz3ymHLHZPX4hR67TKTt8Qp5PJ5RBg/i+RMQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.62.2.tgz",
+      "integrity": "sha512-mQqqAV8QaoSgr9I2fKDLY2BAVvmKjWoGiu/cSYQonsLvtqwEn1E4QYfnCOcp5zoEqNhsDYin1s6jx/VJmrxlZg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-musl": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.62.2.tgz",
+      "integrity": "sha512-IxKLoxCQ2IWi6bT2akyDUBGsOImDKB+sPp4EsTmwFQ/fMwpCKm8uLSSgP/Kx/QYUgKis6SEZ5/Nlhup0DIA0PQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.62.2.tgz",
+      "integrity": "sha512-Mk5ha2RQSgyFfmYYLkBpPnUk8D8FriBxesO1u9O75X0mHgXL1UQcH5Itl2lurWL2tj0RxV9b9tJgipac0hRY9A==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-musl": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.62.2.tgz",
+      "integrity": "sha512-CjvEnqJL/0/TQ3TXX3OPIJ/kmBellrWd4heXUmHeJlTnmwjKpSJzoehLaL6Xk0ZnMHBu9dZuFADNOrtjF4v+2w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.62.2.tgz",
+      "integrity": "sha512-1SiZbzwdkaDURsew/tSOrooKiYy7EQGT6m8ufavAi9NEyQb/6VuIxFXAL1fqa4iZe3g4NbNk4P7J32z2tw5Mgg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.62.2.tgz",
+      "integrity": "sha512-nQts12zJ3NQRoE6uYljOH89v7szzLDvG2JD/vsX+vGXU8w/At1GowTZ5/7qeFQ8m7L55rpR8Okugnuo5bgjy2Q==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.62.2.tgz",
+      "integrity": "sha512-E9/ll019jhPIJgpzfZoIkBGhcz+kKNgVWYRY0zr9srBdPPFVpvOKW8VaJKUbeK+eZXyQF9ltME+Kk6affeaPgg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.62.2.tgz",
+      "integrity": "sha512-5BqxR/pshjey51iliyzTD5Xi3EN0aLmQ2lZ3lvefVV9c82BvrLo2/6OT55iifpWBufs6kdwWbuOKS841DrmK9A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.62.2.tgz",
+      "integrity": "sha512-uNN83XxQrRAh/w0/pmAfibcwyb6YWt4gP+dpnQKPVJshAloQ785ii8CT8ZCIxkGg9opVsvAlGhFitSm6D1Jjpg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-openbsd-x64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.62.2.tgz",
+      "integrity": "sha512-srjEIxSH3LRnJN6THczDHWQplqEMFiAJrTab0msUryh9kwNpkICf3Ea6q6MN/2cZwRFUNx5w+h6Hpi4QuHS6Zg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.62.2.tgz",
+      "integrity": "sha512-8hOJnxgbyObnCm5AlRA3A931xX19xq80RjVTKgJOvEKWqJruP/Uf12IbAOaDjjEXYRewwHLfmF0YRIdK3OwKWA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.62.2.tgz",
+      "integrity": "sha512-mmF4AY1i0hG/bLWUctUq59gtmgaSIRa3cu/A3JFRp/sCNEme2bgDEiDS22P9FbnJB8NJNF4jPJiSP5RHQpUTDg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.62.2.tgz",
+      "integrity": "sha512-DZgkknc6jhHrk46V25vbAM0zZkyP0nSDkJB8/dRkLTxv470dOmWDqGoEJl/9A0dFfS7yE3REOwNDxpHwSLSt0Q==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.62.2.tgz",
+      "integrity": "sha512-T6xr6ucWSFto+VGajA8YH26LdpHRuP4YLHEKAtCWvJDOlnmWcDZVCI2Jmjr+IFHDlt2zRaTAKE4tfjTaWLgJBg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.62.2.tgz",
+      "integrity": "sha512-BfzEnDJOt9T8M989/lA37EcJgat01wLRnoi5dQf3QzOH7jzpqTAzdDbVfRljVr5r+jzKqpbHeyOfAaXxAd0PAA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.9",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/estree/-/estree-1.0.9.tgz",
+      "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "26.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/node/-/node-26.0.0.tgz",
+      "integrity": "sha512-vf2YFi1iY9lHGwNJMs01biZFbKJkrZR1T6/MlzjhJLPdntOHLhTrDSnSVcdtvjihi4VQNlrFRIxLsDBlQpAipA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~8.3.0"
+      }
+    },
+    "node_modules/@types/trusted-types": {
+      "version": "2.0.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/agent-base": {
+      "version": "7.1.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/ajv": {
+      "name": "@redocly/ajv",
+      "version": "8.18.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/ajv/-/ajv-8.18.1.tgz",
+      "integrity": "sha512-Ifm/pP/tul1qmAecpbVxCBluVE32rKfjf8gYXH4xI2gCv9mRWFhJMHzkPDM4TXlxwPQYIFegymlsy8lXz7optA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats": {
+      "version": "3.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ajv-formats/-/ajv-formats-3.0.1.tgz",
+      "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/anynum": {
+      "version": "1.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/anynum/-/anynum-1.0.1.tgz",
+      "integrity": "sha512-N6//FLET/tXYNM/F6ABca1oH6fWB+KlTt909Le28WMDBk8oaT4vY17DCrwg2MvmuqUKt3Ni4N5dGJ/EoBgcO6A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/balanced-match": {
+      "version": "4.0.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/balanced-match/-/balanced-match-4.0.4.tgz",
+      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
+    },
+    "node_modules/better-ajv-errors": {
+      "version": "2.0.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/better-ajv-errors/-/better-ajv-errors-2.0.3.tgz",
+      "integrity": "sha512-t1vxUP+vYKsaYi/BbKo2K98nEAZmfi4sjwvmRT8aOPDzPJeAtLurfoIDazVkLILxO4K+Sw4YrLYnBQ46l6pePg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@humanwhocodes/momoa": "^2.0.4",
+        "chalk": "^4.1.2",
+        "jsonpointer": "^5.0.1",
+        "leven": "^3.1.0 < 4"
+      },
+      "engines": {
+        "node": ">= 18.20.6"
+      },
+      "peerDependencies": {
+        "ajv": "4.11.8 - 8"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "5.0.6",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/brace-expansion/-/brace-expansion-5.0.6.tgz",
+      "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^4.0.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
+    },
+    "node_modules/call-me-maybe": {
+      "version": "1.0.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/call-me-maybe/-/call-me-maybe-1.0.2.tgz",
+      "integrity": "sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/camelize": {
+      "version": "1.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/camelize/-/camelize-1.0.1.tgz",
+      "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/classnames": {
+      "version": "2.5.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/classnames/-/classnames-2.5.1.tgz",
+      "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/clsx": {
+      "version": "2.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/clsx/-/clsx-2.1.1.tgz",
+      "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/colorette": {
+      "version": "1.4.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/colorette/-/colorette-1.4.0.tgz",
+      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cookie": {
+      "version": "0.7.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/core-js": {
+      "version": "3.49.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/core-js/-/core-js-3.49.0.tgz",
+      "integrity": "sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "peer": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/css-color-keywords": {
+      "version": "1.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
+      "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/css-to-react-native": {
+      "version": "3.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/css-to-react-native/-/css-to-react-native-3.2.0.tgz",
+      "integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "camelize": "^1.0.0",
+        "css-color-keywords": "^1.0.0",
+        "postcss-value-parser": "^4.0.2"
+      }
+    },
+    "node_modules/csstype": {
+      "version": "3.2.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/csstype/-/csstype-3.2.3.tgz",
+      "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decko": {
+      "version": "1.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/decko/-/decko-1.2.0.tgz",
+      "integrity": "sha512-m8FnyHXV1QX+S1cl+KPFDIl6NMkxtKsy6+U/aYyjrOqWMuwAwYWu7ePqrsUHtDR5Y8Yk2pi/KIDSgF+vT4cPOQ==",
+      "dev": true
+    },
+    "node_modules/dompurify": {
+      "version": "3.4.11",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/dompurify/-/dompurify-3.4.11.tgz",
+      "integrity": "sha512-zhlUV12GsaRzMsf9q5M254YhA4+VuF0fG+QFqu6aYpoGlKtz+w8//jBcGVYBgQkR5GHjUomejY84AV+/uPbWdw==",
+      "dev": true,
+      "license": "(MPL-2.0 OR Apache-2.0)",
+      "optionalDependencies": {
+        "@types/trusted-types": "^2.0.7"
+      }
+    },
+    "node_modules/dotenv": {
+      "version": "16.4.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/dotenv/-/dotenv-16.4.7.tgz",
+      "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/es6-promise": {
+      "version": "3.3.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/es6-promise/-/es6-promise-3.3.1.tgz",
+      "integrity": "sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/esbuild": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eventemitter3": {
+      "version": "5.0.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/eventemitter3/-/eventemitter3-5.0.4.tgz",
+      "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-safe-stringify": {
+      "version": "2.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-uri": {
+      "version": "3.1.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-uri/-/fast-uri-3.1.2.tgz",
+      "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/fast-xml-builder": {
+      "version": "1.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-xml-builder/-/fast-xml-builder-1.2.0.tgz",
+      "integrity": "sha512-00aAWieqff+ZJhsXA4g1g7M8k+7AYoMUUHF+/zFb5U6Uv/P0Vl4QZo84/IcufzYalLuEj9928bXN9PbbFzMF0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "path-expression-matcher": "^1.5.0",
+        "xml-naming": "^0.1.0"
+      }
+    },
+    "node_modules/fast-xml-parser": {
+      "version": "5.9.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-xml-parser/-/fast-xml-parser-5.9.3.tgz",
+      "integrity": "sha512-brCNCeScma/kqa54J4PIDriSSSLssRkuYaUCpvHJulGc3HGI/xxKUCTDcYkAdqJsyb//ydpbxecjC3hB9+tb/g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@nodable/entities": "^2.2.0",
+        "fast-xml-builder": "^1.2.0",
+        "is-unsafe": "^1.0.1",
+        "path-expression-matcher": "^1.5.0",
+        "strnum": "^2.4.1",
+        "xml-naming": "^0.1.0"
+      },
+      "bin": {
+        "fxparser": "src/cli/cli.js"
+      }
+    },
+    "node_modules/foreach": {
+      "version": "2.0.6",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/foreach/-/foreach-2.0.6.tgz",
+      "integrity": "sha512-k6GAGDyqLe9JaebCsFCoudPPWfihKu8pylYXRlqP1J7ms39iPoTtk2fviNglIeQEwdh0bQeKJ01ZPyuyQvKzwg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/glob": {
+      "version": "13.0.6",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/glob/-/glob-13.0.6.tgz",
+      "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "minimatch": "^10.2.2",
+        "minipass": "^7.1.3",
+        "path-scurry": "^2.0.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/handlebars": {
+      "version": "4.7.9",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/handlebars/-/handlebars-4.7.9.tgz",
+      "integrity": "sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minimist": "^1.2.5",
+        "neo-async": "^2.6.2",
+        "source-map": "^0.6.1",
+        "wordwrap": "^1.0.0"
+      },
+      "bin": {
+        "handlebars": "bin/handlebars"
+      },
+      "engines": {
+        "node": ">=0.4.7"
+      },
+      "optionalDependencies": {
+        "uglify-js": "^3.1.4"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/http2-client": {
+      "version": "1.3.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/http2-client/-/http2-client-1.3.5.tgz",
+      "integrity": "sha512-EC2utToWl4RKfs5zd36Mxq7nzHHBuomZboI0yYL6Y0RmBgT7Sgkq4rQ0ezFTYoIsSs7Tm9SJe+o2FcAg6GBhGA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "7.0.6",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-unsafe": {
+      "version": "1.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/is-unsafe/-/is-unsafe-1.0.1.tgz",
+      "integrity": "sha512-CLK2+VdgERgD96EYm5lUQssZYlRg2tkZnbsxZoacmSiRxiFJ4Nk4SzjCl+Ur+v3kXIY9dTIdb3IH22y1mZ56LA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/js-levenshtein": {
+      "version": "1.1.6",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
+      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/js-yaml": {
+      "version": "4.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/js-yaml/-/js-yaml-4.2.0.tgz",
+      "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/puzrin"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/nodeca"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/json-pointer": {
+      "version": "0.6.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/json-pointer/-/json-pointer-0.6.2.tgz",
+      "integrity": "sha512-vLWcKbOaXlO+jvRy4qNd+TI1QUPZzfJj1tpJ3vAXDych5XJf93ftpUKe5pKCrzyIIwgBJcOcCVRUfqQP25afBw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "foreach": "^2.0.4"
+      }
+    },
+    "node_modules/json-schema-to-ts": {
+      "version": "2.7.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/json-schema-to-ts/-/json-schema-to-ts-2.7.2.tgz",
+      "integrity": "sha512-R1JfqKqbBR4qE8UyBR56Ms30LL62/nlhoz+1UkfI/VE7p54Awu919FZ6ZUPG8zIa3XB65usPJgr1ONVncUGSaQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.18.3",
+        "@types/json-schema": "^7.0.9",
+        "ts-algebra": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jsonpath-rfc9535": {
+      "version": "1.3.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/jsonpath-rfc9535/-/jsonpath-rfc9535-1.3.0.tgz",
+      "integrity": "sha512-3jFHya7oZ45aDxIIdx+/zQARahHXxFSMWBkcBUldfXpLS9VCXDJyTKt35kQfEXLqh0K3Ixw/9xFnvcDStaxh7Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/jsonpointer": {
+      "version": "5.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/jsonpointer/-/jsonpointer-5.0.1.tgz",
+      "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/long": {
+      "version": "5.3.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/long/-/long-5.3.2.tgz",
+      "integrity": "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "11.5.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/lru-cache/-/lru-cache-11.5.1.tgz",
+      "integrity": "sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/lunr": {
+      "version": "2.3.9",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/lunr/-/lunr-2.3.9.tgz",
+      "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/mark.js": {
+      "version": "8.11.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/mark.js/-/mark.js-8.11.1.tgz",
+      "integrity": "sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/marked": {
+      "version": "4.3.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/marked/-/marked-4.3.0.tgz",
+      "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "marked": "bin/marked.js"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "10.2.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/minimatch/-/minimatch-10.2.5.tgz",
+      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "brace-expansion": "^5.0.5"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "7.1.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/minipass/-/minipass-7.1.3.tgz",
+      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/mobx": {
+      "version": "6.16.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/mobx/-/mobx-6.16.1.tgz",
+      "integrity": "sha512-syNcDdX3KT+Jq3je6eGjBhuc24Z68td2VG0zNFqRswaE433D9SNH5VRy/xrGbJsUixfppLLccXhAW9JSf6n+SQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mobx"
+      }
+    },
+    "node_modules/mobx-react": {
+      "version": "9.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/mobx-react/-/mobx-react-9.2.0.tgz",
+      "integrity": "sha512-dkGWCx+S0/1mfiuFfHRH8D9cplmwhxOV5CkXMp38u6rQGG2Pv3FWYztS0M7ncR6TyPRQKaTG/pnitInoYE9Vrw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mobx-react-lite": "^4.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mobx"
+      },
+      "peerDependencies": {
+        "mobx": "^6.9.0",
+        "react": "^16.8.0 || ^17 || ^18 || ^19"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/mobx-react-lite": {
+      "version": "4.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/mobx-react-lite/-/mobx-react-lite-4.1.1.tgz",
+      "integrity": "sha512-iUxiMpsvNraCKXU+yPotsOncNNmyeS2B5DKL+TL6Tar/xm+wwNJAubJmtRSeAoYawdZqwv8Z/+5nPRHeQxTiXg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "use-sync-external-store": "^1.4.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mobx"
+      },
+      "peerDependencies": {
+        "mobx": "^6.9.0",
+        "react": "^16.8.0 || ^17 || ^18 || ^19"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.15",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/nanoid/-/nanoid-3.3.15.tgz",
+      "integrity": "sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/node-fetch-h2": {
+      "version": "2.3.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/node-fetch-h2/-/node-fetch-h2-2.3.0.tgz",
+      "integrity": "sha512-ofRW94Ab0T4AOh5Fk8t0h8OBWrmjb0SSB20xh1H8YnPV9EJ+f5AMoYSUQ2zgJ4Iq2HAK0I2l5/Nequ8YzFS3Hg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "http2-client": "^1.2.5"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      }
+    },
+    "node_modules/node-readfiles": {
+      "version": "0.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/node-readfiles/-/node-readfiles-0.2.0.tgz",
+      "integrity": "sha512-SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es6-promise": "^3.2.1"
+      }
+    },
+    "node_modules/oas-kit-common": {
+      "version": "1.0.8",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/oas-kit-common/-/oas-kit-common-1.0.8.tgz",
+      "integrity": "sha512-pJTS2+T0oGIwgjGpw7sIRU8RQMcUoKCDWFLdBqKB2BNmGpbBMH2sdqAaOXUg8OzonZHU0L7vfJu1mJFEiYDWOQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "fast-safe-stringify": "^2.0.7"
+      }
+    },
+    "node_modules/oas-linter": {
+      "version": "3.2.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/oas-linter/-/oas-linter-3.2.2.tgz",
+      "integrity": "sha512-KEGjPDVoU5K6swgo9hJVA/qYGlwfbFx+Kg2QB/kd7rzV5N8N5Mg6PlsoCMohVnQmo+pzJap/F610qTodKzecGQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@exodus/schemasafe": "^1.0.0-rc.2",
+        "should": "^13.2.1",
+        "yaml": "^1.10.0"
+      },
+      "funding": {
+        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
+      }
+    },
+    "node_modules/oas-resolver": {
+      "version": "2.5.6",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/oas-resolver/-/oas-resolver-2.5.6.tgz",
+      "integrity": "sha512-Yx5PWQNZomfEhPPOphFbZKi9W93CocQj18NlD2Pa4GWZzdZpSJvYwoiuurRI7m3SpcChrnO08hkuQDL3FGsVFQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "node-fetch-h2": "^2.3.0",
+        "oas-kit-common": "^1.0.8",
+        "reftools": "^1.1.9",
+        "yaml": "^1.10.0",
+        "yargs": "^17.0.1"
+      },
+      "bin": {
+        "resolve": "resolve.js"
+      },
+      "funding": {
+        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
+      }
+    },
+    "node_modules/oas-schema-walker": {
+      "version": "1.1.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/oas-schema-walker/-/oas-schema-walker-1.1.5.tgz",
+      "integrity": "sha512-2yucenq1a9YPmeNExoUa9Qwrt9RFkjqaMAA1X+U7sbb0AqBeTIdMHky9SQQ6iN94bO5NW0W4TRYXerG+BdAvAQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "funding": {
+        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
+      }
+    },
+    "node_modules/oas-validator": {
+      "version": "5.0.8",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/oas-validator/-/oas-validator-5.0.8.tgz",
+      "integrity": "sha512-cu20/HE5N5HKqVygs3dt94eYJfBi0TsZvPVXDhbXQHiEityDN+RROTleefoKRKKJ9dFAF2JBkDHgvWj0sjKGmw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "call-me-maybe": "^1.0.1",
+        "oas-kit-common": "^1.0.8",
+        "oas-linter": "^3.2.2",
+        "oas-resolver": "^2.5.6",
+        "oas-schema-walker": "^1.1.5",
+        "reftools": "^1.1.9",
+        "should": "^13.2.1",
+        "yaml": "^1.10.0"
+      },
+      "funding": {
+        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/openapi-sampler": {
+      "version": "1.7.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/openapi-sampler/-/openapi-sampler-1.7.4.tgz",
+      "integrity": "sha512-CKS/rd5ucPCuEDbJnjGDXZTsuGWcmv53aCmQx7soZlPEONUGN4af0/dY5+THRFZraSEjeA78nlfzdFswC/N5SA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.7",
+        "fast-xml-parser": "^5.5.1",
+        "json-pointer": "0.6.2"
+      }
+    },
+    "node_modules/outdent": {
+      "version": "0.8.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/outdent/-/outdent-0.8.0.tgz",
+      "integrity": "sha512-KiOAIsdpUTcAXuykya5fnVVT+/5uS0Q1mrkRHcF89tpieSmY33O/tmc54CqwA+bfhbtEfZUNLHaPUiB9X3jt1A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/path-browserify": {
+      "version": "1.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/path-browserify/-/path-browserify-1.0.1.tgz",
+      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/path-expression-matcher": {
+      "version": "1.6.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/path-expression-matcher/-/path-expression-matcher-1.6.1.tgz",
+      "integrity": "sha512-h7bxdzhHk8Knyc4Tj+jMaa7fEEoUJy7p1qtbVgkYg1Uhpe5Np5VuGXCRZnkZvU+Q42M1vStt0ifa3ueykRJPmQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/path-scurry": {
+      "version": "2.0.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/path-scurry/-/path-scurry-2.0.2.tgz",
+      "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/perfect-scrollbar": {
+      "version": "1.5.6",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/perfect-scrollbar/-/perfect-scrollbar-1.5.6.tgz",
+      "integrity": "sha512-rixgxw3SxyJbCaSpo1n35A/fwI1r2rdwMKOTCg/AcG+xOEyZcE8UHVjpZMFCVImzsFoCZeJTT+M/rdEIQYO2nw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/picomatch": {
+      "version": "4.0.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pluralize": {
+      "version": "8.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/pluralize/-/pluralize-8.0.0.tgz",
+      "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/polished": {
+      "version": "4.3.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/polished/-/polished-4.3.1.tgz",
+      "integrity": "sha512-OBatVyC/N7SCW/FaDHrSd+vn0o5cS855TOmYi4OkdWUMSJCET/xip//ch8xGUvtr3i44X9LVyWwQlRMTN3pwSA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.17.8"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.5.15",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/postcss/-/postcss-8.5.15.tgz",
+      "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.12",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/prismjs": {
+      "version": "1.30.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/prismjs/-/prismjs-1.30.0.tgz",
+      "integrity": "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/prop-types": {
+      "version": "15.8.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      }
+    },
+    "node_modules/protobufjs": {
+      "version": "7.6.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/protobufjs/-/protobufjs-7.6.4.tgz",
+      "integrity": "sha512-RJJPTTpvFfHcWLkIa2JFWK4XvtSzS0yEWDmunqHXli1h3JlkbcQZXDZdcWxv+JK3Xsl5/UFDPZ0iGm7DAengYw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@protobufjs/aspromise": "^1.1.2",
+        "@protobufjs/base64": "^1.1.2",
+        "@protobufjs/codegen": "^2.0.5",
+        "@protobufjs/eventemitter": "^1.1.1",
+        "@protobufjs/fetch": "^1.1.1",
+        "@protobufjs/float": "^1.0.2",
+        "@protobufjs/path": "^1.1.2",
+        "@protobufjs/pool": "^1.1.0",
+        "@protobufjs/utf8": "^1.1.1",
+        "@types/node": ">=13.7.0",
+        "long": "^5.3.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/react": {
+      "version": "19.2.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/react/-/react-19.2.7.tgz",
+      "integrity": "sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-dom": {
+      "version": "19.2.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/react-dom/-/react-dom-19.2.7.tgz",
+      "integrity": "sha512-t0BRVXvbiE/o20Hfw669rLbMCDWtYZLvmJigy2f0MxsXF+71pxhR3xOkspmsO8h3ZlNzyibAmtCa3l4lYKk6gQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "scheduler": "^0.27.0"
+      },
+      "peerDependencies": {
+        "react": "^19.2.7"
+      }
+    },
+    "node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/react-tabs": {
+      "version": "6.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/react-tabs/-/react-tabs-6.1.1.tgz",
+      "integrity": "sha512-CPiuKoMFf89B7QlbFfdBD9XmUWiE3qudQputMVZB8GQvPJZRX/gqjDaDWOPDwGinEfpJKEuBCkGt83Tt4efeyA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "clsx": "^2.0.0",
+        "prop-types": "^15.5.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/redoc": {
+      "version": "2.5.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/redoc/-/redoc-2.5.1.tgz",
+      "integrity": "sha512-LmqA+4A3CmhTllGG197F0arUpmChukAj9klfSdxNRemT9Hr07xXr7OGKu4PHzBs359sgrJ+4JwmOlM7nxLPGMg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@redocly/openapi-core": "^1.4.0",
+        "classnames": "^2.3.2",
+        "decko": "^1.2.0",
+        "dompurify": "^3.2.4",
+        "eventemitter3": "^5.0.1",
+        "json-pointer": "^0.6.2",
+        "lunr": "^2.3.9",
+        "mark.js": "^8.11.1",
+        "marked": "^4.3.0",
+        "mobx-react": "9.2.0",
+        "openapi-sampler": "^1.5.0",
+        "path-browserify": "^1.0.1",
+        "perfect-scrollbar": "^1.5.5",
+        "polished": "^4.2.2",
+        "prismjs": "^1.29.0",
+        "prop-types": "^15.8.1",
+        "react-tabs": "^6.0.2",
+        "slugify": "~1.4.7",
+        "stickyfill": "^1.1.1",
+        "swagger2openapi": "^7.0.8",
+        "url-template": "^2.0.8"
+      },
+      "engines": {
+        "node": ">=6.9",
+        "npm": ">=3.0.0"
+      },
+      "peerDependencies": {
+        "core-js": "^3.1.4",
+        "mobx": "^6.0.4",
+        "react": "^16.8.4 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^16.8.4 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "styled-components": "^4.1.1 || ^5.1.1 || ^6.0.5"
+      }
+    },
+    "node_modules/redoc/node_modules/@redocly/ajv": {
+      "version": "8.11.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/ajv/-/ajv-8.11.2.tgz",
+      "integrity": "sha512-io1JpnwtIcvojV7QKDUSIuMN/ikdOUd1ReEnUnMKGfDVridQZ31J0MmIuqwuRjWDZfmvr+Q0MqCcfHM2gTivOg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js-replace": "^1.0.1"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/redoc/node_modules/@redocly/config": {
+      "version": "0.22.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/config/-/config-0.22.0.tgz",
+      "integrity": "sha512-gAy93Ddo01Z3bHuVdPWfCwzgfaYgMdaZPcfL7JZ7hWJoK9V0lXDbigTWkhiPFAaLWzbOJ+kbUQG1+XwIm0KRGQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/redoc/node_modules/@redocly/openapi-core": {
+      "version": "1.34.15",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/openapi-core/-/openapi-core-1.34.15.tgz",
+      "integrity": "sha512-HAwCnNyKcs5XGQqms+9t7OdAPM/5TDstmhF+0i7tdCFato2QKuYIlyWETwkXd8c5zbltr1oB+6y9NTeQLr2d6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@redocly/ajv": "8.11.2",
+        "@redocly/config": "0.22.0",
+        "colorette": "1.4.0",
+        "https-proxy-agent": "7.0.6",
+        "js-levenshtein": "1.1.6",
+        "js-yaml": "4.1.1",
+        "minimatch": "5.1.9",
+        "pluralize": "8.0.0",
+        "yaml-ast-parser": "0.0.43"
+      },
+      "engines": {
+        "node": ">=18.17.0",
+        "npm": ">=9.5.0"
+      }
+    },
+    "node_modules/redoc/node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/redoc/node_modules/brace-expansion": {
+      "version": "2.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/brace-expansion/-/brace-expansion-2.1.1.tgz",
+      "integrity": "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/redoc/node_modules/js-yaml": {
+      "version": "4.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/redoc/node_modules/minimatch": {
+      "version": "5.1.9",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/minimatch/-/minimatch-5.1.9.tgz",
+      "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/reftools": {
+      "version": "1.1.9",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/reftools/-/reftools-1.1.9.tgz",
+      "integrity": "sha512-OVede/NQE13xBQ+ob5CKd5KyeJYU2YInb1bmV4nRoOfquZPkAkxuOXicSe1PvqIuZZ4kD13sPKBbR7UFDmli6w==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "funding": {
+        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rollup": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/rollup/-/rollup-4.62.2.tgz",
+      "integrity": "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "1.0.9"
+      },
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.62.2",
+        "@rollup/rollup-android-arm64": "4.62.2",
+        "@rollup/rollup-darwin-arm64": "4.62.2",
+        "@rollup/rollup-darwin-x64": "4.62.2",
+        "@rollup/rollup-freebsd-arm64": "4.62.2",
+        "@rollup/rollup-freebsd-x64": "4.62.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.62.2",
+        "@rollup/rollup-linux-arm-musleabihf": "4.62.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.62.2",
+        "@rollup/rollup-linux-arm64-musl": "4.62.2",
+        "@rollup/rollup-linux-loong64-gnu": "4.62.2",
+        "@rollup/rollup-linux-loong64-musl": "4.62.2",
+        "@rollup/rollup-linux-ppc64-gnu": "4.62.2",
+        "@rollup/rollup-linux-ppc64-musl": "4.62.2",
+        "@rollup/rollup-linux-riscv64-gnu": "4.62.2",
+        "@rollup/rollup-linux-riscv64-musl": "4.62.2",
+        "@rollup/rollup-linux-s390x-gnu": "4.62.2",
+        "@rollup/rollup-linux-x64-gnu": "4.62.2",
+        "@rollup/rollup-linux-x64-musl": "4.62.2",
+        "@rollup/rollup-openbsd-x64": "4.62.2",
+        "@rollup/rollup-openharmony-arm64": "4.62.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.62.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.62.2",
+        "@rollup/rollup-win32-x64-gnu": "4.62.2",
+        "@rollup/rollup-win32-x64-msvc": "4.62.2",
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/scheduler": {
+      "version": "0.27.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/scheduler/-/scheduler-0.27.0.tgz",
+      "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/semver": {
+      "version": "7.8.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/set-cookie-parser": {
+      "version": "2.7.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz",
+      "integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/should": {
+      "version": "13.2.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/should/-/should-13.2.3.tgz",
+      "integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "should-equal": "^2.0.0",
+        "should-format": "^3.0.3",
+        "should-type": "^1.4.0",
+        "should-type-adaptors": "^1.0.1",
+        "should-util": "^1.0.0"
+      }
+    },
+    "node_modules/should-equal": {
+      "version": "2.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/should-equal/-/should-equal-2.0.0.tgz",
+      "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "should-type": "^1.4.0"
+      }
+    },
+    "node_modules/should-format": {
+      "version": "3.0.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/should-format/-/should-format-3.0.3.tgz",
+      "integrity": "sha512-hZ58adtulAk0gKtua7QxevgUaXTTXxIi8t41L3zo9AHvjXO1/7sdLECuHeIN2SRtYXpNkmhoUP2pdeWgricQ+Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "should-type": "^1.3.0",
+        "should-type-adaptors": "^1.0.1"
+      }
+    },
+    "node_modules/should-type": {
+      "version": "1.4.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/should-type/-/should-type-1.4.0.tgz",
+      "integrity": "sha512-MdAsTu3n25yDbIe1NeN69G4n6mUnJGtSJHygX3+oN0ZbO3DTiATnf7XnYJdGT42JCXurTb1JI0qOBR65shvhPQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/should-type-adaptors": {
+      "version": "1.1.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz",
+      "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "should-type": "^1.3.0",
+        "should-util": "^1.0.0"
+      }
+    },
+    "node_modules/should-util": {
+      "version": "1.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/should-util/-/should-util-1.0.1.tgz",
+      "integrity": "sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/simple-websocket": {
+      "version": "9.1.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/simple-websocket/-/simple-websocket-9.1.0.tgz",
+      "integrity": "sha512-8MJPnjRN6A8UCp1I+H/dSFyjwJhp6wta4hsVRhjf8w9qBHRzxYt14RaOcjvQnhD1N4yKOddEjflwMnQM4VtXjQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.3.1",
+        "queue-microtask": "^1.2.2",
+        "randombytes": "^2.1.0",
+        "readable-stream": "^3.6.0",
+        "ws": "^7.4.2"
+      }
+    },
+    "node_modules/slugify": {
+      "version": "1.4.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/slugify/-/slugify-1.4.7.tgz",
+      "integrity": "sha512-tf+h5W1IrjNm/9rKKj0JU2MDMruiopx0jjVA5zCdBtcGjfp0+c5rHw/zADLC3IeKlGHtVbHtpfzvYA0OYT+HKg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stickyfill": {
+      "version": "1.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/stickyfill/-/stickyfill-1.1.1.tgz",
+      "integrity": "sha512-GCp7vHAfpao+Qh/3Flh9DXEJ/qSi0KJwJw6zYlZOtRYXWUIpMM6mC2rIep/dK8RQqwW0KxGJIllmjPIBOGN8AA==",
+      "dev": true
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strnum": {
+      "version": "2.4.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/strnum/-/strnum-2.4.1.tgz",
+      "integrity": "sha512-M9eUSMT2dCB2cTNPG7UYj6KuK7RJR2SN2+yCV/fTW3xzTCS6EaGZ5pSMgDIjB7r8zSfTGk+dvvn9rTjpVS9Mwg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "anynum": "^1.0.1"
+      }
+    },
+    "node_modules/styled-components": {
+      "version": "6.4.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/styled-components/-/styled-components-6.4.1.tgz",
+      "integrity": "sha512-ADu2dF53esUzzM4I0ewxhxFtsDd6v4V6dNkg3vG0iFKhnt06sJneTZnRvujAosZwW0XD58IKgGMQoqri4wHRqg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@emotion/is-prop-valid": "1.4.0",
+        "css-to-react-native": "3.2.0",
+        "csstype": "3.2.3",
+        "stylis": "4.3.6"
+      },
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/styled-components"
+      },
+      "peerDependencies": {
+        "css-to-react-native": ">= 3.2.0",
+        "react": ">= 16.8.0",
+        "react-dom": ">= 16.8.0",
+        "react-native": ">= 0.68.0"
+      },
+      "peerDependenciesMeta": {
+        "css-to-react-native": {
+          "optional": true
+        },
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/stylis": {
+      "version": "4.3.6",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/stylis/-/stylis-4.3.6.tgz",
+      "integrity": "sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/swagger2openapi": {
+      "version": "7.0.8",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/swagger2openapi/-/swagger2openapi-7.0.8.tgz",
+      "integrity": "sha512-upi/0ZGkYgEcLeGieoz8gT74oWHA0E7JivX7aN9mAf+Tc7BQoRBvnIGHoPDw+f9TXTW4s6kGYCZJtauP6OYp7g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "call-me-maybe": "^1.0.1",
+        "node-fetch": "^2.6.1",
+        "node-fetch-h2": "^2.3.0",
+        "node-readfiles": "^0.2.0",
+        "oas-kit-common": "^1.0.8",
+        "oas-resolver": "^2.5.6",
+        "oas-schema-walker": "^1.1.5",
+        "oas-validator": "^5.0.8",
+        "reftools": "^1.1.9",
+        "yaml": "^1.10.0",
+        "yargs": "^17.0.1"
+      },
+      "bin": {
+        "boast": "boast.js",
+        "oas-validate": "oas-validate.js",
+        "swagger2openapi": "swagger2openapi.js"
+      },
+      "funding": {
+        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ts-algebra": {
+      "version": "1.2.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ts-algebra/-/ts-algebra-1.2.2.tgz",
+      "integrity": "sha512-kloPhf1hq3JbCPOTYoOWDKxebWjNb2o/LKnNfkWhxVVisFFmMJPPdJeGoGmM+iRLyoXAR61e08Pb+vUXINg8aA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/typescript": {
+      "version": "5.9.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/uglify-js": {
+      "version": "3.19.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/uglify-js/-/uglify-js-3.19.3.tgz",
+      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "optional": true,
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/ulid": {
+      "version": "3.0.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ulid/-/ulid-3.0.2.tgz",
+      "integrity": "sha512-yu26mwteFYzBAot7KVMqFGCVpsF6g8wXfJzQUHvu1no3+rRRSFcSV2nKeYvNPLD2J4b08jYBDhHUjeH0ygIl9w==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "ulid": "dist/cli.js"
+      }
+    },
+    "node_modules/undici": {
+      "version": "6.24.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/undici/-/undici-6.24.0.tgz",
+      "integrity": "sha512-lVLNosgqo5EkGqh5XUDhGfsMSoO8K0BAN0TyJLvwNRSl4xWGZlCVYsAIpa/OpA3TvmnM01GWcoKmc3ZWo5wKKA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.17"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "8.3.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/undici-types/-/undici-types-8.3.0.tgz",
+      "integrity": "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/uri-js-replace": {
+      "version": "1.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/uri-js-replace/-/uri-js-replace-1.0.1.tgz",
+      "integrity": "sha512-W+C9NWNLFOoBI2QWDp4UT9pv65r2w5Cx+3sTYFvtMdDBxkKt1syCqsUdSFAChbEe1uK5TfS04wt/nGwmaeIQ0g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/url-template": {
+      "version": "2.0.8",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/url-template/-/url-template-2.0.8.tgz",
+      "integrity": "sha512-XdVKMF4SJ0nP/O7XIPB0JwAEuT9lDIYnNsK8yGVe43y0AWoKeJNdv3ZNWh7ksJ6KqQFjOO6ox/VEitLnaVNufw==",
+      "dev": true,
+      "license": "BSD"
+    },
+    "node_modules/use-sync-external-store": {
+      "version": "1.6.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
+      "integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/vite": {
+      "version": "5.4.21",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/vite/-/vite-5.4.21.tgz",
+      "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "sass-embedded": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/wordwrap": {
+      "version": "1.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/ws": {
+      "version": "7.5.11",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ws/-/ws-7.5.11.tgz",
+      "integrity": "sha512-zS54Oen9bITtp7kp2XM3AydrCIq1D+HwJOuH+c+e4LfpL/lotP5osijd+UoMnxwAam1GN8R4KtLAyIrIcBNpiA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xml-naming": {
+      "version": "0.1.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/xml-naming/-/xml-naming-0.1.0.tgz",
+      "integrity": "sha512-k8KO9hrMyNk6tUWqUfkTEZbezRRpONVOzUTnc97VnCvyj6Tf9lyUR9EDAIeiVLv56jsMcoXEwjW8Kv5yPY52lw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yaml": {
+      "version": "1.10.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/yaml/-/yaml-1.10.3.tgz",
+      "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/yaml-ast-parser": {
+      "version": "0.0.43",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz",
+      "integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/yargs": {
+      "version": "17.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/yargs/-/yargs-17.0.1.tgz",
+      "integrity": "sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    }
+  }
+}
diff --git a/packages/client-generator/examples/service-class/package.json b/tests/e2e/generate-client/examples/service-class/package.json
similarity index 100%
rename from packages/client-generator/examples/service-class/package.json
rename to tests/e2e/generate-client/examples/service-class/package.json
diff --git a/packages/client-generator/examples/service-class/redocly.yaml b/tests/e2e/generate-client/examples/service-class/redocly.yaml
similarity index 100%
rename from packages/client-generator/examples/service-class/redocly.yaml
rename to tests/e2e/generate-client/examples/service-class/redocly.yaml
diff --git a/packages/client-generator/examples/service-class/src/api/client.ts b/tests/e2e/generate-client/examples/service-class/src/api/client.ts
similarity index 100%
rename from packages/client-generator/examples/service-class/src/api/client.ts
rename to tests/e2e/generate-client/examples/service-class/src/api/client.ts
diff --git a/packages/client-generator/examples/service-class/src/main.ts b/tests/e2e/generate-client/examples/service-class/src/main.ts
similarity index 100%
rename from packages/client-generator/examples/service-class/src/main.ts
rename to tests/e2e/generate-client/examples/service-class/src/main.ts
diff --git a/packages/client-generator/examples/service-class/tsconfig.json b/tests/e2e/generate-client/examples/service-class/tsconfig.json
similarity index 100%
rename from packages/client-generator/examples/service-class/tsconfig.json
rename to tests/e2e/generate-client/examples/service-class/tsconfig.json
diff --git a/packages/client-generator/examples/service-class/vite.config.ts b/tests/e2e/generate-client/examples/service-class/vite.config.ts
similarity index 100%
rename from packages/client-generator/examples/service-class/vite.config.ts
rename to tests/e2e/generate-client/examples/service-class/vite.config.ts
diff --git a/packages/client-generator/examples/tanstack-query/.gitignore b/tests/e2e/generate-client/examples/tanstack-query/.gitignore
similarity index 100%
rename from packages/client-generator/examples/tanstack-query/.gitignore
rename to tests/e2e/generate-client/examples/tanstack-query/.gitignore
diff --git a/packages/client-generator/examples/tanstack-query/README.md b/tests/e2e/generate-client/examples/tanstack-query/README.md
similarity index 100%
rename from packages/client-generator/examples/tanstack-query/README.md
rename to tests/e2e/generate-client/examples/tanstack-query/README.md
diff --git a/packages/client-generator/examples/tanstack-query/index.html b/tests/e2e/generate-client/examples/tanstack-query/index.html
similarity index 100%
rename from packages/client-generator/examples/tanstack-query/index.html
rename to tests/e2e/generate-client/examples/tanstack-query/index.html
diff --git a/packages/client-generator/examples/tanstack-query/openapi.yaml b/tests/e2e/generate-client/examples/tanstack-query/openapi.yaml
similarity index 100%
rename from packages/client-generator/examples/tanstack-query/openapi.yaml
rename to tests/e2e/generate-client/examples/tanstack-query/openapi.yaml
diff --git a/tests/e2e/generate-client/examples/tanstack-query/package-lock.json b/tests/e2e/generate-client/examples/tanstack-query/package-lock.json
new file mode 100644
index 0000000000..7b87ce37ac
--- /dev/null
+++ b/tests/e2e/generate-client/examples/tanstack-query/package-lock.json
@@ -0,0 +1,1814 @@
+{
+  "name": "@redocly-examples/tanstack-query",
+  "version": "0.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "@redocly-examples/tanstack-query",
+      "version": "0.0.0",
+      "dependencies": {
+        "@tanstack/react-query": "^5.0.0",
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0"
+      },
+      "devDependencies": {
+        "@redocly/cli": "2.34.0-local-2026-06-23.1",
+        "@types/react": "^18.2.0",
+        "@types/react-dom": "^18.2.0",
+        "@vitejs/plugin-react": "^4.3.0",
+        "typescript": "^5.5.0",
+        "vite": "^5.4.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/code-frame/-/code-frame-7.29.7.tgz",
+      "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.29.7",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/compat-data/-/compat-data-7.29.7.tgz",
+      "integrity": "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/core/-/core-7.29.7.tgz",
+      "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.29.7",
+        "@babel/generator": "^7.29.7",
+        "@babel/helper-compilation-targets": "^7.29.7",
+        "@babel/helper-module-transforms": "^7.29.7",
+        "@babel/helpers": "^7.29.7",
+        "@babel/parser": "^7.29.7",
+        "@babel/template": "^7.29.7",
+        "@babel/traverse": "^7.29.7",
+        "@babel/types": "^7.29.7",
+        "@jridgewell/remapping": "^2.3.5",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/generator/-/generator-7.29.7.tgz",
+      "integrity": "sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.29.7",
+        "@babel/types": "^7.29.7",
+        "@jridgewell/gen-mapping": "^0.3.12",
+        "@jridgewell/trace-mapping": "^0.3.28",
+        "jsesc": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz",
+      "integrity": "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/compat-data": "^7.29.7",
+        "@babel/helper-validator-option": "^7.29.7",
+        "browserslist": "^4.24.0",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-globals": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helper-globals/-/helper-globals-7.29.7.tgz",
+      "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz",
+      "integrity": "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/traverse": "^7.29.7",
+        "@babel/types": "^7.29.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz",
+      "integrity": "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.29.7",
+        "@babel/helper-validator-identifier": "^7.29.7",
+        "@babel/traverse": "^7.29.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helper-plugin-utils/-/helper-plugin-utils-7.29.7.tgz",
+      "integrity": "sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz",
+      "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
+      "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz",
+      "integrity": "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helpers/-/helpers-7.29.7.tgz",
+      "integrity": "sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/template": "^7.29.7",
+        "@babel/types": "^7.29.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/parser/-/parser-7.29.7.tgz",
+      "integrity": "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.29.7"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-react-jsx-self": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.29.7.tgz",
+      "integrity": "sha512-TL0hMc9xzy86VD31nUiwzd5otRAcyEPcsegCxolO0PvcXuH1v0kECe/UIznYFihpkvU5wg/jk4v0TTEFfm53fw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.29.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-react-jsx-source": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.29.7.tgz",
+      "integrity": "sha512-06IyK09H3wi4cGbhDBwp5gUGo0IKtnYa8tyTiephirPCK6fbobVGiXMMI5zLQ4aKEYP3wZ3ArU44o+8KMrSG/Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.29.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/template/-/template-7.29.7.tgz",
+      "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.29.7",
+        "@babel/parser": "^7.29.7",
+        "@babel/types": "^7.29.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/traverse/-/traverse-7.29.7.tgz",
+      "integrity": "sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.29.7",
+        "@babel/generator": "^7.29.7",
+        "@babel/helper-globals": "^7.29.7",
+        "@babel/parser": "^7.29.7",
+        "@babel/template": "^7.29.7",
+        "@babel/types": "^7.29.7",
+        "debug": "^4.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/types/-/types-7.29.7.tgz",
+      "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.29.7",
+        "@babel/helper-validator-identifier": "^7.29.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.13",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.0",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "node_modules/@jridgewell/remapping": {
+      "version": "2.3.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@jridgewell/remapping/-/remapping-2.3.5.tgz",
+      "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.31",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@redocly/cli": {
+      "version": "2.34.0-local-2026-06-23.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/cli/-/cli-2.34.0-local-2026-06-23.1.tgz",
+      "integrity": "sha512-F3WnkO5Jn51H6hPzdH3Vde1nQq0eb0k7I7X0UEfkQ6paWGQBLnlOc4cudsU6y1Cz8unD+svmcl8SzaGMwTH6OQ==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "openapi": "bin/cli.js",
+        "redocly": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
+        "npm": ">=10"
+      }
+    },
+    "node_modules/@rolldown/pluginutils": {
+      "version": "1.0.0-beta.27",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.27.tgz",
+      "integrity": "sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.62.2.tgz",
+      "integrity": "sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.62.2.tgz",
+      "integrity": "sha512-BaH7BllCACHoH1LguOU56UItGfUWjujlO65kS9LAodViaN4bwIKd7oeW/ZHJ/4ljr/7MIiENnNy3HJ0zXv8Zkw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.62.2.tgz",
+      "integrity": "sha512-v39RCCvj4He82I9sFmk+M1VZ0PLM9sfsLVikjfx2hYBNALhrrOR2D3JjQA6AhlaSOgcR+RzrKY7e1+bT6SUO/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.62.2.tgz",
+      "integrity": "sha512-yl0y2vq3S3lHeuXhEdss6TWfKW8vkujImO12tn4ZkG/4oghr09LvdYm2RElVjokTQiUvDUGXLGsYeLqUMCKpGA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.62.2.tgz",
+      "integrity": "sha512-tT4pvt4qXD+vEoezupCWi+a1F0vvDiksiHc+PxRlYTOH1I6/X4id9jPxTP+Fg+545euaFT1jJVs4CEdHZAU1vw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.62.2.tgz",
+      "integrity": "sha512-6nU5F2wCW+qvCBhTn1pdIU3bzsIoF7EUwsCDRxilWGprQR6yd508YnH9+OKFCwpfS8pjZqDUmnCAr7exax0XCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.62.2.tgz",
+      "integrity": "sha512-n1GJHPOvpIfhi3TmrCeh6S6URt9BFCt0KQE3qvexyGCTAKpR4Lg+eWvNZEqu7epxwus/8ElT3hacYEucm49SZg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.62.2.tgz",
+      "integrity": "sha512-JqgflS8wEB+UXV/vS1RpRbifGBeN4D5lz8D8oOFbFZw4vedvdOgCFAjfBmIMdW3yL10XpQQ0Ambepw6MXrhOnA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.62.2.tgz",
+      "integrity": "sha512-wnFJkogWvN4jm/hQRF2UBaeUmk20j5+DmHvoyWii2b8HJDyvz1MF2OU/6ynXt2KR63rbZLWkFpoytpdc/yBuSA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.62.2.tgz",
+      "integrity": "sha512-HVu2bp0zhvJ8xHEV9+UUs7S90VadmBSY3LcIMvozbPo4AuMGDWlz3ymHLHZPX4hR67TKTt8Qp5PJ5RBg/i+RMQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.62.2.tgz",
+      "integrity": "sha512-mQqqAV8QaoSgr9I2fKDLY2BAVvmKjWoGiu/cSYQonsLvtqwEn1E4QYfnCOcp5zoEqNhsDYin1s6jx/VJmrxlZg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-musl": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.62.2.tgz",
+      "integrity": "sha512-IxKLoxCQ2IWi6bT2akyDUBGsOImDKB+sPp4EsTmwFQ/fMwpCKm8uLSSgP/Kx/QYUgKis6SEZ5/Nlhup0DIA0PQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.62.2.tgz",
+      "integrity": "sha512-Mk5ha2RQSgyFfmYYLkBpPnUk8D8FriBxesO1u9O75X0mHgXL1UQcH5Itl2lurWL2tj0RxV9b9tJgipac0hRY9A==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-musl": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.62.2.tgz",
+      "integrity": "sha512-CjvEnqJL/0/TQ3TXX3OPIJ/kmBellrWd4heXUmHeJlTnmwjKpSJzoehLaL6Xk0ZnMHBu9dZuFADNOrtjF4v+2w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.62.2.tgz",
+      "integrity": "sha512-1SiZbzwdkaDURsew/tSOrooKiYy7EQGT6m8ufavAi9NEyQb/6VuIxFXAL1fqa4iZe3g4NbNk4P7J32z2tw5Mgg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.62.2.tgz",
+      "integrity": "sha512-nQts12zJ3NQRoE6uYljOH89v7szzLDvG2JD/vsX+vGXU8w/At1GowTZ5/7qeFQ8m7L55rpR8Okugnuo5bgjy2Q==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.62.2.tgz",
+      "integrity": "sha512-E9/ll019jhPIJgpzfZoIkBGhcz+kKNgVWYRY0zr9srBdPPFVpvOKW8VaJKUbeK+eZXyQF9ltME+Kk6affeaPgg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.62.2.tgz",
+      "integrity": "sha512-5BqxR/pshjey51iliyzTD5Xi3EN0aLmQ2lZ3lvefVV9c82BvrLo2/6OT55iifpWBufs6kdwWbuOKS841DrmK9A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.62.2.tgz",
+      "integrity": "sha512-uNN83XxQrRAh/w0/pmAfibcwyb6YWt4gP+dpnQKPVJshAloQ785ii8CT8ZCIxkGg9opVsvAlGhFitSm6D1Jjpg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-openbsd-x64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.62.2.tgz",
+      "integrity": "sha512-srjEIxSH3LRnJN6THczDHWQplqEMFiAJrTab0msUryh9kwNpkICf3Ea6q6MN/2cZwRFUNx5w+h6Hpi4QuHS6Zg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.62.2.tgz",
+      "integrity": "sha512-8hOJnxgbyObnCm5AlRA3A931xX19xq80RjVTKgJOvEKWqJruP/Uf12IbAOaDjjEXYRewwHLfmF0YRIdK3OwKWA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.62.2.tgz",
+      "integrity": "sha512-mmF4AY1i0hG/bLWUctUq59gtmgaSIRa3cu/A3JFRp/sCNEme2bgDEiDS22P9FbnJB8NJNF4jPJiSP5RHQpUTDg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.62.2.tgz",
+      "integrity": "sha512-DZgkknc6jhHrk46V25vbAM0zZkyP0nSDkJB8/dRkLTxv470dOmWDqGoEJl/9A0dFfS7yE3REOwNDxpHwSLSt0Q==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.62.2.tgz",
+      "integrity": "sha512-T6xr6ucWSFto+VGajA8YH26LdpHRuP4YLHEKAtCWvJDOlnmWcDZVCI2Jmjr+IFHDlt2zRaTAKE4tfjTaWLgJBg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.62.2.tgz",
+      "integrity": "sha512-BfzEnDJOt9T8M989/lA37EcJgat01wLRnoi5dQf3QzOH7jzpqTAzdDbVfRljVr5r+jzKqpbHeyOfAaXxAd0PAA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@tanstack/query-core": {
+      "version": "5.101.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@tanstack/query-core/-/query-core-5.101.1.tgz",
+      "integrity": "sha512-Y6Y92dkXtNqx67m2pMSxUsA3zOCwv862JexZRP8/EPwvKXMPu9m8rv43spiXWzOUIggQ3SQApttALStzhA8B4g==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      }
+    },
+    "node_modules/@tanstack/react-query": {
+      "version": "5.101.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@tanstack/react-query/-/react-query-5.101.1.tgz",
+      "integrity": "sha512-ZnONUuQKJe1bJMStXUL1s5uKN9FcfC28j5cK+iDZcdSHtUv1wtin1cGc/Oewhf2Oc4eKY7lggtpvT/AbMmhHew==",
+      "license": "MIT",
+      "dependencies": {
+        "@tanstack/query-core": "5.101.1"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/tannerlinsley"
+      },
+      "peerDependencies": {
+        "react": "^18 || ^19"
+      }
+    },
+    "node_modules/@types/babel__core": {
+      "version": "7.20.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.27.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/babel__generator/-/babel__generator-7.27.0.tgz",
+      "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.4.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/babel__template/-/babel__template-7.4.4.tgz",
+      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__traverse": {
+      "version": "7.28.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/babel__traverse/-/babel__traverse-7.28.0.tgz",
+      "integrity": "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.28.2"
+      }
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.9",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/estree/-/estree-1.0.9.tgz",
+      "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/prop-types": {
+      "version": "15.7.15",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/prop-types/-/prop-types-15.7.15.tgz",
+      "integrity": "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/react": {
+      "version": "18.3.31",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/react/-/react-18.3.31.tgz",
+      "integrity": "sha512-vfEqpXTvwT91yhmwdfouStN2hSKwTvyRs8qpLfADyrq/kxDw0hZM7Wk9Ug1FELj8hIby+S/+kQCSRFF32nv2Qw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/prop-types": "*",
+        "csstype": "^3.2.2"
+      }
+    },
+    "node_modules/@types/react-dom": {
+      "version": "18.3.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/react-dom/-/react-dom-18.3.7.tgz",
+      "integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "^18.0.0"
+      }
+    },
+    "node_modules/@vitejs/plugin-react": {
+      "version": "4.7.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@vitejs/plugin-react/-/plugin-react-4.7.0.tgz",
+      "integrity": "sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.28.0",
+        "@babel/plugin-transform-react-jsx-self": "^7.27.1",
+        "@babel/plugin-transform-react-jsx-source": "^7.27.1",
+        "@rolldown/pluginutils": "1.0.0-beta.27",
+        "@types/babel__core": "^7.20.5",
+        "react-refresh": "^0.17.0"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0"
+      }
+    },
+    "node_modules/baseline-browser-mapping": {
+      "version": "2.10.38",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/baseline-browser-mapping/-/baseline-browser-mapping-2.10.38.tgz",
+      "integrity": "sha512-31/02mVB4yuQU6adKk5SlY6m+mxDwUq5KZkyYgnLrrKl7TEm1+3PyDtDBz2kOv/wxZz41GHsvV1A/u6RmiyBvw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "baseline-browser-mapping": "dist/cli.cjs"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.28.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/browserslist/-/browserslist-4.28.4.tgz",
+      "integrity": "sha512-MTc8i/x9jBQd1iMw2CFGS+rwMa07eYjLR0CCTLDACl9xhxy+nIs3KeML/biicXtk9JrZ6dnnTatmc7ErPXIxqw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "baseline-browser-mapping": "^2.10.38",
+        "caniuse-lite": "^1.0.30001799",
+        "electron-to-chromium": "^1.5.376",
+        "node-releases": "^2.0.48",
+        "update-browserslist-db": "^1.2.3"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001799",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/caniuse-lite/-/caniuse-lite-1.0.30001799.tgz",
+      "integrity": "sha512-hG1bReV+OUU+MOqK4t/ZWI0tZOyz3rqS9XuhOUz1cIcbwBKjOyJEJuw9ER5JuNyqxNk8u/JUVbGibBOL1yrjFw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "CC-BY-4.0"
+    },
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/csstype": {
+      "version": "3.2.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/csstype/-/csstype-3.2.3.tgz",
+      "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.377",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/electron-to-chromium/-/electron-to-chromium-1.5.377.tgz",
+      "integrity": "sha512-cH1jZgJHoezfTnKfKwnScpHywTFVnJUNITDPREFdhNjiuD502+QFpG0Qk7G8jhsV/f+CEAFlIrzP1fT+IMb92g==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/esbuild": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "license": "MIT"
+    },
+    "node_modules/jsesc": {
+      "version": "3.1.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "license": "MIT",
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.15",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/nanoid/-/nanoid-3.3.15.tgz",
+      "integrity": "sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.48",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/node-releases/-/node-releases-2.0.48.tgz",
+      "integrity": "sha512-1uz8041X6LoI6ZSdZacM9lVY28vuzDlSKitnpbSNK0RfKoIJkX29NBPVEFXhnuSuEOA9Ww0xnPJ+ILWbGAv8DA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/postcss": {
+      "version": "8.5.15",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/postcss/-/postcss-8.5.15.tgz",
+      "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.12",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/react": {
+      "version": "18.3.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/react/-/react-18.3.1.tgz",
+      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-dom": {
+      "version": "18.3.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/react-dom/-/react-dom-18.3.1.tgz",
+      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "scheduler": "^0.23.2"
+      },
+      "peerDependencies": {
+        "react": "^18.3.1"
+      }
+    },
+    "node_modules/react-refresh": {
+      "version": "0.17.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/react-refresh/-/react-refresh-0.17.0.tgz",
+      "integrity": "sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rollup": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/rollup/-/rollup-4.62.2.tgz",
+      "integrity": "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "1.0.9"
+      },
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.62.2",
+        "@rollup/rollup-android-arm64": "4.62.2",
+        "@rollup/rollup-darwin-arm64": "4.62.2",
+        "@rollup/rollup-darwin-x64": "4.62.2",
+        "@rollup/rollup-freebsd-arm64": "4.62.2",
+        "@rollup/rollup-freebsd-x64": "4.62.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.62.2",
+        "@rollup/rollup-linux-arm-musleabihf": "4.62.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.62.2",
+        "@rollup/rollup-linux-arm64-musl": "4.62.2",
+        "@rollup/rollup-linux-loong64-gnu": "4.62.2",
+        "@rollup/rollup-linux-loong64-musl": "4.62.2",
+        "@rollup/rollup-linux-ppc64-gnu": "4.62.2",
+        "@rollup/rollup-linux-ppc64-musl": "4.62.2",
+        "@rollup/rollup-linux-riscv64-gnu": "4.62.2",
+        "@rollup/rollup-linux-riscv64-musl": "4.62.2",
+        "@rollup/rollup-linux-s390x-gnu": "4.62.2",
+        "@rollup/rollup-linux-x64-gnu": "4.62.2",
+        "@rollup/rollup-linux-x64-musl": "4.62.2",
+        "@rollup/rollup-openbsd-x64": "4.62.2",
+        "@rollup/rollup-openharmony-arm64": "4.62.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.62.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.62.2",
+        "@rollup/rollup-win32-x64-gnu": "4.62.2",
+        "@rollup/rollup-win32-x64-msvc": "4.62.2",
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/scheduler": {
+      "version": "0.23.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/scheduler/-/scheduler-0.23.2.tgz",
+      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.1.0"
+      }
+    },
+    "node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "5.9.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.2.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
+      "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/vite": {
+      "version": "5.4.21",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/vite/-/vite-5.4.21.tgz",
+      "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "sass-embedded": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true,
+      "license": "ISC"
+    }
+  }
+}
diff --git a/packages/client-generator/examples/tanstack-query/package.json b/tests/e2e/generate-client/examples/tanstack-query/package.json
similarity index 100%
rename from packages/client-generator/examples/tanstack-query/package.json
rename to tests/e2e/generate-client/examples/tanstack-query/package.json
diff --git a/packages/client-generator/examples/tanstack-query/redocly.yaml b/tests/e2e/generate-client/examples/tanstack-query/redocly.yaml
similarity index 100%
rename from packages/client-generator/examples/tanstack-query/redocly.yaml
rename to tests/e2e/generate-client/examples/tanstack-query/redocly.yaml
diff --git a/packages/client-generator/examples/tanstack-query/src/App.tsx b/tests/e2e/generate-client/examples/tanstack-query/src/App.tsx
similarity index 100%
rename from packages/client-generator/examples/tanstack-query/src/App.tsx
rename to tests/e2e/generate-client/examples/tanstack-query/src/App.tsx
diff --git a/packages/client-generator/examples/tanstack-query/src/api/client.tanstack.ts b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.tanstack.ts
similarity index 100%
rename from packages/client-generator/examples/tanstack-query/src/api/client.tanstack.ts
rename to tests/e2e/generate-client/examples/tanstack-query/src/api/client.tanstack.ts
diff --git a/packages/client-generator/examples/tanstack-query/src/api/client.ts b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
similarity index 100%
rename from packages/client-generator/examples/tanstack-query/src/api/client.ts
rename to tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
diff --git a/packages/client-generator/examples/tanstack-query/src/main.tsx b/tests/e2e/generate-client/examples/tanstack-query/src/main.tsx
similarity index 100%
rename from packages/client-generator/examples/tanstack-query/src/main.tsx
rename to tests/e2e/generate-client/examples/tanstack-query/src/main.tsx
diff --git a/packages/client-generator/examples/tanstack-query/tsconfig.json b/tests/e2e/generate-client/examples/tanstack-query/tsconfig.json
similarity index 100%
rename from packages/client-generator/examples/tanstack-query/tsconfig.json
rename to tests/e2e/generate-client/examples/tanstack-query/tsconfig.json
diff --git a/packages/client-generator/examples/tanstack-query/vite.config.ts b/tests/e2e/generate-client/examples/tanstack-query/vite.config.ts
similarity index 100%
rename from packages/client-generator/examples/tanstack-query/vite.config.ts
rename to tests/e2e/generate-client/examples/tanstack-query/vite.config.ts
diff --git a/packages/client-generator/examples/tsconfig.base.json b/tests/e2e/generate-client/examples/tsconfig.base.json
similarity index 100%
rename from packages/client-generator/examples/tsconfig.base.json
rename to tests/e2e/generate-client/examples/tsconfig.base.json
diff --git a/packages/client-generator/examples/zod/.gitignore b/tests/e2e/generate-client/examples/zod/.gitignore
similarity index 100%
rename from packages/client-generator/examples/zod/.gitignore
rename to tests/e2e/generate-client/examples/zod/.gitignore
diff --git a/packages/client-generator/examples/zod/README.md b/tests/e2e/generate-client/examples/zod/README.md
similarity index 100%
rename from packages/client-generator/examples/zod/README.md
rename to tests/e2e/generate-client/examples/zod/README.md
diff --git a/packages/client-generator/examples/zod/index.html b/tests/e2e/generate-client/examples/zod/index.html
similarity index 100%
rename from packages/client-generator/examples/zod/index.html
rename to tests/e2e/generate-client/examples/zod/index.html
diff --git a/packages/client-generator/examples/zod/openapi.yaml b/tests/e2e/generate-client/examples/zod/openapi.yaml
similarity index 100%
rename from packages/client-generator/examples/zod/openapi.yaml
rename to tests/e2e/generate-client/examples/zod/openapi.yaml
diff --git a/tests/e2e/generate-client/examples/zod/package-lock.json b/tests/e2e/generate-client/examples/zod/package-lock.json
new file mode 100644
index 0000000000..00b943dae3
--- /dev/null
+++ b/tests/e2e/generate-client/examples/zod/package-lock.json
@@ -0,0 +1,3515 @@
+{
+  "name": "@redocly-examples/zod",
+  "version": "0.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "@redocly-examples/zod",
+      "version": "0.0.0",
+      "devDependencies": {
+        "@redocly/cli": "2.31.4-local-06-22",
+        "typescript": "^5.5.0",
+        "vite": "^5.4.0",
+        "zod": "^4.0.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/code-frame/-/code-frame-7.29.7.tgz",
+      "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.29.7",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
+      "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.29.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/runtime/-/runtime-7.29.7.tgz",
+      "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@emotion/is-prop-valid": {
+      "version": "1.4.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@emotion/is-prop-valid/-/is-prop-valid-1.4.0.tgz",
+      "integrity": "sha512-QgD4fyscGcbbKwJmqNvUMSE02OsHUa+lAWKdEUIJKgqe5IwRSKd7+KhibEWdaKwgjLj0DRSHA9biAIqGBk05lw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@emotion/memoize": "^0.9.0"
+      }
+    },
+    "node_modules/@emotion/memoize": {
+      "version": "0.9.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@emotion/memoize/-/memoize-0.9.0.tgz",
+      "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@exodus/schemasafe": {
+      "version": "1.3.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@exodus/schemasafe/-/schemasafe-1.3.0.tgz",
+      "integrity": "sha512-5Aap/GaRupgNx/feGBwLLTVv8OQFfv3pq2lPRzPg9R+IOBnDgghTGW7l7EuVXOvg5cc/xSAlRW8rBrjIC3Nvqw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@faker-js/faker": {
+      "version": "7.6.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@faker-js/faker/-/faker-7.6.0.tgz",
+      "integrity": "sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0",
+        "npm": ">=6.0.0"
+      }
+    },
+    "node_modules/@humanwhocodes/momoa": {
+      "version": "2.0.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@humanwhocodes/momoa/-/momoa-2.0.4.tgz",
+      "integrity": "sha512-RE815I4arJFtt+FVeU1Tgp9/Xvecacji8w/V6XtXsWWH/wz/eNkNbhb+ny/+PlVZjV0rxQpRSQKNKE3lcktHEA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@noble/hashes": {
+      "version": "1.8.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@noble/hashes/-/hashes-1.8.0.tgz",
+      "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14.21.3 || >=16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@nodable/entities": {
+      "version": "2.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@nodable/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-9uGyhaQavEUMC8AIddIjau4NsnsXhou+j5sBAGojCM1oxmQpVKTWR/9JxABD6UAv12vpIms55fPZKFQEhG6uBg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/nodable"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/@opentelemetry/api": {
+      "version": "1.9.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/api/-/api-1.9.1.tgz",
+      "integrity": "sha512-gLyJlPHPZYdAk1JENA9LeHejZe1Ti77/pTeFm/nMXmQH/HFZlcS/O2XJB+L8fkbrNSqhdtlvjBVjxwUYanNH5Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/api-logs": {
+      "version": "0.214.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/api-logs/-/api-logs-0.214.0.tgz",
+      "integrity": "sha512-40lSJeqYO8Uz2Yj7u94/SJWE/wONa7rmMKjI1ZcIjgf3MHNHv1OZUCrCETGuaRF62d5pQD1wKIW+L4lmSMTzZA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/context-async-hooks": {
+      "version": "2.6.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/context-async-hooks/-/context-async-hooks-2.6.1.tgz",
+      "integrity": "sha512-XHzhwRNkBpeP8Fs/qjGrAf9r9PRv67wkJQ/7ZPaBQQ68DYlTBBx5MF9LvPx7mhuXcDessKK2b+DcxqwpgkcivQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.0.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/core": {
+      "version": "2.6.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/core/-/core-2.6.1.tgz",
+      "integrity": "sha512-8xHSGWpJP9wBxgBpnqGL0R3PbdWQndL1Qp50qrg71+B28zK5OQmUgcDKLJgzyAAV38t4tOyLMGDD60LneR5W8g==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/semantic-conventions": "^1.29.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.0.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/exporter-trace-otlp-http": {
+      "version": "0.214.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.214.0.tgz",
+      "integrity": "sha512-kIN8nTBMgV2hXzV/a20BCFilPZdAIMYYJGSgfMMRm/Xa+07y5hRDS2Vm12A/z8Cdu3Sq++ZvJfElokX2rkgGgw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "2.6.1",
+        "@opentelemetry/otlp-exporter-base": "0.214.0",
+        "@opentelemetry/otlp-transformer": "0.214.0",
+        "@opentelemetry/resources": "2.6.1",
+        "@opentelemetry/sdk-trace-base": "2.6.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/otlp-exporter-base": {
+      "version": "0.214.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.214.0.tgz",
+      "integrity": "sha512-u1Gdv0/E9wP+apqWf7Wv2npXmgJtxsW2XL0TEv9FZloTZRuMBKmu8cYVXwS4Hm3q/f/3FuCnPTgiwYvIqRSpRg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "2.6.1",
+        "@opentelemetry/otlp-transformer": "0.214.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/otlp-transformer": {
+      "version": "0.214.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/otlp-transformer/-/otlp-transformer-0.214.0.tgz",
+      "integrity": "sha512-DSaYcuBRh6uozfsWN3R8HsN0yDhCuWP7tOFdkUOVaWD1KVJg8m4qiLUsg/tNhTLS9HUYUcwNpwL2eroLtsZZ/w==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.214.0",
+        "@opentelemetry/core": "2.6.1",
+        "@opentelemetry/resources": "2.6.1",
+        "@opentelemetry/sdk-logs": "0.214.0",
+        "@opentelemetry/sdk-metrics": "2.6.1",
+        "@opentelemetry/sdk-trace-base": "2.6.1",
+        "protobufjs": "^7.0.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/resources": {
+      "version": "2.6.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/resources/-/resources-2.6.1.tgz",
+      "integrity": "sha512-lID/vxSuKWXM55XhAKNoYXu9Cutoq5hFdkbTdI/zDKQktXzcWBVhNsOkiZFTMU9UtEWuGRNe0HUgmsFldIdxVA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "2.6.1",
+        "@opentelemetry/semantic-conventions": "^1.29.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.3.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/sdk-logs": {
+      "version": "0.214.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/sdk-logs/-/sdk-logs-0.214.0.tgz",
+      "integrity": "sha512-zf6acnScjhsaBUU22zXZ/sLWim1dfhUAbGXdMmHmNG3LfBnQ3DKsOCITb2IZwoUsNNMTogqFKBnlIPPftUgGwA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/api-logs": "0.214.0",
+        "@opentelemetry/core": "2.6.1",
+        "@opentelemetry/resources": "2.6.1",
+        "@opentelemetry/semantic-conventions": "^1.29.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.4.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/sdk-metrics": {
+      "version": "2.6.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/sdk-metrics/-/sdk-metrics-2.6.1.tgz",
+      "integrity": "sha512-9t9hJHX15meBy2NmTJxL+NJfXmnausR2xUDvE19XQce0Qi/GBtDGamU8nS1RMbdgDmhgpm3VaOu2+fiS/SfTpQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "2.6.1",
+        "@opentelemetry/resources": "2.6.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.9.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/sdk-trace-base": {
+      "version": "2.6.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.6.1.tgz",
+      "integrity": "sha512-r86ut4T1e8vNwB35CqCcKd45yzqH6/6Wzvpk2/cZB8PsPLlZFTvrh8yfOS3CYZYcUmAx4hHTZJ8AO8Dj8nrdhw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/core": "2.6.1",
+        "@opentelemetry/resources": "2.6.1",
+        "@opentelemetry/semantic-conventions": "^1.29.0"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.3.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/sdk-trace-node": {
+      "version": "2.6.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/sdk-trace-node/-/sdk-trace-node-2.6.1.tgz",
+      "integrity": "sha512-Hh2i4FwHWRFhnO2Q/p6svMxy8MPsNCG0uuzUY3glqm0rwM0nQvbTO1dXSp9OqQoTKXcQzaz9q1f65fsurmOhNw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@opentelemetry/context-async-hooks": "2.6.1",
+        "@opentelemetry/core": "2.6.1",
+        "@opentelemetry/sdk-trace-base": "2.6.1"
+      },
+      "engines": {
+        "node": "^18.19.0 || >=20.6.0"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.0.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/semantic-conventions": {
+      "version": "1.40.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/semantic-conventions/-/semantic-conventions-1.40.0.tgz",
+      "integrity": "sha512-cifvXDhcqMwwTlTK04GBNeIe7yyo28Mfby85QXFe1Yk8nmi36Ab/5UQwptOx84SsoGNRg+EVSjwzfSZMy6pmlw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@protobufjs/aspromise": {
+      "version": "1.1.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
+      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/base64": {
+      "version": "1.1.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/base64/-/base64-1.1.2.tgz",
+      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/codegen": {
+      "version": "2.0.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/codegen/-/codegen-2.0.5.tgz",
+      "integrity": "sha512-zgXFLzW3Ap33e6d0Wlj4MGIm6Ce8O89n/apUaGNB/jx+hw+ruWEp7EwGUshdLKVRCxZW12fp9r40E1mQrf/34g==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/eventemitter": {
+      "version": "1.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/eventemitter/-/eventemitter-1.1.1.tgz",
+      "integrity": "sha512-vW1GmwMZNnL+gMRaovlh9yZX74kc+TTU3FObkkurpMaRtBfLP3ldjS9KQWlwZgraRE0+dheEEoAxdzcJQ8eXZg==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/fetch": {
+      "version": "1.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/fetch/-/fetch-1.1.1.tgz",
+      "integrity": "sha512-GpptLrs57adMSuHi3VNj0mAF8dwh36LMaYF6XyJ6JMWlVsc+t42tm1HSEDmOs3A8fC9yyeisgLhsTVQokOZ0zw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@protobufjs/aspromise": "^1.1.1"
+      }
+    },
+    "node_modules/@protobufjs/float": {
+      "version": "1.0.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/float/-/float-1.0.2.tgz",
+      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/path": {
+      "version": "1.1.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/path/-/path-1.1.2.tgz",
+      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/pool": {
+      "version": "1.1.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/pool/-/pool-1.1.0.tgz",
+      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@protobufjs/utf8": {
+      "version": "1.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/utf8/-/utf8-1.1.1.tgz",
+      "integrity": "sha512-oOAWABowe8EAbMyWKM0tYDKi8Yaox52D+HWZhAIJqQXbqe0xI/GV7FhLWqlEKreMkfDjshR5FKgi3mnle0h6Eg==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@redocly/ajv": {
+      "version": "8.18.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/ajv/-/ajv-8.18.3.tgz",
+      "integrity": "sha512-l42u0of3hY98sN2A+M4qTX1O/KrpgGH32Hu9kP2GtHyD5Dfqq86PKFLe5dwaD8DEnNmlOlll2BAmeEtf0DaySg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@redocly/cli": {
+      "version": "2.31.4-local-06-22",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/cli/-/cli-2.31.4-local-06-22.tgz",
+      "integrity": "sha512-VZrw8d0vCWNll6ZWnG7Iwp5yeuesWRUb8WCc+KFNnQxpxeJZ4WwPvOyMlb+wOeC5wHWNDwhHRteOaflA+yT6Dg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@opentelemetry/exporter-trace-otlp-http": "0.214.0",
+        "@opentelemetry/resources": "2.6.1",
+        "@opentelemetry/sdk-trace-node": "2.6.1",
+        "@opentelemetry/semantic-conventions": "1.40.0",
+        "@redocly/cli-otel": "0.3.1",
+        "@redocly/openapi-core": "2.31.4",
+        "@redocly/openapi-typescript": "0.1.0-local-local",
+        "@redocly/respect-core": "2.31.4",
+        "ajv": "npm:@redocly/ajv@8.18.1",
+        "ajv-formats": "^3.0.1",
+        "colorette": "^1.2.0",
+        "cookie": "^0.7.2",
+        "dotenv": "16.4.7",
+        "glob": "^13.0.5",
+        "handlebars": "^4.7.9",
+        "https-proxy-agent": "^7.0.5",
+        "mobx": "^6.0.4",
+        "picomatch": "^4.0.4",
+        "pluralize": "^8.0.0",
+        "react": "^17.0.0 || ^18.2.0 || ^19.2.1",
+        "react-dom": "^17.0.0 || ^18.2.0 || ^19.2.1",
+        "redoc": "2.5.1",
+        "semver": "^7.5.2",
+        "set-cookie-parser": "^2.3.5",
+        "simple-websocket": "^9.0.0",
+        "styled-components": "6.4.1",
+        "typescript": "6.0.2",
+        "ulid": "^3.0.1",
+        "undici": "6.24.0",
+        "yargs": "17.0.1"
+      },
+      "bin": {
+        "openapi": "bin/cli.js",
+        "redocly": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
+        "npm": ">=10"
+      }
+    },
+    "node_modules/@redocly/cli-otel": {
+      "version": "0.3.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/cli-otel/-/cli-otel-0.3.1.tgz",
+      "integrity": "sha512-TbC4bK2zLtU/O9I2pszHPP0rtJOvFhQmEwQ/FHxERPu71fgKG8POUDP2jSiGmsXE7NdGSHBKqnf+y9Acn2jq5g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ulid": "^2.3.0"
+      }
+    },
+    "node_modules/@redocly/cli-otel/node_modules/ulid": {
+      "version": "2.4.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ulid/-/ulid-2.4.0.tgz",
+      "integrity": "sha512-fIRiVTJNcSRmXKPZtGzFQv9WRrZ3M9eoptl/teFJvjOzmpU+/K/JH6HZ8deBfb5vMEpicJcLn7JmvdknlMq7Zg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "ulid": "bin/cli.js"
+      }
+    },
+    "node_modules/@redocly/cli/node_modules/typescript": {
+      "version": "6.0.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/typescript/-/typescript-6.0.2.tgz",
+      "integrity": "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/@redocly/config": {
+      "version": "0.49.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/config/-/config-0.49.0.tgz",
+      "integrity": "sha512-OI/rpEffX3fKUuy+OuBHPRspRI/S30b9aiqxfZLMpSWZzDncEGPxSEP1O2LrBVshnDX4hLjVjLvCZ4YT85+1rw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "json-schema-to-ts": "2.7.2"
+      }
+    },
+    "node_modules/@redocly/openapi-core": {
+      "version": "2.31.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/openapi-core/-/openapi-core-2.31.4.tgz",
+      "integrity": "sha512-ne2e5NduK9MHnu42LoPXgfKhyCFG5Mc2Cwh3wNfLdoieYvhKtl37rW7p4p+GDMEJmlI9t6fagQbGPAKic2+3Pw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@redocly/ajv": "^8.18.1",
+        "@redocly/config": "^0.49.0",
+        "ajv": "npm:@redocly/ajv@8.18.1",
+        "ajv-formats": "^3.0.1",
+        "colorette": "^1.2.0",
+        "js-levenshtein": "^1.1.6",
+        "js-yaml": "^4.1.0",
+        "picomatch": "^4.0.4",
+        "pluralize": "^8.0.0",
+        "yaml-ast-parser": "0.0.43"
+      },
+      "engines": {
+        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
+        "npm": ">=10"
+      }
+    },
+    "node_modules/@redocly/openapi-typescript": {
+      "version": "0.1.0-local-local",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/openapi-typescript/-/openapi-typescript-0.1.0-local-local.tgz",
+      "integrity": "sha512-BJRV89BoYdEyECFGRB8t2dzWnOGNe1/oQ7DZoC662kv4NRJhxz5qw3exl24+M+1WCpGdRtPps5GIy+vPqauJUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@redocly/openapi-core": "2.31.4"
+      },
+      "engines": {
+        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
+        "npm": ">=10"
+      },
+      "peerDependencies": {
+        "typescript": ">=5.5.0"
+      }
+    },
+    "node_modules/@redocly/respect-core": {
+      "version": "2.31.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/respect-core/-/respect-core-2.31.4.tgz",
+      "integrity": "sha512-ezdsZap+vmwkv94Gf7a5j+SVcxGDRWm78hxKh7Xb4XNYUxHfAqmC0eDpEfkiJU61LP7tOQeZcckxdFCIVEqI8w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@faker-js/faker": "^7.6.0",
+        "@noble/hashes": "^1.8.0",
+        "@redocly/ajv": "^8.18.1",
+        "@redocly/openapi-core": "2.31.4",
+        "ajv": "npm:@redocly/ajv@8.18.1",
+        "better-ajv-errors": "^2.0.3",
+        "colorette": "^2.0.20",
+        "json-pointer": "^0.6.2",
+        "jsonpath-rfc9535": "1.3.0",
+        "openapi-sampler": "^1.7.1",
+        "outdent": "^0.8.0",
+        "picomatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
+        "npm": ">=10"
+      }
+    },
+    "node_modules/@redocly/respect-core/node_modules/colorette": {
+      "version": "2.0.20",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.62.2.tgz",
+      "integrity": "sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.62.2.tgz",
+      "integrity": "sha512-BaH7BllCACHoH1LguOU56UItGfUWjujlO65kS9LAodViaN4bwIKd7oeW/ZHJ/4ljr/7MIiENnNy3HJ0zXv8Zkw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.62.2.tgz",
+      "integrity": "sha512-v39RCCvj4He82I9sFmk+M1VZ0PLM9sfsLVikjfx2hYBNALhrrOR2D3JjQA6AhlaSOgcR+RzrKY7e1+bT6SUO/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.62.2.tgz",
+      "integrity": "sha512-yl0y2vq3S3lHeuXhEdss6TWfKW8vkujImO12tn4ZkG/4oghr09LvdYm2RElVjokTQiUvDUGXLGsYeLqUMCKpGA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.62.2.tgz",
+      "integrity": "sha512-tT4pvt4qXD+vEoezupCWi+a1F0vvDiksiHc+PxRlYTOH1I6/X4id9jPxTP+Fg+545euaFT1jJVs4CEdHZAU1vw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.62.2.tgz",
+      "integrity": "sha512-6nU5F2wCW+qvCBhTn1pdIU3bzsIoF7EUwsCDRxilWGprQR6yd508YnH9+OKFCwpfS8pjZqDUmnCAr7exax0XCg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.62.2.tgz",
+      "integrity": "sha512-n1GJHPOvpIfhi3TmrCeh6S6URt9BFCt0KQE3qvexyGCTAKpR4Lg+eWvNZEqu7epxwus/8ElT3hacYEucm49SZg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.62.2.tgz",
+      "integrity": "sha512-JqgflS8wEB+UXV/vS1RpRbifGBeN4D5lz8D8oOFbFZw4vedvdOgCFAjfBmIMdW3yL10XpQQ0Ambepw6MXrhOnA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.62.2.tgz",
+      "integrity": "sha512-wnFJkogWvN4jm/hQRF2UBaeUmk20j5+DmHvoyWii2b8HJDyvz1MF2OU/6ynXt2KR63rbZLWkFpoytpdc/yBuSA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.62.2.tgz",
+      "integrity": "sha512-HVu2bp0zhvJ8xHEV9+UUs7S90VadmBSY3LcIMvozbPo4AuMGDWlz3ymHLHZPX4hR67TKTt8Qp5PJ5RBg/i+RMQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.62.2.tgz",
+      "integrity": "sha512-mQqqAV8QaoSgr9I2fKDLY2BAVvmKjWoGiu/cSYQonsLvtqwEn1E4QYfnCOcp5zoEqNhsDYin1s6jx/VJmrxlZg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-musl": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.62.2.tgz",
+      "integrity": "sha512-IxKLoxCQ2IWi6bT2akyDUBGsOImDKB+sPp4EsTmwFQ/fMwpCKm8uLSSgP/Kx/QYUgKis6SEZ5/Nlhup0DIA0PQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.62.2.tgz",
+      "integrity": "sha512-Mk5ha2RQSgyFfmYYLkBpPnUk8D8FriBxesO1u9O75X0mHgXL1UQcH5Itl2lurWL2tj0RxV9b9tJgipac0hRY9A==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-musl": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.62.2.tgz",
+      "integrity": "sha512-CjvEnqJL/0/TQ3TXX3OPIJ/kmBellrWd4heXUmHeJlTnmwjKpSJzoehLaL6Xk0ZnMHBu9dZuFADNOrtjF4v+2w==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.62.2.tgz",
+      "integrity": "sha512-1SiZbzwdkaDURsew/tSOrooKiYy7EQGT6m8ufavAi9NEyQb/6VuIxFXAL1fqa4iZe3g4NbNk4P7J32z2tw5Mgg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.62.2.tgz",
+      "integrity": "sha512-nQts12zJ3NQRoE6uYljOH89v7szzLDvG2JD/vsX+vGXU8w/At1GowTZ5/7qeFQ8m7L55rpR8Okugnuo5bgjy2Q==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.62.2.tgz",
+      "integrity": "sha512-E9/ll019jhPIJgpzfZoIkBGhcz+kKNgVWYRY0zr9srBdPPFVpvOKW8VaJKUbeK+eZXyQF9ltME+Kk6affeaPgg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.62.2.tgz",
+      "integrity": "sha512-5BqxR/pshjey51iliyzTD5Xi3EN0aLmQ2lZ3lvefVV9c82BvrLo2/6OT55iifpWBufs6kdwWbuOKS841DrmK9A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.62.2.tgz",
+      "integrity": "sha512-uNN83XxQrRAh/w0/pmAfibcwyb6YWt4gP+dpnQKPVJshAloQ785ii8CT8ZCIxkGg9opVsvAlGhFitSm6D1Jjpg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-openbsd-x64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.62.2.tgz",
+      "integrity": "sha512-srjEIxSH3LRnJN6THczDHWQplqEMFiAJrTab0msUryh9kwNpkICf3Ea6q6MN/2cZwRFUNx5w+h6Hpi4QuHS6Zg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.62.2.tgz",
+      "integrity": "sha512-8hOJnxgbyObnCm5AlRA3A931xX19xq80RjVTKgJOvEKWqJruP/Uf12IbAOaDjjEXYRewwHLfmF0YRIdK3OwKWA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.62.2.tgz",
+      "integrity": "sha512-mmF4AY1i0hG/bLWUctUq59gtmgaSIRa3cu/A3JFRp/sCNEme2bgDEiDS22P9FbnJB8NJNF4jPJiSP5RHQpUTDg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.62.2.tgz",
+      "integrity": "sha512-DZgkknc6jhHrk46V25vbAM0zZkyP0nSDkJB8/dRkLTxv470dOmWDqGoEJl/9A0dFfS7yE3REOwNDxpHwSLSt0Q==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.62.2.tgz",
+      "integrity": "sha512-T6xr6ucWSFto+VGajA8YH26LdpHRuP4YLHEKAtCWvJDOlnmWcDZVCI2Jmjr+IFHDlt2zRaTAKE4tfjTaWLgJBg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.62.2.tgz",
+      "integrity": "sha512-BfzEnDJOt9T8M989/lA37EcJgat01wLRnoi5dQf3QzOH7jzpqTAzdDbVfRljVr5r+jzKqpbHeyOfAaXxAd0PAA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.9",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/estree/-/estree-1.0.9.tgz",
+      "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/json-schema": {
+      "version": "7.0.15",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/json-schema/-/json-schema-7.0.15.tgz",
+      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "26.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/node/-/node-26.0.0.tgz",
+      "integrity": "sha512-vf2YFi1iY9lHGwNJMs01biZFbKJkrZR1T6/MlzjhJLPdntOHLhTrDSnSVcdtvjihi4VQNlrFRIxLsDBlQpAipA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~8.3.0"
+      }
+    },
+    "node_modules/@types/trusted-types": {
+      "version": "2.0.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/trusted-types/-/trusted-types-2.0.7.tgz",
+      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/agent-base": {
+      "version": "7.1.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/ajv": {
+      "name": "@redocly/ajv",
+      "version": "8.18.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/ajv/-/ajv-8.18.1.tgz",
+      "integrity": "sha512-Ifm/pP/tul1qmAecpbVxCBluVE32rKfjf8gYXH4xI2gCv9mRWFhJMHzkPDM4TXlxwPQYIFegymlsy8lXz7optA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "fast-uri": "^3.0.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ajv-formats": {
+      "version": "3.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ajv-formats/-/ajv-formats-3.0.1.tgz",
+      "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependencies": {
+        "ajv": "^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ajv": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/anynum": {
+      "version": "1.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/anynum/-/anynum-1.0.1.tgz",
+      "integrity": "sha512-N6//FLET/tXYNM/F6ABca1oH6fWB+KlTt909Le28WMDBk8oaT4vY17DCrwg2MvmuqUKt3Ni4N5dGJ/EoBgcO6A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/argparse": {
+      "version": "2.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/balanced-match": {
+      "version": "4.0.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/balanced-match/-/balanced-match-4.0.4.tgz",
+      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
+    },
+    "node_modules/better-ajv-errors": {
+      "version": "2.0.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/better-ajv-errors/-/better-ajv-errors-2.0.3.tgz",
+      "integrity": "sha512-t1vxUP+vYKsaYi/BbKo2K98nEAZmfi4sjwvmRT8aOPDzPJeAtLurfoIDazVkLILxO4K+Sw4YrLYnBQ46l6pePg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@humanwhocodes/momoa": "^2.0.4",
+        "chalk": "^4.1.2",
+        "jsonpointer": "^5.0.1",
+        "leven": "^3.1.0 < 4"
+      },
+      "engines": {
+        "node": ">= 18.20.6"
+      },
+      "peerDependencies": {
+        "ajv": "4.11.8 - 8"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "5.0.6",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/brace-expansion/-/brace-expansion-5.0.6.tgz",
+      "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^4.0.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
+    },
+    "node_modules/call-me-maybe": {
+      "version": "1.0.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/call-me-maybe/-/call-me-maybe-1.0.2.tgz",
+      "integrity": "sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/camelize": {
+      "version": "1.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/camelize/-/camelize-1.0.1.tgz",
+      "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/classnames": {
+      "version": "2.5.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/classnames/-/classnames-2.5.1.tgz",
+      "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/clsx": {
+      "version": "2.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/clsx/-/clsx-2.1.1.tgz",
+      "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/colorette": {
+      "version": "1.4.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/colorette/-/colorette-1.4.0.tgz",
+      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cookie": {
+      "version": "0.7.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/core-js": {
+      "version": "3.49.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/core-js/-/core-js-3.49.0.tgz",
+      "integrity": "sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "peer": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/css-color-keywords": {
+      "version": "1.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
+      "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/css-to-react-native": {
+      "version": "3.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/css-to-react-native/-/css-to-react-native-3.2.0.tgz",
+      "integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "camelize": "^1.0.0",
+        "css-color-keywords": "^1.0.0",
+        "postcss-value-parser": "^4.0.2"
+      }
+    },
+    "node_modules/csstype": {
+      "version": "3.2.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/csstype/-/csstype-3.2.3.tgz",
+      "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decko": {
+      "version": "1.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/decko/-/decko-1.2.0.tgz",
+      "integrity": "sha512-m8FnyHXV1QX+S1cl+KPFDIl6NMkxtKsy6+U/aYyjrOqWMuwAwYWu7ePqrsUHtDR5Y8Yk2pi/KIDSgF+vT4cPOQ==",
+      "dev": true
+    },
+    "node_modules/dompurify": {
+      "version": "3.4.11",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/dompurify/-/dompurify-3.4.11.tgz",
+      "integrity": "sha512-zhlUV12GsaRzMsf9q5M254YhA4+VuF0fG+QFqu6aYpoGlKtz+w8//jBcGVYBgQkR5GHjUomejY84AV+/uPbWdw==",
+      "dev": true,
+      "license": "(MPL-2.0 OR Apache-2.0)",
+      "optionalDependencies": {
+        "@types/trusted-types": "^2.0.7"
+      }
+    },
+    "node_modules/dotenv": {
+      "version": "16.4.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/dotenv/-/dotenv-16.4.7.tgz",
+      "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/es6-promise": {
+      "version": "3.3.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/es6-promise/-/es6-promise-3.3.1.tgz",
+      "integrity": "sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/esbuild": {
+      "version": "0.21.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/esbuild/-/esbuild-0.21.5.tgz",
+      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.21.5",
+        "@esbuild/android-arm": "0.21.5",
+        "@esbuild/android-arm64": "0.21.5",
+        "@esbuild/android-x64": "0.21.5",
+        "@esbuild/darwin-arm64": "0.21.5",
+        "@esbuild/darwin-x64": "0.21.5",
+        "@esbuild/freebsd-arm64": "0.21.5",
+        "@esbuild/freebsd-x64": "0.21.5",
+        "@esbuild/linux-arm": "0.21.5",
+        "@esbuild/linux-arm64": "0.21.5",
+        "@esbuild/linux-ia32": "0.21.5",
+        "@esbuild/linux-loong64": "0.21.5",
+        "@esbuild/linux-mips64el": "0.21.5",
+        "@esbuild/linux-ppc64": "0.21.5",
+        "@esbuild/linux-riscv64": "0.21.5",
+        "@esbuild/linux-s390x": "0.21.5",
+        "@esbuild/linux-x64": "0.21.5",
+        "@esbuild/netbsd-x64": "0.21.5",
+        "@esbuild/openbsd-x64": "0.21.5",
+        "@esbuild/sunos-x64": "0.21.5",
+        "@esbuild/win32-arm64": "0.21.5",
+        "@esbuild/win32-ia32": "0.21.5",
+        "@esbuild/win32-x64": "0.21.5"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/eventemitter3": {
+      "version": "5.0.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/eventemitter3/-/eventemitter3-5.0.4.tgz",
+      "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-safe-stringify": {
+      "version": "2.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-uri": {
+      "version": "3.1.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-uri/-/fast-uri-3.1.2.tgz",
+      "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ],
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/fast-xml-builder": {
+      "version": "1.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-xml-builder/-/fast-xml-builder-1.2.0.tgz",
+      "integrity": "sha512-00aAWieqff+ZJhsXA4g1g7M8k+7AYoMUUHF+/zFb5U6Uv/P0Vl4QZo84/IcufzYalLuEj9928bXN9PbbFzMF0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "path-expression-matcher": "^1.5.0",
+        "xml-naming": "^0.1.0"
+      }
+    },
+    "node_modules/fast-xml-parser": {
+      "version": "5.9.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-xml-parser/-/fast-xml-parser-5.9.3.tgz",
+      "integrity": "sha512-brCNCeScma/kqa54J4PIDriSSSLssRkuYaUCpvHJulGc3HGI/xxKUCTDcYkAdqJsyb//ydpbxecjC3hB9+tb/g==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@nodable/entities": "^2.2.0",
+        "fast-xml-builder": "^1.2.0",
+        "is-unsafe": "^1.0.1",
+        "path-expression-matcher": "^1.5.0",
+        "strnum": "^2.4.1",
+        "xml-naming": "^0.1.0"
+      },
+      "bin": {
+        "fxparser": "src/cli/cli.js"
+      }
+    },
+    "node_modules/foreach": {
+      "version": "2.0.6",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/foreach/-/foreach-2.0.6.tgz",
+      "integrity": "sha512-k6GAGDyqLe9JaebCsFCoudPPWfihKu8pylYXRlqP1J7ms39iPoTtk2fviNglIeQEwdh0bQeKJ01ZPyuyQvKzwg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/glob": {
+      "version": "13.0.6",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/glob/-/glob-13.0.6.tgz",
+      "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "minimatch": "^10.2.2",
+        "minipass": "^7.1.3",
+        "path-scurry": "^2.0.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/handlebars": {
+      "version": "4.7.9",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/handlebars/-/handlebars-4.7.9.tgz",
+      "integrity": "sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minimist": "^1.2.5",
+        "neo-async": "^2.6.2",
+        "source-map": "^0.6.1",
+        "wordwrap": "^1.0.0"
+      },
+      "bin": {
+        "handlebars": "bin/handlebars"
+      },
+      "engines": {
+        "node": ">=0.4.7"
+      },
+      "optionalDependencies": {
+        "uglify-js": "^3.1.4"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/http2-client": {
+      "version": "1.3.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/http2-client/-/http2-client-1.3.5.tgz",
+      "integrity": "sha512-EC2utToWl4RKfs5zd36Mxq7nzHHBuomZboI0yYL6Y0RmBgT7Sgkq4rQ0ezFTYoIsSs7Tm9SJe+o2FcAg6GBhGA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "7.0.6",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-unsafe": {
+      "version": "1.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/is-unsafe/-/is-unsafe-1.0.1.tgz",
+      "integrity": "sha512-CLK2+VdgERgD96EYm5lUQssZYlRg2tkZnbsxZoacmSiRxiFJ4Nk4SzjCl+Ur+v3kXIY9dTIdb3IH22y1mZ56LA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/js-levenshtein": {
+      "version": "1.1.6",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
+      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/js-yaml": {
+      "version": "4.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/js-yaml/-/js-yaml-4.2.0.tgz",
+      "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/puzrin"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/nodeca"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/json-pointer": {
+      "version": "0.6.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/json-pointer/-/json-pointer-0.6.2.tgz",
+      "integrity": "sha512-vLWcKbOaXlO+jvRy4qNd+TI1QUPZzfJj1tpJ3vAXDych5XJf93ftpUKe5pKCrzyIIwgBJcOcCVRUfqQP25afBw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "foreach": "^2.0.4"
+      }
+    },
+    "node_modules/json-schema-to-ts": {
+      "version": "2.7.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/json-schema-to-ts/-/json-schema-to-ts-2.7.2.tgz",
+      "integrity": "sha512-R1JfqKqbBR4qE8UyBR56Ms30LL62/nlhoz+1UkfI/VE7p54Awu919FZ6ZUPG8zIa3XB65usPJgr1ONVncUGSaQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.18.3",
+        "@types/json-schema": "^7.0.9",
+        "ts-algebra": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jsonpath-rfc9535": {
+      "version": "1.3.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/jsonpath-rfc9535/-/jsonpath-rfc9535-1.3.0.tgz",
+      "integrity": "sha512-3jFHya7oZ45aDxIIdx+/zQARahHXxFSMWBkcBUldfXpLS9VCXDJyTKt35kQfEXLqh0K3Ixw/9xFnvcDStaxh7Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/jsonpointer": {
+      "version": "5.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/jsonpointer/-/jsonpointer-5.0.1.tgz",
+      "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/long": {
+      "version": "5.3.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/long/-/long-5.3.2.tgz",
+      "integrity": "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "11.5.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/lru-cache/-/lru-cache-11.5.1.tgz",
+      "integrity": "sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "node_modules/lunr": {
+      "version": "2.3.9",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/lunr/-/lunr-2.3.9.tgz",
+      "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/mark.js": {
+      "version": "8.11.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/mark.js/-/mark.js-8.11.1.tgz",
+      "integrity": "sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/marked": {
+      "version": "4.3.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/marked/-/marked-4.3.0.tgz",
+      "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "marked": "bin/marked.js"
+      },
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "10.2.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/minimatch/-/minimatch-10.2.5.tgz",
+      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "brace-expansion": "^5.0.5"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "7.1.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/minipass/-/minipass-7.1.3.tgz",
+      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/mobx": {
+      "version": "6.16.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/mobx/-/mobx-6.16.1.tgz",
+      "integrity": "sha512-syNcDdX3KT+Jq3je6eGjBhuc24Z68td2VG0zNFqRswaE433D9SNH5VRy/xrGbJsUixfppLLccXhAW9JSf6n+SQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mobx"
+      }
+    },
+    "node_modules/mobx-react": {
+      "version": "9.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/mobx-react/-/mobx-react-9.2.0.tgz",
+      "integrity": "sha512-dkGWCx+S0/1mfiuFfHRH8D9cplmwhxOV5CkXMp38u6rQGG2Pv3FWYztS0M7ncR6TyPRQKaTG/pnitInoYE9Vrw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mobx-react-lite": "^4.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mobx"
+      },
+      "peerDependencies": {
+        "mobx": "^6.9.0",
+        "react": "^16.8.0 || ^17 || ^18 || ^19"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/mobx-react-lite": {
+      "version": "4.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/mobx-react-lite/-/mobx-react-lite-4.1.1.tgz",
+      "integrity": "sha512-iUxiMpsvNraCKXU+yPotsOncNNmyeS2B5DKL+TL6Tar/xm+wwNJAubJmtRSeAoYawdZqwv8Z/+5nPRHeQxTiXg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "use-sync-external-store": "^1.4.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mobx"
+      },
+      "peerDependencies": {
+        "mobx": "^6.9.0",
+        "react": "^16.8.0 || ^17 || ^18 || ^19"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.15",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/nanoid/-/nanoid-3.3.15.tgz",
+      "integrity": "sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/node-fetch-h2": {
+      "version": "2.3.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/node-fetch-h2/-/node-fetch-h2-2.3.0.tgz",
+      "integrity": "sha512-ofRW94Ab0T4AOh5Fk8t0h8OBWrmjb0SSB20xh1H8YnPV9EJ+f5AMoYSUQ2zgJ4Iq2HAK0I2l5/Nequ8YzFS3Hg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "http2-client": "^1.2.5"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      }
+    },
+    "node_modules/node-readfiles": {
+      "version": "0.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/node-readfiles/-/node-readfiles-0.2.0.tgz",
+      "integrity": "sha512-SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es6-promise": "^3.2.1"
+      }
+    },
+    "node_modules/oas-kit-common": {
+      "version": "1.0.8",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/oas-kit-common/-/oas-kit-common-1.0.8.tgz",
+      "integrity": "sha512-pJTS2+T0oGIwgjGpw7sIRU8RQMcUoKCDWFLdBqKB2BNmGpbBMH2sdqAaOXUg8OzonZHU0L7vfJu1mJFEiYDWOQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "fast-safe-stringify": "^2.0.7"
+      }
+    },
+    "node_modules/oas-linter": {
+      "version": "3.2.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/oas-linter/-/oas-linter-3.2.2.tgz",
+      "integrity": "sha512-KEGjPDVoU5K6swgo9hJVA/qYGlwfbFx+Kg2QB/kd7rzV5N8N5Mg6PlsoCMohVnQmo+pzJap/F610qTodKzecGQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@exodus/schemasafe": "^1.0.0-rc.2",
+        "should": "^13.2.1",
+        "yaml": "^1.10.0"
+      },
+      "funding": {
+        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
+      }
+    },
+    "node_modules/oas-resolver": {
+      "version": "2.5.6",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/oas-resolver/-/oas-resolver-2.5.6.tgz",
+      "integrity": "sha512-Yx5PWQNZomfEhPPOphFbZKi9W93CocQj18NlD2Pa4GWZzdZpSJvYwoiuurRI7m3SpcChrnO08hkuQDL3FGsVFQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "node-fetch-h2": "^2.3.0",
+        "oas-kit-common": "^1.0.8",
+        "reftools": "^1.1.9",
+        "yaml": "^1.10.0",
+        "yargs": "^17.0.1"
+      },
+      "bin": {
+        "resolve": "resolve.js"
+      },
+      "funding": {
+        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
+      }
+    },
+    "node_modules/oas-schema-walker": {
+      "version": "1.1.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/oas-schema-walker/-/oas-schema-walker-1.1.5.tgz",
+      "integrity": "sha512-2yucenq1a9YPmeNExoUa9Qwrt9RFkjqaMAA1X+U7sbb0AqBeTIdMHky9SQQ6iN94bO5NW0W4TRYXerG+BdAvAQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "funding": {
+        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
+      }
+    },
+    "node_modules/oas-validator": {
+      "version": "5.0.8",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/oas-validator/-/oas-validator-5.0.8.tgz",
+      "integrity": "sha512-cu20/HE5N5HKqVygs3dt94eYJfBi0TsZvPVXDhbXQHiEityDN+RROTleefoKRKKJ9dFAF2JBkDHgvWj0sjKGmw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "call-me-maybe": "^1.0.1",
+        "oas-kit-common": "^1.0.8",
+        "oas-linter": "^3.2.2",
+        "oas-resolver": "^2.5.6",
+        "oas-schema-walker": "^1.1.5",
+        "reftools": "^1.1.9",
+        "should": "^13.2.1",
+        "yaml": "^1.10.0"
+      },
+      "funding": {
+        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/openapi-sampler": {
+      "version": "1.7.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/openapi-sampler/-/openapi-sampler-1.7.4.tgz",
+      "integrity": "sha512-CKS/rd5ucPCuEDbJnjGDXZTsuGWcmv53aCmQx7soZlPEONUGN4af0/dY5+THRFZraSEjeA78nlfzdFswC/N5SA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/json-schema": "^7.0.7",
+        "fast-xml-parser": "^5.5.1",
+        "json-pointer": "0.6.2"
+      }
+    },
+    "node_modules/outdent": {
+      "version": "0.8.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/outdent/-/outdent-0.8.0.tgz",
+      "integrity": "sha512-KiOAIsdpUTcAXuykya5fnVVT+/5uS0Q1mrkRHcF89tpieSmY33O/tmc54CqwA+bfhbtEfZUNLHaPUiB9X3jt1A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/path-browserify": {
+      "version": "1.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/path-browserify/-/path-browserify-1.0.1.tgz",
+      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/path-expression-matcher": {
+      "version": "1.6.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/path-expression-matcher/-/path-expression-matcher-1.6.1.tgz",
+      "integrity": "sha512-h7bxdzhHk8Knyc4Tj+jMaa7fEEoUJy7p1qtbVgkYg1Uhpe5Np5VuGXCRZnkZvU+Q42M1vStt0ifa3ueykRJPmQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/path-scurry": {
+      "version": "2.0.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/path-scurry/-/path-scurry-2.0.2.tgz",
+      "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^11.0.0",
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/perfect-scrollbar": {
+      "version": "1.5.6",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/perfect-scrollbar/-/perfect-scrollbar-1.5.6.tgz",
+      "integrity": "sha512-rixgxw3SxyJbCaSpo1n35A/fwI1r2rdwMKOTCg/AcG+xOEyZcE8UHVjpZMFCVImzsFoCZeJTT+M/rdEIQYO2nw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/picomatch": {
+      "version": "4.0.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pluralize": {
+      "version": "8.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/pluralize/-/pluralize-8.0.0.tgz",
+      "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/polished": {
+      "version": "4.3.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/polished/-/polished-4.3.1.tgz",
+      "integrity": "sha512-OBatVyC/N7SCW/FaDHrSd+vn0o5cS855TOmYi4OkdWUMSJCET/xip//ch8xGUvtr3i44X9LVyWwQlRMTN3pwSA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.17.8"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.5.15",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/postcss/-/postcss-8.5.15.tgz",
+      "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.12",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/prismjs": {
+      "version": "1.30.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/prismjs/-/prismjs-1.30.0.tgz",
+      "integrity": "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/prop-types": {
+      "version": "15.8.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/prop-types/-/prop-types-15.8.1.tgz",
+      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      }
+    },
+    "node_modules/protobufjs": {
+      "version": "7.6.4",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/protobufjs/-/protobufjs-7.6.4.tgz",
+      "integrity": "sha512-RJJPTTpvFfHcWLkIa2JFWK4XvtSzS0yEWDmunqHXli1h3JlkbcQZXDZdcWxv+JK3Xsl5/UFDPZ0iGm7DAengYw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@protobufjs/aspromise": "^1.1.2",
+        "@protobufjs/base64": "^1.1.2",
+        "@protobufjs/codegen": "^2.0.5",
+        "@protobufjs/eventemitter": "^1.1.1",
+        "@protobufjs/fetch": "^1.1.1",
+        "@protobufjs/float": "^1.0.2",
+        "@protobufjs/path": "^1.1.2",
+        "@protobufjs/pool": "^1.1.0",
+        "@protobufjs/utf8": "^1.1.1",
+        "@types/node": ">=13.7.0",
+        "long": "^5.3.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/react": {
+      "version": "19.2.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/react/-/react-19.2.7.tgz",
+      "integrity": "sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-dom": {
+      "version": "19.2.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/react-dom/-/react-dom-19.2.7.tgz",
+      "integrity": "sha512-t0BRVXvbiE/o20Hfw669rLbMCDWtYZLvmJigy2f0MxsXF+71pxhR3xOkspmsO8h3ZlNzyibAmtCa3l4lYKk6gQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "scheduler": "^0.27.0"
+      },
+      "peerDependencies": {
+        "react": "^19.2.7"
+      }
+    },
+    "node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/react-tabs": {
+      "version": "6.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/react-tabs/-/react-tabs-6.1.1.tgz",
+      "integrity": "sha512-CPiuKoMFf89B7QlbFfdBD9XmUWiE3qudQputMVZB8GQvPJZRX/gqjDaDWOPDwGinEfpJKEuBCkGt83Tt4efeyA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "clsx": "^2.0.0",
+        "prop-types": "^15.5.0"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/redoc": {
+      "version": "2.5.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/redoc/-/redoc-2.5.1.tgz",
+      "integrity": "sha512-LmqA+4A3CmhTllGG197F0arUpmChukAj9klfSdxNRemT9Hr07xXr7OGKu4PHzBs359sgrJ+4JwmOlM7nxLPGMg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@redocly/openapi-core": "^1.4.0",
+        "classnames": "^2.3.2",
+        "decko": "^1.2.0",
+        "dompurify": "^3.2.4",
+        "eventemitter3": "^5.0.1",
+        "json-pointer": "^0.6.2",
+        "lunr": "^2.3.9",
+        "mark.js": "^8.11.1",
+        "marked": "^4.3.0",
+        "mobx-react": "9.2.0",
+        "openapi-sampler": "^1.5.0",
+        "path-browserify": "^1.0.1",
+        "perfect-scrollbar": "^1.5.5",
+        "polished": "^4.2.2",
+        "prismjs": "^1.29.0",
+        "prop-types": "^15.8.1",
+        "react-tabs": "^6.0.2",
+        "slugify": "~1.4.7",
+        "stickyfill": "^1.1.1",
+        "swagger2openapi": "^7.0.8",
+        "url-template": "^2.0.8"
+      },
+      "engines": {
+        "node": ">=6.9",
+        "npm": ">=3.0.0"
+      },
+      "peerDependencies": {
+        "core-js": "^3.1.4",
+        "mobx": "^6.0.4",
+        "react": "^16.8.4 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react-dom": "^16.8.4 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+        "styled-components": "^4.1.1 || ^5.1.1 || ^6.0.5"
+      }
+    },
+    "node_modules/redoc/node_modules/@redocly/ajv": {
+      "version": "8.11.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/ajv/-/ajv-8.11.2.tgz",
+      "integrity": "sha512-io1JpnwtIcvojV7QKDUSIuMN/ikdOUd1ReEnUnMKGfDVridQZ31J0MmIuqwuRjWDZfmvr+Q0MqCcfHM2gTivOg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js-replace": "^1.0.1"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/redoc/node_modules/@redocly/config": {
+      "version": "0.22.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/config/-/config-0.22.0.tgz",
+      "integrity": "sha512-gAy93Ddo01Z3bHuVdPWfCwzgfaYgMdaZPcfL7JZ7hWJoK9V0lXDbigTWkhiPFAaLWzbOJ+kbUQG1+XwIm0KRGQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/redoc/node_modules/@redocly/openapi-core": {
+      "version": "1.34.15",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/openapi-core/-/openapi-core-1.34.15.tgz",
+      "integrity": "sha512-HAwCnNyKcs5XGQqms+9t7OdAPM/5TDstmhF+0i7tdCFato2QKuYIlyWETwkXd8c5zbltr1oB+6y9NTeQLr2d6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@redocly/ajv": "8.11.2",
+        "@redocly/config": "0.22.0",
+        "colorette": "1.4.0",
+        "https-proxy-agent": "7.0.6",
+        "js-levenshtein": "1.1.6",
+        "js-yaml": "4.1.1",
+        "minimatch": "5.1.9",
+        "pluralize": "8.0.0",
+        "yaml-ast-parser": "0.0.43"
+      },
+      "engines": {
+        "node": ">=18.17.0",
+        "npm": ">=9.5.0"
+      }
+    },
+    "node_modules/redoc/node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/redoc/node_modules/brace-expansion": {
+      "version": "2.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/brace-expansion/-/brace-expansion-2.1.1.tgz",
+      "integrity": "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/redoc/node_modules/js-yaml": {
+      "version": "4.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/redoc/node_modules/minimatch": {
+      "version": "5.1.9",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/minimatch/-/minimatch-5.1.9.tgz",
+      "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/reftools": {
+      "version": "1.1.9",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/reftools/-/reftools-1.1.9.tgz",
+      "integrity": "sha512-OVede/NQE13xBQ+ob5CKd5KyeJYU2YInb1bmV4nRoOfquZPkAkxuOXicSe1PvqIuZZ4kD13sPKBbR7UFDmli6w==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "funding": {
+        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rollup": {
+      "version": "4.62.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/rollup/-/rollup-4.62.2.tgz",
+      "integrity": "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "1.0.9"
+      },
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=18.0.0",
+        "npm": ">=8.0.0"
+      },
+      "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.62.2",
+        "@rollup/rollup-android-arm64": "4.62.2",
+        "@rollup/rollup-darwin-arm64": "4.62.2",
+        "@rollup/rollup-darwin-x64": "4.62.2",
+        "@rollup/rollup-freebsd-arm64": "4.62.2",
+        "@rollup/rollup-freebsd-x64": "4.62.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.62.2",
+        "@rollup/rollup-linux-arm-musleabihf": "4.62.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.62.2",
+        "@rollup/rollup-linux-arm64-musl": "4.62.2",
+        "@rollup/rollup-linux-loong64-gnu": "4.62.2",
+        "@rollup/rollup-linux-loong64-musl": "4.62.2",
+        "@rollup/rollup-linux-ppc64-gnu": "4.62.2",
+        "@rollup/rollup-linux-ppc64-musl": "4.62.2",
+        "@rollup/rollup-linux-riscv64-gnu": "4.62.2",
+        "@rollup/rollup-linux-riscv64-musl": "4.62.2",
+        "@rollup/rollup-linux-s390x-gnu": "4.62.2",
+        "@rollup/rollup-linux-x64-gnu": "4.62.2",
+        "@rollup/rollup-linux-x64-musl": "4.62.2",
+        "@rollup/rollup-openbsd-x64": "4.62.2",
+        "@rollup/rollup-openharmony-arm64": "4.62.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.62.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.62.2",
+        "@rollup/rollup-win32-x64-gnu": "4.62.2",
+        "@rollup/rollup-win32-x64-msvc": "4.62.2",
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/scheduler": {
+      "version": "0.27.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/scheduler/-/scheduler-0.27.0.tgz",
+      "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/semver": {
+      "version": "7.8.5",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/semver/-/semver-7.8.5.tgz",
+      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/set-cookie-parser": {
+      "version": "2.7.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz",
+      "integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/should": {
+      "version": "13.2.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/should/-/should-13.2.3.tgz",
+      "integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "should-equal": "^2.0.0",
+        "should-format": "^3.0.3",
+        "should-type": "^1.4.0",
+        "should-type-adaptors": "^1.0.1",
+        "should-util": "^1.0.0"
+      }
+    },
+    "node_modules/should-equal": {
+      "version": "2.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/should-equal/-/should-equal-2.0.0.tgz",
+      "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "should-type": "^1.4.0"
+      }
+    },
+    "node_modules/should-format": {
+      "version": "3.0.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/should-format/-/should-format-3.0.3.tgz",
+      "integrity": "sha512-hZ58adtulAk0gKtua7QxevgUaXTTXxIi8t41L3zo9AHvjXO1/7sdLECuHeIN2SRtYXpNkmhoUP2pdeWgricQ+Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "should-type": "^1.3.0",
+        "should-type-adaptors": "^1.0.1"
+      }
+    },
+    "node_modules/should-type": {
+      "version": "1.4.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/should-type/-/should-type-1.4.0.tgz",
+      "integrity": "sha512-MdAsTu3n25yDbIe1NeN69G4n6mUnJGtSJHygX3+oN0ZbO3DTiATnf7XnYJdGT42JCXurTb1JI0qOBR65shvhPQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/should-type-adaptors": {
+      "version": "1.1.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz",
+      "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "should-type": "^1.3.0",
+        "should-util": "^1.0.0"
+      }
+    },
+    "node_modules/should-util": {
+      "version": "1.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/should-util/-/should-util-1.0.1.tgz",
+      "integrity": "sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/simple-websocket": {
+      "version": "9.1.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/simple-websocket/-/simple-websocket-9.1.0.tgz",
+      "integrity": "sha512-8MJPnjRN6A8UCp1I+H/dSFyjwJhp6wta4hsVRhjf8w9qBHRzxYt14RaOcjvQnhD1N4yKOddEjflwMnQM4VtXjQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.3.1",
+        "queue-microtask": "^1.2.2",
+        "randombytes": "^2.1.0",
+        "readable-stream": "^3.6.0",
+        "ws": "^7.4.2"
+      }
+    },
+    "node_modules/slugify": {
+      "version": "1.4.7",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/slugify/-/slugify-1.4.7.tgz",
+      "integrity": "sha512-tf+h5W1IrjNm/9rKKj0JU2MDMruiopx0jjVA5zCdBtcGjfp0+c5rHw/zADLC3IeKlGHtVbHtpfzvYA0OYT+HKg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.2.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/source-map-js/-/source-map-js-1.2.1.tgz",
+      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stickyfill": {
+      "version": "1.1.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/stickyfill/-/stickyfill-1.1.1.tgz",
+      "integrity": "sha512-GCp7vHAfpao+Qh/3Flh9DXEJ/qSi0KJwJw6zYlZOtRYXWUIpMM6mC2rIep/dK8RQqwW0KxGJIllmjPIBOGN8AA==",
+      "dev": true
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strnum": {
+      "version": "2.4.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/strnum/-/strnum-2.4.1.tgz",
+      "integrity": "sha512-M9eUSMT2dCB2cTNPG7UYj6KuK7RJR2SN2+yCV/fTW3xzTCS6EaGZ5pSMgDIjB7r8zSfTGk+dvvn9rTjpVS9Mwg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "anynum": "^1.0.1"
+      }
+    },
+    "node_modules/styled-components": {
+      "version": "6.4.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/styled-components/-/styled-components-6.4.1.tgz",
+      "integrity": "sha512-ADu2dF53esUzzM4I0ewxhxFtsDd6v4V6dNkg3vG0iFKhnt06sJneTZnRvujAosZwW0XD58IKgGMQoqri4wHRqg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@emotion/is-prop-valid": "1.4.0",
+        "css-to-react-native": "3.2.0",
+        "csstype": "3.2.3",
+        "stylis": "4.3.6"
+      },
+      "engines": {
+        "node": ">= 16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/styled-components"
+      },
+      "peerDependencies": {
+        "css-to-react-native": ">= 3.2.0",
+        "react": ">= 16.8.0",
+        "react-dom": ">= 16.8.0",
+        "react-native": ">= 0.68.0"
+      },
+      "peerDependenciesMeta": {
+        "css-to-react-native": {
+          "optional": true
+        },
+        "react-dom": {
+          "optional": true
+        },
+        "react-native": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/stylis": {
+      "version": "4.3.6",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/stylis/-/stylis-4.3.6.tgz",
+      "integrity": "sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/swagger2openapi": {
+      "version": "7.0.8",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/swagger2openapi/-/swagger2openapi-7.0.8.tgz",
+      "integrity": "sha512-upi/0ZGkYgEcLeGieoz8gT74oWHA0E7JivX7aN9mAf+Tc7BQoRBvnIGHoPDw+f9TXTW4s6kGYCZJtauP6OYp7g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "call-me-maybe": "^1.0.1",
+        "node-fetch": "^2.6.1",
+        "node-fetch-h2": "^2.3.0",
+        "node-readfiles": "^0.2.0",
+        "oas-kit-common": "^1.0.8",
+        "oas-resolver": "^2.5.6",
+        "oas-schema-walker": "^1.1.5",
+        "oas-validator": "^5.0.8",
+        "reftools": "^1.1.9",
+        "yaml": "^1.10.0",
+        "yargs": "^17.0.1"
+      },
+      "bin": {
+        "boast": "boast.js",
+        "oas-validate": "oas-validate.js",
+        "swagger2openapi": "swagger2openapi.js"
+      },
+      "funding": {
+        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ts-algebra": {
+      "version": "1.2.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ts-algebra/-/ts-algebra-1.2.2.tgz",
+      "integrity": "sha512-kloPhf1hq3JbCPOTYoOWDKxebWjNb2o/LKnNfkWhxVVisFFmMJPPdJeGoGmM+iRLyoXAR61e08Pb+vUXINg8aA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/typescript": {
+      "version": "5.9.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
+    "node_modules/uglify-js": {
+      "version": "3.19.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/uglify-js/-/uglify-js-3.19.3.tgz",
+      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "optional": true,
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/ulid": {
+      "version": "3.0.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ulid/-/ulid-3.0.2.tgz",
+      "integrity": "sha512-yu26mwteFYzBAot7KVMqFGCVpsF6g8wXfJzQUHvu1no3+rRRSFcSV2nKeYvNPLD2J4b08jYBDhHUjeH0ygIl9w==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "ulid": "dist/cli.js"
+      }
+    },
+    "node_modules/undici": {
+      "version": "6.24.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/undici/-/undici-6.24.0.tgz",
+      "integrity": "sha512-lVLNosgqo5EkGqh5XUDhGfsMSoO8K0BAN0TyJLvwNRSl4xWGZlCVYsAIpa/OpA3TvmnM01GWcoKmc3ZWo5wKKA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.17"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "8.3.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/undici-types/-/undici-types-8.3.0.tgz",
+      "integrity": "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/uri-js-replace": {
+      "version": "1.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/uri-js-replace/-/uri-js-replace-1.0.1.tgz",
+      "integrity": "sha512-W+C9NWNLFOoBI2QWDp4UT9pv65r2w5Cx+3sTYFvtMdDBxkKt1syCqsUdSFAChbEe1uK5TfS04wt/nGwmaeIQ0g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/url-template": {
+      "version": "2.0.8",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/url-template/-/url-template-2.0.8.tgz",
+      "integrity": "sha512-XdVKMF4SJ0nP/O7XIPB0JwAEuT9lDIYnNsK8yGVe43y0AWoKeJNdv3ZNWh7ksJ6KqQFjOO6ox/VEitLnaVNufw==",
+      "dev": true,
+      "license": "BSD"
+    },
+    "node_modules/use-sync-external-store": {
+      "version": "1.6.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
+      "integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/vite": {
+      "version": "5.4.21",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/vite/-/vite-5.4.21.tgz",
+      "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "esbuild": "^0.21.3",
+        "postcss": "^8.4.43",
+        "rollup": "^4.20.0"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^18.0.0 || >=20.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^18.0.0 || >=20.0.0",
+        "less": "*",
+        "lightningcss": "^1.21.0",
+        "sass": "*",
+        "sass-embedded": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.4.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "lightningcss": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/wordwrap": {
+      "version": "1.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/ws": {
+      "version": "7.5.11",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/ws/-/ws-7.5.11.tgz",
+      "integrity": "sha512-zS54Oen9bITtp7kp2XM3AydrCIq1D+HwJOuH+c+e4LfpL/lotP5osijd+UoMnxwAam1GN8R4KtLAyIrIcBNpiA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xml-naming": {
+      "version": "0.1.0",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/xml-naming/-/xml-naming-0.1.0.tgz",
+      "integrity": "sha512-k8KO9hrMyNk6tUWqUfkTEZbezRRpONVOzUTnc97VnCvyj6Tf9lyUR9EDAIeiVLv56jsMcoXEwjW8Kv5yPY52lw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yaml": {
+      "version": "1.10.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/yaml/-/yaml-1.10.3.tgz",
+      "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/yaml-ast-parser": {
+      "version": "0.0.43",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz",
+      "integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/yargs": {
+      "version": "17.0.1",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/yargs/-/yargs-17.0.1.tgz",
+      "integrity": "sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/zod": {
+      "version": "4.4.3",
+      "resolved": "http://dev-verdaccio.redocly.host:8000/zod/-/zod-4.4.3.tgz",
+      "integrity": "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    }
+  }
+}
diff --git a/packages/client-generator/examples/zod/package.json b/tests/e2e/generate-client/examples/zod/package.json
similarity index 100%
rename from packages/client-generator/examples/zod/package.json
rename to tests/e2e/generate-client/examples/zod/package.json
diff --git a/packages/client-generator/examples/zod/redocly.yaml b/tests/e2e/generate-client/examples/zod/redocly.yaml
similarity index 100%
rename from packages/client-generator/examples/zod/redocly.yaml
rename to tests/e2e/generate-client/examples/zod/redocly.yaml
diff --git a/packages/client-generator/examples/zod/src/api/client.ts b/tests/e2e/generate-client/examples/zod/src/api/client.ts
similarity index 100%
rename from packages/client-generator/examples/zod/src/api/client.ts
rename to tests/e2e/generate-client/examples/zod/src/api/client.ts
diff --git a/packages/client-generator/examples/zod/src/api/client.zod.ts b/tests/e2e/generate-client/examples/zod/src/api/client.zod.ts
similarity index 100%
rename from packages/client-generator/examples/zod/src/api/client.zod.ts
rename to tests/e2e/generate-client/examples/zod/src/api/client.zod.ts
diff --git a/packages/client-generator/examples/zod/src/main.ts b/tests/e2e/generate-client/examples/zod/src/main.ts
similarity index 100%
rename from packages/client-generator/examples/zod/src/main.ts
rename to tests/e2e/generate-client/examples/zod/src/main.ts
diff --git a/packages/client-generator/examples/zod/tsconfig.json b/tests/e2e/generate-client/examples/zod/tsconfig.json
similarity index 100%
rename from packages/client-generator/examples/zod/tsconfig.json
rename to tests/e2e/generate-client/examples/zod/tsconfig.json
diff --git a/packages/client-generator/examples/zod/vite.config.ts b/tests/e2e/generate-client/examples/zod/vite.config.ts
similarity index 100%
rename from packages/client-generator/examples/zod/vite.config.ts
rename to tests/e2e/generate-client/examples/zod/vite.config.ts
diff --git a/tsconfig.json b/tsconfig.json
index c89e48dd81..15bd709c84 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -23,5 +23,5 @@
     "moduleResolution": "nodenext",
     "esModuleInterop": true
   },
-  "exclude": ["packages/client-generator/examples"]
+  "exclude": ["tests/e2e/generate-client/examples"]
 }

From abff0c32a789553e21a23f29b7025c1291aba771 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Wed, 1 Jul 2026 15:59:31 +0300
Subject: [PATCH 040/134] docs(client-generator): simplify and restructure the
 command reference
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Condense the reference to a single house-style page (1054 -> ~350 lines):
convert Markdoc tables to Markdown tables, use the `redocly …` notation
throughout, drop the redundant version-pinning and precedence prose, replace
long runnable examples with links to the examples, and consolidate the
per-generator sections into one Generators table. Keep every feature section,
tightened. Lead targets OpenAPI 3.x while still noting Swagger 2.0 support.
---
 docs/@v2/commands/generate-client.md | 988 ++++-----------------------
 1 file changed, 142 insertions(+), 846 deletions(-)

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index 8875973c75..9a6d067535 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -6,161 +6,51 @@ slug:
 # `generate-client`
 
 {% admonition type="warning" name="Experimental" %}
-`generate-client` is **experimental**.
-Its CLI flags, generated output, configuration schema, and the custom-generator plugin API may change in any minor release until the feature is declared stable.
-Pin your `@redocly/cli` version if you depend on the generated output, and plan to regenerate when you upgrade.
+`generate-client` is **experimental**: its flags, generated output, configuration schema, and custom-generator API may change in any minor release until it's stable.
 We'd love your feedback while we stabilize it.
 {% /admonition %}
 
-Generate a typed TypeScript client from an OpenAPI description.
-
-Accepts **OpenAPI 3.x**, plus **Swagger 2.0** (normalized to the 3.x shape before generation).
-`<input>` is a file path, a URL, or an `apis:` alias from `redocly.yaml`.
+Generate a typed TypeScript client from an OpenAPI 3.x description.
+Swagger 2.0 descriptions are also accepted — normalized to the 3.x shape before generation.
 
 The generated client has **zero runtime dependencies** — it uses only web-standard APIs (`fetch`, `AbortController`, `URLSearchParams`, …), so it runs in browsers, Node, Bun, Deno, and edge runtimes.
-Code is produced through the TypeScript compiler AST (not string templates), so output is correct by construction.
-By default it emits a single file containing inline types and one async function per operation.
+By default it emits a single file with inline types and one async function per operation.
 
 ## Usage
 
 ```sh
-npx @redocly/cli@latest generate-client <input> --output <file.ts>
-
-# <input> is an OpenAPI description file path or an `apis:` alias from redocly.yaml
+redocly generate-client <input> --output <file.ts>
 redocly generate-client openapi.yaml --output src/client.ts
 redocly generate-client cafe -o src/client.ts
 ```
 
-## Options
-
-{% table %}
-
-- Option {% width="20%" %}
-- Type {% width="15%" %}
-- Description
-
----
-
-- `input`
-- `string`
-- **REQUIRED.**
-  Positional argument: OpenAPI description file path, or an alias from the `apis:` section of `redocly.yaml`.
-
----
-
-- `--output`, `-o`
-- `string`
-- **REQUIRED.**
-  Output path for the generated client. Must end in `.ts`.
-  In multi-file modes it is the entry file; sibling files derive from its name and directory.
-
----
-
-- `--output-mode`
-- `string`
-- File layout: `single` (default, one file), `split` (endpoints, schemas, and runtime in sibling files), `tags` (one endpoints file per OpenAPI tag), or `tags-split` (a folder per tag).
-  All multi-file modes share the schemas and runtime modules.
-
----
-
-- `--generators`
-- `string`
-- Comma-separated generators to run (default `sdk`).
-  `sdk` is the typed client.
-  `zod` additionally emits a standalone `<output>.zod.ts` module of [Zod](https://zod.dev) schemas.
-  `tanstack-query` additionally emits a `<output>.tanstack.ts` module of [TanStack Query](https://tanstack.com/query) v5 factories wrapping the sdk (framework selected by `--query-framework`).
-  `swr` additionally emits a `<output>.swr.ts` module of [SWR](https://swr.vercel.app) hooks.
-  `mock` additionally emits a `<output>.mocks.ts` module of [MSW](https://mswjs.io) request handlers (data controlled by `--mock-data`).
-  `transformers` additionally emits a `<output>.transformers.ts` module of `transform<Name>` functions that convert wire ISO strings to `Date` (pair with `--date-type Date`). Example: `--generators sdk,zod` or `--generators sdk,tanstack-query,mock`.
-
----
-
-- `--query-framework`
-- `string`
-- TanStack Query adapter the `tanstack-query` generator imports from: `react` (default), `vue`, `svelte`, or `solid`.
-  Only the import specifier changes — the emitted factory module is byte-identical across frameworks.
-
----
-
-- `--mock-data`
-- `string`
-- How the `mock` generator produces data: `baked` (default) inlines deterministic literals (zero runtime dependency).
-  `faker` emits `@faker-js/faker` calls for realistic data (install `@faker-js/faker` as a dev dependency).
-
----
-
-- `--mock-seed`
-- `number`
-- Seed for faker-mode mocks: emits a top-level `faker.seed(<n>)` so generated data is reproducible across runs.
-  Ignored in `baked` mode.
-
----
-
-- `--date-type`
-- `string`
-- How `date-time`/`date` string fields are typed: `string` (default) keeps the ISO wire shape, byte-identical to before.
-  `Date` emits a `Date` instead.
-  Pair `--date-type Date` with `--generators sdk,transformers` so the runtime value (parsed by `transform<Name>`) matches the type.
-  `int64` → `bigint` is deferred to a follow-up.
-
----
-
-- `--facade`
-- `string`
-- Developer-facing operation shape: `functions` (default, standalone async functions) or `service-class` (operations grouped as class methods — one `Client` class in `single`/`split`, one service class per tag in `tags`/`tags-split`).
-
----
-
-- `--name`
-- `string`
-- Class name for the `service-class` facade in `single`/`split` layouts (ignored otherwise). Defaults to `Client`.
-
----
-
-- `--args-style`
-- `string`
-- How operation inputs are passed: `flat` (default) spreads path params as positional arguments followed by `params`/`body`/`headers`; `grouped` bundles every input into a single `vars` object (typed as the operation's `<Op>Variables`).
-  The per-call request `init` stays a separate trailing argument in both styles.
-
----
-
-- `--enum-style`
-- `string`
-- How named string enums are emitted: `const-object` (default) emits a runtime `as const` object alongside the union type; `union` emits only the union type.
-
----
-
-- `--error-mode`
-- `string`
-- Error-handling shape: `throw` (default) throws `ApiError` on a non-2xx response.
-  `result` returns a discriminated `{ data, error, response }` object instead, with `error` typed from the spec's 4xx/5xx response bodies.
-
----
-
-- `--base-url`
-- `string`
-- Override the `BASE` URL inlined into the generated runtime.
-  Defaults to `servers[0].url` from the description. Must be a valid URL.
-
----
+`<input>` is a file path, a URL, or an [`apis:` alias](../configuration/index.md) from `redocly.yaml`.
 
-- `--setup`
-- `string`
-- Path to a publisher setup module (`export default defineClientSetup({ config, middleware })`) baked into the generated client, so a published SDK ships its request/response defaults built in. Works across all output modes and both facades. See [Bake defaults into a published SDK](#bake-defaults-into-a-published-sdk---setup).
-
----
-
-- `--config`
-- `string`
-- Path to the `redocly.yaml` configuration file (where the `x-client-generator` block lives).
-  Defaults to the `redocly.yaml` discovered in the working directory.
+## Options
 
-{% /table %}
+| Option | Type | Description |
+| --- | --- | --- |
+| `input` | `string` | **REQUIRED.** OpenAPI description file path, URL, or an `apis:` alias from `redocly.yaml`. |
+| `--output`, `-o` | `string` | **REQUIRED.** Output path; must end in `.ts`. In multi-file modes it's the entry file. |
+| `--output-mode` | `string` | File layout: `single` (default), `split` (endpoints/schemas/runtime in sibling files), `tags` (one endpoints file per tag), or `tags-split` (a folder per tag). |
+| `--generators` | `string` | Comma-separated generators to run (default `sdk`). See [Generators](#generators). |
+| `--facade` | `string` | Operation shape: `functions` (default, standalone functions) or `service-class` (methods on a `Client` class). |
+| `--name` | `string` | Class name for the `service-class` facade in `single`/`split` layouts. Default `Client`. |
+| `--args-style` | `string` | Operation inputs: `flat` (default, positional) or `grouped` (a single `vars` object). See [Argument style](#argument-style). |
+| `--enum-style` | `string` | Named string enums: `const-object` (default, `as const` object + union) or `union` (union only). |
+| `--error-mode` | `string` | `throw` (default, throws `ApiError`) or `result` (returns `{ data, error, response }`). See [Error handling](#error-handling). |
+| `--date-type` | `string` | `date`/`date-time` fields as `string` (default) or `Date` (pair with the `transformers` generator). |
+| `--query-framework` | `string` | TanStack Query adapter: `react` (default), `vue`, `svelte`, or `solid`. |
+| `--mock-data` | `string` | `mock` generator data: `baked` (default, deterministic literals) or `faker` (`@faker-js/faker` calls). |
+| `--mock-seed` | `number` | Seed for `faker`-mode mocks, for reproducible data. Ignored in `baked` mode. |
+| `--base-url` | `string` | Override the base URL inlined into the runtime. Defaults to `servers[0].url`. Accepts absolute (`https://api.example.com`) or relative (`/v1`). |
+| `--setup` | `string` | Path to a publisher setup module baked into the client. See [Publisher defaults](#publisher-defaults). |
+| `--config` | `string` | Path to the `redocly.yaml` holding the `x-client-generator` block. Defaults to the one in the working directory. |
 
 ## Configuration
 
-Instead of passing flags every time, you can put the settings in your `redocly.yaml` under an `x-client-generator` block.
-`generate-client` reads it automatically — from a `redocly.yaml` in the working directory, or one pointed to by the standard `--config` flag:
+Instead of passing flags every time, put the settings in `redocly.yaml` under an `x-client-generator` block.
+`generate-client` reads it automatically (relative `input`/`output` resolve against the config file's directory):
 
 ```yaml
 # redocly.yaml
@@ -172,344 +62,113 @@ x-client-generator:
   facade: service-class
 ```
 
-Then run:
-
-```sh
-redocly generate-client
-```
-
-Relative `input`/`output` are resolved against the `redocly.yaml` directory, so the command works the same from any working directory.
-Point at a `redocly.yaml` elsewhere with the standard `--config` flag:
-
 ```sh
+redocly generate-client                          # uses redocly.yaml in the cwd
 redocly generate-client --config ./config/redocly.yaml
 ```
 
-**Precedence** (lowest to highest): the `redocly.yaml` `x-client-generator` block → individual CLI flags.
-Each layer overrides per setting, so you can keep a base config and override one value on the command line.
-For code-level control — including registering custom generators inline — use the programmatic API instead (see [Custom generators](#custom-generators)).
+For code-level control — including registering [custom generators](#custom-generators) inline — use the programmatic `generateClient(...)` API.
 
-## Examples
+## Generators
 
-Generate a single-file client (the default):
+`--generators` selects what to emit (default `sdk`). Each non-`sdk` generator adds a **standalone sibling module** next to the client; the client itself never imports it, so it stays dependency-free. Incompatible selections fail fast with an explanation.
 
-```sh
-redocly generate-client openapi.yaml --output src/client.ts
-```
-
-Split the output across files, one endpoints file per tag:
-
-```sh
-redocly generate-client openapi.yaml --output src/client.ts --output-mode tags
-```
-
-Emit a class-based client and override the base URL for a staging environment:
+| Generator | Emits | App peer dependency |
+| --- | --- | --- |
+| `sdk` | The typed client (default). | none |
+| `zod` | `<output>.zod.ts` — [Zod](https://zod.dev) schemas. | `zod` `^3.23 \|\| ^4` |
+| `tanstack-query` | `<output>.tanstack.ts` — [TanStack Query](https://tanstack.com/query) v5 factories. | `@tanstack/<framework>-query` `^5` |
+| `swr` | `<output>.swr.ts` — [SWR](https://swr.vercel.app) hooks. | `swr` `^2` |
+| `mock` | `<output>.mocks.ts` — [MSW](https://mswjs.io) v2 handlers + `create<Schema>` factories. | `msw` `^2` (+ `@faker-js/faker` for `--mock-data faker`) |
+| `transformers` | `<output>.transformers.ts` — `transform<Name>` functions that parse wire dates to `Date`. | none |
 
 ```sh
-redocly generate-client openapi.yaml \
-  --output src/client.ts \
-  --facade service-class \
-  --name CafeClient \
-  --base-url https://staging.cafe.cloud.redocly.com
+redocly generate-client openapi.yaml --output src/client.ts --generators sdk,zod,mock
 ```
 
-Once generated, import and call operations directly:
-
-```ts
-import { configure, listMenuItems, getOrderById, setBearer } from './client.ts';
-
-setBearer(token); // auth helpers are generated from the spec's securitySchemes
-
-const menu = await listMenuItems({ limit: 10 });
-const order = await getOrderById('ord_01khr487f7qm7p44xn427m43vb');
-```
+`tanstack-query` and `swr` wrap the **throw-mode** `sdk` functions, so they require `--facade functions` and `--error-mode throw`. `transformers` requires `--date-type Date`. See the [`zod`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/zod), [`tanstack-query`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/tanstack-query), and [`mock`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/mock) examples.
 
 ## Authentication
 
 A setter is generated for each `securityScheme` the runtime can apply, and each operation automatically sends the credentials its `security` requires:
 
-| Scheme                 | Generated setter                          | Applied as                      |
-| ---------------------- | ----------------------------------------- | ------------------------------- |
-| HTTP `bearer` / OAuth2 | `setBearer(token)`                        | `Authorization: Bearer <token>` |
-| HTTP `basic`           | `setBasicAuth(username, password)`        | `Authorization: Basic <base64>` |
-| `apiKey` in header     | `setApiKey(key)` / `setApiKey<Name>(key)` | the named request header        |
-| `apiKey` in query      | `setApiKey(key)` / `setApiKey<Name>(key)` | the named URL query parameter   |
-| `apiKey` in cookie     | `setApiKey(key)` / `setApiKey<Name>(key)` | folded into the `Cookie` header |
-
-`setApiKey` is unsuffixed when the spec declares a single apiKey scheme.
-Otherwise, each gets a `setApiKey<SchemeName>` setter.
-`mutualTLS` is not injectable.
+| Scheme | Setter | Applied as |
+| --- | --- | --- |
+| HTTP `bearer` / OAuth2 | `setBearer(token)` | `Authorization: Bearer <token>` |
+| HTTP `basic` | `setBasicAuth(user, pass)` | `Authorization: Basic <base64>` |
+| `apiKey` (header/query/cookie) | `setApiKey(key)` / `setApiKey<Name>(key)` | the named header, query param, or cookie |
 
-Bearer and apiKey credentials accept a **`TokenProvider`** — a string, or a (possibly async) function called per request, which is handy for refresh-token flows:
+`setApiKey` is unsuffixed for a single apiKey scheme; otherwise each gets `setApiKey<SchemeName>`. `mutualTLS` is not injectable. Bearer and apiKey setters accept a **`TokenProvider`** — a string or a (possibly async) function called per request, handy for refresh flows:
 
 ```ts
-import { setBearer, setBasicAuth, setApiKey } from './client.ts';
+import { setBearer } from './client.ts';
 
-setBearer('static-token'); // a literal value
-setBearer(async () => await getFreshAccessToken()); // resolved before each authed call
-setBasicAuth('alice', 's3cr3t'); // encoded as `Authorization: Basic <base64>`
-setApiKey('my-api-key'); // header / query / cookie, per the scheme's `in`
+setBearer(async () => await getFreshAccessToken());
 ```
 
-### Per-instance credentials (service-class facade)
-
-The setters above are **module-global** — every call shares them.
-When you run multiple independent clients (the reason to choose `--facade service-class`), give each instance its own credentials via `ClientConfig.auth`.
-It overrides the global setters for that instance and still honors each operation's declared `security`; omitted fields fall back to the global slots.
+These setters are **module-global**. With `--facade service-class`, give each instance its own credentials via `ClientConfig.auth` (it overrides the global setters for that instance):
 
 ```ts
-import { Client } from './client.ts';
-
-// Two instances of the same client, different credentials — no shared global state.
 const internal = new Client({ auth: { basic: { username: 'svc', password: 's3cr3t' } } });
 const publicApi = new Client(); // no auth
-
-// `auth` mirrors the schemes the spec declares:
-//   { bearer?: TokenProvider; basic?: { username; password }; apiKey?: Record<string, TokenProvider> }
-const withToken = new Client({ auth: { bearer: async () => getAccessToken() } });
 ```
 
-The functions facade can set the same field once globally via `configure({ auth: … })`.
-
 ## Argument style
 
-By default each operation takes **positional arguments** — path params in URL order, then `params` (query), `body`, and `headers` slots, with the per-call request `init` last:
+By default (`--args-style flat`) each operation takes positional arguments — path params in URL order, then `params` (query), `body`, and `headers` — with the per-call `init` last. With `--args-style grouped`, every input is bundled into one `vars` object typed as the operation's `<Op>Variables`:
 
 ```ts
-// --args-style flat (default)
-const order = await updateOrder(
-  'ord_01khr487f7qm7p44xn427m43vb', // orderId path param
-  { ...orderBody } // request body
-);
-```
-
-With `--args-style grouped`, every input is bundled into a single `vars` object typed as the operation's exported `<Op>Variables` type.
-The `init` argument stays separate:
+// flat (default)
+await updateOrder('ord_01khr…', { ...orderBody });
 
-```ts
-// --args-style grouped
-const order = await updateOrder({
-  orderId: 'ord_01khr487f7qm7p44xn427m43vb',
-  body: { ...orderBody },
-});
-```
-
-The grouped style is order-independent and additive — new path or query params show up as new keys rather than shifting positions.
-This strategy makes it a good fit as specs evolve and for wiring operations into React Query / SWR `mutationFn`s.
-Operations with no inputs take no `vars` object at all (just the optional `init`).
-
-```sh
-redocly generate-client openapi.yaml --output src/client.ts --args-style grouped
-```
-
-## Query serialization
-
-Query parameters are serialized per their OpenAPI `style` / `explode` / `allowReserved` declarations.
-The default — `style: form` with `explode: true` — repeats array values (`tags=a&tags=b`) and is what you get when you declare nothing.
-The other supported forms:
-
-| `style`          | `explode` | Array `['a', 'b']` on the wire |
-| ---------------- | --------- | ------------------------------ |
-| `form` (default) | `true`    | `key=a&key=b`                  |
-| `form`           | `false`   | `key=a,b`                      |
-| `spaceDelimited` | `false`   | `key=a%20b`                    |
-| `pipeDelimited`  | `false`   | `key=a\|b`                     |
-
-Delimiters are emitted literally (the individual values are still percent-encoded).
-`allowReserved: true` leaves the RFC-3986 reserved set (`:/?#[]@!$&'()*+,;=`) un-encoded in a value, so e.g. `filter=a/b` survives instead of `filter=a%2Fb`.
-Declare these on the parameter object in the spec:
-
-```yaml
-- name: tags
-  in: query
-  style: pipeDelimited
-  explode: false
-  schema:
-    type: array
-    items:
-      type: string
+// grouped — order-independent, a good fit for React Query / SWR mutationFns
+await updateOrder({ orderId: 'ord_01khr…', body: { ...orderBody } });
 ```
 
-Object-valued query params serialize as `deepObject` brackets (`key[sub]=val`).
-
-{% admonition type="info" name="Note" %}
-An object param at the default `form` style is also emitted as `key[sub]=val` brackets rather than the spec's `sub=val` spread.
-{% /admonition %}
-
 ## Error handling
 
-By default (`--error-mode throw`) an operation throws an `ApiError` on any non-2xx response, so a call returns the success body directly:
+By default (`--error-mode throw`) an operation throws `ApiError` on any non-2xx response and returns the success body directly. With `--error-mode result` it never throws for HTTP errors, returning a discriminated `Result<TData, TError>` whose `error` is typed from the spec's 4xx/5xx bodies:
 
 ```ts
+// throw (default)
 try {
-  const order = await getOrderById('ord_01khr487f7qm7p44xn427m43vb');
+  const order = await getOrderById('ord_123');
 } catch (err) {
   if (err instanceof ApiError) console.error(err.status, err.body);
 }
-```
 
-With `--error-mode result`, an operation never throws on a non-2xx response.
-Instead it returns a discriminated `Result<TData, TError>` — `{ data, error, response }` — whose `error` is typed from the spec's declared 4xx/5xx response bodies (the `<Op>Error` union).
-On success `error` is `undefined`; on a non-2xx response `data` is `undefined` and `error` holds the typed body.
-`response` is always the raw `Response`, so the HTTP status is `response.status`:
-
-```ts
-// --error-mode result
-const { data, error, response } = await getThing('thing_123');
-if (error) {
-  // `error` is typed (e.g. ProblemDetails); narrow on the status if needed.
-  console.error(response.status, error.title);
-} else {
-  console.log(data.id); // `data` is the success body
-}
-```
-
-Transport-level and abort failures still throw in both modes; the `onError` hook applies to `throw` mode only.
-The choice is made once at generate time for the whole client.
-
-```sh
-redocly generate-client openapi.yaml --output src/client.ts --error-mode result
+// result
+const { data, error, response } = await getOrderById('ord_123');
+if (error) console.error(response.status, error.title);
+else console.log(data.id);
 ```
 
-## Operation metadata
-
-Alongside the operations, the client exports an `OPERATIONS` map keyed by operationId, holding each operation's HTTP method, path template (with `{param}` placeholders intact), and tags:
-
-```ts
-export const OPERATIONS = {
-  listMenuItems: { method: 'GET', path: '/menu', tags: ['Products'] },
-  getOrderById: { method: 'GET', path: '/orders/{orderId}', tags: ['Orders'] },
-  // …
-} as const;
-
-export type OperationId = keyof typeof OPERATIONS;
-export type OperationPath = (typeof OPERATIONS)[OperationId]['path'];
-export type OperationTag = (typeof OPERATIONS)[OperationId]['tags'][number];
-export type OperationMetadata = {
-  readonly method: string;
-  readonly path: string;
-  readonly tags: readonly string[];
-};
-```
-
-These same `OperationId` / `OperationPath` / `OperationTag` unions type `ctx.operation` in middleware (above), so you get autocomplete and typo-checking there too.
-
-Because the keys and values are plain string literals — not function or method names — they survive bundling and minification.
-That makes `OPERATIONS` the stable handle to reach for when building cache/query keys, tracing span names, or request log labels, instead of reflecting over a function (`fn.name` / `fn.toString()`), which a minifier can rename:
-
-```ts
-import { OPERATIONS, getOrderById } from './client.ts';
-
-// Stable React Query key, robust under minification.
-const queryKey = [OPERATIONS.getOrderById.path, orderId];
-const order = await getOrderById(orderId);
-```
-
-The map is emitted for both facades (`functions` and `service-class`) and, in the multi-file output modes, lives once in the shared schemas module and is re-exported from the entry barrel.
-
-## Discriminated unions
-
-A `oneOf` / `anyOf` with a usable discriminator gets an exported `is<Member>` type guard per member, narrowing the union to that member's named type.
-The discriminator is taken from the spec's `discriminator` block, or inferred when every member is a named schema that pins one shared property to a distinct string `const`.
-
-```ts
-export type MenuItem = Beverage | Dessert;
-
-export function isBeverage(value: MenuItem): value is Beverage { … }
-export function isDessert(value: MenuItem): value is Dessert { … }
-```
-
-Guards are also emitted when the union is **nested** inside another schema — e.g. the `items` of an array, or a property value — as long as every member is a named schema.
-The guard's parameter is then the inline member union:
-
-```ts
-// `BulkResult = (BulkSuccessItem | BulkErrorItem)[]` — a discriminated array.
-export function isBulkSuccessItem(
-  value: BulkSuccessItem | BulkErrorItem
-): value is BulkSuccessItem { … }
-
-// Narrow each item without hand-writing the discriminant check:
-const created = result.flatMap((item) => (isBulkSuccessItem(item) ? [item.resource] : []));
-```
-
-{% admonition type="info" name="Note" %}
-Each `is<Member>` is emitted once, even when the same member appears in several unions (the first occurrence in document order wins).
-A union without a usable discriminator gets no guard — TypeScript can't soundly narrow it.
-{% /admonition %}
+Transport and abort failures still throw in both modes. The choice is fixed at generate time.
 
 ## Middleware
 
-Beyond the single `onRequest` / `onResponse` / `onError` hooks on `ClientConfig`, the client takes **composable middleware** — the escape hatch for cross-cutting concerns like auth-token refresh, logging, tracing, or request IDs.
-A middleware is an object with any subset of the three hooks:
+Beyond the single `onRequest`/`onResponse`/`onError` hooks on `ClientConfig`, the client takes **composable middleware** for cross-cutting concerns (auth refresh, logging, tracing, request IDs). Register with `use()` (functions facade) or `<Client>.use()` (service-class); both accept several at once:
 
 ```ts
-type Middleware = {
-  onRequest?: (ctx: RequestContext) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext
-  ) => Response | void | Promise<Response | void>;
-  onError?: (error: ApiError, ctx: RequestContext) => Error | Promise<Error>; // throw mode
-};
-```
-
-Register with `use()` (functions facade) or `<Client>.use()` (service-class facade); both accept several at once and can be called repeatedly:
-
-```ts
-// functions facade
-import { use, configure } from './client.ts';
-use(
-  {
-    onRequest: (ctx) => {
-      ctx.headers['X-Request-Id'] = crypto.randomUUID();
-    },
-  },
-  {
-    onResponse: (res) => {
-      console.debug(res.status);
-    },
-  }
-);
-
-// service-class facade
-const client = new Client({ middleware: [authRefresh] }); // declaratively…
-client.use(logging); // …or imperatively (chainable)
-```
-
-`onRequest` runs in registration order; `onResponse` runs in **reverse** — an onion, so the last-registered middleware wraps closest to the network.
-`onError` (throw mode only) is threaded through each middleware in turn, so any can map the failure.
-`onRequest` may mutate the request context (`url` / `method` / `headers` / `body` — body edits are serialized and sent); `onResponse` may return a replacement `Response`.
+import { use } from './client.ts';
 
-Each `RequestContext` also carries `operation: { id, path, tags }` — the operationId, path template, and tags — so middleware can **target by operation identity** instead of brittle URL matching. All three are typed literal unions (`OperationId` / `OperationPath` / `OperationTag`), so the comparisons below autocomplete and reject typos at compile time:
-
-```ts
 use({
   onRequest: (ctx) => {
-    if (ctx.operation.id === 'createOrder' || ctx.operation.tags.includes('Orders')) {
+    // ctx.operation is { id, path, tags } — target by identity, not URL matching
+    if (ctx.operation.tags.includes('Orders')) {
       ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
-      (ctx.body as { source?: string }).source = 'web'; // mutate the body in flight
     }
   },
 });
 ```
 
-A header for a single call instead goes in that operation's trailing `RequestOptions` argument (`await listMenuItems({}, { headers: { 'X-Request-Id': '42' } })`).
-See the [`customization` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/customization) for a runnable end-to-end version.
-
-`onRequest` and `onResponse` run for every request — under both `throw` and `result` error modes, and around each Server-Sent-Events connect/reconnect.
-`onError` only fires when a non-2xx response would be **thrown**, so it is a no-op in `result` mode (inspect `result.error` instead) and for SSE (which throws its own `ApiError`).
-Transport/network failures are not routed through `onError`.
-
-{% admonition type="info" name="Relation to the single hooks" %}
-The `onRequest` / `onResponse` / `onError` fields on `ClientConfig` still work — they run as one implicit, first middleware.
-`use()` simply appends to the same chain (`ClientConfig.middleware`), so existing code is unaffected.
-{% /admonition %}
+`onRequest` runs in registration order; `onResponse` runs in reverse (onion). `onRequest` may mutate `ctx` (`url`/`method`/`headers`/`body` — body edits are serialized and sent); `onResponse` may return a replacement `Response`. `onError` (throw mode only) is threaded through each middleware. `ctx.operation`'s fields are typed literal unions (`OperationId`/`OperationPath`/`OperationTag`) for autocomplete and typo-checking. A single call's header instead goes in that operation's trailing `init` argument.
 
-## Bake defaults into a published SDK (`--setup`)
+See the [`customization` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/customization) for a runnable version.
 
-The middleware above is composed by the **consumer**. If you **publish an SDK** and want those defaults already active for _your_ users, bake them in at generation time with `--setup <file>`.
+## Publisher defaults
 
-The setup module imports its contract from `@redocly/client-generator` (so it resolves and is unit-testable before the client is generated) and returns a `defineClientSetup({ config, middleware })`:
+The middleware above is composed by the **consumer**. If you **publish an SDK**, bake defaults in at generation time with `--setup <file>`. The setup module imports its contract from `@redocly/client-generator` (so it resolves and is unit-testable) and default-exports `defineClientSetup({ config, middleware })`:
 
 ```ts
 // client-setup.ts
@@ -517,15 +176,7 @@ import { defineClientSetup, type RequestContext } from '@redocly/client-generato
 
 export default defineClientSetup({
   config: { baseUrl: 'https://api.acme.com', retry: { retries: 3 } },
-  middleware: [
-    {
-      onRequest: (ctx: RequestContext) => {
-        ctx.headers['X-Acme-SDK'] = '1.4.0';
-        if (ctx.operation.tags.includes('Orders'))
-          ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
-      },
-    },
-  ],
+  middleware: [{ onRequest: (ctx: RequestContext) => { ctx.headers['X-Acme-SDK'] = '1.4.0'; } }],
 });
 ```
 
@@ -533,410 +184,119 @@ export default defineClientSetup({
 redocly generate-client openapi.yaml --output src/api/client.ts --setup ./client-setup.ts
 ```
 
-The generator bakes the `config`/`middleware` into the generated client, so the published package applies them on import. It works across **all output modes and both facades** (functions: the global `configure`/`use`; service-class: `new Client()` merges the baked defaults). Downstream users call operations with no setup of their own and can still customize on top — the baked block runs first, then theirs:
-
-- **Config values** (`fetch`/transport, `baseUrl`, `headers`, `retry`, single hooks) are last-write-wins, so a consumer **overrides** the baked default — a consumer `config.fetch` _replaces_ a baked transport rather than wrapping it.
-- **Middleware** (`use`) **composes** — baked middleware runs first, then the consumer's (`onRequest` in order, `onResponse` reversed). A publisher who needs un-bypassable behavior should express it as middleware, not a baked `fetch`.
-
-{% admonition type="warning" name="Constraints" %}
-A setup file may import **only** from `@redocly/client-generator`, keeping the client zero-dependency.
-{% /admonition %}
-
-See the [`baked-setup` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/baked-setup) and ADR-0015.
+The baked block runs before the consumer's own setup. **Config values** are last-write-wins (a consumer overrides a baked default), while **middleware composes** (baked first, then the consumer's). Express un-bypassable behavior as middleware, not a baked `fetch`. A setup file may import **only** from `@redocly/client-generator`. See the [`baked-setup` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/baked-setup).
 
 ## Retries
 
-The generated client can retry transient failures.
-Retry is **opt-in** and configured through `ClientConfig`, with an optional per-call override.
+Retry is **opt-in**, configured through `ClientConfig` with an optional per-call override:
 
 ```ts
-// Global policy (functions facade)
-configure({ retry: { retries: 3 } });
+configure({ retry: { retries: 3 } });                          // global (functions facade)
+const client = new Client({ retry: { retries: 3 } });          // per instance (service-class)
+await getOrderById('ord_123', {}, { retry: { retries: 5 } });  // per call
+```
 
-// Per instance (service-class facade)
-const client = new Client({ retry: { retries: 3 } });
+By default only **idempotent** methods (`GET`, `HEAD`, `PUT`, `DELETE`, `OPTIONS`) are retried, on a network error or a transient status (`408`, `429`, `500`, `502`, `503`, `504`). `POST`/`PATCH` are not, since re-sending can duplicate side effects — opt in with a custom `retryOn` when safe. Backoff is exponential with full jitter (`retryStrategy: 'fixed'` for a constant delay); a `Retry-After` header takes precedence; an aborted `AbortSignal` stops retries immediately.
 
-// Per call — opt in where there is no global policy
-await getOrderById('ord_01khr487f7qm7p44xn427m43vb', {}, { retry: { retries: 5 } });
+| `RetryConfig` field | Type | Default |
+| --- | --- | --- |
+| `retries` | `number` | `0` (extra attempts after the first; `0` disables) |
+| `retryDelay` | `number` | `1000` (base delay, ms) |
+| `retryStrategy` | `'fixed' \| 'exponential'` | `'exponential'` |
+| `jitter` | `boolean` | `true` |
+| `retryOn` | `(ctx: RetryContext) => boolean \| Promise<boolean>` | idempotent-only predicate |
 
-// Per call — opt out where a global policy is set
-await listMenuItems({ limit: 10 }, { retry: { retries: 0 } });
-```
-
-By default only **idempotent** methods (`GET`, `HEAD`, `PUT`, `DELETE`, `OPTIONS`) are retried, on a network error or a transient status (`408`, `429`, `500`, `502`, `503`, `504`).
-`POST`/`PATCH` are **not** retried automatically, because re-sending a non-idempotent request can duplicate side effects.
-Opt in explicitly when your API is safe (e.g. it uses idempotency keys):
+A custom `retryOn` receives the failed attempt's `RetryContext` (`attempt`, `request`, and exactly one of `response` / `error`) and **fully replaces** the default. To inspect a response body, read `ctx.response.clone()` — the body is a single-use stream:
 
 ```ts
-await createOrder(body, { retry: { retries: 3, retryOn: () => true } });
+await createOrder(body, {
+  retry: {
+    retries: 3,
+    retryOn: async (ctx) => {
+      if (ctx.error) return true;                 // transport error
+      return (ctx.response?.status ?? 0) >= 500;  // server error
+    },
+  },
+});
 ```
 
-Backoff is exponential with full jitter (`retryStrategy: 'fixed'` for a constant delay).
-A `Retry-After` response header takes precedence over the computed delay.
-Retries stop immediately when the request's `AbortSignal` aborts.
-
-### `RetryConfig` fields
-
-{% table %}
-
-- Field {% width="20%" %}
-- Type {% width="25%" %}
-- Description
-
----
-
-- `retries`
-- `number`
-- Number of _extra_ attempts after the first. Default `0` (opt-in; `0` disables retry).
-
----
-
-- `retryDelay`
-- `number`
-- Base delay in milliseconds. Default `1000`.
-
----
-
-- `retryStrategy`
-- `'fixed' | 'exponential'`
-- Backoff shape. Default `'exponential'`.
-
----
-
-- `jitter`
-- `boolean`
-- Apply full jitter over the computed delay. Default `true`.
-
----
-
-- `retryOn`
-- `(ctx: RetryContext) => boolean | Promise<boolean>`
-- Decide whether to retry a failed attempt. Defaults to the idempotent-only predicate described above.
-
-{% /table %}
-
-A per-call override is merged field-by-field over the global policy.
-A single field (such as `retries: 0`) can disable retry for one call without restating the whole policy.
-
-### Custom `retryOn`
-
-`retryOn` receives a `RetryContext` for the attempt that just failed and returns whether to retry.
-A custom predicate **fully replaces** the idempotent-only default.
-This way you opt a `POST`/`PATCH` into retrying (the method is no longer checked for you).
-
-{% table %}
-
-- Field {% width="20%" %}
-- Type {% width="25%" %}
-- Description
-
----
-
-- `attempt`
-- `number`
-- 1-based number of the attempt that just failed.
-
----
-
-- `request`
-- `RequestContext`
-- The attempted request: `{ url, method, headers, body }`.
-
----
-
-- `response`
-- `Response | undefined`
-- Present when the server returned a (non-ok) response.
-  Absent on a transport error.
-
----
-
-- `error`
-- `unknown`
-- Present when the transport threw (network error, DNS, connection reset).
-  Absent on an HTTP response.
-
-{% /table %}
+## Query serialization
 
-Exactly one of `response` / `error` is set: branch on `ctx.error` for transport failures and `ctx.response` for HTTP status codes.
-To inspect the **response body**, clone it first — the body is a single-use stream, and reading it directly would leave nothing for the client to parse:
+Query parameters follow their OpenAPI `style` / `explode` / `allowReserved`. The default (`form`, `explode: true`) repeats array values:
 
-```ts
-await pushRemoteContent(
-  { orgId, projectId, body: formData },
-  {
-    retry: {
-      retries: 5,
-      retryDelay: 1000,
-      retryStrategy: 'exponential',
-      retryOn: async (ctx) => {
-        if (ctx.error) return true; // network / connection error — retry
-        const res = ctx.response;
-        if (!res) return false;
-        if (res.status >= 500) return true;
-        // Body inspection: clone() so the original stream stays readable downstream.
-        const body = await res
-          .clone()
-          .json()
-          .catch(() => undefined);
-        return body?.title === 'Multipart: Unexpected end of form';
-      },
-    },
-  }
-);
-```
+| `style` | `explode` | `['a', 'b']` on the wire |
+| --- | --- | --- |
+| `form` (default) | `true` | `key=a&key=b` |
+| `form` | `false` | `key=a,b` |
+| `spaceDelimited` | `false` | `key=a%20b` |
+| `pipeDelimited` | `false` | `key=a\|b` |
 
-{% admonition type="warning" name="Read the body via clone()" %}
-`ctx.response` is the raw `Response` — its body can be read only once.
-Always inspect it through `ctx.response.clone()`.
-Calling `.json()`/`.text()` on `ctx.response` directly consumes the stream and the client can no longer decode the result.
-{% /admonition %}
+Delimiters are literal (values are still percent-encoded). `allowReserved: true` leaves the RFC-3986 reserved set un-encoded. Object-valued params serialize as `deepObject` brackets (`key[sub]=val`).
 
 ## Multipart uploads
 
-A `multipart/form-data` request body whose schema is an **object** is generated as a typed object.
-When you pass a plain object, the client serializes it to `FormData` for you.
-Binary fields (`type: string, format: binary`) are typed as `Blob` (a `File` is assignable):
+A `multipart/form-data` body whose schema is an **object** is generated as a typed object; pass a plain object and the client serializes it to `FormData` (after the `onRequest` chain, so middleware can mutate it). Binary fields (`format: binary`) are typed as `Blob`:
 
 ```ts
 // type UploadBody = { file: Blob; orgId: string; tags?: string[] };
 await upload({ file, orgId: 'org_1', tags: ['a', 'b'] });
 ```
 
-Serialization rules:
-
-- `Blob`/`File` and strings pass through
-- arrays append one field per item
-- nested objects are JSON-encoded
-- other scalars are stringified
-- `undefined`/`null` are skipped
-
-A multipart body whose schema **isn't** a concrete object keeps the raw `FormData` type.
-You can build the form yourself when the shape can't be expressed.
-
-`format: binary` surfaces as `Blob` wherever it appears; `format: byte` (base64) stays a `string`.
+`Blob`/strings pass through, arrays append one field per item, nested objects are JSON-encoded, `undefined`/`null` are skipped. A multipart body whose schema isn't a concrete object keeps the raw `FormData` type. `format: byte` (base64) stays a `string`.
 
 ## Response decoding
 
-By default the client reads each response body by negotiating from its `Content-Type` (JSON, then `text/*`, then `Blob`).
-The per-call request `init` accepts a `parseAs` option to force a specific reader:
-
-```ts
-// Read the raw bytes as a stream instead of decoding JSON.
-const res = await getMenuItemPhoto('prd_01khr487f7qm7p44xn427m43vb', { parseAs: 'stream' });
-for await (const chunk of res as ReadableStream<Uint8Array>) {
-  // …consume the stream…
-}
-```
-
-`parseAs` accepts `'json'`, `'text'`, `'blob'`, `'arrayBuffer'`, `'formData'`, `'stream'` (the raw `ReadableStream` from `response.body`), or `'auto'` (the default content-type sniff).
-
-{% admonition type="warning" name="Runtime override only" %}
-`parseAs` does not change the operation's static return type.
-Forcing a reader that disagrees with the schema (for example `'blob'` on a JSON endpoint) returns that value at runtime while TypeScript still reports the declared type.
-Reconciling the two is the caller's responsibility.
-{% /admonition %}
-
-## Runtime validation with Zod
-
-Pass `--generators sdk,zod` to additionally emit a standalone `<output>.zod.ts` module of [Zod](https://zod.dev) schemas — one `export const <Name>Schema` per schema in the description:
-
-```sh
-redocly generate-client openapi.yaml --output src/client.ts --generators sdk,zod
-# → src/client.ts (the zero-dependency client) + src/client.zod.ts (the Zod schemas)
-```
-
-The generated **client stays dependency-free** and never imports Zod.
-The `*.zod.ts` module is the only file that imports Zod, so install it in your app as a peer:
-
-```sh
-npm install zod   # any zod ^3.23 || ^4
-```
-
-Validate a payload with `.parse()` (or `.safeParse()`), and derive the static type from the same schema with `z.infer` — it matches the client's exported type:
+The client reads each response by negotiating from its `Content-Type` (JSON, then `text/*`, then `Blob`). Force a reader per call with `parseAs`:
 
 ```ts
-import { z } from 'zod';
-import type { Pet } from './client.ts';
-import { PetSchema } from './client.zod.ts';
-
-const pet = PetSchema.parse(await res.json()); // throws on invalid input
-type PetFromSchema = z.infer<typeof PetSchema>; // structurally equal to `Pet`
-const typed: Pet = pet;
+const res = await getMenuItemPhoto('prd_123', { parseAs: 'stream' });
 ```
 
-Each schema maps the OpenAPI structure plus the validation refinements that are stable across Zod 3.23 and 4 — string/array length (`.min`/`.max`), numeric bounds (`.min`/`.max`/`.gt`/`.lt`), `.int`, and `.regex`.
-Refs become `z.lazy(() => …)`, so recursive and forward-referencing schemas validate correctly.
-Format-specific helpers (`.email`/`.uuid`/`.url`) are intentionally not emitted, since they diverge between Zod 3 and 4.
-
-## TanStack Query
+`parseAs` accepts `'json'`, `'text'`, `'blob'`, `'arrayBuffer'`, `'formData'`, `'stream'`, or `'auto'` (default). It changes the runtime reader only, not the static return type.
 
-Pass `--generators sdk,tanstack-query` to additionally emit a standalone `<output>.tanstack.ts` module of [TanStack Query](https://tanstack.com/query) v5 factories that wrap the sdk operations:
-
-```sh
-redocly generate-client openapi.yaml --output src/client.ts --generators sdk,tanstack-query
-# → src/client.ts (the zero-dependency client) + src/client.tanstack.ts (the TanStack Query factories)
-
-# Vue / Svelte / Solid: only the import specifier changes
-redocly generate-client openapi.yaml --output src/client.ts \
-  --generators sdk,tanstack-query --query-framework vue
-```
-
-Per **query** operation (`GET`/`HEAD`) the module exports a `<op>QueryKey(vars)` and a `<op>Options(vars, init?)` factory that returns `queryOptions({ queryKey, queryFn })`.
-Per **mutation** (every other method), it exports a `<op>Mutation()` factory returning `{ mutationKey, mutationFn }`.
-Each factory forwards to the matching sdk function, so the generated client itself stays dependency-free.
+## Operation metadata
 
-Compose them with `useQuery`/`useMutation`:
+The client exports an `OPERATIONS` map keyed by operationId, holding each operation's `method`, `path` template, and `tags`:
 
 ```ts
-import { useQuery, useMutation } from '@tanstack/react-query';
-import { getPetOptions, createPetMutation } from './client.tanstack.ts';
-
-function Pet({ id }: { id: string }) {
-  const { data } = useQuery(getPetOptions({ id }));
-  const { mutate } = useMutation(createPetMutation());
+export const OPERATIONS = {
+  getOrderById: { method: 'GET', path: '/orders/{orderId}', tags: ['Orders'] },
   // …
-}
-```
-
-The `*.tanstack.ts` module is the only file that imports TanStack Query, so install the adapter for your framework as a peer — any `@tanstack/<framework>-query` `^5`:
-
-```sh
-npm install @tanstack/react-query   # ^5  (or @tanstack/vue-query, /svelte-query, /solid-query)
+} as const;
 ```
 
-Select the framework with `--query-framework` (`react` default, `vue`, `svelte`, `solid`).
-Only the import specifier the module reads from changes — the emitted factory module is otherwise **byte-identical** across frameworks, since TanStack Query's `queryOptions`/mutation shapes are framework-agnostic.
-
-The factories wrap the **throw-mode** sdk (the default): TanStack's `queryFn` is expected to throw on error.
-Use the default (throw-mode) client — a `--error-mode result` client would need an unwrap-and-throw shim, which is out of scope.
+Because keys and values are plain string literals, they survive bundling/minification — making `OPERATIONS` the stable handle for cache keys, span names, or log labels (rather than `fn.name`, which a minifier can rename). The same `OperationId` / `OperationPath` / `OperationTag` unions type `ctx.operation` in middleware.
 
-{% admonition type="info" name="Compatibility" %}
-`tanstack-query` wraps the sdk's exported throw-mode functions, so it requires `--generators sdk`, `--facade functions`, and `--error-mode throw`.
-An incompatible selection fails fast with an explanatory message rather than emitting a client that doesn't compile.
-
-Server-Sent-Events operations have no request/response function to wrap: you consume them via the sdk's `sse.*` surface.
-These operations they are **skipped** with a notice, and the rest of the operations are still generated.
-{% /admonition %}
-
-## SWR
-
-Pass `--generators sdk,swr` to additionally emit a standalone `<output>.swr.ts` module of [SWR](https://swr.vercel.app) hooks that wrap the sdk operations:
-
-```sh
-redocly generate-client openapi.yaml --output src/client.ts --generators sdk,swr
-# → src/client.ts (the zero-dependency client) + src/client.swr.ts (the SWR hooks)
-```
+## Discriminated unions
 
-Each **query** operation (`GET`/`HEAD`) exports a `<op>Key(vars)` tuple factory and a `use<Op>(vars, init?)` hook returning `useSWR(key, fetcher)`.
-Each **mutation** exports a `use<Op>()` hook returning `useSWRMutation(key, trigger)`.
-Call them straight from a component:
+A `oneOf` / `anyOf` with a usable discriminator gets an exported `is<Member>` type guard per member, taken from the spec's `discriminator` or inferred when every member pins a shared property to a distinct string `const`:
 
 ```ts
-import { useGetPetById, useCreatePet } from './client.swr.ts';
-
-const { data } = useGetPetById({ id });
-const { trigger } = useCreatePet();
-await trigger({ body: { name: 'Rex' } });
-```
-
-The generated client stays dependency-free.
-Only the `*.swr.ts` module imports SWR (`swr` for queries, `swr/mutation` for mutations).
-Install it in your app as a peer — any `swr` `^2`:
-
-```sh
-npm install swr   # ^2
+export type MenuItem = Beverage | Dessert;
+export function isBeverage(value: MenuItem): value is Beverage { … }
 ```
 
-{% admonition type="info" name="Compatibility" %}
-The hooks wrap the **throw-mode** sdk (the default), since SWR's fetcher is expected to throw an error.
-`swr` requires `--generators sdk`, `--facade functions`, and `--error-mode throw`.
-An incompatible selection fails fast.
-SSE operations are **skipped** with a notice (consume them via the sdk's `sse.*` surface).
-{% /admonition %}
-
-## Date transformers
-
-By default, `date-time`/`date` fields are typed as `string` (the ISO wire shape).
-Pass `--date-type Date` to type them as `Date` instead, and pair it with `--generators sdk,transformers` to emit a standalone `<output>.transformers.ts` module of `transform<Name>(data)` functions that convert those wire ISO strings to `Date` at runtime so the value matches the type:
+Guards are also emitted for unions nested inside another schema (array items, property values) as long as every member is a named schema. A union without a usable discriminator gets no guard.
 
-```sh
-redocly generate-client openapi.yaml --output src/client.ts \
-  --generators sdk,transformers --date-type Date
-# → src/client.ts (the zero-dependency client, dates typed `Date`) + src/client.transformers.ts
-```
+## Server-Sent Events
 
-Per schema that (recursively) carries a date field, the module exports a `transform<Name>(data: <Name>): <Name>` that walks the value and rewrites the date positions in place — top-level scalars, arrays of dates, records, and `$ref`s (composing `transformPet` → `transformOwner`).
-Pipe responses through it:
+An operation whose `2xx` response declares `text/event-stream` is generated as a typed async iterator under an `sse` namespace — no flag required. Each event's `data` is typed from the OpenAPI 3.2 `itemSchema` (falling back to the media `schema`, then `string`) and `JSON.parse`d when structured:
 
 ```ts
-import { getPet } from './client.ts';
-import { transformPet } from './client.transformers.ts';
-
-const pet = transformPet(await getPet(id));
-// pet.createdAt is now a Date
-```
-
-The transformers module imports only the schema **types** from the client, so the generated client itself stays dependency-free (`Date` is a web standard — no library).
-`int64` → `bigint` is deferred to a follow-up; without `--date-type Date` the date fields stay `string` and the output is byte-identical to before.
-
-{% admonition type="info" name="Compatibility" %}
-`transformers` requires `--generators sdk` and `--date-type Date`.
-`transformers` assigns `Date` values to the sdk's date fields, so it only type-checks when the sdk types them as `Date`.
-Selecting it without `--date-type Date` fails fast with an explanatory message rather than emitting a module that doesn't compile.
-{% /admonition %}
-
-## MSW mocks
-
-Pass `--generators sdk,mock` to additionally emit a standalone `<output>.mocks.ts` module of [MSW](https://mswjs.io) v2 request handlers and `create<Schema>(overrides?)` data factories:
-
-```sh
-redocly generate-client openapi.yaml --output src/client.ts --generators sdk,mock
-# → src/client.ts (the zero-dependency client) + src/client.mocks.ts (MSW handlers + factories)
-```
-
-Each handler intercepts its operation's method + path and responds with a fixture baked from the spec (prefers `example`/`default`; `format: binary` → `new Blob([])`.
-Recursive schemas terminate at the cycle with an empty array/record).
-Each `create<Schema>` factory builds the same default object and merges in any `overrides`, so factories double as test builders:
+import { sse } from './client.ts';
 
-```ts
-// test setup (Node)
-import { setupServer } from 'msw/node';
-import { handlers } from './client.mocks.ts';
-
-const server = setupServer(...handlers);
-beforeAll(() => server.listen());
-afterEach(() => server.resetHandlers());
-afterAll(() => server.close());
-
-// override a single factory for one case
-import { createMenuItem } from './client.mocks.ts';
-const special = createMenuItem({ name: 'Cold Brew', price: 499 });
+for await (const ev of sse.streamMessages()) {
+  console.log(ev.id, ev.data.text); // ServerSentEvent<T>: { event?, data, id?, retry? }
+}
 ```
 
-By default mock data is **baked** — deterministic literals inlined from the spec, with no extra runtime dependency.
-Pass `--mock-data faker` to emit [`@faker-js/faker`](https://fakerjs.dev) calls for realistic data, and `--mock-seed <n>` to pin faker's PRNG so the data is reproducible:
-
-```sh
-redocly generate-client openapi.yaml --output src/client.ts \
-  --generators sdk,mock --mock-data faker --mock-seed 42
-```
-
-{% admonition type="info" name="Compatibility" %}
-`mock` requires `--generators sdk` (the factories reference its types).
-Install MSW in your app as a dev dependency (`msw` `^2`).
-For `--mock-data faker`, also install `@faker-js/faker`.
-The generated client itself stays dependency-free — only the `*.mocks.ts` module imports them.
-{% /admonition %}
+The stream **auto-reconnects** on a dropped connection, resuming from the last event id via `Last-Event-ID` (backoff honors the server's `retry:`, then `reconnectDelay`, then 1s; capped at 30s). Tune per call with `{ reconnect: false }` or `{ reconnectDelay: 500 }`. `break`ing the loop or aborting an `AbortSignal` ends it cleanly (no throw). SSE always throws `ApiError` on a non-2xx initial response, regardless of `--error-mode`.
 
 ## Custom generators
 
-The built-in generators (`sdk`, `zod`, …) cover the common targets.
-For anything else derived from the same description — validators in another library, a permissions map for your UI, mocks in your test runner's format, an SDK in your company's house style — write a **custom generator**.
-It reads the same spec-agnostic model the built-ins consume and runs in the same command, so its output never drifts from the spec and you never parse OpenAPI yourself.
+The built-in generators cover common targets. For anything else derived from the same description (validators in another library, a permissions map, a house-style SDK), write a **custom generator**: it reads the same spec-agnostic model the built-ins consume, so its output never drifts from the spec.
 
-A generator is `{ name, run }` (plus optional compatibility metadata).
-`run` receives the model and returns files; author it with `defineGenerator` for type inference:
+A generator is `{ name, run }` (plus optional compatibility metadata); author it with `defineGenerator`:
 
 ```ts
 // route-map-generator.ts
@@ -944,111 +304,47 @@ import { defineGenerator } from '@redocly/client-generator/plugin';
 
 export default defineGenerator({
   name: 'route-map',
-  requires: ['sdk'], // optional contract: only valid alongside these generators
+  requires: ['sdk'],
   run({ model, outputPath }) {
     const routes = model.services
-      .flatMap((service) => service.operations)
+      .flatMap((s) => s.operations)
       .map((op) => `  ${op.name}: '${op.method.toUpperCase()} ${op.path}',`)
       .join('\n');
-    return [
-      {
-        path: outputPath.replace(/\.ts$/, '.routes.ts'),
-        content: `export const routes = {\n${routes}\n} as const;\n`,
-      },
-    ];
+    return [{ path: outputPath.replace(/\.ts$/, '.routes.ts'), content: `export const routes = {\n${routes}\n} as const;\n` }];
   },
 });
 ```
 
-The `@redocly/client-generator/plugin` entry also exports the **codegen toolkit** the built-in generators use — `ts` (the `ts.factory` wrapper), `printStatements`, `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, `safeIdent` — and the IR types (`ApiModel`, `OperationModel`, `SchemaModel`, …), so a custom generator can emit TypeScript exactly as the first-party ones do.
-
-### Select a custom generator
-
-In `redocly.yaml`, a `generators` entry that is not a built-in name is an **import specifier**:
+The `@redocly/client-generator/plugin` entry also exports the codegen toolkit (`ts`, `printStatements`, `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, …) and the IR types, so a custom generator emits TypeScript exactly as the first-party ones do.
 
-- a path (resolved against the `redocly.yaml` directory), or
-- an installed package — that default-exports the generator
+Select it in `redocly.yaml` by path or package name:
 
 ```yaml
-# redocly.yaml — by path or by published package
 x-client-generator:
-  input: ./openapi.yaml
-  output: ./src/api/client.ts
   generators:
     - sdk
-    - ./tools/route-map-generator.ts # local path
-    - '@acme/openapi-valibot' # npm package
+    - ./tools/route-map-generator.ts   # local path (resolved against redocly.yaml)
+    - '@acme/openapi-valibot'          # published package
 ```
 
-To register a generator **inline** (the function itself, with full type-safety and no install), use the programmatic API and pass it via `customGenerators`:
+Or register one **inline** with the programmatic API and select it by name:
 
 ```ts
-// generate.ts — run with `node --import tsx generate.ts`
 import { generateClient } from '@redocly/client-generator';
 import routeMap from './tools/route-map-generator.ts';
 
 await generateClient({
   input: './openapi.yaml',
   output: './src/api/client.ts',
-  customGenerators: [routeMap], // register…
-  generators: ['sdk', 'route-map'], // …then select by name
+  customGenerators: [routeMap],
+  generators: ['sdk', 'route-map'],
 });
 ```
 
-A worked example lives in [`examples/custom-generator`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/custom-generator).
-
-{% admonition type="info" name="Compatibility & trust" %}
-A custom generator declares the same `requires` / `facades` / `errorModes` / `dateTypes` contract as the built-ins, validated up front — an incompatible selection, a name that collides with another generator, or an unloadable specifier fails fast with an actionable message.
-The generated client stays dependency-free.
-A generator's output is its own file(s), and any libraries it targets are peers of _your app_.
-Import-specifier generators execute at generation time.
-It has the same trust level as any installed dependency you run.
-{% /admonition %}
-
-## Server-Sent Events (streaming)
-
-An operation whose `2xx` response declares `text/event-stream` is generated as a typed async iterator under an `sse` namespace instead of as a regular call — no flag is required.
-It is detected from the description.
-Each event's `data` is typed from the OpenAPI 3.2 `itemSchema` (falling back to the media `schema`, then `string`).
-When the payload is a structured type the runtime `JSON.parse`s `data` for you, otherwise it passes the raw string.
-
-```ts
-import { sse } from './client.ts';
-
-for await (const ev of sse.streamMessages()) {
-  console.log(ev.id, ev.data.text); // ev.data is the typed event payload
-}
-```
-
-Each yielded `ServerSentEvent<T>` is `{ event?: string; data: T; id?: string; retry?: number }`.
-With the **service-class** facade the same surface lives on the instance: `new Client(cfg).sse.streamMessages()`.
-
-The stream **auto-reconnects** on a dropped connection, resuming from the last seen event id via the `Last-Event-ID` header (backoff honors the server's `retry:` field, then `reconnectDelay`, then 1s — exponential with jitter, capped at 30s).
-Opt out or tune it per call:
-
-```ts
-// Disable reconnection, or set the base delay (ms).
-for await (const ev of sse.streamMessages({ reconnect: false })) {
-  /* … */
-}
-const stream = sse.streamMessages({ reconnectDelay: 500 });
-```
-
-To stop early, `break` out of the loop or pass an `AbortSignal` — both end the iterator **cleanly** (no error is thrown):
-
-```ts
-const ac = new AbortController();
-setTimeout(() => ac.abort(), 5000);
-for await (const ev of sse.streamMessages({ signal: ac.signal })) {
-  /* … */
-}
-// loop ends without throwing when the signal aborts
-```
-
-SSE operations are **error-mode-agnostic**: they always throw an `ApiError` if the initial response is non-2xx, and never return the `--error-mode result` `Result` shape.
+Import-specifier generators execute at generation time — they carry the same trust level as any installed dependency you run. See the [`custom-generator` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/custom-generator).
 
 ## Resources
 
 - [Lint command](./lint.md) to validate your API description before generating a client.
-- [Bundle command](./bundle.md) to combine a multi-file description into the single input file.
+- [Bundle command](./bundle.md) to combine a multi-file description into a single input file.
 - [Configuration](../configuration/index.md) reference for `redocly.yaml`, including the `apis:` aliases you can pass as `<input>`.

From 7b87b6ce696187d232d3311d35e253bc35c5d3ab Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Wed, 1 Jul 2026 17:51:48 +0300
Subject: [PATCH 041/134] refactor(client-generator): rename the input
 positional/field to api

Match the single-description commands (stats/score/split/build-docs), which name
their positional <api>; generate-client was the only one using <input>. Renames
the CLI positional, the x-client-generator config key, and the programmatic
generateClient({ api }) field (all one field), plus examples, tests, and docs.
Breaking, but the package is unreleased (0.0.0).
---
 docs/@v2/commands/generate-client.md          | 14 +++++-----
 packages/cli/src/commands/generate-client.ts  | 28 ++++++++-----------
 packages/cli/src/index.ts                     |  4 +--
 packages/client-generator/README.md           |  8 +++---
 .../src/__tests__/config-file.test.ts         |  4 +--
 .../src/__tests__/index.test.ts               | 20 ++++++-------
 packages/client-generator/src/config.ts       |  4 +--
 packages/client-generator/src/index.ts        |  2 +-
 packages/client-generator/src/types.ts        |  3 +-
 .../examples/baked-setup/redocly.yaml         |  2 +-
 .../examples/custom-generator/redocly.yaml    |  2 +-
 .../examples/customization/redocly.yaml       |  2 +-
 .../examples/fetch-functions/redocly.yaml     |  2 +-
 .../examples/mock/redocly.yaml                |  2 +-
 .../examples/programmatic/generate.ts         |  2 +-
 .../examples/service-class/redocly.yaml       |  2 +-
 .../examples/tanstack-query/redocly.yaml      |  2 +-
 .../generate-client/examples/zod/redocly.yaml |  2 +-
 .../generate-client/redocly-config.test.ts    | 12 ++++----
 19 files changed, 57 insertions(+), 60 deletions(-)

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index 9a6d067535..fd606b118f 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -19,18 +19,18 @@ By default it emits a single file with inline types and one async function per o
 ## Usage
 
 ```sh
-redocly generate-client <input> --output <file.ts>
+redocly generate-client <api> --output <file.ts>
 redocly generate-client openapi.yaml --output src/client.ts
 redocly generate-client cafe -o src/client.ts
 ```
 
-`<input>` is a file path, a URL, or an [`apis:` alias](../configuration/index.md) from `redocly.yaml`.
+`<api>` is a file path, a URL, or an [`apis:` alias](../configuration/index.md) from `redocly.yaml`.
 
 ## Options
 
 | Option | Type | Description |
 | --- | --- | --- |
-| `input` | `string` | **REQUIRED.** OpenAPI description file path, URL, or an `apis:` alias from `redocly.yaml`. |
+| `api` | `string` | **REQUIRED.** OpenAPI description file path, URL, or an `apis:` alias from `redocly.yaml`. |
 | `--output`, `-o` | `string` | **REQUIRED.** Output path; must end in `.ts`. In multi-file modes it's the entry file. |
 | `--output-mode` | `string` | File layout: `single` (default), `split` (endpoints/schemas/runtime in sibling files), `tags` (one endpoints file per tag), or `tags-split` (a folder per tag). |
 | `--generators` | `string` | Comma-separated generators to run (default `sdk`). See [Generators](#generators). |
@@ -50,12 +50,12 @@ redocly generate-client cafe -o src/client.ts
 ## Configuration
 
 Instead of passing flags every time, put the settings in `redocly.yaml` under an `x-client-generator` block.
-`generate-client` reads it automatically (relative `input`/`output` resolve against the config file's directory):
+`generate-client` reads it automatically (relative `api`/`output` resolve against the config file's directory):
 
 ```yaml
 # redocly.yaml
 x-client-generator:
-  input: ./openapi.yaml
+  api: ./openapi.yaml
   output: ./src/api/client.ts
   generators:
     - sdk
@@ -334,7 +334,7 @@ import { generateClient } from '@redocly/client-generator';
 import routeMap from './tools/route-map-generator.ts';
 
 await generateClient({
-  input: './openapi.yaml',
+  api: './openapi.yaml',
   output: './src/api/client.ts',
   customGenerators: [routeMap],
   generators: ['sdk', 'route-map'],
@@ -347,4 +347,4 @@ Import-specifier generators execute at generation time — they carry the same t
 
 - [Lint command](./lint.md) to validate your API description before generating a client.
 - [Bundle command](./bundle.md) to combine a multi-file description into a single input file.
-- [Configuration](../configuration/index.md) reference for `redocly.yaml`, including the `apis:` aliases you can pass as `<input>`.
+- [Configuration](../configuration/index.md) reference for `redocly.yaml`, including the `apis:` aliases you can pass as `<api>`.
diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index 1777339f61..de7279e5bf 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -9,9 +9,9 @@ import { type CommandArgs } from '../wrapper.js';
 /**
  * Read generate-client settings from a `redocly.yaml`'s `x-client-generator`
  * extension block (the auto-discovered config, or the one at `--config`). Relative
- * `input`/`output` are resolved against the config file's directory so they mean the
+ * `api`/`output` are resolved against the config file's directory so they mean the
  * same thing regardless of the current working directory. Returns `{}` when the block
- * is absent. (A URL/registry `input` is left untouched.)
+ * is absent. (A URL/registry `api` is left untouched.)
  */
 function readRedoclyExtension(config: Config): Record<string, unknown> {
   const raw = (config.resolvedConfig as Record<string, unknown>)['x-client-generator'];
@@ -19,12 +19,8 @@ function readRedoclyExtension(config: Config): Record<string, unknown> {
   const ext: Record<string, unknown> = { ...raw };
   const baseDir = config.configPath ? dirname(config.configPath) : undefined;
   if (baseDir) {
-    if (
-      typeof ext.input === 'string' &&
-      !isAbsolute(ext.input) &&
-      !/^https?:\/\//i.test(ext.input)
-    ) {
-      ext.input = resolvePath(baseDir, ext.input);
+    if (typeof ext.api === 'string' && !isAbsolute(ext.api) && !/^https?:\/\//i.test(ext.api)) {
+      ext.api = resolvePath(baseDir, ext.api);
     }
     if (typeof ext.output === 'string' && !isAbsolute(ext.output)) {
       ext.output = resolvePath(baseDir, ext.output);
@@ -37,7 +33,7 @@ function readRedoclyExtension(config: Config): Record<string, unknown> {
 }
 
 export type GenerateClientCommandArgv = {
-  input?: string;
+  api?: string;
   output?: string;
   config?: string;
   'base-url'?: string;
@@ -68,7 +64,7 @@ export async function handleGenerateClient({
   // block (located via the standard `--config` flag, else discovered in cwd) → CLI flags.
   const redoclyExtension = readRedoclyExtension(config);
   const merged = mergeConfig(redoclyExtension as Partial<OpenApiTsConfig>, {
-    input: argv.input,
+    api: argv.api,
     output: argv.output,
     baseUrl: argv['base-url'],
     enumStyle: argv['enum-style'],
@@ -85,14 +81,14 @@ export async function handleGenerateClient({
     setup: argv.setup,
   });
 
-  if (!merged.input)
-    throw new HandledError(`\n❌  No input. Pass <input> or set it in a config file.\n`);
+  if (!merged.api)
+    throw new HandledError(`\n❌  No API. Pass <api> or set it in a config file.\n`);
   if (!merged.output)
     throw new HandledError(`\n❌  No output. Pass --output or set it in a config file.\n`);
 
-  // Resolve `<input>` as a `redocly.yaml` `apis:` alias when it matches one (to the
+  // Resolve `<api>` as a `redocly.yaml` `apis:` alias when it matches one (to the
   // alias's `root`, relative to the config dir); a plain path/URL passes through.
-  const input = getAliasOrPath(config, merged.input).path;
+  const api = getAliasOrPath(config, merged.api).path;
   const outputPath = resolvePath(merged.output);
   // A relative `--setup` resolves against the cwd, like `--output` (a config-file
   // `setup` was already resolved against the config dir in readRedoclyExtension);
@@ -125,7 +121,7 @@ export async function handleGenerateClient({
     logger.info(gray('\n  Generating TypeScript client... \n'));
     const result = await generateClient({
       ...merged,
-      input,
+      api,
       output: outputPath,
       setup: setupPath,
       config,
@@ -141,7 +137,7 @@ export async function handleGenerateClient({
     throw new HandledError(
       '\n' +
         `❌  Failed to generate TypeScript client.\n   ${message}\n` +
-        '   Check the input file path and that the OpenAPI document is valid.'
+        '   Check the API description file path and that the OpenAPI document is valid.'
     );
   }
 }
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index 2bd131a041..699c87ce2d 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -856,12 +856,12 @@ yargs(hideBin(process.argv))
     }
   )
   .command(
-    'generate-client [input]',
+    'generate-client [api]',
     'Generate a TypeScript client from an OpenAPI description.',
     (yargs) => {
       return yargs
         .env('REDOCLY_CLI_GENERATE_CLIENT')
-        .positional('input', {
+        .positional('api', {
           describe: 'OpenAPI description file path (or alias from redocly.yaml `apis:`).',
           type: 'string',
         })
diff --git a/packages/client-generator/README.md b/packages/client-generator/README.md
index 907055d71b..0903398b4d 100644
--- a/packages/client-generator/README.md
+++ b/packages/client-generator/README.md
@@ -15,7 +15,7 @@ The rest of this README covers using the package **programmatically**.
 ## Features
 
 - **Broad input** — OpenAPI **3.0, 3.1, and 3.2.0**, plus **Swagger 2.0** (normalized to 3.x before generation)
-  `input` is a file path or URL.
+  `api` is a file path or URL.
 - **Zero-dependency client** built via the TS AST, with `typescript` as the only peer dep
 - **Output modes** — `single`, `split`, `tags`, `tags-split` (`outputMode`)
 - **Facades** — standalone `functions` or a `service-class` (`facade`), the latter supporting **per-instance configuration and credentials** (`new Client({ auth, baseUrl, … })`)
@@ -48,7 +48,7 @@ Every add-on generator keeps the emitted client dependency-free; its peer librar
 import { generateClient } from '@redocly/client-generator';
 
 const result = await generateClient({
-  input: 'openapi.yaml', // file path or URL
+  api: 'openapi.yaml', // file path or URL
   output: 'src/client.ts', // entry file; siblings derive from it in multi-file modes
   outputMode: 'single', // 'single' | 'split' | 'tags' | 'tags-split'
   facade: 'functions', // 'functions' | 'service-class'
@@ -69,7 +69,7 @@ For type-safe option authoring, `defineConfig` returns its argument unchanged:
 import { defineConfig } from '@redocly/client-generator';
 
 export default defineConfig({
-  input: './openapi.yaml',
+  api: './openapi.yaml',
   output: './src/api/client.ts',
   generators: ['sdk', 'zod'],
 });
@@ -397,7 +397,7 @@ import generateClient from '@redocly/client-generator';
 import routeMap from './tools/route-map-generator.ts';
 
 await generateClient({
-  input: './openapi.yaml',
+  api: './openapi.yaml',
   output: './src/api/client.ts',
   customGenerators: [routeMap], // register…
   generators: ['sdk', 'route-map'], // …then select by name (or pass './tools/route-map-generator.ts')
diff --git a/packages/client-generator/src/__tests__/config-file.test.ts b/packages/client-generator/src/__tests__/config-file.test.ts
index a4f1b24df3..0efed2a266 100644
--- a/packages/client-generator/src/__tests__/config-file.test.ts
+++ b/packages/client-generator/src/__tests__/config-file.test.ts
@@ -3,11 +3,11 @@ import { mergeConfig } from '../config-file.js';
 describe('mergeConfig', () => {
   it('CLI overrides win over base values; undefined overrides are ignored', () => {
     const merged = mergeConfig(
-      { input: 'spec.yaml', output: 'a.ts', outputMode: 'single' },
+      { api: 'spec.yaml', output: 'a.ts', outputMode: 'single' },
       { output: 'b.ts', outputMode: undefined, facade: 'service-class' }
     );
     expect(merged).toEqual({
-      input: 'spec.yaml',
+      api: 'spec.yaml',
       output: 'b.ts',
       outputMode: 'single',
       facade: 'service-class',
diff --git a/packages/client-generator/src/__tests__/index.test.ts b/packages/client-generator/src/__tests__/index.test.ts
index 34738902e9..6d8aa76edb 100644
--- a/packages/client-generator/src/__tests__/index.test.ts
+++ b/packages/client-generator/src/__tests__/index.test.ts
@@ -52,9 +52,9 @@ describe('generateClient — end-to-end orchestration', () => {
   });
 
   it('writes the generated file to disk and reports its size', async () => {
-    const input = join(workDir, 'spec.yaml');
+    const api = join(workDir, 'spec.yaml');
     await writeFile(
-      input,
+      api,
       `openapi: 3.0.3
 info:
   title: Tiny
@@ -74,7 +74,7 @@ paths:
     );
 
     const output = join(workDir, 'nested/dir/api.ts');
-    const result = await generateClient({ input, output });
+    const result = await generateClient({ api, output });
 
     expect(result.outputPath).toBe(output);
     expect(result.bytes).toBeGreaterThan(0);
@@ -87,9 +87,9 @@ paths:
   });
 
   it('emits the result shape when errorMode is `result`', async () => {
-    const input = join(workDir, 'errmode.yaml');
+    const api = join(workDir, 'errmode.yaml');
     await writeFile(
-      input,
+      api,
       `openapi: 3.0.3
 info:
   title: Tiny
@@ -109,22 +109,22 @@ paths:
     );
 
     const resultOutput = join(workDir, 'result.ts');
-    await generateClient({ input, output: resultOutput, errorMode: 'result' });
+    await generateClient({ api, output: resultOutput, errorMode: 'result' });
     const resultContents = await readFile(resultOutput, 'utf-8');
     expect(resultContents).toContain('__requestResult');
     expect(resultContents).toContain('export type Result<');
 
     const throwOutput = join(workDir, 'throw.ts');
-    await generateClient({ input, output: throwOutput });
+    await generateClient({ api, output: throwOutput });
     const throwContents = await readFile(throwOutput, 'utf-8');
     expect(throwContents).not.toContain('__requestResult');
     expect(throwContents).not.toContain('export type Result<');
   });
 
   it('normalizes a Swagger 2.0 document before generating', async () => {
-    const input = join(workDir, 'swagger2.yaml');
+    const api = join(workDir, 'swagger2.yaml');
     await writeFile(
-      input,
+      api,
       `swagger: '2.0'
 info:
   title: Tiny2
@@ -154,7 +154,7 @@ definitions:
     );
 
     const output = join(workDir, 'api2.ts');
-    const result = await generateClient({ input, output });
+    const result = await generateClient({ api, output });
 
     expect(result.bytes).toBeGreaterThan(0);
     const contents = await readFile(output, 'utf-8');
diff --git a/packages/client-generator/src/config.ts b/packages/client-generator/src/config.ts
index a732dd8057..ca6fd40c9a 100644
--- a/packages/client-generator/src/config.ts
+++ b/packages/client-generator/src/config.ts
@@ -10,8 +10,8 @@ import type { OutputMode } from './writers/types.js';
  * (roadmap P7.5).
  */
 export type Config = {
-  /** Path or URL to the OpenAPI document. */
-  input: string;
+  /** Path or URL to the OpenAPI document (or an `apis:` alias from `redocly.yaml`). */
+  api: string;
   /** Output anchor path (a `.ts` file; multi-file modes derive siblings from it). */
   output: string;
   /** File partitioning. Defaults to `single`. */
diff --git a/packages/client-generator/src/index.ts b/packages/client-generator/src/index.ts
index 0fdfb67ec9..4afbb8a0d3 100644
--- a/packages/client-generator/src/index.ts
+++ b/packages/client-generator/src/index.ts
@@ -87,7 +87,7 @@ export async function generateClient(
   options: GenerateClientOptions
 ): Promise<GenerateClientResult> {
   const outputPath = resolve(options.output);
-  const { document, version } = await loadSpec(options.input, options.config);
+  const { document, version } = await loadSpec(options.api, options.config);
   const normalized =
     version === 'oas2'
       ? normalizeSwagger2(document as unknown as Record<string, unknown>)
diff --git a/packages/client-generator/src/types.ts b/packages/client-generator/src/types.ts
index 139008c716..30684f132b 100644
--- a/packages/client-generator/src/types.ts
+++ b/packages/client-generator/src/types.ts
@@ -5,7 +5,8 @@ import type { CustomGenerator } from './generators/types.js';
 import type { OutputMode } from './writers/types.js';
 
 export type GenerateClientOptions = {
-  input: string;
+  /** Path or URL to the OpenAPI document (or an `apis:` alias from `redocly.yaml`). */
+  api: string;
   output: string;
   /** Resolved Redocly config for spec loading. */
   config?: RedoclyConfig;
diff --git a/tests/e2e/generate-client/examples/baked-setup/redocly.yaml b/tests/e2e/generate-client/examples/baked-setup/redocly.yaml
index 2533f39fee..674a4f672c 100644
--- a/tests/e2e/generate-client/examples/baked-setup/redocly.yaml
+++ b/tests/e2e/generate-client/examples/baked-setup/redocly.yaml
@@ -1,7 +1,7 @@
 # redocly.yaml — drives `redocly generate-client` for this example.
 # `setup` bakes the publisher's defineClientSetup module into the generated client.
 x-client-generator:
-  input: ./openapi.yaml
+  api: ./openapi.yaml
   output: ./src/api/client.ts
   generators:
     - sdk
diff --git a/tests/e2e/generate-client/examples/custom-generator/redocly.yaml b/tests/e2e/generate-client/examples/custom-generator/redocly.yaml
index d2a20865cb..fc306c3947 100644
--- a/tests/e2e/generate-client/examples/custom-generator/redocly.yaml
+++ b/tests/e2e/generate-client/examples/custom-generator/redocly.yaml
@@ -2,7 +2,7 @@
 # The `generators` list mixes a built-in (`sdk`) with a custom generator referenced by path
 # (the experimental plugin API). The path is resolved against this file's directory.
 x-client-generator:
-  input: ./openapi.yaml
+  api: ./openapi.yaml
   output: ./src/api/client.ts
   generators:
     - sdk
diff --git a/tests/e2e/generate-client/examples/customization/redocly.yaml b/tests/e2e/generate-client/examples/customization/redocly.yaml
index 085d1f32bf..f926ee07d3 100644
--- a/tests/e2e/generate-client/examples/customization/redocly.yaml
+++ b/tests/e2e/generate-client/examples/customization/redocly.yaml
@@ -2,7 +2,7 @@
 # generate-client settings live under the `x-client-generator` extension for now
 # (first-class config support is planned in @redocly/config).
 x-client-generator:
-  input: ./openapi.yaml
+  api: ./openapi.yaml
   output: ./src/api/client.ts
   generators:
     - sdk
diff --git a/tests/e2e/generate-client/examples/fetch-functions/redocly.yaml b/tests/e2e/generate-client/examples/fetch-functions/redocly.yaml
index 085d1f32bf..f926ee07d3 100644
--- a/tests/e2e/generate-client/examples/fetch-functions/redocly.yaml
+++ b/tests/e2e/generate-client/examples/fetch-functions/redocly.yaml
@@ -2,7 +2,7 @@
 # generate-client settings live under the `x-client-generator` extension for now
 # (first-class config support is planned in @redocly/config).
 x-client-generator:
-  input: ./openapi.yaml
+  api: ./openapi.yaml
   output: ./src/api/client.ts
   generators:
     - sdk
diff --git a/tests/e2e/generate-client/examples/mock/redocly.yaml b/tests/e2e/generate-client/examples/mock/redocly.yaml
index c16fc57463..1aae64e4cc 100644
--- a/tests/e2e/generate-client/examples/mock/redocly.yaml
+++ b/tests/e2e/generate-client/examples/mock/redocly.yaml
@@ -2,7 +2,7 @@
 # generate-client settings live under the `x-client-generator` extension for now
 # (first-class config support is planned in @redocly/config).
 x-client-generator:
-  input: ./openapi.yaml
+  api: ./openapi.yaml
   output: ./src/api/client.ts
   generators:
     - sdk
diff --git a/tests/e2e/generate-client/examples/programmatic/generate.ts b/tests/e2e/generate-client/examples/programmatic/generate.ts
index 06aae6131a..412533fdef 100644
--- a/tests/e2e/generate-client/examples/programmatic/generate.ts
+++ b/tests/e2e/generate-client/examples/programmatic/generate.ts
@@ -8,7 +8,7 @@ import { fileURLToPath } from 'node:url';
 const here = dirname(fileURLToPath(import.meta.url));
 
 const result = await generateClient({
-  input: join(here, 'openapi.yaml'),
+  api: join(here, 'openapi.yaml'),
   output: process.env.OUT ?? join(here, 'src/api/client.ts'),
   outputMode: 'single', // 'single' | 'split' | 'tags' | 'tags-split'
   facade: 'functions', // 'functions' | 'service-class'
diff --git a/tests/e2e/generate-client/examples/service-class/redocly.yaml b/tests/e2e/generate-client/examples/service-class/redocly.yaml
index 638f09dda8..b2e955fe56 100644
--- a/tests/e2e/generate-client/examples/service-class/redocly.yaml
+++ b/tests/e2e/generate-client/examples/service-class/redocly.yaml
@@ -2,7 +2,7 @@
 # generate-client settings live under the `x-client-generator` extension for now
 # (first-class config support is planned in @redocly/config).
 x-client-generator:
-  input: ./openapi.yaml
+  api: ./openapi.yaml
   output: ./src/api/client.ts
   generators:
     - sdk
diff --git a/tests/e2e/generate-client/examples/tanstack-query/redocly.yaml b/tests/e2e/generate-client/examples/tanstack-query/redocly.yaml
index 2683884421..a43094f1e3 100644
--- a/tests/e2e/generate-client/examples/tanstack-query/redocly.yaml
+++ b/tests/e2e/generate-client/examples/tanstack-query/redocly.yaml
@@ -2,7 +2,7 @@
 # generate-client settings live under the `x-client-generator` extension for now
 # (first-class config support is planned in @redocly/config).
 x-client-generator:
-  input: ./openapi.yaml
+  api: ./openapi.yaml
   output: ./src/api/client.ts
   generators:
     - sdk
diff --git a/tests/e2e/generate-client/examples/zod/redocly.yaml b/tests/e2e/generate-client/examples/zod/redocly.yaml
index 353f73636c..a03e93d9da 100644
--- a/tests/e2e/generate-client/examples/zod/redocly.yaml
+++ b/tests/e2e/generate-client/examples/zod/redocly.yaml
@@ -2,7 +2,7 @@
 # generate-client settings live under the `x-client-generator` extension for now
 # (first-class config support is planned in @redocly/config).
 x-client-generator:
-  input: ./openapi.yaml
+  api: ./openapi.yaml
   output: ./src/api/client.ts
   generators:
     - sdk
diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
index 384e62412c..b268aaebb1 100644
--- a/tests/e2e/generate-client/redocly-config.test.ts
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -31,7 +31,7 @@ describe('generate-client redocly.yaml config (x-client-generator)', () => {
   it('generates from the redocly.yaml block with no flags', () => {
     const dir = project(
       [
-        '  input: ./openapi.yaml',
+        '  api: ./openapi.yaml',
         '  output: ./src/api/client.ts',
         '  generators: [sdk]',
         '  facade: service-class',
@@ -46,7 +46,7 @@ describe('generate-client redocly.yaml config (x-client-generator)', () => {
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
-  it('resolves an `apis:` alias passed as <input> to that API’s root', () => {
+  it('resolves an `apis:` alias passed as <api> to that API’s root', () => {
     const dir = mkdtempSync(join(tmpdir(), 'ots-alias-'));
     copyFileSync(fixture, join(dir, 'openapi.yaml'));
     writeFileSync(join(dir, 'redocly.yaml'), 'apis:\n  cafe:\n    root: ./openapi.yaml\n', 'utf-8');
@@ -70,7 +70,7 @@ describe('generate-client redocly.yaml config (x-client-generator)', () => {
   it('lets a CLI flag override the redocly.yaml block (flags win)', () => {
     const dir = project(
       [
-        '  input: ./openapi.yaml',
+        '  api: ./openapi.yaml',
         '  output: ./src/api/client.ts',
         '  generators: [sdk]',
         '  facade: service-class',
@@ -88,9 +88,9 @@ describe('generate-client redocly.yaml config (x-client-generator)', () => {
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
-  it('resolves the block’s relative input/output against the redocly.yaml directory', () => {
+  it('resolves the block’s relative api/output against the redocly.yaml directory', () => {
     const dir = project(
-      ['  input: ./openapi.yaml', '  output: ./out/client.ts', '  generators: [sdk]'].join('\n') +
+      ['  api: ./openapi.yaml', '  output: ./out/client.ts', '  generators: [sdk]'].join('\n') +
         '\n'
     );
     // Run from the repo root, pointing at the config elsewhere via --config.
@@ -99,7 +99,7 @@ describe('generate-client redocly.yaml config (x-client-generator)', () => {
       encoding: 'utf-8',
     });
     expect(res.status, res.stderr).toBe(0);
-    // input/output resolved relative to the redocly.yaml dir, not the cwd.
+    // api/output resolved relative to the redocly.yaml dir, not the cwd.
     expect(existsSync(join(dir, 'out/client.ts'))).toBe(true);
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);

From 2b87a3fcd39ca17d5f493e02ef817f7ec3d76d05 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 10:30:59 +0300
Subject: [PATCH 042/134] feat(core): register client + clientOutput in the
 redocly.yaml config schema

Add a `client` config block (top-level shared defaults and per-API overrides
under `apis.<name>.client`) plus a per-API `clientOutput` string, backing the
generate-client config redesign. The `client` block lists only generation
settings, so input/output keys (`api`/`output`/`clientOutput`) inside it report
as unexpected. Replaces the `x-client-generator` extension with a first-class key.
---
 .../__snapshots__/redocly-yaml.test.ts.snap   | 79 +++++++++++++++++++
 packages/core/src/types/redocly-yaml.ts       | 27 +++++++
 2 files changed, 106 insertions(+)

diff --git a/packages/core/src/__tests__/__snapshots__/redocly-yaml.test.ts.snap b/packages/core/src/__tests__/__snapshots__/redocly-yaml.test.ts.snap
index 48104f3d01..404c69c770 100644
--- a/packages/core/src/__tests__/__snapshots__/redocly-yaml.test.ts.snap
+++ b/packages/core/src/__tests__/__snapshots__/redocly-yaml.test.ts.snap
@@ -211,6 +211,80 @@ exports[`createConfigTypes > matches snapshot for the default config schema 1`]
       "severity",
     ],
   },
+  "Client": {
+    "properties": {
+      "argsStyle": {
+        "enum": [
+          "flat",
+          "grouped",
+        ],
+      },
+      "dateType": {
+        "enum": [
+          "string",
+          "Date",
+        ],
+      },
+      "enumStyle": {
+        "enum": [
+          "union",
+          "const-object",
+        ],
+      },
+      "errorMode": {
+        "enum": [
+          "throw",
+          "result",
+        ],
+      },
+      "facade": {
+        "enum": [
+          "functions",
+          "service-class",
+        ],
+      },
+      "generators": {
+        "items": {
+          "type": "string",
+        },
+        "type": "array",
+      },
+      "mockData": {
+        "enum": [
+          "baked",
+          "faker",
+        ],
+      },
+      "mockSeed": {
+        "type": "number",
+      },
+      "name": {
+        "type": "string",
+      },
+      "outputMode": {
+        "enum": [
+          "single",
+          "split",
+          "tags",
+          "tags-split",
+        ],
+      },
+      "queryFramework": {
+        "enum": [
+          "react",
+          "vue",
+          "svelte",
+          "solid",
+        ],
+      },
+      "serverUrl": {
+        "type": "string",
+      },
+      "setup": {
+        "type": "string",
+      },
+    },
+  },
   "ConfigApis": {
     "additionalProperties": "ConfigApisProperties",
     "description": "The \`apis\` configuration section is used when a project contains multiple API descriptions to set up different rules and settings for individual APIs. It allows defining specific configurations for each API, which must be identified by a unique name.",
@@ -235,6 +309,10 @@ exports[`createConfigTypes > matches snapshot for the default config schema 1`]
       "async3Decorators": "Decorators",
       "async3Preprocessors": "Preprocessors",
       "async3Rules": "Rules",
+      "client": "Client",
+      "clientOutput": {
+        "type": "string",
+      },
       "decorators": "Decorators",
       "extends": {
         "description": "Use extends to inherit rules and their configurations from other rulesets.",
@@ -376,6 +454,7 @@ exports[`createConfigTypes > matches snapshot for the default config schema 1`]
       "catalogClassic": {
         "type": "object",
       },
+      "client": "Client",
       "codeSnippet": "rootRedoclyConfigSchema.codeSnippet",
       "colorMode": "rootRedoclyConfigSchema.colorMode",
       "corsProxy": "rootRedoclyConfigSchema.corsProxy",
diff --git a/packages/core/src/types/redocly-yaml.ts b/packages/core/src/types/redocly-yaml.ts
index 21d087770f..0e79e25f07 100644
--- a/packages/core/src/types/redocly-yaml.ts
+++ b/packages/core/src/types/redocly-yaml.ts
@@ -302,6 +302,7 @@ const createConfigRoot = (nodeTypes: Record<string, NodeType>): NodeType => ({
     ...nodeTypes.rootRedoclyConfigSchema.properties,
     ...ConfigGovernance.properties,
     apis: 'ConfigApis', // Override apis with internal format
+    client: 'Client', // generate-client shared defaults
     telemetry: { enum: ['on', 'off'] },
     resolve: {
       properties: {
@@ -325,6 +326,8 @@ const createConfigApisProperties = (nodeTypes: Record<string, NodeType>): NodeTy
   properties: {
     ...nodeTypes['rootRedoclyConfigSchema.apis_additionalProperties']?.properties,
     ...omit(ConfigGovernance.properties, ['plugins']), // plugins are not allowed in apis
+    client: 'Client', // per-API generate-client overrides
+    clientOutput: { type: 'string' }, // per-API client output path
   },
 });
 
@@ -339,6 +342,29 @@ const ConfigHTTP: NodeType = {
   },
 };
 
+// `generate-client` settings. Shared defaults live under the top-level `client` key;
+// per-API overrides live under `apis.<name>.client`. The input (`apis.<name>.root` or a
+// CLI path) and output (`apis.<name>.clientOutput` or `--output`) are intentionally NOT
+// part of this block — listing only these properties makes `api`/`output`/`clientOutput`
+// here report as unexpected.
+const Client: NodeType = {
+  properties: {
+    generators: { type: 'array', items: { type: 'string' } },
+    facade: { enum: ['functions', 'service-class'] },
+    name: { type: 'string' },
+    argsStyle: { enum: ['flat', 'grouped'] },
+    serverUrl: { type: 'string' },
+    outputMode: { enum: ['single', 'split', 'tags', 'tags-split'] },
+    enumStyle: { enum: ['union', 'const-object'] },
+    errorMode: { enum: ['throw', 'result'] },
+    dateType: { enum: ['string', 'Date'] },
+    queryFramework: { enum: ['react', 'vue', 'svelte', 'solid'] },
+    mockData: { enum: ['baked', 'faker'] },
+    mockSeed: { type: 'number' },
+    setup: { type: 'string' },
+  },
+};
+
 const Rules: NodeType = {
   properties: {},
   description:
@@ -734,6 +760,7 @@ const CoreConfigTypes: Record<string, NodeType> = {
   ConfigApis,
   ConfigGovernance,
   ConfigHTTP,
+  Client,
   Where,
   BuiltinRule,
   CustomRule,

From 3596d1263b98b2be647a10f4b951c897ec09ecf8 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 10:51:19 +0300
Subject: [PATCH 043/134] refactor(client-generator): rename baseUrl to
 serverUrl

Rename the config/programmatic field and the generated runtime API from baseUrl to
serverUrl (matching Respect): Config/GenerateClientOptions.serverUrl, the IR model +
emit plumbing, and the generated ClientConfig.serverUrl / configure({ serverUrl }) /
new Client({ serverUrl }) / __buildUrl. The internal inlined BASE constant is
unchanged. The CLI now maps its input to the serverUrl field (the --base-url flag is
renamed to --server-url in a later stage).

Committed examples and e2e tests are regenerated/updated in the examples stage.
---
 packages/cli/src/commands/generate-client.ts   | 10 +++++-----
 .../src/__tests__/index.test.ts                |  2 +-
 .../src/__tests__/runtime-contract.test.ts     |  2 +-
 packages/client-generator/src/config.ts        |  2 +-
 .../src/emitters/__tests__/client.test.ts      | 18 +++++++++---------
 .../src/emitters/__tests__/fixtures.ts         |  2 +-
 .../src/emitters/__tests__/setup-bake.test.ts  |  8 ++++----
 .../emitters/__tests__/transformers.test.ts    |  2 +-
 .../client-generator/src/emitters/client.ts    |  6 +++---
 .../client-generator/src/emitters/runtime.ts   | 18 +++++++++---------
 .../src/generators/__tests__/sdk.test.ts       |  2 +-
 .../client-generator/src/generators/types.ts   |  2 +-
 packages/client-generator/src/index.ts         |  2 +-
 .../src/ir/__tests__/build.test.ts             |  6 +++---
 .../ir/__tests__/sanitize-identifiers.test.ts  |  2 +-
 packages/client-generator/src/ir/build.ts      |  4 ++--
 packages/client-generator/src/ir/model.ts      |  2 +-
 .../client-generator/src/runtime-contract.ts   |  2 +-
 packages/client-generator/src/types.ts         |  2 +-
 .../src/writers/__tests__/group-by-tag.test.ts |  2 +-
 .../src/writers/__tests__/index.test.ts        |  2 +-
 .../src/writers/__tests__/split-writer.test.ts |  2 +-
 .../__tests__/tags-split-writer.test.ts        |  2 +-
 .../src/writers/__tests__/tags-writer.test.ts  |  2 +-
 24 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index de7279e5bf..e96dcc104d 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -66,7 +66,7 @@ export async function handleGenerateClient({
   const merged = mergeConfig(redoclyExtension as Partial<OpenApiTsConfig>, {
     api: argv.api,
     output: argv.output,
-    baseUrl: argv['base-url'],
+    serverUrl: argv['base-url'],
     enumStyle: argv['enum-style'],
     outputMode: argv['output-mode'],
     facade: argv.facade,
@@ -104,15 +104,15 @@ export async function handleGenerateClient({
       `\n❌  output must point at a TypeScript file (ending in .ts).\n   Got: ${outputPath}\n`
     );
   }
-  if (merged.baseUrl !== undefined) {
+  if (merged.serverUrl !== undefined) {
     try {
       // Accept absolute URLs (https://api.example.com) and relative bases (/v1):
       // OpenAPI allows relative `servers[].url`, and the runtime concatenates
-      // baseUrl + path, so a relative base needs no absolute origin.
-      new URL(merged.baseUrl, 'http://localhost');
+      // serverUrl + path, so a relative base needs no absolute origin.
+      new URL(merged.serverUrl, 'http://localhost');
     } catch {
       throw new HandledError(
-        `\n❌  --base-url must be a valid URL — absolute (https://api.example.com) or relative (/v1).\n   Got: ${merged.baseUrl}\n`
+        `\n❌  --base-url must be a valid URL — absolute (https://api.example.com) or relative (/v1).\n   Got: ${merged.serverUrl}\n`
       );
     }
   }
diff --git a/packages/client-generator/src/__tests__/index.test.ts b/packages/client-generator/src/__tests__/index.test.ts
index 6d8aa76edb..bda5b77fd8 100644
--- a/packages/client-generator/src/__tests__/index.test.ts
+++ b/packages/client-generator/src/__tests__/index.test.ts
@@ -9,7 +9,7 @@ function model(): ApiModel {
   return {
     title: 'T',
     version: '1',
-    baseUrl: 'https://x',
+    serverUrl: 'https://x',
     services: [{ name: 'Default', operations: [] }],
     schemas: [],
     securitySchemes: [],
diff --git a/packages/client-generator/src/__tests__/runtime-contract.test.ts b/packages/client-generator/src/__tests__/runtime-contract.test.ts
index 4110a76a29..b6fae3b0c4 100644
--- a/packages/client-generator/src/__tests__/runtime-contract.test.ts
+++ b/packages/client-generator/src/__tests__/runtime-contract.test.ts
@@ -3,7 +3,7 @@ import { defineClientSetup } from '../runtime-contract.js';
 
 describe('defineClientSetup', () => {
   it('returns its argument unchanged (identity helper)', () => {
-    const setup = { config: { baseUrl: 'https://x' }, middleware: [] };
+    const setup = { config: { serverUrl: 'https://x' }, middleware: [] };
     expect(defineClientSetup(setup)).toBe(setup);
   });
 });
diff --git a/packages/client-generator/src/config.ts b/packages/client-generator/src/config.ts
index ca6fd40c9a..19cba8cee2 100644
--- a/packages/client-generator/src/config.ts
+++ b/packages/client-generator/src/config.ts
@@ -23,7 +23,7 @@ export type Config = {
   /** Class name for the service-class facade. Defaults to `Client`. */
   name?: string;
   /** Override the inlined base URL (else derived from `servers[0].url`). */
-  baseUrl?: string;
+  serverUrl?: string;
   /** Named-enum emission. Defaults to `const-object`. */
   enumStyle?: 'union' | 'const-object';
   /** Error-handling shape of the generated client. `'throw'` (default) throws `ApiError`
diff --git a/packages/client-generator/src/emitters/__tests__/client.test.ts b/packages/client-generator/src/emitters/__tests__/client.test.ts
index 4319fae587..dab984740a 100644
--- a/packages/client-generator/src/emitters/__tests__/client.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/client.test.ts
@@ -37,7 +37,7 @@ describe('typed ctx.operation (OperationContext narrowing)', () => {
 });
 
 describe('setupApply — baked publisher setup (--setup)', () => {
-  const EXPR = '{ config: { baseUrl: "https://x" }, middleware: [] }';
+  const EXPR = '{ config: { serverUrl: "https://x" }, middleware: [] }';
 
   it('functions facade: declares __redoclySetup then applies it via configure/use', () => {
     const out = setupApply(EXPR, 'functions', false);
@@ -107,21 +107,21 @@ describe('emitSingleFile — top-level layout', () => {
     expect(out.endsWith('\n')).toBe(true);
   });
 
-  it('inlines the baseUrl as a mutable `let` binding so setBaseUrl() can update it', () => {
-    const out = emitSingleFile(apiModel({ baseUrl: 'https://api.example.com/v1' }));
+  it('inlines the serverUrl as a mutable `let` binding so setBaseUrl() can update it', () => {
+    const out = emitSingleFile(apiModel({ serverUrl: 'https://api.example.com/v1' }));
     expect(out).toContain('let BASE = "https://api.example.com/v1";');
     expect(out).not.toContain('const BASE = ');
   });
 
   it('always exports a setBaseUrl() helper that reassigns the BASE binding', () => {
-    const out = emitSingleFile(apiModel({ baseUrl: 'https://api.example.com' }));
+    const out = emitSingleFile(apiModel({ serverUrl: 'https://api.example.com' }));
     expect(out).toContain('export function setBaseUrl(url: string): void');
     expect(out).toMatch(/BASE\s*=\s*url/);
   });
 
-  it('lets a caller override the spec-derived baseUrl via options.baseUrl', () => {
-    const out = emitSingleFile(apiModel({ baseUrl: 'https://from-spec.example.com' }), {
-      baseUrl: 'http://127.0.0.1:3101',
+  it('lets a caller override the spec-derived serverUrl via options.serverUrl', () => {
+    const out = emitSingleFile(apiModel({ serverUrl: 'https://from-spec.example.com' }), {
+      serverUrl: 'http://127.0.0.1:3101',
     });
     expect(out).toContain('let BASE = "http://127.0.0.1:3101";');
     expect(out).not.toContain('from-spec.example.com');
@@ -197,9 +197,9 @@ describe('extension contract (ClientConfig)', () => {
     expect(out).toContain('__request<void>(__config, { id: "ping", path: "/p", tags: [] }');
   });
 
-  it('runtime resolves config.baseUrl ?? BASE and config.fetch ?? fetch', () => {
+  it('runtime resolves config.serverUrl ?? BASE and config.fetch ?? fetch', () => {
     const out = emitSingleFile(apiModel());
-    expect(out).toContain('(config.baseUrl ?? BASE)');
+    expect(out).toContain('(config.serverUrl ?? BASE)');
     expect(out).toContain('const doFetch = config.fetch ?? fetch;');
   });
 
diff --git a/packages/client-generator/src/emitters/__tests__/fixtures.ts b/packages/client-generator/src/emitters/__tests__/fixtures.ts
index c83fec463f..8fd57b4c90 100644
--- a/packages/client-generator/src/emitters/__tests__/fixtures.ts
+++ b/packages/client-generator/src/emitters/__tests__/fixtures.ts
@@ -16,7 +16,7 @@ export function apiModel(overrides: Partial<ApiModel> = {}): ApiModel {
   return {
     title: 'T',
     version: '1.0.0',
-    baseUrl: 'https://api.example.com',
+    serverUrl: 'https://api.example.com',
     services: [{ name: 'Default', operations: [] }],
     schemas: [],
     securitySchemes: [],
diff --git a/packages/client-generator/src/emitters/__tests__/setup-bake.test.ts b/packages/client-generator/src/emitters/__tests__/setup-bake.test.ts
index d272d6d2bc..41184b7f55 100644
--- a/packages/client-generator/src/emitters/__tests__/setup-bake.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/setup-bake.test.ts
@@ -3,7 +3,7 @@ import { bakeSetup } from '../setup-bake.js';
 const FILE = `
 import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
 export default defineClientSetup({
-  config: { baseUrl: 'https://api.acme.com', retry: { retries: 3 } },
+  config: { serverUrl: 'https://api.acme.com', retry: { retries: 3 } },
   middleware: [{ onRequest: (ctx: RequestContext) => { ctx.headers['X-Acme'] = '1'; } }],
 });
 `;
@@ -13,7 +13,7 @@ describe('bakeSetup', () => {
     const out = bakeSetup(FILE);
     expect(out).not.toContain("from '@redocly/client-generator'");
     expect(out).not.toContain('defineClientSetup');
-    expect(out).toContain("baseUrl: 'https://api.acme.com'");
+    expect(out).toContain("serverUrl: 'https://api.acme.com'");
     expect(out).toContain("ctx.headers['X-Acme'] = '1'");
     // No facade-specific application — that is the emitter's job.
     expect(out).not.toContain('configure(');
@@ -31,8 +31,8 @@ describe('bakeSetup', () => {
   });
 
   it('accepts a bare default-exported object (no defineClientSetup wrapper)', () => {
-    const out = bakeSetup(`export default { config: { baseUrl: 'https://x' } };`);
-    expect(out).toBe("{ config: { baseUrl: 'https://x' } }");
+    const out = bakeSetup(`export default { config: { serverUrl: 'https://x' } };`);
+    expect(out).toBe("{ config: { serverUrl: 'https://x' } }");
   });
 
   it('wraps file-level helper declarations in an IIFE so they are preserved and scoped', () => {
diff --git a/packages/client-generator/src/emitters/__tests__/transformers.test.ts b/packages/client-generator/src/emitters/__tests__/transformers.test.ts
index 26d3693182..eee2e6783c 100644
--- a/packages/client-generator/src/emitters/__tests__/transformers.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/transformers.test.ts
@@ -4,7 +4,7 @@ import { renderTransformersModule } from '../transformers.js';
 const base: Omit<ApiModel, 'schemas'> = {
   title: 'T',
   version: '1',
-  baseUrl: 'https://x',
+  serverUrl: 'https://x',
   services: [],
   securitySchemes: [],
 };
diff --git a/packages/client-generator/src/emitters/client.ts b/packages/client-generator/src/emitters/client.ts
index 7aa203fd13..c95c71611e 100644
--- a/packages/client-generator/src/emitters/client.ts
+++ b/packages/client-generator/src/emitters/client.ts
@@ -39,7 +39,7 @@ export type EmitOptions = {
    * Override the BASE URL inlined into the emitted runtime. When omitted, the
    * value is derived from `servers[0].url` in the source OpenAPI document.
    */
-  baseUrl?: string;
+  serverUrl?: string;
   /**
    * How named string enums are emitted:
    * - `'union'`: only the string-literal union type (`type X = "a" | "b"`).
@@ -142,7 +142,7 @@ function renderFragments(
   options: EmitOptions,
   exportHelpers: boolean
 ): ClientFragments {
-  const baseUrl = options.baseUrl ?? model.baseUrl;
+  const serverUrl = options.serverUrl ?? model.serverUrl;
   const enumStyle: EnumStyle = options.enumStyle ?? 'const-object';
   const errorMode = options.errorMode ?? 'throw';
   const dateType: DateType = options.dateType ?? 'string';
@@ -167,7 +167,7 @@ function renderFragments(
     typeGuards: typeGuardStatements(model.schemas),
     operationsMeta: operationsMetaStatements(allOps),
     runtime: runtimeStatements(
-      baseUrl,
+      serverUrl,
       needsHeaderHelper,
       exportHelpers,
       errorMode,
diff --git a/packages/client-generator/src/emitters/runtime.ts b/packages/client-generator/src/emitters/runtime.ts
index c7894330eb..62b86a00c2 100644
--- a/packages/client-generator/src/emitters/runtime.ts
+++ b/packages/client-generator/src/emitters/runtime.ts
@@ -44,7 +44,7 @@ const DEFAULT_OPERATION_CONTEXT: OperationContextTypes = {
 };
 
 export function renderRuntime(
-  baseUrl: string,
+  serverUrl: string,
   needsHeaderHelper: boolean,
   exportHelpers: boolean,
   errorMode: 'throw' | 'result' = 'throw',
@@ -55,7 +55,7 @@ export function renderRuntime(
 ): string {
   return printStatements(
     runtimeStatements(
-      baseUrl,
+      serverUrl,
       needsHeaderHelper,
       exportHelpers,
       errorMode,
@@ -73,7 +73,7 @@ export function renderRuntime(
  * into the single-file / module statement lists. `renderRuntime` prints these.
  */
 export function runtimeStatements(
-  baseUrl: string,
+  serverUrl: string,
   needsHeaderHelper: boolean,
   exportHelpers: boolean,
   errorMode: 'throw' | 'result' = 'throw',
@@ -84,7 +84,7 @@ export function runtimeStatements(
 ): ts.Statement[] {
   return parseStatements(
     runtimeSource(
-      baseUrl,
+      serverUrl,
       needsHeaderHelper,
       exportHelpers,
       errorMode,
@@ -97,7 +97,7 @@ export function runtimeStatements(
 }
 
 function runtimeSource(
-  baseUrl: string,
+  serverUrl: string,
   needsHeaderHelper: boolean,
   exportHelpers: boolean,
   errorMode: 'throw' | 'result',
@@ -106,7 +106,7 @@ function runtimeSource(
   needsMultipart: boolean,
   opCtx: OperationContextTypes
 ): string {
-  const base = JSON.stringify(baseUrl);
+  const base = JSON.stringify(serverUrl);
   const ex = exportHelpers ? 'export ' : '';
   const multipartBlock = needsMultipart
     ? `
@@ -363,7 +363,7 @@ export type RequestContext = {
  */
 export type ClientConfig = {
   /** Base URL for this client; overrides the inlined default and \`setBaseUrl()\`. */
-  baseUrl?: string;
+  serverUrl?: string;
   /** Extra headers merged into every request; a function is invoked per request. */
   headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
   /** Transport used to issue requests. Defaults to the global \`fetch\`. */
@@ -457,7 +457,7 @@ export type RequestOptions = RequestInit & { retry?: Partial<RetryConfig>; parse
  * (e.g. dev / staging / prod toggles in a single-page app).
  *
  * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with \`new Client({ baseUrl })\`.
+ * bases at once, use the service-class facade with \`new Client({ serverUrl })\`.
  */
 export function setBaseUrl(url: string): void {
   BASE = url;
@@ -545,7 +545,7 @@ ${ex}function __buildUrl(
   query?: Record<string, QueryValue>,
   styles?: Record<string, QueryStyle>
 ): string {
-  const url = (config.baseUrl ?? BASE).replace(/\\/+$/, '') + path;
+  const url = (config.serverUrl ?? BASE).replace(/\\/+$/, '') + path;
   if (!query) return url;
   const params = new URLSearchParams();
   const raw: string[] = [];
diff --git a/packages/client-generator/src/generators/__tests__/sdk.test.ts b/packages/client-generator/src/generators/__tests__/sdk.test.ts
index 1b04636a26..d22d8c76bf 100644
--- a/packages/client-generator/src/generators/__tests__/sdk.test.ts
+++ b/packages/client-generator/src/generators/__tests__/sdk.test.ts
@@ -6,7 +6,7 @@ function apiModel(): ApiModel {
   return {
     title: 'T',
     version: '1.0.0',
-    baseUrl: 'https://api.example.com',
+    serverUrl: 'https://api.example.com',
     services: [
       {
         name: 'Default',
diff --git a/packages/client-generator/src/generators/types.ts b/packages/client-generator/src/generators/types.ts
index 89643e6c04..cc51e6face 100644
--- a/packages/client-generator/src/generators/types.ts
+++ b/packages/client-generator/src/generators/types.ts
@@ -15,7 +15,7 @@ export type GeneratorInput = {
   outputPath: string;
   /** File partitioning the generator should honor. */
   outputMode: OutputMode;
-  /** Emit options (baseUrl/enumStyle/facade/argsStyle/name). */
+  /** Emit options (serverUrl/enumStyle/facade/argsStyle/name). */
   emit: EmitOptions;
 };
 
diff --git a/packages/client-generator/src/index.ts b/packages/client-generator/src/index.ts
index 4afbb8a0d3..983e804425 100644
--- a/packages/client-generator/src/index.ts
+++ b/packages/client-generator/src/index.ts
@@ -119,7 +119,7 @@ export async function generateClient(
     outputPath,
     outputMode: options.outputMode ?? 'single',
     emit: {
-      baseUrl: options.baseUrl,
+      serverUrl: options.serverUrl,
       enumStyle: options.enumStyle,
       facade: options.facade,
       argsStyle: options.argsStyle,
diff --git a/packages/client-generator/src/ir/__tests__/build.test.ts b/packages/client-generator/src/ir/__tests__/build.test.ts
index d98f583158..93ae5694cd 100644
--- a/packages/client-generator/src/ir/__tests__/build.test.ts
+++ b/packages/client-generator/src/ir/__tests__/build.test.ts
@@ -70,7 +70,7 @@ describe('buildApiModel — operationId fallback naming', () => {
 });
 
 describe('buildApiModel — top-level metadata', () => {
-  it('reads title/version/description/baseUrl from info & servers', () => {
+  it('reads title/version/description/serverUrl from info & servers', () => {
     const model = buildApiModel(
       doc({
         info: { title: 'My API', version: '2.0.0', description: 'docs here' },
@@ -80,7 +80,7 @@ describe('buildApiModel — top-level metadata', () => {
     expect(model.title).toBe('My API');
     expect(model.version).toBe('2.0.0');
     expect(model.description).toBe('docs here');
-    expect(model.baseUrl).toBe('https://api.example.com');
+    expect(model.serverUrl).toBe('https://api.example.com');
   });
 
   it('falls back to defaults when info/servers are missing', () => {
@@ -88,7 +88,7 @@ describe('buildApiModel — top-level metadata', () => {
     expect(model.title).toBe('Api');
     expect(model.version).toBe('0.0.0');
     expect(model.description).toBeUndefined();
-    expect(model.baseUrl).toBe('');
+    expect(model.serverUrl).toBe('');
   });
 
   it('emits an empty schemas array when components.schemas is absent', () => {
diff --git a/packages/client-generator/src/ir/__tests__/sanitize-identifiers.test.ts b/packages/client-generator/src/ir/__tests__/sanitize-identifiers.test.ts
index 4c5ad0602c..a8c305899c 100644
--- a/packages/client-generator/src/ir/__tests__/sanitize-identifiers.test.ts
+++ b/packages/client-generator/src/ir/__tests__/sanitize-identifiers.test.ts
@@ -5,7 +5,7 @@ function model(schemas: ApiModel['schemas'], operations: OperationModel[] = []):
   return {
     title: 'T',
     version: '1',
-    baseUrl: '',
+    serverUrl: '',
     services: [{ name: 'Default', operations }],
     schemas,
     securitySchemes: [],
diff --git a/packages/client-generator/src/ir/build.ts b/packages/client-generator/src/ir/build.ts
index b30be15091..f4753a2da4 100644
--- a/packages/client-generator/src/ir/build.ts
+++ b/packages/client-generator/src/ir/build.ts
@@ -202,7 +202,7 @@ export function buildApiModel(doc: Oas3Definition): ApiModel {
   const title = doc.info?.title ?? 'Api';
   const version = doc.info?.version ?? '0.0.0';
   const description = doc.info?.description;
-  const baseUrl = doc.servers?.[0]?.url ?? '';
+  const serverUrl = doc.servers?.[0]?.url ?? '';
 
   const schemas = buildNamedSchemas(doc);
   const securitySchemes = buildSecuritySchemes(doc);
@@ -212,7 +212,7 @@ export function buildApiModel(doc: Oas3Definition): ApiModel {
     title,
     version,
     description,
-    baseUrl,
+    serverUrl,
     services,
     schemas,
     securitySchemes,
diff --git a/packages/client-generator/src/ir/model.ts b/packages/client-generator/src/ir/model.ts
index 24adbd0658..0073d4ec76 100644
--- a/packages/client-generator/src/ir/model.ts
+++ b/packages/client-generator/src/ir/model.ts
@@ -222,7 +222,7 @@ export type ApiModel = {
   title: string;
   version: string;
   description?: string;
-  baseUrl: string;
+  serverUrl: string;
   services: ServiceModel[];
   schemas: NamedSchemaModel[];
   securitySchemes: SecuritySchemeModel[];
diff --git a/packages/client-generator/src/runtime-contract.ts b/packages/client-generator/src/runtime-contract.ts
index 34079a660e..52715ec7c7 100644
--- a/packages/client-generator/src/runtime-contract.ts
+++ b/packages/client-generator/src/runtime-contract.ts
@@ -43,7 +43,7 @@ export type RetryConfig = {
  * (everything except the spec-derived `auth`).
  */
 export type ClientSetupConfig = {
-  baseUrl?: string;
+  serverUrl?: string;
   headers?:
     | Record<string, string>
     | (() => Record<string, string> | Promise<Record<string, string>>);
diff --git a/packages/client-generator/src/types.ts b/packages/client-generator/src/types.ts
index 30684f132b..40e0e98eb8 100644
--- a/packages/client-generator/src/types.ts
+++ b/packages/client-generator/src/types.ts
@@ -38,7 +38,7 @@ export type GenerateClientOptions = {
    * Validation (e.g. `new URL(value)`) is the caller's responsibility — the
    * CLI handler validates before calling.
    */
-  baseUrl?: string;
+  serverUrl?: string;
   /**
    * How named string enums are emitted. `'const-object'` (default) emits a
    * runtime `as const` companion object alongside the union type; `'union'`
diff --git a/packages/client-generator/src/writers/__tests__/group-by-tag.test.ts b/packages/client-generator/src/writers/__tests__/group-by-tag.test.ts
index a016d2ad8c..6ec32e6061 100644
--- a/packages/client-generator/src/writers/__tests__/group-by-tag.test.ts
+++ b/packages/client-generator/src/writers/__tests__/group-by-tag.test.ts
@@ -20,7 +20,7 @@ function model(ops: OperationModel[]): ApiModel {
   return {
     title: 'T',
     version: '1.0.0',
-    baseUrl: '',
+    serverUrl: '',
     services: [{ name: 'Default', operations: ops }],
     schemas: [],
     securitySchemes: [],
diff --git a/packages/client-generator/src/writers/__tests__/index.test.ts b/packages/client-generator/src/writers/__tests__/index.test.ts
index a6dafeb78f..6314c22de0 100644
--- a/packages/client-generator/src/writers/__tests__/index.test.ts
+++ b/packages/client-generator/src/writers/__tests__/index.test.ts
@@ -8,7 +8,7 @@ import { tagsWriter } from '../tags-writer.js';
 const model: ApiModel = {
   title: 'Tiny',
   version: '1.0.0',
-  baseUrl: 'https://api.example.com',
+  serverUrl: 'https://api.example.com',
   services: [
     {
       name: 'Default',
diff --git a/packages/client-generator/src/writers/__tests__/split-writer.test.ts b/packages/client-generator/src/writers/__tests__/split-writer.test.ts
index 57ceebd0e0..438e62e8f9 100644
--- a/packages/client-generator/src/writers/__tests__/split-writer.test.ts
+++ b/packages/client-generator/src/writers/__tests__/split-writer.test.ts
@@ -21,7 +21,7 @@ function model(overrides: Partial<ApiModel> = {}): ApiModel {
   return {
     title: 'Tiny',
     version: '1.0.0',
-    baseUrl: 'https://api.example.com',
+    serverUrl: 'https://api.example.com',
     services: [{ name: 'Default', operations: [] }],
     schemas: [],
     securitySchemes: [],
diff --git a/packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts b/packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts
index 65004dd6cf..cc71d29f31 100644
--- a/packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts
+++ b/packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts
@@ -21,7 +21,7 @@ function model(overrides: Partial<ApiModel> = {}): ApiModel {
   return {
     title: 'T',
     version: '1.0.0',
-    baseUrl: 'https://api.example.com',
+    serverUrl: 'https://api.example.com',
     services: [{ name: 'Default', operations: [] }],
     schemas: [],
     securitySchemes: [],
diff --git a/packages/client-generator/src/writers/__tests__/tags-writer.test.ts b/packages/client-generator/src/writers/__tests__/tags-writer.test.ts
index 55a00ea2b2..3f000675c3 100644
--- a/packages/client-generator/src/writers/__tests__/tags-writer.test.ts
+++ b/packages/client-generator/src/writers/__tests__/tags-writer.test.ts
@@ -21,7 +21,7 @@ function model(overrides: Partial<ApiModel> = {}): ApiModel {
   return {
     title: 'T',
     version: '1.0.0',
-    baseUrl: 'https://api.example.com',
+    serverUrl: 'https://api.example.com',
     services: [{ name: 'Default', operations: [] }],
     schemas: [],
     securitySchemes: [],

From 9379791b611dc03baad9672514963502852a713f Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 10:58:40 +0300
Subject: [PATCH 044/134] feat(cli): generate-client reads the client config
 block; three invocation modes

Replace the x-client-generator reader with the new model:
- no positional -> fan out over every api that has a `client` block; output is
  `clientOutput` or `<name>.client.ts` in the redocly.yaml dir (--output rejected)
- positional matching an `apis:` alias -> that api's root + `client` block + clientOutput
- positional that isn't an alias -> a plain file/URL, ignoring `apis:`; top-level
  `client` still applies

Precedence: top-level `client` < per-api `client` < CLI flags. Rename the
--base-url flag to --server-url. Errors when no api opts in, or --output is used
with a fan-out.
---
 packages/cli/src/commands/generate-client.ts | 210 +++++++++++--------
 packages/cli/src/index.ts                    |   4 +-
 2 files changed, 123 insertions(+), 91 deletions(-)

diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index e96dcc104d..2fc5022b55 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -1,42 +1,16 @@
 import { type Config as OpenApiTsConfig } from '@redocly/client-generator';
-import { type Config, HandledError, isPlainObject, logger } from '@redocly/openapi-core';
+import { HandledError, isPlainObject, logger } from '@redocly/openapi-core';
 import { blue, gray, yellow } from 'colorette';
-import { dirname, isAbsolute, resolve as resolvePath } from 'node:path';
+import { basename, dirname, extname, isAbsolute, resolve as resolvePath } from 'node:path';
 
 import { getAliasOrPath } from '../utils/miscellaneous.js';
 import { type CommandArgs } from '../wrapper.js';
 
-/**
- * Read generate-client settings from a `redocly.yaml`'s `x-client-generator`
- * extension block (the auto-discovered config, or the one at `--config`). Relative
- * `api`/`output` are resolved against the config file's directory so they mean the
- * same thing regardless of the current working directory. Returns `{}` when the block
- * is absent. (A URL/registry `api` is left untouched.)
- */
-function readRedoclyExtension(config: Config): Record<string, unknown> {
-  const raw = (config.resolvedConfig as Record<string, unknown>)['x-client-generator'];
-  if (!isPlainObject(raw)) return {};
-  const ext: Record<string, unknown> = { ...raw };
-  const baseDir = config.configPath ? dirname(config.configPath) : undefined;
-  if (baseDir) {
-    if (typeof ext.api === 'string' && !isAbsolute(ext.api) && !/^https?:\/\//i.test(ext.api)) {
-      ext.api = resolvePath(baseDir, ext.api);
-    }
-    if (typeof ext.output === 'string' && !isAbsolute(ext.output)) {
-      ext.output = resolvePath(baseDir, ext.output);
-    }
-    if (typeof ext.setup === 'string' && !isAbsolute(ext.setup)) {
-      ext.setup = resolvePath(baseDir, ext.setup);
-    }
-  }
-  return ext;
-}
-
 export type GenerateClientCommandArgv = {
   api?: string;
   output?: string;
   config?: string;
-  'base-url'?: string;
+  'server-url'?: string;
   'enum-style'?: 'union' | 'const-object';
   'output-mode'?: 'single' | 'split' | 'tags' | 'tags-split';
   facade?: 'functions' | 'service-class';
@@ -53,6 +27,25 @@ export type GenerateClientCommandArgv = {
   setup?: string;
 };
 
+type ClientConfig = Partial<OpenApiTsConfig>;
+
+/** A single client to generate: which API to read, where to write it, and its per-API `client` block. */
+type Job = { name: string; api: string; clientOutput?: string; perApiClient: ClientConfig };
+
+/** Resolve a `client` block's relative `setup` path against the config dir (URLs/absolute left as-is). */
+function resolveSetup(client: ClientConfig, configDir: string): ClientConfig {
+  const { setup } = client;
+  if (typeof setup === 'string' && !isAbsolute(setup) && !/^https?:\/\//i.test(setup)) {
+    return { ...client, setup: resolvePath(configDir, setup) };
+  }
+  return client;
+}
+
+/** Make an API name safe as a filename segment (path separators would escape the target dir). */
+function fileNameFor(name: string): string {
+  return `${name.replace(/[\\/]/g, '_')}.client.ts`;
+}
+
 export async function handleGenerateClient({
   argv,
   config,
@@ -60,13 +53,22 @@ export async function handleGenerateClient({
   const { generateClient } = await import('@redocly/client-generator');
   const { mergeConfig } = await import('@redocly/client-generator/config-file');
 
-  // Config sources, lowest → highest precedence: the `redocly.yaml` `x-client-generator`
-  // block (located via the standard `--config` flag, else discovered in cwd) → CLI flags.
-  const redoclyExtension = readRedoclyExtension(config);
-  const merged = mergeConfig(redoclyExtension as Partial<OpenApiTsConfig>, {
-    api: argv.api,
-    output: argv.output,
-    serverUrl: argv['base-url'],
+  const resolved = config.resolvedConfig as Record<string, unknown>;
+  const configDir = config.configPath ? dirname(config.configPath) : process.cwd();
+  // Top-level `client` block: shared defaults (relative `setup` resolved against the config dir).
+  const topClient = resolveSetup(
+    (isPlainObject(resolved.client) ? resolved.client : {}) as ClientConfig,
+    configDir
+  );
+  const apisCfg = (isPlainObject(resolved.apis) ? resolved.apis : {}) as Record<
+    string,
+    Record<string, unknown>
+  >;
+
+  // CLI setting flags override both the top-level and per-API `client` blocks. `--setup` is
+  // relative to the cwd (like `--output`); `api`/`output` are not settings and stay out of the merge.
+  const cliFlags: ClientConfig = {
+    serverUrl: argv['server-url'],
     enumStyle: argv['enum-style'],
     outputMode: argv['output-mode'],
     facade: argv.facade,
@@ -78,66 +80,96 @@ export async function handleGenerateClient({
     mockSeed: argv['mock-seed'],
     name: argv.name,
     generators: argv.generators,
-    setup: argv.setup,
-  });
+    setup: argv.setup === undefined ? undefined : resolvePath(argv.setup),
+  };
 
-  if (!merged.api)
-    throw new HandledError(`\n❌  No API. Pass <api> or set it in a config file.\n`);
-  if (!merged.output)
-    throw new HandledError(`\n❌  No output. Pass --output or set it in a config file.\n`);
+  const perApiJob = (name: string): Job => {
+    const apiCfg = apisCfg[name];
+    return {
+      name,
+      api: getAliasOrPath(config, name).path,
+      clientOutput: typeof apiCfg?.clientOutput === 'string' ? apiCfg.clientOutput : undefined,
+      perApiClient: isPlainObject(apiCfg?.client)
+        ? resolveSetup(apiCfg.client as ClientConfig, configDir)
+        : {},
+    };
+  };
 
-  // Resolve `<api>` as a `redocly.yaml` `apis:` alias when it matches one (to the
-  // alias's `root`, relative to the config dir); a plain path/URL passes through.
-  const api = getAliasOrPath(config, merged.api).path;
-  const outputPath = resolvePath(merged.output);
-  // A relative `--setup` resolves against the cwd, like `--output` (a config-file
-  // `setup` was already resolved against the config dir in readRedoclyExtension);
-  // passing an absolute path makes generateClient's own resolution a no-op.
-  const setupPath = merged.setup === undefined ? undefined : resolvePath(merged.setup);
+  // Three invocation modes, keyed off the positional argument.
+  const jobs: Job[] = [];
+  if (argv.api === undefined) {
+    // Fan-out: generate for every API that opts in with a `client` block.
+    if (argv.output) {
+      throw new HandledError(
+        `\n❌  --output can't target multiple APIs. Set \`clientOutput\` under each api in redocly.yaml, or pass a single <api>.\n`
+      );
+    }
+    for (const [name, apiCfg] of Object.entries(apisCfg)) {
+      if (isPlainObject(apiCfg.client)) jobs.push(perApiJob(name));
+    }
+    if (jobs.length === 0) {
+      throw new HandledError(
+        `\n❌  No API to generate. Add a \`client\` block under an \`apis:\` entry, or pass <api> (a file/URL or an \`apis:\` alias).\n`
+      );
+    }
+  } else if (apisCfg[argv.api]) {
+    // Named `apis:` alias: use its root, its `client` block (if any), and its `clientOutput`.
+    jobs.push(perApiJob(argv.api));
+  } else {
+    // Plain file/URL: ignore the `apis:` registry; use the top-level `client` defaults only.
+    jobs.push({ name: basename(argv.api, extname(argv.api)), api: argv.api, perApiClient: {} });
+  }
 
-  // Relative-path generator specifiers (and inline plugins) resolve against the
-  // `redocly.yaml` directory (the config's location), else the working directory.
-  const configDir = config.configPath ? dirname(config.configPath) : process.cwd();
+  for (const job of jobs) {
+    const merged = mergeConfig(mergeConfig(topClient, job.perApiClient), cliFlags);
 
-  if (!outputPath.endsWith('.ts')) {
-    throw new HandledError(
-      `\n❌  output must point at a TypeScript file (ending in .ts).\n   Got: ${outputPath}\n`
-    );
-  }
-  if (merged.serverUrl !== undefined) {
-    try {
-      // Accept absolute URLs (https://api.example.com) and relative bases (/v1):
-      // OpenAPI allows relative `servers[].url`, and the runtime concatenates
-      // serverUrl + path, so a relative base needs no absolute origin.
-      new URL(merged.serverUrl, 'http://localhost');
-    } catch {
+    // Output: an explicit `--output` (single-API modes) wins; else the per-API `clientOutput`
+    // (config-dir-relative); else `<name>.client.ts` in the config dir.
+    const outputPath =
+      argv.output !== undefined
+        ? resolvePath(argv.output)
+        : job.clientOutput !== undefined
+          ? resolvePath(configDir, job.clientOutput)
+          : resolvePath(configDir, fileNameFor(job.name));
+
+    if (!outputPath.endsWith('.ts')) {
       throw new HandledError(
-        `\n❌  --base-url must be a valid URL — absolute (https://api.example.com) or relative (/v1).\n   Got: ${merged.serverUrl}\n`
+        `\n❌  output must point at a TypeScript file (ending in .ts).\n   Got: ${outputPath}\n`
       );
     }
-  }
+    if (merged.serverUrl !== undefined) {
+      try {
+        // Accept absolute URLs (https://api.example.com) and relative bases (/v1): OpenAPI allows
+        // relative `servers[].url`, and the runtime concatenates serverUrl + path.
+        new URL(merged.serverUrl, 'http://localhost');
+      } catch {
+        throw new HandledError(
+          `\n❌  --server-url must be a valid URL — absolute (https://api.example.com) or relative (/v1).\n   Got: ${merged.serverUrl}\n`
+        );
+      }
+    }
 
-  try {
-    logger.info(gray('\n  Generating TypeScript client... \n'));
-    const result = await generateClient({
-      ...merged,
-      api,
-      output: outputPath,
-      setup: setupPath,
-      config,
-      configDir,
-    });
-    const summary =
-      result.files.length === 1
-        ? `TypeScript client successfully generated to ${yellow(result.outputPath)} (${result.bytes} bytes).`
-        : `TypeScript client successfully generated: ${result.files.length} files (${result.bytes} bytes), entry at ${yellow(result.outputPath)}.`;
-    logger.info('\n' + blue(summary) + '\n');
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    throw new HandledError(
-      '\n' +
-        `❌  Failed to generate TypeScript client.\n   ${message}\n` +
-        '   Check the API description file path and that the OpenAPI document is valid.'
-    );
+    try {
+      logger.info(gray(`\n  Generating TypeScript client${job.name ? ` for ${job.name}` : ''}... \n`));
+      const result = await generateClient({
+        ...merged,
+        api: job.api,
+        output: outputPath,
+        config,
+        configDir,
+      });
+      const summary =
+        result.files.length === 1
+          ? `TypeScript client successfully generated to ${yellow(result.outputPath)} (${result.bytes} bytes).`
+          : `TypeScript client successfully generated: ${result.files.length} files (${result.bytes} bytes), entry at ${yellow(result.outputPath)}.`;
+      logger.info('\n' + blue(summary) + '\n');
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new HandledError(
+        '\n' +
+          `❌  Failed to generate TypeScript client${job.name ? ` for ${job.name}` : ''}.\n   ${message}\n` +
+          '   Check the API description file path and that the OpenAPI document is valid.'
+      );
+    }
   }
 }
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index 699c87ce2d..928835d4b4 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -872,9 +872,9 @@ yargs(hideBin(process.argv))
             type: 'string',
             requiresArg: true,
           },
-          'base-url': {
+          'server-url': {
             describe:
-              'Override the BASE URL inlined into the generated runtime. Defaults to `servers[0].url`.',
+              'Override the server URL inlined into the generated runtime. Defaults to `servers[0].url`.',
             type: 'string',
             requiresArg: true,
           },

From 37b5949660ab25bd9bfe9065cdd741135d76c353 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 12:05:03 +0300
Subject: [PATCH 045/134] test(client-generator): move examples + e2e to the
 new client config model

Restructure the 8 example redocly.yaml files to the new shape (apis.<name> with
root + clientOutput + a client block; the api key is the example folder name).
Rewrite redocly-config.test.ts to cover the three invocation modes (fan-out, alias,
plain path) and the error cases. Rename baseUrl -> serverUrl and --base-url ->
--server-url across the e2e consumers and tests, and regenerate every committed
client, consumer fixture, and the cafe snapshot. Fix the drift test to regenerate
via alias mode (a bare --output is now a fan-out error).
---
 .../e2e/generate-client/base-consumer/api.ts  |   6 +-
 .../e2e/generate-client/cafe-consumer/api.ts  |   6 +-
 .../cafe-consumer/index-setbaseurl.ts         |   2 +-
 tests/e2e/generate-client/cafe.snapshot.ts    |   6 +-
 tests/e2e/generate-client/cafe.test.ts        |   8 +-
 tests/e2e/generate-client/examples.test.ts    |  11 +-
 tests/e2e/generate-client/examples/README.md  |   2 +-
 .../examples/baked-setup/client-setup.ts      |   2 +-
 .../examples/baked-setup/redocly.yaml         |  19 +-
 .../examples/baked-setup/src/api/client.ts    |   8 +-
 .../examples/custom-generator/redocly.yaml    |  20 +-
 .../custom-generator/src/api/client.ts        |   6 +-
 .../examples/custom-generator/src/main.ts     |   2 +-
 .../examples/customization/redocly.yaml       |  18 +-
 .../examples/customization/src/api/client.ts  |   6 +-
 .../examples/fetch-functions/README.md        |   2 +-
 .../examples/fetch-functions/redocly.yaml     |  18 +-
 .../fetch-functions/src/api/client.ts         |   6 +-
 .../examples/fetch-functions/src/main.ts      |   2 +-
 .../examples/mock/redocly.yaml                |  20 +-
 .../examples/mock/src/api/client.ts           |   6 +-
 .../generate-client/examples/mock/src/main.ts |   2 +-
 .../generate-client/examples/mock/src/node.ts |   2 +-
 .../examples/programmatic/src/api/client.ts   |   6 +-
 .../examples/programmatic/src/main.ts         |   2 +-
 .../examples/service-class/README.md          |   2 +-
 .../examples/service-class/redocly.yaml       |  18 +-
 .../examples/service-class/src/api/client.ts  |   6 +-
 .../examples/service-class/src/main.ts        |   2 +-
 .../examples/tanstack-query/redocly.yaml      |  20 +-
 .../examples/tanstack-query/src/App.tsx       |   2 +-
 .../examples/tanstack-query/src/api/client.ts |   6 +-
 .../generate-client/examples/zod/redocly.yaml |  20 +-
 .../examples/zod/src/api/client.ts            |   6 +-
 .../generate-client/examples/zod/src/main.ts  |   2 +-
 tests/e2e/generate-client/extension.test.ts   |  16 +-
 tests/e2e/generate-client/middleware.test.ts  |   2 +-
 tests/e2e/generate-client/mock.test.ts        |   2 +-
 .../generate-client/redocly-config.test.ts    | 180 ++++++++++++------
 tests/e2e/generate-client/setup.test.ts       |   6 +-
 tests/e2e/generate-client/sse-consumer/api.ts |   6 +-
 .../sse-consumer/index-abort.ts               |   4 +-
 .../sse-consumer/index-finite.ts              |   4 +-
 .../e2e/generate-client/sse-consumer/index.ts |   6 +-
 44 files changed, 294 insertions(+), 204 deletions(-)

diff --git a/tests/e2e/generate-client/base-consumer/api.ts b/tests/e2e/generate-client/base-consumer/api.ts
index 8c9fa2a7aa..91e81ab89b 100644
--- a/tests/e2e/generate-client/base-consumer/api.ts
+++ b/tests/e2e/generate-client/base-consumer/api.ts
@@ -153,7 +153,7 @@ export type RequestContext = {
  */
 export type ClientConfig = {
     /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
-    baseUrl?: string;
+    serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
     /** Transport used to issue requests. Defaults to the global `fetch`. */
@@ -250,7 +250,7 @@ export type RequestOptions = RequestInit & {
  * (e.g. dev / staging / prod toggles in a single-page app).
  *
  * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
 export function setBaseUrl(url: string): void {
     BASE = url;
@@ -325,7 +325,7 @@ function __encodeReserved(value: string): string {
 }
 
 function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
     if (!query)
         return url;
     const params = new URLSearchParams();
diff --git a/tests/e2e/generate-client/cafe-consumer/api.ts b/tests/e2e/generate-client/cafe-consumer/api.ts
index c93d4aee62..150ccd0e94 100644
--- a/tests/e2e/generate-client/cafe-consumer/api.ts
+++ b/tests/e2e/generate-client/cafe-consumer/api.ts
@@ -477,7 +477,7 @@ export type RequestContext = {
  */
 export type ClientConfig = {
     /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
-    baseUrl?: string;
+    serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
     /** Transport used to issue requests. Defaults to the global `fetch`. */
@@ -581,7 +581,7 @@ export type RequestOptions = RequestInit & {
  * (e.g. dev / staging / prod toggles in a single-page app).
  *
  * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
 export function setBaseUrl(url: string): void {
     BASE = url;
@@ -656,7 +656,7 @@ function __encodeReserved(value: string): string {
 }
 
 function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
     if (!query)
         return url;
     const params = new URLSearchParams();
diff --git a/tests/e2e/generate-client/cafe-consumer/index-setbaseurl.ts b/tests/e2e/generate-client/cafe-consumer/index-setbaseurl.ts
index 107454ba1c..eabfe7c241 100644
--- a/tests/e2e/generate-client/cafe-consumer/index-setbaseurl.ts
+++ b/tests/e2e/generate-client/cafe-consumer/index-setbaseurl.ts
@@ -33,7 +33,7 @@ async function step(name: string, run: () => Promise<unknown>): Promise<StepResu
 async function main(): Promise<void> {
   const results: StepResult[] = [];
 
-  // 1) Baseline: the file was generated with --base-url ${CAFE_BASE}, so the first
+  // 1) Baseline: the file was generated with --server-url ${CAFE_BASE}, so the first
   //    call should succeed against the mock server.
   results.push(await step('initial-call-against-mock', () => listMenuItems({ limit: 1 })));
 
diff --git a/tests/e2e/generate-client/cafe.snapshot.ts b/tests/e2e/generate-client/cafe.snapshot.ts
index 241ef5fac7..01ffeb8c5c 100644
--- a/tests/e2e/generate-client/cafe.snapshot.ts
+++ b/tests/e2e/generate-client/cafe.snapshot.ts
@@ -477,7 +477,7 @@ export type RequestContext = {
  */
 export type ClientConfig = {
     /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
-    baseUrl?: string;
+    serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
     /** Transport used to issue requests. Defaults to the global `fetch`. */
@@ -581,7 +581,7 @@ export type RequestOptions = RequestInit & {
  * (e.g. dev / staging / prod toggles in a single-page app).
  *
  * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
 export function setBaseUrl(url: string): void {
     BASE = url;
@@ -656,7 +656,7 @@ function __encodeReserved(value: string): string {
 }
 
 function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
     if (!query)
         return url;
     const params = new URLSearchParams();
diff --git a/tests/e2e/generate-client/cafe.test.ts b/tests/e2e/generate-client/cafe.test.ts
index f2443cbf67..e173d8e862 100644
--- a/tests/e2e/generate-client/cafe.test.ts
+++ b/tests/e2e/generate-client/cafe.test.ts
@@ -73,7 +73,7 @@ describe('generate-client end-to-end (cafe.yaml)', () => {
   let log: LogEntry[] = [];
   /** Raw generator output — what the CLI emits from cafe.yaml without any overrides. */
   let rawGenerated = '';
-  /** Generator output the consumer imports — same source, but BASE pinned at the mock via --base-url. */
+  /** Generator output the consumer imports — same source, but BASE pinned at the mock via --server-url. */
   let generated = '';
 
   beforeAll(async () => {
@@ -105,11 +105,11 @@ describe('generate-client end-to-end (cafe.yaml)', () => {
     }
     rawGenerated = readFileSync(generatedFile, 'utf-8');
 
-    // Second pass: regenerate with --base-url so the consumer's import targets the mock.
+    // Second pass: regenerate with --server-url so the consumer's import targets the mock.
     // This is the file the consumer actually loads — and replaces the old string-replace hack.
     const consumerGen = spawnSync(
       'node',
-      [cliEntry, 'generate-client', fixture, '--output', generatedFile, '--base-url', SERVER_BASE],
+      [cliEntry, 'generate-client', fixture, '--output', generatedFile, '--server-url', SERVER_BASE],
       { encoding: 'utf-8', cwd: repoRoot }
     );
     if (consumerGen.status !== 0) {
@@ -117,7 +117,7 @@ describe('generate-client end-to-end (cafe.yaml)', () => {
     }
     generated = readFileSync(generatedFile, 'utf-8');
     if (!generated.includes(`let BASE = "${SERVER_BASE}"`)) {
-      throw new Error(`--base-url was not honoured; expected \`let BASE = "${SERVER_BASE}"\``);
+      throw new Error(`--server-url was not honoured; expected \`let BASE = "${SERVER_BASE}"\``);
     }
 
     // Type-check the consumer.
diff --git a/tests/e2e/generate-client/examples.test.ts b/tests/e2e/generate-client/examples.test.ts
index edd95b5e29..b44fcba686 100644
--- a/tests/e2e/generate-client/examples.test.ts
+++ b/tests/e2e/generate-client/examples.test.ts
@@ -22,16 +22,17 @@ const EXAMPLES = [
 ];
 
 /**
- * Regenerate an example's client into `outFile`. A `redocly.yaml` example uses the CLI
- * (auto-discovering its `x-client-generator` block); the programmatic example runs its
- * `generate.ts` with `OUT` redirecting the output.
+ * Regenerate an example's client into `outFile`. A `redocly.yaml` example is generated by
+ * naming its `apis:` alias (which equals the example folder name) with `--output` redirecting
+ * the entry file to a temp dir; the programmatic example runs its `generate.ts` with `OUT`.
  */
 function regenerate(
   exampleDir: string,
+  name: string,
   outFile: string
 ): { status: number | null; stderr: string } {
   if (existsSync(join(exampleDir, 'redocly.yaml'))) {
-    return spawnSync('node', [cli, 'generate-client', '--output', outFile], {
+    return spawnSync('node', [cli, 'generate-client', name, '--output', outFile], {
       cwd: exampleDir,
       encoding: 'utf-8',
     });
@@ -62,7 +63,7 @@ describe('examples are in sync with the generator', () => {
       const tmp = mkdtempSync(join(tmpdir(), `ex-${name}-`));
       try {
         // Regenerate to a temp dir so the committed client isn't touched.
-        const res = regenerate(exampleDir, join(tmp, 'client.ts'));
+        const res = regenerate(exampleDir, name, join(tmp, 'client.ts'));
         expect(res.status, res.stderr).toBe(0);
 
         const committedFiles = listFiles(committed).sort();
diff --git a/tests/e2e/generate-client/examples/README.md b/tests/e2e/generate-client/examples/README.md
index a9ec576853..8c058b1ab9 100644
--- a/tests/e2e/generate-client/examples/README.md
+++ b/tests/e2e/generate-client/examples/README.md
@@ -11,7 +11,7 @@ the `generateClient(...)` API.
 | [fetch-functions](./fetch-functions) | CLI · `sdk`, functions        | free functions + `ApiError`                                                             |
 | [customization](./customization)     | CLI · `sdk`, functions        | request/response middleware, `ctx.operation` targeting, body mutation, custom transport |
 | [baked-setup](./baked-setup)         | CLI · `sdk`, functions        | publisher defaults baked into the client via `--setup` (`defineClientSetup`)            |
-| [service-class](./service-class)     | CLI · `sdk`, service-class    | `new Client({ baseUrl })`, per-instance `auth`                                          |
+| [service-class](./service-class)     | CLI · `sdk`, service-class    | `new Client({ serverUrl })`, per-instance `auth`                                          |
 | [zod](./zod)                         | CLI · `sdk`, `zod`            | validating responses with generated zod schemas                                         |
 | [tanstack-query](./tanstack-query)   | CLI · `sdk`, `tanstack-query` | React `useQuery(<op>Options())`                                                         |
 | [mock](./mock)                       | CLI · `sdk`, `mock`           | MSW handlers from generated `handlers`                                                  |
diff --git a/tests/e2e/generate-client/examples/baked-setup/client-setup.ts b/tests/e2e/generate-client/examples/baked-setup/client-setup.ts
index e48be0dd85..f53e976d94 100644
--- a/tests/e2e/generate-client/examples/baked-setup/client-setup.ts
+++ b/tests/e2e/generate-client/examples/baked-setup/client-setup.ts
@@ -4,7 +4,7 @@ import { defineClientSetup, type RequestContext } from '@redocly/client-generato
 // by `setup:` in redocly.yaml. Imports the contract from the package (not the generated client),
 // so this file resolves and is unit-testable before the client even exists.
 export default defineClientSetup({
-  config: { baseUrl: 'https://api.cafe.redocly.com', retry: { retries: 2 } },
+  config: { serverUrl: 'https://api.cafe.redocly.com', retry: { retries: 2 } },
   middleware: [
     {
       onRequest: (ctx: RequestContext) => {
diff --git a/tests/e2e/generate-client/examples/baked-setup/redocly.yaml b/tests/e2e/generate-client/examples/baked-setup/redocly.yaml
index 674a4f672c..019a947412 100644
--- a/tests/e2e/generate-client/examples/baked-setup/redocly.yaml
+++ b/tests/e2e/generate-client/examples/baked-setup/redocly.yaml
@@ -1,9 +1,12 @@
 # redocly.yaml — drives `redocly generate-client` for this example.
-# `setup` bakes the publisher's defineClientSetup module into the generated client.
-x-client-generator:
-  api: ./openapi.yaml
-  output: ./src/api/client.ts
-  generators:
-    - sdk
-  facade: functions
-  setup: ./client-setup.ts
+# The client is generated for the api that declares a `client` block
+# (run `redocly generate-client` with no args to build every such api).
+apis:
+  baked-setup:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
+      facade: functions
+      setup: ./client-setup.ts
diff --git a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
index 784ba6a735..20dc1d34d6 100644
--- a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
@@ -477,7 +477,7 @@ export type RequestContext = {
  */
 export type ClientConfig = {
     /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
-    baseUrl?: string;
+    serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
     /** Transport used to issue requests. Defaults to the global `fetch`. */
@@ -581,7 +581,7 @@ export type RequestOptions = RequestInit & {
  * (e.g. dev / staging / prod toggles in a single-page app).
  *
  * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
 export function setBaseUrl(url: string): void {
     BASE = url;
@@ -656,7 +656,7 @@ function __encodeReserved(value: string): string {
 }
 
 function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
     if (!query)
         return url;
     const params = new URLSearchParams();
@@ -1535,7 +1535,7 @@ export async function registerOAuth2Client(body: RegisterClientObject, init: Req
 
 // ─── Baked-in setup (--setup) ───
 const __redoclySetup: { config?: ClientConfig; middleware?: Middleware[] } = {
-  config: { baseUrl: 'https://api.cafe.redocly.com', retry: { retries: 2 } },
+  config: { serverUrl: 'https://api.cafe.redocly.com', retry: { retries: 2 } },
   middleware: [
     {
       onRequest: (ctx: RequestContext) => {
diff --git a/tests/e2e/generate-client/examples/custom-generator/redocly.yaml b/tests/e2e/generate-client/examples/custom-generator/redocly.yaml
index fc306c3947..564217cd50 100644
--- a/tests/e2e/generate-client/examples/custom-generator/redocly.yaml
+++ b/tests/e2e/generate-client/examples/custom-generator/redocly.yaml
@@ -1,10 +1,12 @@
 # redocly.yaml — drives `redocly generate-client` for this example.
-# The `generators` list mixes a built-in (`sdk`) with a custom generator referenced by path
-# (the experimental plugin API). The path is resolved against this file's directory.
-x-client-generator:
-  api: ./openapi.yaml
-  output: ./src/api/client.ts
-  generators:
-    - sdk
-    - ./route-map-generator.mjs
-  facade: functions
+# The client is generated for the api that declares a `client` block
+# (run `redocly generate-client` with no args to build every such api).
+apis:
+  custom-generator:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
+        - ./route-map-generator.mjs
+      facade: functions
diff --git a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
index 241ef5fac7..01ffeb8c5c 100644
--- a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
@@ -477,7 +477,7 @@ export type RequestContext = {
  */
 export type ClientConfig = {
     /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
-    baseUrl?: string;
+    serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
     /** Transport used to issue requests. Defaults to the global `fetch`. */
@@ -581,7 +581,7 @@ export type RequestOptions = RequestInit & {
  * (e.g. dev / staging / prod toggles in a single-page app).
  *
  * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
 export function setBaseUrl(url: string): void {
     BASE = url;
@@ -656,7 +656,7 @@ function __encodeReserved(value: string): string {
 }
 
 function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
     if (!query)
         return url;
     const params = new URLSearchParams();
diff --git a/tests/e2e/generate-client/examples/custom-generator/src/main.ts b/tests/e2e/generate-client/examples/custom-generator/src/main.ts
index 79c36b34e3..e8e1449f2e 100644
--- a/tests/e2e/generate-client/examples/custom-generator/src/main.ts
+++ b/tests/e2e/generate-client/examples/custom-generator/src/main.ts
@@ -3,7 +3,7 @@
 import { configure, listMenuItems } from './api/client.js';
 import { routes } from './api/client.routes.js';
 
-configure({ baseUrl: 'https://api.cafe.redocly.com' });
+configure({ serverUrl: 'https://api.cafe.redocly.com' });
 
 const out = document.querySelector<HTMLPreElement>('#out')!;
 
diff --git a/tests/e2e/generate-client/examples/customization/redocly.yaml b/tests/e2e/generate-client/examples/customization/redocly.yaml
index f926ee07d3..9a6959609b 100644
--- a/tests/e2e/generate-client/examples/customization/redocly.yaml
+++ b/tests/e2e/generate-client/examples/customization/redocly.yaml
@@ -1,9 +1,11 @@
 # redocly.yaml — drives `redocly generate-client` for this example.
-# generate-client settings live under the `x-client-generator` extension for now
-# (first-class config support is planned in @redocly/config).
-x-client-generator:
-  api: ./openapi.yaml
-  output: ./src/api/client.ts
-  generators:
-    - sdk
-  facade: functions
+# The client is generated for the api that declares a `client` block
+# (run `redocly generate-client` with no args to build every such api).
+apis:
+  customization:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
+      facade: functions
diff --git a/tests/e2e/generate-client/examples/customization/src/api/client.ts b/tests/e2e/generate-client/examples/customization/src/api/client.ts
index 241ef5fac7..01ffeb8c5c 100644
--- a/tests/e2e/generate-client/examples/customization/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/customization/src/api/client.ts
@@ -477,7 +477,7 @@ export type RequestContext = {
  */
 export type ClientConfig = {
     /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
-    baseUrl?: string;
+    serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
     /** Transport used to issue requests. Defaults to the global `fetch`. */
@@ -581,7 +581,7 @@ export type RequestOptions = RequestInit & {
  * (e.g. dev / staging / prod toggles in a single-page app).
  *
  * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
 export function setBaseUrl(url: string): void {
     BASE = url;
@@ -656,7 +656,7 @@ function __encodeReserved(value: string): string {
 }
 
 function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
     if (!query)
         return url;
     const params = new URLSearchParams();
diff --git a/tests/e2e/generate-client/examples/fetch-functions/README.md b/tests/e2e/generate-client/examples/fetch-functions/README.md
index dc64cbbec8..12f5e51c97 100644
--- a/tests/e2e/generate-client/examples/fetch-functions/README.md
+++ b/tests/e2e/generate-client/examples/fetch-functions/README.md
@@ -12,4 +12,4 @@ npm run dev        # open the printed local URL
 ```
 
 The generated client under `src/api/` is committed and drift-checked against the generator in CI.
-Point `configure({ baseUrl })` at your own server or a mock as needed.
+Point `configure({ serverUrl })` at your own server or a mock as needed.
diff --git a/tests/e2e/generate-client/examples/fetch-functions/redocly.yaml b/tests/e2e/generate-client/examples/fetch-functions/redocly.yaml
index f926ee07d3..2256b1fef6 100644
--- a/tests/e2e/generate-client/examples/fetch-functions/redocly.yaml
+++ b/tests/e2e/generate-client/examples/fetch-functions/redocly.yaml
@@ -1,9 +1,11 @@
 # redocly.yaml — drives `redocly generate-client` for this example.
-# generate-client settings live under the `x-client-generator` extension for now
-# (first-class config support is planned in @redocly/config).
-x-client-generator:
-  api: ./openapi.yaml
-  output: ./src/api/client.ts
-  generators:
-    - sdk
-  facade: functions
+# The client is generated for the api that declares a `client` block
+# (run `redocly generate-client` with no args to build every such api).
+apis:
+  fetch-functions:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
+      facade: functions
diff --git a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
index 241ef5fac7..01ffeb8c5c 100644
--- a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
@@ -477,7 +477,7 @@ export type RequestContext = {
  */
 export type ClientConfig = {
     /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
-    baseUrl?: string;
+    serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
     /** Transport used to issue requests. Defaults to the global `fetch`. */
@@ -581,7 +581,7 @@ export type RequestOptions = RequestInit & {
  * (e.g. dev / staging / prod toggles in a single-page app).
  *
  * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
 export function setBaseUrl(url: string): void {
     BASE = url;
@@ -656,7 +656,7 @@ function __encodeReserved(value: string): string {
 }
 
 function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
     if (!query)
         return url;
     const params = new URLSearchParams();
diff --git a/tests/e2e/generate-client/examples/fetch-functions/src/main.ts b/tests/e2e/generate-client/examples/fetch-functions/src/main.ts
index 5a178477ec..7db9a08fb0 100644
--- a/tests/e2e/generate-client/examples/fetch-functions/src/main.ts
+++ b/tests/e2e/generate-client/examples/fetch-functions/src/main.ts
@@ -1,6 +1,6 @@
 import { configure, use, listMenuItems, ApiError } from './api/client.js';
 
-configure({ baseUrl: 'https://api.cafe.redocly.com' });
+configure({ serverUrl: 'https://api.cafe.redocly.com' });
 
 const out = document.querySelector<HTMLPreElement>('#out')!;
 
diff --git a/tests/e2e/generate-client/examples/mock/redocly.yaml b/tests/e2e/generate-client/examples/mock/redocly.yaml
index 1aae64e4cc..37d0235a28 100644
--- a/tests/e2e/generate-client/examples/mock/redocly.yaml
+++ b/tests/e2e/generate-client/examples/mock/redocly.yaml
@@ -1,10 +1,12 @@
 # redocly.yaml — drives `redocly generate-client` for this example.
-# generate-client settings live under the `x-client-generator` extension for now
-# (first-class config support is planned in @redocly/config).
-x-client-generator:
-  api: ./openapi.yaml
-  output: ./src/api/client.ts
-  generators:
-    - sdk
-    - mock
-  facade: functions
+# The client is generated for the api that declares a `client` block
+# (run `redocly generate-client` with no args to build every such api).
+apis:
+  mock:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
+        - mock
+      facade: functions
diff --git a/tests/e2e/generate-client/examples/mock/src/api/client.ts b/tests/e2e/generate-client/examples/mock/src/api/client.ts
index 241ef5fac7..01ffeb8c5c 100644
--- a/tests/e2e/generate-client/examples/mock/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/mock/src/api/client.ts
@@ -477,7 +477,7 @@ export type RequestContext = {
  */
 export type ClientConfig = {
     /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
-    baseUrl?: string;
+    serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
     /** Transport used to issue requests. Defaults to the global `fetch`. */
@@ -581,7 +581,7 @@ export type RequestOptions = RequestInit & {
  * (e.g. dev / staging / prod toggles in a single-page app).
  *
  * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
 export function setBaseUrl(url: string): void {
     BASE = url;
@@ -656,7 +656,7 @@ function __encodeReserved(value: string): string {
 }
 
 function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
     if (!query)
         return url;
     const params = new URLSearchParams();
diff --git a/tests/e2e/generate-client/examples/mock/src/main.ts b/tests/e2e/generate-client/examples/mock/src/main.ts
index 7cc7507b3a..9928640947 100644
--- a/tests/e2e/generate-client/examples/mock/src/main.ts
+++ b/tests/e2e/generate-client/examples/mock/src/main.ts
@@ -8,7 +8,7 @@ const out = document.querySelector<HTMLPreElement>('#out')!;
 async function main() {
   try {
     await setupWorker(...handlers).start();
-    configure({ baseUrl: 'https://api.cafe.redocly.com' });
+    configure({ serverUrl: 'https://api.cafe.redocly.com' });
     const response = await listMenuItems();
     out.textContent = `Mocked ${response.items.length} items:\n${JSON.stringify(
       response,
diff --git a/tests/e2e/generate-client/examples/mock/src/node.ts b/tests/e2e/generate-client/examples/mock/src/node.ts
index 8b62794039..8567681783 100644
--- a/tests/e2e/generate-client/examples/mock/src/node.ts
+++ b/tests/e2e/generate-client/examples/mock/src/node.ts
@@ -10,7 +10,7 @@ const server = setupServer(...handlers);
 
 export async function loadMockedMenu() {
   server.listen();
-  configure({ baseUrl: 'https://api.cafe.redocly.com' });
+  configure({ serverUrl: 'https://api.cafe.redocly.com' });
   try {
     // Served by the generated mocks — no real backend required.
     return await listMenuItems();
diff --git a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
index 241ef5fac7..01ffeb8c5c 100644
--- a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
@@ -477,7 +477,7 @@ export type RequestContext = {
  */
 export type ClientConfig = {
     /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
-    baseUrl?: string;
+    serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
     /** Transport used to issue requests. Defaults to the global `fetch`. */
@@ -581,7 +581,7 @@ export type RequestOptions = RequestInit & {
  * (e.g. dev / staging / prod toggles in a single-page app).
  *
  * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
 export function setBaseUrl(url: string): void {
     BASE = url;
@@ -656,7 +656,7 @@ function __encodeReserved(value: string): string {
 }
 
 function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
     if (!query)
         return url;
     const params = new URLSearchParams();
diff --git a/tests/e2e/generate-client/examples/programmatic/src/main.ts b/tests/e2e/generate-client/examples/programmatic/src/main.ts
index d50d970d76..1d54f67be6 100644
--- a/tests/e2e/generate-client/examples/programmatic/src/main.ts
+++ b/tests/e2e/generate-client/examples/programmatic/src/main.ts
@@ -2,7 +2,7 @@
 // programmatic generation only changes *how* you invoke the generator, not what it emits.
 import { configure, listMenuItems } from './api/client.js';
 
-configure({ baseUrl: 'https://api.cafe.redocly.com' });
+configure({ serverUrl: 'https://api.cafe.redocly.com' });
 
 export async function loadMenu() {
   return listMenuItems();
diff --git a/tests/e2e/generate-client/examples/service-class/README.md b/tests/e2e/generate-client/examples/service-class/README.md
index d5d54d735c..d9149b74b9 100644
--- a/tests/e2e/generate-client/examples/service-class/README.md
+++ b/tests/e2e/generate-client/examples/service-class/README.md
@@ -1,7 +1,7 @@
 # service-class example
 
 Generated TypeScript client using the **service-class facade** (`generators: ['sdk']`). Operations are
-methods on a `Client` configured per instance (`new Client({ baseUrl })`).
+methods on a `Client` configured per instance (`new Client({ serverUrl })`).
 
 ## Run
 
diff --git a/tests/e2e/generate-client/examples/service-class/redocly.yaml b/tests/e2e/generate-client/examples/service-class/redocly.yaml
index b2e955fe56..92dd612e64 100644
--- a/tests/e2e/generate-client/examples/service-class/redocly.yaml
+++ b/tests/e2e/generate-client/examples/service-class/redocly.yaml
@@ -1,9 +1,11 @@
 # redocly.yaml — drives `redocly generate-client` for this example.
-# generate-client settings live under the `x-client-generator` extension for now
-# (first-class config support is planned in @redocly/config).
-x-client-generator:
-  api: ./openapi.yaml
-  output: ./src/api/client.ts
-  generators:
-    - sdk
-  facade: service-class
+# The client is generated for the api that declares a `client` block
+# (run `redocly generate-client` with no args to build every such api).
+apis:
+  service-class:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
+      facade: service-class
diff --git a/tests/e2e/generate-client/examples/service-class/src/api/client.ts b/tests/e2e/generate-client/examples/service-class/src/api/client.ts
index 0f1e428367..7d78f5cd7e 100644
--- a/tests/e2e/generate-client/examples/service-class/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/service-class/src/api/client.ts
@@ -477,7 +477,7 @@ export type RequestContext = {
  */
 export type ClientConfig = {
     /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
-    baseUrl?: string;
+    serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
     /** Transport used to issue requests. Defaults to the global `fetch`. */
@@ -581,7 +581,7 @@ export type RequestOptions = RequestInit & {
  * (e.g. dev / staging / prod toggles in a single-page app).
  *
  * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
 export function setBaseUrl(url: string): void {
     BASE = url;
@@ -656,7 +656,7 @@ function __encodeReserved(value: string): string {
 }
 
 function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
     if (!query)
         return url;
     const params = new URLSearchParams();
diff --git a/tests/e2e/generate-client/examples/service-class/src/main.ts b/tests/e2e/generate-client/examples/service-class/src/main.ts
index f934c17152..a2532e0357 100644
--- a/tests/e2e/generate-client/examples/service-class/src/main.ts
+++ b/tests/e2e/generate-client/examples/service-class/src/main.ts
@@ -1,6 +1,6 @@
 import { Client, ApiError } from './api/client.js';
 
-const client = new Client({ baseUrl: 'https://api.cafe.redocly.com' });
+const client = new Client({ serverUrl: 'https://api.cafe.redocly.com' });
 
 const out = document.querySelector<HTMLPreElement>('#out')!;
 
diff --git a/tests/e2e/generate-client/examples/tanstack-query/redocly.yaml b/tests/e2e/generate-client/examples/tanstack-query/redocly.yaml
index a43094f1e3..34503a0950 100644
--- a/tests/e2e/generate-client/examples/tanstack-query/redocly.yaml
+++ b/tests/e2e/generate-client/examples/tanstack-query/redocly.yaml
@@ -1,10 +1,12 @@
 # redocly.yaml — drives `redocly generate-client` for this example.
-# generate-client settings live under the `x-client-generator` extension for now
-# (first-class config support is planned in @redocly/config).
-x-client-generator:
-  api: ./openapi.yaml
-  output: ./src/api/client.ts
-  generators:
-    - sdk
-    - tanstack-query
-  facade: functions
+# The client is generated for the api that declares a `client` block
+# (run `redocly generate-client` with no args to build every such api).
+apis:
+  tanstack-query:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
+        - tanstack-query
+      facade: functions
diff --git a/tests/e2e/generate-client/examples/tanstack-query/src/App.tsx b/tests/e2e/generate-client/examples/tanstack-query/src/App.tsx
index bc767ec6cc..f8aa426f4a 100644
--- a/tests/e2e/generate-client/examples/tanstack-query/src/App.tsx
+++ b/tests/e2e/generate-client/examples/tanstack-query/src/App.tsx
@@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/react-query';
 import { configure } from './api/client.js';
 import { listMenuItemsOptions } from './api/client.tanstack.js';
 
-configure({ baseUrl: 'https://api.cafe.redocly.com' });
+configure({ serverUrl: 'https://api.cafe.redocly.com' });
 
 export function App() {
   const { data, error, isLoading } = useQuery(listMenuItemsOptions({}));
diff --git a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
index 241ef5fac7..01ffeb8c5c 100644
--- a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
@@ -477,7 +477,7 @@ export type RequestContext = {
  */
 export type ClientConfig = {
     /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
-    baseUrl?: string;
+    serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
     /** Transport used to issue requests. Defaults to the global `fetch`. */
@@ -581,7 +581,7 @@ export type RequestOptions = RequestInit & {
  * (e.g. dev / staging / prod toggles in a single-page app).
  *
  * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
 export function setBaseUrl(url: string): void {
     BASE = url;
@@ -656,7 +656,7 @@ function __encodeReserved(value: string): string {
 }
 
 function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
     if (!query)
         return url;
     const params = new URLSearchParams();
diff --git a/tests/e2e/generate-client/examples/zod/redocly.yaml b/tests/e2e/generate-client/examples/zod/redocly.yaml
index a03e93d9da..c545911f40 100644
--- a/tests/e2e/generate-client/examples/zod/redocly.yaml
+++ b/tests/e2e/generate-client/examples/zod/redocly.yaml
@@ -1,10 +1,12 @@
 # redocly.yaml — drives `redocly generate-client` for this example.
-# generate-client settings live under the `x-client-generator` extension for now
-# (first-class config support is planned in @redocly/config).
-x-client-generator:
-  api: ./openapi.yaml
-  output: ./src/api/client.ts
-  generators:
-    - sdk
-    - zod
-  facade: functions
+# The client is generated for the api that declares a `client` block
+# (run `redocly generate-client` with no args to build every such api).
+apis:
+  zod:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
+        - zod
+      facade: functions
diff --git a/tests/e2e/generate-client/examples/zod/src/api/client.ts b/tests/e2e/generate-client/examples/zod/src/api/client.ts
index 241ef5fac7..01ffeb8c5c 100644
--- a/tests/e2e/generate-client/examples/zod/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/zod/src/api/client.ts
@@ -477,7 +477,7 @@ export type RequestContext = {
  */
 export type ClientConfig = {
     /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
-    baseUrl?: string;
+    serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
     /** Transport used to issue requests. Defaults to the global `fetch`. */
@@ -581,7 +581,7 @@ export type RequestOptions = RequestInit & {
  * (e.g. dev / staging / prod toggles in a single-page app).
  *
  * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
 export function setBaseUrl(url: string): void {
     BASE = url;
@@ -656,7 +656,7 @@ function __encodeReserved(value: string): string {
 }
 
 function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
     if (!query)
         return url;
     const params = new URLSearchParams();
diff --git a/tests/e2e/generate-client/examples/zod/src/main.ts b/tests/e2e/generate-client/examples/zod/src/main.ts
index af1f816399..d06d3fff08 100644
--- a/tests/e2e/generate-client/examples/zod/src/main.ts
+++ b/tests/e2e/generate-client/examples/zod/src/main.ts
@@ -1,7 +1,7 @@
 import { configure, listMenuItems, ApiError } from './api/client.js';
 import { MenuItemListSchema } from './api/client.zod.js';
 
-configure({ baseUrl: 'https://api.cafe.redocly.com' });
+configure({ serverUrl: 'https://api.cafe.redocly.com' });
 
 const out = document.querySelector<HTMLPreElement>('#out')!;
 
diff --git a/tests/e2e/generate-client/extension.test.ts b/tests/e2e/generate-client/extension.test.ts
index f580591541..11301001ce 100644
--- a/tests/e2e/generate-client/extension.test.ts
+++ b/tests/e2e/generate-client/extension.test.ts
@@ -1,7 +1,7 @@
 /**
  * Behavioral e2e for the extension contract (D3). Rather than a live server, we
  * inject a fake `fetch` via `configure()` / `new Client(config)` and capture what
- * the generated runtime actually produced — proving that `baseUrl`, `config.headers`,
+ * the generated runtime actually produced — proving that `serverUrl`, `config.headers`,
  * `onRequest`, transport-swap, and per-instance config observably take effect.
  */
 import { spawnSync } from 'node:child_process';
@@ -50,7 +50,7 @@ describe('extension contract — functions facade (configure)', () => {
     if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
   });
 
-  test('configure() applies baseUrl, config.headers, onRequest, and the fetch transport-swap', () => {
+  test('configure() applies serverUrl, config.headers, onRequest, and the fetch transport-swap', () => {
     const captured = runConsumer(
       dir,
       `
@@ -58,7 +58,7 @@ import { configure, listPets } from './client.ts';
 
 const seen: { url?: string; headers?: Record<string, string> } = {};
 configure({
-  baseUrl: 'https://configured.example',
+  serverUrl: 'https://configured.example',
   headers: { 'X-Tenant': 'acme' },
   onRequest: (ctx) => { ctx.headers['X-Trace'] = 'trace-123'; },
   fetch: (async (url: string, init: RequestInit) => {
@@ -73,7 +73,7 @@ console.log(JSON.stringify(seen));
 `
     ) as { url: string; headers: Record<string, string> };
 
-    // baseUrl override was honored (not the spec's localhost:3102).
+    // serverUrl override was honored (not the spec's localhost:3102).
     expect(captured.url).toBe('https://configured.example/pets');
     // The fake fetch was actually used, and both config.headers + onRequest applied.
     expect(captured.headers['X-Tenant']).toBe('acme');
@@ -118,7 +118,7 @@ describe('extension contract — service-class facade (per-instance config)', ()
     if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
   });
 
-  test('two instances carry independent baseUrl + headers (multi-tenant isolation)', () => {
+  test('two instances carry independent serverUrl + headers (multi-tenant isolation)', () => {
     const calls = runConsumer(
       dir,
       `
@@ -132,8 +132,8 @@ const make = (tag: string) =>
     return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
   }) as unknown as typeof fetch;
 
-const a = new PetClient({ baseUrl: 'https://a.example', headers: { 'X-Tenant': 'A' }, fetch: make('a') });
-const b = new PetClient({ baseUrl: 'https://b.example', headers: { 'X-Tenant': 'B' }, fetch: make('b') });
+const a = new PetClient({ serverUrl: 'https://a.example', headers: { 'X-Tenant': 'A' }, fetch: make('a') });
+const b = new PetClient({ serverUrl: 'https://b.example', headers: { 'X-Tenant': 'B' }, fetch: make('b') });
 
 await a.listPets();
 await b.listPets();
@@ -164,7 +164,7 @@ console.log(JSON.stringify({ captured }));
 `
     ) as { captured: string };
 
-    // No baseUrl in config → falls back to the inlined BASE from base.yaml.
+    // No serverUrl in config → falls back to the inlined BASE from base.yaml.
     expect(seen.captured).toBe('http://localhost:3102/pets');
   }, 60_000);
 });
diff --git a/tests/e2e/generate-client/middleware.test.ts b/tests/e2e/generate-client/middleware.test.ts
index 54dc745dd3..655df92ffa 100644
--- a/tests/e2e/generate-client/middleware.test.ts
+++ b/tests/e2e/generate-client/middleware.test.ts
@@ -201,7 +201,7 @@ describe('middleware — multi-file output (split)', () => {
       `
 import { configure, use, listPets } from './client.ts';
 let url = '', header = '';
-configure({ baseUrl: 'https://multi.example.com', fetch: (async (u: string, init: RequestInit) => { url = u; header = (init.headers as Record<string,string>)['X-MW']; return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } }); }) as unknown as typeof fetch });
+configure({ serverUrl: 'https://multi.example.com', fetch: (async (u: string, init: RequestInit) => { url = u; header = (init.headers as Record<string,string>)['X-MW']; return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } }); }) as unknown as typeof fetch });
 use({ onRequest: (ctx) => { ctx.headers['X-MW'] = 'yes'; } });
 await listPets();
 console.log(JSON.stringify({ url, header }));
diff --git a/tests/e2e/generate-client/mock.test.ts b/tests/e2e/generate-client/mock.test.ts
index ac15ea8e90..916b047091 100644
--- a/tests/e2e/generate-client/mock.test.ts
+++ b/tests/e2e/generate-client/mock.test.ts
@@ -75,7 +75,7 @@ import { configure, getPetById } from './client.ts';
 
 const server = setupServer(...handlers);
 server.listen({ onUnhandledRequest: 'error' });
-configure({ baseUrl: 'https://api.example.com' });
+configure({ serverUrl: 'https://api.example.com' });
 try {
   const pet = await getPetById(1);
   process.stdout.write(JSON.stringify({ ok: pet !== undefined, id: pet.id, name: pet.name }));
diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
index b268aaebb1..63979f9eee 100644
--- a/tests/e2e/generate-client/redocly-config.test.ts
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -1,15 +1,9 @@
-// generate-client reads its settings from a `redocly.yaml` `x-client-generator`
-// block (discovered in the cwd, or located via `--config`), with CLI flags overriding it.
-// This is the only declarative config surface — the examples use it.
+// generate-client reads its settings from a `redocly.yaml` `client` block (top-level
+// shared defaults) and per-API `apis.<name>.client` / `clientOutput`. Three invocation
+// modes: fan-out (no arg, over apis with a `client` block), an `apis:` alias, and a plain
+// file path (which ignores `apis:`). CLI flags override the config.
 import { spawnSync } from 'node:child_process';
-import {
-  existsSync,
-  mkdtempSync,
-  readFileSync,
-  rmSync,
-  writeFileSync,
-  copyFileSync,
-} from 'node:fs';
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync, copyFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -19,79 +13,158 @@ const repoRoot = resolve(__dirname, '../../..');
 const cli = join(repoRoot, 'packages/cli/lib/index.js');
 const fixture = join(__dirname, 'fixtures', 'cafe.yaml');
 
-/** Write a temp project: a vendored spec + a redocly.yaml carrying the extension block. */
-function project(xConfig: string): string {
+/** Write a temp project: the cafe spec + a redocly.yaml with the given contents. */
+function project(redoclyYaml: string): string {
   const dir = mkdtempSync(join(tmpdir(), 'ots-redocly-'));
   copyFileSync(fixture, join(dir, 'openapi.yaml'));
-  writeFileSync(join(dir, 'redocly.yaml'), `x-client-generator:\n${xConfig}`, 'utf-8');
+  writeFileSync(join(dir, 'redocly.yaml'), redoclyYaml, 'utf-8');
   return dir;
 }
+const run = (dir: string, args: string[] = []) =>
+  spawnSync('node', [cli, 'generate-client', ...args], { cwd: dir, encoding: 'utf-8' });
 
-describe('generate-client redocly.yaml config (x-client-generator)', () => {
-  it('generates from the redocly.yaml block with no flags', () => {
+describe('generate-client redocly.yaml config', () => {
+  it('fan-out (no arg) builds every api with a `client` block, to its clientOutput', () => {
     const dir = project(
       [
-        '  api: ./openapi.yaml',
-        '  output: ./src/api/client.ts',
-        '  generators: [sdk]',
-        '  facade: service-class',
+        'apis:',
+        '  cafe:',
+        '    root: ./openapi.yaml',
+        '    clientOutput: ./src/cafe.ts',
+        '    client:',
+        '      generators: [sdk]',
+        '      facade: service-class',
+        '  lintOnly:', // no `client` block -> skipped by the fan-out
+        '    root: ./openapi.yaml',
       ].join('\n') + '\n'
     );
-    const res = spawnSync('node', [cli, 'generate-client'], { cwd: dir, encoding: 'utf-8' });
+    const res = run(dir);
     expect(res.status, res.stderr).toBe(0);
-    const out = join(dir, 'src/api/client.ts');
-    expect(existsSync(out)).toBe(true);
-    // facade + generators came from the redocly.yaml block.
-    expect(readFileSync(out, 'utf-8')).toContain('export class Client');
+    expect(existsSync(join(dir, 'src/cafe.ts'))).toBe(true);
+    expect(existsSync(join(dir, 'lintOnly.client.ts'))).toBe(false);
+    expect(readFileSync(join(dir, 'src/cafe.ts'), 'utf-8')).toContain('export class Client');
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
-  it('resolves an `apis:` alias passed as <api> to that API’s root', () => {
-    const dir = mkdtempSync(join(tmpdir(), 'ots-alias-'));
-    copyFileSync(fixture, join(dir, 'openapi.yaml'));
-    writeFileSync(join(dir, 'redocly.yaml'), 'apis:\n  cafe:\n    root: ./openapi.yaml\n', 'utf-8');
-    // `cafe` is an alias, not a file path — it must resolve to ./openapi.yaml.
-    const res = spawnSync(
-      'node',
-      [cli, 'generate-client', 'cafe', '--output', join(dir, 'out.ts')],
-      {
-        cwd: dir,
-        encoding: 'utf-8',
-      }
+  it('defaults the output to `<name>.client.ts` in the config dir when clientOutput is omitted', () => {
+    const dir = project(
+      ['apis:', '  cafe:', '    root: ./openapi.yaml', '    client:', '      generators: [sdk]'].join(
+        '\n'
+      ) + '\n'
     );
+    const res = run(dir);
     expect(res.status, res.stderr).toBe(0);
-    expect(existsSync(join(dir, 'out.ts'))).toBe(true);
-    expect(readFileSync(join(dir, 'out.ts'), 'utf-8')).toContain(
-      'export async function listMenuItems'
+    expect(existsSync(join(dir, 'cafe.client.ts'))).toBe(true);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('resolves an `apis:` alias passed as <api>, using its client block + clientOutput', () => {
+    const dir = project(
+      [
+        'apis:',
+        '  cafe:',
+        '    root: ./openapi.yaml',
+        '    clientOutput: ./out.ts',
+        '    client:',
+        '      generators: [sdk]',
+        '      facade: service-class',
+      ].join('\n') + '\n'
     );
+    const res = run(dir, ['cafe']);
+    expect(res.status, res.stderr).toBe(0);
+    expect(readFileSync(join(dir, 'out.ts'), 'utf-8')).toContain('export class Client');
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
-  it('lets a CLI flag override the redocly.yaml block (flags win)', () => {
+  it('a named alias falls back to the top-level `client` when it has no per-api block', () => {
     const dir = project(
       [
-        '  api: ./openapi.yaml',
-        '  output: ./src/api/client.ts',
+        'client:',
         '  generators: [sdk]',
         '  facade: service-class',
+        'apis:',
+        '  cafe:',
+        '    root: ./openapi.yaml',
+        '    clientOutput: ./out.ts',
       ].join('\n') + '\n'
     );
-    // Override facade: service-class (in redocly.yaml) → functions (flag).
-    const res = spawnSync('node', [cli, 'generate-client', '--facade', 'functions'], {
-      cwd: dir,
-      encoding: 'utf-8',
-    });
+    const res = run(dir, ['cafe']);
     expect(res.status, res.stderr).toBe(0);
-    const src = readFileSync(join(dir, 'src/api/client.ts'), 'utf-8');
-    expect(src).toContain('export async function');
-    expect(src).not.toContain('export class Client');
+    // service-class came from the top-level client block (the api declares none).
+    expect(readFileSync(join(dir, 'out.ts'), 'utf-8')).toContain('export class Client');
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
-  it('resolves the block’s relative api/output against the redocly.yaml directory', () => {
+  it('a plain file path ignores `apis:` and uses the top-level `client` defaults', () => {
     const dir = project(
-      ['  api: ./openapi.yaml', '  output: ./out/client.ts', '  generators: [sdk]'].join('\n') +
+      [
+        'client:',
+        '  generators: [sdk]',
+        '  facade: functions',
+        'apis:',
+        '  cafe:',
+        '    root: ./openapi.yaml',
+        '    client:',
+        '      facade: service-class', // must NOT apply to a path invocation
+      ].join('\n') + '\n'
+    );
+    const res = run(dir, ['./openapi.yaml', '--output', './out.ts']);
+    expect(res.status, res.stderr).toBe(0);
+    const out = readFileSync(join(dir, 'out.ts'), 'utf-8');
+    expect(out).toContain('export async function listMenuItems'); // functions facade (top-level)
+    expect(out).not.toContain('export class Client'); // per-api service-class ignored
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('CLI flags override the client block', () => {
+    const dir = project(
+      [
+        'apis:',
+        '  cafe:',
+        '    root: ./openapi.yaml',
+        '    clientOutput: ./out.ts',
+        '    client:',
+        '      facade: service-class',
+      ].join('\n') + '\n'
+    );
+    const res = run(dir, ['cafe', '--facade', 'functions']);
+    expect(res.status, res.stderr).toBe(0);
+    expect(readFileSync(join(dir, 'out.ts'), 'utf-8')).toContain(
+      'export async function listMenuItems'
+    );
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('rejects --output in fan-out mode', () => {
+    const dir = project(
+      ['apis:', '  cafe:', '    root: ./openapi.yaml', '    client:', '      generators: [sdk]'].join(
         '\n'
+      ) + '\n'
+    );
+    const res = run(dir, ['--output', './out.ts']);
+    expect(res.status).not.toBe(0);
+    expect(res.stderr).toContain("--output can't target multiple APIs");
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('errors when no api has a `client` block and none is named', () => {
+    const dir = project(['apis:', '  cafe:', '    root: ./openapi.yaml'].join('\n') + '\n');
+    const res = run(dir);
+    expect(res.status).not.toBe(0);
+    expect(res.stderr).toContain('No API to generate');
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('resolves a relative clientOutput against the redocly.yaml dir (via --config)', () => {
+    const dir = project(
+      [
+        'apis:',
+        '  cafe:',
+        '    root: ./openapi.yaml',
+        '    clientOutput: ./out/client.ts',
+        '    client:',
+        '      generators: [sdk]',
+      ].join('\n') + '\n'
     );
     // Run from the repo root, pointing at the config elsewhere via --config.
     const res = spawnSync('node', [cli, 'generate-client', '--config', join(dir, 'redocly.yaml')], {
@@ -99,7 +172,6 @@ describe('generate-client redocly.yaml config (x-client-generator)', () => {
       encoding: 'utf-8',
     });
     expect(res.status, res.stderr).toBe(0);
-    // api/output resolved relative to the redocly.yaml dir, not the cwd.
     expect(existsSync(join(dir, 'out/client.ts'))).toBe(true);
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
diff --git a/tests/e2e/generate-client/setup.test.ts b/tests/e2e/generate-client/setup.test.ts
index 7a6a312e59..79f62b651b 100644
--- a/tests/e2e/generate-client/setup.test.ts
+++ b/tests/e2e/generate-client/setup.test.ts
@@ -19,7 +19,7 @@ const tsxBin = join(repoRoot, 'node_modules/.bin/tsx');
 const SETUP = `
 import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
 export default defineClientSetup({
-  config: { baseUrl: 'https://baked.example.com' },
+  config: { serverUrl: 'https://baked.example.com' },
   middleware: [{ onRequest: (ctx: RequestContext) => { ctx.headers['X-Baked'] = 'yes'; } }],
 });
 `;
@@ -88,7 +88,7 @@ console.log(JSON.stringify({ url, header }));
       `
 import { configure, listPets } from './client.ts';
 let url = '';
-configure({ baseUrl: 'https://override.example.com', fetch: (async (u: string) => { url = u; return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } }); }) as unknown as typeof fetch });
+configure({ serverUrl: 'https://override.example.com', fetch: (async (u: string) => { url = u; return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } }); }) as unknown as typeof fetch });
 await listPets();
 console.log(JSON.stringify({ url }));
 `
@@ -139,7 +139,7 @@ const fetchSpy = (sink: { url: string; header: string }) => (async (u: string, i
 const baked = { url: '', header: '' };
 await new PetClient({ fetch: fetchSpy(baked) }).listPets();
 const overridden = { url: '', header: '' };
-await new PetClient({ baseUrl: 'https://override.example.com', fetch: fetchSpy(overridden) }).listPets();
+await new PetClient({ serverUrl: 'https://override.example.com', fetch: fetchSpy(overridden) }).listPets();
 console.log(JSON.stringify({ baked, overridden }));
 `
     ) as { baked: { url: string; header: string }; overridden: { url: string } };
diff --git a/tests/e2e/generate-client/sse-consumer/api.ts b/tests/e2e/generate-client/sse-consumer/api.ts
index 9325a189db..bd1152f344 100644
--- a/tests/e2e/generate-client/sse-consumer/api.ts
+++ b/tests/e2e/generate-client/sse-consumer/api.ts
@@ -71,7 +71,7 @@ export type RequestContext = {
  */
 export type ClientConfig = {
     /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
-    baseUrl?: string;
+    serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
     /** Transport used to issue requests. Defaults to the global `fetch`. */
@@ -168,7 +168,7 @@ export type RequestOptions = RequestInit & {
  * (e.g. dev / staging / prod toggles in a single-page app).
  *
  * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ baseUrl })`.
+ * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
 export function setBaseUrl(url: string): void {
     BASE = url;
@@ -243,7 +243,7 @@ function __encodeReserved(value: string): string {
 }
 
 function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.baseUrl ?? BASE).replace(/\/+$/, '') + path;
+    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
     if (!query)
         return url;
     const params = new URLSearchParams();
diff --git a/tests/e2e/generate-client/sse-consumer/index-abort.ts b/tests/e2e/generate-client/sse-consumer/index-abort.ts
index f2a9d9713f..66fb22058d 100644
--- a/tests/e2e/generate-client/sse-consumer/index-abort.ts
+++ b/tests/e2e/generate-client/sse-consumer/index-abort.ts
@@ -1,11 +1,11 @@
 import { configure, sse } from './api.js';
 
-const baseUrl = process.argv[2] ?? process.env.SSE_BASE_URL ?? 'http://127.0.0.1:3104';
+const serverUrl = process.argv[2] ?? process.env.SSE_BASE_URL ?? 'http://127.0.0.1:3104';
 
 // Aborting an SSE stream via AbortSignal must terminate the `for await` loop
 // cleanly — the iterator completes and NO AbortError escapes the loop.
 async function main(): Promise<void> {
-  configure({ baseUrl });
+  configure({ serverUrl });
 
   const controller = new AbortController();
   let received = 0;
diff --git a/tests/e2e/generate-client/sse-consumer/index-finite.ts b/tests/e2e/generate-client/sse-consumer/index-finite.ts
index f318df0820..c6cdb21028 100644
--- a/tests/e2e/generate-client/sse-consumer/index-finite.ts
+++ b/tests/e2e/generate-client/sse-consumer/index-finite.ts
@@ -1,6 +1,6 @@
 import { configure, sse } from './api.js';
 
-const baseUrl = process.argv[2] ?? process.env.SSE_BASE_URL ?? 'http://127.0.0.1:3104';
+const serverUrl = process.argv[2] ?? process.env.SSE_BASE_URL ?? 'http://127.0.0.1:3104';
 
 // Iterate to natural completion — no `break`. The server drops the first connection
 // (client reconnects via Last-Event-ID), then delivers the final frame WITHOUT a
@@ -8,7 +8,7 @@ const baseUrl = process.argv[2] ?? process.env.SSE_BASE_URL ?? 'http://127.0.0.1
 // two things: the final dangling frame was flushed, and a clean close finished the
 // stream instead of looping forever on reconnect.
 async function main(): Promise<void> {
-  configure({ baseUrl });
+  configure({ serverUrl });
 
   const collected: Array<{ text: string; id: string | undefined }> = [];
   for await (const ev of sse.streamMessages()) {
diff --git a/tests/e2e/generate-client/sse-consumer/index.ts b/tests/e2e/generate-client/sse-consumer/index.ts
index ec783b8110..fc12544f0e 100644
--- a/tests/e2e/generate-client/sse-consumer/index.ts
+++ b/tests/e2e/generate-client/sse-consumer/index.ts
@@ -1,11 +1,11 @@
 import { configure, sse } from './api.js';
 
-const baseUrl = process.argv[2] ?? process.env.SSE_BASE_URL ?? 'http://127.0.0.1:3104';
+const serverUrl = process.argv[2] ?? process.env.SSE_BASE_URL ?? 'http://127.0.0.1:3104';
 
 type Collected = { text: string; id: string | undefined };
 
 async function main(): Promise<void> {
-  configure({ baseUrl });
+  configure({ serverUrl });
 
   // Collect events across an auto-reconnect: the server drops after `b`, the
   // client resumes with `Last-Event-ID: 2` and receives `c`. `ev.data` is the
@@ -16,7 +16,7 @@ async function main(): Promise<void> {
     if (collected.length >= 3) break;
   }
 
-  const logResponse = await fetch(`${baseUrl}/__test__/log`);
+  const logResponse = await fetch(`${serverUrl}/__test__/log`);
   const log = (await logResponse.json()) as Array<{ path: string; lastEventId: string | null }>;
   const lastEventIds = log
     .filter((entry) => entry.path === '/messages')

From 2159ba5c57880a6889fb17f3143f1228e431b314 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 13:16:32 +0300
Subject: [PATCH 046/134] refactor(client-generator): rename setBaseUrl to
 setServerUrl

Complete the serverUrl rename: the generated client's runtime helper
`setBaseUrl()` becomes `setServerUrl()` (it reassigns the inlined BASE binding).
Updates the emitter, the sorted public re-export list, unit + e2e tests, and
regenerates the committed clients, consumer fixtures, and cafe snapshot.
---
 .../src/emitters/__tests__/client.test.ts          |  8 ++++----
 packages/client-generator/src/emitters/client.ts   |  4 ++--
 packages/client-generator/src/emitters/runtime.ts  |  4 ++--
 .../src/writers/__tests__/split-writer.test.ts     |  8 ++++----
 .../writers/__tests__/tags-split-writer.test.ts    |  2 +-
 .../src/writers/__tests__/tags-writer.test.ts      |  4 ++--
 tests/e2e/generate-client/auth.test.ts             |  6 +++---
 tests/e2e/generate-client/base-consumer/api.ts     |  4 ++--
 tests/e2e/generate-client/base.test.ts             |  2 +-
 tests/e2e/generate-client/cafe-consumer/api.ts     |  4 ++--
 .../cafe-consumer/index-setbaseurl.ts              | 14 +++++++-------
 tests/e2e/generate-client/cafe.snapshot.ts         |  4 ++--
 tests/e2e/generate-client/cafe.test.ts             | 10 +++++-----
 .../examples/baked-setup/src/api/client.ts         |  4 ++--
 .../examples/custom-generator/src/api/client.ts    |  4 ++--
 .../examples/customization/src/api/client.ts       |  4 ++--
 .../examples/fetch-functions/src/api/client.ts     |  4 ++--
 .../examples/mock/src/api/client.ts                |  4 ++--
 .../examples/programmatic/src/api/client.ts        |  4 ++--
 .../examples/service-class/src/api/client.ts       |  4 ++--
 .../examples/tanstack-query/src/api/client.ts      |  4 ++--
 .../generate-client/examples/zod/src/api/client.ts |  4 ++--
 tests/e2e/generate-client/sse-consumer/api.ts      |  4 ++--
 23 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/packages/client-generator/src/emitters/__tests__/client.test.ts b/packages/client-generator/src/emitters/__tests__/client.test.ts
index dab984740a..61b3e112f5 100644
--- a/packages/client-generator/src/emitters/__tests__/client.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/client.test.ts
@@ -107,15 +107,15 @@ describe('emitSingleFile — top-level layout', () => {
     expect(out.endsWith('\n')).toBe(true);
   });
 
-  it('inlines the serverUrl as a mutable `let` binding so setBaseUrl() can update it', () => {
+  it('inlines the serverUrl as a mutable `let` binding so setServerUrl() can update it', () => {
     const out = emitSingleFile(apiModel({ serverUrl: 'https://api.example.com/v1' }));
     expect(out).toContain('let BASE = "https://api.example.com/v1";');
     expect(out).not.toContain('const BASE = ');
   });
 
-  it('always exports a setBaseUrl() helper that reassigns the BASE binding', () => {
+  it('always exports a setServerUrl() helper that reassigns the BASE binding', () => {
     const out = emitSingleFile(apiModel({ serverUrl: 'https://api.example.com' }));
-    expect(out).toContain('export function setBaseUrl(url: string): void');
+    expect(out).toContain('export function setServerUrl(url: string): void');
     expect(out).toMatch(/BASE\s*=\s*url/);
   });
 
@@ -338,7 +338,7 @@ describe('emitModules — writer-facing module interface', () => {
     const m = emitModules(apiModel());
     const reexport = m.publicReexport('client');
     expect(reexport).toContain(
-      'export { ApiError, configure, setBaseUrl, use } from "./client.http.js";'
+      'export { ApiError, configure, setServerUrl, use } from "./client.http.js";'
     );
     expect(reexport).toContain('export type {');
   });
diff --git a/packages/client-generator/src/emitters/client.ts b/packages/client-generator/src/emitters/client.ts
index c95c71611e..6c77d14282 100644
--- a/packages/client-generator/src/emitters/client.ts
+++ b/packages/client-generator/src/emitters/client.ts
@@ -465,7 +465,7 @@ function endpointImportNodes(
 
 /**
  * Re-export the public runtime surface from the http module: the values
- * (`ApiError`, `setBaseUrl`, `configure`, auth setters) and the config types
+ * (`ApiError`, `setServerUrl`, `configure`, auth setters) and the config types
  * (`PUBLIC_RUNTIME_TYPES` — `ClientConfig`, `RequestContext`, `RequestOptions`,
  * and the retry types) so callers get the whole surface from the entry.
  */
@@ -475,7 +475,7 @@ function publicReexportNodes(
   errorMode: 'throw' | 'result' | undefined,
   hasSse: boolean
 ): ts.ExportDeclaration[] {
-  const values = ['ApiError', 'configure', 'use', 'setBaseUrl', ...authSetterNames(schemes)].sort();
+  const values = ['ApiError', 'configure', 'use', 'setServerUrl', ...authSetterNames(schemes)].sort();
   const types = [
     ...PUBLIC_RUNTIME_TYPES,
     ...authTypeNames(schemes),
diff --git a/packages/client-generator/src/emitters/runtime.ts b/packages/client-generator/src/emitters/runtime.ts
index 62b86a00c2..e42c621f37 100644
--- a/packages/client-generator/src/emitters/runtime.ts
+++ b/packages/client-generator/src/emitters/runtime.ts
@@ -362,7 +362,7 @@ export type RequestContext = {
  * (functions facade).
  */
 export type ClientConfig = {
-  /** Base URL for this client; overrides the inlined default and \`setBaseUrl()\`. */
+  /** Base URL for this client; overrides the inlined default and \`setServerUrl()\`. */
   serverUrl?: string;
   /** Extra headers merged into every request; a function is invoked per request. */
   headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
@@ -459,7 +459,7 @@ export type RequestOptions = RequestInit & { retry?: Partial<RetryConfig>; parse
  * Mutates a module-scoped binding shared by the functions facade. For multiple
  * bases at once, use the service-class facade with \`new Client({ serverUrl })\`.
  */
-export function setBaseUrl(url: string): void {
+export function setServerUrl(url: string): void {
   BASE = url;
 }
 
diff --git a/packages/client-generator/src/writers/__tests__/split-writer.test.ts b/packages/client-generator/src/writers/__tests__/split-writer.test.ts
index 438e62e8f9..58800f7862 100644
--- a/packages/client-generator/src/writers/__tests__/split-writer.test.ts
+++ b/packages/client-generator/src/writers/__tests__/split-writer.test.ts
@@ -62,7 +62,7 @@ describe('splitWriter — http module', () => {
         services: [{ name: 'Default', operations: [operation()] }],
       })
     );
-    expect(http.content).toContain('export function setBaseUrl(');
+    expect(http.content).toContain('export function setServerUrl(');
     expect(http.content).toContain('export class ApiError');
     expect(http.content).toContain('export function __buildUrl(');
     expect(http.content).toContain('export async function __request<T>(');
@@ -126,7 +126,7 @@ describe('splitWriter — entry imports & re-exports', () => {
     );
     expect(entry.content).toContain("export * from './client.schemas.js';");
     expect(entry.content).toContain(
-      'export { ApiError, configure, setBaseUrl, use } from "./client.http.js";'
+      'export { ApiError, configure, setServerUrl, use } from "./client.http.js";'
     );
     expect(entry.content).toContain(
       'export type { ClientConfig, Middleware, OperationContext, ParseAs, RequestContext, RequestOptions, RetryConfig, RetryContext, RetryStrategy } from "./client.http.js";'
@@ -166,7 +166,7 @@ describe('splitWriter — entry imports & re-exports', () => {
       'import { __auth, __buildUrl, __config, __headers, __request, type RequestOptions } from "./client.http.js";'
     );
     expect(entry.content).toContain(
-      'export { ApiError, configure, setBaseUrl, setBearer, use } from "./client.http.js";'
+      'export { ApiError, configure, setBearer, setServerUrl, use } from "./client.http.js";'
     );
     expect(http.content).toContain('export async function __auth(');
     expect(http.content).toContain('export function setBearer(');
@@ -186,7 +186,7 @@ describe('splitWriter — entry imports & re-exports', () => {
     const { entry } = run(model());
     expect(entry.content).not.toContain('.schemas.js');
     expect(entry.content).toContain(
-      'export { ApiError, configure, setBaseUrl, use } from "./client.http.js";'
+      'export { ApiError, configure, setServerUrl, use } from "./client.http.js";'
     );
   });
 
diff --git a/packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts b/packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts
index cc71d29f31..43f8432fe7 100644
--- a/packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts
+++ b/packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts
@@ -138,7 +138,7 @@ describe('tagsSplitWriter', () => {
     );
     const entry = find('/out/client.ts')!;
     expect(entry.content).toContain(
-      'export { ApiError, configure, setBaseUrl, setBearer, use } from "./client.http.js";'
+      'export { ApiError, configure, setBearer, setServerUrl, use } from "./client.http.js";'
     );
     expect(entry.content).toContain(
       'export type { AuthCredentials, ClientConfig, Middleware, OperationContext, ParseAs, RequestContext, RequestOptions, RetryConfig, RetryContext, RetryStrategy, TokenProvider } from "./client.http.js";'
diff --git a/packages/client-generator/src/writers/__tests__/tags-writer.test.ts b/packages/client-generator/src/writers/__tests__/tags-writer.test.ts
index 3f000675c3..4dbe780a98 100644
--- a/packages/client-generator/src/writers/__tests__/tags-writer.test.ts
+++ b/packages/client-generator/src/writers/__tests__/tags-writer.test.ts
@@ -157,7 +157,7 @@ describe('tagsWriter', () => {
     const entry = find('/out/client.ts')!;
     expect(entry.content).toContain("export * from './client.schemas.js';");
     expect(entry.content).toContain(
-      'export { ApiError, configure, setBaseUrl, setBearer, use } from "./client.http.js";'
+      'export { ApiError, configure, setBearer, setServerUrl, use } from "./client.http.js";'
     );
     expect(entry.content).toContain(
       'export type { AuthCredentials, ClientConfig, Middleware, OperationContext, ParseAs, RequestContext, RequestOptions, RetryConfig, RetryContext, RetryStrategy, TokenProvider } from "./client.http.js";'
@@ -239,7 +239,7 @@ describe('tagsWriter', () => {
     const entry = find('/out/client.ts')!;
     expect(entry.content).not.toContain("export * from './client.schemas.js';");
     expect(entry.content).toContain(
-      'export { ApiError, configure, setBaseUrl, use } from "./client.http.js";'
+      'export { ApiError, configure, setServerUrl, use } from "./client.http.js";'
     );
   });
 });
diff --git a/tests/e2e/generate-client/auth.test.ts b/tests/e2e/generate-client/auth.test.ts
index b14e01c44e..1c114092f5 100644
--- a/tests/e2e/generate-client/auth.test.ts
+++ b/tests/e2e/generate-client/auth.test.ts
@@ -119,7 +119,7 @@ describe('generate-client auth breadth (auth.yaml)', () => {
   // header and (b) a query-key scheme lands `api_key=` in the request URL.
   it('async setBearer resolves onto Authorization and query-key lands in the URL', () => {
     // The driver owns its own throwaway http server (and binds BASE to it at
-    // runtime via setBaseUrl), so a single `spawnSync` runs the whole behavioral
+    // runtime via setServerUrl), so a single `spawnSync` runs the whole behavioral
     // probe — the server can't be starved by the test process's blocking spawn.
     const dir = mkdtempSync(join(tmpdir(), 'ots-auth-run-'));
     const out = join(dir, 'client.ts');
@@ -133,7 +133,7 @@ describe('generate-client auth breadth (auth.yaml)', () => {
     writeFileSync(
       driver,
       `import * as http from 'node:http';
-import { getBearer, getQuery, setBaseUrl, setBearer, setApiKeyQueryKey } from './client.js';
+import { getBearer, getQuery, setServerUrl, setBearer, setApiKeyQueryKey } from './client.js';
 
 const captured: Array<{ url: string; auth?: string }> = [];
 const server = http.createServer((req, res) => {
@@ -145,7 +145,7 @@ const server = http.createServer((req, res) => {
 async function main() {
   await new Promise<void>((r) => server.listen(0, '127.0.0.1', r));
   const port = (server.address() as { port: number }).port;
-  setBaseUrl('http://127.0.0.1:' + port);
+  setServerUrl('http://127.0.0.1:' + port);
   setBearer(async () => 'tok');
   await getBearer();
   setApiKeyQueryKey('secret-key');
diff --git a/tests/e2e/generate-client/base-consumer/api.ts b/tests/e2e/generate-client/base-consumer/api.ts
index 91e81ab89b..639ab7fba2 100644
--- a/tests/e2e/generate-client/base-consumer/api.ts
+++ b/tests/e2e/generate-client/base-consumer/api.ts
@@ -152,7 +152,7 @@ export type RequestContext = {
  * (functions facade).
  */
 export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
     serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
@@ -252,7 +252,7 @@ export type RequestOptions = RequestInit & {
  * Mutates a module-scoped binding shared by the functions facade. For multiple
  * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
-export function setBaseUrl(url: string): void {
+export function setServerUrl(url: string): void {
     BASE = url;
 }
 
diff --git a/tests/e2e/generate-client/base.test.ts b/tests/e2e/generate-client/base.test.ts
index 1cb17d0faa..af469dfeaa 100644
--- a/tests/e2e/generate-client/base.test.ts
+++ b/tests/e2e/generate-client/base.test.ts
@@ -96,7 +96,7 @@ describe('generate-client base consumer (single-file output)', () => {
     expect(generated).toContain('export async function getPetById');
     expect(generated).toContain('export async function getSlowPet');
     expect(generated).toContain('export async function listPets');
-    // BASE is emitted as a mutable binding so setBaseUrl() can override it.
+    // BASE is emitted as a mutable binding so setServerUrl() can override it.
     expect(generated).toContain('let BASE = "http://localhost:3102"');
     // An OAS 3.1 enum that includes null renders as a nullable union.
     expect(generated).toMatch(/status\?:\s*\("available" \| "pending" \| "sold"\) \| null;/);
diff --git a/tests/e2e/generate-client/cafe-consumer/api.ts b/tests/e2e/generate-client/cafe-consumer/api.ts
index 150ccd0e94..17e544556e 100644
--- a/tests/e2e/generate-client/cafe-consumer/api.ts
+++ b/tests/e2e/generate-client/cafe-consumer/api.ts
@@ -476,7 +476,7 @@ export type RequestContext = {
  * (functions facade).
  */
 export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
     serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
@@ -583,7 +583,7 @@ export type RequestOptions = RequestInit & {
  * Mutates a module-scoped binding shared by the functions facade. For multiple
  * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
-export function setBaseUrl(url: string): void {
+export function setServerUrl(url: string): void {
     BASE = url;
 }
 
diff --git a/tests/e2e/generate-client/cafe-consumer/index-setbaseurl.ts b/tests/e2e/generate-client/cafe-consumer/index-setbaseurl.ts
index eabfe7c241..d88bcf7a97 100644
--- a/tests/e2e/generate-client/cafe-consumer/index-setbaseurl.ts
+++ b/tests/e2e/generate-client/cafe-consumer/index-setbaseurl.ts
@@ -1,11 +1,11 @@
-import { listMenuItems, setBaseUrl } from './api.js';
+import { listMenuItems, setServerUrl } from './api.js';
 
 type StepResult = { kind: 'ok'; name: string } | { kind: 'err'; name: string; error: string };
 
 function requireEnv(name: string): string {
   const value = process.env[name];
   if (!value) {
-    process.stderr.write(`${name} env var required for the setBaseUrl mid-flight test\n`);
+    process.stderr.write(`${name} env var required for the setServerUrl mid-flight test\n`);
     process.exit(1);
   }
   return value;
@@ -38,15 +38,15 @@ async function main(): Promise<void> {
   results.push(await step('initial-call-against-mock', () => listMenuItems({ limit: 1 })));
 
   // 2) Flip BASE to an unreachable host. The same operation should now fail to connect.
-  //    This is the proof that setBaseUrl() actually mutated the module-scoped binding.
-  setBaseUrl(UNREACHABLE);
+  //    This is the proof that setServerUrl() actually mutated the module-scoped binding.
+  setServerUrl(UNREACHABLE);
   results.push(
-    await step('call-after-setBaseUrl-to-unreachable', () => listMenuItems({ limit: 1 }))
+    await step('call-after-setServerUrl-to-unreachable', () => listMenuItems({ limit: 1 }))
   );
 
   // 3) Flip BASE back to the live mock and confirm the binding restored cleanly.
-  setBaseUrl(liveBase);
-  results.push(await step('call-after-setBaseUrl-restored', () => listMenuItems({ limit: 1 })));
+  setServerUrl(liveBase);
+  results.push(await step('call-after-setServerUrl-restored', () => listMenuItems({ limit: 1 })));
 
   process.stdout.write(JSON.stringify(results, null, 2) + '\n');
 }
diff --git a/tests/e2e/generate-client/cafe.snapshot.ts b/tests/e2e/generate-client/cafe.snapshot.ts
index 01ffeb8c5c..804e48df94 100644
--- a/tests/e2e/generate-client/cafe.snapshot.ts
+++ b/tests/e2e/generate-client/cafe.snapshot.ts
@@ -476,7 +476,7 @@ export type RequestContext = {
  * (functions facade).
  */
 export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
     serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
@@ -583,7 +583,7 @@ export type RequestOptions = RequestInit & {
  * Mutates a module-scoped binding shared by the functions facade. For multiple
  * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
-export function setBaseUrl(url: string): void {
+export function setServerUrl(url: string): void {
     BASE = url;
 }
 
diff --git a/tests/e2e/generate-client/cafe.test.ts b/tests/e2e/generate-client/cafe.test.ts
index e173d8e862..29fa8220f6 100644
--- a/tests/e2e/generate-client/cafe.test.ts
+++ b/tests/e2e/generate-client/cafe.test.ts
@@ -391,22 +391,22 @@ describe('generate-client end-to-end (cafe.yaml)', () => {
     }
   });
 
-  // `setBaseUrl()` is exercised mid-flight: the first call hits the mock, the
+  // `setServerUrl()` is exercised mid-flight: the first call hits the mock, the
   // second (after flipping to an unreachable host) fails to connect, and the
   // third (after restoring) succeeds again.
-  test('setBaseUrl() switches the BASE binding for subsequent operations', () => {
+  test('setServerUrl() switches the BASE binding for subsequent operations', () => {
     const run = spawnSync('npx', ['tsx', setBaseUrlScript], {
       encoding: 'utf-8',
       cwd: consumerDir,
       env: { ...process.env, CAFE_BASE: SERVER_BASE },
     });
-    expect(run.status, `setBaseUrl consumer stderr:\n${run.stderr}`).toBe(0);
+    expect(run.status, `setServerUrl consumer stderr:\n${run.stderr}`).toBe(0);
     const steps = JSON.parse(run.stdout.trim()) as Array<
       { kind: 'ok'; name: string } | { kind: 'err'; name: string; error: string }
     >;
     expect(steps.find((s) => s.name === 'initial-call-against-mock')?.kind).toBe('ok');
-    const flipped = steps.find((s) => s.name === 'call-after-setBaseUrl-to-unreachable');
+    const flipped = steps.find((s) => s.name === 'call-after-setServerUrl-to-unreachable');
     expect(flipped?.kind).toBe('err');
-    expect(steps.find((s) => s.name === 'call-after-setBaseUrl-restored')?.kind).toBe('ok');
+    expect(steps.find((s) => s.name === 'call-after-setServerUrl-restored')?.kind).toBe('ok');
   });
 });
diff --git a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
index 20dc1d34d6..616f0c0e6c 100644
--- a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
@@ -476,7 +476,7 @@ export type RequestContext = {
  * (functions facade).
  */
 export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
     serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
@@ -583,7 +583,7 @@ export type RequestOptions = RequestInit & {
  * Mutates a module-scoped binding shared by the functions facade. For multiple
  * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
-export function setBaseUrl(url: string): void {
+export function setServerUrl(url: string): void {
     BASE = url;
 }
 
diff --git a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
index 01ffeb8c5c..804e48df94 100644
--- a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
@@ -476,7 +476,7 @@ export type RequestContext = {
  * (functions facade).
  */
 export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
     serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
@@ -583,7 +583,7 @@ export type RequestOptions = RequestInit & {
  * Mutates a module-scoped binding shared by the functions facade. For multiple
  * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
-export function setBaseUrl(url: string): void {
+export function setServerUrl(url: string): void {
     BASE = url;
 }
 
diff --git a/tests/e2e/generate-client/examples/customization/src/api/client.ts b/tests/e2e/generate-client/examples/customization/src/api/client.ts
index 01ffeb8c5c..804e48df94 100644
--- a/tests/e2e/generate-client/examples/customization/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/customization/src/api/client.ts
@@ -476,7 +476,7 @@ export type RequestContext = {
  * (functions facade).
  */
 export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
     serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
@@ -583,7 +583,7 @@ export type RequestOptions = RequestInit & {
  * Mutates a module-scoped binding shared by the functions facade. For multiple
  * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
-export function setBaseUrl(url: string): void {
+export function setServerUrl(url: string): void {
     BASE = url;
 }
 
diff --git a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
index 01ffeb8c5c..804e48df94 100644
--- a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
@@ -476,7 +476,7 @@ export type RequestContext = {
  * (functions facade).
  */
 export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
     serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
@@ -583,7 +583,7 @@ export type RequestOptions = RequestInit & {
  * Mutates a module-scoped binding shared by the functions facade. For multiple
  * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
-export function setBaseUrl(url: string): void {
+export function setServerUrl(url: string): void {
     BASE = url;
 }
 
diff --git a/tests/e2e/generate-client/examples/mock/src/api/client.ts b/tests/e2e/generate-client/examples/mock/src/api/client.ts
index 01ffeb8c5c..804e48df94 100644
--- a/tests/e2e/generate-client/examples/mock/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/mock/src/api/client.ts
@@ -476,7 +476,7 @@ export type RequestContext = {
  * (functions facade).
  */
 export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
     serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
@@ -583,7 +583,7 @@ export type RequestOptions = RequestInit & {
  * Mutates a module-scoped binding shared by the functions facade. For multiple
  * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
-export function setBaseUrl(url: string): void {
+export function setServerUrl(url: string): void {
     BASE = url;
 }
 
diff --git a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
index 01ffeb8c5c..804e48df94 100644
--- a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
@@ -476,7 +476,7 @@ export type RequestContext = {
  * (functions facade).
  */
 export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
     serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
@@ -583,7 +583,7 @@ export type RequestOptions = RequestInit & {
  * Mutates a module-scoped binding shared by the functions facade. For multiple
  * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
-export function setBaseUrl(url: string): void {
+export function setServerUrl(url: string): void {
     BASE = url;
 }
 
diff --git a/tests/e2e/generate-client/examples/service-class/src/api/client.ts b/tests/e2e/generate-client/examples/service-class/src/api/client.ts
index 7d78f5cd7e..2948988c6e 100644
--- a/tests/e2e/generate-client/examples/service-class/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/service-class/src/api/client.ts
@@ -476,7 +476,7 @@ export type RequestContext = {
  * (functions facade).
  */
 export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
     serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
@@ -583,7 +583,7 @@ export type RequestOptions = RequestInit & {
  * Mutates a module-scoped binding shared by the functions facade. For multiple
  * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
-export function setBaseUrl(url: string): void {
+export function setServerUrl(url: string): void {
     BASE = url;
 }
 
diff --git a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
index 01ffeb8c5c..804e48df94 100644
--- a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
@@ -476,7 +476,7 @@ export type RequestContext = {
  * (functions facade).
  */
 export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
     serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
@@ -583,7 +583,7 @@ export type RequestOptions = RequestInit & {
  * Mutates a module-scoped binding shared by the functions facade. For multiple
  * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
-export function setBaseUrl(url: string): void {
+export function setServerUrl(url: string): void {
     BASE = url;
 }
 
diff --git a/tests/e2e/generate-client/examples/zod/src/api/client.ts b/tests/e2e/generate-client/examples/zod/src/api/client.ts
index 01ffeb8c5c..804e48df94 100644
--- a/tests/e2e/generate-client/examples/zod/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/zod/src/api/client.ts
@@ -476,7 +476,7 @@ export type RequestContext = {
  * (functions facade).
  */
 export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
     serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
@@ -583,7 +583,7 @@ export type RequestOptions = RequestInit & {
  * Mutates a module-scoped binding shared by the functions facade. For multiple
  * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
-export function setBaseUrl(url: string): void {
+export function setServerUrl(url: string): void {
     BASE = url;
 }
 
diff --git a/tests/e2e/generate-client/sse-consumer/api.ts b/tests/e2e/generate-client/sse-consumer/api.ts
index bd1152f344..67d6fb7dd7 100644
--- a/tests/e2e/generate-client/sse-consumer/api.ts
+++ b/tests/e2e/generate-client/sse-consumer/api.ts
@@ -70,7 +70,7 @@ export type RequestContext = {
  * (functions facade).
  */
 export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setBaseUrl()`. */
+    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
     serverUrl?: string;
     /** Extra headers merged into every request; a function is invoked per request. */
     headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
@@ -170,7 +170,7 @@ export type RequestOptions = RequestInit & {
  * Mutates a module-scoped binding shared by the functions facade. For multiple
  * bases at once, use the service-class facade with `new Client({ serverUrl })`.
  */
-export function setBaseUrl(url: string): void {
+export function setServerUrl(url: string): void {
     BASE = url;
 }
 

From 794649e10bd94f2ba236cb0209e8e91ee3f4844c Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 13:16:41 +0300
Subject: [PATCH 047/134] docs(client-generator): document the client config
 model + serverUrl

Rewrite the command reference Configuration + Usage for the new model: a top-level
`client` block, per-API `apis.<name>.client` / `clientOutput`, and the three
invocation modes (fan-out / alias / path). Rename baseUrl -> serverUrl and
--base-url -> --server-url throughout the docs, drop the removed `defineConfig`
from the README (use `satisfies Config`), refresh ARCHITECTURE.md and the
regenerate/mergeConfig comments, and mark ADR-0008 superseded.
---
 docs/@v2/commands/generate-client.md          | 52 +++++++++++--------
 packages/client-generator/ARCHITECTURE.md     |  2 +-
 packages/client-generator/README.md           | 20 +++----
 .../docs/adr/0008-redocly-yaml-config.md      |  4 +-
 .../scripts/regenerate-examples.mjs           |  4 +-
 packages/client-generator/src/config-file.ts  |  4 +-
 6 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index fd606b118f..e827ea1565 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -19,19 +19,19 @@ By default it emits a single file with inline types and one async function per o
 ## Usage
 
 ```sh
-redocly generate-client <api> --output <file.ts>
-redocly generate-client openapi.yaml --output src/client.ts
-redocly generate-client cafe -o src/client.ts
+redocly generate-client                          # every api with a `client` block (see Configuration)
+redocly generate-client cafe                     # a single `apis:` alias from redocly.yaml
+redocly generate-client openapi.yaml -o src/client.ts   # a file path (ignores `apis:`)
 ```
 
-`<api>` is a file path, a URL, or an [`apis:` alias](../configuration/index.md) from `redocly.yaml`.
+With **no argument**, a client is generated for every api that declares a `client` block under `apis:` (see [Configuration](#configuration)). Otherwise `<api>` is a file path, a URL, or an [`apis:` alias](../configuration/index.md): an alias uses that api's `client` block and `clientOutput`, while a plain path/URL ignores the `apis:` section and uses the top-level `client` defaults.
 
 ## Options
 
 | Option | Type | Description |
 | --- | --- | --- |
-| `api` | `string` | **REQUIRED.** OpenAPI description file path, URL, or an `apis:` alias from `redocly.yaml`. |
-| `--output`, `-o` | `string` | **REQUIRED.** Output path; must end in `.ts`. In multi-file modes it's the entry file. |
+| `api` | `string` | OpenAPI description file path, URL, or an `apis:` alias. Omit it to generate for every api that has a `client` block. |
+| `--output`, `-o` | `string` | Output path (must end in `.ts`); the entry file in multi-file modes. Defaults to the api's `clientOutput`, else `<name>.client.ts` in the config dir. Not allowed when generating for multiple apis. |
 | `--output-mode` | `string` | File layout: `single` (default), `split` (endpoints/schemas/runtime in sibling files), `tags` (one endpoints file per tag), or `tags-split` (a folder per tag). |
 | `--generators` | `string` | Comma-separated generators to run (default `sdk`). See [Generators](#generators). |
 | `--facade` | `string` | Operation shape: `functions` (default, standalone functions) or `service-class` (methods on a `Client` class). |
@@ -43,31 +43,35 @@ redocly generate-client cafe -o src/client.ts
 | `--query-framework` | `string` | TanStack Query adapter: `react` (default), `vue`, `svelte`, or `solid`. |
 | `--mock-data` | `string` | `mock` generator data: `baked` (default, deterministic literals) or `faker` (`@faker-js/faker` calls). |
 | `--mock-seed` | `number` | Seed for `faker`-mode mocks, for reproducible data. Ignored in `baked` mode. |
-| `--base-url` | `string` | Override the base URL inlined into the runtime. Defaults to `servers[0].url`. Accepts absolute (`https://api.example.com`) or relative (`/v1`). |
+| `--server-url` | `string` | Override the server URL inlined into the runtime. Defaults to `servers[0].url`. Accepts absolute (`https://api.example.com`) or relative (`/v1`). |
 | `--setup` | `string` | Path to a publisher setup module baked into the client. See [Publisher defaults](#publisher-defaults). |
-| `--config` | `string` | Path to the `redocly.yaml` holding the `x-client-generator` block. Defaults to the one in the working directory. |
+| `--config` | `string` | Path to the `redocly.yaml` (the `client` config and `apis:` live there). Defaults to the one in the working directory. |
 
 ## Configuration
 
-Instead of passing flags every time, put the settings in `redocly.yaml` under an `x-client-generator` block.
-`generate-client` reads it automatically (relative `api`/`output` resolve against the config file's directory):
+Put shared settings in a top-level `client` block, and give each API its input (`root`), an optional output (`clientOutput`), and any per-API overrides under `apis.<name>.client`:
 
 ```yaml
 # redocly.yaml
-x-client-generator:
-  api: ./openapi.yaml
-  output: ./src/api/client.ts
+client: # shared defaults for every generated client
   generators:
     - sdk
-  facade: service-class
+  facade: functions
+apis:
+  cafe:
+    root: ./openapi.yaml # the input
+    clientOutput: ./src/api/client.ts # optional; defaults to `cafe.client.ts`
+    client: # per-API overrides (optional)
+      facade: service-class
 ```
 
 ```sh
-redocly generate-client                          # uses redocly.yaml in the cwd
+redocly generate-client              # builds every api with a `client` block, to its clientOutput
+redocly generate-client cafe         # just the `cafe` api (its client block + clientOutput)
 redocly generate-client --config ./config/redocly.yaml
 ```
 
-For code-level control — including registering [custom generators](#custom-generators) inline — use the programmatic `generateClient(...)` API.
+Settings resolve **top-level `client` → per-API `client` → CLI flags** (later wins). The input and output never go in a `client` block: the input is `apis.<name>.root` (or a CLI path/alias), and the output is `clientOutput`, `--output`, or the `<name>.client.ts` default. A plain file-path invocation ignores `apis:` and uses only the top-level `client`. For code-level control — including registering [custom generators](#custom-generators) inline — use the programmatic `generateClient(...)` API.
 
 ## Generators
 
@@ -175,7 +179,7 @@ The middleware above is composed by the **consumer**. If you **publish an SDK**,
 import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
 
 export default defineClientSetup({
-  config: { baseUrl: 'https://api.acme.com', retry: { retries: 3 } },
+  config: { serverUrl: 'https://api.acme.com', retry: { retries: 3 } },
   middleware: [{ onRequest: (ctx: RequestContext) => { ctx.headers['X-Acme-SDK'] = '1.4.0'; } }],
 });
 ```
@@ -320,11 +324,15 @@ The `@redocly/client-generator/plugin` entry also exports the codegen toolkit (`
 Select it in `redocly.yaml` by path or package name:
 
 ```yaml
-x-client-generator:
-  generators:
-    - sdk
-    - ./tools/route-map-generator.ts   # local path (resolved against redocly.yaml)
-    - '@acme/openapi-valibot'          # published package
+apis:
+  cafe:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
+        - ./tools/route-map-generator.ts # local path (resolved against redocly.yaml)
+        - '@acme/openapi-valibot' # published package
 ```
 
 Or register one **inline** with the programmatic API and select it by name:
diff --git a/packages/client-generator/ARCHITECTURE.md b/packages/client-generator/ARCHITECTURE.md
index ce825dd25b..a372227b74 100644
--- a/packages/client-generator/ARCHITECTURE.md
+++ b/packages/client-generator/ARCHITECTURE.md
@@ -92,7 +92,7 @@ Places where behavior varies without editing in place:
 
 ## Configuration
 
-`generate-client` reads its options from an `x-client-generator` block in `redocly.yaml` (auto-discovered), with a dedicated `*.config.ts` (`--config-file`) and CLI flags layering over it.
+`generate-client` reads its options from a `client` block in `redocly.yaml`: top-level shared defaults plus per-API overrides under `apis.<name>.client`, with the input as `apis.<name>.root` and the output as `apis.<name>.clientOutput`. CLI flags layer over the config (top-level `client` → per-API `client` → flags).
 The extraction lives in the CLI command, not this package's core.
 See [ADR-0008](./docs/adr/0008-redocly-yaml-config.md).
 
diff --git a/packages/client-generator/README.md b/packages/client-generator/README.md
index 0903398b4d..62740156bf 100644
--- a/packages/client-generator/README.md
+++ b/packages/client-generator/README.md
@@ -18,7 +18,7 @@ The rest of this README covers using the package **programmatically**.
   `api` is a file path or URL.
 - **Zero-dependency client** built via the TS AST, with `typescript` as the only peer dep
 - **Output modes** — `single`, `split`, `tags`, `tags-split` (`outputMode`)
-- **Facades** — standalone `functions` or a `service-class` (`facade`), the latter supporting **per-instance configuration and credentials** (`new Client({ auth, baseUrl, … })`)
+- **Facades** — standalone `functions` or a `service-class` (`facade`), the latter supporting **per-instance configuration and credentials** (`new Client({ auth, serverUrl, … })`)
 - **Argument styles** — `flat` positional args or a `grouped` `vars` object (`argsStyle`)
 - **Rich types** — inline types for every schema:
   - string enums as unions or runtime `const` objects (`enumStyle`)
@@ -26,7 +26,7 @@ The rest of this README covers using the package **programmatically**.
   - validation keywords surfaced as JSDoc
   - `dateType: 'Date'`
   - **typed `multipart/form-data` bodies** (object fields, binary → `Blob`) auto-serialized to `FormData`
-- **Runtime** — `setBaseUrl` + a typed `ClientConfig` (headers, `fetch` swap, hooks):
+- **Runtime** — `setServerUrl` + a typed `ClientConfig` (headers, `fetch` swap, hooks):
   - **composable middleware** (`onRequest`/`onResponse`/`onError`)
   - **opt-in, abort-aware retries** with backoff, jitter, `Retry-After`, and a custom `retryOn`
   - per-call response decoding (`parseAs`)
@@ -57,22 +57,24 @@ const result = await generateClient({
   dateType: 'string', // 'string' | 'Date' (pair 'Date' with the 'transformers' generator)
   enumStyle: 'const-object', // 'const-object' | 'union'
   generators: ['sdk'], // see "Generators" below
-  // baseUrl, name, queryFramework, mockData, mockSeed, customGenerators are also accepted
+  // serverUrl, name, queryFramework, mockData, mockSeed, customGenerators are also accepted
 });
 
 console.log(`Wrote ${result.files.length} file(s), ${result.bytes} bytes.`);
 ```
 
-For type-safe option authoring, `defineConfig` returns its argument unchanged:
+For type-safe authoring of a standalone options object, annotate it with `satisfies Config`:
 
 ```ts
-import { defineConfig } from '@redocly/client-generator';
+import { generateClient, type Config } from '@redocly/client-generator';
 
-export default defineConfig({
+const options = {
   api: './openapi.yaml',
   output: './src/api/client.ts',
   generators: ['sdk', 'zod'],
-});
+} satisfies Config;
+
+await generateClient(options);
 ```
 
 To inspect the output without writing to disk, the lower-level `collectGeneratedFiles(model, opts)` returns the files in memory (see `src/index.ts`).
@@ -200,7 +202,7 @@ The customization above is composed by the **consumer**. If you instead **publis
 import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
 
 export default defineClientSetup({
-  config: { baseUrl: 'https://api.acme.com', retry: { retries: 3 } },
+  config: { serverUrl: 'https://api.acme.com', retry: { retries: 3 } },
   middleware: [
     {
       onRequest: (ctx: RequestContext) => {
@@ -230,7 +232,7 @@ The client is plain `fetch` code, so you test it like any HTTP code — there is
 ```ts
 import { configure, listMenuItems } from './client.ts';
 
-configure({ baseUrl: 'https://api.example.com' });
+configure({ serverUrl: 'https://api.example.com' });
 const items = await listMenuItems(); // resolves or throws ApiError
 ```
 
diff --git a/packages/client-generator/docs/adr/0008-redocly-yaml-config.md b/packages/client-generator/docs/adr/0008-redocly-yaml-config.md
index b7c905e924..8e1bcd4d30 100644
--- a/packages/client-generator/docs/adr/0008-redocly-yaml-config.md
+++ b/packages/client-generator/docs/adr/0008-redocly-yaml-config.md
@@ -1,6 +1,8 @@
 # ADR 0008: `generate-client` config via `redocly.yaml` `x-client-generator`
 
-- Status: Accepted
+- Status: Superseded — the `x-client-generator` extension and the `*.config.ts` /
+  `--config-file` layer were replaced by a first-class `client` block (top-level shared
+  defaults + per-API `apis.<name>.client`) with the output at `apis.<name>.clientOutput`.
 - Date: 2026-06-10
 
 ## Context
diff --git a/packages/client-generator/scripts/regenerate-examples.mjs b/packages/client-generator/scripts/regenerate-examples.mjs
index 0f81f1c490..73433e27cb 100644
--- a/packages/client-generator/scripts/regenerate-examples.mjs
+++ b/packages/client-generator/scripts/regenerate-examples.mjs
@@ -4,8 +4,8 @@ import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
 // Regenerate each example's client in place. A `redocly.yaml` example uses the CLI
-// (auto-discovering its `x-client-generator` block); the programmatic example runs
-// its own `generate.ts`.
+// (a no-arg run fans out over its `apis:` entry's `client` block); the programmatic
+// example runs its own `generate.ts`.
 const pkgRoot = join(dirname(fileURLToPath(import.meta.url)), '..');
 const repoRoot = join(pkgRoot, '..', '..');
 const cli = join(repoRoot, 'packages/cli/lib/index.js');
diff --git a/packages/client-generator/src/config-file.ts b/packages/client-generator/src/config-file.ts
index 4fcbad8752..cc9c4b4636 100644
--- a/packages/client-generator/src/config-file.ts
+++ b/packages/client-generator/src/config-file.ts
@@ -2,8 +2,8 @@
 import type { Config } from './config.js';
 
 /**
- * Merge a base config (the `redocly.yaml` `x-client-generator` block) with CLI
- * overrides. Defined keys in `overrides` win; `undefined` override values are ignored
+ * Merge a base config (a `redocly.yaml` `client` block) with CLI overrides.
+ * Defined keys in `overrides` win; `undefined` override values are ignored
  * so absent flags don't clobber the base values.
  */
 export function mergeConfig(base: Partial<Config>, overrides: Partial<Config>): Partial<Config> {

From 4d55775f3564d91b9fa15f787dac9dedb00a756a Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 13:26:13 +0300
Subject: [PATCH 048/134] refactor(core): type client + clientOutput on the
 resolved config

Add `client` (config root + per-API) and `clientOutput` (per-API) to the config
types as a loosely-typed ClientGeneratorConfig (core does not depend on
@redocly/client-generator, which owns the precise shape). The generate-client CLI
now reads `config.resolvedConfig.client` / `.apis` through those types instead of
casting the whole resolved config to Record<string, unknown>.
---
 packages/cli/src/commands/generate-client.ts | 14 ++++---------
 packages/core/src/config/types.ts            | 22 +++++++++++++++++---
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index 2fc5022b55..df291088f3 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -53,17 +53,11 @@ export async function handleGenerateClient({
   const { generateClient } = await import('@redocly/client-generator');
   const { mergeConfig } = await import('@redocly/client-generator/config-file');
 
-  const resolved = config.resolvedConfig as Record<string, unknown>;
+  const { client, apis } = config.resolvedConfig;
   const configDir = config.configPath ? dirname(config.configPath) : process.cwd();
   // Top-level `client` block: shared defaults (relative `setup` resolved against the config dir).
-  const topClient = resolveSetup(
-    (isPlainObject(resolved.client) ? resolved.client : {}) as ClientConfig,
-    configDir
-  );
-  const apisCfg = (isPlainObject(resolved.apis) ? resolved.apis : {}) as Record<
-    string,
-    Record<string, unknown>
-  >;
+  const topClient = resolveSetup((isPlainObject(client) ? client : {}) as ClientConfig, configDir);
+  const apisCfg = apis ?? {};
 
   // CLI setting flags override both the top-level and per-API `client` blocks. `--setup` is
   // relative to the cwd (like `--output`); `api`/`output` are not settings and stay out of the merge.
@@ -88,7 +82,7 @@ export async function handleGenerateClient({
     return {
       name,
       api: getAliasOrPath(config, name).path,
-      clientOutput: typeof apiCfg?.clientOutput === 'string' ? apiCfg.clientOutput : undefined,
+      clientOutput: apiCfg?.clientOutput,
       perApiClient: isPlainObject(apiCfg?.client)
         ? resolveSetup(apiCfg.client as ClientConfig, configDir)
         : {},
diff --git a/packages/core/src/config/types.ts b/packages/core/src/config/types.ts
index b7bf6fd898..06b46a88d0 100644
--- a/packages/core/src/config/types.ts
+++ b/packages/core/src/config/types.ts
@@ -268,18 +268,34 @@ export type ResolveConfig = {
 
 export type Telemetry = 'on' | 'off';
 
+/**
+ * `generate-client` settings carried on the config root or an `apis` entry. Loosely
+ * typed because `@redocly/openapi-core` does not depend on `@redocly/client-generator`,
+ * which owns the precise shape; the CLI narrows it when consuming.
+ */
+export type ClientGeneratorConfig = Record<string, unknown>;
+
+/** Per-API `generate-client` fields: the `client` overrides block and its output path. */
+export type ClientGeneratorApiConfig = {
+  client?: ClientGeneratorConfig;
+  clientOutput?: string;
+};
+
 export type RawUniversalApiConfig = ApiConfig &
-  RawGovernanceConfig & {
+  RawGovernanceConfig &
+  ClientGeneratorApiConfig & {
     plugins?: (string | Plugin)[];
   };
 
-export type ResolvedApiConfig = ApiConfig & Required<ResolvedGovernanceConfig>;
+export type ResolvedApiConfig = ApiConfig &
+  Required<ResolvedGovernanceConfig> &
+  ClientGeneratorApiConfig;
 
 export type RawUniversalConfig = Omit<RedoclyConfig, 'apis' | 'plugins'> &
   RawGovernanceConfig & {
     plugins?: (string | Plugin)[];
     apis?: Record<string, RawUniversalApiConfig>;
-
+    client?: ClientGeneratorConfig;
     resolve?: RawResolveConfig;
     telemetry?: Telemetry;
   };

From 582b3e48f0676201d5386adda7384225c0046fc4 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 13:30:23 +0300
Subject: [PATCH 049/134] chore: drop the body-serialization changeset

The body-after-onRequest behavior is part of the new experimental generate-client
command's first release, not a fix to a shipped version, so it folds into the
single client-generator changeset for this PR.
---
 .changeset/serialize-body-after-onrequest.md | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 .changeset/serialize-body-after-onrequest.md

diff --git a/.changeset/serialize-body-after-onrequest.md b/.changeset/serialize-body-after-onrequest.md
deleted file mode 100644
index 3f16af40cb..0000000000
--- a/.changeset/serialize-body-after-onrequest.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-'@redocly/client-generator': patch
-'@redocly/cli': patch
----
-
-`generate-client`: the generated client now serializes the request body **after** the `onRequest` middleware chain runs, so a middleware that mutates `ctx.body` (enveloping, signing, case conversion) has its change sent. Previously the body was serialized before `onRequest`, silently dropping such mutations.

From 953206ccc25f4da5a5e9b41a8c1cb364f07258c4 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 13:35:09 +0300
Subject: [PATCH 050/134] refactor(cli): use openapi-core pluralize for the
 generate-client summary

Collapse the manual files.length === 1 branch into one message using the shared
`pluralize` helper (the house pattern), so it reads "1 file" / "N files" at the
output path.
---
 packages/cli/src/commands/generate-client.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index df291088f3..edef0b5b6f 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -1,5 +1,5 @@
 import { type Config as OpenApiTsConfig } from '@redocly/client-generator';
-import { HandledError, isPlainObject, logger } from '@redocly/openapi-core';
+import { HandledError, isPlainObject, logger, pluralize } from '@redocly/openapi-core';
 import { blue, gray, yellow } from 'colorette';
 import { basename, dirname, extname, isAbsolute, resolve as resolvePath } from 'node:path';
 
@@ -152,10 +152,8 @@ export async function handleGenerateClient({
         config,
         configDir,
       });
-      const summary =
-        result.files.length === 1
-          ? `TypeScript client successfully generated to ${yellow(result.outputPath)} (${result.bytes} bytes).`
-          : `TypeScript client successfully generated: ${result.files.length} files (${result.bytes} bytes), entry at ${yellow(result.outputPath)}.`;
+      const fileCount = `${result.files.length} ${pluralize('file', result.files.length)}`;
+      const summary = `TypeScript client successfully generated: ${fileCount} (${result.bytes} bytes) at ${yellow(result.outputPath)}.`;
       logger.info('\n' + blue(summary) + '\n');
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);

From 829839e3d47a02127273a9b4d7b9094834e7bcdc Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 13:37:30 +0300
Subject: [PATCH 051/134] refactor(cli): drop explanatory comments in the
 generators coerce

The parse-only intent reads from the code (split/trim/filter, empty -> undefined);
name the accumulator `generators` instead.
---
 packages/cli/src/index.ts | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index 928835d4b4..1f12f13210 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -949,17 +949,12 @@ yargs(hideBin(process.argv))
               'Generators to run, comma-separated (default: sdk). Built-in names (sdk, zod, tanstack-query, swr, transformers, mock) or a custom-generator path/package specifier. Example: --generators sdk,zod or --generators sdk,./my-generator.ts',
             type: 'string',
             coerce: (value: string | undefined): string[] | undefined => {
-              // Parse only — built-in names, inline custom names, and plugin specifiers are all
-              // valid here; the generator resolver validates each (and reports unknown/unloadable
-              // entries with an actionable message) once the config is assembled.
               if (value === undefined) return undefined;
-              const names = value
+              const generators = value
                 .split(',')
-                .map((s) => s.trim())
+                .map((entry) => entry.trim())
                 .filter(Boolean);
-              // Treat an empty value (`--generators ` or `,`) as unset, so it neither
-              // replaces the default sdk generator nor clobbers a redocly.yaml selection.
-              return names.length ? names : undefined;
+              return generators.length ? generators : undefined;
             },
           },
           config: {

From 5deef0d7903f08cdf96f7f880c48746d6de8d53f Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 13:48:08 +0300
Subject: [PATCH 052/134] refactor(client-generator): rename ir/ to
 intermediate-representation/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Spell out the only abbreviated directory (the IR — intermediate representation)
as intermediate-representation/, updating all imports, the moved __tests__, and the
path references in ARCHITECTURE.md and the ADRs. The `refs`/`sse`/`jsdoc` names
stay — they're standard, meaningful domain terms, not cryptic abbreviations.
---
 packages/client-generator/ARCHITECTURE.md              | 10 +++++-----
 packages/client-generator/README.md                    |  2 +-
 packages/client-generator/docs/adr/0001-ast-codegen.md |  2 +-
 .../client-generator/docs/adr/0003-spec-agnostic-ir.md |  4 ++--
 packages/client-generator/src/__tests__/index.test.ts  |  2 +-
 .../src/emitters/__tests__/auth.test.ts                |  2 +-
 .../src/emitters/__tests__/client.test.ts              |  2 +-
 .../src/emitters/__tests__/faker.test.ts               |  2 +-
 .../src/emitters/__tests__/fixtures.ts                 |  2 +-
 .../src/emitters/__tests__/operations.test.ts          |  2 +-
 .../src/emitters/__tests__/sample.test.ts              |  2 +-
 .../src/emitters/__tests__/sse.deletion.test.ts        |  2 +-
 .../src/emitters/__tests__/sse.test.ts                 |  2 +-
 .../src/emitters/__tests__/transformers.test.ts        |  2 +-
 .../src/emitters/__tests__/types.test.ts               |  2 +-
 .../src/emitters/__tests__/zod.test.ts                 |  2 +-
 packages/client-generator/src/emitters/auth.ts         |  2 +-
 packages/client-generator/src/emitters/client.ts       |  4 ++--
 packages/client-generator/src/emitters/faker.ts        |  2 +-
 packages/client-generator/src/emitters/jsdoc.ts        |  2 +-
 packages/client-generator/src/emitters/mock.ts         |  2 +-
 .../client-generator/src/emitters/operation-aliases.ts |  2 +-
 .../src/emitters/operation-signature.ts                |  2 +-
 .../client-generator/src/emitters/operation-types.ts   |  2 +-
 packages/client-generator/src/emitters/operations.ts   |  2 +-
 packages/client-generator/src/emitters/sample.ts       |  2 +-
 packages/client-generator/src/emitters/sse.ts          |  2 +-
 packages/client-generator/src/emitters/swr.ts          |  2 +-
 .../client-generator/src/emitters/tanstack-query.ts    |  2 +-
 packages/client-generator/src/emitters/transformers.ts |  2 +-
 packages/client-generator/src/emitters/type-guards.ts  |  2 +-
 packages/client-generator/src/emitters/types.ts        |  2 +-
 .../client-generator/src/emitters/wrapper-support.ts   |  2 +-
 packages/client-generator/src/emitters/zod.ts          |  2 +-
 .../src/generators/__tests__/sdk.test.ts               |  2 +-
 packages/client-generator/src/generators/types.ts      |  2 +-
 packages/client-generator/src/index.ts                 |  8 ++++----
 .../__tests__/build.test.ts                            |  0
 .../__tests__/normalize-swagger2.test.ts               |  0
 .../__tests__/refs.test.ts                             |  0
 .../__tests__/sanitize-identifiers.test.ts             |  0
 .../src/{ir => intermediate-representation}/build.ts   |  0
 .../src/{ir => intermediate-representation}/model.ts   |  0
 .../normalize-swagger2.ts                              |  0
 .../src/{ir => intermediate-representation}/refs.ts    |  0
 .../sanitize-identifiers.ts                            |  0
 packages/client-generator/src/plugin.ts                |  2 +-
 .../src/writers/__tests__/group-by-tag.test.ts         |  2 +-
 .../src/writers/__tests__/index.test.ts                |  2 +-
 .../src/writers/__tests__/split-writer.test.ts         |  2 +-
 .../src/writers/__tests__/tags-split-writer.test.ts    |  2 +-
 .../src/writers/__tests__/tags-writer.test.ts          |  2 +-
 packages/client-generator/src/writers/group-by-tag.ts  |  2 +-
 packages/client-generator/src/writers/types.ts         |  2 +-
 packages/client-generator/src/writers/util.ts          |  2 +-
 55 files changed, 55 insertions(+), 55 deletions(-)
 rename packages/client-generator/src/{ir => intermediate-representation}/__tests__/build.test.ts (100%)
 rename packages/client-generator/src/{ir => intermediate-representation}/__tests__/normalize-swagger2.test.ts (100%)
 rename packages/client-generator/src/{ir => intermediate-representation}/__tests__/refs.test.ts (100%)
 rename packages/client-generator/src/{ir => intermediate-representation}/__tests__/sanitize-identifiers.test.ts (100%)
 rename packages/client-generator/src/{ir => intermediate-representation}/build.ts (100%)
 rename packages/client-generator/src/{ir => intermediate-representation}/model.ts (100%)
 rename packages/client-generator/src/{ir => intermediate-representation}/normalize-swagger2.ts (100%)
 rename packages/client-generator/src/{ir => intermediate-representation}/refs.ts (100%)
 rename packages/client-generator/src/{ir => intermediate-representation}/sanitize-identifiers.ts (100%)

diff --git a/packages/client-generator/ARCHITECTURE.md b/packages/client-generator/ARCHITECTURE.md
index a372227b74..bebb35fecb 100644
--- a/packages/client-generator/ARCHITECTURE.md
+++ b/packages/client-generator/ARCHITECTURE.md
@@ -35,9 +35,9 @@ flowchart LR
 
 1. **`loadSpec`** (`loader.ts`) — bundles the OpenAPI document via `@redocly/openapi-core`, resolving external `$ref`s while **preserving internal `$ref`s** (the IR builder relies on named references staying intact).
    Also detects the spec version (`detectSpec`).
-   1.5. **`normalizeSwagger2`** (`ir/normalize-swagger2.ts`) — when the detected version is `oas2`, converts the Swagger 2.0 document to the OpenAPI 3.x shape (definitions → components.schemas, host/basePath/schemes → servers, body/formData params → requestBody, `responses[].schema` → `responses[].content`, securityDefinitions → securitySchemes, `$ref` rewrite).
+   1.5. **`normalizeSwagger2`** (`intermediate-representation/normalize-swagger2.ts`) — when the detected version is `oas2`, converts the Swagger 2.0 document to the OpenAPI 3.x shape (definitions → components.schemas, host/basePath/schemes → servers, body/formData params → requestBody, `responses[].schema` → `responses[].content`, securityDefinitions → securitySchemes, `$ref` rewrite).
    OAS 3.0/3.1/3.2 skip this step.
-2. **`buildApiModel`** (`ir/build.ts`) — walks the OpenAPI document and produces the spec-agnostic **IR** (`ir/model.ts`).
+2. **`buildApiModel`** (`intermediate-representation/build.ts`) — walks the OpenAPI document and produces the spec-agnostic **IR** (`intermediate-representation/model.ts`).
    Everything downstream reads the IR, never the raw spec ([ADR-0003](./docs/adr/0003-spec-agnostic-ir.md)).
 3. **`getWriter(outputMode)`** (`writers/index.ts`) — selects the **Writer** for the chosen output mode.
 4. The **Writer** decides the file layout and fills each file by calling the **emitters**.
@@ -50,13 +50,13 @@ flowchart LR
 | ---------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | Entry      | `index.ts`, `types.ts`, `config.ts`, `config-file.ts`, `plugin.ts`                                                                                                                                                                                                                                                                                                                                                          | `generateClient` orchestration; public option/result types; config loading; the experimental `@redocly/client-generator/plugin` entry (`defineGenerator` + IR types + codegen toolkit)                                                                                                                                                                                                                                                                                       | thin orchestrator                                                                                                                                                             |
 | Load       | `loader.ts`                                                                                                                                                                                                                                                                                                                                                                                                                 | bundle + `$ref` resolution, preserving internal refs                                                                                                                                                                                                                                                                                                                                                                                                                         | deep (hides `openapi-core`)                                                                                                                                                   |
-| IR         | `ir/build.ts`, `ir/model.ts`, `ir/refs.ts`, `ir/normalize-swagger2.ts`, `ir/sanitize-identifiers.ts`                                                                                                                                                                                                                                                                                                                        | OpenAPI → IR; the IR type model; ref collection; Swagger 2.0 → 3.x normalization; coerce document-derived names to safe unique identifiers (security boundary)                                                                                                                                                                                                                                                                                                               | deep (`buildApiModel` + `normalizeSwagger2` each one interface over a whole walk)                                                                                             |
+| IR         | `intermediate-representation/build.ts`, `intermediate-representation/model.ts`, `intermediate-representation/refs.ts`, `intermediate-representation/normalize-swagger2.ts`, `intermediate-representation/sanitize-identifiers.ts`                                                                                                                                                                                                                                                                                                                        | OpenAPI → IR; the IR type model; ref collection; Swagger 2.0 → 3.x normalization; coerce document-derived names to safe unique identifiers (security boundary)                                                                                                                                                                                                                                                                                                               | deep (`buildApiModel` + `normalizeSwagger2` each one interface over a whole walk)                                                                                             |
 | Writers    | `writers/index.ts`, `single-file-writer.ts`, `split-writer.ts`, `tagged.ts`, `tags-writer.ts`, `tags-split-writer.ts`, `group-by-tag.ts`, `util.ts`, `types.ts`                                                                                                                                                                                                                                                             | file layout per output mode                                                                                                                                                                                                                                                                                                                                                                                                                                                  | thin adapters at the `getWriter` seam + `group-by-tag` (deep)                                                                                                                 |
 | Generators | `generators/index.ts` (registry + `validateGenerators`), `resolve.ts` (built-in / inline / specifier resolution), `types.ts`, `sdk.ts`, `zod.ts`, `tanstack-query.ts`, `swr.ts`, `transformers.ts`, `mock.ts`                                                                                                                                                                                                               | the generator registry seam: each descriptor declares its requires/facades/errorModes and produces `GeneratedFile[]` by calling an emitter; `resolve.ts` turns a selection (built-in names, inline `customGenerators`, or plugin import specifiers) into a name→descriptor registry                                                                                                                                                                                          | thin adapters at the `getGenerator` seam ([ADR-0004](./docs/adr/0004-registry-seams.md), [ADR-0012](./docs/adr/0012-plugin-api.md))                                           |
 | Emitters   | sdk: `emitters/client.ts` (composition), `types.ts`, `type-guards.ts`, `auth.ts`, `operations.ts` (+ `operation-aliases.ts`, `operation-types.ts`), `sse.ts`, `runtime.ts`; satellite: `zod.ts`, `transformers.ts`, `tanstack-query.ts`, `swr.ts` (+ shared `wrapper-support.ts`), `mock.ts`/`faker.ts`/`sample.ts`; foundation `ts.ts`; shared `operation-signature.ts`; private `support.ts`, `jsdoc.ts`, `identifier.ts` | IR → TypeScript AST (`ts.factory` nodes, printed via `ts.ts`); the emitted runtime; `operations.ts` splits the per-op assembly from its `<Op>*` alias builders (`operation-aliases.ts`) and shared param/body/response type builders (`operation-types.ts`); `sse.ts` is the SSE detection seam; `operation-signature.ts` is the single source of an operation’s calling convention; `wrapper-support.ts` is the shared eligibility/param model for `swr` + `tanstack-query` | each emitter is deep (one entry point builds nodes over hidden bulk); `client.ts` assembles the per-file statements and prints once; the runtime is the client library itself |
 | Errors     | `errors.ts`                                                                                                                                                                                                                                                                                                                                                                                                                 | `NotSupportedError`                                                                                                                                                                                                                                                                                                                                                                                                                                                          | trivial                                                                                                                                                                       |
 
-The IR (`ir/model.ts`) is a **pure type model** — no runtime code. It is the contract between the
+The IR (`intermediate-representation/model.ts`) is a **pure type model** — no runtime code. It is the contract between the
 builder and the emitters ([ADR-0003](./docs/adr/0003-spec-agnostic-ir.md)).
 
 ## Seams
@@ -125,7 +125,7 @@ Compile (`npm run compile`) before running tests — they run against built outp
 - **A new output mode** — add the literal to `OutputMode` (`writers/types.ts`), write a `Writer` (or extend `buildTaggedClient`), and register it in the `WRITERS` map (`writers/index.ts`).
   Wire the CLI choice in the `generate-client` command.
 - **A new facade** — extend the `Facade` type and `operationsBlockStatements` in `emitters/operations.ts` (build the function/method nodes via `emitters/ts.ts`); both single and multi-file writers route through it.
-- **A new schema kind** — add the variant to `SchemaModel` (`ir/model.ts`), produce it in `ir/build.ts`, and build its `ts.TypeNode` in `schemaToTypeNode` (`emitters/types.ts`).
+- **A new schema kind** — add the variant to `SchemaModel` (`intermediate-representation/model.ts`), produce it in `intermediate-representation/build.ts`, and build its `ts.TypeNode` in `schemaToTypeNode` (`emitters/types.ts`).
 - **A new runtime capability** — extend the authored source in `emitters/runtime.ts` (parsed into nodes via `parseStatements`); surface any new public type via `PUBLIC_RUNTIME_TYPES` so multi-file output re-exports it from the barrel.
 - **A new wrapper generator** (a framework adapter that forwards to the sdk functions) — reuse `emitters/wrapper-support.ts` for operation eligibility (SSE / `<Op>Variables`-collision skips) and the `vars`/`init` parameter shape, and derive the forwarding call's argument order and `<Op>Variables` naming from `operationSignature` (`emitters/operation-signature.ts`), the same source the sdk's parameter list uses, so the wrappers cannot drift.
   Declare its compatibility contract (`requires`/`facades`/`errorModes`/`dateTypes`) in the generator registry (`generators/index.ts`).
diff --git a/packages/client-generator/README.md b/packages/client-generator/README.md
index 62740156bf..bbde524aba 100644
--- a/packages/client-generator/README.md
+++ b/packages/client-generator/README.md
@@ -448,4 +448,4 @@ npm run unit                    # unit tests (this package is held at 100% cover
 VITEST_SUITE=e2e npx vitest run tests/e2e/generate-client/   # behavioral e2e
 ```
 
-The emitted runtime lives in `src/emitters/runtime.ts` (a template string), the structural emitters in `src/emitters/`, the IR in `src/ir/`, the generators in `src/generators/`, and the multi-file layout strategies in `src/writers/`.
+The emitted runtime lives in `src/emitters/runtime.ts` (a template string), the structural emitters in `src/emitters/`, the IR in `src/intermediate-representation/`, the generators in `src/generators/`, and the multi-file layout strategies in `src/writers/`.
diff --git a/packages/client-generator/docs/adr/0001-ast-codegen.md b/packages/client-generator/docs/adr/0001-ast-codegen.md
index 4ccb31affb..34f4825a3c 100644
--- a/packages/client-generator/docs/adr/0001-ast-codegen.md
+++ b/packages/client-generator/docs/adr/0001-ast-codegen.md
@@ -17,6 +17,6 @@ Each emitter returns `ts.Statement[]` / `ts.TypeNode`s; the composition (`client
 ## Consequences
 
 - Structurally malformed output (mismatched braces, wrong nesting) is impossible; passes can compose/transform/dedupe nodes before printing; the option matrix scales without brittle template edits.
-- **The AST is not a sanitizer.** `ts.factory.createIdentifier` prints its text verbatim and synthetic comments are emitted as written — so a spec-supplied name or description still reaches the output unchecked. Those two channels are closed _before_ the printer, not by it: names are coerced to safe identifiers in the IR (`ir/sanitize-identifiers.ts`, with an assert backstop) and all comment text is run through `escapeJsDoc` (`emitters/ts.ts`). Treat any new value that flows into an identifier slot or a comment as requiring the same handling.
+- **The AST is not a sanitizer.** `ts.factory.createIdentifier` prints its text verbatim and synthetic comments are emitted as written — so a spec-supplied name or description still reaches the output unchecked. Those two channels are closed _before_ the printer, not by it: names are coerced to safe identifiers in the IR (`intermediate-representation/sanitize-identifiers.ts`, with an assert backstop) and all comment text is run through `escapeJsDoc` (`emitters/ts.ts`). Treat any new value that flows into an identifier slot or a comment as requiring the same handling.
 - Output formatting is the printer's (valid, but plainer than hand-formatting) — a pretty-print pass is deferred to optional-formatter work.
 - The cost is a dependency on `typescript` at generation time (see [ADR-0002](./0002-typescript-peer-dep.md)), and emitter code is more verbose than templates for trivial snippets — accepted for the correctness and composability gains.
diff --git a/packages/client-generator/docs/adr/0003-spec-agnostic-ir.md b/packages/client-generator/docs/adr/0003-spec-agnostic-ir.md
index b99c185bbc..ac1021699b 100644
--- a/packages/client-generator/docs/adr/0003-spec-agnostic-ir.md
+++ b/packages/client-generator/docs/adr/0003-spec-agnostic-ir.md
@@ -10,8 +10,8 @@ If emitters read the raw OpenAPI document directly, every emitter would have to
 
 ## Decision
 
-We interpose a **spec-agnostic intermediate representation** (`ir/model.ts`) between parsing and emission.
-`buildApiModel` (`ir/build.ts`) walks the (bundled, ref-preserved) document once and produces the IR; Swagger 2.0 is first normalized to the 3.x shape (`ir/normalize-swagger2.ts`) so the builder sees one shape.
+We interpose a **spec-agnostic intermediate representation** (`intermediate-representation/model.ts`) between parsing and emission.
+`buildApiModel` (`intermediate-representation/build.ts`) walks the (bundled, ref-preserved) document once and produces the IR; Swagger 2.0 is first normalized to the 3.x shape (`intermediate-representation/normalize-swagger2.ts`) so the builder sees one shape.
 **Everything downstream reads the IR, never the raw spec.**
 The IR is a pure type model — no runtime code — and is the contract between the builder and the emitters.
 
diff --git a/packages/client-generator/src/__tests__/index.test.ts b/packages/client-generator/src/__tests__/index.test.ts
index bda5b77fd8..488b387009 100644
--- a/packages/client-generator/src/__tests__/index.test.ts
+++ b/packages/client-generator/src/__tests__/index.test.ts
@@ -3,7 +3,7 @@ import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 
 import { collectGeneratedFiles, generateClient } from '../index.js';
-import type { ApiModel } from '../ir/model.js';
+import type { ApiModel } from '../intermediate-representation/model.js';
 
 function model(): ApiModel {
   return {
diff --git a/packages/client-generator/src/emitters/__tests__/auth.test.ts b/packages/client-generator/src/emitters/__tests__/auth.test.ts
index f0a1c357c4..e4c8b086ee 100644
--- a/packages/client-generator/src/emitters/__tests__/auth.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/auth.test.ts
@@ -1,4 +1,4 @@
-import type { SecuritySchemeModel } from '../../ir/model.js';
+import type { SecuritySchemeModel } from '../../intermediate-representation/model.js';
 import { authSetterNames, authTypeNames, renderAuth } from '../auth.js';
 
 /** A spec exercising all five injectable kinds at once. */
diff --git a/packages/client-generator/src/emitters/__tests__/client.test.ts b/packages/client-generator/src/emitters/__tests__/client.test.ts
index 61b3e112f5..7f63dd0375 100644
--- a/packages/client-generator/src/emitters/__tests__/client.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/client.test.ts
@@ -1,4 +1,4 @@
-import type { ApiModel, OperationModel } from '../../ir/model.js';
+import type { ApiModel, OperationModel } from '../../intermediate-representation/model.js';
 import { emitModules, emitSingleFile, setupApply } from '../client.js';
 import { apiModel, emitWithOp, namedSchema, operation, param } from './fixtures.js';
 
diff --git a/packages/client-generator/src/emitters/__tests__/faker.test.ts b/packages/client-generator/src/emitters/__tests__/faker.test.ts
index ef7fa36e18..c84229dfab 100644
--- a/packages/client-generator/src/emitters/__tests__/faker.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/faker.test.ts
@@ -1,4 +1,4 @@
-import type { NamedSchemaModel, SchemaModel } from '../../ir/model.js';
+import type { NamedSchemaModel, SchemaModel } from '../../intermediate-representation/model.js';
 import { fakerExpression } from '../faker.js';
 import { printNodes } from '../ts.js';
 
diff --git a/packages/client-generator/src/emitters/__tests__/fixtures.ts b/packages/client-generator/src/emitters/__tests__/fixtures.ts
index 8fd57b4c90..55fd2afda0 100644
--- a/packages/client-generator/src/emitters/__tests__/fixtures.ts
+++ b/packages/client-generator/src/emitters/__tests__/fixtures.ts
@@ -5,7 +5,7 @@ import type {
   ParamModel,
   ResponseBodyModel,
   SchemaModel,
-} from '../../ir/model.js';
+} from '../../intermediate-representation/model.js';
 import { emitSingleFile } from '../client.js';
 
 /** A plain `string` scalar — the default schema for params and the most-reused leaf. */
diff --git a/packages/client-generator/src/emitters/__tests__/operations.test.ts b/packages/client-generator/src/emitters/__tests__/operations.test.ts
index 47ed754c0a..f275da4258 100644
--- a/packages/client-generator/src/emitters/__tests__/operations.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/operations.test.ts
@@ -3,7 +3,7 @@ import type {
   RequestBodyModel,
   ResponseBodyModel,
   SchemaModel,
-} from '../../ir/model.js';
+} from '../../intermediate-representation/model.js';
 import { emitSingleFile } from '../client.js';
 import { renderOperationsBlock, renderOperationsMeta, serviceClassName } from '../operations.js';
 import { SCALAR, apiModel, emitWithOp, namedSchema, operation, param } from './fixtures.js';
diff --git a/packages/client-generator/src/emitters/__tests__/sample.test.ts b/packages/client-generator/src/emitters/__tests__/sample.test.ts
index 9313a9288f..fcc21b2ad0 100644
--- a/packages/client-generator/src/emitters/__tests__/sample.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/sample.test.ts
@@ -1,4 +1,4 @@
-import type { NamedSchemaModel, SchemaModel } from '../../ir/model.js';
+import type { NamedSchemaModel, SchemaModel } from '../../intermediate-representation/model.js';
 import { sampleValue, SampleExpression } from '../sample.js';
 
 describe('sampleValue', () => {
diff --git a/packages/client-generator/src/emitters/__tests__/sse.deletion.test.ts b/packages/client-generator/src/emitters/__tests__/sse.deletion.test.ts
index 22b914ca4b..aa2c3375ed 100644
--- a/packages/client-generator/src/emitters/__tests__/sse.deletion.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/sse.deletion.test.ts
@@ -2,7 +2,7 @@
 // public `sse` aggregate must appear ONLY when a model declares a
 // `text/event-stream` operation. A non-streaming model must be byte-free of
 // both — this protects the "non-SSE clients are unchanged" invariant.
-import type { ApiModel } from '../../ir/model.js';
+import type { ApiModel } from '../../intermediate-representation/model.js';
 import { emitSingleFile } from '../client.js';
 import { apiModel, namedSchema, operation } from './fixtures.js';
 
diff --git a/packages/client-generator/src/emitters/__tests__/sse.test.ts b/packages/client-generator/src/emitters/__tests__/sse.test.ts
index a3c821833f..21e22ad443 100644
--- a/packages/client-generator/src/emitters/__tests__/sse.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/sse.test.ts
@@ -1,4 +1,4 @@
-import type { ResponseBodyModel, SchemaModel } from '../../ir/model.js';
+import type { ResponseBodyModel, SchemaModel } from '../../intermediate-representation/model.js';
 import { isSseOp, partitionOps, sseDataKind, sseEventType, sseFragmentName } from '../sse.js';
 import { printNodes } from '../ts.js';
 import { operation } from './fixtures.js';
diff --git a/packages/client-generator/src/emitters/__tests__/transformers.test.ts b/packages/client-generator/src/emitters/__tests__/transformers.test.ts
index eee2e6783c..f29b5dc968 100644
--- a/packages/client-generator/src/emitters/__tests__/transformers.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/transformers.test.ts
@@ -1,4 +1,4 @@
-import type { ApiModel, NamedSchemaModel } from '../../ir/model.js';
+import type { ApiModel, NamedSchemaModel } from '../../intermediate-representation/model.js';
 import { renderTransformersModule } from '../transformers.js';
 
 const base: Omit<ApiModel, 'schemas'> = {
diff --git a/packages/client-generator/src/emitters/__tests__/types.test.ts b/packages/client-generator/src/emitters/__tests__/types.test.ts
index 24d08c598f..d3b090bc4f 100644
--- a/packages/client-generator/src/emitters/__tests__/types.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/types.test.ts
@@ -1,4 +1,4 @@
-import type { PropertyModel, SchemaModel } from '../../ir/model.js';
+import type { PropertyModel, SchemaModel } from '../../intermediate-representation/model.js';
 import { emitSingleFile } from '../client.js';
 import { printNodes } from '../ts.js';
 import { renderSchema, schemaToTypeNode, typesStatements } from '../types.js';
diff --git a/packages/client-generator/src/emitters/__tests__/zod.test.ts b/packages/client-generator/src/emitters/__tests__/zod.test.ts
index fac2a290e4..c85341cd95 100644
--- a/packages/client-generator/src/emitters/__tests__/zod.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/zod.test.ts
@@ -1,4 +1,4 @@
-import type { NamedSchemaModel, SchemaModel } from '../../ir/model.js';
+import type { NamedSchemaModel, SchemaModel } from '../../intermediate-representation/model.js';
 import { printStatements } from '../ts.js';
 import { renderZodModule, schemaToZodExpression, zodModuleStatements } from '../zod.js';
 
diff --git a/packages/client-generator/src/emitters/auth.ts b/packages/client-generator/src/emitters/auth.ts
index 687afdbb48..90b41b4051 100644
--- a/packages/client-generator/src/emitters/auth.ts
+++ b/packages/client-generator/src/emitters/auth.ts
@@ -1,4 +1,4 @@
-import type { SecuritySchemeModel } from '../ir/model.js';
+import type { SecuritySchemeModel } from '../intermediate-representation/model.js';
 import { pascalCase } from './support.js';
 import { constStatement, jsdoc, letStatement, printStatements, ts } from './ts.js';
 
diff --git a/packages/client-generator/src/emitters/client.ts b/packages/client-generator/src/emitters/client.ts
index 6c77d14282..3de0824d96 100644
--- a/packages/client-generator/src/emitters/client.ts
+++ b/packages/client-generator/src/emitters/client.ts
@@ -1,5 +1,5 @@
-import type { ApiModel, OperationModel, SecuritySchemeModel } from '../ir/model.js';
-import { collectOperationRefs } from '../ir/refs.js';
+import type { ApiModel, OperationModel, SecuritySchemeModel } from '../intermediate-representation/model.js';
+import { collectOperationRefs } from '../intermediate-representation/refs.js';
 import { authSetterNames, authStatements, authTypeNames } from './auth.js';
 import {
   type ArgsStyle,
diff --git a/packages/client-generator/src/emitters/faker.ts b/packages/client-generator/src/emitters/faker.ts
index a05b0f7731..af8171c324 100644
--- a/packages/client-generator/src/emitters/faker.ts
+++ b/packages/client-generator/src/emitters/faker.ts
@@ -9,7 +9,7 @@
 // consumer can flip `mockData` without touching call sites; `@faker-js/faker`
 // becomes their dev-dep while the real client stays dependency-free.
 
-import type { NamedSchemaModel, ScalarKind, SchemaMetadata, SchemaModel } from '../ir/model.js';
+import type { NamedSchemaModel, ScalarKind, SchemaMetadata, SchemaModel } from '../intermediate-representation/model.js';
 import { safeIdent } from './identifier.js';
 import { constArray, ts } from './ts.js';
 
diff --git a/packages/client-generator/src/emitters/jsdoc.ts b/packages/client-generator/src/emitters/jsdoc.ts
index 0a866f0563..0ee6d2963d 100644
--- a/packages/client-generator/src/emitters/jsdoc.ts
+++ b/packages/client-generator/src/emitters/jsdoc.ts
@@ -1,4 +1,4 @@
-import type { SchemaMetadata } from '../ir/model.js';
+import type { SchemaMetadata } from '../intermediate-representation/model.js';
 import { splitLines } from './support.js';
 
 /**
diff --git a/packages/client-generator/src/emitters/mock.ts b/packages/client-generator/src/emitters/mock.ts
index 3a1409ccc6..791883dcfe 100644
--- a/packages/client-generator/src/emitters/mock.ts
+++ b/packages/client-generator/src/emitters/mock.ts
@@ -11,7 +11,7 @@ import type {
   OperationModel,
   ResponseBodyModel,
   SchemaModel,
-} from '../ir/model.js';
+} from '../intermediate-representation/model.js';
 import { allOperations } from '../writers/util.js';
 import { fakerExpression } from './faker.js';
 import { safeIdent } from './identifier.js';
diff --git a/packages/client-generator/src/emitters/operation-aliases.ts b/packages/client-generator/src/emitters/operation-aliases.ts
index 2f08fce6de..4b6dddb622 100644
--- a/packages/client-generator/src/emitters/operation-aliases.ts
+++ b/packages/client-generator/src/emitters/operation-aliases.ts
@@ -3,7 +3,7 @@
 // intermediate values. Reuses the shared type builders (operation-types.ts) and the block-wide
 // `EmitContext` (a type-only import from operations.ts — erased, so there is no runtime cycle).
 
-import type { OperationModel, ParamModel } from '../ir/model.js';
+import type { OperationModel, ParamModel } from '../intermediate-representation/model.js';
 import { jsdocText } from './jsdoc.js';
 import { operationSignature } from './operation-signature.js';
 import { bodyTypeNode, paramsTypeLiteral } from './operation-types.js';
diff --git a/packages/client-generator/src/emitters/operation-signature.ts b/packages/client-generator/src/emitters/operation-signature.ts
index 3160ef483c..5b3fb3ae43 100644
--- a/packages/client-generator/src/emitters/operation-signature.ts
+++ b/packages/client-generator/src/emitters/operation-signature.ts
@@ -5,7 +5,7 @@
 // so a flat-mode signature and its call site can never drift. Previously each side
 // recomputed this independently, kept in sync only by a "matching exactly" comment.
 
-import type { OperationModel, ParamModel } from '../ir/model.js';
+import type { OperationModel, ParamModel } from '../intermediate-representation/model.js';
 import { uniqueIdent } from './identifier.js';
 import { pascalCase } from './support.js';
 
diff --git a/packages/client-generator/src/emitters/operation-types.ts b/packages/client-generator/src/emitters/operation-types.ts
index 0d43a3bc90..55a1a40624 100644
--- a/packages/client-generator/src/emitters/operation-types.ts
+++ b/packages/client-generator/src/emitters/operation-types.ts
@@ -2,7 +2,7 @@
 // builders: turn an operation's params / body / responses into `ts` type and parameter nodes.
 // Leaf module — depends only on the IR types and the codegen foundation, never back on operations.ts.
 
-import type { ParamModel, RequestBodyModel, ResponseBodyModel } from '../ir/model.js';
+import type { ParamModel, RequestBodyModel, ResponseBodyModel } from '../intermediate-representation/model.js';
 import { safeIdent } from './identifier.js';
 import { jsdocText } from './jsdoc.js';
 import { jsdoc, printNodes, ts } from './ts.js';
diff --git a/packages/client-generator/src/emitters/operations.ts b/packages/client-generator/src/emitters/operations.ts
index 7e9c1afaa3..2ae296f26b 100644
--- a/packages/client-generator/src/emitters/operations.ts
+++ b/packages/client-generator/src/emitters/operations.ts
@@ -1,4 +1,4 @@
-import type { OperationModel, ParamModel } from '../ir/model.js';
+import type { OperationModel, ParamModel } from '../intermediate-representation/model.js';
 import { safeIdent } from './identifier.js';
 import { renderOperationAliases, sseAliases, variablesTypeLiteral } from './operation-aliases.js';
 import { operationSignature } from './operation-signature.js';
diff --git a/packages/client-generator/src/emitters/sample.ts b/packages/client-generator/src/emitters/sample.ts
index caf69a2eea..87646c7eea 100644
--- a/packages/client-generator/src/emitters/sample.ts
+++ b/packages/client-generator/src/emitters/sample.ts
@@ -1,6 +1,6 @@
 import { isPlainObject } from '@redocly/openapi-core';
 
-import type { NamedSchemaModel, ScalarKind, SchemaMetadata, SchemaModel } from '../ir/model.js';
+import type { NamedSchemaModel, ScalarKind, SchemaMetadata, SchemaModel } from '../intermediate-representation/model.js';
 import type { DateType } from './types.js';
 
 /** A sampled value the emitter must print as a raw TS expression rather than a JSON
diff --git a/packages/client-generator/src/emitters/sse.ts b/packages/client-generator/src/emitters/sse.ts
index 6bc2322a1f..d4f8c6d8e6 100644
--- a/packages/client-generator/src/emitters/sse.ts
+++ b/packages/client-generator/src/emitters/sse.ts
@@ -1,4 +1,4 @@
-import type { OperationModel, ResponseBodyModel, SchemaModel } from '../ir/model.js';
+import type { OperationModel, ResponseBodyModel, SchemaModel } from '../intermediate-representation/model.js';
 import { ts } from './ts.js';
 import { type DateType, schemaToTypeNode } from './types.js';
 
diff --git a/packages/client-generator/src/emitters/swr.ts b/packages/client-generator/src/emitters/swr.ts
index 0ff8faee17..e5e8732396 100644
--- a/packages/client-generator/src/emitters/swr.ts
+++ b/packages/client-generator/src/emitters/swr.ts
@@ -8,7 +8,7 @@
 // `swr`/`swr/mutation` are the consumer's peer; the sdk stays dependency-free.
 // AST-native via `ts.factory`.
 
-import type { ApiModel, OperationModel } from '../ir/model.js';
+import type { ApiModel, OperationModel } from '../intermediate-representation/model.js';
 import { operationSignature } from './operation-signature.js';
 import { pascalCase } from './support.js';
 import {
diff --git a/packages/client-generator/src/emitters/tanstack-query.ts b/packages/client-generator/src/emitters/tanstack-query.ts
index 79b54f4279..d65b9af8d9 100644
--- a/packages/client-generator/src/emitters/tanstack-query.ts
+++ b/packages/client-generator/src/emitters/tanstack-query.ts
@@ -7,7 +7,7 @@
 // matching `operations.ts` positional order so the call type-checks against the
 // generated sdk. AST-native via `ts.factory`.
 
-import type { ApiModel, OperationModel } from '../ir/model.js';
+import type { ApiModel, OperationModel } from '../intermediate-representation/model.js';
 import { operationSignature } from './operation-signature.js';
 import {
   arrow,
diff --git a/packages/client-generator/src/emitters/transformers.ts b/packages/client-generator/src/emitters/transformers.ts
index 63d1d9df99..f3512c3151 100644
--- a/packages/client-generator/src/emitters/transformers.ts
+++ b/packages/client-generator/src/emitters/transformers.ts
@@ -9,7 +9,7 @@
 // `transformPet` calls `transformPerson(data["owner"])` when `Pet.owner` is a
 // `Person` that has dates.
 
-import type { ApiModel, NamedSchemaModel, SchemaModel } from '../ir/model.js';
+import type { ApiModel, NamedSchemaModel, SchemaModel } from '../intermediate-representation/model.js';
 import { safeIdent } from './identifier.js';
 import { pascalCase } from './support.js';
 import { arrow, exportConstStatement, printStatements, ts } from './ts.js';
diff --git a/packages/client-generator/src/emitters/type-guards.ts b/packages/client-generator/src/emitters/type-guards.ts
index af04b3c402..c0111ad291 100644
--- a/packages/client-generator/src/emitters/type-guards.ts
+++ b/packages/client-generator/src/emitters/type-guards.ts
@@ -1,4 +1,4 @@
-import type { DiscriminatorModel, NamedSchemaModel, SchemaModel } from '../ir/model.js';
+import type { DiscriminatorModel, NamedSchemaModel, SchemaModel } from '../intermediate-representation/model.js';
 import { jsdoc, ts } from './ts.js';
 
 /**
diff --git a/packages/client-generator/src/emitters/types.ts b/packages/client-generator/src/emitters/types.ts
index 486716c3be..62dfe9d3c6 100644
--- a/packages/client-generator/src/emitters/types.ts
+++ b/packages/client-generator/src/emitters/types.ts
@@ -4,7 +4,7 @@ import type {
   ScalarKind,
   SchemaMetadata,
   SchemaModel,
-} from '../ir/model.js';
+} from '../intermediate-representation/model.js';
 import { isIdentifier, safeIdent } from './identifier.js';
 import { jsdocText } from './jsdoc.js';
 import { jsdoc, printNodes, ts } from './ts.js';
diff --git a/packages/client-generator/src/emitters/wrapper-support.ts b/packages/client-generator/src/emitters/wrapper-support.ts
index d29108eaac..644aef336c 100644
--- a/packages/client-generator/src/emitters/wrapper-support.ts
+++ b/packages/client-generator/src/emitters/wrapper-support.ts
@@ -7,7 +7,7 @@
 
 import { logger } from '@redocly/openapi-core';
 
-import type { ApiModel, OperationModel } from '../ir/model.js';
+import type { ApiModel, OperationModel } from '../intermediate-representation/model.js';
 import { operationSignature } from './operation-signature.js';
 import { isSseOp } from './sse.js';
 import { ts } from './ts.js';
diff --git a/packages/client-generator/src/emitters/zod.ts b/packages/client-generator/src/emitters/zod.ts
index dcd2a710a1..616fc8a806 100644
--- a/packages/client-generator/src/emitters/zod.ts
+++ b/packages/client-generator/src/emitters/zod.ts
@@ -13,7 +13,7 @@ import type {
   ScalarKind,
   SchemaMetadata,
   SchemaModel,
-} from '../ir/model.js';
+} from '../intermediate-representation/model.js';
 import { safeIdent } from './identifier.js';
 import { pascalCase } from './support.js';
 import { printStatements, ts } from './ts.js';
diff --git a/packages/client-generator/src/generators/__tests__/sdk.test.ts b/packages/client-generator/src/generators/__tests__/sdk.test.ts
index d22d8c76bf..cafe53fba9 100644
--- a/packages/client-generator/src/generators/__tests__/sdk.test.ts
+++ b/packages/client-generator/src/generators/__tests__/sdk.test.ts
@@ -1,4 +1,4 @@
-import type { ApiModel } from '../../ir/model.js';
+import type { ApiModel } from '../../intermediate-representation/model.js';
 import { getWriter } from '../../writers/index.js';
 import { sdkGenerator } from '../sdk.js';
 
diff --git a/packages/client-generator/src/generators/types.ts b/packages/client-generator/src/generators/types.ts
index cc51e6face..75a24dc51c 100644
--- a/packages/client-generator/src/generators/types.ts
+++ b/packages/client-generator/src/generators/types.ts
@@ -2,7 +2,7 @@
 import type { EmitOptions } from '../emitters/client.js';
 import type { ErrorMode, Facade } from '../emitters/operations.js';
 import type { DateType } from '../emitters/types.js';
-import type { ApiModel } from '../ir/model.js';
+import type { ApiModel } from '../intermediate-representation/model.js';
 import type { GeneratedFile, OutputMode } from '../writers/types.js';
 
 /** The first-party generators the registry knows. Extends as P5 lands (react-query, …). */
diff --git a/packages/client-generator/src/index.ts b/packages/client-generator/src/index.ts
index 983e804425..4890f810ca 100644
--- a/packages/client-generator/src/index.ts
+++ b/packages/client-generator/src/index.ts
@@ -6,9 +6,9 @@ import { bakeSetup } from './emitters/setup-bake.js';
 import { builtinGenerators, validateGenerators } from './generators/index.js';
 import { resolveGenerators } from './generators/resolve.js';
 import type { GeneratorDescriptor } from './generators/types.js';
-import { buildApiModel } from './ir/build.js';
-import type { ApiModel } from './ir/model.js';
-import { normalizeSwagger2 } from './ir/normalize-swagger2.js';
+import { buildApiModel } from './intermediate-representation/build.js';
+import type { ApiModel } from './intermediate-representation/model.js';
+import { normalizeSwagger2 } from './intermediate-representation/normalize-swagger2.js';
 import { loadSpec } from './loader.js';
 import type { GenerateClientOptions, GenerateClientResult } from './types.js';
 import type { GeneratedFile, OutputMode } from './writers/types.js';
@@ -38,7 +38,7 @@ export type {
   ScalarKind,
   SchemaModel,
   ServiceModel,
-} from './ir/model.js';
+} from './intermediate-representation/model.js';
 export type { GenerateClientOptions, GenerateClientResult, LoadResult } from './types.js';
 export type { GeneratedFile, OutputMode } from './writers/index.js';
 export type { ArgsStyle, Facade } from './emitters/client.js';
diff --git a/packages/client-generator/src/ir/__tests__/build.test.ts b/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
similarity index 100%
rename from packages/client-generator/src/ir/__tests__/build.test.ts
rename to packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
diff --git a/packages/client-generator/src/ir/__tests__/normalize-swagger2.test.ts b/packages/client-generator/src/intermediate-representation/__tests__/normalize-swagger2.test.ts
similarity index 100%
rename from packages/client-generator/src/ir/__tests__/normalize-swagger2.test.ts
rename to packages/client-generator/src/intermediate-representation/__tests__/normalize-swagger2.test.ts
diff --git a/packages/client-generator/src/ir/__tests__/refs.test.ts b/packages/client-generator/src/intermediate-representation/__tests__/refs.test.ts
similarity index 100%
rename from packages/client-generator/src/ir/__tests__/refs.test.ts
rename to packages/client-generator/src/intermediate-representation/__tests__/refs.test.ts
diff --git a/packages/client-generator/src/ir/__tests__/sanitize-identifiers.test.ts b/packages/client-generator/src/intermediate-representation/__tests__/sanitize-identifiers.test.ts
similarity index 100%
rename from packages/client-generator/src/ir/__tests__/sanitize-identifiers.test.ts
rename to packages/client-generator/src/intermediate-representation/__tests__/sanitize-identifiers.test.ts
diff --git a/packages/client-generator/src/ir/build.ts b/packages/client-generator/src/intermediate-representation/build.ts
similarity index 100%
rename from packages/client-generator/src/ir/build.ts
rename to packages/client-generator/src/intermediate-representation/build.ts
diff --git a/packages/client-generator/src/ir/model.ts b/packages/client-generator/src/intermediate-representation/model.ts
similarity index 100%
rename from packages/client-generator/src/ir/model.ts
rename to packages/client-generator/src/intermediate-representation/model.ts
diff --git a/packages/client-generator/src/ir/normalize-swagger2.ts b/packages/client-generator/src/intermediate-representation/normalize-swagger2.ts
similarity index 100%
rename from packages/client-generator/src/ir/normalize-swagger2.ts
rename to packages/client-generator/src/intermediate-representation/normalize-swagger2.ts
diff --git a/packages/client-generator/src/ir/refs.ts b/packages/client-generator/src/intermediate-representation/refs.ts
similarity index 100%
rename from packages/client-generator/src/ir/refs.ts
rename to packages/client-generator/src/intermediate-representation/refs.ts
diff --git a/packages/client-generator/src/ir/sanitize-identifiers.ts b/packages/client-generator/src/intermediate-representation/sanitize-identifiers.ts
similarity index 100%
rename from packages/client-generator/src/ir/sanitize-identifiers.ts
rename to packages/client-generator/src/intermediate-representation/sanitize-identifiers.ts
diff --git a/packages/client-generator/src/plugin.ts b/packages/client-generator/src/plugin.ts
index 344d1fd7c5..d207ef261a 100644
--- a/packages/client-generator/src/plugin.ts
+++ b/packages/client-generator/src/plugin.ts
@@ -59,7 +59,7 @@ export type {
   SchemaMetadata,
   SchemaModel,
   ServiceModel,
-} from './ir/model.js';
+} from './intermediate-representation/model.js';
 
 // --- Codegen toolkit: build TypeScript the same way the built-in generators do -----------------
 export {
diff --git a/packages/client-generator/src/writers/__tests__/group-by-tag.test.ts b/packages/client-generator/src/writers/__tests__/group-by-tag.test.ts
index 6ec32e6061..1a7b6cbf36 100644
--- a/packages/client-generator/src/writers/__tests__/group-by-tag.test.ts
+++ b/packages/client-generator/src/writers/__tests__/group-by-tag.test.ts
@@ -1,4 +1,4 @@
-import type { ApiModel, OperationModel } from '../../ir/model.js';
+import type { ApiModel, OperationModel } from '../../intermediate-representation/model.js';
 import { groupByTag, sanitizeTagStem } from '../group-by-tag.js';
 
 function op(name: string, tags: string[] = []): OperationModel {
diff --git a/packages/client-generator/src/writers/__tests__/index.test.ts b/packages/client-generator/src/writers/__tests__/index.test.ts
index 6314c22de0..083b3731bd 100644
--- a/packages/client-generator/src/writers/__tests__/index.test.ts
+++ b/packages/client-generator/src/writers/__tests__/index.test.ts
@@ -1,4 +1,4 @@
-import type { ApiModel } from '../../ir/model.js';
+import type { ApiModel } from '../../intermediate-representation/model.js';
 import { getWriter } from '../index.js';
 import { singleFileWriter } from '../single-file-writer.js';
 import { splitWriter } from '../split-writer.js';
diff --git a/packages/client-generator/src/writers/__tests__/split-writer.test.ts b/packages/client-generator/src/writers/__tests__/split-writer.test.ts
index 58800f7862..ab7575db51 100644
--- a/packages/client-generator/src/writers/__tests__/split-writer.test.ts
+++ b/packages/client-generator/src/writers/__tests__/split-writer.test.ts
@@ -1,4 +1,4 @@
-import type { ApiModel, OperationModel } from '../../ir/model.js';
+import type { ApiModel, OperationModel } from '../../intermediate-representation/model.js';
 import { splitWriter } from '../split-writer.js';
 
 function operation(overrides: Partial<OperationModel> = {}): OperationModel {
diff --git a/packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts b/packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts
index 43f8432fe7..6f44c37b81 100644
--- a/packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts
+++ b/packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts
@@ -1,4 +1,4 @@
-import type { ApiModel, OperationModel } from '../../ir/model.js';
+import type { ApiModel, OperationModel } from '../../intermediate-representation/model.js';
 import { tagsSplitWriter } from '../tags-split-writer.js';
 
 function operation(overrides: Partial<OperationModel> = {}): OperationModel {
diff --git a/packages/client-generator/src/writers/__tests__/tags-writer.test.ts b/packages/client-generator/src/writers/__tests__/tags-writer.test.ts
index 4dbe780a98..15aebbf7dd 100644
--- a/packages/client-generator/src/writers/__tests__/tags-writer.test.ts
+++ b/packages/client-generator/src/writers/__tests__/tags-writer.test.ts
@@ -1,4 +1,4 @@
-import type { ApiModel, OperationModel } from '../../ir/model.js';
+import type { ApiModel, OperationModel } from '../../intermediate-representation/model.js';
 import { tagsWriter } from '../tags-writer.js';
 
 function operation(overrides: Partial<OperationModel> = {}): OperationModel {
diff --git a/packages/client-generator/src/writers/group-by-tag.ts b/packages/client-generator/src/writers/group-by-tag.ts
index e59d120e85..f49eb5f3cf 100644
--- a/packages/client-generator/src/writers/group-by-tag.ts
+++ b/packages/client-generator/src/writers/group-by-tag.ts
@@ -1,4 +1,4 @@
-import type { ApiModel, OperationModel } from '../ir/model.js';
+import type { ApiModel, OperationModel } from '../intermediate-representation/model.js';
 
 export type TagGroup = {
   /** The safe file stem for this group (without extension). */
diff --git a/packages/client-generator/src/writers/types.ts b/packages/client-generator/src/writers/types.ts
index 56206195f1..b32170721e 100644
--- a/packages/client-generator/src/writers/types.ts
+++ b/packages/client-generator/src/writers/types.ts
@@ -1,5 +1,5 @@
 import type { EmitOptions } from '../emitters/client.js';
-import type { ApiModel } from '../ir/model.js';
+import type { ApiModel } from '../intermediate-representation/model.js';
 
 /**
  * How the generated client is partitioned across files.
diff --git a/packages/client-generator/src/writers/util.ts b/packages/client-generator/src/writers/util.ts
index 0afd0d9f0f..95549811ca 100644
--- a/packages/client-generator/src/writers/util.ts
+++ b/packages/client-generator/src/writers/util.ts
@@ -1,6 +1,6 @@
 import { parse } from 'node:path';
 
-import type { OperationModel } from '../ir/model.js';
+import type { OperationModel } from '../intermediate-representation/model.js';
 
 /**
  * Derive the directory and base name (stem, without `.ts`) from the `--output`

From 5728f002c418ab2756ed563ba7a64d5c0355f47a Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 14:07:40 +0300
Subject: [PATCH 053/134] fix(client-generator): correct stale/misplaced
 comments and a dead __toFormData import

Comment review across the branch after the renames/refactors:
- fix stale references: ir/ path in support.ts, ADR-0007 -> ADR-0009 for per-instance
  auth, drop the internal '(Task 6)' note, drop 'in PoC' from the $ref error, and the
  'mirroring how config files load' analogy (that mechanism was removed)
- move two JSDoc blocks that had drifted onto the wrong function (the __request-args
  doc onto renderRequestArgs; the body-type one-liner onto bodyTypeNode), and correct
  the __request-args doc (it omitted the op-identity arg and the multipart flag)
- reword the 'three things vary' runtime header (now several gated blocks) and the
  EmitOptions parenthetical (it omitted knobs generators actually read), and clarify
  the client-block schema comment

The review surfaced a real bug: since multipart bodies now serialize in __send (after
onRequest), the endpoints module no longer references __toFormData, yet still imported
it (an unused import, invisible to tsc --strict). Make __toFormData module-private in
the runtime and stop the endpoints module importing it; update the unit test.
---
 .../src/emitters/__tests__/client.test.ts      | 17 ++++++-----------
 .../client-generator/src/emitters/client.ts    |  8 +++-----
 .../src/emitters/operation-types.ts            |  8 ++++----
 .../src/emitters/operations.ts                 | 12 ++++++------
 .../client-generator/src/emitters/runtime.ts   | 18 ++++++++++--------
 .../client-generator/src/emitters/support.ts   |  2 +-
 .../client-generator/src/generators/resolve.ts |  2 +-
 .../client-generator/src/generators/types.ts   |  2 +-
 .../src/intermediate-representation/build.ts   |  2 +-
 packages/core/src/types/redocly-yaml.ts        |  8 ++++----
 10 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/packages/client-generator/src/emitters/__tests__/client.test.ts b/packages/client-generator/src/emitters/__tests__/client.test.ts
index 7f63dd0375..0dcd1a0216 100644
--- a/packages/client-generator/src/emitters/__tests__/client.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/client.test.ts
@@ -579,17 +579,12 @@ describe('multipart serialization helper (#5)', () => {
     expect(emitSingleFile(apiModel())).not.toContain('__toFormData');
   });
 
-  it('imports __toFormData into the endpoints module in multi-file output', () => {
+  it('does not import __toFormData into the endpoints module (the runtime serializes)', () => {
     const ops = uploadModel.services[0].operations;
-    // The call site lives in the endpoints module; the helper in the http module — so a
-    // multipart op must pull `__toFormData` across the module boundary (else TS2552).
-    expect(emitModules(uploadModel, {}).endpointImports(ops, 'client')).toContain('__toFormData');
-    // A non-multipart op must NOT import it (noUnusedLocals).
-    const plain = apiModel({
-      services: [{ name: 'Default', operations: [operation({ name: 'ping' })] }],
-    });
-    expect(
-      emitModules(plain, {}).endpointImports(plain.services[0].operations, 'client')
-    ).not.toContain('__toFormData');
+    // `__send` (http module) serializes a multipart body after the onRequest chain, so
+    // `__toFormData` stays module-private there and the endpoints module never imports it.
+    expect(emitModules(uploadModel, {}).endpointImports(ops, 'client')).not.toContain(
+      '__toFormData'
+    );
   });
 });
diff --git a/packages/client-generator/src/emitters/client.ts b/packages/client-generator/src/emitters/client.ts
index 3de0824d96..7cc20ea21e 100644
--- a/packages/client-generator/src/emitters/client.ts
+++ b/packages/client-generator/src/emitters/client.ts
@@ -155,7 +155,7 @@ function renderFragments(
   const allOps = model.services.flatMap((s) => s.operations);
   const needsSse = allOps.some(isSseOp);
   // The `__toFormData` runtime helper is emitted only when some operation has a typed
-  // multipart body (object schema) that the call site serializes.
+  // multipart body (object schema); `__send` serializes it after the onRequest chain.
   const needsMultipart = allOps.some((op) => op.requestBody && isTypedMultipart(op.requestBody));
   // ClientConfig gains an `auth?: AuthCredentials` field (per-instance credentials)
   // whenever the client has injectable security schemes — the type the auth emitter
@@ -399,10 +399,8 @@ function helperNamesFor(ops: OperationModel[], errorMode: 'throw' | 'result'): s
   if (ops.some(isSseOp)) helpers.push('__sse');
   if (ops.some((op) => op.security.length > 0)) helpers.push('__auth');
   if (ops.some((op) => op.headerParams.length > 0)) helpers.push('__headers');
-  // A typed multipart body's call site serializes it via `__toFormData` (see operations.ts).
-  if (ops.some((op) => op.requestBody && isTypedMultipart(op.requestBody))) {
-    helpers.push('__toFormData');
-  }
+  // `__toFormData` is not imported here: `__send` (in the runtime module) serializes a
+  // multipart body itself, so the endpoints module never references the helper.
   return helpers.sort();
 }
 
diff --git a/packages/client-generator/src/emitters/operation-types.ts b/packages/client-generator/src/emitters/operation-types.ts
index 55a1a40624..352212d999 100644
--- a/packages/client-generator/src/emitters/operation-types.ts
+++ b/packages/client-generator/src/emitters/operation-types.ts
@@ -63,17 +63,17 @@ export function propertyKey(safe: string): ts.PropertyName {
     : factory.createIdentifier(safe);
 }
 
-/** The request-body TS type: special wrapper types per content-type, else the schema. */
 /**
  * A multipart body whose schema is a concrete object — the case worth typing. Such a body
- * is emitted as its object shape (binary fields → `Blob`) and serialized to `FormData` at
- * the call site (`__toFormData`). Multipart bodies with a non-object schema can't be typed
- * field-by-field, so they keep the raw `FormData` escape hatch.
+ * is emitted as its object shape (binary fields → `Blob`); the runtime's `__send` serializes
+ * it to `FormData` (via `__toFormData`) after the onRequest chain. Multipart bodies with a
+ * non-object schema can't be typed field-by-field, so they keep the raw `FormData` escape hatch.
  */
 export function isTypedMultipart(rb: RequestBodyModel): boolean {
   return rb.contentType === 'multipart/form-data' && rb.schema.kind === 'object';
 }
 
+/** The request-body TS type: special wrapper types per content-type, else the schema. */
 export function bodyTypeNode(rb: RequestBodyModel, dateType: DateType): ts.TypeNode {
   if (isTypedMultipart(rb)) return schemaToTypeNode(rb.schema, dateType);
   switch (rb.contentType) {
diff --git a/packages/client-generator/src/emitters/operations.ts b/packages/client-generator/src/emitters/operations.ts
index 2ae296f26b..6576607219 100644
--- a/packages/client-generator/src/emitters/operations.ts
+++ b/packages/client-generator/src/emitters/operations.ts
@@ -1065,12 +1065,6 @@ function headersHelperCall(op: OperationModel, groupedMode: boolean): ts.Express
   ]);
 }
 
-/**
- * The positional arguments to `__request<T>(…)`: config, url, init, then an
- * optional body and an explicit response-kind. A non-json response with no body
- * still passes `undefined` as the body placeholder so the kind lands in the right
- * position.
- */
 /** The `{ id, path, tags }` literal passed to the runtime as the operation's identity. */
 function operationMetaExpr(op: OperationModel): ts.Expression {
   return factory.createObjectLiteralExpression(
@@ -1089,6 +1083,12 @@ function operationMetaExpr(op: OperationModel): ts.Expression {
   );
 }
 
+/**
+ * The positional arguments to `__request<T>` / `__requestResult`: config, the operation
+ * identity (`operationMetaExpr`), url, init, then an optional body, an explicit response-kind,
+ * and a trailing `true` for a typed-multipart body. A non-json response with no body still
+ * passes `undefined` as the body placeholder so the later args land in the right positions.
+ */
 function renderRequestArgs(
   op: OperationModel,
   configRef: string,
diff --git a/packages/client-generator/src/emitters/runtime.ts b/packages/client-generator/src/emitters/runtime.ts
index e42c621f37..44c43fa5a5 100644
--- a/packages/client-generator/src/emitters/runtime.ts
+++ b/packages/client-generator/src/emitters/runtime.ts
@@ -3,11 +3,12 @@
  * extension contract, the error type, the URL/query builder, the fetch wrapper,
  * and the optional header normalizer.
  *
- * Three things vary by call: the inlined `BASE` value; whether `__headers` is
+ * Several parts are gated by call: the inlined `BASE` value; whether `__headers` is
  * emitted (only when some operation declares header params, so `noUnusedLocals`
- * consumers don't trip over dead code); and whether the operation-facing helpers
- * (`__buildUrl` / `__request` / `__headers` / `__config`) are `export`ed — they
- * are in multi-file modes, module-private in single-file.
+ * consumers don't trip over dead code); whether the operation-facing helpers
+ * (`__buildUrl` / `__request` / `__headers` / `__config`) are `export`ed (multi-file
+ * modes) or module-private (single-file); and the optional SSE, per-instance-auth,
+ * multipart, and result-mode blocks.
  */
 /**
  * The public `export type`s the runtime/http module exposes. Multi-file writers
@@ -69,7 +70,7 @@ export function renderRuntime(
 
 /**
  * The runtime as parsed `ts.Statement[]` — the same hand-authored reference
- * source, embedded via `parseStatements` so the composition (Task 6) can fold it
+ * source, embedded via `parseStatements` so the composition can fold it
  * into the single-file / module statement lists. `renderRuntime` prints these.
  */
 export function runtimeStatements(
@@ -112,11 +113,12 @@ function runtimeSource(
     ? `
 
 /**
- * Serialize a plain object into \`FormData\` for a \`multipart/form-data\` body. \`Blob\`/\`File\`
+ * Serialize a plain object into \`FormData\` for a \`multipart/form-data\` body. Called by
+ * \`__send\` after the onRequest chain — module-private, never imported across files. \`Blob\`/\`File\`
  * and strings pass through; arrays append one field per item; other objects are JSON-encoded;
  * everything else is stringified. \`undefined\` / \`null\` entries are skipped.
  */
-${ex}function __toFormData(body: Record<string, unknown>): FormData {
+function __toFormData(body: Record<string, unknown>): FormData {
   const fd = new FormData();
   const append = (key: string, value: unknown): void => {
     if (value === undefined || value === null) return;
@@ -330,7 +332,7 @@ ${ex}async function __requestResult<TData, TError>(
   // Per-instance credentials field on ClientConfig, emitted only when the client has
   // injectable security schemes (so the `AuthCredentials` type exists). Lets each
   // service-class instance carry its own credentials instead of sharing the module
-  // globals — see ADR-0007.
+  // globals — see ADR-0009.
   const authField = authConfig
     ? `
   /**
diff --git a/packages/client-generator/src/emitters/support.ts b/packages/client-generator/src/emitters/support.ts
index 95df1a1d44..bf4f0022bc 100644
--- a/packages/client-generator/src/emitters/support.ts
+++ b/packages/client-generator/src/emitters/support.ts
@@ -14,7 +14,7 @@ export function joinSections(sections: string[]): string {
  * way for a reason.
  *
  * `op.name` reaches here already sanitized into a non-empty, valid TS identifier
- * by the IR builder (see `ir/sanitize-identifiers.ts`), so no empty-string or
+ * by the IR builder (see `intermediate-representation/sanitize-identifiers.ts`), so no empty-string or
  * unsafe-character guard is needed.
  */
 export function pascalCase(name: string): string {
diff --git a/packages/client-generator/src/generators/resolve.ts b/packages/client-generator/src/generators/resolve.ts
index 93f3b9d160..5d8c138934 100644
--- a/packages/client-generator/src/generators/resolve.ts
+++ b/packages/client-generator/src/generators/resolve.ts
@@ -1,7 +1,7 @@
 // Resolves a `generators` selection (a mix of built-in names, inline custom generators, and import
 // specifiers) into a registry keyed by name plus the ordered list of names to run. This is the only
 // async, side-effecting step in the generator pipeline: a specifier that is neither a built-in nor an
-// already-registered custom name is dynamically `import()`ed (mirroring how config files load), its
+// already-registered custom name is dynamically `import()`ed (a standard Node ESM dynamic import), its
 // default (or `generator`) export validated, and registered under its declared name. Built-ins are
 // seeded fresh per call (see `builtinGenerators`), so registration never mutates the built-in table.
 
diff --git a/packages/client-generator/src/generators/types.ts b/packages/client-generator/src/generators/types.ts
index 75a24dc51c..27c58e9ee3 100644
--- a/packages/client-generator/src/generators/types.ts
+++ b/packages/client-generator/src/generators/types.ts
@@ -15,7 +15,7 @@ export type GeneratorInput = {
   outputPath: string;
   /** File partitioning the generator should honor. */
   outputMode: OutputMode;
-  /** Emit options (serverUrl/enumStyle/facade/argsStyle/name). */
+  /** Emit options — serverUrl, facade, and the generator knobs (dateType, mockData, queryFramework, …); see `EmitOptions`. */
   emit: EmitOptions;
 };
 
diff --git a/packages/client-generator/src/intermediate-representation/build.ts b/packages/client-generator/src/intermediate-representation/build.ts
index f4753a2da4..e40f7fe4e9 100644
--- a/packages/client-generator/src/intermediate-representation/build.ts
+++ b/packages/client-generator/src/intermediate-representation/build.ts
@@ -52,7 +52,7 @@ function isRef<T>(value: Referenced<T> | undefined | null): value is { $ref: str
 
 function resolveRef<T>(doc: Oas3Definition, ref: string): T {
   if (!ref.startsWith('#/')) {
-    throw new NotSupportedError(`External $ref not supported in PoC: ${ref}`);
+    throw new NotSupportedError(`External $ref not supported: ${ref}`);
   }
   const segments = ref
     .slice(2)
diff --git a/packages/core/src/types/redocly-yaml.ts b/packages/core/src/types/redocly-yaml.ts
index 0e79e25f07..b8784ca540 100644
--- a/packages/core/src/types/redocly-yaml.ts
+++ b/packages/core/src/types/redocly-yaml.ts
@@ -343,10 +343,10 @@ const ConfigHTTP: NodeType = {
 };
 
 // `generate-client` settings. Shared defaults live under the top-level `client` key;
-// per-API overrides live under `apis.<name>.client`. The input (`apis.<name>.root` or a
-// CLI path) and output (`apis.<name>.clientOutput` or `--output`) are intentionally NOT
-// part of this block — listing only these properties makes `api`/`output`/`clientOutput`
-// here report as unexpected.
+// per-API overrides live under `apis.<name>.client`. The input and output are NOT part of
+// this block — they live on the `apis` entry (`root` / `clientOutput`) or on the CLI — so a
+// `client` block accepts only the settings below, and any stray input/output key inside it
+// reports as unexpected.
 const Client: NodeType = {
   properties: {
     generators: { type: 'array', items: { type: 'string' } },

From f8faebf559229c366e35d9c87b66eeb95d57408e Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 15:22:19 +0300
Subject: [PATCH 054/134] chore: stop blanket-ignoring e2e yaml in oxfmt
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remove the `tests/e2e/**/*.yaml` ignore added on this branch — it suppressed
formatting for every e2e spec fixture. The only file it was shielding is
fixtures/cafe.yaml, which is a normal spec with no reason to skip formatting, so
format it rather than ignore the whole tree. Also normalizes the oxlint ignore
ordering.
---
 .oxfmtrc.json                                | 1 -
 .oxlintrc.json                               | 4 ++--
 tests/e2e/generate-client/fixtures/cafe.yaml | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.oxfmtrc.json b/.oxfmtrc.json
index 125a6bafa8..269466ad4e 100644
--- a/.oxfmtrc.json
+++ b/.oxfmtrc.json
@@ -11,7 +11,6 @@
     "packages/respect-core/src/modules/runtime-expressions/abnf-parser.js",
     "packages/core/src/rules/common/__tests__/fixtures/invalid-yaml.yaml",
     "tests/performance/api-definitions/",
-    "tests/e2e/**/*.yaml",
     "tests/e2e/generate-client/*-consumer/api.ts",
     "tests/smoke/**/*.yaml",
     "snapshot*.txt",
diff --git a/.oxlintrc.json b/.oxlintrc.json
index e9c734a6c8..9fe6e9bb09 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -11,10 +11,10 @@
   },
   "ignorePatterns": [
     "packages/*/lib/**",
-    "tests/e2e/generate-client/examples/*/src/api/**",
-    "tests/e2e/generate-client/examples/*/generate.ts",
     "*.js",
     "*.cjs",
+    "tests/e2e/generate-client/examples/*/src/api/**",
+    "tests/e2e/generate-client/examples/*/generate.ts",
     "tests/e2e/generate-client/*.snapshot.ts",
     "tests/e2e/generate-client/*-consumer/api.ts"
   ],
diff --git a/tests/e2e/generate-client/fixtures/cafe.yaml b/tests/e2e/generate-client/fixtures/cafe.yaml
index d39d250242..a255b72a20 100644
--- a/tests/e2e/generate-client/fixtures/cafe.yaml
+++ b/tests/e2e/generate-client/fixtures/cafe.yaml
@@ -1160,4 +1160,4 @@ components:
       content:
         application/problem+json:
           schema:
-            $ref: '#/components/schemas/Error'
\ No newline at end of file
+            $ref: '#/components/schemas/Error'

From 7197b024dc4d7dd25ffb9c4ef47e92dea33206be Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 15:22:20 +0300
Subject: [PATCH 055/134] style: run oxfmt across the client-generator branch

Apply oxfmt to files committed with --no-verify earlier on the branch (emitters,
CLI command, docs, e2e tests) so the tree is clean under `npm run format`. Also
drops a redundant coverage sentence in CONTRIBUTING.md. No behavior change.
---
 CONTRIBUTING.md                               |   2 -
 docs/@v2/commands/generate-client.md          | 111 ++++++++++--------
 packages/cli/src/commands/generate-client.ts  |   4 +-
 packages/client-generator/ARCHITECTURE.md     |   2 +-
 .../client-generator/src/emitters/client.ts   |  14 ++-
 .../client-generator/src/emitters/faker.ts    |   7 +-
 .../src/emitters/operation-types.ts           |   6 +-
 .../client-generator/src/emitters/sample.ts   |   7 +-
 packages/client-generator/src/emitters/sse.ts |   6 +-
 .../src/emitters/transformers.ts              |   6 +-
 .../src/emitters/type-guards.ts               |   6 +-
 tests/e2e/generate-client/cafe.test.ts        |  10 +-
 tests/e2e/generate-client/examples/README.md  |   2 +-
 .../generate-client/redocly-config.test.ts    |  29 +++--
 14 files changed, 141 insertions(+), 71 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bc0b40f971..c1e7cf5665 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -261,8 +261,6 @@ To run a specific test, use this command: `npm run unit -- -t 'Test name'`.
 To update snapshots, run `npm run unit -- -u`.
 To skip coverage, run it with `--coverage=false`.
 
-Run `npm run unit` with coverage reporting always enabled (the `coverage` block in the root config sets `enabled: true`); the HTML report is written to `coverage/`.
-
 ### E2E tests
 
 Run e2e tests with this command: `npm run e2e`.
diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index e827ea1565..d774199a73 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -28,24 +28,24 @@ With **no argument**, a client is generated for every api that declares a `clien
 
 ## Options
 
-| Option | Type | Description |
-| --- | --- | --- |
-| `api` | `string` | OpenAPI description file path, URL, or an `apis:` alias. Omit it to generate for every api that has a `client` block. |
-| `--output`, `-o` | `string` | Output path (must end in `.ts`); the entry file in multi-file modes. Defaults to the api's `clientOutput`, else `<name>.client.ts` in the config dir. Not allowed when generating for multiple apis. |
-| `--output-mode` | `string` | File layout: `single` (default), `split` (endpoints/schemas/runtime in sibling files), `tags` (one endpoints file per tag), or `tags-split` (a folder per tag). |
-| `--generators` | `string` | Comma-separated generators to run (default `sdk`). See [Generators](#generators). |
-| `--facade` | `string` | Operation shape: `functions` (default, standalone functions) or `service-class` (methods on a `Client` class). |
-| `--name` | `string` | Class name for the `service-class` facade in `single`/`split` layouts. Default `Client`. |
-| `--args-style` | `string` | Operation inputs: `flat` (default, positional) or `grouped` (a single `vars` object). See [Argument style](#argument-style). |
-| `--enum-style` | `string` | Named string enums: `const-object` (default, `as const` object + union) or `union` (union only). |
-| `--error-mode` | `string` | `throw` (default, throws `ApiError`) or `result` (returns `{ data, error, response }`). See [Error handling](#error-handling). |
-| `--date-type` | `string` | `date`/`date-time` fields as `string` (default) or `Date` (pair with the `transformers` generator). |
-| `--query-framework` | `string` | TanStack Query adapter: `react` (default), `vue`, `svelte`, or `solid`. |
-| `--mock-data` | `string` | `mock` generator data: `baked` (default, deterministic literals) or `faker` (`@faker-js/faker` calls). |
-| `--mock-seed` | `number` | Seed for `faker`-mode mocks, for reproducible data. Ignored in `baked` mode. |
-| `--server-url` | `string` | Override the server URL inlined into the runtime. Defaults to `servers[0].url`. Accepts absolute (`https://api.example.com`) or relative (`/v1`). |
-| `--setup` | `string` | Path to a publisher setup module baked into the client. See [Publisher defaults](#publisher-defaults). |
-| `--config` | `string` | Path to the `redocly.yaml` (the `client` config and `apis:` live there). Defaults to the one in the working directory. |
+| Option              | Type     | Description                                                                                                                                                                                          |
+| ------------------- | -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `api`               | `string` | OpenAPI description file path, URL, or an `apis:` alias. Omit it to generate for every api that has a `client` block.                                                                                |
+| `--output`, `-o`    | `string` | Output path (must end in `.ts`); the entry file in multi-file modes. Defaults to the api's `clientOutput`, else `<name>.client.ts` in the config dir. Not allowed when generating for multiple apis. |
+| `--output-mode`     | `string` | File layout: `single` (default), `split` (endpoints/schemas/runtime in sibling files), `tags` (one endpoints file per tag), or `tags-split` (a folder per tag).                                      |
+| `--generators`      | `string` | Comma-separated generators to run (default `sdk`). See [Generators](#generators).                                                                                                                    |
+| `--facade`          | `string` | Operation shape: `functions` (default, standalone functions) or `service-class` (methods on a `Client` class).                                                                                       |
+| `--name`            | `string` | Class name for the `service-class` facade in `single`/`split` layouts. Default `Client`.                                                                                                             |
+| `--args-style`      | `string` | Operation inputs: `flat` (default, positional) or `grouped` (a single `vars` object). See [Argument style](#argument-style).                                                                         |
+| `--enum-style`      | `string` | Named string enums: `const-object` (default, `as const` object + union) or `union` (union only).                                                                                                     |
+| `--error-mode`      | `string` | `throw` (default, throws `ApiError`) or `result` (returns `{ data, error, response }`). See [Error handling](#error-handling).                                                                       |
+| `--date-type`       | `string` | `date`/`date-time` fields as `string` (default) or `Date` (pair with the `transformers` generator).                                                                                                  |
+| `--query-framework` | `string` | TanStack Query adapter: `react` (default), `vue`, `svelte`, or `solid`.                                                                                                                              |
+| `--mock-data`       | `string` | `mock` generator data: `baked` (default, deterministic literals) or `faker` (`@faker-js/faker` calls).                                                                                               |
+| `--mock-seed`       | `number` | Seed for `faker`-mode mocks, for reproducible data. Ignored in `baked` mode.                                                                                                                         |
+| `--server-url`      | `string` | Override the server URL inlined into the runtime. Defaults to `servers[0].url`. Accepts absolute (`https://api.example.com`) or relative (`/v1`).                                                    |
+| `--setup`           | `string` | Path to a publisher setup module baked into the client. See [Publisher defaults](#publisher-defaults).                                                                                               |
+| `--config`          | `string` | Path to the `redocly.yaml` (the `client` config and `apis:` live there). Defaults to the one in the working directory.                                                                               |
 
 ## Configuration
 
@@ -77,14 +77,14 @@ Settings resolve **top-level `client` → per-API `client` → CLI flags** (late
 
 `--generators` selects what to emit (default `sdk`). Each non-`sdk` generator adds a **standalone sibling module** next to the client; the client itself never imports it, so it stays dependency-free. Incompatible selections fail fast with an explanation.
 
-| Generator | Emits | App peer dependency |
-| --- | --- | --- |
-| `sdk` | The typed client (default). | none |
-| `zod` | `<output>.zod.ts` — [Zod](https://zod.dev) schemas. | `zod` `^3.23 \|\| ^4` |
-| `tanstack-query` | `<output>.tanstack.ts` — [TanStack Query](https://tanstack.com/query) v5 factories. | `@tanstack/<framework>-query` `^5` |
-| `swr` | `<output>.swr.ts` — [SWR](https://swr.vercel.app) hooks. | `swr` `^2` |
-| `mock` | `<output>.mocks.ts` — [MSW](https://mswjs.io) v2 handlers + `create<Schema>` factories. | `msw` `^2` (+ `@faker-js/faker` for `--mock-data faker`) |
-| `transformers` | `<output>.transformers.ts` — `transform<Name>` functions that parse wire dates to `Date`. | none |
+| Generator        | Emits                                                                                     | App peer dependency                                      |
+| ---------------- | ----------------------------------------------------------------------------------------- | -------------------------------------------------------- |
+| `sdk`            | The typed client (default).                                                               | none                                                     |
+| `zod`            | `<output>.zod.ts` — [Zod](https://zod.dev) schemas.                                       | `zod` `^3.23 \|\| ^4`                                    |
+| `tanstack-query` | `<output>.tanstack.ts` — [TanStack Query](https://tanstack.com/query) v5 factories.       | `@tanstack/<framework>-query` `^5`                       |
+| `swr`            | `<output>.swr.ts` — [SWR](https://swr.vercel.app) hooks.                                  | `swr` `^2`                                               |
+| `mock`           | `<output>.mocks.ts` — [MSW](https://mswjs.io) v2 handlers + `create<Schema>` factories.   | `msw` `^2` (+ `@faker-js/faker` for `--mock-data faker`) |
+| `transformers`   | `<output>.transformers.ts` — `transform<Name>` functions that parse wire dates to `Date`. | none                                                     |
 
 ```sh
 redocly generate-client openapi.yaml --output src/client.ts --generators sdk,zod,mock
@@ -96,10 +96,10 @@ redocly generate-client openapi.yaml --output src/client.ts --generators sdk,zod
 
 A setter is generated for each `securityScheme` the runtime can apply, and each operation automatically sends the credentials its `security` requires:
 
-| Scheme | Setter | Applied as |
-| --- | --- | --- |
-| HTTP `bearer` / OAuth2 | `setBearer(token)` | `Authorization: Bearer <token>` |
-| HTTP `basic` | `setBasicAuth(user, pass)` | `Authorization: Basic <base64>` |
+| Scheme                         | Setter                                    | Applied as                               |
+| ------------------------------ | ----------------------------------------- | ---------------------------------------- |
+| HTTP `bearer` / OAuth2         | `setBearer(token)`                        | `Authorization: Bearer <token>`          |
+| HTTP `basic`                   | `setBasicAuth(user, pass)`                | `Authorization: Basic <base64>`          |
 | `apiKey` (header/query/cookie) | `setApiKey(key)` / `setApiKey<Name>(key)` | the named header, query param, or cookie |
 
 `setApiKey` is unsuffixed for a single apiKey scheme; otherwise each gets `setApiKey<SchemeName>`. `mutualTLS` is not injectable. Bearer and apiKey setters accept a **`TokenProvider`** — a string or a (possibly async) function called per request, handy for refresh flows:
@@ -180,7 +180,13 @@ import { defineClientSetup, type RequestContext } from '@redocly/client-generato
 
 export default defineClientSetup({
   config: { serverUrl: 'https://api.acme.com', retry: { retries: 3 } },
-  middleware: [{ onRequest: (ctx: RequestContext) => { ctx.headers['X-Acme-SDK'] = '1.4.0'; } }],
+  middleware: [
+    {
+      onRequest: (ctx: RequestContext) => {
+        ctx.headers['X-Acme-SDK'] = '1.4.0';
+      },
+    },
+  ],
 });
 ```
 
@@ -195,20 +201,20 @@ The baked block runs before the consumer's own setup. **Config values** are last
 Retry is **opt-in**, configured through `ClientConfig` with an optional per-call override:
 
 ```ts
-configure({ retry: { retries: 3 } });                          // global (functions facade)
-const client = new Client({ retry: { retries: 3 } });          // per instance (service-class)
-await getOrderById('ord_123', {}, { retry: { retries: 5 } });  // per call
+configure({ retry: { retries: 3 } }); // global (functions facade)
+const client = new Client({ retry: { retries: 3 } }); // per instance (service-class)
+await getOrderById('ord_123', {}, { retry: { retries: 5 } }); // per call
 ```
 
 By default only **idempotent** methods (`GET`, `HEAD`, `PUT`, `DELETE`, `OPTIONS`) are retried, on a network error or a transient status (`408`, `429`, `500`, `502`, `503`, `504`). `POST`/`PATCH` are not, since re-sending can duplicate side effects — opt in with a custom `retryOn` when safe. Backoff is exponential with full jitter (`retryStrategy: 'fixed'` for a constant delay); a `Retry-After` header takes precedence; an aborted `AbortSignal` stops retries immediately.
 
-| `RetryConfig` field | Type | Default |
-| --- | --- | --- |
-| `retries` | `number` | `0` (extra attempts after the first; `0` disables) |
-| `retryDelay` | `number` | `1000` (base delay, ms) |
-| `retryStrategy` | `'fixed' \| 'exponential'` | `'exponential'` |
-| `jitter` | `boolean` | `true` |
-| `retryOn` | `(ctx: RetryContext) => boolean \| Promise<boolean>` | idempotent-only predicate |
+| `RetryConfig` field | Type                                                 | Default                                            |
+| ------------------- | ---------------------------------------------------- | -------------------------------------------------- |
+| `retries`           | `number`                                             | `0` (extra attempts after the first; `0` disables) |
+| `retryDelay`        | `number`                                             | `1000` (base delay, ms)                            |
+| `retryStrategy`     | `'fixed' \| 'exponential'`                           | `'exponential'`                                    |
+| `jitter`            | `boolean`                                            | `true`                                             |
+| `retryOn`           | `(ctx: RetryContext) => boolean \| Promise<boolean>` | idempotent-only predicate                          |
 
 A custom `retryOn` receives the failed attempt's `RetryContext` (`attempt`, `request`, and exactly one of `response` / `error`) and **fully replaces** the default. To inspect a response body, read `ctx.response.clone()` — the body is a single-use stream:
 
@@ -217,8 +223,8 @@ await createOrder(body, {
   retry: {
     retries: 3,
     retryOn: async (ctx) => {
-      if (ctx.error) return true;                 // transport error
-      return (ctx.response?.status ?? 0) >= 500;  // server error
+      if (ctx.error) return true; // transport error
+      return (ctx.response?.status ?? 0) >= 500; // server error
     },
   },
 });
@@ -228,12 +234,12 @@ await createOrder(body, {
 
 Query parameters follow their OpenAPI `style` / `explode` / `allowReserved`. The default (`form`, `explode: true`) repeats array values:
 
-| `style` | `explode` | `['a', 'b']` on the wire |
-| --- | --- | --- |
-| `form` (default) | `true` | `key=a&key=b` |
-| `form` | `false` | `key=a,b` |
-| `spaceDelimited` | `false` | `key=a%20b` |
-| `pipeDelimited` | `false` | `key=a\|b` |
+| `style`          | `explode` | `['a', 'b']` on the wire |
+| ---------------- | --------- | ------------------------ |
+| `form` (default) | `true`    | `key=a&key=b`            |
+| `form`           | `false`   | `key=a,b`                |
+| `spaceDelimited` | `false`   | `key=a%20b`              |
+| `pipeDelimited`  | `false`   | `key=a\|b`               |
 
 Delimiters are literal (values are still percent-encoded). `allowReserved: true` leaves the RFC-3986 reserved set un-encoded. Object-valued params serialize as `deepObject` brackets (`key[sub]=val`).
 
@@ -314,7 +320,12 @@ export default defineGenerator({
       .flatMap((s) => s.operations)
       .map((op) => `  ${op.name}: '${op.method.toUpperCase()} ${op.path}',`)
       .join('\n');
-    return [{ path: outputPath.replace(/\.ts$/, '.routes.ts'), content: `export const routes = {\n${routes}\n} as const;\n` }];
+    return [
+      {
+        path: outputPath.replace(/\.ts$/, '.routes.ts'),
+        content: `export const routes = {\n${routes}\n} as const;\n`,
+      },
+    ];
   },
 });
 ```
diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index edef0b5b6f..e1945a4f85 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -144,7 +144,9 @@ export async function handleGenerateClient({
     }
 
     try {
-      logger.info(gray(`\n  Generating TypeScript client${job.name ? ` for ${job.name}` : ''}... \n`));
+      logger.info(
+        gray(`\n  Generating TypeScript client${job.name ? ` for ${job.name}` : ''}... \n`)
+      );
       const result = await generateClient({
         ...merged,
         api: job.api,
diff --git a/packages/client-generator/ARCHITECTURE.md b/packages/client-generator/ARCHITECTURE.md
index bebb35fecb..d97d30b343 100644
--- a/packages/client-generator/ARCHITECTURE.md
+++ b/packages/client-generator/ARCHITECTURE.md
@@ -50,7 +50,7 @@ flowchart LR
 | ---------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | Entry      | `index.ts`, `types.ts`, `config.ts`, `config-file.ts`, `plugin.ts`                                                                                                                                                                                                                                                                                                                                                          | `generateClient` orchestration; public option/result types; config loading; the experimental `@redocly/client-generator/plugin` entry (`defineGenerator` + IR types + codegen toolkit)                                                                                                                                                                                                                                                                                       | thin orchestrator                                                                                                                                                             |
 | Load       | `loader.ts`                                                                                                                                                                                                                                                                                                                                                                                                                 | bundle + `$ref` resolution, preserving internal refs                                                                                                                                                                                                                                                                                                                                                                                                                         | deep (hides `openapi-core`)                                                                                                                                                   |
-| IR         | `intermediate-representation/build.ts`, `intermediate-representation/model.ts`, `intermediate-representation/refs.ts`, `intermediate-representation/normalize-swagger2.ts`, `intermediate-representation/sanitize-identifiers.ts`                                                                                                                                                                                                                                                                                                                        | OpenAPI → IR; the IR type model; ref collection; Swagger 2.0 → 3.x normalization; coerce document-derived names to safe unique identifiers (security boundary)                                                                                                                                                                                                                                                                                                               | deep (`buildApiModel` + `normalizeSwagger2` each one interface over a whole walk)                                                                                             |
+| IR         | `intermediate-representation/build.ts`, `intermediate-representation/model.ts`, `intermediate-representation/refs.ts`, `intermediate-representation/normalize-swagger2.ts`, `intermediate-representation/sanitize-identifiers.ts`                                                                                                                                                                                           | OpenAPI → IR; the IR type model; ref collection; Swagger 2.0 → 3.x normalization; coerce document-derived names to safe unique identifiers (security boundary)                                                                                                                                                                                                                                                                                                               | deep (`buildApiModel` + `normalizeSwagger2` each one interface over a whole walk)                                                                                             |
 | Writers    | `writers/index.ts`, `single-file-writer.ts`, `split-writer.ts`, `tagged.ts`, `tags-writer.ts`, `tags-split-writer.ts`, `group-by-tag.ts`, `util.ts`, `types.ts`                                                                                                                                                                                                                                                             | file layout per output mode                                                                                                                                                                                                                                                                                                                                                                                                                                                  | thin adapters at the `getWriter` seam + `group-by-tag` (deep)                                                                                                                 |
 | Generators | `generators/index.ts` (registry + `validateGenerators`), `resolve.ts` (built-in / inline / specifier resolution), `types.ts`, `sdk.ts`, `zod.ts`, `tanstack-query.ts`, `swr.ts`, `transformers.ts`, `mock.ts`                                                                                                                                                                                                               | the generator registry seam: each descriptor declares its requires/facades/errorModes and produces `GeneratedFile[]` by calling an emitter; `resolve.ts` turns a selection (built-in names, inline `customGenerators`, or plugin import specifiers) into a name→descriptor registry                                                                                                                                                                                          | thin adapters at the `getGenerator` seam ([ADR-0004](./docs/adr/0004-registry-seams.md), [ADR-0012](./docs/adr/0012-plugin-api.md))                                           |
 | Emitters   | sdk: `emitters/client.ts` (composition), `types.ts`, `type-guards.ts`, `auth.ts`, `operations.ts` (+ `operation-aliases.ts`, `operation-types.ts`), `sse.ts`, `runtime.ts`; satellite: `zod.ts`, `transformers.ts`, `tanstack-query.ts`, `swr.ts` (+ shared `wrapper-support.ts`), `mock.ts`/`faker.ts`/`sample.ts`; foundation `ts.ts`; shared `operation-signature.ts`; private `support.ts`, `jsdoc.ts`, `identifier.ts` | IR → TypeScript AST (`ts.factory` nodes, printed via `ts.ts`); the emitted runtime; `operations.ts` splits the per-op assembly from its `<Op>*` alias builders (`operation-aliases.ts`) and shared param/body/response type builders (`operation-types.ts`); `sse.ts` is the SSE detection seam; `operation-signature.ts` is the single source of an operation’s calling convention; `wrapper-support.ts` is the shared eligibility/param model for `swr` + `tanstack-query` | each emitter is deep (one entry point builds nodes over hidden bulk); `client.ts` assembles the per-file statements and prints once; the runtime is the client library itself |
diff --git a/packages/client-generator/src/emitters/client.ts b/packages/client-generator/src/emitters/client.ts
index 7cc20ea21e..68b05cd4e7 100644
--- a/packages/client-generator/src/emitters/client.ts
+++ b/packages/client-generator/src/emitters/client.ts
@@ -1,4 +1,8 @@
-import type { ApiModel, OperationModel, SecuritySchemeModel } from '../intermediate-representation/model.js';
+import type {
+  ApiModel,
+  OperationModel,
+  SecuritySchemeModel,
+} from '../intermediate-representation/model.js';
 import { collectOperationRefs } from '../intermediate-representation/refs.js';
 import { authSetterNames, authStatements, authTypeNames } from './auth.js';
 import {
@@ -473,7 +477,13 @@ function publicReexportNodes(
   errorMode: 'throw' | 'result' | undefined,
   hasSse: boolean
 ): ts.ExportDeclaration[] {
-  const values = ['ApiError', 'configure', 'use', 'setServerUrl', ...authSetterNames(schemes)].sort();
+  const values = [
+    'ApiError',
+    'configure',
+    'use',
+    'setServerUrl',
+    ...authSetterNames(schemes),
+  ].sort();
   const types = [
     ...PUBLIC_RUNTIME_TYPES,
     ...authTypeNames(schemes),
diff --git a/packages/client-generator/src/emitters/faker.ts b/packages/client-generator/src/emitters/faker.ts
index af8171c324..1d7d738cff 100644
--- a/packages/client-generator/src/emitters/faker.ts
+++ b/packages/client-generator/src/emitters/faker.ts
@@ -9,7 +9,12 @@
 // consumer can flip `mockData` without touching call sites; `@faker-js/faker`
 // becomes their dev-dep while the real client stays dependency-free.
 
-import type { NamedSchemaModel, ScalarKind, SchemaMetadata, SchemaModel } from '../intermediate-representation/model.js';
+import type {
+  NamedSchemaModel,
+  ScalarKind,
+  SchemaMetadata,
+  SchemaModel,
+} from '../intermediate-representation/model.js';
 import { safeIdent } from './identifier.js';
 import { constArray, ts } from './ts.js';
 
diff --git a/packages/client-generator/src/emitters/operation-types.ts b/packages/client-generator/src/emitters/operation-types.ts
index 352212d999..44b99f81ca 100644
--- a/packages/client-generator/src/emitters/operation-types.ts
+++ b/packages/client-generator/src/emitters/operation-types.ts
@@ -2,7 +2,11 @@
 // builders: turn an operation's params / body / responses into `ts` type and parameter nodes.
 // Leaf module — depends only on the IR types and the codegen foundation, never back on operations.ts.
 
-import type { ParamModel, RequestBodyModel, ResponseBodyModel } from '../intermediate-representation/model.js';
+import type {
+  ParamModel,
+  RequestBodyModel,
+  ResponseBodyModel,
+} from '../intermediate-representation/model.js';
 import { safeIdent } from './identifier.js';
 import { jsdocText } from './jsdoc.js';
 import { jsdoc, printNodes, ts } from './ts.js';
diff --git a/packages/client-generator/src/emitters/sample.ts b/packages/client-generator/src/emitters/sample.ts
index 87646c7eea..6c2b6e7614 100644
--- a/packages/client-generator/src/emitters/sample.ts
+++ b/packages/client-generator/src/emitters/sample.ts
@@ -1,6 +1,11 @@
 import { isPlainObject } from '@redocly/openapi-core';
 
-import type { NamedSchemaModel, ScalarKind, SchemaMetadata, SchemaModel } from '../intermediate-representation/model.js';
+import type {
+  NamedSchemaModel,
+  ScalarKind,
+  SchemaMetadata,
+  SchemaModel,
+} from '../intermediate-representation/model.js';
 import type { DateType } from './types.js';
 
 /** A sampled value the emitter must print as a raw TS expression rather than a JSON
diff --git a/packages/client-generator/src/emitters/sse.ts b/packages/client-generator/src/emitters/sse.ts
index d4f8c6d8e6..a93c37f21c 100644
--- a/packages/client-generator/src/emitters/sse.ts
+++ b/packages/client-generator/src/emitters/sse.ts
@@ -1,4 +1,8 @@
-import type { OperationModel, ResponseBodyModel, SchemaModel } from '../intermediate-representation/model.js';
+import type {
+  OperationModel,
+  ResponseBodyModel,
+  SchemaModel,
+} from '../intermediate-representation/model.js';
 import { ts } from './ts.js';
 import { type DateType, schemaToTypeNode } from './types.js';
 
diff --git a/packages/client-generator/src/emitters/transformers.ts b/packages/client-generator/src/emitters/transformers.ts
index f3512c3151..bb5557de12 100644
--- a/packages/client-generator/src/emitters/transformers.ts
+++ b/packages/client-generator/src/emitters/transformers.ts
@@ -9,7 +9,11 @@
 // `transformPet` calls `transformPerson(data["owner"])` when `Pet.owner` is a
 // `Person` that has dates.
 
-import type { ApiModel, NamedSchemaModel, SchemaModel } from '../intermediate-representation/model.js';
+import type {
+  ApiModel,
+  NamedSchemaModel,
+  SchemaModel,
+} from '../intermediate-representation/model.js';
 import { safeIdent } from './identifier.js';
 import { pascalCase } from './support.js';
 import { arrow, exportConstStatement, printStatements, ts } from './ts.js';
diff --git a/packages/client-generator/src/emitters/type-guards.ts b/packages/client-generator/src/emitters/type-guards.ts
index c0111ad291..6f273bc52e 100644
--- a/packages/client-generator/src/emitters/type-guards.ts
+++ b/packages/client-generator/src/emitters/type-guards.ts
@@ -1,4 +1,8 @@
-import type { DiscriminatorModel, NamedSchemaModel, SchemaModel } from '../intermediate-representation/model.js';
+import type {
+  DiscriminatorModel,
+  NamedSchemaModel,
+  SchemaModel,
+} from '../intermediate-representation/model.js';
 import { jsdoc, ts } from './ts.js';
 
 /**
diff --git a/tests/e2e/generate-client/cafe.test.ts b/tests/e2e/generate-client/cafe.test.ts
index 29fa8220f6..eaa60abc39 100644
--- a/tests/e2e/generate-client/cafe.test.ts
+++ b/tests/e2e/generate-client/cafe.test.ts
@@ -109,7 +109,15 @@ describe('generate-client end-to-end (cafe.yaml)', () => {
     // This is the file the consumer actually loads — and replaces the old string-replace hack.
     const consumerGen = spawnSync(
       'node',
-      [cliEntry, 'generate-client', fixture, '--output', generatedFile, '--server-url', SERVER_BASE],
+      [
+        cliEntry,
+        'generate-client',
+        fixture,
+        '--output',
+        generatedFile,
+        '--server-url',
+        SERVER_BASE,
+      ],
       { encoding: 'utf-8', cwd: repoRoot }
     );
     if (consumerGen.status !== 0) {
diff --git a/tests/e2e/generate-client/examples/README.md b/tests/e2e/generate-client/examples/README.md
index 8c058b1ab9..7ebdc5d038 100644
--- a/tests/e2e/generate-client/examples/README.md
+++ b/tests/e2e/generate-client/examples/README.md
@@ -11,7 +11,7 @@ the `generateClient(...)` API.
 | [fetch-functions](./fetch-functions) | CLI · `sdk`, functions        | free functions + `ApiError`                                                             |
 | [customization](./customization)     | CLI · `sdk`, functions        | request/response middleware, `ctx.operation` targeting, body mutation, custom transport |
 | [baked-setup](./baked-setup)         | CLI · `sdk`, functions        | publisher defaults baked into the client via `--setup` (`defineClientSetup`)            |
-| [service-class](./service-class)     | CLI · `sdk`, service-class    | `new Client({ serverUrl })`, per-instance `auth`                                          |
+| [service-class](./service-class)     | CLI · `sdk`, service-class    | `new Client({ serverUrl })`, per-instance `auth`                                        |
 | [zod](./zod)                         | CLI · `sdk`, `zod`            | validating responses with generated zod schemas                                         |
 | [tanstack-query](./tanstack-query)   | CLI · `sdk`, `tanstack-query` | React `useQuery(<op>Options())`                                                         |
 | [mock](./mock)                       | CLI · `sdk`, `mock`           | MSW handlers from generated `handlers`                                                  |
diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
index 63979f9eee..b327edd8ae 100644
--- a/tests/e2e/generate-client/redocly-config.test.ts
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -3,7 +3,14 @@
 // modes: fan-out (no arg, over apis with a `client` block), an `apis:` alias, and a plain
 // file path (which ignores `apis:`). CLI flags override the config.
 import { spawnSync } from 'node:child_process';
-import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync, copyFileSync } from 'node:fs';
+import {
+  existsSync,
+  mkdtempSync,
+  readFileSync,
+  rmSync,
+  writeFileSync,
+  copyFileSync,
+} from 'node:fs';
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -48,9 +55,13 @@ describe('generate-client redocly.yaml config', () => {
 
   it('defaults the output to `<name>.client.ts` in the config dir when clientOutput is omitted', () => {
     const dir = project(
-      ['apis:', '  cafe:', '    root: ./openapi.yaml', '    client:', '      generators: [sdk]'].join(
-        '\n'
-      ) + '\n'
+      [
+        'apis:',
+        '  cafe:',
+        '    root: ./openapi.yaml',
+        '    client:',
+        '      generators: [sdk]',
+      ].join('\n') + '\n'
     );
     const res = run(dir);
     expect(res.status, res.stderr).toBe(0);
@@ -137,9 +148,13 @@ describe('generate-client redocly.yaml config', () => {
 
   it('rejects --output in fan-out mode', () => {
     const dir = project(
-      ['apis:', '  cafe:', '    root: ./openapi.yaml', '    client:', '      generators: [sdk]'].join(
-        '\n'
-      ) + '\n'
+      [
+        'apis:',
+        '  cafe:',
+        '    root: ./openapi.yaml',
+        '    client:',
+        '      generators: [sdk]',
+      ].join('\n') + '\n'
     );
     const res = run(dir, ['--output', './out.ts']);
     expect(res.status).not.toBe(0);

From 4743b589b6ac253e64cafbdd5cc0bc5ee0adabd4 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 15:51:48 +0300
Subject: [PATCH 056/134] test(client-generator): compile generated clients
 under nodenext, not node16

The minimum supported Node is v20, so the node16 module/moduleResolution used by
the e2e strict-compile checks and the consumer tsconfigs is outdated. Switch them to
nodenext (the repo-wide convention; still node-style resolution, so the emitted `.js`
extensions are still exercised). Update the moduleSpecifier comment to drop the stale
node16 reference.
---
 packages/client-generator/src/emitters/client.ts      | 2 +-
 tests/e2e/generate-client/auth.test.ts                | 4 ++--
 tests/e2e/generate-client/base-consumer/tsconfig.json | 4 ++--
 tests/e2e/generate-client/cafe-consumer/tsconfig.json | 4 ++--
 tests/e2e/generate-client/error-mode.test.ts          | 4 ++--
 tests/e2e/generate-client/parse-as.test.ts            | 4 ++--
 tests/e2e/generate-client/path-param-idents.test.ts   | 4 ++--
 tests/e2e/generate-client/query-styles.test.ts        | 4 ++--
 tests/e2e/generate-client/spec-versions.test.ts       | 4 ++--
 tests/e2e/generate-client/sse-consumer/tsconfig.json  | 4 ++--
 tests/e2e/generate-client/sse.test.ts                 | 4 ++--
 tests/e2e/generate-client/zod.test.ts                 | 4 ++--
 12 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/packages/client-generator/src/emitters/client.ts b/packages/client-generator/src/emitters/client.ts
index 68b05cd4e7..1b17d7e1b0 100644
--- a/packages/client-generator/src/emitters/client.ts
+++ b/packages/client-generator/src/emitters/client.ts
@@ -338,7 +338,7 @@ export function emitModules(model: ApiModel, options: EmitOptions = {}): ClientM
 
 /**
  * The relative-import basename for emitting `from './<stem>.<kind>.js'`. The `.js`
- * extension is required for `node16`/`nodenext` module resolution and accepted by
+ * extension is required for `nodenext` (node-style) module resolution and accepted by
  * bundler resolution, so generated imports stay portable. Writers also use this to
  * wire the barrel's cross-module re-exports.
  */
diff --git a/tests/e2e/generate-client/auth.test.ts b/tests/e2e/generate-client/auth.test.ts
index 1c114092f5..78960d3380 100644
--- a/tests/e2e/generate-client/auth.test.ts
+++ b/tests/e2e/generate-client/auth.test.ts
@@ -12,8 +12,8 @@ const fixture = join(__dirname, 'fixtures', 'auth.yaml');
 
 const STRICT_TSCONFIG = {
   compilerOptions: {
-    module: 'node16',
-    moduleResolution: 'node16',
+    module: 'nodenext',
+    moduleResolution: 'nodenext',
     target: 'es2022',
     lib: ['ES2022', 'DOM'],
     strict: true,
diff --git a/tests/e2e/generate-client/base-consumer/tsconfig.json b/tests/e2e/generate-client/base-consumer/tsconfig.json
index 1b3492b511..3e2badaaea 100644
--- a/tests/e2e/generate-client/base-consumer/tsconfig.json
+++ b/tests/e2e/generate-client/base-consumer/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
-    "module": "node16",
-    "moduleResolution": "node16",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
     "target": "es2022",
     "lib": ["ES2022", "DOM"],
     "strict": true,
diff --git a/tests/e2e/generate-client/cafe-consumer/tsconfig.json b/tests/e2e/generate-client/cafe-consumer/tsconfig.json
index 1b3492b511..3e2badaaea 100644
--- a/tests/e2e/generate-client/cafe-consumer/tsconfig.json
+++ b/tests/e2e/generate-client/cafe-consumer/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
-    "module": "node16",
-    "moduleResolution": "node16",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
     "target": "es2022",
     "lib": ["ES2022", "DOM"],
     "strict": true,
diff --git a/tests/e2e/generate-client/error-mode.test.ts b/tests/e2e/generate-client/error-mode.test.ts
index 0d0d5f28dd..b161afed88 100644
--- a/tests/e2e/generate-client/error-mode.test.ts
+++ b/tests/e2e/generate-client/error-mode.test.ts
@@ -30,8 +30,8 @@ const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
 
 const TSCONFIG = {
   compilerOptions: {
-    module: 'node16',
-    moduleResolution: 'node16',
+    module: 'nodenext',
+    moduleResolution: 'nodenext',
     target: 'es2022',
     lib: ['ES2022', 'DOM'],
     strict: true,
diff --git a/tests/e2e/generate-client/parse-as.test.ts b/tests/e2e/generate-client/parse-as.test.ts
index 3a0b2ce58b..8315c11bec 100644
--- a/tests/e2e/generate-client/parse-as.test.ts
+++ b/tests/e2e/generate-client/parse-as.test.ts
@@ -69,8 +69,8 @@ describe('generate-client parseAs', () => {
       join(dir, 'tsconfig.json'),
       JSON.stringify({
         compilerOptions: {
-          module: 'node16',
-          moduleResolution: 'node16',
+          module: 'nodenext',
+          moduleResolution: 'nodenext',
           target: 'es2022',
           lib: ['ES2022', 'DOM'],
           strict: true,
diff --git a/tests/e2e/generate-client/path-param-idents.test.ts b/tests/e2e/generate-client/path-param-idents.test.ts
index 6062b860fc..d87f5ab8da 100644
--- a/tests/e2e/generate-client/path-param-idents.test.ts
+++ b/tests/e2e/generate-client/path-param-idents.test.ts
@@ -71,8 +71,8 @@ paths:
 
 const TSCONFIG = JSON.stringify({
   compilerOptions: {
-    module: 'node16',
-    moduleResolution: 'node16',
+    module: 'nodenext',
+    moduleResolution: 'nodenext',
     target: 'es2022',
     lib: ['ES2022', 'DOM'],
     strict: true,
diff --git a/tests/e2e/generate-client/query-styles.test.ts b/tests/e2e/generate-client/query-styles.test.ts
index 1732676814..21b3ff2813 100644
--- a/tests/e2e/generate-client/query-styles.test.ts
+++ b/tests/e2e/generate-client/query-styles.test.ts
@@ -58,8 +58,8 @@ describe('generate-client query serialization styles', () => {
       join(dir, 'tsconfig.json'),
       JSON.stringify({
         compilerOptions: {
-          module: 'node16',
-          moduleResolution: 'node16',
+          module: 'nodenext',
+          moduleResolution: 'nodenext',
           target: 'es2022',
           lib: ['ES2022', 'DOM'],
           strict: true,
diff --git a/tests/e2e/generate-client/spec-versions.test.ts b/tests/e2e/generate-client/spec-versions.test.ts
index b42c7e2ab0..5c23347a9b 100644
--- a/tests/e2e/generate-client/spec-versions.test.ts
+++ b/tests/e2e/generate-client/spec-versions.test.ts
@@ -24,8 +24,8 @@ function generateAndTypecheck(fixture: string): { generated: string } {
     join(dir, 'tsconfig.json'),
     JSON.stringify({
       compilerOptions: {
-        module: 'node16',
-        moduleResolution: 'node16',
+        module: 'nodenext',
+        moduleResolution: 'nodenext',
         target: 'es2022',
         lib: ['ES2022', 'DOM'],
         strict: true,
diff --git a/tests/e2e/generate-client/sse-consumer/tsconfig.json b/tests/e2e/generate-client/sse-consumer/tsconfig.json
index 1b3492b511..3e2badaaea 100644
--- a/tests/e2e/generate-client/sse-consumer/tsconfig.json
+++ b/tests/e2e/generate-client/sse-consumer/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
-    "module": "node16",
-    "moduleResolution": "node16",
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
     "target": "es2022",
     "lib": ["ES2022", "DOM"],
     "strict": true,
diff --git a/tests/e2e/generate-client/sse.test.ts b/tests/e2e/generate-client/sse.test.ts
index 6fa1047a3a..514f331d41 100644
--- a/tests/e2e/generate-client/sse.test.ts
+++ b/tests/e2e/generate-client/sse.test.ts
@@ -24,8 +24,8 @@ const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
 
 const TSCONFIG = {
   compilerOptions: {
-    module: 'node16',
-    moduleResolution: 'node16',
+    module: 'nodenext',
+    moduleResolution: 'nodenext',
     target: 'es2022',
     lib: ['ES2022', 'DOM'],
     strict: true,
diff --git a/tests/e2e/generate-client/zod.test.ts b/tests/e2e/generate-client/zod.test.ts
index 8448d50f81..e8f8b9d7fd 100644
--- a/tests/e2e/generate-client/zod.test.ts
+++ b/tests/e2e/generate-client/zod.test.ts
@@ -64,8 +64,8 @@ describe('generate-client zod generator', () => {
       join(dir, 'tsconfig.json'),
       JSON.stringify({
         compilerOptions: {
-          module: 'node16',
-          moduleResolution: 'node16',
+          module: 'nodenext',
+          moduleResolution: 'nodenext',
           target: 'es2022',
           lib: ['ES2022', 'DOM'],
           strict: true,

From 6ea02b440e1bbc60c9655ffcba3b4f471ebd7c1c Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 17:04:58 +0300
Subject: [PATCH 057/134] refactor(client-generator): expose everything from
 the single package root

Fold the ./config-file and ./plugin subpath exports into the root entry: index.ts
now re-exports `mergeConfig` and `export *`s the plugin surface (defineGenerator,
the codegen toolkit, IR types), and package.json declares only the "." export. The
CLI reads `mergeConfig` from the root import, and the plugin/config-file references
in docs, comments, the custom-generator example, and ADR-0012/0013 point at the root
(ADR-0012 amended to note the entry move). One import path for consumers.
---
 docs/@v2/commands/generate-client.md          |  4 ++--
 packages/cli/src/commands/generate-client.ts  |  3 +--
 packages/client-generator/ARCHITECTURE.md     |  6 +++---
 packages/client-generator/README.md           |  4 ++--
 .../docs/adr/0012-plugin-api.md               |  7 ++++++-
 .../docs/adr/0013-experimental-status.md      |  2 +-
 packages/client-generator/package.json        |  8 --------
 packages/client-generator/src/config.ts       |  2 +-
 .../client-generator/src/generators/types.ts  |  2 +-
 packages/client-generator/src/index.ts        | 19 ++++---------------
 packages/client-generator/src/plugin.ts       |  5 +++--
 packages/client-generator/src/types.ts        |  2 +-
 .../examples/custom-generator/README.md       |  2 +-
 .../custom-generator/route-map-generator.mjs  |  2 +-
 14 files changed, 27 insertions(+), 41 deletions(-)

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index d774199a73..f7122fe9fb 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -310,7 +310,7 @@ A generator is `{ name, run }` (plus optional compatibility metadata); author it
 
 ```ts
 // route-map-generator.ts
-import { defineGenerator } from '@redocly/client-generator/plugin';
+import { defineGenerator } from '@redocly/client-generator';
 
 export default defineGenerator({
   name: 'route-map',
@@ -330,7 +330,7 @@ export default defineGenerator({
 });
 ```
 
-The `@redocly/client-generator/plugin` entry also exports the codegen toolkit (`ts`, `printStatements`, `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, …) and the IR types, so a custom generator emits TypeScript exactly as the first-party ones do.
+The `@redocly/client-generator` entry also exports the codegen toolkit (`ts`, `printStatements`, `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, …) and the IR types, so a custom generator emits TypeScript exactly as the first-party ones do.
 
 Select it in `redocly.yaml` by path or package name:
 
diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index e1945a4f85..d851392486 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -50,8 +50,7 @@ export async function handleGenerateClient({
   argv,
   config,
 }: CommandArgs<GenerateClientCommandArgv>) {
-  const { generateClient } = await import('@redocly/client-generator');
-  const { mergeConfig } = await import('@redocly/client-generator/config-file');
+  const { generateClient, mergeConfig } = await import('@redocly/client-generator');
 
   const { client, apis } = config.resolvedConfig;
   const configDir = config.configPath ? dirname(config.configPath) : process.cwd();
diff --git a/packages/client-generator/ARCHITECTURE.md b/packages/client-generator/ARCHITECTURE.md
index d97d30b343..cefa539f2e 100644
--- a/packages/client-generator/ARCHITECTURE.md
+++ b/packages/client-generator/ARCHITECTURE.md
@@ -48,7 +48,7 @@ flowchart LR
 
 | Area       | Files                                                                                                                                                                                                                                                                                                                                                                                                                       | Owns                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Depth                                                                                                                                                                         |
 | ---------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Entry      | `index.ts`, `types.ts`, `config.ts`, `config-file.ts`, `plugin.ts`                                                                                                                                                                                                                                                                                                                                                          | `generateClient` orchestration; public option/result types; config loading; the experimental `@redocly/client-generator/plugin` entry (`defineGenerator` + IR types + codegen toolkit)                                                                                                                                                                                                                                                                                       | thin orchestrator                                                                                                                                                             |
+| Entry      | `index.ts`, `types.ts`, `config.ts`, `config-file.ts`, `plugin.ts`                                                                                                                                                                                                                                                                                                                                                          | `generateClient` orchestration; public option/result types; config loading; the experimental `@redocly/client-generator` entry (`defineGenerator` + IR types + codegen toolkit)                                                                                                                                                                                                                                                                                              | thin orchestrator                                                                                                                                                             |
 | Load       | `loader.ts`                                                                                                                                                                                                                                                                                                                                                                                                                 | bundle + `$ref` resolution, preserving internal refs                                                                                                                                                                                                                                                                                                                                                                                                                         | deep (hides `openapi-core`)                                                                                                                                                   |
 | IR         | `intermediate-representation/build.ts`, `intermediate-representation/model.ts`, `intermediate-representation/refs.ts`, `intermediate-representation/normalize-swagger2.ts`, `intermediate-representation/sanitize-identifiers.ts`                                                                                                                                                                                           | OpenAPI → IR; the IR type model; ref collection; Swagger 2.0 → 3.x normalization; coerce document-derived names to safe unique identifiers (security boundary)                                                                                                                                                                                                                                                                                                               | deep (`buildApiModel` + `normalizeSwagger2` each one interface over a whole walk)                                                                                             |
 | Writers    | `writers/index.ts`, `single-file-writer.ts`, `split-writer.ts`, `tagged.ts`, `tags-writer.ts`, `tags-split-writer.ts`, `group-by-tag.ts`, `util.ts`, `types.ts`                                                                                                                                                                                                                                                             | file layout per output mode                                                                                                                                                                                                                                                                                                                                                                                                                                                  | thin adapters at the `getWriter` seam + `group-by-tag` (deep)                                                                                                                 |
@@ -66,7 +66,7 @@ Places where behavior varies without editing in place:
 - **The `getGenerator` seam** — a generator is `(input) => GeneratedFile[]` (`generators/types.ts`).
   `generateClient` resolves the configured selection (default `['sdk']`) via `resolveGenerators` (`generators/resolve.ts`) into a name→descriptor registry, then runs them through `collectGeneratedFiles` and merges their files (duplicate output paths throw).
   A selection entry is a built-in name, the `name` of an inline `customGenerators` entry, or a **plugin import specifier** (path or package, dynamically imported and validated).
-  This is the public, **experimental** extension point — authored with `defineGenerator` from `@redocly/client-generator/plugin`, which also re-exports the IR types and the codegen toolkit.
+  This is the public, **experimental** extension point — authored with `defineGenerator` from `@redocly/client-generator`, which also re-exports the IR types and the codegen toolkit.
   Where new capabilities (zod, framework hooks) plug in.
   See [ADR-0004](./docs/adr/0004-registry-seams.md) and [ADR-0012](./docs/adr/0012-plugin-api.md).
 - **The `getWriter` seam** — `getWriter(outputMode)` maps an output mode to a `Writer`.
@@ -132,7 +132,7 @@ Compile (`npm run compile`) before running tests — they run against built outp
   See [ADR-0011](./docs/adr/0011-wrapper-generators.md).
 - **A new mock data source** — the `mock` generator's data comes from `emitters/sample.ts` (baked literals) or `emitters/faker.ts` (faker calls), selected by `--mock-data`; both walk the IR with the same cycle semantics.
   See [ADR-0010](./docs/adr/0010-mock-data-baked-vs-faker.md).
-- **A custom generator (plugin, experimental)** — author `{ name, run }` with `defineGenerator` from the `@redocly/client-generator/plugin` entry (it also exports the IR types and the codegen toolkit); select it in `generators` by inline `customGenerators` name or by import specifier.
+- **A custom generator (plugin, experimental)** — author `{ name, run }` with `defineGenerator` from the `@redocly/client-generator` entry (it also exports the IR types and the codegen toolkit); select it in `generators` by inline `customGenerators` name or by import specifier.
   No core change is needed — `resolve.ts` loads and validates it.
   See [ADR-0012](./docs/adr/0012-plugin-api.md).
 
diff --git a/packages/client-generator/README.md b/packages/client-generator/README.md
index bbde524aba..136c5b4763 100644
--- a/packages/client-generator/README.md
+++ b/packages/client-generator/README.md
@@ -372,7 +372,7 @@ Write a **custom generator**: it reads the same OpenAPI-derived model the built-
 
 ```ts
 // route-map-generator.ts
-import { defineGenerator } from '@redocly/client-generator/plugin';
+import { defineGenerator } from '@redocly/client-generator';
 
 export default defineGenerator({
   name: 'route-map',
@@ -406,7 +406,7 @@ await generateClient({
 });
 ```
 
-`@redocly/client-generator/plugin` also exports the IR types and the codegen toolkit the built-ins use (`ts`, `printStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, …).
+`@redocly/client-generator` also exports the IR types and the codegen toolkit the built-ins use (`ts`, `printStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, …).
 A generator declares the same `requires`/`facades`/`errorModes`/`dateTypes` contract, validated up front.
 The generated client stays dependency-free.
 See `examples/custom-generator` for a runnable example.
diff --git a/packages/client-generator/docs/adr/0012-plugin-api.md b/packages/client-generator/docs/adr/0012-plugin-api.md
index 8eba8abce4..c12a44b653 100644
--- a/packages/client-generator/docs/adr/0012-plugin-api.md
+++ b/packages/client-generator/docs/adr/0012-plugin-api.md
@@ -2,6 +2,11 @@
 
 - Status: Accepted (experimental)
 - Date: 2026-06-13
+- Amended: the plugin surface is no longer a dedicated `@redocly/client-generator/plugin`
+  subpath — it is re-exported from the **package root** (`@redocly/client-generator`), the
+  package's single entry. The `defineConfig` / `*.config.ts` / `--config-file` mechanism was
+  also removed; inline `customGenerators` are passed via the programmatic `generateClient(...)`
+  API. The plugin API decision itself (below) is unchanged.
 
 ## Context
 
@@ -16,7 +21,7 @@ Open the `getGenerator` registry as a **public, experimental** API for **custom
 A custom generator is the internal `GeneratorDescriptor` plus a `name`: `{ name, run, requires?, facades?, errorModes?, dateTypes? }`, where `run(input) => GeneratedFile[]` receives the same IR the built-ins do.
 
 - **Loading is dual.** A `generators` entry resolves as a built-in name, an inline `customGenerators` entry (from a `defineConfig` file — type-safe, no dynamic import), or an **import specifier** (a path resolved against the config dir, or an installed package) that is dynamically `import()`ed and default-exported (mirroring how config files load). A new `resolveGenerators` performs this before emission, producing a name→descriptor registry that `validateGenerators` and the run loop consume.
-- **Surface + stability.** A dedicated `@redocly/client-generator/plugin` entry exports `defineGenerator`, the IR types, and a curated codegen toolkit (`ts`, `printStatements`, `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, `safeIdent`) — the same internals the built-in generators use, re-surfaced (no new logic). The whole surface is **`@experimental`**: it may change between minor versions until real plugins exercise it and it is stabilized.
+- **Surface + stability.** The package root (`@redocly/client-generator`) exports `defineGenerator`, the IR types, and a curated codegen toolkit (`ts`, `printStatements`, `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, `safeIdent`) — the same internals the built-in generators use, re-surfaced (no new logic). The whole surface is **`@experimental`**: it may change between minor versions until real plugins exercise it and it is stabilized.
 - **Fail fast.** Collisions (a custom name equal to a built-in or another custom), invalid exports, unloadable specifiers, and unmet `requires`/`facades`/`errorModes`/`dateTypes` all throw an actionable error before any file is written.
 
 ## Consequences
diff --git a/packages/client-generator/docs/adr/0013-experimental-status.md b/packages/client-generator/docs/adr/0013-experimental-status.md
index 6325f7d3fd..1bbaf19b49 100644
--- a/packages/client-generator/docs/adr/0013-experimental-status.md
+++ b/packages/client-generator/docs/adr/0013-experimental-status.md
@@ -28,7 +28,7 @@ The feature stays experimental until all of the following hold:
 
 1. **Validated against real-world specs** — exercised on a representative set of production OpenAPI descriptions (incl. internal consumers) with no output-shape surprises.
 2. **Generated-output shape frozen** — no pending changes to the emitted client/types that would break a committed, generated client.
-3. **Plugin IR committed to** — the IR and codegen toolkit re-exported from `@redocly/client-generator/plugin` are reviewed and promoted from `@experimental` to stable.
+3. **Plugin IR committed to** — the IR and codegen toolkit re-exported from `@redocly/client-generator` are reviewed and promoted from `@experimental` to stable.
 4. **Deferrals decided** — `int64`→`bigint`, oauth2 token-flow helpers, and the formatting/pretty-print pass are each either implemented or explicitly declared out of scope.
 5. **Soak period** — a defined window of no breaking changes to flags/output/config before the flag is flipped.
 
diff --git a/packages/client-generator/package.json b/packages/client-generator/package.json
index 976fce4634..dd20eb0926 100644
--- a/packages/client-generator/package.json
+++ b/packages/client-generator/package.json
@@ -9,14 +9,6 @@
     ".": {
       "import": "./lib/index.js",
       "types": "./lib/index.d.ts"
-    },
-    "./config-file": {
-      "import": "./lib/config-file.js",
-      "types": "./lib/config-file.d.ts"
-    },
-    "./plugin": {
-      "import": "./lib/plugin.js",
-      "types": "./lib/plugin.d.ts"
     }
   },
   "engines": {
diff --git a/packages/client-generator/src/config.ts b/packages/client-generator/src/config.ts
index 19cba8cee2..d82b2b5067 100644
--- a/packages/client-generator/src/config.ts
+++ b/packages/client-generator/src/config.ts
@@ -50,7 +50,7 @@ export type Config = {
   generators?: string[];
   /**
    * Inline custom generators (the experimental plugin API), registered so they can be selected in
-   * `generators` by `name`. Authored with `defineGenerator` from `@redocly/client-generator/plugin`.
+   * `generators` by `name`. Authored with `defineGenerator` from `@redocly/client-generator`.
    */
   customGenerators?: CustomGenerator[];
   /**
diff --git a/packages/client-generator/src/generators/types.ts b/packages/client-generator/src/generators/types.ts
index 27c58e9ee3..f9f01e3c2e 100644
--- a/packages/client-generator/src/generators/types.ts
+++ b/packages/client-generator/src/generators/types.ts
@@ -52,7 +52,7 @@ export type GeneratorDescriptor = {
  * A user-authored generator (the public, experimental plugin contract): a `GeneratorDescriptor`
  * plus a unique `name` used to select it in `generators`, to satisfy other generators' `requires`,
  * and to detect collisions. Authors build one via `defineGenerator` from the
- * `@redocly/client-generator/plugin` entry; the resolver registers it under `name`.
+ * `@redocly/client-generator` entry; the resolver registers it under `name`.
  */
 export type CustomGenerator = GeneratorDescriptor & {
   /** Unique name, used in `generators` selection, `requires`, and collision detection. */
diff --git a/packages/client-generator/src/index.ts b/packages/client-generator/src/index.ts
index 4890f810ca..c5c03e8edc 100644
--- a/packages/client-generator/src/index.ts
+++ b/packages/client-generator/src/index.ts
@@ -26,22 +26,11 @@ export type {
   RetryStrategy,
 } from './runtime-contract.js';
 export type { Config } from './config.js';
-export type { Generator, GeneratorInput, GeneratorName } from './generators/index.js';
-export type {
-  ApiModel,
-  NamedSchemaModel,
-  OperationModel,
-  ParamModel,
-  PropertyModel,
-  RequestBodyModel,
-  ResponseBodyModel,
-  ScalarKind,
-  SchemaModel,
-  ServiceModel,
-} from './intermediate-representation/model.js';
 export type { GenerateClientOptions, GenerateClientResult, LoadResult } from './types.js';
-export type { GeneratedFile, OutputMode } from './writers/index.js';
-export type { ArgsStyle, Facade } from './emitters/client.js';
+export { mergeConfig } from './config-file.js';
+// The custom-generator plugin API + codegen toolkit + IR types (also re-exports the shared
+// `Generator`/`GeneratedFile`/`OutputMode`/`ArgsStyle`/`Facade` types).
+export * from './plugin.js';
 
 /**
  * Validate the generator selection (see `validateGenerators`), then run each
diff --git a/packages/client-generator/src/plugin.ts b/packages/client-generator/src/plugin.ts
index d207ef261a..dd83aab66a 100644
--- a/packages/client-generator/src/plugin.ts
+++ b/packages/client-generator/src/plugin.ts
@@ -1,4 +1,5 @@
-// Public entry for authoring custom generators — the EXPERIMENTAL plugin API.
+// The custom-generator authoring API — the EXPERIMENTAL plugin surface, re-exported from the
+// package root (`@redocly/client-generator`).
 //
 // ⚠️ Experimental: this surface (the IR types and the codegen toolkit re-exported here) may change
 // between minor versions until it is stabilized. Pin your version if you depend on it.
@@ -11,7 +12,7 @@
 // libraries are peers of the consumer's app, never of the client.
 //
 //   // my-generator.ts
-//   import { defineGenerator, ts, printStatements } from '@redocly/client-generator/plugin';
+//   import { defineGenerator, ts, printStatements } from '@redocly/client-generator';
 //   export default defineGenerator({
 //     name: 'route-map',
 //     requires: ['sdk'],
diff --git a/packages/client-generator/src/types.ts b/packages/client-generator/src/types.ts
index 40e0e98eb8..4f1184eb12 100644
--- a/packages/client-generator/src/types.ts
+++ b/packages/client-generator/src/types.ts
@@ -86,7 +86,7 @@ export type GenerateClientOptions = {
   /**
    * Inline custom generators (the experimental plugin API), registered before resolution so they
    * can be selected in `generators` by `name`. Authored with `defineGenerator` from
-   * `@redocly/client-generator/plugin`. Path/package specifiers in `generators` don't need this.
+   * `@redocly/client-generator`. Path/package specifiers in `generators` don't need this.
    */
   customGenerators?: CustomGenerator[];
   /**
diff --git a/tests/e2e/generate-client/examples/custom-generator/README.md b/tests/e2e/generate-client/examples/custom-generator/README.md
index c8711eea83..a1dc61dcfb 100644
--- a/tests/e2e/generate-client/examples/custom-generator/README.md
+++ b/tests/e2e/generate-client/examples/custom-generator/README.md
@@ -11,4 +11,4 @@ generator runs alongside the built-in `sdk`, reading the same OpenAPI-derived IR
 Regenerate from the repo root with `npm run examples:regen -w @redocly/client-generator`; type-check
 with `npm run typecheck:examples -w @redocly/client-generator`. See the "Custom generators" section
 of the command reference for the
-authoring contract and the `@redocly/client-generator/plugin` toolkit.
+authoring contract and the `@redocly/client-generator` toolkit.
diff --git a/tests/e2e/generate-client/examples/custom-generator/route-map-generator.mjs b/tests/e2e/generate-client/examples/custom-generator/route-map-generator.mjs
index d34fd49985..c6b589e6d8 100644
--- a/tests/e2e/generate-client/examples/custom-generator/route-map-generator.mjs
+++ b/tests/e2e/generate-client/examples/custom-generator/route-map-generator.mjs
@@ -4,7 +4,7 @@
 //
 // Plain ESM so the CLI imports it under bare `node`. Authored in TypeScript you would write:
 //
-//   import { defineGenerator } from '@redocly/client-generator/plugin';
+//   import { defineGenerator } from '@redocly/client-generator';
 //   export default defineGenerator({ name: 'route-map', requires: ['sdk'], run({ model, outputPath }) { … } });
 //
 // `defineGenerator` is just an identity helper for types, so a plain object works too:

From e1d90982401e4d451cd5e841c21aa8be17256e23 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 17:22:29 +0300
Subject: [PATCH 058/134] test(client-generator): use outdent for inline specs
 and consumer scripts

Wrap the flush-left multi-line template literals across the test suite (inline
OpenAPI/Swagger specs, TS consumer/driver scripts, and setup-module sources) with
the `outdent` tag so they read naturally at their nesting level while producing the
same string at runtime. Applied systematically across 15 files (~45 literals);
files whose specs/consumers live in fixtures/ or *-consumer/ were left unchanged.
---
 .../src/__tests__/index.test.ts               | 114 +++++-----
 .../src/__tests__/loader.test.ts              |  80 +++----
 .../src/emitters/__tests__/setup-bake.test.ts |  24 +-
 tests/e2e/generate-client/auth.test.ts        |  48 ++--
 tests/e2e/generate-client/extension.test.ts   | 125 +++++------
 .../generator-contract.test.ts                |  34 +--
 .../identifier-injection.test.ts              |  70 +++---
 tests/e2e/generate-client/middleware.test.ts  | 205 +++++++++---------
 tests/e2e/generate-client/mock.test.ts        |  29 +--
 tests/e2e/generate-client/multipart.test.ts   | 126 +++++------
 .../generate-client/operation-types.test.ts   |  13 +-
 .../generate-client/path-param-idents.test.ts | 118 +++++-----
 .../generate-client/per-instance-auth.test.ts |  59 ++---
 tests/e2e/generate-client/retry.test.ts       | 187 ++++++++--------
 tests/e2e/generate-client/setup.test.ts       |  71 +++---
 15 files changed, 667 insertions(+), 636 deletions(-)

diff --git a/packages/client-generator/src/__tests__/index.test.ts b/packages/client-generator/src/__tests__/index.test.ts
index 488b387009..b0eea09a96 100644
--- a/packages/client-generator/src/__tests__/index.test.ts
+++ b/packages/client-generator/src/__tests__/index.test.ts
@@ -1,6 +1,7 @@
 import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
+import { outdent } from 'outdent';
 
 import { collectGeneratedFiles, generateClient } from '../index.js';
 import type { ApiModel } from '../intermediate-representation/model.js';
@@ -55,21 +56,22 @@ describe('generateClient — end-to-end orchestration', () => {
     const api = join(workDir, 'spec.yaml');
     await writeFile(
       api,
-      `openapi: 3.0.3
-info:
-  title: Tiny
-  version: 1.0.0
-paths:
-  /ping:
-    get:
-      operationId: ping
-      responses:
-        '200':
-          description: OK
-          content:
-            application/json:
-              schema: { type: string }
-`,
+      outdent`
+        openapi: 3.0.3
+        info:
+          title: Tiny
+          version: 1.0.0
+        paths:
+          /ping:
+            get:
+              operationId: ping
+              responses:
+                '200':
+                  description: OK
+                  content:
+                    application/json:
+                      schema: { type: string }
+      `,
       'utf-8'
     );
 
@@ -90,21 +92,22 @@ paths:
     const api = join(workDir, 'errmode.yaml');
     await writeFile(
       api,
-      `openapi: 3.0.3
-info:
-  title: Tiny
-  version: 1.0.0
-paths:
-  /ping:
-    get:
-      operationId: ping
-      responses:
-        '200':
-          description: OK
-          content:
-            application/json:
-              schema: { type: string }
-`,
+      outdent`
+        openapi: 3.0.3
+        info:
+          title: Tiny
+          version: 1.0.0
+        paths:
+          /ping:
+            get:
+              operationId: ping
+              responses:
+                '200':
+                  description: OK
+                  content:
+                    application/json:
+                      schema: { type: string }
+      `,
       'utf-8'
     );
 
@@ -125,31 +128,32 @@ paths:
     const api = join(workDir, 'swagger2.yaml');
     await writeFile(
       api,
-      `swagger: '2.0'
-info:
-  title: Tiny2
-  version: 1.0.0
-host: api.example.com
-basePath: /v1
-schemes: [https]
-consumes: [application/json]
-produces: [application/json]
-paths:
-  /items:
-    get:
-      operationId: listItems
-      parameters:
-        - { name: page, in: query, required: false, type: integer }
-      responses:
-        '200':
-          description: ok
-          schema: { $ref: '#/definitions/Item' }
-definitions:
-  Item:
-    type: object
-    properties:
-      id: { type: integer }
-`,
+      outdent`
+        swagger: '2.0'
+        info:
+          title: Tiny2
+          version: 1.0.0
+        host: api.example.com
+        basePath: /v1
+        schemes: [https]
+        consumes: [application/json]
+        produces: [application/json]
+        paths:
+          /items:
+            get:
+              operationId: listItems
+              parameters:
+                - { name: page, in: query, required: false, type: integer }
+              responses:
+                '200':
+                  description: ok
+                  schema: { $ref: '#/definitions/Item' }
+        definitions:
+          Item:
+            type: object
+            properties:
+              id: { type: integer }
+      `,
       'utf-8'
     );
 
diff --git a/packages/client-generator/src/__tests__/loader.test.ts b/packages/client-generator/src/__tests__/loader.test.ts
index a87d36291f..04520357e7 100644
--- a/packages/client-generator/src/__tests__/loader.test.ts
+++ b/packages/client-generator/src/__tests__/loader.test.ts
@@ -2,6 +2,7 @@ import { createConfig } from '@redocly/openapi-core';
 import { mkdtemp, rm, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
+import { outdent } from 'outdent';
 
 import { loadSpec } from '../loader.js';
 
@@ -25,12 +26,13 @@ describe('loadSpec', () => {
   it('loads a valid OpenAPI document and returns the parsed bundle', async () => {
     const file = await write(
       'minimal.yaml',
-      `openapi: 3.0.3
-info:
-  title: Minimal
-  version: 1.0.0
-paths: {}
-`
+      outdent`
+        openapi: 3.0.3
+        info:
+          title: Minimal
+          version: 1.0.0
+        paths: {}
+      `
     );
 
     const { document } = await loadSpec(file);
@@ -41,12 +43,13 @@ paths: {}
   it('uses a caller-supplied Config instead of building a fresh one', async () => {
     const file = await write(
       'with-config.yaml',
-      `openapi: 3.0.3
-info:
-  title: Minimal
-  version: 1.0.0
-paths: {}
-`
+      outdent`
+        openapi: 3.0.3
+        info:
+          title: Minimal
+          version: 1.0.0
+        paths: {}
+      `
     );
     const config = await createConfig({});
     const { document } = await loadSpec(file, config);
@@ -59,12 +62,13 @@ paths: {}
   it('detects the spec version (oas3_0)', async () => {
     const file = await write(
       'oas3_0.yaml',
-      `openapi: 3.0.3
-info:
-  title: Minimal
-  version: 1.0.0
-paths: {}
-`
+      outdent`
+        openapi: 3.0.3
+        info:
+          title: Minimal
+          version: 1.0.0
+        paths: {}
+      `
     );
     const result = await loadSpec(file);
     expect(result.version).toBe('oas3_0');
@@ -73,28 +77,30 @@ paths: {}
   it('returns the source files read — the entry plus external $ref targets', async () => {
     const pet = await write(
       'pet.yaml',
-      `type: object
-properties:
-  id: { type: integer }
-`
+      outdent`
+        type: object
+        properties:
+          id: { type: integer }
+      `
     );
     const entry = await write(
       'split.yaml',
-      `openapi: 3.0.3
-info:
-  title: Split
-  version: 1.0.0
-paths:
-  /pets:
-    get:
-      responses:
-        '200':
-          description: ok
-          content:
-            application/json:
-              schema:
-                $ref: './pet.yaml'
-`
+      outdent`
+        openapi: 3.0.3
+        info:
+          title: Split
+          version: 1.0.0
+        paths:
+          /pets:
+            get:
+              responses:
+                '200':
+                  description: ok
+                  content:
+                    application/json:
+                      schema:
+                        $ref: './pet.yaml'
+      `
     );
     const { fileDependencies } = await loadSpec(entry);
     expect(fileDependencies.has(entry)).toBe(true);
diff --git a/packages/client-generator/src/emitters/__tests__/setup-bake.test.ts b/packages/client-generator/src/emitters/__tests__/setup-bake.test.ts
index 41184b7f55..03196b6a3e 100644
--- a/packages/client-generator/src/emitters/__tests__/setup-bake.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/setup-bake.test.ts
@@ -1,11 +1,13 @@
+import { outdent } from 'outdent';
+
 import { bakeSetup } from '../setup-bake.js';
 
-const FILE = `
-import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
-export default defineClientSetup({
-  config: { serverUrl: 'https://api.acme.com', retry: { retries: 3 } },
-  middleware: [{ onRequest: (ctx: RequestContext) => { ctx.headers['X-Acme'] = '1'; } }],
-});
+const FILE = outdent`
+  import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
+  export default defineClientSetup({
+    config: { serverUrl: 'https://api.acme.com', retry: { retries: 3 } },
+    middleware: [{ onRequest: (ctx: RequestContext) => { ctx.headers['X-Acme'] = '1'; } }],
+  });
 `;
 
 describe('bakeSetup', () => {
@@ -36,11 +38,11 @@ describe('bakeSetup', () => {
   });
 
   it('wraps file-level helper declarations in an IIFE so they are preserved and scoped', () => {
-    const out = bakeSetup(
-      `import { defineClientSetup } from '@redocly/client-generator';
-const VERSION = '9.9';
-export default defineClientSetup({ config: { headers: { 'X-V': VERSION } } });`
-    );
+    const out = bakeSetup(outdent`
+      import { defineClientSetup } from '@redocly/client-generator';
+      const VERSION = '9.9';
+      export default defineClientSetup({ config: { headers: { 'X-V': VERSION } } });
+    `);
     expect(out.startsWith('(() => {')).toBe(true);
     expect(out).toContain("const VERSION = '9.9'");
     expect(out).toContain("'X-V': VERSION");
diff --git a/tests/e2e/generate-client/auth.test.ts b/tests/e2e/generate-client/auth.test.ts
index 78960d3380..49efd32253 100644
--- a/tests/e2e/generate-client/auth.test.ts
+++ b/tests/e2e/generate-client/auth.test.ts
@@ -3,6 +3,7 @@ import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'no
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { outdent } from 'outdent';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const repoRoot = resolve(__dirname, '../../..');
@@ -132,29 +133,30 @@ describe('generate-client auth breadth (auth.yaml)', () => {
     const driver = join(dir, 'driver.ts');
     writeFileSync(
       driver,
-      `import * as http from 'node:http';
-import { getBearer, getQuery, setServerUrl, setBearer, setApiKeyQueryKey } from './client.js';
-
-const captured: Array<{ url: string; auth?: string }> = [];
-const server = http.createServer((req, res) => {
-  captured.push({ url: req.url ?? '', auth: req.headers['authorization'] as string | undefined });
-  res.writeHead(200, { 'Content-Type': 'application/json' });
-  res.end(JSON.stringify({ id: 'x' }));
-});
-
-async function main() {
-  await new Promise<void>((r) => server.listen(0, '127.0.0.1', r));
-  const port = (server.address() as { port: number }).port;
-  setServerUrl('http://127.0.0.1:' + port);
-  setBearer(async () => 'tok');
-  await getBearer();
-  setApiKeyQueryKey('secret-key');
-  await getQuery({ limit: 5 });
-  await new Promise<void>((r) => server.close(() => r()));
-  process.stdout.write(JSON.stringify(captured));
-}
-main().then(() => process.exit(0)).catch((e) => { console.error(e); process.exit(1); });
-`,
+      outdent`
+        import * as http from 'node:http';
+        import { getBearer, getQuery, setServerUrl, setBearer, setApiKeyQueryKey } from './client.js';
+
+        const captured: Array<{ url: string; auth?: string }> = [];
+        const server = http.createServer((req, res) => {
+          captured.push({ url: req.url ?? '', auth: req.headers['authorization'] as string | undefined });
+          res.writeHead(200, { 'Content-Type': 'application/json' });
+          res.end(JSON.stringify({ id: 'x' }));
+        });
+
+        async function main() {
+          await new Promise<void>((r) => server.listen(0, '127.0.0.1', r));
+          const port = (server.address() as { port: number }).port;
+          setServerUrl('http://127.0.0.1:' + port);
+          setBearer(async () => 'tok');
+          await getBearer();
+          setApiKeyQueryKey('secret-key');
+          await getQuery({ limit: 5 });
+          await new Promise<void>((r) => server.close(() => r()));
+          process.stdout.write(JSON.stringify(captured));
+        }
+        main().then(() => process.exit(0)).catch((e) => { console.error(e); process.exit(1); });
+      `,
       'utf-8'
     );
     const run = spawnSync('npx', ['tsx', driver], { encoding: 'utf-8', cwd: repoRoot });
diff --git a/tests/e2e/generate-client/extension.test.ts b/tests/e2e/generate-client/extension.test.ts
index 11301001ce..222b27d361 100644
--- a/tests/e2e/generate-client/extension.test.ts
+++ b/tests/e2e/generate-client/extension.test.ts
@@ -9,6 +9,7 @@ import { existsSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { outdent } from 'outdent';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const repoRoot = resolve(__dirname, '../../..');
@@ -53,24 +54,24 @@ describe('extension contract — functions facade (configure)', () => {
   test('configure() applies serverUrl, config.headers, onRequest, and the fetch transport-swap', () => {
     const captured = runConsumer(
       dir,
+      outdent`
+        import { configure, listPets } from './client.ts';
+
+        const seen: { url?: string; headers?: Record<string, string> } = {};
+        configure({
+          serverUrl: 'https://configured.example',
+          headers: { 'X-Tenant': 'acme' },
+          onRequest: (ctx) => { ctx.headers['X-Trace'] = 'trace-123'; },
+          fetch: (async (url: string, init: RequestInit) => {
+            seen.url = String(url);
+            seen.headers = init.headers as Record<string, string>;
+            return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
+          }) as unknown as typeof fetch,
+        });
+
+        await listPets();
+        console.log(JSON.stringify(seen));
       `
-import { configure, listPets } from './client.ts';
-
-const seen: { url?: string; headers?: Record<string, string> } = {};
-configure({
-  serverUrl: 'https://configured.example',
-  headers: { 'X-Tenant': 'acme' },
-  onRequest: (ctx) => { ctx.headers['X-Trace'] = 'trace-123'; },
-  fetch: (async (url: string, init: RequestInit) => {
-    seen.url = String(url);
-    seen.headers = init.headers as Record<string, string>;
-    return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
-  }) as unknown as typeof fetch,
-});
-
-await listPets();
-console.log(JSON.stringify(seen));
-`
     ) as { url: string; headers: Record<string, string> };
 
     // serverUrl override was honored (not the spec's localhost:3102).
@@ -83,23 +84,23 @@ console.log(JSON.stringify(seen));
   test('onError maps a failed request to a custom error', () => {
     const result = runConsumer(
       dir,
+      outdent`
+        import { configure, getPetById, ApiError } from './client.ts';
+
+        class NotFound extends Error {}
+        configure({
+          fetch: (async () =>
+            new Response('{"detail":"nope"}', { status: 404, headers: { 'content-type': 'application/json' } })) as unknown as typeof fetch,
+          onError: (error: ApiError) => new NotFound('mapped:' + error.status),
+        });
+
+        try {
+          await getPetById(1);
+          console.log(JSON.stringify({ threw: false }));
+        } catch (e) {
+          console.log(JSON.stringify({ threw: true, name: (e as Error).constructor.name, message: (e as Error).message }));
+        }
       `
-import { configure, getPetById, ApiError } from './client.ts';
-
-class NotFound extends Error {}
-configure({
-  fetch: (async () =>
-    new Response('{"detail":"nope"}', { status: 404, headers: { 'content-type': 'application/json' } })) as unknown as typeof fetch,
-  onError: (error: ApiError) => new NotFound('mapped:' + error.status),
-});
-
-try {
-  await getPetById(1);
-  console.log(JSON.stringify({ threw: false }));
-} catch (e) {
-  console.log(JSON.stringify({ threw: true, name: (e as Error).constructor.name, message: (e as Error).message }));
-}
-`
     ) as { threw: boolean; name: string; message: string };
 
     expect(result.threw).toBe(true);
@@ -121,24 +122,24 @@ describe('extension contract — service-class facade (per-instance config)', ()
   test('two instances carry independent serverUrl + headers (multi-tenant isolation)', () => {
     const calls = runConsumer(
       dir,
+      outdent`
+        import { PetClient } from './client.ts';
+
+        const calls: Array<{ tag: string; url: string; tenant: string }> = [];
+        const make = (tag: string) =>
+          (async (url: string, init: RequestInit) => {
+            const headers = init.headers as Record<string, string>;
+            calls.push({ tag, url: String(url), tenant: headers['X-Tenant'] });
+            return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
+          }) as unknown as typeof fetch;
+
+        const a = new PetClient({ serverUrl: 'https://a.example', headers: { 'X-Tenant': 'A' }, fetch: make('a') });
+        const b = new PetClient({ serverUrl: 'https://b.example', headers: { 'X-Tenant': 'B' }, fetch: make('b') });
+
+        await a.listPets();
+        await b.listPets();
+        console.log(JSON.stringify(calls));
       `
-import { PetClient } from './client.ts';
-
-const calls: Array<{ tag: string; url: string; tenant: string }> = [];
-const make = (tag: string) =>
-  (async (url: string, init: RequestInit) => {
-    const headers = init.headers as Record<string, string>;
-    calls.push({ tag, url: String(url), tenant: headers['X-Tenant'] });
-    return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
-  }) as unknown as typeof fetch;
-
-const a = new PetClient({ serverUrl: 'https://a.example', headers: { 'X-Tenant': 'A' }, fetch: make('a') });
-const b = new PetClient({ serverUrl: 'https://b.example', headers: { 'X-Tenant': 'B' }, fetch: make('b') });
-
-await a.listPets();
-await b.listPets();
-console.log(JSON.stringify(calls));
-`
     ) as Array<{ tag: string; url: string; tenant: string }>;
 
     expect(calls).toHaveLength(2);
@@ -149,19 +150,19 @@ console.log(JSON.stringify(calls));
   test('an instance with no config falls back to the spec-derived BASE', () => {
     const seen = runConsumer(
       dir,
+      outdent`
+        import { PetClient } from './client.ts';
+
+        let captured = '';
+        const client = new PetClient({
+          fetch: (async (url: string) => {
+            captured = String(url);
+            return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
+          }) as unknown as typeof fetch,
+        });
+        await client.listPets();
+        console.log(JSON.stringify({ captured }));
       `
-import { PetClient } from './client.ts';
-
-let captured = '';
-const client = new PetClient({
-  fetch: (async (url: string) => {
-    captured = String(url);
-    return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
-  }) as unknown as typeof fetch,
-});
-await client.listPets();
-console.log(JSON.stringify({ captured }));
-`
     ) as { captured: string };
 
     // No serverUrl in config → falls back to the inlined BASE from base.yaml.
diff --git a/tests/e2e/generate-client/generator-contract.test.ts b/tests/e2e/generate-client/generator-contract.test.ts
index 2bc785bcd7..566af44b26 100644
--- a/tests/e2e/generate-client/generator-contract.test.ts
+++ b/tests/e2e/generate-client/generator-contract.test.ts
@@ -6,6 +6,7 @@ import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'no
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { outdent } from 'outdent';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const repoRoot = resolve(__dirname, '../../..');
@@ -119,22 +120,23 @@ describe('generate-client generator compatibility contract', () => {
     // Schema `GetUserVariables` collides with the `getUser` op's derived variables alias.
     writeFileSync(
       join(dir, 'api.yaml'),
-      `openapi: 3.1.0
-info: { title: C, version: '1.0.0' }
-paths:
-  /users/{id}:
-    get:
-      operationId: getUser
-      parameters: [{ name: id, in: path, required: true, schema: { type: string } }]
-      responses: { '200': { description: ok } }
-  /users:
-    get:
-      operationId: listUsers
-      responses: { '200': { description: ok } }
-components:
-  schemas:
-    GetUserVariables: { type: object, properties: { ready: { type: boolean } } }
-`,
+      outdent`
+        openapi: 3.1.0
+        info: { title: C, version: '1.0.0' }
+        paths:
+          /users/{id}:
+            get:
+              operationId: getUser
+              parameters: [{ name: id, in: path, required: true, schema: { type: string } }]
+              responses: { '200': { description: ok } }
+          /users:
+            get:
+              operationId: listUsers
+              responses: { '200': { description: ok } }
+        components:
+          schemas:
+            GetUserVariables: { type: object, properties: { ready: { type: boolean } } }
+      `,
       'utf-8'
     );
     const { status, out } = run([
diff --git a/tests/e2e/generate-client/identifier-injection.test.ts b/tests/e2e/generate-client/identifier-injection.test.ts
index a03980ded6..cdd627637c 100644
--- a/tests/e2e/generate-client/identifier-injection.test.ts
+++ b/tests/e2e/generate-client/identifier-injection.test.ts
@@ -9,46 +9,48 @@ import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { outdent } from 'outdent';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const repoRoot = resolve(__dirname, '../../..');
 const cli = join(repoRoot, 'packages/cli/lib/index.js');
 const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
 
-const HOSTILE_SPEC = `openapi: 3.1.0
-info:
-  title: "Evil */ ;globalThis.PWNED_TITLE=1; /*"
-  version: "1.0.0"
-  description: "desc */ ;globalThis.PWNED_DESC=1; /*"
-servers: [{ url: https://api.example.com }]
-paths:
-  /x:
-    get:
-      operationId: "foo(a){}; globalThis.PWNED_OPID=1; export async function bar"
-      security:
-        - "k(){}; globalThis.PWNED_KEY=1; export const z": []
-      responses:
-        '200':
-          description: "ok */ ;globalThis.PWNED_RESP=1; /*"
-          content:
-            application/json:
-              schema: { $ref: '#/components/schemas/Thing' }
-components:
-  securitySchemes:
-    "k(){}; globalThis.PWNED_KEY=1; export const z":
-      type: apiKey
-      in: header
-      name: X-Api-Key
-    other:
-      type: apiKey
-      in: header
-      name: X-Other
-  schemas:
-    Thing:
-      description: "schema */ ;globalThis.PWNED_SCHEMA=1; /*"
-      type: object
-      properties:
-        n: { type: integer }
+const HOSTILE_SPEC = outdent`
+  openapi: 3.1.0
+  info:
+    title: "Evil */ ;globalThis.PWNED_TITLE=1; /*"
+    version: "1.0.0"
+    description: "desc */ ;globalThis.PWNED_DESC=1; /*"
+  servers: [{ url: https://api.example.com }]
+  paths:
+    /x:
+      get:
+        operationId: "foo(a){}; globalThis.PWNED_OPID=1; export async function bar"
+        security:
+          - "k(){}; globalThis.PWNED_KEY=1; export const z": []
+        responses:
+          '200':
+            description: "ok */ ;globalThis.PWNED_RESP=1; /*"
+            content:
+              application/json:
+                schema: { $ref: '#/components/schemas/Thing' }
+  components:
+    securitySchemes:
+      "k(){}; globalThis.PWNED_KEY=1; export const z":
+        type: apiKey
+        in: header
+        name: X-Api-Key
+      other:
+        type: apiKey
+        in: header
+        name: X-Other
+    schemas:
+      Thing:
+        description: "schema */ ;globalThis.PWNED_SCHEMA=1; /*"
+        type: object
+        properties:
+          n: { type: integer }
 `;
 
 describe('generate-client identifier / comment injection', () => {
diff --git a/tests/e2e/generate-client/middleware.test.ts b/tests/e2e/generate-client/middleware.test.ts
index 655df92ffa..46624dd178 100644
--- a/tests/e2e/generate-client/middleware.test.ts
+++ b/tests/e2e/generate-client/middleware.test.ts
@@ -9,6 +9,7 @@ import { existsSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { outdent } from 'outdent';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const repoRoot = resolve(__dirname, '../../..');
@@ -57,24 +58,24 @@ describe('middleware — functions facade (use)', () => {
   test('use() registers middleware: onRequest runs in order, onResponse in reverse (onion)', () => {
     const captured = runConsumer(
       dir,
+      outdent`
+        import { configure, use, listPets } from './client.ts';
+
+        const order: string[] = [];
+        let headers: Record<string, string> = {};
+        configure({
+          fetch: (async (_url: string, init: RequestInit) => {
+            headers = init.headers as Record<string, string>;
+            return ${OK};
+          }) as unknown as typeof fetch,
+        });
+        use(
+          { onRequest: (ctx) => { order.push('req-A'); ctx.headers['X-A'] = '1'; }, onResponse: () => { order.push('res-A'); } },
+          { onRequest: (ctx) => { order.push('req-B'); ctx.headers['X-B'] = '1'; }, onResponse: () => { order.push('res-B'); } },
+        );
+        await listPets();
+        console.log(JSON.stringify({ order, hasA: 'X-A' in headers, hasB: 'X-B' in headers }));
       `
-import { configure, use, listPets } from './client.ts';
-
-const order: string[] = [];
-let headers: Record<string, string> = {};
-configure({
-  fetch: (async (_url: string, init: RequestInit) => {
-    headers = init.headers as Record<string, string>;
-    return ${OK};
-  }) as unknown as typeof fetch,
-});
-use(
-  { onRequest: (ctx) => { order.push('req-A'); ctx.headers['X-A'] = '1'; }, onResponse: () => { order.push('res-A'); } },
-  { onRequest: (ctx) => { order.push('req-B'); ctx.headers['X-B'] = '1'; }, onResponse: () => { order.push('res-B'); } },
-);
-await listPets();
-console.log(JSON.stringify({ order, hasA: 'X-A' in headers, hasB: 'X-B' in headers }));
-`
     ) as { order: string[]; hasA: boolean; hasB: boolean };
 
     expect(captured.order).toEqual(['req-A', 'req-B', 'res-B', 'res-A']);
@@ -85,23 +86,23 @@ console.log(JSON.stringify({ order, hasA: 'X-A' in headers, hasB: 'X-B' in heade
   test('onError threads through each middleware in turn', () => {
     const result = runConsumer(
       dir,
+      outdent`
+        import { configure, use, getPetById, type ApiError } from './client.ts';
+
+        configure({
+          fetch: (async () => new Response('{}', { status: 500, headers: { 'content-type': 'application/json' } })) as unknown as typeof fetch,
+        });
+        use(
+          { onError: (e: ApiError) => new Error('first:' + e.status) },
+          { onError: (e) => new Error('second:' + e.message) },
+        );
+        try {
+          await getPetById(1);
+          console.log(JSON.stringify({ threw: false }));
+        } catch (e) {
+          console.log(JSON.stringify({ threw: true, message: (e as Error).message }));
+        }
       `
-import { configure, use, getPetById, type ApiError } from './client.ts';
-
-configure({
-  fetch: (async () => new Response('{}', { status: 500, headers: { 'content-type': 'application/json' } })) as unknown as typeof fetch,
-});
-use(
-  { onError: (e: ApiError) => new Error('first:' + e.status) },
-  { onError: (e) => new Error('second:' + e.message) },
-);
-try {
-  await getPetById(1);
-  console.log(JSON.stringify({ threw: false }));
-} catch (e) {
-  console.log(JSON.stringify({ threw: true, message: (e as Error).message }));
-}
-`
     ) as { threw: boolean; message: string };
 
     expect(result.threw).toBe(true);
@@ -111,15 +112,15 @@ try {
   test('use() does not mutate a caller-provided middleware array (no cross-client leak)', () => {
     const result = runConsumer(
       dir,
+      outdent`
+        import { configure, use, listPets, type Middleware } from './client.ts';
+
+        const mine: Middleware[] = [];
+        configure({ middleware: mine, fetch: (async () => ${OK}) as unknown as typeof fetch });
+        use({ onRequest: () => {} });
+        await listPets();
+        console.log(JSON.stringify({ mineLength: mine.length }));
       `
-import { configure, use, listPets, type Middleware } from './client.ts';
-
-const mine: Middleware[] = [];
-configure({ middleware: mine, fetch: (async () => ${OK}) as unknown as typeof fetch });
-use({ onRequest: () => {} });
-await listPets();
-console.log(JSON.stringify({ mineLength: mine.length }));
-`
     ) as { mineLength: number };
 
     // use() must append to a fresh array, not push into the array the caller passed.
@@ -129,18 +130,18 @@ console.log(JSON.stringify({ mineLength: mine.length }));
   test('the single config.onRequest hook still runs (as an implicit first middleware)', () => {
     const captured = runConsumer(
       dir,
+      outdent`
+        import { configure, use, listPets } from './client.ts';
+
+        const order: string[] = [];
+        configure({
+          onRequest: () => { order.push('config'); },
+          fetch: (async () => ${OK}) as unknown as typeof fetch,
+        });
+        use({ onRequest: () => { order.push('mw'); } });
+        await listPets();
+        console.log(JSON.stringify({ order }));
       `
-import { configure, use, listPets } from './client.ts';
-
-const order: string[] = [];
-configure({
-  onRequest: () => { order.push('config'); },
-  fetch: (async () => ${OK}) as unknown as typeof fetch,
-});
-use({ onRequest: () => { order.push('mw'); } });
-await listPets();
-console.log(JSON.stringify({ order }));
-`
     ) as { order: string[] };
 
     expect(captured.order).toEqual(['config', 'mw']);
@@ -149,15 +150,15 @@ console.log(JSON.stringify({ order }));
   test('onRequest sees ctx.operation { id, path, tags }', () => {
     const captured = runConsumer(
       dir,
+      outdent`
+        import { configure, use, createPet } from './client.ts';
+
+        let op: unknown;
+        configure({ fetch: (async () => ${OK}) as unknown as typeof fetch });
+        use({ onRequest: (ctx) => { op = ctx.operation; } });
+        await createPet({ name: 'Rex' });
+        console.log(JSON.stringify({ op }));
       `
-import { configure, use, createPet } from './client.ts';
-
-let op: unknown;
-configure({ fetch: (async () => ${OK}) as unknown as typeof fetch });
-use({ onRequest: (ctx) => { op = ctx.operation; } });
-await createPet({ name: 'Rex' });
-console.log(JSON.stringify({ op }));
-`
     ) as { op: { id: string; path: string; tags: string[] } };
 
     expect(captured.op.id).toBe('createPet');
@@ -168,17 +169,17 @@ console.log(JSON.stringify({ op }));
   test('onRequest can mutate ctx.body and the change is sent', () => {
     const captured = runConsumer(
       dir,
+      outdent`
+        import { configure, use, createPet } from './client.ts';
+
+        let sent = '';
+        configure({
+          fetch: (async (_url: string, init: RequestInit) => { sent = init.body as string; return ${OK}; }) as unknown as typeof fetch,
+        });
+        use({ onRequest: (ctx) => { (ctx.body as { name: string }).name = 'Mutated'; } });
+        await createPet({ name: 'Rex' });
+        console.log(JSON.stringify({ sent }));
       `
-import { configure, use, createPet } from './client.ts';
-
-let sent = '';
-configure({
-  fetch: (async (_url: string, init: RequestInit) => { sent = init.body as string; return ${OK}; }) as unknown as typeof fetch,
-});
-use({ onRequest: (ctx) => { (ctx.body as { name: string }).name = 'Mutated'; } });
-await createPet({ name: 'Rex' });
-console.log(JSON.stringify({ sent }));
-`
     ) as { sent: string };
 
     expect(JSON.parse(captured.sent)).toEqual({ name: 'Mutated' });
@@ -198,14 +199,14 @@ describe('middleware — multi-file output (split)', () => {
   test('configure() and use() are re-exported by the entry barrel and affect operations', () => {
     const captured = runConsumer(
       dir,
+      outdent`
+        import { configure, use, listPets } from './client.ts';
+        let url = '', header = '';
+        configure({ serverUrl: 'https://multi.example.com', fetch: (async (u: string, init: RequestInit) => { url = u; header = (init.headers as Record<string,string>)['X-MW']; return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } }); }) as unknown as typeof fetch });
+        use({ onRequest: (ctx) => { ctx.headers['X-MW'] = 'yes'; } });
+        await listPets();
+        console.log(JSON.stringify({ url, header }));
       `
-import { configure, use, listPets } from './client.ts';
-let url = '', header = '';
-configure({ serverUrl: 'https://multi.example.com', fetch: (async (u: string, init: RequestInit) => { url = u; header = (init.headers as Record<string,string>)['X-MW']; return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } }); }) as unknown as typeof fetch });
-use({ onRequest: (ctx) => { ctx.headers['X-MW'] = 'yes'; } });
-await listPets();
-console.log(JSON.stringify({ url, header }));
-`
     ) as { url: string; header: string };
     expect(new URL(captured.url).origin).toBe('https://multi.example.com');
     expect(captured.header).toBe('yes');
@@ -225,21 +226,21 @@ describe('middleware — result error mode', () => {
   test('onRequest/onResponse run; onError does not fire (the error is returned, not thrown)', () => {
     const result = runConsumer(
       dir,
+      outdent`
+        import { configure, use, getPetById } from './client.ts';
+
+        const ran: string[] = [];
+        configure({
+          fetch: (async () => new Response('{"bad":true}', { status: 500, headers: { 'content-type': 'application/json' } })) as unknown as typeof fetch,
+        });
+        use({
+          onRequest: () => { ran.push('req'); },
+          onResponse: () => { ran.push('res'); },
+          onError: () => { ran.push('err'); return new Error('should-not-run'); },
+        });
+        const r = await getPetById(1) as { error: unknown; data: unknown };
+        console.log(JSON.stringify({ ran, hasError: r.error !== undefined, hasData: r.data !== undefined }));
       `
-import { configure, use, getPetById } from './client.ts';
-
-const ran: string[] = [];
-configure({
-  fetch: (async () => new Response('{"bad":true}', { status: 500, headers: { 'content-type': 'application/json' } })) as unknown as typeof fetch,
-});
-use({
-  onRequest: () => { ran.push('req'); },
-  onResponse: () => { ran.push('res'); },
-  onError: () => { ran.push('err'); return new Error('should-not-run'); },
-});
-const r = await getPetById(1) as { error: unknown; data: unknown };
-console.log(JSON.stringify({ ran, hasError: r.error !== undefined, hasData: r.data !== undefined }));
-`
     ) as { ran: string[]; hasError: boolean; hasData: boolean };
 
     // onRequest + onResponse ran; onError did NOT (result mode returns the error).
@@ -262,18 +263,18 @@ describe('middleware — service-class facade (use + constructor)', () => {
   test('constructor middleware runs before instance .use() middleware', () => {
     const captured = runConsumer(
       dir,
+      outdent`
+        import { PetClient } from './client.ts';
+
+        const order: string[] = [];
+        const client = new PetClient({
+          fetch: (async () => ${OK}) as unknown as typeof fetch,
+          middleware: [{ onRequest: () => { order.push('ctor'); } }],
+        });
+        client.use({ onRequest: () => { order.push('use'); } });
+        await client.listPets();
+        console.log(JSON.stringify({ order }));
       `
-import { PetClient } from './client.ts';
-
-const order: string[] = [];
-const client = new PetClient({
-  fetch: (async () => ${OK}) as unknown as typeof fetch,
-  middleware: [{ onRequest: () => { order.push('ctor'); } }],
-});
-client.use({ onRequest: () => { order.push('use'); } });
-await client.listPets();
-console.log(JSON.stringify({ order }));
-`
     ) as { order: string[] };
 
     expect(captured.order).toEqual(['ctor', 'use']);
diff --git a/tests/e2e/generate-client/mock.test.ts b/tests/e2e/generate-client/mock.test.ts
index 916b047091..e111aa9d30 100644
--- a/tests/e2e/generate-client/mock.test.ts
+++ b/tests/e2e/generate-client/mock.test.ts
@@ -10,6 +10,7 @@ import { spawnSync } from 'node:child_process';
 import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { outdent } from 'outdent';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const repoRoot = resolve(__dirname, '../../..');
@@ -68,21 +69,21 @@ describe('mock generator — generated client through MSW', () => {
   test('handlers installed in setupServer intercept the generated fetch and return baked data', () => {
     const result = runConsumer(
       dir,
+      outdent`
+        import { setupServer } from 'msw/node';
+        import { handlers } from './client.mocks.ts';
+        import { configure, getPetById } from './client.ts';
+
+        const server = setupServer(...handlers);
+        server.listen({ onUnhandledRequest: 'error' });
+        configure({ serverUrl: 'https://api.example.com' });
+        try {
+          const pet = await getPetById(1);
+          process.stdout.write(JSON.stringify({ ok: pet !== undefined, id: pet.id, name: pet.name }));
+        } finally {
+          server.close();
+        }
       `
-import { setupServer } from 'msw/node';
-import { handlers } from './client.mocks.ts';
-import { configure, getPetById } from './client.ts';
-
-const server = setupServer(...handlers);
-server.listen({ onUnhandledRequest: 'error' });
-configure({ serverUrl: 'https://api.example.com' });
-try {
-  const pet = await getPetById(1);
-  process.stdout.write(JSON.stringify({ ok: pet !== undefined, id: pet.id, name: pet.name }));
-} finally {
-  server.close();
-}
-`
     ) as { ok: boolean; id: number; name: string };
 
     // Deterministic sampler output for the Pet schema in base.yaml.
diff --git a/tests/e2e/generate-client/multipart.test.ts b/tests/e2e/generate-client/multipart.test.ts
index 914bdf72a3..094e602027 100644
--- a/tests/e2e/generate-client/multipart.test.ts
+++ b/tests/e2e/generate-client/multipart.test.ts
@@ -8,6 +8,7 @@ import { existsSync, mkdtempSync, readdirSync, rmSync, statSync, writeFileSync }
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { outdent } from 'outdent';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const repoRoot = resolve(__dirname, '../../..');
@@ -22,25 +23,26 @@ function collectTsFiles(d: string): string[] {
   });
 }
 
-const SPEC = `openapi: 3.1.0
-info: { title: M, version: 1.0.0 }
-paths:
-  /upload:
-    post:
-      operationId: upload
-      requestBody:
-        required: true
-        content:
-          multipart/form-data:
-            schema:
-              type: object
-              required: [file, orgId]
-              properties:
-                file: { type: string, format: binary }
-                orgId: { type: string }
-                tags: { type: array, items: { type: string } }
-                meta: { type: object }
-      responses: { '200': { description: ok } }
+const SPEC = outdent`
+  openapi: 3.1.0
+  info: { title: M, version: 1.0.0 }
+  paths:
+    /upload:
+      post:
+        operationId: upload
+        requestBody:
+          required: true
+          content:
+            multipart/form-data:
+              schema:
+                type: object
+                required: [file, orgId]
+                properties:
+                  file: { type: string, format: binary }
+                  orgId: { type: string }
+                  tags: { type: array, items: { type: string } }
+                  meta: { type: object }
+        responses: { '200': { description: ok } }
 `;
 
 describe('generate-client typed multipart body (#5)', () => {
@@ -66,29 +68,29 @@ describe('generate-client typed multipart body (#5)', () => {
 
     writeFileSync(
       join(dir, 'consumer.ts'),
-      `
-import { configure, upload } from './client.ts';
-
-let body: unknown;
-configure({
-  fetch: (async (_url: string, init: RequestInit) => {
-    body = init.body;
-    return new Response('', { status: 200 });
-  }) as unknown as typeof fetch,
-});
-
-const file = new Blob(['hello'], { type: 'text/plain' });
-await upload({ file, orgId: 'org_1', tags: ['a', 'b'], meta: { k: 'v' } });
-
-const fd = body as FormData;
-console.log(JSON.stringify({
-  isFormData: fd instanceof FormData,
-  orgId: fd.get('orgId'),
-  fileIsBlob: fd.get('file') instanceof Blob,
-  tags: fd.getAll('tags'),
-  meta: fd.get('meta'),
-}));
-`,
+      outdent`
+        import { configure, upload } from './client.ts';
+
+        let body: unknown;
+        configure({
+          fetch: (async (_url: string, init: RequestInit) => {
+            body = init.body;
+            return new Response('', { status: 200 });
+          }) as unknown as typeof fetch,
+        });
+
+        const file = new Blob(['hello'], { type: 'text/plain' });
+        await upload({ file, orgId: 'org_1', tags: ['a', 'b'], meta: { k: 'v' } });
+
+        const fd = body as FormData;
+        console.log(JSON.stringify({
+          isFormData: fd instanceof FormData,
+          orgId: fd.get('orgId'),
+          fileIsBlob: fd.get('file') instanceof Blob,
+          tags: fd.getAll('tags'),
+          meta: fd.get('meta'),
+        }));
+      `,
       'utf-8'
     );
     const run = spawnSync(tsxBin, [join(dir, 'consumer.ts')], { encoding: 'utf-8', cwd: repoRoot });
@@ -119,26 +121,26 @@ console.log(JSON.stringify({
 
     writeFileSync(
       join(dir, 'consumer.ts'),
-      `
-import { configure, use, upload } from './client.ts';
-
-let body: unknown;
-configure({
-  fetch: (async (_url: string, init: RequestInit) => {
-    body = init.body;
-    return new Response('', { status: 200 });
-  }) as unknown as typeof fetch,
-});
-// A multipart op must expose the plain body object to onRequest (not pre-built FormData);
-// mutating it has to be reflected in the FormData that __send serializes afterwards.
-use({ onRequest: (ctx) => { (ctx.body as { orgId: string }).orgId = 'mutated'; } });
-
-const file = new Blob(['hi'], { type: 'text/plain' });
-await upload({ file, orgId: 'org_1' });
-
-const fd = body as FormData;
-console.log(JSON.stringify({ isFormData: fd instanceof FormData, orgId: fd.get('orgId') }));
-`,
+      outdent`
+        import { configure, use, upload } from './client.ts';
+
+        let body: unknown;
+        configure({
+          fetch: (async (_url: string, init: RequestInit) => {
+            body = init.body;
+            return new Response('', { status: 200 });
+          }) as unknown as typeof fetch,
+        });
+        // A multipart op must expose the plain body object to onRequest (not pre-built FormData);
+        // mutating it has to be reflected in the FormData that __send serializes afterwards.
+        use({ onRequest: (ctx) => { (ctx.body as { orgId: string }).orgId = 'mutated'; } });
+
+        const file = new Blob(['hi'], { type: 'text/plain' });
+        await upload({ file, orgId: 'org_1' });
+
+        const fd = body as FormData;
+        console.log(JSON.stringify({ isFormData: fd instanceof FormData, orgId: fd.get('orgId') }));
+      `,
       'utf-8'
     );
     const run = spawnSync(tsxBin, [join(dir, 'consumer.ts')], { encoding: 'utf-8', cwd: repoRoot });
diff --git a/tests/e2e/generate-client/operation-types.test.ts b/tests/e2e/generate-client/operation-types.test.ts
index eed5dfa343..b2d6c7efab 100644
--- a/tests/e2e/generate-client/operation-types.test.ts
+++ b/tests/e2e/generate-client/operation-types.test.ts
@@ -8,6 +8,7 @@ import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { outdent } from 'outdent';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const repoRoot = resolve(__dirname, '../../..');
@@ -64,10 +65,10 @@ describe('typed ctx.operation rejects typos at compile time', () => {
     expect(
       typechecks(
         dir,
+        outdent`
+          import { use, type RequestContext } from './client.ts';
+          use({ onRequest: (ctx: RequestContext) => { if (ctx.operation.id === 'listPets' || ctx.operation.path === '/pets') {} } });
         `
-import { use, type RequestContext } from './client.ts';
-use({ onRequest: (ctx: RequestContext) => { if (ctx.operation.id === 'listPets' || ctx.operation.path === '/pets') {} } });
-`
       )
     ).toBe(true);
   }, 60_000);
@@ -76,10 +77,10 @@ use({ onRequest: (ctx: RequestContext) => { if (ctx.operation.id === 'listPets'
     expect(
       typechecks(
         dir,
+        outdent`
+          import { use, type RequestContext } from './client.ts';
+          use({ onRequest: (ctx: RequestContext) => { if (ctx.operation.id === 'listPetss') {} } });
         `
-import { use, type RequestContext } from './client.ts';
-use({ onRequest: (ctx: RequestContext) => { if (ctx.operation.id === 'listPetss') {} } });
-`
       )
     ).toBe(false);
   }, 60_000);
diff --git a/tests/e2e/generate-client/path-param-idents.test.ts b/tests/e2e/generate-client/path-param-idents.test.ts
index d87f5ab8da..1be68cfd71 100644
--- a/tests/e2e/generate-client/path-param-idents.test.ts
+++ b/tests/e2e/generate-client/path-param-idents.test.ts
@@ -15,6 +15,7 @@ import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'no
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { outdent } from 'outdent';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const repoRoot = resolve(__dirname, '../../..');
@@ -22,51 +23,52 @@ const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
 const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
 const tsxBin = join(repoRoot, 'node_modules/.bin/tsx');
 
-const SPEC = `openapi: 3.0.3
-info:
-  title: Odd Names API
-  version: 1.0.0
-servers:
-  - url: https://api.example.com
-paths:
-  /widgets/{widget-id}:
-    get:
-      operationId: getWidget
-      parameters:
-        - name: widget-id
-          in: path
-          required: true
-          schema:
-            type: string
-      responses:
-        '200':
-          description: ok
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  id:
-                    type: string
-  /items/{new}:
-    get:
-      operationId: getItem
-      parameters:
-        - name: new
-          in: path
-          required: true
-          schema:
-            type: string
-      responses:
-        '200':
-          description: ok
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  id:
-                    type: string
+const SPEC = outdent`
+  openapi: 3.0.3
+  info:
+    title: Odd Names API
+    version: 1.0.0
+  servers:
+    - url: https://api.example.com
+  paths:
+    /widgets/{widget-id}:
+      get:
+        operationId: getWidget
+        parameters:
+          - name: widget-id
+            in: path
+            required: true
+            schema:
+              type: string
+        responses:
+          '200':
+            description: ok
+            content:
+              application/json:
+                schema:
+                  type: object
+                  properties:
+                    id:
+                      type: string
+    /items/{new}:
+      get:
+        operationId: getItem
+        parameters:
+          - name: new
+            in: path
+            required: true
+            schema:
+              type: string
+        responses:
+          '200':
+            description: ok
+            content:
+              application/json:
+                schema:
+                  type: object
+                  properties:
+                    id:
+                      type: string
 `;
 
 const TSCONFIG = JSON.stringify({
@@ -123,21 +125,21 @@ describe('non-identifier path parameters', () => {
   }, 60_000);
 
   test('builds the request URL from the argument value', () => {
-    const consumer = `
-import { configure, getWidget, getItem } from './client.ts';
+    const consumer = outdent`
+      import { configure, getWidget, getItem } from './client.ts';
 
-const urls: string[] = [];
-configure({
-  fetch: (async (url: string) => {
-    urls.push(url);
-    return new Response('{"id":"x"}', { status: 200, headers: { 'content-type': 'application/json' } });
-  }) as unknown as typeof fetch,
-});
+      const urls: string[] = [];
+      configure({
+        fetch: (async (url: string) => {
+          urls.push(url);
+          return new Response('{"id":"x"}', { status: 200, headers: { 'content-type': 'application/json' } });
+        }) as unknown as typeof fetch,
+      });
 
-await getWidget('abc');
-await getItem('xyz');
-console.log(JSON.stringify(urls));
-`;
+      await getWidget('abc');
+      await getItem('xyz');
+      console.log(JSON.stringify(urls));
+    `;
     writeFileSync(join(dir, 'consumer.ts'), consumer, 'utf-8');
     const result = spawnSync(tsxBin, [join(dir, 'consumer.ts')], {
       encoding: 'utf-8',
diff --git a/tests/e2e/generate-client/per-instance-auth.test.ts b/tests/e2e/generate-client/per-instance-auth.test.ts
index 61a46fd92a..707a6228c9 100644
--- a/tests/e2e/generate-client/per-instance-auth.test.ts
+++ b/tests/e2e/generate-client/per-instance-auth.test.ts
@@ -8,44 +8,47 @@ import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { outdent } from 'outdent';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const repoRoot = resolve(__dirname, '../../..');
 const cli = join(repoRoot, 'packages/cli/lib/index.js');
 const tsx = join(repoRoot, 'node_modules/.bin/tsx');
 
-const SPEC = `openapi: 3.1.0
-info: { title: Thing API, version: '1.0.0' }
-servers: [{ url: https://api.example.com }]
-components:
-  securitySchemes:
-    basicAuth: { type: http, scheme: basic }
-paths:
-  /thing:
-    get:
-      operationId: getThing
-      security: [{ basicAuth: [] }]
-      responses:
-        '200': { description: ok, content: { application/json: { schema: { type: object } } } }
+const SPEC = outdent`
+  openapi: 3.1.0
+  info: { title: Thing API, version: '1.0.0' }
+  servers: [{ url: https://api.example.com }]
+  components:
+    securitySchemes:
+      basicAuth: { type: http, scheme: basic }
+  paths:
+    /thing:
+      get:
+        operationId: getThing
+        security: [{ basicAuth: [] }]
+        responses:
+          '200': { description: ok, content: { application/json: { schema: { type: object } } } }
 `;
 
-const DRIVER = `import { Client } from './client.js';
+const DRIVER = outdent`
+  import { Client } from './client.js';
 
-const calls: (string | null)[] = [];
-const fakeFetch = (async (_url: string, init?: RequestInit) => {
-  const h = (init?.headers ?? {}) as Record<string, string>;
-  calls.push(h['Authorization'] ?? null);
-  return new Response('{}', { status: 200, headers: { 'content-type': 'application/json' } });
-}) as unknown as typeof fetch;
+  const calls: (string | null)[] = [];
+  const fakeFetch = (async (_url: string, init?: RequestInit) => {
+    const h = (init?.headers ?? {}) as Record<string, string>;
+    calls.push(h['Authorization'] ?? null);
+    return new Response('{}', { status: 200, headers: { 'content-type': 'application/json' } });
+  }) as unknown as typeof fetch;
 
-async function main() {
-  const authed = new Client({ fetch: fakeFetch, auth: { basic: { username: 'alice', password: 'pw' } } });
-  const anon = new Client({ fetch: fakeFetch });
-  await authed.getThing();
-  await anon.getThing();
-  console.log(JSON.stringify(calls));
-}
-void main();
+  async function main() {
+    const authed = new Client({ fetch: fakeFetch, auth: { basic: { username: 'alice', password: 'pw' } } });
+    const anon = new Client({ fetch: fakeFetch });
+    await authed.getThing();
+    await anon.getThing();
+    console.log(JSON.stringify(calls));
+  }
+  void main();
 `;
 
 describe('per-instance auth (service-class config.auth)', () => {
diff --git a/tests/e2e/generate-client/retry.test.ts b/tests/e2e/generate-client/retry.test.ts
index b5ddcbd0d3..04c63cea4d 100644
--- a/tests/e2e/generate-client/retry.test.ts
+++ b/tests/e2e/generate-client/retry.test.ts
@@ -7,6 +7,7 @@ import { existsSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { outdent } from 'outdent';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const repoRoot = resolve(__dirname, '../../..');
@@ -49,34 +50,34 @@ describe('retry behavior', () => {
   test('retries a GET on 503 then succeeds; default is no retry', () => {
     const result = runConsumer(
       dir,
+      outdent`
+        import { configure, listPets } from './client.ts';
+
+        let calls = 0;
+        const makeFetch = (failures: number) =>
+          (async () => {
+            calls++;
+            if (calls <= failures) {
+              return new Response('busy', { status: 503, headers: { 'content-type': 'text/plain' } });
+            }
+            return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
+          }) as unknown as typeof fetch;
+
+        // retries: 0 (default) → one call, throws.
+        calls = 0;
+        configure({ fetch: makeFetch(1) });
+        let defaultThrew = false;
+        try { await listPets(); } catch { defaultThrew = true; }
+        const defaultCalls = calls;
+
+        // retries: 3, fast backoff → recovers after 2 failures.
+        calls = 0;
+        configure({ fetch: makeFetch(2), retry: { retries: 3, retryDelay: 1 } });
+        await listPets();
+        const retryCalls = calls;
+
+        console.log(JSON.stringify({ defaultThrew, defaultCalls, retryCalls }));
       `
-import { configure, listPets } from './client.ts';
-
-let calls = 0;
-const makeFetch = (failures: number) =>
-  (async () => {
-    calls++;
-    if (calls <= failures) {
-      return new Response('busy', { status: 503, headers: { 'content-type': 'text/plain' } });
-    }
-    return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
-  }) as unknown as typeof fetch;
-
-// retries: 0 (default) → one call, throws.
-calls = 0;
-configure({ fetch: makeFetch(1) });
-let defaultThrew = false;
-try { await listPets(); } catch { defaultThrew = true; }
-const defaultCalls = calls;
-
-// retries: 3, fast backoff → recovers after 2 failures.
-calls = 0;
-configure({ fetch: makeFetch(2), retry: { retries: 3, retryDelay: 1 } });
-await listPets();
-const retryCalls = calls;
-
-console.log(JSON.stringify({ defaultThrew, defaultCalls, retryCalls }));
-`
     ) as { defaultThrew: boolean; defaultCalls: number; retryCalls: number };
 
     expect(result.defaultThrew).toBe(true);
@@ -87,30 +88,30 @@ console.log(JSON.stringify({ defaultThrew, defaultCalls, retryCalls }));
   test('drains the unread body of a retried response before the next attempt', () => {
     const result = runConsumer(
       dir,
+      outdent`
+        import { configure, listPets } from './client.ts';
+
+        let calls = 0;
+        let cancelled = 0;
+        // A 503 whose body cancellation is observable, then a 200 success.
+        const makeFetch = () =>
+          (async () => {
+            calls++;
+            if (calls === 1) {
+              const body = new ReadableStream({
+                start(c) { c.enqueue(new TextEncoder().encode('busy')); c.close(); },
+                cancel() { cancelled++; },
+              });
+              return new Response(body, { status: 503, headers: { 'content-type': 'text/plain' } });
+            }
+            return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
+          }) as unknown as typeof fetch;
+
+        configure({ fetch: makeFetch(), retry: { retries: 3, retryDelay: 1 } });
+        await listPets();
+
+        console.log(JSON.stringify({ calls, cancelled }));
       `
-import { configure, listPets } from './client.ts';
-
-let calls = 0;
-let cancelled = 0;
-// A 503 whose body cancellation is observable, then a 200 success.
-const makeFetch = () =>
-  (async () => {
-    calls++;
-    if (calls === 1) {
-      const body = new ReadableStream({
-        start(c) { c.enqueue(new TextEncoder().encode('busy')); c.close(); },
-        cancel() { cancelled++; },
-      });
-      return new Response(body, { status: 503, headers: { 'content-type': 'text/plain' } });
-    }
-    return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
-  }) as unknown as typeof fetch;
-
-configure({ fetch: makeFetch(), retry: { retries: 3, retryDelay: 1 } });
-await listPets();
-
-console.log(JSON.stringify({ calls, cancelled }));
-`
     ) as { calls: number; cancelled: number };
 
     expect(result.calls).toBe(2); // 1 failure + 1 success
@@ -120,29 +121,29 @@ console.log(JSON.stringify({ calls, cancelled }));
   test('does NOT retry a non-idempotent POST by default, but does when retryOn opts in', () => {
     const result = runConsumer(
       dir,
+      outdent`
+        import { configure, createPet } from './client.ts';
+
+        let calls = 0;
+        const failing = (async () => {
+          calls++;
+          return new Response('err', { status: 503, headers: { 'content-type': 'text/plain' } });
+        }) as unknown as typeof fetch;
+
+        // default predicate: POST is not idempotent → no retry.
+        calls = 0;
+        configure({ fetch: failing, retry: { retries: 3, retryDelay: 1 } });
+        try { await createPet({ name: 'x' } as any); } catch {}
+        const defaultCalls = calls;
+
+        // retryOn: () => true → POST retried.
+        calls = 0;
+        configure({ fetch: failing, retry: { retries: 3, retryDelay: 1, retryOn: () => true } });
+        try { await createPet({ name: 'x' } as any); } catch {}
+        const optInCalls = calls;
+
+        console.log(JSON.stringify({ defaultCalls, optInCalls }));
       `
-import { configure, createPet } from './client.ts';
-
-let calls = 0;
-const failing = (async () => {
-  calls++;
-  return new Response('err', { status: 503, headers: { 'content-type': 'text/plain' } });
-}) as unknown as typeof fetch;
-
-// default predicate: POST is not idempotent → no retry.
-calls = 0;
-configure({ fetch: failing, retry: { retries: 3, retryDelay: 1 } });
-try { await createPet({ name: 'x' } as any); } catch {}
-const defaultCalls = calls;
-
-// retryOn: () => true → POST retried.
-calls = 0;
-configure({ fetch: failing, retry: { retries: 3, retryDelay: 1, retryOn: () => true } });
-try { await createPet({ name: 'x' } as any); } catch {}
-const optInCalls = calls;
-
-console.log(JSON.stringify({ defaultCalls, optInCalls }));
-`
     ) as { defaultCalls: number; optInCalls: number };
 
     expect(result.defaultCalls).toBe(1); // POST not retried by default
@@ -152,28 +153,28 @@ console.log(JSON.stringify({ defaultCalls, optInCalls }));
   test('aborting during backoff stops retries and rejects', () => {
     const result = runConsumer(
       dir,
+      outdent`
+        import { configure, listPets } from './client.ts';
+
+        let calls = 0;
+        const failing = (async () => {
+          calls++;
+          return new Response('err', { status: 503, headers: { 'content-type': 'text/plain' } });
+        }) as unknown as typeof fetch;
+
+        configure({ fetch: failing, retry: { retries: 5, retryDelay: 50 } });
+        const controller = new AbortController();
+        setTimeout(() => controller.abort(), 10);
+
+        let aborted = false;
+        try {
+          // listPets takes (params, init); the signal belongs on init.
+          await listPets({}, { signal: controller.signal });
+        } catch (e) {
+          aborted = (e as Error).name === 'AbortError';
+        }
+        console.log(JSON.stringify({ aborted, calls }));
       `
-import { configure, listPets } from './client.ts';
-
-let calls = 0;
-const failing = (async () => {
-  calls++;
-  return new Response('err', { status: 503, headers: { 'content-type': 'text/plain' } });
-}) as unknown as typeof fetch;
-
-configure({ fetch: failing, retry: { retries: 5, retryDelay: 50 } });
-const controller = new AbortController();
-setTimeout(() => controller.abort(), 10);
-
-let aborted = false;
-try {
-  // listPets takes (params, init); the signal belongs on init.
-  await listPets({}, { signal: controller.signal });
-} catch (e) {
-  aborted = (e as Error).name === 'AbortError';
-}
-console.log(JSON.stringify({ aborted, calls }));
-`
     ) as { aborted: boolean; calls: number };
 
     expect(result.aborted).toBe(true);
diff --git a/tests/e2e/generate-client/setup.test.ts b/tests/e2e/generate-client/setup.test.ts
index 79f62b651b..8095a99215 100644
--- a/tests/e2e/generate-client/setup.test.ts
+++ b/tests/e2e/generate-client/setup.test.ts
@@ -9,6 +9,7 @@ import { existsSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { outdent } from 'outdent';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const repoRoot = resolve(__dirname, '../../..');
@@ -16,12 +17,12 @@ const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
 const fixture = join(__dirname, 'fixtures/base.yaml');
 const tsxBin = join(repoRoot, 'node_modules/.bin/tsx');
 
-const SETUP = `
-import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
-export default defineClientSetup({
-  config: { serverUrl: 'https://baked.example.com' },
-  middleware: [{ onRequest: (ctx: RequestContext) => { ctx.headers['X-Baked'] = 'yes'; } }],
-});
+const SETUP = outdent`
+  import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
+  export default defineClientSetup({
+    config: { serverUrl: 'https://baked.example.com' },
+    middleware: [{ onRequest: (ctx: RequestContext) => { ctx.headers['X-Baked'] = 'yes'; } }],
+  });
 `;
 
 function generate(
@@ -67,16 +68,16 @@ describe('--setup bakes publisher defaults into the single-file client', () => {
   test('a consumer with no configure/use still sends the baked URL + header', () => {
     const captured = runConsumer(
       dir,
+      outdent`
+        import { listPets } from './client.ts';
+        let url = '', header = '';
+        globalThis.fetch = (async (u: string, init: RequestInit) => {
+          url = u; header = (init.headers as Record<string,string>)['X-Baked'];
+          return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
+        }) as unknown as typeof fetch;
+        await listPets();
+        console.log(JSON.stringify({ url, header }));
       `
-import { listPets } from './client.ts';
-let url = '', header = '';
-globalThis.fetch = (async (u: string, init: RequestInit) => {
-  url = u; header = (init.headers as Record<string,string>)['X-Baked'];
-  return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
-}) as unknown as typeof fetch;
-await listPets();
-console.log(JSON.stringify({ url, header }));
-`
     ) as { url: string; header: string };
     expect(new URL(captured.url).origin).toBe('https://baked.example.com');
     expect(captured.header).toBe('yes');
@@ -85,13 +86,13 @@ console.log(JSON.stringify({ url, header }));
   test('a consumer configure() overrides the baked default', () => {
     const captured = runConsumer(
       dir,
+      outdent`
+        import { configure, listPets } from './client.ts';
+        let url = '';
+        configure({ serverUrl: 'https://override.example.com', fetch: (async (u: string) => { url = u; return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } }); }) as unknown as typeof fetch });
+        await listPets();
+        console.log(JSON.stringify({ url }));
       `
-import { configure, listPets } from './client.ts';
-let url = '';
-configure({ serverUrl: 'https://override.example.com', fetch: (async (u: string) => { url = u; return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } }); }) as unknown as typeof fetch });
-await listPets();
-console.log(JSON.stringify({ url }));
-`
     ) as { url: string };
     expect(new URL(captured.url).origin).toBe('https://override.example.com');
   }, 60_000);
@@ -103,13 +104,13 @@ console.log(JSON.stringify({ url }));
       expect(r.status, r.stderr).toBe(0);
       const captured = runConsumer(
         dir2,
+        outdent`
+          import { listPets } from './client.ts';
+          let url = '', header = '';
+          globalThis.fetch = (async (u: string, init: RequestInit) => { url = u; header = (init.headers as Record<string,string>)['X-Baked']; return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } }); }) as unknown as typeof fetch;
+          await listPets();
+          console.log(JSON.stringify({ url, header }));
         `
-import { listPets } from './client.ts';
-let url = '', header = '';
-globalThis.fetch = (async (u: string, init: RequestInit) => { url = u; header = (init.headers as Record<string,string>)['X-Baked']; return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } }); }) as unknown as typeof fetch;
-await listPets();
-console.log(JSON.stringify({ url, header }));
-`
       ) as { url: string; header: string };
       expect(new URL(captured.url).origin).toBe('https://baked.example.com');
       expect(captured.header).toBe('yes');
@@ -133,15 +134,15 @@ describe('--setup with the service-class facade', () => {
   test('new Client() with no args picks up the baked defaults; a passed config overrides', () => {
     const captured = runConsumer(
       dir,
+      outdent`
+        import { PetClient } from './client.ts';
+        const fetchSpy = (sink: { url: string; header: string }) => (async (u: string, init: RequestInit) => { sink.url = u; sink.header = (init.headers as Record<string,string>)['X-Baked']; return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } }); }) as unknown as typeof fetch;
+        const baked = { url: '', header: '' };
+        await new PetClient({ fetch: fetchSpy(baked) }).listPets();
+        const overridden = { url: '', header: '' };
+        await new PetClient({ serverUrl: 'https://override.example.com', fetch: fetchSpy(overridden) }).listPets();
+        console.log(JSON.stringify({ baked, overridden }));
       `
-import { PetClient } from './client.ts';
-const fetchSpy = (sink: { url: string; header: string }) => (async (u: string, init: RequestInit) => { sink.url = u; sink.header = (init.headers as Record<string,string>)['X-Baked']; return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } }); }) as unknown as typeof fetch;
-const baked = { url: '', header: '' };
-await new PetClient({ fetch: fetchSpy(baked) }).listPets();
-const overridden = { url: '', header: '' };
-await new PetClient({ serverUrl: 'https://override.example.com', fetch: fetchSpy(overridden) }).listPets();
-console.log(JSON.stringify({ baked, overridden }));
-`
     ) as { baked: { url: string; header: string }; overridden: { url: string } };
     expect(new URL(captured.baked.url).origin).toBe('https://baked.example.com');
     expect(captured.baked.header).toBe('yes');

From 447b4e947f00741759ac041fd01d8d0d7975e568 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 17:29:54 +0300
Subject: [PATCH 059/134] docs: add generate-client to the v2 sidebar

---
 docs/@v2/v2.sidebars.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/@v2/v2.sidebars.yaml b/docs/@v2/v2.sidebars.yaml
index 1a425a10be..e9de7896ab 100644
--- a/docs/@v2/v2.sidebars.yaml
+++ b/docs/@v2/v2.sidebars.yaml
@@ -18,6 +18,8 @@
           page: commands/eject.md
         - label: generate-arazzo
           page: commands/generate-arazzo.md
+        - label: generate-client
+          page: commands/generate-client.md
         - label: join
           page: commands/join.md
         - label: lint

From da30a435131e4dc4a7573162c799cd81b7c9575d Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 22:08:42 +0300
Subject: [PATCH 060/134] docs: split generate-client into command,
 client-usage, and config pages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The single generate-client reference grew to cover both the CLI and the generated
client's runtime API. Split it three ways:
- commands/generate-client.md — CLI usage: flags, output modes, a config pointer
- commands/generate-client-usage.md (new) — the runtime surface: auth, error modes,
  middleware, retries, query/multipart/decoding, metadata, SSE, and the add-on generators
- configuration/client.md (new) — the redocly.yaml `client` block + `clientOutput`

Cross-page anchor links repointed, both new pages added to the v2 sidebar.
---
 docs/@v2/commands/generate-client-usage.md | 302 +++++++++++++++++++
 docs/@v2/commands/generate-client.md       | 333 ++-------------------
 docs/@v2/configuration/client.md           |  49 +++
 docs/@v2/v2.sidebars.yaml                  |   3 +
 4 files changed, 372 insertions(+), 315 deletions(-)
 create mode 100644 docs/@v2/commands/generate-client-usage.md
 create mode 100644 docs/@v2/configuration/client.md

diff --git a/docs/@v2/commands/generate-client-usage.md b/docs/@v2/commands/generate-client-usage.md
new file mode 100644
index 0000000000..e321b482f6
--- /dev/null
+++ b/docs/@v2/commands/generate-client-usage.md
@@ -0,0 +1,302 @@
+---
+slug:
+  - /docs/cli/commands/generate-client-usage
+---
+
+# Use the generated client
+
+How to consume the TypeScript client produced by [`generate-client`](./generate-client.md): authentication, argument styles, error handling, middleware, retries, and the optional add-on generators. For invoking the command itself (flags, output modes, config), see the [`generate-client` command reference](./generate-client.md).
+
+## Generators
+
+`--generators` selects what to emit (default `sdk`). Each non-`sdk` generator adds a **standalone sibling module** next to the client; the client itself never imports it, so it stays dependency-free. Incompatible selections fail fast with an explanation.
+
+| Generator        | Emits                                                                                     | App peer dependency                                      |
+| ---------------- | ----------------------------------------------------------------------------------------- | -------------------------------------------------------- |
+| `sdk`            | The typed client (default).                                                               | none                                                     |
+| `zod`            | `<output>.zod.ts` — [Zod](https://zod.dev) schemas.                                       | `zod` `^3.23 \|\| ^4`                                    |
+| `tanstack-query` | `<output>.tanstack.ts` — [TanStack Query](https://tanstack.com/query) v5 factories.       | `@tanstack/<framework>-query` `^5`                       |
+| `swr`            | `<output>.swr.ts` — [SWR](https://swr.vercel.app) hooks.                                  | `swr` `^2`                                               |
+| `mock`           | `<output>.mocks.ts` — [MSW](https://mswjs.io) v2 handlers + `create<Schema>` factories.   | `msw` `^2` (+ `@faker-js/faker` for `--mock-data faker`) |
+| `transformers`   | `<output>.transformers.ts` — `transform<Name>` functions that parse wire dates to `Date`. | none                                                     |
+
+```sh
+redocly generate-client openapi.yaml --output src/client.ts --generators sdk,zod,mock
+```
+
+`tanstack-query` and `swr` wrap the **throw-mode** `sdk` functions, so they require `--facade functions` and `--error-mode throw`. `transformers` requires `--date-type Date`. See the [`zod`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/zod), [`tanstack-query`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/tanstack-query), and [`mock`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/mock) examples.
+
+## Authentication
+
+A setter is generated for each `securityScheme` the runtime can apply, and each operation automatically sends the credentials its `security` requires:
+
+| Scheme                         | Setter                                    | Applied as                               |
+| ------------------------------ | ----------------------------------------- | ---------------------------------------- |
+| HTTP `bearer` / OAuth2         | `setBearer(token)`                        | `Authorization: Bearer <token>`          |
+| HTTP `basic`                   | `setBasicAuth(user, pass)`                | `Authorization: Basic <base64>`          |
+| `apiKey` (header/query/cookie) | `setApiKey(key)` / `setApiKey<Name>(key)` | the named header, query param, or cookie |
+
+`setApiKey` is unsuffixed for a single apiKey scheme; otherwise each gets `setApiKey<SchemeName>`. `mutualTLS` is not injectable. Bearer and apiKey setters accept a **`TokenProvider`** — a string or a (possibly async) function called per request, handy for refresh flows:
+
+```ts
+import { setBearer } from './client.ts';
+
+setBearer(async () => await getFreshAccessToken());
+```
+
+These setters are **module-global**. With `--facade service-class`, give each instance its own credentials via `ClientConfig.auth` (it overrides the global setters for that instance):
+
+```ts
+const internal = new Client({ auth: { basic: { username: 'svc', password: 's3cr3t' } } });
+const publicApi = new Client(); // no auth
+```
+
+## Argument style
+
+By default (`--args-style flat`) each operation takes positional arguments — path params in URL order, then `params` (query), `body`, and `headers` — with the per-call `init` last. With `--args-style grouped`, every input is bundled into one `vars` object typed as the operation's `<Op>Variables`:
+
+```ts
+// flat (default)
+await updateOrder('ord_01khr…', { ...orderBody });
+
+// grouped — order-independent, a good fit for React Query / SWR mutationFns
+await updateOrder({ orderId: 'ord_01khr…', body: { ...orderBody } });
+```
+
+## Error handling
+
+By default (`--error-mode throw`) an operation throws `ApiError` on any non-2xx response and returns the success body directly. With `--error-mode result` it never throws for HTTP errors, returning a discriminated `Result<TData, TError>` whose `error` is typed from the spec's 4xx/5xx bodies:
+
+```ts
+// throw (default)
+try {
+  const order = await getOrderById('ord_123');
+} catch (err) {
+  if (err instanceof ApiError) console.error(err.status, err.body);
+}
+
+// result
+const { data, error, response } = await getOrderById('ord_123');
+if (error) console.error(response.status, error.title);
+else console.log(data.id);
+```
+
+Transport and abort failures still throw in both modes. The choice is fixed at generate time.
+
+## Middleware
+
+Beyond the single `onRequest`/`onResponse`/`onError` hooks on `ClientConfig`, the client takes **composable middleware** for cross-cutting concerns (auth refresh, logging, tracing, request IDs). Register with `use()` (functions facade) or `<Client>.use()` (service-class); both accept several at once:
+
+```ts
+import { use } from './client.ts';
+
+use({
+  onRequest: (ctx) => {
+    // ctx.operation is { id, path, tags } — target by identity, not URL matching
+    if (ctx.operation.tags.includes('Orders')) {
+      ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
+    }
+  },
+});
+```
+
+`onRequest` runs in registration order; `onResponse` runs in reverse (onion). `onRequest` may mutate `ctx` (`url`/`method`/`headers`/`body` — body edits are serialized and sent); `onResponse` may return a replacement `Response`. `onError` (throw mode only) is threaded through each middleware. `ctx.operation`'s fields are typed literal unions (`OperationId`/`OperationPath`/`OperationTag`) for autocomplete and typo-checking. A single call's header instead goes in that operation's trailing `init` argument.
+
+See the [`customization` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/customization) for a runnable version.
+
+## Publisher defaults
+
+The middleware above is composed by the **consumer**. If you **publish an SDK**, bake defaults in at generation time with `--setup <file>`. The setup module imports its contract from `@redocly/client-generator` (so it resolves and is unit-testable) and default-exports `defineClientSetup({ config, middleware })`:
+
+```ts
+// client-setup.ts
+import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
+
+export default defineClientSetup({
+  config: { serverUrl: 'https://api.acme.com', retry: { retries: 3 } },
+  middleware: [
+    {
+      onRequest: (ctx: RequestContext) => {
+        ctx.headers['X-Acme-SDK'] = '1.4.0';
+      },
+    },
+  ],
+});
+```
+
+```sh
+redocly generate-client openapi.yaml --output src/api/client.ts --setup ./client-setup.ts
+```
+
+The baked block runs before the consumer's own setup. **Config values** are last-write-wins (a consumer overrides a baked default), while **middleware composes** (baked first, then the consumer's). Express un-bypassable behavior as middleware, not a baked `fetch`. A setup file may import **only** from `@redocly/client-generator`. See the [`baked-setup` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/baked-setup).
+
+## Retries
+
+Retry is **opt-in**, configured through `ClientConfig` with an optional per-call override:
+
+```ts
+configure({ retry: { retries: 3 } }); // global (functions facade)
+const client = new Client({ retry: { retries: 3 } }); // per instance (service-class)
+await getOrderById('ord_123', {}, { retry: { retries: 5 } }); // per call
+```
+
+By default only **idempotent** methods (`GET`, `HEAD`, `PUT`, `DELETE`, `OPTIONS`) are retried, on a network error or a transient status (`408`, `429`, `500`, `502`, `503`, `504`). `POST`/`PATCH` are not, since re-sending can duplicate side effects — opt in with a custom `retryOn` when safe. Backoff is exponential with full jitter (`retryStrategy: 'fixed'` for a constant delay); a `Retry-After` header takes precedence; an aborted `AbortSignal` stops retries immediately.
+
+| `RetryConfig` field | Type                                                 | Default                                            |
+| ------------------- | ---------------------------------------------------- | -------------------------------------------------- |
+| `retries`           | `number`                                             | `0` (extra attempts after the first; `0` disables) |
+| `retryDelay`        | `number`                                             | `1000` (base delay, ms)                            |
+| `retryStrategy`     | `'fixed' \| 'exponential'`                           | `'exponential'`                                    |
+| `jitter`            | `boolean`                                            | `true`                                             |
+| `retryOn`           | `(ctx: RetryContext) => boolean \| Promise<boolean>` | idempotent-only predicate                          |
+
+A custom `retryOn` receives the failed attempt's `RetryContext` (`attempt`, `request`, and exactly one of `response` / `error`) and **fully replaces** the default. To inspect a response body, read `ctx.response.clone()` — the body is a single-use stream:
+
+```ts
+await createOrder(body, {
+  retry: {
+    retries: 3,
+    retryOn: async (ctx) => {
+      if (ctx.error) return true; // transport error
+      return (ctx.response?.status ?? 0) >= 500; // server error
+    },
+  },
+});
+```
+
+## Query serialization
+
+Query parameters follow their OpenAPI `style` / `explode` / `allowReserved`. The default (`form`, `explode: true`) repeats array values:
+
+| `style`          | `explode` | `['a', 'b']` on the wire |
+| ---------------- | --------- | ------------------------ |
+| `form` (default) | `true`    | `key=a&key=b`            |
+| `form`           | `false`   | `key=a,b`                |
+| `spaceDelimited` | `false`   | `key=a%20b`              |
+| `pipeDelimited`  | `false`   | `key=a\|b`               |
+
+Delimiters are literal (values are still percent-encoded). `allowReserved: true` leaves the RFC-3986 reserved set un-encoded. Object-valued params serialize as `deepObject` brackets (`key[sub]=val`).
+
+## Multipart uploads
+
+A `multipart/form-data` body whose schema is an **object** is generated as a typed object; pass a plain object and the client serializes it to `FormData` (after the `onRequest` chain, so middleware can mutate it). Binary fields (`format: binary`) are typed as `Blob`:
+
+```ts
+// type UploadBody = { file: Blob; orgId: string; tags?: string[] };
+await upload({ file, orgId: 'org_1', tags: ['a', 'b'] });
+```
+
+`Blob`/strings pass through, arrays append one field per item, nested objects are JSON-encoded, `undefined`/`null` are skipped. A multipart body whose schema isn't a concrete object keeps the raw `FormData` type. `format: byte` (base64) stays a `string`.
+
+## Response decoding
+
+The client reads each response by negotiating from its `Content-Type` (JSON, then `text/*`, then `Blob`). Force a reader per call with `parseAs`:
+
+```ts
+const res = await getMenuItemPhoto('prd_123', { parseAs: 'stream' });
+```
+
+`parseAs` accepts `'json'`, `'text'`, `'blob'`, `'arrayBuffer'`, `'formData'`, `'stream'`, or `'auto'` (default). It changes the runtime reader only, not the static return type.
+
+## Operation metadata
+
+The client exports an `OPERATIONS` map keyed by operationId, holding each operation's `method`, `path` template, and `tags`:
+
+```ts
+export const OPERATIONS = {
+  getOrderById: { method: 'GET', path: '/orders/{orderId}', tags: ['Orders'] },
+  // …
+} as const;
+```
+
+Because keys and values are plain string literals, they survive bundling/minification — making `OPERATIONS` the stable handle for cache keys, span names, or log labels (rather than `fn.name`, which a minifier can rename). The same `OperationId` / `OperationPath` / `OperationTag` unions type `ctx.operation` in middleware.
+
+## Discriminated unions
+
+A `oneOf` / `anyOf` with a usable discriminator gets an exported `is<Member>` type guard per member, taken from the spec's `discriminator` or inferred when every member pins a shared property to a distinct string `const`:
+
+```ts
+export type MenuItem = Beverage | Dessert;
+export function isBeverage(value: MenuItem): value is Beverage { … }
+```
+
+Guards are also emitted for unions nested inside another schema (array items, property values) as long as every member is a named schema. A union without a usable discriminator gets no guard.
+
+## Server-Sent Events
+
+An operation whose `2xx` response declares `text/event-stream` is generated as a typed async iterator under an `sse` namespace — no flag required. Each event's `data` is typed from the OpenAPI 3.2 `itemSchema` (falling back to the media `schema`, then `string`) and `JSON.parse`d when structured:
+
+```ts
+import { sse } from './client.ts';
+
+for await (const ev of sse.streamMessages()) {
+  console.log(ev.id, ev.data.text); // ServerSentEvent<T>: { event?, data, id?, retry? }
+}
+```
+
+The stream **auto-reconnects** on a dropped connection, resuming from the last event id via `Last-Event-ID` (backoff honors the server's `retry:`, then `reconnectDelay`, then 1s; capped at 30s). Tune per call with `{ reconnect: false }` or `{ reconnectDelay: 500 }`. `break`ing the loop or aborting an `AbortSignal` ends it cleanly (no throw). SSE always throws `ApiError` on a non-2xx initial response, regardless of `--error-mode`.
+
+## Custom generators
+
+The built-in generators cover common targets. For anything else derived from the same description (validators in another library, a permissions map, a house-style SDK), write a **custom generator**: it reads the same spec-agnostic model the built-ins consume, so its output never drifts from the spec.
+
+A generator is `{ name, run }` (plus optional compatibility metadata); author it with `defineGenerator`:
+
+```ts
+// route-map-generator.ts
+import { defineGenerator } from '@redocly/client-generator';
+
+export default defineGenerator({
+  name: 'route-map',
+  requires: ['sdk'],
+  run({ model, outputPath }) {
+    const routes = model.services
+      .flatMap((s) => s.operations)
+      .map((op) => `  ${op.name}: '${op.method.toUpperCase()} ${op.path}',`)
+      .join('\n');
+    return [
+      {
+        path: outputPath.replace(/\.ts$/, '.routes.ts'),
+        content: `export const routes = {\n${routes}\n} as const;\n`,
+      },
+    ];
+  },
+});
+```
+
+The `@redocly/client-generator` entry also exports the codegen toolkit (`ts`, `printStatements`, `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, …) and the IR types, so a custom generator emits TypeScript exactly as the first-party ones do.
+
+Select it in `redocly.yaml` by path or package name:
+
+```yaml
+apis:
+  cafe:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
+        - ./tools/route-map-generator.ts # local path (resolved against redocly.yaml)
+        - '@acme/openapi-valibot' # published package
+```
+
+Or register one **inline** with the programmatic API and select it by name:
+
+```ts
+import { generateClient } from '@redocly/client-generator';
+import routeMap from './tools/route-map-generator.ts';
+
+await generateClient({
+  api: './openapi.yaml',
+  output: './src/api/client.ts',
+  customGenerators: [routeMap],
+  generators: ['sdk', 'route-map'],
+});
+```
+
+Import-specifier generators execute at generation time — they carry the same trust level as any installed dependency you run. See the [`custom-generator` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/custom-generator).
+
+## Resources
+
+- [`generate-client` command](./generate-client.md) — flags, output modes, and invocation.
+- [`client` configuration](../configuration/client.md) — the `redocly.yaml` `client` block.
diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index f7122fe9fb..9b9eef86f6 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -16,6 +16,8 @@ Swagger 2.0 descriptions are also accepted — normalized to the 3.x shape befor
 The generated client has **zero runtime dependencies** — it uses only web-standard APIs (`fetch`, `AbortController`, `URLSearchParams`, …), so it runs in browsers, Node, Bun, Deno, and edge runtimes.
 By default it emits a single file with inline types and one async function per operation.
 
+This page covers running the command; for the generated client's runtime API (auth, error handling, middleware, retries, and the add-on generators) see [Use the generated client](./generate-client-usage.md).
+
 ## Usage
 
 ```sh
@@ -24,7 +26,7 @@ redocly generate-client cafe                     # a single `apis:` alias from r
 redocly generate-client openapi.yaml -o src/client.ts   # a file path (ignores `apis:`)
 ```
 
-With **no argument**, a client is generated for every api that declares a `client` block under `apis:` (see [Configuration](#configuration)). Otherwise `<api>` is a file path, a URL, or an [`apis:` alias](../configuration/index.md): an alias uses that api's `client` block and `clientOutput`, while a plain path/URL ignores the `apis:` section and uses the top-level `client` defaults.
+With **no argument**, a client is generated for every api that declares a `client` block under `apis:` (see [`client` configuration](../configuration/client.md)). Otherwise `<api>` is a file path, a URL, or an [`apis:` alias](../configuration/index.md): an alias uses that api's `client` block and `clientOutput`, while a plain path/URL ignores the `apis:` section and uses the top-level `client` defaults.
 
 ## Options
 
@@ -32,338 +34,39 @@ With **no argument**, a client is generated for every api that declares a `clien
 | ------------------- | -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `api`               | `string` | OpenAPI description file path, URL, or an `apis:` alias. Omit it to generate for every api that has a `client` block.                                                                                |
 | `--output`, `-o`    | `string` | Output path (must end in `.ts`); the entry file in multi-file modes. Defaults to the api's `clientOutput`, else `<name>.client.ts` in the config dir. Not allowed when generating for multiple apis. |
-| `--output-mode`     | `string` | File layout: `single` (default), `split` (endpoints/schemas/runtime in sibling files), `tags` (one endpoints file per tag), or `tags-split` (a folder per tag).                                      |
-| `--generators`      | `string` | Comma-separated generators to run (default `sdk`). See [Generators](#generators).                                                                                                                    |
+| `--output-mode`     | `string` | File layout: `single` (default), `split`, `tags`, or `tags-split`. See [Output modes](#output-modes).                                                                                                |
+| `--generators`      | `string` | Comma-separated generators to run (default `sdk`). See [Generators](./generate-client-usage.md#generators).                                                                                          |
 | `--facade`          | `string` | Operation shape: `functions` (default, standalone functions) or `service-class` (methods on a `Client` class).                                                                                       |
 | `--name`            | `string` | Class name for the `service-class` facade in `single`/`split` layouts. Default `Client`.                                                                                                             |
-| `--args-style`      | `string` | Operation inputs: `flat` (default, positional) or `grouped` (a single `vars` object). See [Argument style](#argument-style).                                                                         |
+| `--args-style`      | `string` | Operation inputs: `flat` (default, positional) or `grouped` (a single `vars` object). See [Argument style](./generate-client-usage.md#argument-style).                                               |
 | `--enum-style`      | `string` | Named string enums: `const-object` (default, `as const` object + union) or `union` (union only).                                                                                                     |
-| `--error-mode`      | `string` | `throw` (default, throws `ApiError`) or `result` (returns `{ data, error, response }`). See [Error handling](#error-handling).                                                                       |
+| `--error-mode`      | `string` | `throw` (default, throws `ApiError`) or `result` (returns `{ data, error, response }`). See [Error handling](./generate-client-usage.md#error-handling).                                             |
 | `--date-type`       | `string` | `date`/`date-time` fields as `string` (default) or `Date` (pair with the `transformers` generator).                                                                                                  |
 | `--query-framework` | `string` | TanStack Query adapter: `react` (default), `vue`, `svelte`, or `solid`.                                                                                                                              |
 | `--mock-data`       | `string` | `mock` generator data: `baked` (default, deterministic literals) or `faker` (`@faker-js/faker` calls).                                                                                               |
 | `--mock-seed`       | `number` | Seed for `faker`-mode mocks, for reproducible data. Ignored in `baked` mode.                                                                                                                         |
 | `--server-url`      | `string` | Override the server URL inlined into the runtime. Defaults to `servers[0].url`. Accepts absolute (`https://api.example.com`) or relative (`/v1`).                                                    |
-| `--setup`           | `string` | Path to a publisher setup module baked into the client. See [Publisher defaults](#publisher-defaults).                                                                                               |
+| `--setup`           | `string` | Path to a publisher setup module baked into the client. See [Publisher defaults](./generate-client-usage.md#publisher-defaults).                                                                     |
 | `--config`          | `string` | Path to the `redocly.yaml` (the `client` config and `apis:` live there). Defaults to the one in the working directory.                                                                               |
 
 ## Configuration
 
-Put shared settings in a top-level `client` block, and give each API its input (`root`), an optional output (`clientOutput`), and any per-API overrides under `apis.<name>.client`:
-
-```yaml
-# redocly.yaml
-client: # shared defaults for every generated client
-  generators:
-    - sdk
-  facade: functions
-apis:
-  cafe:
-    root: ./openapi.yaml # the input
-    clientOutput: ./src/api/client.ts # optional; defaults to `cafe.client.ts`
-    client: # per-API overrides (optional)
-      facade: service-class
-```
-
-```sh
-redocly generate-client              # builds every api with a `client` block, to its clientOutput
-redocly generate-client cafe         # just the `cafe` api (its client block + clientOutput)
-redocly generate-client --config ./config/redocly.yaml
-```
-
-Settings resolve **top-level `client` → per-API `client` → CLI flags** (later wins). The input and output never go in a `client` block: the input is `apis.<name>.root` (or a CLI path/alias), and the output is `clientOutput`, `--output`, or the `<name>.client.ts` default. A plain file-path invocation ignores `apis:` and uses only the top-level `client`. For code-level control — including registering [custom generators](#custom-generators) inline — use the programmatic `generateClient(...)` API.
-
-## Generators
-
-`--generators` selects what to emit (default `sdk`). Each non-`sdk` generator adds a **standalone sibling module** next to the client; the client itself never imports it, so it stays dependency-free. Incompatible selections fail fast with an explanation.
-
-| Generator        | Emits                                                                                     | App peer dependency                                      |
-| ---------------- | ----------------------------------------------------------------------------------------- | -------------------------------------------------------- |
-| `sdk`            | The typed client (default).                                                               | none                                                     |
-| `zod`            | `<output>.zod.ts` — [Zod](https://zod.dev) schemas.                                       | `zod` `^3.23 \|\| ^4`                                    |
-| `tanstack-query` | `<output>.tanstack.ts` — [TanStack Query](https://tanstack.com/query) v5 factories.       | `@tanstack/<framework>-query` `^5`                       |
-| `swr`            | `<output>.swr.ts` — [SWR](https://swr.vercel.app) hooks.                                  | `swr` `^2`                                               |
-| `mock`           | `<output>.mocks.ts` — [MSW](https://mswjs.io) v2 handlers + `create<Schema>` factories.   | `msw` `^2` (+ `@faker-js/faker` for `--mock-data faker`) |
-| `transformers`   | `<output>.transformers.ts` — `transform<Name>` functions that parse wire dates to `Date`. | none                                                     |
-
-```sh
-redocly generate-client openapi.yaml --output src/client.ts --generators sdk,zod,mock
-```
-
-`tanstack-query` and `swr` wrap the **throw-mode** `sdk` functions, so they require `--facade functions` and `--error-mode throw`. `transformers` requires `--date-type Date`. See the [`zod`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/zod), [`tanstack-query`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/tanstack-query), and [`mock`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/mock) examples.
-
-## Authentication
-
-A setter is generated for each `securityScheme` the runtime can apply, and each operation automatically sends the credentials its `security` requires:
-
-| Scheme                         | Setter                                    | Applied as                               |
-| ------------------------------ | ----------------------------------------- | ---------------------------------------- |
-| HTTP `bearer` / OAuth2         | `setBearer(token)`                        | `Authorization: Bearer <token>`          |
-| HTTP `basic`                   | `setBasicAuth(user, pass)`                | `Authorization: Basic <base64>`          |
-| `apiKey` (header/query/cookie) | `setApiKey(key)` / `setApiKey<Name>(key)` | the named header, query param, or cookie |
-
-`setApiKey` is unsuffixed for a single apiKey scheme; otherwise each gets `setApiKey<SchemeName>`. `mutualTLS` is not injectable. Bearer and apiKey setters accept a **`TokenProvider`** — a string or a (possibly async) function called per request, handy for refresh flows:
-
-```ts
-import { setBearer } from './client.ts';
-
-setBearer(async () => await getFreshAccessToken());
-```
-
-These setters are **module-global**. With `--facade service-class`, give each instance its own credentials via `ClientConfig.auth` (it overrides the global setters for that instance):
-
-```ts
-const internal = new Client({ auth: { basic: { username: 'svc', password: 's3cr3t' } } });
-const publicApi = new Client(); // no auth
-```
-
-## Argument style
-
-By default (`--args-style flat`) each operation takes positional arguments — path params in URL order, then `params` (query), `body`, and `headers` — with the per-call `init` last. With `--args-style grouped`, every input is bundled into one `vars` object typed as the operation's `<Op>Variables`:
-
-```ts
-// flat (default)
-await updateOrder('ord_01khr…', { ...orderBody });
-
-// grouped — order-independent, a good fit for React Query / SWR mutationFns
-await updateOrder({ orderId: 'ord_01khr…', body: { ...orderBody } });
-```
-
-## Error handling
-
-By default (`--error-mode throw`) an operation throws `ApiError` on any non-2xx response and returns the success body directly. With `--error-mode result` it never throws for HTTP errors, returning a discriminated `Result<TData, TError>` whose `error` is typed from the spec's 4xx/5xx bodies:
-
-```ts
-// throw (default)
-try {
-  const order = await getOrderById('ord_123');
-} catch (err) {
-  if (err instanceof ApiError) console.error(err.status, err.body);
-}
-
-// result
-const { data, error, response } = await getOrderById('ord_123');
-if (error) console.error(response.status, error.title);
-else console.log(data.id);
-```
-
-Transport and abort failures still throw in both modes. The choice is fixed at generate time.
-
-## Middleware
-
-Beyond the single `onRequest`/`onResponse`/`onError` hooks on `ClientConfig`, the client takes **composable middleware** for cross-cutting concerns (auth refresh, logging, tracing, request IDs). Register with `use()` (functions facade) or `<Client>.use()` (service-class); both accept several at once:
-
-```ts
-import { use } from './client.ts';
-
-use({
-  onRequest: (ctx) => {
-    // ctx.operation is { id, path, tags } — target by identity, not URL matching
-    if (ctx.operation.tags.includes('Orders')) {
-      ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
-    }
-  },
-});
-```
-
-`onRequest` runs in registration order; `onResponse` runs in reverse (onion). `onRequest` may mutate `ctx` (`url`/`method`/`headers`/`body` — body edits are serialized and sent); `onResponse` may return a replacement `Response`. `onError` (throw mode only) is threaded through each middleware. `ctx.operation`'s fields are typed literal unions (`OperationId`/`OperationPath`/`OperationTag`) for autocomplete and typo-checking. A single call's header instead goes in that operation's trailing `init` argument.
-
-See the [`customization` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/customization) for a runnable version.
-
-## Publisher defaults
-
-The middleware above is composed by the **consumer**. If you **publish an SDK**, bake defaults in at generation time with `--setup <file>`. The setup module imports its contract from `@redocly/client-generator` (so it resolves and is unit-testable) and default-exports `defineClientSetup({ config, middleware })`:
-
-```ts
-// client-setup.ts
-import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
-
-export default defineClientSetup({
-  config: { serverUrl: 'https://api.acme.com', retry: { retries: 3 } },
-  middleware: [
-    {
-      onRequest: (ctx: RequestContext) => {
-        ctx.headers['X-Acme-SDK'] = '1.4.0';
-      },
-    },
-  ],
-});
-```
-
-```sh
-redocly generate-client openapi.yaml --output src/api/client.ts --setup ./client-setup.ts
-```
-
-The baked block runs before the consumer's own setup. **Config values** are last-write-wins (a consumer overrides a baked default), while **middleware composes** (baked first, then the consumer's). Express un-bypassable behavior as middleware, not a baked `fetch`. A setup file may import **only** from `@redocly/client-generator`. See the [`baked-setup` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/baked-setup).
+Instead of passing flags every time, keep the settings in `redocly.yaml` under a top-level `client` block and per-API `apis.<name>.client` / `clientOutput`. Settings resolve **top-level `client` → per-API `client` → CLI flags**. See [`client` configuration](../configuration/client.md) for the full reference.
 
-## Retries
+## Output modes
 
-Retry is **opt-in**, configured through `ClientConfig` with an optional per-call override:
+`--output-mode` controls how the client is split across files:
 
-```ts
-configure({ retry: { retries: 3 } }); // global (functions facade)
-const client = new Client({ retry: { retries: 3 } }); // per instance (service-class)
-await getOrderById('ord_123', {}, { retry: { retries: 5 } }); // per call
-```
-
-By default only **idempotent** methods (`GET`, `HEAD`, `PUT`, `DELETE`, `OPTIONS`) are retried, on a network error or a transient status (`408`, `429`, `500`, `502`, `503`, `504`). `POST`/`PATCH` are not, since re-sending can duplicate side effects — opt in with a custom `retryOn` when safe. Backoff is exponential with full jitter (`retryStrategy: 'fixed'` for a constant delay); a `Retry-After` header takes precedence; an aborted `AbortSignal` stops retries immediately.
-
-| `RetryConfig` field | Type                                                 | Default                                            |
-| ------------------- | ---------------------------------------------------- | -------------------------------------------------- |
-| `retries`           | `number`                                             | `0` (extra attempts after the first; `0` disables) |
-| `retryDelay`        | `number`                                             | `1000` (base delay, ms)                            |
-| `retryStrategy`     | `'fixed' \| 'exponential'`                           | `'exponential'`                                    |
-| `jitter`            | `boolean`                                            | `true`                                             |
-| `retryOn`           | `(ctx: RetryContext) => boolean \| Promise<boolean>` | idempotent-only predicate                          |
-
-A custom `retryOn` receives the failed attempt's `RetryContext` (`attempt`, `request`, and exactly one of `response` / `error`) and **fully replaces** the default. To inspect a response body, read `ctx.response.clone()` — the body is a single-use stream:
-
-```ts
-await createOrder(body, {
-  retry: {
-    retries: 3,
-    retryOn: async (ctx) => {
-      if (ctx.error) return true; // transport error
-      return (ctx.response?.status ?? 0) >= 500; // server error
-    },
-  },
-});
-```
-
-## Query serialization
-
-Query parameters follow their OpenAPI `style` / `explode` / `allowReserved`. The default (`form`, `explode: true`) repeats array values:
-
-| `style`          | `explode` | `['a', 'b']` on the wire |
-| ---------------- | --------- | ------------------------ |
-| `form` (default) | `true`    | `key=a&key=b`            |
-| `form`           | `false`   | `key=a,b`                |
-| `spaceDelimited` | `false`   | `key=a%20b`              |
-| `pipeDelimited`  | `false`   | `key=a\|b`               |
-
-Delimiters are literal (values are still percent-encoded). `allowReserved: true` leaves the RFC-3986 reserved set un-encoded. Object-valued params serialize as `deepObject` brackets (`key[sub]=val`).
-
-## Multipart uploads
-
-A `multipart/form-data` body whose schema is an **object** is generated as a typed object; pass a plain object and the client serializes it to `FormData` (after the `onRequest` chain, so middleware can mutate it). Binary fields (`format: binary`) are typed as `Blob`:
-
-```ts
-// type UploadBody = { file: Blob; orgId: string; tags?: string[] };
-await upload({ file, orgId: 'org_1', tags: ['a', 'b'] });
-```
-
-`Blob`/strings pass through, arrays append one field per item, nested objects are JSON-encoded, `undefined`/`null` are skipped. A multipart body whose schema isn't a concrete object keeps the raw `FormData` type. `format: byte` (base64) stays a `string`.
-
-## Response decoding
-
-The client reads each response by negotiating from its `Content-Type` (JSON, then `text/*`, then `Blob`). Force a reader per call with `parseAs`:
-
-```ts
-const res = await getMenuItemPhoto('prd_123', { parseAs: 'stream' });
-```
-
-`parseAs` accepts `'json'`, `'text'`, `'blob'`, `'arrayBuffer'`, `'formData'`, `'stream'`, or `'auto'` (default). It changes the runtime reader only, not the static return type.
-
-## Operation metadata
-
-The client exports an `OPERATIONS` map keyed by operationId, holding each operation's `method`, `path` template, and `tags`:
-
-```ts
-export const OPERATIONS = {
-  getOrderById: { method: 'GET', path: '/orders/{orderId}', tags: ['Orders'] },
-  // …
-} as const;
-```
-
-Because keys and values are plain string literals, they survive bundling/minification — making `OPERATIONS` the stable handle for cache keys, span names, or log labels (rather than `fn.name`, which a minifier can rename). The same `OperationId` / `OperationPath` / `OperationTag` unions type `ctx.operation` in middleware.
-
-## Discriminated unions
-
-A `oneOf` / `anyOf` with a usable discriminator gets an exported `is<Member>` type guard per member, taken from the spec's `discriminator` or inferred when every member pins a shared property to a distinct string `const`:
-
-```ts
-export type MenuItem = Beverage | Dessert;
-export function isBeverage(value: MenuItem): value is Beverage { … }
-```
-
-Guards are also emitted for unions nested inside another schema (array items, property values) as long as every member is a named schema. A union without a usable discriminator gets no guard.
-
-## Server-Sent Events
-
-An operation whose `2xx` response declares `text/event-stream` is generated as a typed async iterator under an `sse` namespace — no flag required. Each event's `data` is typed from the OpenAPI 3.2 `itemSchema` (falling back to the media `schema`, then `string`) and `JSON.parse`d when structured:
-
-```ts
-import { sse } from './client.ts';
-
-for await (const ev of sse.streamMessages()) {
-  console.log(ev.id, ev.data.text); // ServerSentEvent<T>: { event?, data, id?, retry? }
-}
-```
-
-The stream **auto-reconnects** on a dropped connection, resuming from the last event id via `Last-Event-ID` (backoff honors the server's `retry:`, then `reconnectDelay`, then 1s; capped at 30s). Tune per call with `{ reconnect: false }` or `{ reconnectDelay: 500 }`. `break`ing the loop or aborting an `AbortSignal` ends it cleanly (no throw). SSE always throws `ApiError` on a non-2xx initial response, regardless of `--error-mode`.
-
-## Custom generators
-
-The built-in generators cover common targets. For anything else derived from the same description (validators in another library, a permissions map, a house-style SDK), write a **custom generator**: it reads the same spec-agnostic model the built-ins consume, so its output never drifts from the spec.
-
-A generator is `{ name, run }` (plus optional compatibility metadata); author it with `defineGenerator`:
-
-```ts
-// route-map-generator.ts
-import { defineGenerator } from '@redocly/client-generator';
-
-export default defineGenerator({
-  name: 'route-map',
-  requires: ['sdk'],
-  run({ model, outputPath }) {
-    const routes = model.services
-      .flatMap((s) => s.operations)
-      .map((op) => `  ${op.name}: '${op.method.toUpperCase()} ${op.path}',`)
-      .join('\n');
-    return [
-      {
-        path: outputPath.replace(/\.ts$/, '.routes.ts'),
-        content: `export const routes = {\n${routes}\n} as const;\n`,
-      },
-    ];
-  },
-});
-```
-
-The `@redocly/client-generator` entry also exports the codegen toolkit (`ts`, `printStatements`, `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, …) and the IR types, so a custom generator emits TypeScript exactly as the first-party ones do.
-
-Select it in `redocly.yaml` by path or package name:
-
-```yaml
-apis:
-  cafe:
-    root: ./openapi.yaml
-    clientOutput: ./src/api/client.ts
-    client:
-      generators:
-        - sdk
-        - ./tools/route-map-generator.ts # local path (resolved against redocly.yaml)
-        - '@acme/openapi-valibot' # published package
-```
-
-Or register one **inline** with the programmatic API and select it by name:
-
-```ts
-import { generateClient } from '@redocly/client-generator';
-import routeMap from './tools/route-map-generator.ts';
-
-await generateClient({
-  api: './openapi.yaml',
-  output: './src/api/client.ts',
-  customGenerators: [routeMap],
-  generators: ['sdk', 'route-map'],
-});
-```
+- `single` (default) — one self-contained file.
+- `split` — endpoints, schemas, and runtime in sibling files.
+- `tags` — one endpoints file per OpenAPI tag.
+- `tags-split` — a folder per tag.
 
-Import-specifier generators execute at generation time — they carry the same trust level as any installed dependency you run. See the [`custom-generator` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/custom-generator).
+All multi-file modes share the schemas and runtime modules; `--output` names the entry file, and the siblings derive from its name and directory.
 
 ## Resources
 
+- [Use the generated client](./generate-client-usage.md) — the runtime API and the add-on generators.
+- [`client` configuration](../configuration/client.md) — the `redocly.yaml` `client` block.
 - [Lint command](./lint.md) to validate your API description before generating a client.
 - [Bundle command](./bundle.md) to combine a multi-file description into a single input file.
-- [Configuration](../configuration/index.md) reference for `redocly.yaml`, including the `apis:` aliases you can pass as `<api>`.
diff --git a/docs/@v2/configuration/client.md b/docs/@v2/configuration/client.md
new file mode 100644
index 0000000000..8a1d9cc99b
--- /dev/null
+++ b/docs/@v2/configuration/client.md
@@ -0,0 +1,49 @@
+---
+slug:
+  - /docs/cli/configuration/client
+---
+
+# `client` configuration
+
+The [`generate-client`](../commands/generate-client.md) command reads its settings from `redocly.yaml`: a top-level `client` block holds shared defaults, and each API under `apis:` supplies its input (`root`), an optional output (`clientOutput`), and any per-API overrides under `apis.<name>.client`.
+
+```yaml
+# redocly.yaml
+client: # shared defaults for every generated client
+  generators:
+    - sdk
+  facade: functions
+apis:
+  cafe:
+    root: ./openapi.yaml # the input
+    clientOutput: ./src/api/client.ts # optional; defaults to `cafe.client.ts`
+    client: # per-API overrides (optional)
+      facade: service-class
+```
+
+```sh
+redocly generate-client              # builds every api with a `client` block, to its clientOutput
+redocly generate-client cafe         # just the `cafe` api (its client block + clientOutput)
+redocly generate-client --config ./config/redocly.yaml
+```
+
+## The `client` block
+
+The same fields are accepted at the top level (shared defaults) and under `apis.<name>.client` (per-API overrides): `generators`, `facade`, `name`, `argsStyle`, `serverUrl`, `outputMode`, `enumStyle`, `errorMode`, `dateType`, `queryFramework`, `mockData`, `mockSeed`, and `setup`. Each mirrors the matching CLI flag — see the [command options](../commands/generate-client.md#options) for what every field does.
+
+The input and output are **not** part of a `client` block:
+
+- **input** — `apis.<name>.root` (or a path/alias passed on the command line).
+- **output** — `apis.<name>.clientOutput`; when omitted it defaults to `<name>.client.ts` in the `redocly.yaml` directory. `--output` overrides it (single-API invocations only).
+
+## Precedence
+
+Settings resolve **top-level `client` → per-API `client` → CLI flags** (later wins). A plain file-path invocation ignores `apis:` and uses only the top-level `client`.
+
+For code-level control — including registering [custom generators](../commands/generate-client-usage.md#custom-generators) inline — use the programmatic `generateClient(...)` API instead.
+
+## Resources
+
+- [`generate-client` command](../commands/generate-client.md) — flags, output modes, and invocation.
+- [Use the generated client](../commands/generate-client-usage.md) — the runtime API (auth, retries, middleware, extra generators).
+- [`apis` configuration](./apis.md) — the `apis:` section and its aliases.
diff --git a/docs/@v2/v2.sidebars.yaml b/docs/@v2/v2.sidebars.yaml
index e9de7896ab..dd4ea60eb5 100644
--- a/docs/@v2/v2.sidebars.yaml
+++ b/docs/@v2/v2.sidebars.yaml
@@ -20,6 +20,8 @@
           page: commands/generate-arazzo.md
         - label: generate-client
           page: commands/generate-client.md
+        - label: generate-client (client usage)
+          page: commands/generate-client-usage.md
         - label: join
           page: commands/join.md
         - label: lint
@@ -198,6 +200,7 @@
         - page: configuration/extends.md
         - page: configuration/rules.md
         - page: configuration/apis.md
+        - page: configuration/client.md
         - group: Reference
           items:
             - page: configuration/reference/apis.md

From fe649307344859b87a18aa469a0e4bfa652de8d3 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 22:21:53 +0300
Subject: [PATCH 061/134] docs: keep generate-client as a single command page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Revert the three-way split: no other command has a secondary '-usage' page or a
dedicated configuration/ page — each command is one commands/<name>.md that
documents its flags and config inline (lint.md is 487 lines on one page). Fold the
client-usage and client-config content back into commands/generate-client.md and
drop the two extra pages + their sidebar entries, matching the existing convention.
---
 docs/@v2/commands/generate-client-usage.md | 302 -------------------
 docs/@v2/commands/generate-client.md       | 333 +++++++++++++++++++--
 docs/@v2/configuration/client.md           |  49 ---
 3 files changed, 315 insertions(+), 369 deletions(-)
 delete mode 100644 docs/@v2/commands/generate-client-usage.md
 delete mode 100644 docs/@v2/configuration/client.md

diff --git a/docs/@v2/commands/generate-client-usage.md b/docs/@v2/commands/generate-client-usage.md
deleted file mode 100644
index e321b482f6..0000000000
--- a/docs/@v2/commands/generate-client-usage.md
+++ /dev/null
@@ -1,302 +0,0 @@
----
-slug:
-  - /docs/cli/commands/generate-client-usage
----
-
-# Use the generated client
-
-How to consume the TypeScript client produced by [`generate-client`](./generate-client.md): authentication, argument styles, error handling, middleware, retries, and the optional add-on generators. For invoking the command itself (flags, output modes, config), see the [`generate-client` command reference](./generate-client.md).
-
-## Generators
-
-`--generators` selects what to emit (default `sdk`). Each non-`sdk` generator adds a **standalone sibling module** next to the client; the client itself never imports it, so it stays dependency-free. Incompatible selections fail fast with an explanation.
-
-| Generator        | Emits                                                                                     | App peer dependency                                      |
-| ---------------- | ----------------------------------------------------------------------------------------- | -------------------------------------------------------- |
-| `sdk`            | The typed client (default).                                                               | none                                                     |
-| `zod`            | `<output>.zod.ts` — [Zod](https://zod.dev) schemas.                                       | `zod` `^3.23 \|\| ^4`                                    |
-| `tanstack-query` | `<output>.tanstack.ts` — [TanStack Query](https://tanstack.com/query) v5 factories.       | `@tanstack/<framework>-query` `^5`                       |
-| `swr`            | `<output>.swr.ts` — [SWR](https://swr.vercel.app) hooks.                                  | `swr` `^2`                                               |
-| `mock`           | `<output>.mocks.ts` — [MSW](https://mswjs.io) v2 handlers + `create<Schema>` factories.   | `msw` `^2` (+ `@faker-js/faker` for `--mock-data faker`) |
-| `transformers`   | `<output>.transformers.ts` — `transform<Name>` functions that parse wire dates to `Date`. | none                                                     |
-
-```sh
-redocly generate-client openapi.yaml --output src/client.ts --generators sdk,zod,mock
-```
-
-`tanstack-query` and `swr` wrap the **throw-mode** `sdk` functions, so they require `--facade functions` and `--error-mode throw`. `transformers` requires `--date-type Date`. See the [`zod`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/zod), [`tanstack-query`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/tanstack-query), and [`mock`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/mock) examples.
-
-## Authentication
-
-A setter is generated for each `securityScheme` the runtime can apply, and each operation automatically sends the credentials its `security` requires:
-
-| Scheme                         | Setter                                    | Applied as                               |
-| ------------------------------ | ----------------------------------------- | ---------------------------------------- |
-| HTTP `bearer` / OAuth2         | `setBearer(token)`                        | `Authorization: Bearer <token>`          |
-| HTTP `basic`                   | `setBasicAuth(user, pass)`                | `Authorization: Basic <base64>`          |
-| `apiKey` (header/query/cookie) | `setApiKey(key)` / `setApiKey<Name>(key)` | the named header, query param, or cookie |
-
-`setApiKey` is unsuffixed for a single apiKey scheme; otherwise each gets `setApiKey<SchemeName>`. `mutualTLS` is not injectable. Bearer and apiKey setters accept a **`TokenProvider`** — a string or a (possibly async) function called per request, handy for refresh flows:
-
-```ts
-import { setBearer } from './client.ts';
-
-setBearer(async () => await getFreshAccessToken());
-```
-
-These setters are **module-global**. With `--facade service-class`, give each instance its own credentials via `ClientConfig.auth` (it overrides the global setters for that instance):
-
-```ts
-const internal = new Client({ auth: { basic: { username: 'svc', password: 's3cr3t' } } });
-const publicApi = new Client(); // no auth
-```
-
-## Argument style
-
-By default (`--args-style flat`) each operation takes positional arguments — path params in URL order, then `params` (query), `body`, and `headers` — with the per-call `init` last. With `--args-style grouped`, every input is bundled into one `vars` object typed as the operation's `<Op>Variables`:
-
-```ts
-// flat (default)
-await updateOrder('ord_01khr…', { ...orderBody });
-
-// grouped — order-independent, a good fit for React Query / SWR mutationFns
-await updateOrder({ orderId: 'ord_01khr…', body: { ...orderBody } });
-```
-
-## Error handling
-
-By default (`--error-mode throw`) an operation throws `ApiError` on any non-2xx response and returns the success body directly. With `--error-mode result` it never throws for HTTP errors, returning a discriminated `Result<TData, TError>` whose `error` is typed from the spec's 4xx/5xx bodies:
-
-```ts
-// throw (default)
-try {
-  const order = await getOrderById('ord_123');
-} catch (err) {
-  if (err instanceof ApiError) console.error(err.status, err.body);
-}
-
-// result
-const { data, error, response } = await getOrderById('ord_123');
-if (error) console.error(response.status, error.title);
-else console.log(data.id);
-```
-
-Transport and abort failures still throw in both modes. The choice is fixed at generate time.
-
-## Middleware
-
-Beyond the single `onRequest`/`onResponse`/`onError` hooks on `ClientConfig`, the client takes **composable middleware** for cross-cutting concerns (auth refresh, logging, tracing, request IDs). Register with `use()` (functions facade) or `<Client>.use()` (service-class); both accept several at once:
-
-```ts
-import { use } from './client.ts';
-
-use({
-  onRequest: (ctx) => {
-    // ctx.operation is { id, path, tags } — target by identity, not URL matching
-    if (ctx.operation.tags.includes('Orders')) {
-      ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
-    }
-  },
-});
-```
-
-`onRequest` runs in registration order; `onResponse` runs in reverse (onion). `onRequest` may mutate `ctx` (`url`/`method`/`headers`/`body` — body edits are serialized and sent); `onResponse` may return a replacement `Response`. `onError` (throw mode only) is threaded through each middleware. `ctx.operation`'s fields are typed literal unions (`OperationId`/`OperationPath`/`OperationTag`) for autocomplete and typo-checking. A single call's header instead goes in that operation's trailing `init` argument.
-
-See the [`customization` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/customization) for a runnable version.
-
-## Publisher defaults
-
-The middleware above is composed by the **consumer**. If you **publish an SDK**, bake defaults in at generation time with `--setup <file>`. The setup module imports its contract from `@redocly/client-generator` (so it resolves and is unit-testable) and default-exports `defineClientSetup({ config, middleware })`:
-
-```ts
-// client-setup.ts
-import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
-
-export default defineClientSetup({
-  config: { serverUrl: 'https://api.acme.com', retry: { retries: 3 } },
-  middleware: [
-    {
-      onRequest: (ctx: RequestContext) => {
-        ctx.headers['X-Acme-SDK'] = '1.4.0';
-      },
-    },
-  ],
-});
-```
-
-```sh
-redocly generate-client openapi.yaml --output src/api/client.ts --setup ./client-setup.ts
-```
-
-The baked block runs before the consumer's own setup. **Config values** are last-write-wins (a consumer overrides a baked default), while **middleware composes** (baked first, then the consumer's). Express un-bypassable behavior as middleware, not a baked `fetch`. A setup file may import **only** from `@redocly/client-generator`. See the [`baked-setup` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/baked-setup).
-
-## Retries
-
-Retry is **opt-in**, configured through `ClientConfig` with an optional per-call override:
-
-```ts
-configure({ retry: { retries: 3 } }); // global (functions facade)
-const client = new Client({ retry: { retries: 3 } }); // per instance (service-class)
-await getOrderById('ord_123', {}, { retry: { retries: 5 } }); // per call
-```
-
-By default only **idempotent** methods (`GET`, `HEAD`, `PUT`, `DELETE`, `OPTIONS`) are retried, on a network error or a transient status (`408`, `429`, `500`, `502`, `503`, `504`). `POST`/`PATCH` are not, since re-sending can duplicate side effects — opt in with a custom `retryOn` when safe. Backoff is exponential with full jitter (`retryStrategy: 'fixed'` for a constant delay); a `Retry-After` header takes precedence; an aborted `AbortSignal` stops retries immediately.
-
-| `RetryConfig` field | Type                                                 | Default                                            |
-| ------------------- | ---------------------------------------------------- | -------------------------------------------------- |
-| `retries`           | `number`                                             | `0` (extra attempts after the first; `0` disables) |
-| `retryDelay`        | `number`                                             | `1000` (base delay, ms)                            |
-| `retryStrategy`     | `'fixed' \| 'exponential'`                           | `'exponential'`                                    |
-| `jitter`            | `boolean`                                            | `true`                                             |
-| `retryOn`           | `(ctx: RetryContext) => boolean \| Promise<boolean>` | idempotent-only predicate                          |
-
-A custom `retryOn` receives the failed attempt's `RetryContext` (`attempt`, `request`, and exactly one of `response` / `error`) and **fully replaces** the default. To inspect a response body, read `ctx.response.clone()` — the body is a single-use stream:
-
-```ts
-await createOrder(body, {
-  retry: {
-    retries: 3,
-    retryOn: async (ctx) => {
-      if (ctx.error) return true; // transport error
-      return (ctx.response?.status ?? 0) >= 500; // server error
-    },
-  },
-});
-```
-
-## Query serialization
-
-Query parameters follow their OpenAPI `style` / `explode` / `allowReserved`. The default (`form`, `explode: true`) repeats array values:
-
-| `style`          | `explode` | `['a', 'b']` on the wire |
-| ---------------- | --------- | ------------------------ |
-| `form` (default) | `true`    | `key=a&key=b`            |
-| `form`           | `false`   | `key=a,b`                |
-| `spaceDelimited` | `false`   | `key=a%20b`              |
-| `pipeDelimited`  | `false`   | `key=a\|b`               |
-
-Delimiters are literal (values are still percent-encoded). `allowReserved: true` leaves the RFC-3986 reserved set un-encoded. Object-valued params serialize as `deepObject` brackets (`key[sub]=val`).
-
-## Multipart uploads
-
-A `multipart/form-data` body whose schema is an **object** is generated as a typed object; pass a plain object and the client serializes it to `FormData` (after the `onRequest` chain, so middleware can mutate it). Binary fields (`format: binary`) are typed as `Blob`:
-
-```ts
-// type UploadBody = { file: Blob; orgId: string; tags?: string[] };
-await upload({ file, orgId: 'org_1', tags: ['a', 'b'] });
-```
-
-`Blob`/strings pass through, arrays append one field per item, nested objects are JSON-encoded, `undefined`/`null` are skipped. A multipart body whose schema isn't a concrete object keeps the raw `FormData` type. `format: byte` (base64) stays a `string`.
-
-## Response decoding
-
-The client reads each response by negotiating from its `Content-Type` (JSON, then `text/*`, then `Blob`). Force a reader per call with `parseAs`:
-
-```ts
-const res = await getMenuItemPhoto('prd_123', { parseAs: 'stream' });
-```
-
-`parseAs` accepts `'json'`, `'text'`, `'blob'`, `'arrayBuffer'`, `'formData'`, `'stream'`, or `'auto'` (default). It changes the runtime reader only, not the static return type.
-
-## Operation metadata
-
-The client exports an `OPERATIONS` map keyed by operationId, holding each operation's `method`, `path` template, and `tags`:
-
-```ts
-export const OPERATIONS = {
-  getOrderById: { method: 'GET', path: '/orders/{orderId}', tags: ['Orders'] },
-  // …
-} as const;
-```
-
-Because keys and values are plain string literals, they survive bundling/minification — making `OPERATIONS` the stable handle for cache keys, span names, or log labels (rather than `fn.name`, which a minifier can rename). The same `OperationId` / `OperationPath` / `OperationTag` unions type `ctx.operation` in middleware.
-
-## Discriminated unions
-
-A `oneOf` / `anyOf` with a usable discriminator gets an exported `is<Member>` type guard per member, taken from the spec's `discriminator` or inferred when every member pins a shared property to a distinct string `const`:
-
-```ts
-export type MenuItem = Beverage | Dessert;
-export function isBeverage(value: MenuItem): value is Beverage { … }
-```
-
-Guards are also emitted for unions nested inside another schema (array items, property values) as long as every member is a named schema. A union without a usable discriminator gets no guard.
-
-## Server-Sent Events
-
-An operation whose `2xx` response declares `text/event-stream` is generated as a typed async iterator under an `sse` namespace — no flag required. Each event's `data` is typed from the OpenAPI 3.2 `itemSchema` (falling back to the media `schema`, then `string`) and `JSON.parse`d when structured:
-
-```ts
-import { sse } from './client.ts';
-
-for await (const ev of sse.streamMessages()) {
-  console.log(ev.id, ev.data.text); // ServerSentEvent<T>: { event?, data, id?, retry? }
-}
-```
-
-The stream **auto-reconnects** on a dropped connection, resuming from the last event id via `Last-Event-ID` (backoff honors the server's `retry:`, then `reconnectDelay`, then 1s; capped at 30s). Tune per call with `{ reconnect: false }` or `{ reconnectDelay: 500 }`. `break`ing the loop or aborting an `AbortSignal` ends it cleanly (no throw). SSE always throws `ApiError` on a non-2xx initial response, regardless of `--error-mode`.
-
-## Custom generators
-
-The built-in generators cover common targets. For anything else derived from the same description (validators in another library, a permissions map, a house-style SDK), write a **custom generator**: it reads the same spec-agnostic model the built-ins consume, so its output never drifts from the spec.
-
-A generator is `{ name, run }` (plus optional compatibility metadata); author it with `defineGenerator`:
-
-```ts
-// route-map-generator.ts
-import { defineGenerator } from '@redocly/client-generator';
-
-export default defineGenerator({
-  name: 'route-map',
-  requires: ['sdk'],
-  run({ model, outputPath }) {
-    const routes = model.services
-      .flatMap((s) => s.operations)
-      .map((op) => `  ${op.name}: '${op.method.toUpperCase()} ${op.path}',`)
-      .join('\n');
-    return [
-      {
-        path: outputPath.replace(/\.ts$/, '.routes.ts'),
-        content: `export const routes = {\n${routes}\n} as const;\n`,
-      },
-    ];
-  },
-});
-```
-
-The `@redocly/client-generator` entry also exports the codegen toolkit (`ts`, `printStatements`, `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, …) and the IR types, so a custom generator emits TypeScript exactly as the first-party ones do.
-
-Select it in `redocly.yaml` by path or package name:
-
-```yaml
-apis:
-  cafe:
-    root: ./openapi.yaml
-    clientOutput: ./src/api/client.ts
-    client:
-      generators:
-        - sdk
-        - ./tools/route-map-generator.ts # local path (resolved against redocly.yaml)
-        - '@acme/openapi-valibot' # published package
-```
-
-Or register one **inline** with the programmatic API and select it by name:
-
-```ts
-import { generateClient } from '@redocly/client-generator';
-import routeMap from './tools/route-map-generator.ts';
-
-await generateClient({
-  api: './openapi.yaml',
-  output: './src/api/client.ts',
-  customGenerators: [routeMap],
-  generators: ['sdk', 'route-map'],
-});
-```
-
-Import-specifier generators execute at generation time — they carry the same trust level as any installed dependency you run. See the [`custom-generator` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/custom-generator).
-
-## Resources
-
-- [`generate-client` command](./generate-client.md) — flags, output modes, and invocation.
-- [`client` configuration](../configuration/client.md) — the `redocly.yaml` `client` block.
diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index 9b9eef86f6..f7122fe9fb 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -16,8 +16,6 @@ Swagger 2.0 descriptions are also accepted — normalized to the 3.x shape befor
 The generated client has **zero runtime dependencies** — it uses only web-standard APIs (`fetch`, `AbortController`, `URLSearchParams`, …), so it runs in browsers, Node, Bun, Deno, and edge runtimes.
 By default it emits a single file with inline types and one async function per operation.
 
-This page covers running the command; for the generated client's runtime API (auth, error handling, middleware, retries, and the add-on generators) see [Use the generated client](./generate-client-usage.md).
-
 ## Usage
 
 ```sh
@@ -26,7 +24,7 @@ redocly generate-client cafe                     # a single `apis:` alias from r
 redocly generate-client openapi.yaml -o src/client.ts   # a file path (ignores `apis:`)
 ```
 
-With **no argument**, a client is generated for every api that declares a `client` block under `apis:` (see [`client` configuration](../configuration/client.md)). Otherwise `<api>` is a file path, a URL, or an [`apis:` alias](../configuration/index.md): an alias uses that api's `client` block and `clientOutput`, while a plain path/URL ignores the `apis:` section and uses the top-level `client` defaults.
+With **no argument**, a client is generated for every api that declares a `client` block under `apis:` (see [Configuration](#configuration)). Otherwise `<api>` is a file path, a URL, or an [`apis:` alias](../configuration/index.md): an alias uses that api's `client` block and `clientOutput`, while a plain path/URL ignores the `apis:` section and uses the top-level `client` defaults.
 
 ## Options
 
@@ -34,39 +32,338 @@ With **no argument**, a client is generated for every api that declares a `clien
 | ------------------- | -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `api`               | `string` | OpenAPI description file path, URL, or an `apis:` alias. Omit it to generate for every api that has a `client` block.                                                                                |
 | `--output`, `-o`    | `string` | Output path (must end in `.ts`); the entry file in multi-file modes. Defaults to the api's `clientOutput`, else `<name>.client.ts` in the config dir. Not allowed when generating for multiple apis. |
-| `--output-mode`     | `string` | File layout: `single` (default), `split`, `tags`, or `tags-split`. See [Output modes](#output-modes).                                                                                                |
-| `--generators`      | `string` | Comma-separated generators to run (default `sdk`). See [Generators](./generate-client-usage.md#generators).                                                                                          |
+| `--output-mode`     | `string` | File layout: `single` (default), `split` (endpoints/schemas/runtime in sibling files), `tags` (one endpoints file per tag), or `tags-split` (a folder per tag).                                      |
+| `--generators`      | `string` | Comma-separated generators to run (default `sdk`). See [Generators](#generators).                                                                                                                    |
 | `--facade`          | `string` | Operation shape: `functions` (default, standalone functions) or `service-class` (methods on a `Client` class).                                                                                       |
 | `--name`            | `string` | Class name for the `service-class` facade in `single`/`split` layouts. Default `Client`.                                                                                                             |
-| `--args-style`      | `string` | Operation inputs: `flat` (default, positional) or `grouped` (a single `vars` object). See [Argument style](./generate-client-usage.md#argument-style).                                               |
+| `--args-style`      | `string` | Operation inputs: `flat` (default, positional) or `grouped` (a single `vars` object). See [Argument style](#argument-style).                                                                         |
 | `--enum-style`      | `string` | Named string enums: `const-object` (default, `as const` object + union) or `union` (union only).                                                                                                     |
-| `--error-mode`      | `string` | `throw` (default, throws `ApiError`) or `result` (returns `{ data, error, response }`). See [Error handling](./generate-client-usage.md#error-handling).                                             |
+| `--error-mode`      | `string` | `throw` (default, throws `ApiError`) or `result` (returns `{ data, error, response }`). See [Error handling](#error-handling).                                                                       |
 | `--date-type`       | `string` | `date`/`date-time` fields as `string` (default) or `Date` (pair with the `transformers` generator).                                                                                                  |
 | `--query-framework` | `string` | TanStack Query adapter: `react` (default), `vue`, `svelte`, or `solid`.                                                                                                                              |
 | `--mock-data`       | `string` | `mock` generator data: `baked` (default, deterministic literals) or `faker` (`@faker-js/faker` calls).                                                                                               |
 | `--mock-seed`       | `number` | Seed for `faker`-mode mocks, for reproducible data. Ignored in `baked` mode.                                                                                                                         |
 | `--server-url`      | `string` | Override the server URL inlined into the runtime. Defaults to `servers[0].url`. Accepts absolute (`https://api.example.com`) or relative (`/v1`).                                                    |
-| `--setup`           | `string` | Path to a publisher setup module baked into the client. See [Publisher defaults](./generate-client-usage.md#publisher-defaults).                                                                     |
+| `--setup`           | `string` | Path to a publisher setup module baked into the client. See [Publisher defaults](#publisher-defaults).                                                                                               |
 | `--config`          | `string` | Path to the `redocly.yaml` (the `client` config and `apis:` live there). Defaults to the one in the working directory.                                                                               |
 
 ## Configuration
 
-Instead of passing flags every time, keep the settings in `redocly.yaml` under a top-level `client` block and per-API `apis.<name>.client` / `clientOutput`. Settings resolve **top-level `client` → per-API `client` → CLI flags**. See [`client` configuration](../configuration/client.md) for the full reference.
+Put shared settings in a top-level `client` block, and give each API its input (`root`), an optional output (`clientOutput`), and any per-API overrides under `apis.<name>.client`:
+
+```yaml
+# redocly.yaml
+client: # shared defaults for every generated client
+  generators:
+    - sdk
+  facade: functions
+apis:
+  cafe:
+    root: ./openapi.yaml # the input
+    clientOutput: ./src/api/client.ts # optional; defaults to `cafe.client.ts`
+    client: # per-API overrides (optional)
+      facade: service-class
+```
+
+```sh
+redocly generate-client              # builds every api with a `client` block, to its clientOutput
+redocly generate-client cafe         # just the `cafe` api (its client block + clientOutput)
+redocly generate-client --config ./config/redocly.yaml
+```
+
+Settings resolve **top-level `client` → per-API `client` → CLI flags** (later wins). The input and output never go in a `client` block: the input is `apis.<name>.root` (or a CLI path/alias), and the output is `clientOutput`, `--output`, or the `<name>.client.ts` default. A plain file-path invocation ignores `apis:` and uses only the top-level `client`. For code-level control — including registering [custom generators](#custom-generators) inline — use the programmatic `generateClient(...)` API.
+
+## Generators
+
+`--generators` selects what to emit (default `sdk`). Each non-`sdk` generator adds a **standalone sibling module** next to the client; the client itself never imports it, so it stays dependency-free. Incompatible selections fail fast with an explanation.
+
+| Generator        | Emits                                                                                     | App peer dependency                                      |
+| ---------------- | ----------------------------------------------------------------------------------------- | -------------------------------------------------------- |
+| `sdk`            | The typed client (default).                                                               | none                                                     |
+| `zod`            | `<output>.zod.ts` — [Zod](https://zod.dev) schemas.                                       | `zod` `^3.23 \|\| ^4`                                    |
+| `tanstack-query` | `<output>.tanstack.ts` — [TanStack Query](https://tanstack.com/query) v5 factories.       | `@tanstack/<framework>-query` `^5`                       |
+| `swr`            | `<output>.swr.ts` — [SWR](https://swr.vercel.app) hooks.                                  | `swr` `^2`                                               |
+| `mock`           | `<output>.mocks.ts` — [MSW](https://mswjs.io) v2 handlers + `create<Schema>` factories.   | `msw` `^2` (+ `@faker-js/faker` for `--mock-data faker`) |
+| `transformers`   | `<output>.transformers.ts` — `transform<Name>` functions that parse wire dates to `Date`. | none                                                     |
+
+```sh
+redocly generate-client openapi.yaml --output src/client.ts --generators sdk,zod,mock
+```
+
+`tanstack-query` and `swr` wrap the **throw-mode** `sdk` functions, so they require `--facade functions` and `--error-mode throw`. `transformers` requires `--date-type Date`. See the [`zod`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/zod), [`tanstack-query`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/tanstack-query), and [`mock`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/mock) examples.
+
+## Authentication
+
+A setter is generated for each `securityScheme` the runtime can apply, and each operation automatically sends the credentials its `security` requires:
+
+| Scheme                         | Setter                                    | Applied as                               |
+| ------------------------------ | ----------------------------------------- | ---------------------------------------- |
+| HTTP `bearer` / OAuth2         | `setBearer(token)`                        | `Authorization: Bearer <token>`          |
+| HTTP `basic`                   | `setBasicAuth(user, pass)`                | `Authorization: Basic <base64>`          |
+| `apiKey` (header/query/cookie) | `setApiKey(key)` / `setApiKey<Name>(key)` | the named header, query param, or cookie |
+
+`setApiKey` is unsuffixed for a single apiKey scheme; otherwise each gets `setApiKey<SchemeName>`. `mutualTLS` is not injectable. Bearer and apiKey setters accept a **`TokenProvider`** — a string or a (possibly async) function called per request, handy for refresh flows:
+
+```ts
+import { setBearer } from './client.ts';
+
+setBearer(async () => await getFreshAccessToken());
+```
+
+These setters are **module-global**. With `--facade service-class`, give each instance its own credentials via `ClientConfig.auth` (it overrides the global setters for that instance):
+
+```ts
+const internal = new Client({ auth: { basic: { username: 'svc', password: 's3cr3t' } } });
+const publicApi = new Client(); // no auth
+```
+
+## Argument style
+
+By default (`--args-style flat`) each operation takes positional arguments — path params in URL order, then `params` (query), `body`, and `headers` — with the per-call `init` last. With `--args-style grouped`, every input is bundled into one `vars` object typed as the operation's `<Op>Variables`:
+
+```ts
+// flat (default)
+await updateOrder('ord_01khr…', { ...orderBody });
+
+// grouped — order-independent, a good fit for React Query / SWR mutationFns
+await updateOrder({ orderId: 'ord_01khr…', body: { ...orderBody } });
+```
+
+## Error handling
+
+By default (`--error-mode throw`) an operation throws `ApiError` on any non-2xx response and returns the success body directly. With `--error-mode result` it never throws for HTTP errors, returning a discriminated `Result<TData, TError>` whose `error` is typed from the spec's 4xx/5xx bodies:
+
+```ts
+// throw (default)
+try {
+  const order = await getOrderById('ord_123');
+} catch (err) {
+  if (err instanceof ApiError) console.error(err.status, err.body);
+}
+
+// result
+const { data, error, response } = await getOrderById('ord_123');
+if (error) console.error(response.status, error.title);
+else console.log(data.id);
+```
+
+Transport and abort failures still throw in both modes. The choice is fixed at generate time.
+
+## Middleware
+
+Beyond the single `onRequest`/`onResponse`/`onError` hooks on `ClientConfig`, the client takes **composable middleware** for cross-cutting concerns (auth refresh, logging, tracing, request IDs). Register with `use()` (functions facade) or `<Client>.use()` (service-class); both accept several at once:
+
+```ts
+import { use } from './client.ts';
+
+use({
+  onRequest: (ctx) => {
+    // ctx.operation is { id, path, tags } — target by identity, not URL matching
+    if (ctx.operation.tags.includes('Orders')) {
+      ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
+    }
+  },
+});
+```
+
+`onRequest` runs in registration order; `onResponse` runs in reverse (onion). `onRequest` may mutate `ctx` (`url`/`method`/`headers`/`body` — body edits are serialized and sent); `onResponse` may return a replacement `Response`. `onError` (throw mode only) is threaded through each middleware. `ctx.operation`'s fields are typed literal unions (`OperationId`/`OperationPath`/`OperationTag`) for autocomplete and typo-checking. A single call's header instead goes in that operation's trailing `init` argument.
+
+See the [`customization` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/customization) for a runnable version.
+
+## Publisher defaults
+
+The middleware above is composed by the **consumer**. If you **publish an SDK**, bake defaults in at generation time with `--setup <file>`. The setup module imports its contract from `@redocly/client-generator` (so it resolves and is unit-testable) and default-exports `defineClientSetup({ config, middleware })`:
+
+```ts
+// client-setup.ts
+import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
+
+export default defineClientSetup({
+  config: { serverUrl: 'https://api.acme.com', retry: { retries: 3 } },
+  middleware: [
+    {
+      onRequest: (ctx: RequestContext) => {
+        ctx.headers['X-Acme-SDK'] = '1.4.0';
+      },
+    },
+  ],
+});
+```
+
+```sh
+redocly generate-client openapi.yaml --output src/api/client.ts --setup ./client-setup.ts
+```
+
+The baked block runs before the consumer's own setup. **Config values** are last-write-wins (a consumer overrides a baked default), while **middleware composes** (baked first, then the consumer's). Express un-bypassable behavior as middleware, not a baked `fetch`. A setup file may import **only** from `@redocly/client-generator`. See the [`baked-setup` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/baked-setup).
 
-## Output modes
+## Retries
 
-`--output-mode` controls how the client is split across files:
+Retry is **opt-in**, configured through `ClientConfig` with an optional per-call override:
 
-- `single` (default) — one self-contained file.
-- `split` — endpoints, schemas, and runtime in sibling files.
-- `tags` — one endpoints file per OpenAPI tag.
-- `tags-split` — a folder per tag.
+```ts
+configure({ retry: { retries: 3 } }); // global (functions facade)
+const client = new Client({ retry: { retries: 3 } }); // per instance (service-class)
+await getOrderById('ord_123', {}, { retry: { retries: 5 } }); // per call
+```
+
+By default only **idempotent** methods (`GET`, `HEAD`, `PUT`, `DELETE`, `OPTIONS`) are retried, on a network error or a transient status (`408`, `429`, `500`, `502`, `503`, `504`). `POST`/`PATCH` are not, since re-sending can duplicate side effects — opt in with a custom `retryOn` when safe. Backoff is exponential with full jitter (`retryStrategy: 'fixed'` for a constant delay); a `Retry-After` header takes precedence; an aborted `AbortSignal` stops retries immediately.
+
+| `RetryConfig` field | Type                                                 | Default                                            |
+| ------------------- | ---------------------------------------------------- | -------------------------------------------------- |
+| `retries`           | `number`                                             | `0` (extra attempts after the first; `0` disables) |
+| `retryDelay`        | `number`                                             | `1000` (base delay, ms)                            |
+| `retryStrategy`     | `'fixed' \| 'exponential'`                           | `'exponential'`                                    |
+| `jitter`            | `boolean`                                            | `true`                                             |
+| `retryOn`           | `(ctx: RetryContext) => boolean \| Promise<boolean>` | idempotent-only predicate                          |
+
+A custom `retryOn` receives the failed attempt's `RetryContext` (`attempt`, `request`, and exactly one of `response` / `error`) and **fully replaces** the default. To inspect a response body, read `ctx.response.clone()` — the body is a single-use stream:
+
+```ts
+await createOrder(body, {
+  retry: {
+    retries: 3,
+    retryOn: async (ctx) => {
+      if (ctx.error) return true; // transport error
+      return (ctx.response?.status ?? 0) >= 500; // server error
+    },
+  },
+});
+```
+
+## Query serialization
+
+Query parameters follow their OpenAPI `style` / `explode` / `allowReserved`. The default (`form`, `explode: true`) repeats array values:
+
+| `style`          | `explode` | `['a', 'b']` on the wire |
+| ---------------- | --------- | ------------------------ |
+| `form` (default) | `true`    | `key=a&key=b`            |
+| `form`           | `false`   | `key=a,b`                |
+| `spaceDelimited` | `false`   | `key=a%20b`              |
+| `pipeDelimited`  | `false`   | `key=a\|b`               |
+
+Delimiters are literal (values are still percent-encoded). `allowReserved: true` leaves the RFC-3986 reserved set un-encoded. Object-valued params serialize as `deepObject` brackets (`key[sub]=val`).
+
+## Multipart uploads
+
+A `multipart/form-data` body whose schema is an **object** is generated as a typed object; pass a plain object and the client serializes it to `FormData` (after the `onRequest` chain, so middleware can mutate it). Binary fields (`format: binary`) are typed as `Blob`:
+
+```ts
+// type UploadBody = { file: Blob; orgId: string; tags?: string[] };
+await upload({ file, orgId: 'org_1', tags: ['a', 'b'] });
+```
+
+`Blob`/strings pass through, arrays append one field per item, nested objects are JSON-encoded, `undefined`/`null` are skipped. A multipart body whose schema isn't a concrete object keeps the raw `FormData` type. `format: byte` (base64) stays a `string`.
+
+## Response decoding
+
+The client reads each response by negotiating from its `Content-Type` (JSON, then `text/*`, then `Blob`). Force a reader per call with `parseAs`:
+
+```ts
+const res = await getMenuItemPhoto('prd_123', { parseAs: 'stream' });
+```
+
+`parseAs` accepts `'json'`, `'text'`, `'blob'`, `'arrayBuffer'`, `'formData'`, `'stream'`, or `'auto'` (default). It changes the runtime reader only, not the static return type.
+
+## Operation metadata
+
+The client exports an `OPERATIONS` map keyed by operationId, holding each operation's `method`, `path` template, and `tags`:
+
+```ts
+export const OPERATIONS = {
+  getOrderById: { method: 'GET', path: '/orders/{orderId}', tags: ['Orders'] },
+  // …
+} as const;
+```
+
+Because keys and values are plain string literals, they survive bundling/minification — making `OPERATIONS` the stable handle for cache keys, span names, or log labels (rather than `fn.name`, which a minifier can rename). The same `OperationId` / `OperationPath` / `OperationTag` unions type `ctx.operation` in middleware.
+
+## Discriminated unions
+
+A `oneOf` / `anyOf` with a usable discriminator gets an exported `is<Member>` type guard per member, taken from the spec's `discriminator` or inferred when every member pins a shared property to a distinct string `const`:
+
+```ts
+export type MenuItem = Beverage | Dessert;
+export function isBeverage(value: MenuItem): value is Beverage { … }
+```
+
+Guards are also emitted for unions nested inside another schema (array items, property values) as long as every member is a named schema. A union without a usable discriminator gets no guard.
+
+## Server-Sent Events
+
+An operation whose `2xx` response declares `text/event-stream` is generated as a typed async iterator under an `sse` namespace — no flag required. Each event's `data` is typed from the OpenAPI 3.2 `itemSchema` (falling back to the media `schema`, then `string`) and `JSON.parse`d when structured:
+
+```ts
+import { sse } from './client.ts';
+
+for await (const ev of sse.streamMessages()) {
+  console.log(ev.id, ev.data.text); // ServerSentEvent<T>: { event?, data, id?, retry? }
+}
+```
+
+The stream **auto-reconnects** on a dropped connection, resuming from the last event id via `Last-Event-ID` (backoff honors the server's `retry:`, then `reconnectDelay`, then 1s; capped at 30s). Tune per call with `{ reconnect: false }` or `{ reconnectDelay: 500 }`. `break`ing the loop or aborting an `AbortSignal` ends it cleanly (no throw). SSE always throws `ApiError` on a non-2xx initial response, regardless of `--error-mode`.
+
+## Custom generators
+
+The built-in generators cover common targets. For anything else derived from the same description (validators in another library, a permissions map, a house-style SDK), write a **custom generator**: it reads the same spec-agnostic model the built-ins consume, so its output never drifts from the spec.
+
+A generator is `{ name, run }` (plus optional compatibility metadata); author it with `defineGenerator`:
+
+```ts
+// route-map-generator.ts
+import { defineGenerator } from '@redocly/client-generator';
+
+export default defineGenerator({
+  name: 'route-map',
+  requires: ['sdk'],
+  run({ model, outputPath }) {
+    const routes = model.services
+      .flatMap((s) => s.operations)
+      .map((op) => `  ${op.name}: '${op.method.toUpperCase()} ${op.path}',`)
+      .join('\n');
+    return [
+      {
+        path: outputPath.replace(/\.ts$/, '.routes.ts'),
+        content: `export const routes = {\n${routes}\n} as const;\n`,
+      },
+    ];
+  },
+});
+```
+
+The `@redocly/client-generator` entry also exports the codegen toolkit (`ts`, `printStatements`, `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, …) and the IR types, so a custom generator emits TypeScript exactly as the first-party ones do.
+
+Select it in `redocly.yaml` by path or package name:
+
+```yaml
+apis:
+  cafe:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
+        - ./tools/route-map-generator.ts # local path (resolved against redocly.yaml)
+        - '@acme/openapi-valibot' # published package
+```
+
+Or register one **inline** with the programmatic API and select it by name:
+
+```ts
+import { generateClient } from '@redocly/client-generator';
+import routeMap from './tools/route-map-generator.ts';
+
+await generateClient({
+  api: './openapi.yaml',
+  output: './src/api/client.ts',
+  customGenerators: [routeMap],
+  generators: ['sdk', 'route-map'],
+});
+```
 
-All multi-file modes share the schemas and runtime modules; `--output` names the entry file, and the siblings derive from its name and directory.
+Import-specifier generators execute at generation time — they carry the same trust level as any installed dependency you run. See the [`custom-generator` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/custom-generator).
 
 ## Resources
 
-- [Use the generated client](./generate-client-usage.md) — the runtime API and the add-on generators.
-- [`client` configuration](../configuration/client.md) — the `redocly.yaml` `client` block.
 - [Lint command](./lint.md) to validate your API description before generating a client.
 - [Bundle command](./bundle.md) to combine a multi-file description into a single input file.
+- [Configuration](../configuration/index.md) reference for `redocly.yaml`, including the `apis:` aliases you can pass as `<api>`.
diff --git a/docs/@v2/configuration/client.md b/docs/@v2/configuration/client.md
deleted file mode 100644
index 8a1d9cc99b..0000000000
--- a/docs/@v2/configuration/client.md
+++ /dev/null
@@ -1,49 +0,0 @@
----
-slug:
-  - /docs/cli/configuration/client
----
-
-# `client` configuration
-
-The [`generate-client`](../commands/generate-client.md) command reads its settings from `redocly.yaml`: a top-level `client` block holds shared defaults, and each API under `apis:` supplies its input (`root`), an optional output (`clientOutput`), and any per-API overrides under `apis.<name>.client`.
-
-```yaml
-# redocly.yaml
-client: # shared defaults for every generated client
-  generators:
-    - sdk
-  facade: functions
-apis:
-  cafe:
-    root: ./openapi.yaml # the input
-    clientOutput: ./src/api/client.ts # optional; defaults to `cafe.client.ts`
-    client: # per-API overrides (optional)
-      facade: service-class
-```
-
-```sh
-redocly generate-client              # builds every api with a `client` block, to its clientOutput
-redocly generate-client cafe         # just the `cafe` api (its client block + clientOutput)
-redocly generate-client --config ./config/redocly.yaml
-```
-
-## The `client` block
-
-The same fields are accepted at the top level (shared defaults) and under `apis.<name>.client` (per-API overrides): `generators`, `facade`, `name`, `argsStyle`, `serverUrl`, `outputMode`, `enumStyle`, `errorMode`, `dateType`, `queryFramework`, `mockData`, `mockSeed`, and `setup`. Each mirrors the matching CLI flag — see the [command options](../commands/generate-client.md#options) for what every field does.
-
-The input and output are **not** part of a `client` block:
-
-- **input** — `apis.<name>.root` (or a path/alias passed on the command line).
-- **output** — `apis.<name>.clientOutput`; when omitted it defaults to `<name>.client.ts` in the `redocly.yaml` directory. `--output` overrides it (single-API invocations only).
-
-## Precedence
-
-Settings resolve **top-level `client` → per-API `client` → CLI flags** (later wins). A plain file-path invocation ignores `apis:` and uses only the top-level `client`.
-
-For code-level control — including registering [custom generators](../commands/generate-client-usage.md#custom-generators) inline — use the programmatic `generateClient(...)` API instead.
-
-## Resources
-
-- [`generate-client` command](../commands/generate-client.md) — flags, output modes, and invocation.
-- [Use the generated client](../commands/generate-client-usage.md) — the runtime API (auth, retries, middleware, extra generators).
-- [`apis` configuration](./apis.md) — the `apis:` section and its aliases.

From 25d8f189cd950d702737249aa0b459d5545f56fd Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 22:22:11 +0300
Subject: [PATCH 062/134] docs: drop the extra generate-client sidebar entries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow-up to the single-page revert — remove the generate-client (client usage) and
configuration/client.md sidebar entries left over from the split.
---
 docs/@v2/v2.sidebars.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/@v2/v2.sidebars.yaml b/docs/@v2/v2.sidebars.yaml
index dd4ea60eb5..e9de7896ab 100644
--- a/docs/@v2/v2.sidebars.yaml
+++ b/docs/@v2/v2.sidebars.yaml
@@ -20,8 +20,6 @@
           page: commands/generate-arazzo.md
         - label: generate-client
           page: commands/generate-client.md
-        - label: generate-client (client usage)
-          page: commands/generate-client-usage.md
         - label: join
           page: commands/join.md
         - label: lint
@@ -200,7 +198,6 @@
         - page: configuration/extends.md
         - page: configuration/rules.md
         - page: configuration/apis.md
-        - page: configuration/client.md
         - group: Reference
           items:
             - page: configuration/reference/apis.md

From 6f465490892f75eb7ebd682b95244655a238b63f Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 22:28:15 +0300
Subject: [PATCH 063/134] docs: client usage as a guide, client config under
 configuration/reference
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Re-split generate-client the way the docs are organized:
- commands/generate-client.md — the command reference (flags, output modes)
- guides/use-generated-client.md — a usage guide for the generated client (auth,
  error modes, middleware, retries, add-on generators), in the Guides group
- configuration/reference/client.md — the `client` config-key reference, alongside
  the other reference pages (apis, rules, …)

Cross-page anchor links wired; all three added to the v2 sidebar (Commands, Guides,
Configuration → Reference).
---
 docs/@v2/commands/generate-client.md       | 333 ++-------------------
 docs/@v2/configuration/reference/client.md |  46 +++
 docs/@v2/guides/use-generated-client.md    | 297 ++++++++++++++++++
 docs/@v2/v2.sidebars.yaml                  |   3 +
 4 files changed, 364 insertions(+), 315 deletions(-)
 create mode 100644 docs/@v2/configuration/reference/client.md
 create mode 100644 docs/@v2/guides/use-generated-client.md

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index f7122fe9fb..a1320401f1 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -16,6 +16,8 @@ Swagger 2.0 descriptions are also accepted — normalized to the 3.x shape befor
 The generated client has **zero runtime dependencies** — it uses only web-standard APIs (`fetch`, `AbortController`, `URLSearchParams`, …), so it runs in browsers, Node, Bun, Deno, and edge runtimes.
 By default it emits a single file with inline types and one async function per operation.
 
+This page covers running the command; for the generated client's runtime API (auth, error handling, middleware, retries, and the add-on generators) see [Use the generated client](../guides/use-generated-client.md).
+
 ## Usage
 
 ```sh
@@ -24,7 +26,7 @@ redocly generate-client cafe                     # a single `apis:` alias from r
 redocly generate-client openapi.yaml -o src/client.ts   # a file path (ignores `apis:`)
 ```
 
-With **no argument**, a client is generated for every api that declares a `client` block under `apis:` (see [Configuration](#configuration)). Otherwise `<api>` is a file path, a URL, or an [`apis:` alias](../configuration/index.md): an alias uses that api's `client` block and `clientOutput`, while a plain path/URL ignores the `apis:` section and uses the top-level `client` defaults.
+With **no argument**, a client is generated for every api that declares a `client` block under `apis:` (see [`client` configuration](../configuration/reference/client.md)). Otherwise `<api>` is a file path, a URL, or an [`apis:` alias](../configuration/index.md): an alias uses that api's `client` block and `clientOutput`, while a plain path/URL ignores the `apis:` section and uses the top-level `client` defaults.
 
 ## Options
 
@@ -32,338 +34,39 @@ With **no argument**, a client is generated for every api that declares a `clien
 | ------------------- | -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `api`               | `string` | OpenAPI description file path, URL, or an `apis:` alias. Omit it to generate for every api that has a `client` block.                                                                                |
 | `--output`, `-o`    | `string` | Output path (must end in `.ts`); the entry file in multi-file modes. Defaults to the api's `clientOutput`, else `<name>.client.ts` in the config dir. Not allowed when generating for multiple apis. |
-| `--output-mode`     | `string` | File layout: `single` (default), `split` (endpoints/schemas/runtime in sibling files), `tags` (one endpoints file per tag), or `tags-split` (a folder per tag).                                      |
-| `--generators`      | `string` | Comma-separated generators to run (default `sdk`). See [Generators](#generators).                                                                                                                    |
+| `--output-mode`     | `string` | File layout: `single` (default), `split`, `tags`, or `tags-split`. See [Output modes](#output-modes).                                                                                                |
+| `--generators`      | `string` | Comma-separated generators to run (default `sdk`). See [Generators](../guides/use-generated-client.md#generators).                                                                                   |
 | `--facade`          | `string` | Operation shape: `functions` (default, standalone functions) or `service-class` (methods on a `Client` class).                                                                                       |
 | `--name`            | `string` | Class name for the `service-class` facade in `single`/`split` layouts. Default `Client`.                                                                                                             |
-| `--args-style`      | `string` | Operation inputs: `flat` (default, positional) or `grouped` (a single `vars` object). See [Argument style](#argument-style).                                                                         |
+| `--args-style`      | `string` | Operation inputs: `flat` (default, positional) or `grouped` (a single `vars` object). See [Argument style](../guides/use-generated-client.md#argument-style).                                        |
 | `--enum-style`      | `string` | Named string enums: `const-object` (default, `as const` object + union) or `union` (union only).                                                                                                     |
-| `--error-mode`      | `string` | `throw` (default, throws `ApiError`) or `result` (returns `{ data, error, response }`). See [Error handling](#error-handling).                                                                       |
+| `--error-mode`      | `string` | `throw` (default, throws `ApiError`) or `result` (returns `{ data, error, response }`). See [Error handling](../guides/use-generated-client.md#error-handling).                                      |
 | `--date-type`       | `string` | `date`/`date-time` fields as `string` (default) or `Date` (pair with the `transformers` generator).                                                                                                  |
 | `--query-framework` | `string` | TanStack Query adapter: `react` (default), `vue`, `svelte`, or `solid`.                                                                                                                              |
 | `--mock-data`       | `string` | `mock` generator data: `baked` (default, deterministic literals) or `faker` (`@faker-js/faker` calls).                                                                                               |
 | `--mock-seed`       | `number` | Seed for `faker`-mode mocks, for reproducible data. Ignored in `baked` mode.                                                                                                                         |
 | `--server-url`      | `string` | Override the server URL inlined into the runtime. Defaults to `servers[0].url`. Accepts absolute (`https://api.example.com`) or relative (`/v1`).                                                    |
-| `--setup`           | `string` | Path to a publisher setup module baked into the client. See [Publisher defaults](#publisher-defaults).                                                                                               |
+| `--setup`           | `string` | Path to a publisher setup module baked into the client. See [Publisher defaults](../guides/use-generated-client.md#publisher-defaults).                                                              |
 | `--config`          | `string` | Path to the `redocly.yaml` (the `client` config and `apis:` live there). Defaults to the one in the working directory.                                                                               |
 
 ## Configuration
 
-Put shared settings in a top-level `client` block, and give each API its input (`root`), an optional output (`clientOutput`), and any per-API overrides under `apis.<name>.client`:
-
-```yaml
-# redocly.yaml
-client: # shared defaults for every generated client
-  generators:
-    - sdk
-  facade: functions
-apis:
-  cafe:
-    root: ./openapi.yaml # the input
-    clientOutput: ./src/api/client.ts # optional; defaults to `cafe.client.ts`
-    client: # per-API overrides (optional)
-      facade: service-class
-```
-
-```sh
-redocly generate-client              # builds every api with a `client` block, to its clientOutput
-redocly generate-client cafe         # just the `cafe` api (its client block + clientOutput)
-redocly generate-client --config ./config/redocly.yaml
-```
-
-Settings resolve **top-level `client` → per-API `client` → CLI flags** (later wins). The input and output never go in a `client` block: the input is `apis.<name>.root` (or a CLI path/alias), and the output is `clientOutput`, `--output`, or the `<name>.client.ts` default. A plain file-path invocation ignores `apis:` and uses only the top-level `client`. For code-level control — including registering [custom generators](#custom-generators) inline — use the programmatic `generateClient(...)` API.
-
-## Generators
-
-`--generators` selects what to emit (default `sdk`). Each non-`sdk` generator adds a **standalone sibling module** next to the client; the client itself never imports it, so it stays dependency-free. Incompatible selections fail fast with an explanation.
-
-| Generator        | Emits                                                                                     | App peer dependency                                      |
-| ---------------- | ----------------------------------------------------------------------------------------- | -------------------------------------------------------- |
-| `sdk`            | The typed client (default).                                                               | none                                                     |
-| `zod`            | `<output>.zod.ts` — [Zod](https://zod.dev) schemas.                                       | `zod` `^3.23 \|\| ^4`                                    |
-| `tanstack-query` | `<output>.tanstack.ts` — [TanStack Query](https://tanstack.com/query) v5 factories.       | `@tanstack/<framework>-query` `^5`                       |
-| `swr`            | `<output>.swr.ts` — [SWR](https://swr.vercel.app) hooks.                                  | `swr` `^2`                                               |
-| `mock`           | `<output>.mocks.ts` — [MSW](https://mswjs.io) v2 handlers + `create<Schema>` factories.   | `msw` `^2` (+ `@faker-js/faker` for `--mock-data faker`) |
-| `transformers`   | `<output>.transformers.ts` — `transform<Name>` functions that parse wire dates to `Date`. | none                                                     |
-
-```sh
-redocly generate-client openapi.yaml --output src/client.ts --generators sdk,zod,mock
-```
-
-`tanstack-query` and `swr` wrap the **throw-mode** `sdk` functions, so they require `--facade functions` and `--error-mode throw`. `transformers` requires `--date-type Date`. See the [`zod`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/zod), [`tanstack-query`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/tanstack-query), and [`mock`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/mock) examples.
-
-## Authentication
-
-A setter is generated for each `securityScheme` the runtime can apply, and each operation automatically sends the credentials its `security` requires:
-
-| Scheme                         | Setter                                    | Applied as                               |
-| ------------------------------ | ----------------------------------------- | ---------------------------------------- |
-| HTTP `bearer` / OAuth2         | `setBearer(token)`                        | `Authorization: Bearer <token>`          |
-| HTTP `basic`                   | `setBasicAuth(user, pass)`                | `Authorization: Basic <base64>`          |
-| `apiKey` (header/query/cookie) | `setApiKey(key)` / `setApiKey<Name>(key)` | the named header, query param, or cookie |
-
-`setApiKey` is unsuffixed for a single apiKey scheme; otherwise each gets `setApiKey<SchemeName>`. `mutualTLS` is not injectable. Bearer and apiKey setters accept a **`TokenProvider`** — a string or a (possibly async) function called per request, handy for refresh flows:
-
-```ts
-import { setBearer } from './client.ts';
-
-setBearer(async () => await getFreshAccessToken());
-```
-
-These setters are **module-global**. With `--facade service-class`, give each instance its own credentials via `ClientConfig.auth` (it overrides the global setters for that instance):
-
-```ts
-const internal = new Client({ auth: { basic: { username: 'svc', password: 's3cr3t' } } });
-const publicApi = new Client(); // no auth
-```
-
-## Argument style
-
-By default (`--args-style flat`) each operation takes positional arguments — path params in URL order, then `params` (query), `body`, and `headers` — with the per-call `init` last. With `--args-style grouped`, every input is bundled into one `vars` object typed as the operation's `<Op>Variables`:
-
-```ts
-// flat (default)
-await updateOrder('ord_01khr…', { ...orderBody });
-
-// grouped — order-independent, a good fit for React Query / SWR mutationFns
-await updateOrder({ orderId: 'ord_01khr…', body: { ...orderBody } });
-```
-
-## Error handling
-
-By default (`--error-mode throw`) an operation throws `ApiError` on any non-2xx response and returns the success body directly. With `--error-mode result` it never throws for HTTP errors, returning a discriminated `Result<TData, TError>` whose `error` is typed from the spec's 4xx/5xx bodies:
-
-```ts
-// throw (default)
-try {
-  const order = await getOrderById('ord_123');
-} catch (err) {
-  if (err instanceof ApiError) console.error(err.status, err.body);
-}
-
-// result
-const { data, error, response } = await getOrderById('ord_123');
-if (error) console.error(response.status, error.title);
-else console.log(data.id);
-```
-
-Transport and abort failures still throw in both modes. The choice is fixed at generate time.
-
-## Middleware
-
-Beyond the single `onRequest`/`onResponse`/`onError` hooks on `ClientConfig`, the client takes **composable middleware** for cross-cutting concerns (auth refresh, logging, tracing, request IDs). Register with `use()` (functions facade) or `<Client>.use()` (service-class); both accept several at once:
-
-```ts
-import { use } from './client.ts';
-
-use({
-  onRequest: (ctx) => {
-    // ctx.operation is { id, path, tags } — target by identity, not URL matching
-    if (ctx.operation.tags.includes('Orders')) {
-      ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
-    }
-  },
-});
-```
-
-`onRequest` runs in registration order; `onResponse` runs in reverse (onion). `onRequest` may mutate `ctx` (`url`/`method`/`headers`/`body` — body edits are serialized and sent); `onResponse` may return a replacement `Response`. `onError` (throw mode only) is threaded through each middleware. `ctx.operation`'s fields are typed literal unions (`OperationId`/`OperationPath`/`OperationTag`) for autocomplete and typo-checking. A single call's header instead goes in that operation's trailing `init` argument.
-
-See the [`customization` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/customization) for a runnable version.
-
-## Publisher defaults
-
-The middleware above is composed by the **consumer**. If you **publish an SDK**, bake defaults in at generation time with `--setup <file>`. The setup module imports its contract from `@redocly/client-generator` (so it resolves and is unit-testable) and default-exports `defineClientSetup({ config, middleware })`:
-
-```ts
-// client-setup.ts
-import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
-
-export default defineClientSetup({
-  config: { serverUrl: 'https://api.acme.com', retry: { retries: 3 } },
-  middleware: [
-    {
-      onRequest: (ctx: RequestContext) => {
-        ctx.headers['X-Acme-SDK'] = '1.4.0';
-      },
-    },
-  ],
-});
-```
-
-```sh
-redocly generate-client openapi.yaml --output src/api/client.ts --setup ./client-setup.ts
-```
-
-The baked block runs before the consumer's own setup. **Config values** are last-write-wins (a consumer overrides a baked default), while **middleware composes** (baked first, then the consumer's). Express un-bypassable behavior as middleware, not a baked `fetch`. A setup file may import **only** from `@redocly/client-generator`. See the [`baked-setup` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/baked-setup).
+Instead of passing flags every time, keep the settings in `redocly.yaml` under a top-level `client` block and per-API `apis.<name>.client` / `clientOutput`. Settings resolve **top-level `client` → per-API `client` → CLI flags**. See [`client` configuration](../configuration/reference/client.md) for the full reference.
 
-## Retries
+## Output modes
 
-Retry is **opt-in**, configured through `ClientConfig` with an optional per-call override:
+`--output-mode` controls how the client is split across files:
 
-```ts
-configure({ retry: { retries: 3 } }); // global (functions facade)
-const client = new Client({ retry: { retries: 3 } }); // per instance (service-class)
-await getOrderById('ord_123', {}, { retry: { retries: 5 } }); // per call
-```
-
-By default only **idempotent** methods (`GET`, `HEAD`, `PUT`, `DELETE`, `OPTIONS`) are retried, on a network error or a transient status (`408`, `429`, `500`, `502`, `503`, `504`). `POST`/`PATCH` are not, since re-sending can duplicate side effects — opt in with a custom `retryOn` when safe. Backoff is exponential with full jitter (`retryStrategy: 'fixed'` for a constant delay); a `Retry-After` header takes precedence; an aborted `AbortSignal` stops retries immediately.
-
-| `RetryConfig` field | Type                                                 | Default                                            |
-| ------------------- | ---------------------------------------------------- | -------------------------------------------------- |
-| `retries`           | `number`                                             | `0` (extra attempts after the first; `0` disables) |
-| `retryDelay`        | `number`                                             | `1000` (base delay, ms)                            |
-| `retryStrategy`     | `'fixed' \| 'exponential'`                           | `'exponential'`                                    |
-| `jitter`            | `boolean`                                            | `true`                                             |
-| `retryOn`           | `(ctx: RetryContext) => boolean \| Promise<boolean>` | idempotent-only predicate                          |
-
-A custom `retryOn` receives the failed attempt's `RetryContext` (`attempt`, `request`, and exactly one of `response` / `error`) and **fully replaces** the default. To inspect a response body, read `ctx.response.clone()` — the body is a single-use stream:
-
-```ts
-await createOrder(body, {
-  retry: {
-    retries: 3,
-    retryOn: async (ctx) => {
-      if (ctx.error) return true; // transport error
-      return (ctx.response?.status ?? 0) >= 500; // server error
-    },
-  },
-});
-```
-
-## Query serialization
-
-Query parameters follow their OpenAPI `style` / `explode` / `allowReserved`. The default (`form`, `explode: true`) repeats array values:
-
-| `style`          | `explode` | `['a', 'b']` on the wire |
-| ---------------- | --------- | ------------------------ |
-| `form` (default) | `true`    | `key=a&key=b`            |
-| `form`           | `false`   | `key=a,b`                |
-| `spaceDelimited` | `false`   | `key=a%20b`              |
-| `pipeDelimited`  | `false`   | `key=a\|b`               |
-
-Delimiters are literal (values are still percent-encoded). `allowReserved: true` leaves the RFC-3986 reserved set un-encoded. Object-valued params serialize as `deepObject` brackets (`key[sub]=val`).
-
-## Multipart uploads
-
-A `multipart/form-data` body whose schema is an **object** is generated as a typed object; pass a plain object and the client serializes it to `FormData` (after the `onRequest` chain, so middleware can mutate it). Binary fields (`format: binary`) are typed as `Blob`:
-
-```ts
-// type UploadBody = { file: Blob; orgId: string; tags?: string[] };
-await upload({ file, orgId: 'org_1', tags: ['a', 'b'] });
-```
-
-`Blob`/strings pass through, arrays append one field per item, nested objects are JSON-encoded, `undefined`/`null` are skipped. A multipart body whose schema isn't a concrete object keeps the raw `FormData` type. `format: byte` (base64) stays a `string`.
-
-## Response decoding
-
-The client reads each response by negotiating from its `Content-Type` (JSON, then `text/*`, then `Blob`). Force a reader per call with `parseAs`:
-
-```ts
-const res = await getMenuItemPhoto('prd_123', { parseAs: 'stream' });
-```
-
-`parseAs` accepts `'json'`, `'text'`, `'blob'`, `'arrayBuffer'`, `'formData'`, `'stream'`, or `'auto'` (default). It changes the runtime reader only, not the static return type.
-
-## Operation metadata
-
-The client exports an `OPERATIONS` map keyed by operationId, holding each operation's `method`, `path` template, and `tags`:
-
-```ts
-export const OPERATIONS = {
-  getOrderById: { method: 'GET', path: '/orders/{orderId}', tags: ['Orders'] },
-  // …
-} as const;
-```
-
-Because keys and values are plain string literals, they survive bundling/minification — making `OPERATIONS` the stable handle for cache keys, span names, or log labels (rather than `fn.name`, which a minifier can rename). The same `OperationId` / `OperationPath` / `OperationTag` unions type `ctx.operation` in middleware.
-
-## Discriminated unions
-
-A `oneOf` / `anyOf` with a usable discriminator gets an exported `is<Member>` type guard per member, taken from the spec's `discriminator` or inferred when every member pins a shared property to a distinct string `const`:
-
-```ts
-export type MenuItem = Beverage | Dessert;
-export function isBeverage(value: MenuItem): value is Beverage { … }
-```
-
-Guards are also emitted for unions nested inside another schema (array items, property values) as long as every member is a named schema. A union without a usable discriminator gets no guard.
-
-## Server-Sent Events
-
-An operation whose `2xx` response declares `text/event-stream` is generated as a typed async iterator under an `sse` namespace — no flag required. Each event's `data` is typed from the OpenAPI 3.2 `itemSchema` (falling back to the media `schema`, then `string`) and `JSON.parse`d when structured:
-
-```ts
-import { sse } from './client.ts';
-
-for await (const ev of sse.streamMessages()) {
-  console.log(ev.id, ev.data.text); // ServerSentEvent<T>: { event?, data, id?, retry? }
-}
-```
-
-The stream **auto-reconnects** on a dropped connection, resuming from the last event id via `Last-Event-ID` (backoff honors the server's `retry:`, then `reconnectDelay`, then 1s; capped at 30s). Tune per call with `{ reconnect: false }` or `{ reconnectDelay: 500 }`. `break`ing the loop or aborting an `AbortSignal` ends it cleanly (no throw). SSE always throws `ApiError` on a non-2xx initial response, regardless of `--error-mode`.
-
-## Custom generators
-
-The built-in generators cover common targets. For anything else derived from the same description (validators in another library, a permissions map, a house-style SDK), write a **custom generator**: it reads the same spec-agnostic model the built-ins consume, so its output never drifts from the spec.
-
-A generator is `{ name, run }` (plus optional compatibility metadata); author it with `defineGenerator`:
-
-```ts
-// route-map-generator.ts
-import { defineGenerator } from '@redocly/client-generator';
-
-export default defineGenerator({
-  name: 'route-map',
-  requires: ['sdk'],
-  run({ model, outputPath }) {
-    const routes = model.services
-      .flatMap((s) => s.operations)
-      .map((op) => `  ${op.name}: '${op.method.toUpperCase()} ${op.path}',`)
-      .join('\n');
-    return [
-      {
-        path: outputPath.replace(/\.ts$/, '.routes.ts'),
-        content: `export const routes = {\n${routes}\n} as const;\n`,
-      },
-    ];
-  },
-});
-```
-
-The `@redocly/client-generator` entry also exports the codegen toolkit (`ts`, `printStatements`, `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, …) and the IR types, so a custom generator emits TypeScript exactly as the first-party ones do.
-
-Select it in `redocly.yaml` by path or package name:
-
-```yaml
-apis:
-  cafe:
-    root: ./openapi.yaml
-    clientOutput: ./src/api/client.ts
-    client:
-      generators:
-        - sdk
-        - ./tools/route-map-generator.ts # local path (resolved against redocly.yaml)
-        - '@acme/openapi-valibot' # published package
-```
-
-Or register one **inline** with the programmatic API and select it by name:
-
-```ts
-import { generateClient } from '@redocly/client-generator';
-import routeMap from './tools/route-map-generator.ts';
-
-await generateClient({
-  api: './openapi.yaml',
-  output: './src/api/client.ts',
-  customGenerators: [routeMap],
-  generators: ['sdk', 'route-map'],
-});
-```
+- `single` (default) — one self-contained file.
+- `split` — endpoints, schemas, and runtime in sibling files.
+- `tags` — one endpoints file per OpenAPI tag.
+- `tags-split` — a folder per tag.
 
-Import-specifier generators execute at generation time — they carry the same trust level as any installed dependency you run. See the [`custom-generator` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/custom-generator).
+All multi-file modes share the schemas and runtime modules; `--output` names the entry file, and the siblings derive from its name and directory.
 
 ## Resources
 
+- [Use the generated client](../guides/use-generated-client.md) — the runtime API and the add-on generators.
+- [`client` configuration](../configuration/reference/client.md) — the `redocly.yaml` `client` block.
 - [Lint command](./lint.md) to validate your API description before generating a client.
 - [Bundle command](./bundle.md) to combine a multi-file description into a single input file.
-- [Configuration](../configuration/index.md) reference for `redocly.yaml`, including the `apis:` aliases you can pass as `<api>`.
diff --git a/docs/@v2/configuration/reference/client.md b/docs/@v2/configuration/reference/client.md
new file mode 100644
index 0000000000..f942951c27
--- /dev/null
+++ b/docs/@v2/configuration/reference/client.md
@@ -0,0 +1,46 @@
+# `client`
+
+## Introduction
+
+The [`generate-client`](../../commands/generate-client.md) command reads its settings from `redocly.yaml`: a top-level `client` block holds shared defaults, and each API under `apis:` supplies its input (`root`), an optional output (`clientOutput`), and any per-API overrides under `apis.<name>.client`.
+
+```yaml
+# redocly.yaml
+client: # shared defaults for every generated client
+  generators:
+    - sdk
+  facade: functions
+apis:
+  cafe:
+    root: ./openapi.yaml # the input
+    clientOutput: ./src/api/client.ts # optional; defaults to `cafe.client.ts`
+    client: # per-API overrides (optional)
+      facade: service-class
+```
+
+```sh
+redocly generate-client              # builds every api with a `client` block, to its clientOutput
+redocly generate-client cafe         # just the `cafe` api (its client block + clientOutput)
+redocly generate-client --config ./config/redocly.yaml
+```
+
+## Options
+
+The same fields are accepted at the top level (shared defaults) and under `apis.<name>.client` (per-API overrides): `generators`, `facade`, `name`, `argsStyle`, `serverUrl`, `outputMode`, `enumStyle`, `errorMode`, `dateType`, `queryFramework`, `mockData`, `mockSeed`, and `setup`. Each mirrors the matching CLI flag — see the [command options](../../commands/generate-client.md#options) for what every field does.
+
+The input and output are **not** part of a `client` block:
+
+- **input** — `apis.<name>.root` (or a path/alias passed on the command line).
+- **output** — `apis.<name>.clientOutput`; when omitted it defaults to `<name>.client.ts` in the `redocly.yaml` directory. `--output` overrides it (single-API invocations only).
+
+## Precedence
+
+Settings resolve **top-level `client` → per-API `client` → CLI flags** (later wins). A plain file-path invocation ignores `apis:` and uses only the top-level `client`.
+
+For code-level control — including registering [custom generators](../../guides/use-generated-client.md#custom-generators) inline — use the programmatic `generateClient(...)` API instead.
+
+## Resources
+
+- [`generate-client` command](../../commands/generate-client.md) — flags, output modes, and invocation.
+- [Use the generated client](../../guides/use-generated-client.md) — the runtime API (auth, retries, middleware, extra generators).
+- [`apis` configuration](../apis.md) — the `apis:` section and its aliases.
diff --git a/docs/@v2/guides/use-generated-client.md b/docs/@v2/guides/use-generated-client.md
new file mode 100644
index 0000000000..54638c822d
--- /dev/null
+++ b/docs/@v2/guides/use-generated-client.md
@@ -0,0 +1,297 @@
+# Use the generated client
+
+How to consume the TypeScript client produced by [`generate-client`](../commands/generate-client.md): authentication, argument styles, error handling, middleware, retries, and the optional add-on generators. For invoking the command itself (flags, output modes, config), see the [`generate-client` command reference](../commands/generate-client.md).
+
+## Generators
+
+`--generators` selects what to emit (default `sdk`). Each non-`sdk` generator adds a **standalone sibling module** next to the client; the client itself never imports it, so it stays dependency-free. Incompatible selections fail fast with an explanation.
+
+| Generator        | Emits                                                                                     | App peer dependency                                      |
+| ---------------- | ----------------------------------------------------------------------------------------- | -------------------------------------------------------- |
+| `sdk`            | The typed client (default).                                                               | none                                                     |
+| `zod`            | `<output>.zod.ts` — [Zod](https://zod.dev) schemas.                                       | `zod` `^3.23 \|\| ^4`                                    |
+| `tanstack-query` | `<output>.tanstack.ts` — [TanStack Query](https://tanstack.com/query) v5 factories.       | `@tanstack/<framework>-query` `^5`                       |
+| `swr`            | `<output>.swr.ts` — [SWR](https://swr.vercel.app) hooks.                                  | `swr` `^2`                                               |
+| `mock`           | `<output>.mocks.ts` — [MSW](https://mswjs.io) v2 handlers + `create<Schema>` factories.   | `msw` `^2` (+ `@faker-js/faker` for `--mock-data faker`) |
+| `transformers`   | `<output>.transformers.ts` — `transform<Name>` functions that parse wire dates to `Date`. | none                                                     |
+
+```sh
+redocly generate-client openapi.yaml --output src/client.ts --generators sdk,zod,mock
+```
+
+`tanstack-query` and `swr` wrap the **throw-mode** `sdk` functions, so they require `--facade functions` and `--error-mode throw`. `transformers` requires `--date-type Date`. See the [`zod`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/zod), [`tanstack-query`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/tanstack-query), and [`mock`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/mock) examples.
+
+## Authentication
+
+A setter is generated for each `securityScheme` the runtime can apply, and each operation automatically sends the credentials its `security` requires:
+
+| Scheme                         | Setter                                    | Applied as                               |
+| ------------------------------ | ----------------------------------------- | ---------------------------------------- |
+| HTTP `bearer` / OAuth2         | `setBearer(token)`                        | `Authorization: Bearer <token>`          |
+| HTTP `basic`                   | `setBasicAuth(user, pass)`                | `Authorization: Basic <base64>`          |
+| `apiKey` (header/query/cookie) | `setApiKey(key)` / `setApiKey<Name>(key)` | the named header, query param, or cookie |
+
+`setApiKey` is unsuffixed for a single apiKey scheme; otherwise each gets `setApiKey<SchemeName>`. `mutualTLS` is not injectable. Bearer and apiKey setters accept a **`TokenProvider`** — a string or a (possibly async) function called per request, handy for refresh flows:
+
+```ts
+import { setBearer } from './client.ts';
+
+setBearer(async () => await getFreshAccessToken());
+```
+
+These setters are **module-global**. With `--facade service-class`, give each instance its own credentials via `ClientConfig.auth` (it overrides the global setters for that instance):
+
+```ts
+const internal = new Client({ auth: { basic: { username: 'svc', password: 's3cr3t' } } });
+const publicApi = new Client(); // no auth
+```
+
+## Argument style
+
+By default (`--args-style flat`) each operation takes positional arguments — path params in URL order, then `params` (query), `body`, and `headers` — with the per-call `init` last. With `--args-style grouped`, every input is bundled into one `vars` object typed as the operation's `<Op>Variables`:
+
+```ts
+// flat (default)
+await updateOrder('ord_01khr…', { ...orderBody });
+
+// grouped — order-independent, a good fit for React Query / SWR mutationFns
+await updateOrder({ orderId: 'ord_01khr…', body: { ...orderBody } });
+```
+
+## Error handling
+
+By default (`--error-mode throw`) an operation throws `ApiError` on any non-2xx response and returns the success body directly. With `--error-mode result` it never throws for HTTP errors, returning a discriminated `Result<TData, TError>` whose `error` is typed from the spec's 4xx/5xx bodies:
+
+```ts
+// throw (default)
+try {
+  const order = await getOrderById('ord_123');
+} catch (err) {
+  if (err instanceof ApiError) console.error(err.status, err.body);
+}
+
+// result
+const { data, error, response } = await getOrderById('ord_123');
+if (error) console.error(response.status, error.title);
+else console.log(data.id);
+```
+
+Transport and abort failures still throw in both modes. The choice is fixed at generate time.
+
+## Middleware
+
+Beyond the single `onRequest`/`onResponse`/`onError` hooks on `ClientConfig`, the client takes **composable middleware** for cross-cutting concerns (auth refresh, logging, tracing, request IDs). Register with `use()` (functions facade) or `<Client>.use()` (service-class); both accept several at once:
+
+```ts
+import { use } from './client.ts';
+
+use({
+  onRequest: (ctx) => {
+    // ctx.operation is { id, path, tags } — target by identity, not URL matching
+    if (ctx.operation.tags.includes('Orders')) {
+      ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
+    }
+  },
+});
+```
+
+`onRequest` runs in registration order; `onResponse` runs in reverse (onion). `onRequest` may mutate `ctx` (`url`/`method`/`headers`/`body` — body edits are serialized and sent); `onResponse` may return a replacement `Response`. `onError` (throw mode only) is threaded through each middleware. `ctx.operation`'s fields are typed literal unions (`OperationId`/`OperationPath`/`OperationTag`) for autocomplete and typo-checking. A single call's header instead goes in that operation's trailing `init` argument.
+
+See the [`customization` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/customization) for a runnable version.
+
+## Publisher defaults
+
+The middleware above is composed by the **consumer**. If you **publish an SDK**, bake defaults in at generation time with `--setup <file>`. The setup module imports its contract from `@redocly/client-generator` (so it resolves and is unit-testable) and default-exports `defineClientSetup({ config, middleware })`:
+
+```ts
+// client-setup.ts
+import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
+
+export default defineClientSetup({
+  config: { serverUrl: 'https://api.acme.com', retry: { retries: 3 } },
+  middleware: [
+    {
+      onRequest: (ctx: RequestContext) => {
+        ctx.headers['X-Acme-SDK'] = '1.4.0';
+      },
+    },
+  ],
+});
+```
+
+```sh
+redocly generate-client openapi.yaml --output src/api/client.ts --setup ./client-setup.ts
+```
+
+The baked block runs before the consumer's own setup. **Config values** are last-write-wins (a consumer overrides a baked default), while **middleware composes** (baked first, then the consumer's). Express un-bypassable behavior as middleware, not a baked `fetch`. A setup file may import **only** from `@redocly/client-generator`. See the [`baked-setup` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/baked-setup).
+
+## Retries
+
+Retry is **opt-in**, configured through `ClientConfig` with an optional per-call override:
+
+```ts
+configure({ retry: { retries: 3 } }); // global (functions facade)
+const client = new Client({ retry: { retries: 3 } }); // per instance (service-class)
+await getOrderById('ord_123', {}, { retry: { retries: 5 } }); // per call
+```
+
+By default only **idempotent** methods (`GET`, `HEAD`, `PUT`, `DELETE`, `OPTIONS`) are retried, on a network error or a transient status (`408`, `429`, `500`, `502`, `503`, `504`). `POST`/`PATCH` are not, since re-sending can duplicate side effects — opt in with a custom `retryOn` when safe. Backoff is exponential with full jitter (`retryStrategy: 'fixed'` for a constant delay); a `Retry-After` header takes precedence; an aborted `AbortSignal` stops retries immediately.
+
+| `RetryConfig` field | Type                                                 | Default                                            |
+| ------------------- | ---------------------------------------------------- | -------------------------------------------------- |
+| `retries`           | `number`                                             | `0` (extra attempts after the first; `0` disables) |
+| `retryDelay`        | `number`                                             | `1000` (base delay, ms)                            |
+| `retryStrategy`     | `'fixed' \| 'exponential'`                           | `'exponential'`                                    |
+| `jitter`            | `boolean`                                            | `true`                                             |
+| `retryOn`           | `(ctx: RetryContext) => boolean \| Promise<boolean>` | idempotent-only predicate                          |
+
+A custom `retryOn` receives the failed attempt's `RetryContext` (`attempt`, `request`, and exactly one of `response` / `error`) and **fully replaces** the default. To inspect a response body, read `ctx.response.clone()` — the body is a single-use stream:
+
+```ts
+await createOrder(body, {
+  retry: {
+    retries: 3,
+    retryOn: async (ctx) => {
+      if (ctx.error) return true; // transport error
+      return (ctx.response?.status ?? 0) >= 500; // server error
+    },
+  },
+});
+```
+
+## Query serialization
+
+Query parameters follow their OpenAPI `style` / `explode` / `allowReserved`. The default (`form`, `explode: true`) repeats array values:
+
+| `style`          | `explode` | `['a', 'b']` on the wire |
+| ---------------- | --------- | ------------------------ |
+| `form` (default) | `true`    | `key=a&key=b`            |
+| `form`           | `false`   | `key=a,b`                |
+| `spaceDelimited` | `false`   | `key=a%20b`              |
+| `pipeDelimited`  | `false`   | `key=a\|b`               |
+
+Delimiters are literal (values are still percent-encoded). `allowReserved: true` leaves the RFC-3986 reserved set un-encoded. Object-valued params serialize as `deepObject` brackets (`key[sub]=val`).
+
+## Multipart uploads
+
+A `multipart/form-data` body whose schema is an **object** is generated as a typed object; pass a plain object and the client serializes it to `FormData` (after the `onRequest` chain, so middleware can mutate it). Binary fields (`format: binary`) are typed as `Blob`:
+
+```ts
+// type UploadBody = { file: Blob; orgId: string; tags?: string[] };
+await upload({ file, orgId: 'org_1', tags: ['a', 'b'] });
+```
+
+`Blob`/strings pass through, arrays append one field per item, nested objects are JSON-encoded, `undefined`/`null` are skipped. A multipart body whose schema isn't a concrete object keeps the raw `FormData` type. `format: byte` (base64) stays a `string`.
+
+## Response decoding
+
+The client reads each response by negotiating from its `Content-Type` (JSON, then `text/*`, then `Blob`). Force a reader per call with `parseAs`:
+
+```ts
+const res = await getMenuItemPhoto('prd_123', { parseAs: 'stream' });
+```
+
+`parseAs` accepts `'json'`, `'text'`, `'blob'`, `'arrayBuffer'`, `'formData'`, `'stream'`, or `'auto'` (default). It changes the runtime reader only, not the static return type.
+
+## Operation metadata
+
+The client exports an `OPERATIONS` map keyed by operationId, holding each operation's `method`, `path` template, and `tags`:
+
+```ts
+export const OPERATIONS = {
+  getOrderById: { method: 'GET', path: '/orders/{orderId}', tags: ['Orders'] },
+  // …
+} as const;
+```
+
+Because keys and values are plain string literals, they survive bundling/minification — making `OPERATIONS` the stable handle for cache keys, span names, or log labels (rather than `fn.name`, which a minifier can rename). The same `OperationId` / `OperationPath` / `OperationTag` unions type `ctx.operation` in middleware.
+
+## Discriminated unions
+
+A `oneOf` / `anyOf` with a usable discriminator gets an exported `is<Member>` type guard per member, taken from the spec's `discriminator` or inferred when every member pins a shared property to a distinct string `const`:
+
+```ts
+export type MenuItem = Beverage | Dessert;
+export function isBeverage(value: MenuItem): value is Beverage { … }
+```
+
+Guards are also emitted for unions nested inside another schema (array items, property values) as long as every member is a named schema. A union without a usable discriminator gets no guard.
+
+## Server-Sent Events
+
+An operation whose `2xx` response declares `text/event-stream` is generated as a typed async iterator under an `sse` namespace — no flag required. Each event's `data` is typed from the OpenAPI 3.2 `itemSchema` (falling back to the media `schema`, then `string`) and `JSON.parse`d when structured:
+
+```ts
+import { sse } from './client.ts';
+
+for await (const ev of sse.streamMessages()) {
+  console.log(ev.id, ev.data.text); // ServerSentEvent<T>: { event?, data, id?, retry? }
+}
+```
+
+The stream **auto-reconnects** on a dropped connection, resuming from the last event id via `Last-Event-ID` (backoff honors the server's `retry:`, then `reconnectDelay`, then 1s; capped at 30s). Tune per call with `{ reconnect: false }` or `{ reconnectDelay: 500 }`. `break`ing the loop or aborting an `AbortSignal` ends it cleanly (no throw). SSE always throws `ApiError` on a non-2xx initial response, regardless of `--error-mode`.
+
+## Custom generators
+
+The built-in generators cover common targets. For anything else derived from the same description (validators in another library, a permissions map, a house-style SDK), write a **custom generator**: it reads the same spec-agnostic model the built-ins consume, so its output never drifts from the spec.
+
+A generator is `{ name, run }` (plus optional compatibility metadata); author it with `defineGenerator`:
+
+```ts
+// route-map-generator.ts
+import { defineGenerator } from '@redocly/client-generator';
+
+export default defineGenerator({
+  name: 'route-map',
+  requires: ['sdk'],
+  run({ model, outputPath }) {
+    const routes = model.services
+      .flatMap((s) => s.operations)
+      .map((op) => `  ${op.name}: '${op.method.toUpperCase()} ${op.path}',`)
+      .join('\n');
+    return [
+      {
+        path: outputPath.replace(/\.ts$/, '.routes.ts'),
+        content: `export const routes = {\n${routes}\n} as const;\n`,
+      },
+    ];
+  },
+});
+```
+
+The `@redocly/client-generator` entry also exports the codegen toolkit (`ts`, `printStatements`, `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, …) and the IR types, so a custom generator emits TypeScript exactly as the first-party ones do.
+
+Select it in `redocly.yaml` by path or package name:
+
+```yaml
+apis:
+  cafe:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
+        - ./tools/route-map-generator.ts # local path (resolved against redocly.yaml)
+        - '@acme/openapi-valibot' # published package
+```
+
+Or register one **inline** with the programmatic API and select it by name:
+
+```ts
+import { generateClient } from '@redocly/client-generator';
+import routeMap from './tools/route-map-generator.ts';
+
+await generateClient({
+  api: './openapi.yaml',
+  output: './src/api/client.ts',
+  customGenerators: [routeMap],
+  generators: ['sdk', 'route-map'],
+});
+```
+
+Import-specifier generators execute at generation time — they carry the same trust level as any installed dependency you run. See the [`custom-generator` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/custom-generator).
+
+## Resources
+
+- [`generate-client` command](../commands/generate-client.md) — flags, output modes, and invocation.
+- [`client` configuration](../configuration/reference/client.md) — the `redocly.yaml` `client` block.
diff --git a/docs/@v2/v2.sidebars.yaml b/docs/@v2/v2.sidebars.yaml
index e9de7896ab..f17c2b7ef2 100644
--- a/docs/@v2/v2.sidebars.yaml
+++ b/docs/@v2/v2.sidebars.yaml
@@ -56,6 +56,8 @@
         - page: guides/configure-rules.md
         - page: guides/lint-and-bundle.md
           label: Lint and bundle
+        - label: Use the generated client
+          page: guides/use-generated-client.md
         - label: Hide internal APIs
           page: guides/hide-apis.md
         - label: Replace the servers URL
@@ -201,6 +203,7 @@
         - group: Reference
           items:
             - page: configuration/reference/apis.md
+            - page: configuration/reference/client.md
             - page: configuration/reference/decorators.md
             - page: configuration/reference/extends.md
             - page: configuration/reference/plugins.md

From 4158cdcb389bf53cb96c65d39dbaeec5f326efaf Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 22:44:07 +0300
Subject: [PATCH 064/134] fix(client-generator): address cursor-bot findings
 (serverUrl, dup output, setup alias, ready probe)

- Reject a bare-hostname --server-url (e.g. api.example.com): validate as an absolute
  URL or a root-relative path, not new URL(value, base) which accepts any string as a path.
- Error when two fan-out apis resolve to the same output path instead of silently
  overwriting; track resolved output paths across jobs.
- bakeSetup now unwraps a renamed defineClientSetup import (import { defineClientSetup
  as setup }); it matched the literal name before, leaving a call to a dropped import.
- The e2e readiness probe records a non-OK HTTP status as the failure reason so the
  timeout message is accurate.

Adds unit coverage for the aliased-import unwrap and e2e coverage for the duplicate
clientOutput and serverUrl validation.
---
 packages/cli/src/commands/generate-client.ts  | 38 +++++++++++----
 .../src/emitters/__tests__/setup-bake.test.ts | 10 ++++
 .../src/emitters/setup-bake.ts                | 20 ++++++--
 tests/e2e/generate-client/base.test.ts        |  1 +
 tests/e2e/generate-client/cafe.test.ts        |  1 +
 .../generate-client/redocly-config.test.ts    | 47 +++++++++++++++++++
 6 files changed, 103 insertions(+), 14 deletions(-)

diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index d851392486..89a5640989 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -46,6 +46,21 @@ function fileNameFor(name: string): string {
   return `${name.replace(/[\\/]/g, '_')}.client.ts`;
 }
 
+/**
+ * A valid inlined server URL is an absolute URL (`https://api.example.com`) or a root-relative
+ * path (`/v1`, which OpenAPI allows for `servers[].url`). A bare hostname (`api.example.com`) is
+ * rejected — `new URL(value, base)` would treat it as a path and it would concatenate wrongly.
+ */
+function isValidServerUrl(value: string): boolean {
+  if (value.startsWith('/')) return true;
+  try {
+    new URL(value); // no base — only an absolute URL with a scheme parses
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 export async function handleGenerateClient({
   argv,
   config,
@@ -113,6 +128,9 @@ export async function handleGenerateClient({
     jobs.push({ name: basename(argv.api, extname(argv.api)), api: argv.api, perApiClient: {} });
   }
 
+  // Resolved output paths, so two fan-out jobs can't silently overwrite each other.
+  const seenOutputs = new Set<string>();
+
   for (const job of jobs) {
     const merged = mergeConfig(mergeConfig(topClient, job.perApiClient), cliFlags);
 
@@ -130,16 +148,16 @@ export async function handleGenerateClient({
         `\n❌  output must point at a TypeScript file (ending in .ts).\n   Got: ${outputPath}\n`
       );
     }
-    if (merged.serverUrl !== undefined) {
-      try {
-        // Accept absolute URLs (https://api.example.com) and relative bases (/v1): OpenAPI allows
-        // relative `servers[].url`, and the runtime concatenates serverUrl + path.
-        new URL(merged.serverUrl, 'http://localhost');
-      } catch {
-        throw new HandledError(
-          `\n❌  --server-url must be a valid URL — absolute (https://api.example.com) or relative (/v1).\n   Got: ${merged.serverUrl}\n`
-        );
-      }
+    if (seenOutputs.has(outputPath)) {
+      throw new HandledError(
+        `\n❌  Two APIs resolve to the same output path: ${outputPath}.\n   Give each api a distinct \`clientOutput\`.\n`
+      );
+    }
+    seenOutputs.add(outputPath);
+    if (merged.serverUrl !== undefined && !isValidServerUrl(merged.serverUrl)) {
+      throw new HandledError(
+        `\n❌  --server-url must be an absolute URL (https://api.example.com) or a root-relative path (/v1).\n   Got: ${merged.serverUrl}\n`
+      );
     }
 
     try {
diff --git a/packages/client-generator/src/emitters/__tests__/setup-bake.test.ts b/packages/client-generator/src/emitters/__tests__/setup-bake.test.ts
index 03196b6a3e..50d81d2d63 100644
--- a/packages/client-generator/src/emitters/__tests__/setup-bake.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/setup-bake.test.ts
@@ -37,6 +37,16 @@ describe('bakeSetup', () => {
     expect(out).toBe("{ config: { serverUrl: 'https://x' } }");
   });
 
+  it('unwraps a renamed (aliased) defineClientSetup import', () => {
+    const out = bakeSetup(outdent`
+      import { defineClientSetup as setup } from '@redocly/client-generator';
+      export default setup({ config: { serverUrl: 'https://x' } });
+    `);
+    // The alias is unwrapped to the bare argument — no dangling call to the dropped import.
+    expect(out).toBe("{ config: { serverUrl: 'https://x' } }");
+    expect(out).not.toContain('setup(');
+  });
+
   it('wraps file-level helper declarations in an IIFE so they are preserved and scoped', () => {
     const out = bakeSetup(outdent`
       import { defineClientSetup } from '@redocly/client-generator';
diff --git a/packages/client-generator/src/emitters/setup-bake.ts b/packages/client-generator/src/emitters/setup-bake.ts
index 3a6d6f5c29..39f49af42f 100644
--- a/packages/client-generator/src/emitters/setup-bake.ts
+++ b/packages/client-generator/src/emitters/setup-bake.ts
@@ -26,6 +26,9 @@ export function bakeSetup(source: string): string {
   );
   const kept: string[] = [];
   let argText: string | undefined;
+  // The local name `defineClientSetup` is imported as (it may be aliased:
+  // `import { defineClientSetup as setup }`), so `unwrap` matches the right callee.
+  let defineClientSetupLocal = 'defineClientSetup';
 
   for (const stmt of sf.statements) {
     if (ts.isImportDeclaration(stmt)) {
@@ -36,10 +39,18 @@ export function bakeSetup(source: string): string {
             `Setup code may use web globals and the client contract only (keeps the client zero-dependency).`
         );
       }
+      const named = stmt.importClause?.namedBindings;
+      if (named && ts.isNamedImports(named)) {
+        for (const el of named.elements) {
+          if ((el.propertyName?.text ?? el.name.text) === 'defineClientSetup') {
+            defineClientSetupLocal = el.name.text;
+          }
+        }
+      }
       continue; // drop — the symbols resolve in the baked client's own scope
     }
     if (ts.isExportAssignment(stmt) && !stmt.isExportEquals) {
-      argText = unwrap(stmt.expression).getText(sf);
+      argText = unwrap(stmt.expression, defineClientSetupLocal).getText(sf);
       continue;
     }
     kept.push(stmt.getText(sf));
@@ -55,12 +66,13 @@ export function bakeSetup(source: string): string {
   return `(() => {\n${kept.join('\n')}\nreturn ${argText};\n})()`;
 }
 
-/** `defineClientSetup(<arg>)` → `<arg>`; a bare object literal passes through unchanged. */
-function unwrap(expr: ts.Expression): ts.Expression {
+/** `defineClientSetup(<arg>)` → `<arg>`; a bare object literal passes through unchanged.
+ * `localName` is the (possibly aliased) local binding the setup module imported it as. */
+function unwrap(expr: ts.Expression, localName: string): ts.Expression {
   if (
     ts.isCallExpression(expr) &&
     ts.isIdentifier(expr.expression) &&
-    expr.expression.text === 'defineClientSetup' &&
+    expr.expression.text === localName &&
     expr.arguments.length === 1
   ) {
     return expr.arguments[0];
diff --git a/tests/e2e/generate-client/base.test.ts b/tests/e2e/generate-client/base.test.ts
index af469dfeaa..9cc3f0a551 100644
--- a/tests/e2e/generate-client/base.test.ts
+++ b/tests/e2e/generate-client/base.test.ts
@@ -23,6 +23,7 @@ async function waitForServerReady(timeoutMs: number): Promise<void> {
     try {
       const response = await fetch(`${SERVER_BASE}/__test__/ready`);
       if (response.ok) return;
+      lastError = `readiness probe returned HTTP ${response.status}`;
     } catch (error) {
       lastError = error;
     }
diff --git a/tests/e2e/generate-client/cafe.test.ts b/tests/e2e/generate-client/cafe.test.ts
index eaa60abc39..ad5822f821 100644
--- a/tests/e2e/generate-client/cafe.test.ts
+++ b/tests/e2e/generate-client/cafe.test.ts
@@ -23,6 +23,7 @@ async function waitForServerReady(timeoutMs: number): Promise<void> {
     try {
       const response = await fetch(`${SERVER_BASE}/__test__/ready`);
       if (response.ok) return;
+      lastError = `readiness probe returned HTTP ${response.status}`;
     } catch (error) {
       lastError = error;
     }
diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
index b327edd8ae..9460b3926a 100644
--- a/tests/e2e/generate-client/redocly-config.test.ts
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -170,6 +170,53 @@ describe('generate-client redocly.yaml config', () => {
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
+  it('errors when two fan-out apis resolve to the same clientOutput', () => {
+    const dir = project(
+      [
+        'apis:',
+        '  a:',
+        '    root: ./openapi.yaml',
+        '    clientOutput: ./dupe.ts',
+        '    client: { generators: [sdk] }',
+        '  b:',
+        '    root: ./openapi.yaml',
+        '    clientOutput: ./dupe.ts',
+        '    client: { generators: [sdk] }',
+      ].join('\n') + '\n'
+    );
+    const res = run(dir);
+    expect(res.status).not.toBe(0);
+    expect(res.stderr).toContain('resolve to the same output path');
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('rejects a bare-hostname serverUrl but accepts absolute and root-relative', () => {
+    const withServerUrl = (serverUrl: string) =>
+      project(
+        [
+          'apis:',
+          '  cafe:',
+          '    root: ./openapi.yaml',
+          '    clientOutput: ./out.ts',
+          '    client:',
+          '      generators: [sdk]',
+          `      serverUrl: ${serverUrl}`,
+        ].join('\n') + '\n'
+      );
+    const bare = withServerUrl('api.example.com');
+    const bad = run(bare, ['cafe']);
+    expect(bad.status).not.toBe(0);
+    expect(bad.stderr).toContain('--server-url must be an absolute URL');
+    rmSync(bare, { recursive: true, force: true });
+
+    for (const ok of ['https://api.example.com', '/v1']) {
+      const dir = withServerUrl(ok);
+      const res = run(dir, ['cafe']);
+      expect(res.status, res.stderr).toBe(0);
+      rmSync(dir, { recursive: true, force: true });
+    }
+  }, 60_000);
+
   it('resolves a relative clientOutput against the redocly.yaml dir (via --config)', () => {
     const dir = project(
       [

From 6f21aa59db09b9b3e9eaa1d3405ad6b84b534470 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 2 Jul 2026 22:44:15 +0300
Subject: [PATCH 065/134] docs(client-generator): note retry resend +
 use()/configure middleware semantics

- Retries resend the same request (onRequest/headers()/body run once); refresh
  per-attempt via onResponse/onError/retryOn.
- use() appends (composes with baked middleware); configure({middleware}) replaces.
---
 docs/@v2/guides/use-generated-client.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/@v2/guides/use-generated-client.md b/docs/@v2/guides/use-generated-client.md
index 54638c822d..ab42ac6bde 100644
--- a/docs/@v2/guides/use-generated-client.md
+++ b/docs/@v2/guides/use-generated-client.md
@@ -97,6 +97,8 @@ use({
 
 `onRequest` runs in registration order; `onResponse` runs in reverse (onion). `onRequest` may mutate `ctx` (`url`/`method`/`headers`/`body` — body edits are serialized and sent); `onResponse` may return a replacement `Response`. `onError` (throw mode only) is threaded through each middleware. `ctx.operation`'s fields are typed literal unions (`OperationId`/`OperationPath`/`OperationTag`) for autocomplete and typo-checking. A single call's header instead goes in that operation's trailing `init` argument.
 
+`use()` **appends** to the middleware chain (it composes with any already-registered or baked-in middleware). `configure({ middleware: [...] })` **replaces** the whole chain — use it to reset, but prefer `use()` to add to existing (including [publisher-baked](#publisher-defaults)) middleware.
+
 See the [`customization` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/customization) for a runnable version.
 
 ## Publisher defaults
@@ -137,6 +139,8 @@ await getOrderById('ord_123', {}, { retry: { retries: 5 } }); // per call
 
 By default only **idempotent** methods (`GET`, `HEAD`, `PUT`, `DELETE`, `OPTIONS`) are retried, on a network error or a transient status (`408`, `429`, `500`, `502`, `503`, `504`). `POST`/`PATCH` are not, since re-sending can duplicate side effects — opt in with a custom `retryOn` when safe. Backoff is exponential with full jitter (`retryStrategy: 'fixed'` for a constant delay); a `Retry-After` header takes precedence; an aborted `AbortSignal` stops retries immediately.
 
+A retry **resends the same request** — the `onRequest` chain, `config.headers()`, and body serialization run once and are reused across attempts. To refresh a token, signature, or timestamp per attempt, do it in `onResponse`/`onError` or a custom `retryOn` rather than expecting `onRequest` to re-run.
+
 | `RetryConfig` field | Type                                                 | Default                                            |
 | ------------------- | ---------------------------------------------------- | -------------------------------------------------- |
 | `retries`           | `number`                                             | `0` (extra attempts after the first; `0` disables) |

From 3f0323cae06d987762cc051b0a3f8a8405668efe Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <roman.marshevskyy@redoc.ly>
Date: Fri, 3 Jul 2026 15:15:33 +0300
Subject: [PATCH 066/134] Update README.md

Co-authored-by: Andrew Tatomyr <andrew.tatomyr@redocly.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index affe7ef399..ca094f4822 100644
--- a/README.md
+++ b/README.md
@@ -144,7 +144,7 @@ Learn more about [Respect](https://redocly.com/respect) and [get started with AP
 > ⚠️ **Experimental** — flags, output, and configuration may change in any minor release until declared stable.
 
 Turn an OpenAPI description (3.0/3.1/3.2 or Swagger 2.0) into a typed TypeScript client with the `generate-client` command.
-The emitted client has **zero runtime dependencies** — it uses only web-standard APIs (`fetch`, `AbortController`, …), so it runs in browsers, Node, Bun, Deno, and edge runtimes.
+The emitted client has zero runtime dependencies and runs in browsers, Node, Bun, Deno, and edge runtimes.
 
 ```sh
 redocly generate-client openapi.yaml --output src/client.ts

From 59990e99db5a4075c961cda9f4981fafc006dd50 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Fri, 3 Jul 2026 17:16:17 +0300
Subject: [PATCH 067/134] docs(client-generator): new ard for msw vs mock
 server

---
 .../adr/0016-msw-generator-vs-mock-server.md  | 35 +++++++++++++++++++
 packages/client-generator/docs/adr/README.md  |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 packages/client-generator/docs/adr/0016-msw-generator-vs-mock-server.md

diff --git a/packages/client-generator/docs/adr/0016-msw-generator-vs-mock-server.md b/packages/client-generator/docs/adr/0016-msw-generator-vs-mock-server.md
new file mode 100644
index 0000000000..b517c323a2
--- /dev/null
+++ b/packages/client-generator/docs/adr/0016-msw-generator-vs-mock-server.md
@@ -0,0 +1,35 @@
+# ADR 0016: In-process MSW mocks (generated) coexist with the out-of-process mock server
+
+- Status: Accepted
+- Date: 2026-07-03
+
+## Context
+
+Two mocking mechanisms exist in this repo, and it recurs in review whether they are redundant — "why not use `@redocly/mock-server` for every mocking use case, and drop the generated [MSW](https://mswjs.io) handlers (and `faker`)?"
+
+They sit on **two orthogonal axes**, which the "redundant?" question conflates:
+
+1. **Where interception happens** — this ADR.
+   - **Generated MSW handlers** (`mock` generator, `*.mocks.ts`): run **in-process** and intercept the client's real `fetch` transparently. No change to where the client points; no port, no separate process. Work in a browser (service worker) and inside test workers (Vitest/jsdom, Storybook, Playwright-CT).
+   - **`@redocly/mock-server`**: a **separate HTTP process** on a port, serving spec-derived responses. The client must point its `baseUrl` at it. Language-agnostic and exercises the **real transport** (real `fetch` round-trip, real `AbortController`, real headers).
+2. **What data is returned** — already settled by [ADR-0010](./0010-mock-data-baked-vs-faker.md): `baked` deterministic literals (default) vs. `faker` realistic data; the mock server independently serves spec `example` values. This axis is _not_ the subject here.
+
+The dominant consumer of a generated TypeScript SDK is application code (React/Vue/…) whose testing and local-dev story is **in-process fetch interception** — which is precisely what MSW is, and what comparable generators emit, because it is the ecosystem norm. Booting a Node HTTP server inside each frontend test worker is heavier, flake-prone (port lifecycle), impossible in a browser worker, and loses transparent interception (the client's `baseUrl` must be redirected).
+
+The mock server's strengths are the mirror image: real transport (why this repo's own runtime-tier tests — `tests/e2e/generate-client/base.test.ts` / `cafe.test.ts` — run the generated client against it), a shared team/staging-like instance, and cross-language clients. Using the _generated_ mock as the harness for the _sdk_ generator's own runtime test would also be circular — a mock-generator bug could mask or cause an sdk-test failure — so the independent, spec-driven server is the trustworthy double there.
+
+## Decision
+
+Keep **both**, as complementary tools for different interception points; do not fold one into the other.
+
+- The **`mock` generator** owns **in-process** mocking: type-safe MSW handlers + data factories, co-located in the consumer's repo, overridable per test (`server.use(...)`), zero infra, browser- and test-worker-capable. It stays dependency-free for the client itself — `msw`/`@faker-js/faker` appear only in the emitted `*.mocks.ts`, never in the client ([ADR-0002](./0002-typescript-peer-dep.md), [ADR-0010](./0010-mock-data-baked-vs-faker.md)).
+- **`@redocly/mock-server`** owns **out-of-process** mocking: real-transport, language-agnostic, shared-instance scenarios — and is the independent double for this repo's runtime test tier.
+
+Neither mechanism can cover the other's primary use case well, so neither is dropped.
+
+## Consequences
+
+- The SDK's primary audience (frontend app + test code) gets the mocking mode it actually reaches for, with no running process.
+- Two mocking stories must be documented and maintained; this ADR is the reference for _why_, so the "just use the server" question does not get re-litigated per PR.
+- The genuine trim lever, if surface must shrink, is the **data axis, not the mechanism axis**: `faker` (an extra opt-in mode + peer dep) is the most marginal piece — `baked` already covers the deterministic-test case, and realistic data is mostly a demo/Storybook nicety. Dropping `faker` would be defensible; dropping the MSW generator in favor of the server would remove the one mode the primary audience needs. Revisit `faker` only if its maintenance cost outweighs demand.
+- The runtime test tier deliberately uses the independent mock server (not the generated mock) to keep sdk-failure blame unambiguous.
diff --git a/packages/client-generator/docs/adr/README.md b/packages/client-generator/docs/adr/README.md
index b8bddf076a..de50285bdc 100644
--- a/packages/client-generator/docs/adr/README.md
+++ b/packages/client-generator/docs/adr/README.md
@@ -26,6 +26,7 @@ ARCHITECTURE.md says _what is_; these ADRs say _why_.
 | [0013](./0013-experimental-status.md)            | Experimental release status & stabilization criteria             | Accepted                |
 | [0014](./0014-request-response-customization.md) | Request/response customization as a runtime contract             | Accepted                |
 | [0015](./0015-publisher-setup-bake-in.md)        | Publisher setup bake-in via `--setup`                            | Accepted                |
+| [0016](./0016-msw-generator-vs-mock-server.md)   | In-process MSW mocks coexist with the out-of-process mock server | Accepted                |
 
 ## Template
 

From d6f7e804e1b94d0706ce148df8dc8c024b7ba919 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 6 Jul 2026 15:25:48 +0300
Subject: [PATCH 068/134] feat(client-generator): runtime module + descriptor
 client (--runtime inline|package)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Extract the generated-client engine into a hand-written, directly-tested
runtime (src/runtime/, 100% coverage). Generated clients are typed operation
descriptors + an Ops type wired into createClient — identical app code in
both modes: 'inline' (default) embeds only the runtime parts the API needs;
'package' imports it from @redocly/client-generator so fixes ship via npm
update, with the emitted 'satisfies' clause as a build-time skew guard.

Collapses --facade/--name, tags output modes, setServerUrl, the sse.*
namespace, and module-global auth; split = entry + schemas. Middleware gets
literal-union ctx.operation typing. Adds 6 examples, docs, ADR-0017.
---
 .changeset/client-generator.md                |   14 +-
 .oxlintrc.json                                |   12 +-
 README.md                                     |    2 +-
 docs/@v2/commands/generate-client.md          |   86 +-
 docs/@v2/configuration/reference/client.md    |    6 +-
 docs/@v2/guides/use-generated-client.md       |   61 +-
 package.json                                  |    4 +
 packages/cli/src/commands/generate-client.ts  |    8 +-
 packages/cli/src/index.ts                     |   22 +-
 packages/client-generator/ARCHITECTURE.md     |   74 +-
 packages/client-generator/CONTEXT.md          |   95 +-
 packages/client-generator/README.md           |   52 +-
 .../docs/adr/0005-error-mode-terminals.md     |    2 +
 .../docs/adr/0006-sse-namespace.md            |    2 +
 .../docs/adr/0007-call-site-auth.md           |    2 +
 .../docs/adr/0009-per-instance-auth.md        |    2 +
 ...17-runtime-module-and-descriptor-client.md |   38 +
 packages/client-generator/docs/adr/README.md  |   37 +-
 packages/client-generator/package.json        |    3 +-
 .../scripts/generate-runtime-sources.mjs      |   57 +
 .../scripts/regenerate-examples.mjs           |    7 +-
 .../scripts/typecheck-examples.mjs            |    7 +-
 .../src/__tests__/config-file.test.ts         |    4 +-
 .../src/__tests__/index.test.ts               |   28 +-
 .../src/__tests__/runtime-contract.test.ts    |   26 -
 packages/client-generator/src/config.ts       |   10 +-
 .../__snapshots__/package-client.test.ts.snap | 1118 ++++++
 .../src/emitters/__tests__/auth.test.ts       |  347 +-
 .../src/emitters/__tests__/client.test.ts     |  594 +--
 .../src/emitters/__tests__/descriptor.test.ts |  472 +++
 .../src/emitters/__tests__/fixtures.ts        |    8 +-
 .../emitters/__tests__/inline-runtime.test.ts |  194 +
 .../src/emitters/__tests__/operations.test.ts | 2113 ++--------
 .../emitters/__tests__/package-client.test.ts |  449 +++
 .../__tests__/runtime-sources.test.ts         |   21 +
 .../src/emitters/__tests__/runtime.test.ts    |  323 --
 .../src/emitters/__tests__/setup-bake.test.ts |    2 +-
 .../emitters/__tests__/sse.deletion.test.ts   |   43 +-
 .../src/emitters/__tests__/sse.test.ts        |    8 +-
 .../emitters/__tests__/type-guards.test.ts    |   45 +-
 .../src/emitters/__tests__/types.test.ts      |   47 +-
 .../client-generator/src/emitters/auth.ts     |  740 +---
 .../client-generator/src/emitters/client.ts   |  496 +--
 .../src/emitters/descriptor.ts                |  276 ++
 .../src/emitters/inline-runtime.ts            |  100 +
 .../src/emitters/operation-aliases.ts         |   37 +-
 .../src/emitters/operation-types.ts           |    4 +-
 .../src/emitters/operations.ts                | 1140 +-----
 .../src/emitters/package-client.ts            |  365 ++
 .../src/emitters/runtime-sources.ts           |   27 +
 .../client-generator/src/emitters/runtime.ts  |  761 ----
 .../src/emitters/setup-bake.ts                |    6 +-
 packages/client-generator/src/emitters/sse.ts |    5 -
 packages/client-generator/src/emitters/ts.ts  |   33 +-
 .../src/emitters/wrapper-support.ts           |    6 +-
 .../src/generators/__tests__/index.test.ts    |   54 +-
 .../src/generators/__tests__/sdk.test.ts      |    8 +-
 .../client-generator/src/generators/index.ts  |   31 +-
 .../src/generators/resolve.ts                 |    2 +-
 .../client-generator/src/generators/swr.ts    |    2 +-
 .../src/generators/tanstack-query.ts          |    2 +-
 .../client-generator/src/generators/types.ts  |   15 +-
 packages/client-generator/src/index.ts        |   32 +-
 .../__tests__/refs.test.ts                    |  138 -
 .../src/intermediate-representation/refs.ts   |   66 -
 .../sanitize-identifiers.ts                   |    7 +-
 packages/client-generator/src/plugin.ts       |    2 +-
 .../client-generator/src/runtime-contract.ts  |   52 +-
 .../src/runtime/__tests__/auth.test.ts        |   45 +
 .../runtime/__tests__/create-client.test.ts   |  291 ++
 .../src/runtime/__tests__/errors.test.ts      |   31 +
 .../src/runtime/__tests__/index.test.ts       |  127 +
 .../src/runtime/__tests__/multipart.test.ts   |   29 +
 .../src/runtime/__tests__/parse.test.ts       |   75 +
 .../src/runtime/__tests__/retry.test.ts       |   86 +
 .../src/runtime/__tests__/send.test.ts        |  320 ++
 .../src/runtime/__tests__/sse.test.ts         |  235 ++
 .../src/runtime/__tests__/types.test.ts       |  105 +
 .../src/runtime/__tests__/url.test.ts         |  125 +
 packages/client-generator/src/runtime/auth.ts |   42 +
 .../src/runtime/create-client.ts              |  244 ++
 .../client-generator/src/runtime/errors.ts    |   24 +
 .../client-generator/src/runtime/index.ts     |   39 +
 .../client-generator/src/runtime/multipart.ts |   22 +
 .../client-generator/src/runtime/parse.ts     |   29 +
 .../client-generator/src/runtime/retry.ts     |   50 +
 packages/client-generator/src/runtime/send.ts |  142 +
 .../client-generator/src/runtime/setup.ts     |   17 +
 packages/client-generator/src/runtime/sse.ts  |  141 +
 .../client-generator/src/runtime/types.ts     |  200 +
 packages/client-generator/src/runtime/url.ts  |  104 +
 packages/client-generator/src/types.ts        |   17 +-
 .../writers/__tests__/group-by-tag.test.ts    |   74 -
 .../src/writers/__tests__/index.test.ts       |   36 +-
 .../writers/__tests__/split-writer.test.ts    |  275 +-
 .../__tests__/tags-split-writer.test.ts       |  148 -
 .../src/writers/__tests__/tags-writer.test.ts |  245 --
 .../src/writers/group-by-tag.ts               |   60 -
 .../client-generator/src/writers/index.ts     |    4 -
 .../src/writers/single-file-writer.ts         |   14 +-
 .../src/writers/split-writer.ts               |   37 +-
 .../client-generator/src/writers/tagged.ts    |   68 -
 .../src/writers/tags-split-writer.ts          |   10 -
 .../src/writers/tags-writer.ts                |    9 -
 .../client-generator/src/writers/types.ts     |    9 +-
 .../__snapshots__/redocly-yaml.test.ts.snap   |   17 +-
 packages/core/src/types/redocly-yaml.ts       |    5 +-
 .../e2e/generate-client/args-grouped.test.ts  |   32 +-
 tests/e2e/generate-client/auth.test.ts        |   80 +-
 .../e2e/generate-client/base-consumer/api.ts  | 1301 +++---
 tests/e2e/generate-client/base.test.ts        |   16 +-
 .../e2e/generate-client/cafe-consumer/api.ts  | 1994 ++++++----
 ...index-setbaseurl.ts => index-configure.ts} |   22 +-
 tests/e2e/generate-client/cafe.snapshot.ts    | 1994 ++++++----
 tests/e2e/generate-client/cafe.test.ts        |   60 +-
 tests/e2e/generate-client/error-mode.test.ts  |   38 +-
 tests/e2e/generate-client/examples.test.ts    |    7 +-
 tests/e2e/generate-client/examples/README.md  |   30 +-
 .../examples/baked-setup/redocly.yaml         |    1 -
 .../examples/baked-setup/src/api/client.ts    | 2019 +++++-----
 .../.gitignore                                |    0
 .../configure-and-middleware/README.md        |   18 +
 .../configure-and-middleware/index.html       |   11 +
 .../configure-and-middleware/openapi.yaml     |  169 +
 .../configure-and-middleware/package.json     |   16 +
 .../configure-and-middleware/redocly.yaml     |    8 +
 .../src/api/client.ts                         |  989 +++++
 .../configure-and-middleware/src/main.ts      |   97 +
 .../tsconfig.json                             |    0
 .../vite.config.ts                            |    0
 .../examples/custom-generator/redocly.yaml    |    1 -
 .../custom-generator/src/api/client.ts        | 1994 ++++++----
 .../examples/customization/redocly.yaml       |    1 -
 .../examples/customization/src/api/client.ts  | 1994 ++++++----
 .../examples/fetch-functions/README.md        |    2 +-
 .../examples/fetch-functions/redocly.yaml     |    1 -
 .../fetch-functions/src/api/client.ts         | 1994 ++++++----
 .../examples/fetch-functions/src/main.ts      |    2 +-
 .../examples/mock/redocly.yaml                |    1 -
 .../examples/mock/src/api/client.ts           | 1994 ++++++----
 .../examples/multi-instance/.gitignore        |    2 +
 .../examples/multi-instance/README.md         |   22 +
 .../examples/multi-instance/index.html        |   11 +
 .../examples/multi-instance/openapi.yaml      |   81 +
 .../examples/multi-instance/package.json      |   19 +
 .../examples/multi-instance/redocly.yaml      |   11 +
 .../examples/multi-instance/src/api/client.ts |   86 +
 .../examples/multi-instance/src/main.ts       |   77 +
 .../examples/multi-instance/tsconfig.json     |    4 +
 .../examples/multi-instance/vite.config.ts    |    3 +
 .../examples/package-runtime/.gitignore       |    2 +
 .../examples/package-runtime/README.md        |   19 +
 .../examples/package-runtime/index.html       |   11 +
 .../openapi.yaml                              |    0
 .../examples/package-runtime/package.json     |   19 +
 .../examples/package-runtime/redocly.yaml     |   12 +
 .../package-runtime/src/api/client.ts         |  967 +++++
 .../examples/package-runtime/src/main.ts      |   48 +
 .../examples/package-runtime/tsconfig.json    |    4 +
 .../examples/package-runtime/vite.config.ts   |    3 +
 .../examples/programmatic/generate.ts         |    3 +-
 .../examples/programmatic/src/api/client.ts   | 1994 ++++++----
 .../examples/service-class/README.md          |   14 -
 .../examples/service-class/package-lock.json  | 3504 -----------------
 .../examples/service-class/redocly.yaml       |   11 -
 .../examples/service-class/src/api/client.ts  | 1533 --------
 .../examples/service-class/src/main.ts        |   19 -
 .../examples/sse-streaming/.gitignore         |    2 +
 .../examples/sse-streaming/README.md          |   18 +
 .../index.html                                |    2 +-
 .../examples/sse-streaming/openapi.yaml       |   58 +
 .../package.json                              |    2 +-
 .../examples/sse-streaming/redocly.yaml       |    8 +
 .../examples/sse-streaming/src/api/client.ts  |  980 +++++
 .../examples/sse-streaming/src/main.ts        |   76 +
 .../examples/sse-streaming/tsconfig.json      |    4 +
 .../examples/sse-streaming/vite.config.ts     |    3 +
 .../examples/tanstack-query/redocly.yaml      |    1 -
 .../examples/tanstack-query/src/api/client.ts | 1994 ++++++----
 .../examples/vendored-edge/.gitignore         |    1 +
 .../examples/vendored-edge/README.md          |   18 +
 .../examples/vendored-edge/openapi.yaml       |   97 +
 .../examples/vendored-edge/package.json       |   12 +
 .../examples/vendored-edge/redocly.yaml       |   10 +
 .../examples/vendored-edge/src/api/client.ts  |  894 +++++
 .../examples/vendored-edge/tsconfig.json      |    4 +
 .../examples/vendored-edge/worker.ts          |   38 +
 .../zero-install-quickstart/.gitignore        |    1 +
 .../zero-install-quickstart/README.md         |   15 +
 .../zero-install-quickstart/openapi.yaml      |  148 +
 .../zero-install-quickstart/package.json      |   15 +
 .../zero-install-quickstart/redocly.yaml      |    8 +
 .../zero-install-quickstart/src/api/client.ts |  940 +++++
 .../zero-install-quickstart/src/main.ts       |   19 +
 .../zero-install-quickstart/tsconfig.json     |    4 +
 .../generate-client/examples/zod/redocly.yaml |    1 -
 .../examples/zod/src/api/client.ts            | 1994 ++++++----
 tests/e2e/generate-client/extension.test.ts   |   27 +-
 .../fixtures/package-runtime.yaml             |   82 +
 .../generator-contract.test.ts                |   18 +-
 .../identifier-injection.test.ts              |    5 +-
 tests/e2e/generate-client/middleware.test.ts  |   20 +-
 tests/e2e/generate-client/multipart.test.ts   |   13 +-
 .../generate-client/name-collision.test.ts    |   27 +-
 .../generate-client/operation-types.test.ts   |   13 +-
 .../e2e/generate-client/package-mode.test.ts  |  249 ++
 .../package-runtime-consumer/api.ts           |  102 +
 .../package-runtime-consumer/index.ts         |   42 +
 .../package-runtime-consumer/package.json     |    6 +
 .../package-runtime-consumer/server.ts        |   78 +
 .../package-runtime-consumer/tsconfig.json    |   17 +
 tests/e2e/generate-client/parse-as.test.ts    |   10 +-
 .../generate-client/path-param-idents.test.ts |   25 +-
 .../generate-client/per-instance-auth.test.ts |   33 +-
 .../e2e/generate-client/query-styles.test.ts  |   32 +-
 .../generate-client/redocly-config.test.ts    |   74 +-
 .../e2e/generate-client/service-class.test.ts |  296 --
 tests/e2e/generate-client/setup.test.ts       |   34 +-
 .../e2e/generate-client/spec-versions.test.ts |   10 +-
 tests/e2e/generate-client/split.test.ts       |   38 +-
 tests/e2e/generate-client/sse-consumer/api.ts | 1434 ++++---
 .../sse-consumer/index-abort.ts               |    4 +-
 .../sse-consumer/index-connect-retry.ts       |    8 +-
 .../sse-consumer/index-finite.ts              |    4 +-
 .../e2e/generate-client/sse-consumer/index.ts |    4 +-
 tests/e2e/generate-client/sse.runtime.test.ts |    2 +-
 tests/e2e/generate-client/sse.test.ts         |   77 +-
 tests/e2e/generate-client/tags-split.test.ts  |   84 -
 tests/e2e/generate-client/tags.test.ts        |   88 -
 .../generate-client/tanstack-query.test.ts    |   88 +
 vitest.config.ts                              |    7 +
 231 files changed, 26890 insertions(+), 23296 deletions(-)
 create mode 100644 packages/client-generator/docs/adr/0017-runtime-module-and-descriptor-client.md
 create mode 100644 packages/client-generator/scripts/generate-runtime-sources.mjs
 delete mode 100644 packages/client-generator/src/__tests__/runtime-contract.test.ts
 create mode 100644 packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
 create mode 100644 packages/client-generator/src/emitters/__tests__/descriptor.test.ts
 create mode 100644 packages/client-generator/src/emitters/__tests__/inline-runtime.test.ts
 create mode 100644 packages/client-generator/src/emitters/__tests__/package-client.test.ts
 create mode 100644 packages/client-generator/src/emitters/__tests__/runtime-sources.test.ts
 delete mode 100644 packages/client-generator/src/emitters/__tests__/runtime.test.ts
 create mode 100644 packages/client-generator/src/emitters/descriptor.ts
 create mode 100644 packages/client-generator/src/emitters/inline-runtime.ts
 create mode 100644 packages/client-generator/src/emitters/package-client.ts
 create mode 100644 packages/client-generator/src/emitters/runtime-sources.ts
 delete mode 100644 packages/client-generator/src/emitters/runtime.ts
 delete mode 100644 packages/client-generator/src/intermediate-representation/__tests__/refs.test.ts
 delete mode 100644 packages/client-generator/src/intermediate-representation/refs.ts
 create mode 100644 packages/client-generator/src/runtime/__tests__/auth.test.ts
 create mode 100644 packages/client-generator/src/runtime/__tests__/create-client.test.ts
 create mode 100644 packages/client-generator/src/runtime/__tests__/errors.test.ts
 create mode 100644 packages/client-generator/src/runtime/__tests__/index.test.ts
 create mode 100644 packages/client-generator/src/runtime/__tests__/multipart.test.ts
 create mode 100644 packages/client-generator/src/runtime/__tests__/parse.test.ts
 create mode 100644 packages/client-generator/src/runtime/__tests__/retry.test.ts
 create mode 100644 packages/client-generator/src/runtime/__tests__/send.test.ts
 create mode 100644 packages/client-generator/src/runtime/__tests__/sse.test.ts
 create mode 100644 packages/client-generator/src/runtime/__tests__/types.test.ts
 create mode 100644 packages/client-generator/src/runtime/__tests__/url.test.ts
 create mode 100644 packages/client-generator/src/runtime/auth.ts
 create mode 100644 packages/client-generator/src/runtime/create-client.ts
 create mode 100644 packages/client-generator/src/runtime/errors.ts
 create mode 100644 packages/client-generator/src/runtime/index.ts
 create mode 100644 packages/client-generator/src/runtime/multipart.ts
 create mode 100644 packages/client-generator/src/runtime/parse.ts
 create mode 100644 packages/client-generator/src/runtime/retry.ts
 create mode 100644 packages/client-generator/src/runtime/send.ts
 create mode 100644 packages/client-generator/src/runtime/setup.ts
 create mode 100644 packages/client-generator/src/runtime/sse.ts
 create mode 100644 packages/client-generator/src/runtime/types.ts
 create mode 100644 packages/client-generator/src/runtime/url.ts
 delete mode 100644 packages/client-generator/src/writers/__tests__/group-by-tag.test.ts
 delete mode 100644 packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts
 delete mode 100644 packages/client-generator/src/writers/__tests__/tags-writer.test.ts
 delete mode 100644 packages/client-generator/src/writers/group-by-tag.ts
 delete mode 100644 packages/client-generator/src/writers/tagged.ts
 delete mode 100644 packages/client-generator/src/writers/tags-split-writer.ts
 delete mode 100644 packages/client-generator/src/writers/tags-writer.ts
 rename tests/e2e/generate-client/cafe-consumer/{index-setbaseurl.ts => index-configure.ts} (62%)
 rename tests/e2e/generate-client/examples/{service-class => configure-and-middleware}/.gitignore (100%)
 create mode 100644 tests/e2e/generate-client/examples/configure-and-middleware/README.md
 create mode 100644 tests/e2e/generate-client/examples/configure-and-middleware/index.html
 create mode 100644 tests/e2e/generate-client/examples/configure-and-middleware/openapi.yaml
 create mode 100644 tests/e2e/generate-client/examples/configure-and-middleware/package.json
 create mode 100644 tests/e2e/generate-client/examples/configure-and-middleware/redocly.yaml
 create mode 100644 tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
 create mode 100644 tests/e2e/generate-client/examples/configure-and-middleware/src/main.ts
 rename tests/e2e/generate-client/examples/{service-class => configure-and-middleware}/tsconfig.json (100%)
 rename tests/e2e/generate-client/examples/{service-class => configure-and-middleware}/vite.config.ts (100%)
 create mode 100644 tests/e2e/generate-client/examples/multi-instance/.gitignore
 create mode 100644 tests/e2e/generate-client/examples/multi-instance/README.md
 create mode 100644 tests/e2e/generate-client/examples/multi-instance/index.html
 create mode 100644 tests/e2e/generate-client/examples/multi-instance/openapi.yaml
 create mode 100644 tests/e2e/generate-client/examples/multi-instance/package.json
 create mode 100644 tests/e2e/generate-client/examples/multi-instance/redocly.yaml
 create mode 100644 tests/e2e/generate-client/examples/multi-instance/src/api/client.ts
 create mode 100644 tests/e2e/generate-client/examples/multi-instance/src/main.ts
 create mode 100644 tests/e2e/generate-client/examples/multi-instance/tsconfig.json
 create mode 100644 tests/e2e/generate-client/examples/multi-instance/vite.config.ts
 create mode 100644 tests/e2e/generate-client/examples/package-runtime/.gitignore
 create mode 100644 tests/e2e/generate-client/examples/package-runtime/README.md
 create mode 100644 tests/e2e/generate-client/examples/package-runtime/index.html
 rename tests/e2e/generate-client/examples/{service-class => package-runtime}/openapi.yaml (100%)
 create mode 100644 tests/e2e/generate-client/examples/package-runtime/package.json
 create mode 100644 tests/e2e/generate-client/examples/package-runtime/redocly.yaml
 create mode 100644 tests/e2e/generate-client/examples/package-runtime/src/api/client.ts
 create mode 100644 tests/e2e/generate-client/examples/package-runtime/src/main.ts
 create mode 100644 tests/e2e/generate-client/examples/package-runtime/tsconfig.json
 create mode 100644 tests/e2e/generate-client/examples/package-runtime/vite.config.ts
 delete mode 100644 tests/e2e/generate-client/examples/service-class/README.md
 delete mode 100644 tests/e2e/generate-client/examples/service-class/package-lock.json
 delete mode 100644 tests/e2e/generate-client/examples/service-class/redocly.yaml
 delete mode 100644 tests/e2e/generate-client/examples/service-class/src/api/client.ts
 delete mode 100644 tests/e2e/generate-client/examples/service-class/src/main.ts
 create mode 100644 tests/e2e/generate-client/examples/sse-streaming/.gitignore
 create mode 100644 tests/e2e/generate-client/examples/sse-streaming/README.md
 rename tests/e2e/generate-client/examples/{service-class => sse-streaming}/index.html (76%)
 create mode 100644 tests/e2e/generate-client/examples/sse-streaming/openapi.yaml
 rename tests/e2e/generate-client/examples/{service-class => sse-streaming}/package.json (86%)
 create mode 100644 tests/e2e/generate-client/examples/sse-streaming/redocly.yaml
 create mode 100644 tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
 create mode 100644 tests/e2e/generate-client/examples/sse-streaming/src/main.ts
 create mode 100644 tests/e2e/generate-client/examples/sse-streaming/tsconfig.json
 create mode 100644 tests/e2e/generate-client/examples/sse-streaming/vite.config.ts
 create mode 100644 tests/e2e/generate-client/examples/vendored-edge/.gitignore
 create mode 100644 tests/e2e/generate-client/examples/vendored-edge/README.md
 create mode 100644 tests/e2e/generate-client/examples/vendored-edge/openapi.yaml
 create mode 100644 tests/e2e/generate-client/examples/vendored-edge/package.json
 create mode 100644 tests/e2e/generate-client/examples/vendored-edge/redocly.yaml
 create mode 100644 tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
 create mode 100644 tests/e2e/generate-client/examples/vendored-edge/tsconfig.json
 create mode 100644 tests/e2e/generate-client/examples/vendored-edge/worker.ts
 create mode 100644 tests/e2e/generate-client/examples/zero-install-quickstart/.gitignore
 create mode 100644 tests/e2e/generate-client/examples/zero-install-quickstart/README.md
 create mode 100644 tests/e2e/generate-client/examples/zero-install-quickstart/openapi.yaml
 create mode 100644 tests/e2e/generate-client/examples/zero-install-quickstart/package.json
 create mode 100644 tests/e2e/generate-client/examples/zero-install-quickstart/redocly.yaml
 create mode 100644 tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
 create mode 100644 tests/e2e/generate-client/examples/zero-install-quickstart/src/main.ts
 create mode 100644 tests/e2e/generate-client/examples/zero-install-quickstart/tsconfig.json
 create mode 100644 tests/e2e/generate-client/fixtures/package-runtime.yaml
 create mode 100644 tests/e2e/generate-client/package-mode.test.ts
 create mode 100644 tests/e2e/generate-client/package-runtime-consumer/api.ts
 create mode 100644 tests/e2e/generate-client/package-runtime-consumer/index.ts
 create mode 100644 tests/e2e/generate-client/package-runtime-consumer/package.json
 create mode 100644 tests/e2e/generate-client/package-runtime-consumer/server.ts
 create mode 100644 tests/e2e/generate-client/package-runtime-consumer/tsconfig.json
 delete mode 100644 tests/e2e/generate-client/service-class.test.ts
 delete mode 100644 tests/e2e/generate-client/tags-split.test.ts
 delete mode 100644 tests/e2e/generate-client/tags.test.ts

diff --git a/.changeset/client-generator.md b/.changeset/client-generator.md
index dd769dd061..0890835fbf 100644
--- a/.changeset/client-generator.md
+++ b/.changeset/client-generator.md
@@ -1,12 +1,16 @@
 ---
 '@redocly/client-generator': minor
+'@redocly/openapi-core': minor
 '@redocly/cli': minor
 ---
 
-Added an **experimental** `generate-client` command that generates a typed, zero-dependency TypeScript client from an OpenAPI description.
+Added an **experimental** `generate-client` command that generates a typed TypeScript client from an OpenAPI description — auth, retries, middleware, typed SSE streaming, and multipart out of the box, built on a hand-written, directly-tested runtime.
 
-The generated client exposes the operation's identity (`ctx.operation.{id,path,tags}`) on `RequestContext` so middleware can target requests by operationId/tags. A new `customization` example shows the request/response extension points.
+Generated clients are typed operation descriptors (`OPERATIONS … satisfies Record<string, OperationDescriptor>`) plus an `Ops` type, wired into a `createClient` instance. Every generated module exports both call styles: the `client` instance (grouped-args methods plus `configure`/`use`/`auth`) and free-function one-liners (`--args-style` shapes them), and re-exports `createClient` for additional per-tenant instances.
 
-A `--setup` flag bakes a publisher-authored `defineClientSetup({ config, middleware })` module into the generated client (all output modes, both facades), so a published SDK ships its request/response defaults built in. The package now exports the runtime contract types + `defineClientSetup` from its main entry.
-
-`ctx.operation.{id,path,tags}` and the `OPERATIONS` map are now typed as literal unions (`OperationId`/`OperationPath`/`OperationTag`, all exported), so middleware gets autocomplete and compile-time typo-checking; `OPERATIONS` entries now include `tags`.
+- `--runtime` option (`redocly.yaml`: `client.runtime`): `inline` (default) emits one self-contained, zero-dependency file, embedding only the runtime parts the API needs; `package` makes the generated file import the engine from `@redocly/client-generator`, so runtime fixes arrive via `npm update` with no regeneration. Application code is identical in both modes, and the emitted `satisfies` clause doubles as a build-time version-skew guard.
+- `--output-mode`: `single` (default) or `split` (the entry file plus a `<name>.schemas.ts` sibling). Both modes work with both runtimes.
+- Middleware sees the operation's identity as literal unions — `ctx.operation.{id,path,tags}` (`OperationId`/`OperationPath`/`OperationTag`, all exported) — so targeting requests by operationId/tags gets autocomplete and compile-time typo-checking.
+- Auth follows the spec's `securitySchemes` with per-instance credentials (`client.auth.{bearer,basic,apiKey}` / `ClientConfig.auth`) and generated `setBearer`/`setBasicAuth`/`setApiKey*` sugar bound to the default instance.
+- A `--setup` flag bakes a publisher-authored `defineClientSetup({ config, middleware })` module into the generated client (both runtimes and output modes), so a published SDK ships its request/response defaults built in — layered between the spec's defaults and the app's `configure()`. The package exports the runtime contract types + `defineClientSetup` from its main entry.
+- Companion generators from the same spec via `--generators`: `zod`, `tanstack-query` (React/Vue/Svelte/Solid), `swr`, `transformers`, `mock` (MSW, baked or faker), plus an experimental `defineGenerator` plugin API — each emits its own file and adds no dependency to the client.
diff --git a/.oxlintrc.json b/.oxlintrc.json
index 9fe6e9bb09..e8e0d1fa04 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -35,7 +35,6 @@
         "caughtErrors": "none"
       }
     ],
-
     "typescript/ban-ts-comment": "error",
     "typescript/no-empty-object-type": "error",
     "typescript/no-explicit-any": "warn",
@@ -50,7 +49,6 @@
         "fixStyle": "inline-type-imports"
       }
     ],
-
     "import/no-cycle": ["warn"],
     "import/no-duplicates": [
       "error",
@@ -58,7 +56,6 @@
         "preferInline": true
       }
     ],
-
     "oxlint-redocly-plugin/no-typeof-object": "error"
   },
   "overrides": [
@@ -76,6 +73,15 @@
       "rules": {
         "eslint/no-console": "allow"
       }
+    },
+    {
+      "files": [
+        "tests/e2e/generate-client/examples/*/src/**",
+        "tests/e2e/generate-client/examples/*/worker.ts"
+      ],
+      "rules": {
+        "eslint/no-console": "allow"
+      }
     }
   ]
 }
diff --git a/README.md b/README.md
index ca094f4822..c08012b42e 100644
--- a/README.md
+++ b/README.md
@@ -150,7 +150,7 @@ The emitted client has zero runtime dependencies and runs in browsers, Node, Bun
 redocly generate-client openapi.yaml --output src/client.ts
 ```
 
-Inline types plus one async function per operation (or `--facade service-class` for class methods), with auth, opt-in abort-aware retries, middleware, and typed Server-Sent Events.
+Inline types plus a typed client instance and one async function per operation, with auth, opt-in abort-aware retries, middleware, and typed Server-Sent Events.
 The same command can also emit Zod schemas, TanStack Query / SWR hooks, MSW mocks, and more via `--generators`.
 For detailed information, read the [ `generate-client` docs](./docs/@v2/commands/generate-client.md).
 
diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index a1320401f1..c4680f6abb 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -13,8 +13,8 @@ We'd love your feedback while we stabilize it.
 Generate a typed TypeScript client from an OpenAPI 3.x description.
 Swagger 2.0 descriptions are also accepted — normalized to the 3.x shape before generation.
 
-The generated client has **zero runtime dependencies** — it uses only web-standard APIs (`fetch`, `AbortController`, `URLSearchParams`, …), so it runs in browsers, Node, Bun, Deno, and edge runtimes.
-By default it emits a single file with inline types and one async function per operation.
+The generated client has **zero runtime dependencies** by default — it uses only web-standard APIs (`fetch`, `AbortController`, `URLSearchParams`, …), so it runs in browsers, Node, Bun, Deno, and edge runtimes.
+By default it emits a single self-contained file with inline types and one async function per operation; opt in to a versioned, npm-updatable runtime instead with [`--runtime package`](#runtime-distribution).
 
 This page covers running the command; for the generated client's runtime API (auth, error handling, middleware, retries, and the add-on generators) see [Use the generated client](../guides/use-generated-client.md).
 
@@ -30,24 +30,23 @@ With **no argument**, a client is generated for every api that declares a `clien
 
 ## Options
 
-| Option              | Type     | Description                                                                                                                                                                                          |
-| ------------------- | -------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `api`               | `string` | OpenAPI description file path, URL, or an `apis:` alias. Omit it to generate for every api that has a `client` block.                                                                                |
-| `--output`, `-o`    | `string` | Output path (must end in `.ts`); the entry file in multi-file modes. Defaults to the api's `clientOutput`, else `<name>.client.ts` in the config dir. Not allowed when generating for multiple apis. |
-| `--output-mode`     | `string` | File layout: `single` (default), `split`, `tags`, or `tags-split`. See [Output modes](#output-modes).                                                                                                |
-| `--generators`      | `string` | Comma-separated generators to run (default `sdk`). See [Generators](../guides/use-generated-client.md#generators).                                                                                   |
-| `--facade`          | `string` | Operation shape: `functions` (default, standalone functions) or `service-class` (methods on a `Client` class).                                                                                       |
-| `--name`            | `string` | Class name for the `service-class` facade in `single`/`split` layouts. Default `Client`.                                                                                                             |
-| `--args-style`      | `string` | Operation inputs: `flat` (default, positional) or `grouped` (a single `vars` object). See [Argument style](../guides/use-generated-client.md#argument-style).                                        |
-| `--enum-style`      | `string` | Named string enums: `const-object` (default, `as const` object + union) or `union` (union only).                                                                                                     |
-| `--error-mode`      | `string` | `throw` (default, throws `ApiError`) or `result` (returns `{ data, error, response }`). See [Error handling](../guides/use-generated-client.md#error-handling).                                      |
-| `--date-type`       | `string` | `date`/`date-time` fields as `string` (default) or `Date` (pair with the `transformers` generator).                                                                                                  |
-| `--query-framework` | `string` | TanStack Query adapter: `react` (default), `vue`, `svelte`, or `solid`.                                                                                                                              |
-| `--mock-data`       | `string` | `mock` generator data: `baked` (default, deterministic literals) or `faker` (`@faker-js/faker` calls).                                                                                               |
-| `--mock-seed`       | `number` | Seed for `faker`-mode mocks, for reproducible data. Ignored in `baked` mode.                                                                                                                         |
-| `--server-url`      | `string` | Override the server URL inlined into the runtime. Defaults to `servers[0].url`. Accepts absolute (`https://api.example.com`) or relative (`/v1`).                                                    |
-| `--setup`           | `string` | Path to a publisher setup module baked into the client. See [Publisher defaults](../guides/use-generated-client.md#publisher-defaults).                                                              |
-| `--config`          | `string` | Path to the `redocly.yaml` (the `client` config and `apis:` live there). Defaults to the one in the working directory.                                                                               |
+| Option              | Type     | Description                                                                                                                                                                                                                       |
+| ------------------- | -------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `api`               | `string` | OpenAPI description file path, URL, or an `apis:` alias. Omit it to generate for every api that has a `client` block.                                                                                                             |
+| `--output`, `-o`    | `string` | Output path (must end in `.ts`); the entry file in multi-file modes. Defaults to the api's `clientOutput`, else `<name>.client.ts` in the config dir. Not allowed when generating for multiple apis.                              |
+| `--output-mode`     | `string` | File layout: `single` (default) or `split`. See [Output modes](#output-modes).                                                                                                                                                    |
+| `--runtime`         | `string` | `inline` (default, self-contained file — zero runtime dependencies) or `package` (imports the runtime from `@redocly/client-generator`; engine fixes arrive via `npm update`). See [Runtime distribution](#runtime-distribution). |
+| `--generators`      | `string` | Comma-separated generators to run (default `sdk`). See [Generators](../guides/use-generated-client.md#generators).                                                                                                                |
+| `--args-style`      | `string` | Operation inputs: `flat` (default, positional) or `grouped` (a single `vars` object). See [Argument style](../guides/use-generated-client.md#argument-style).                                                                     |
+| `--enum-style`      | `string` | Named string enums: `const-object` (default, `as const` object + union) or `union` (union only).                                                                                                                                  |
+| `--error-mode`      | `string` | `throw` (default, throws `ApiError`) or `result` (returns `{ data, error, response }`). See [Error handling](../guides/use-generated-client.md#error-handling).                                                                   |
+| `--date-type`       | `string` | `date`/`date-time` fields as `string` (default) or `Date` (pair with the `transformers` generator).                                                                                                                               |
+| `--query-framework` | `string` | TanStack Query adapter: `react` (default), `vue`, `svelte`, or `solid`.                                                                                                                                                           |
+| `--mock-data`       | `string` | `mock` generator data: `baked` (default, deterministic literals) or `faker` (`@faker-js/faker` calls).                                                                                                                            |
+| `--mock-seed`       | `number` | Seed for `faker`-mode mocks, for reproducible data. Ignored in `baked` mode.                                                                                                                                                      |
+| `--server-url`      | `string` | Override the server URL inlined into the runtime. Defaults to `servers[0].url`. Accepts absolute (`https://api.example.com`) or relative (`/v1`).                                                                                 |
+| `--setup`           | `string` | Path to a publisher setup module baked into the client. See [Publisher defaults](../guides/use-generated-client.md#publisher-defaults).                                                                                           |
+| `--config`          | `string` | Path to the `redocly.yaml` (the `client` config and `apis:` live there). Defaults to the one in the working directory.                                                                                                            |
 
 ## Configuration
 
@@ -57,12 +56,49 @@ Instead of passing flags every time, keep the settings in `redocly.yaml` under a
 
 `--output-mode` controls how the client is split across files:
 
-- `single` (default) — one self-contained file.
-- `split` — endpoints, schemas, and runtime in sibling files.
-- `tags` — one endpoints file per OpenAPI tag.
-- `tags-split` — a folder per tag.
+- `single` (default) — one file (self-contained with the default `inline` runtime).
+- `split` — two files: the schema types and type guards move to a sibling `<name>.schemas.ts`, and the entry file (everything else) re-exports them — so your imports are the same as in `single`.
 
-All multi-file modes share the schemas and runtime modules; `--output` names the entry file, and the siblings derive from its name and directory.
+`--output` names the entry file; the `.schemas.ts` sibling derives from its name and directory. Both modes work with both [runtimes](#runtime-distribution).
+
+## Runtime distribution
+
+`--runtime` controls where the client's engine (request building, auth, retries, middleware, SSE) lives:
+
+- `inline` (default) — the same runtime source is embedded in the generated output (only the parts your API needs): self-contained, zero runtime dependencies.
+- `package` — the generated file imports the runtime from `@redocly/client-generator` and contains only the types, pure-data operation descriptors, and thin call wrappers:
+
+  ```ts
+  import {
+    createClient,
+    type OperationDescriptor,
+    type RequestOptions,
+  } from '@redocly/client-generator';
+
+  export const OPERATIONS = {
+    getOrderById: {
+      id: 'getOrderById',
+      method: 'GET',
+      path: '/orders/{orderId}',
+      tags: ['Orders'],
+      params: [
+        /* … */
+      ],
+    },
+    // …
+  } as const satisfies Record<string, OperationDescriptor>;
+
+  export const client = createClient<Ops>(OPERATIONS, { serverUrl: 'https://api.example.com' });
+  export const { configure, use } = client;
+  export const getOrderById = (orderId: string, init: RequestOptions = {}) =>
+    client.getOrderById({ orderId }, init);
+  ```
+
+Choose `package` when you want engine fixes and improvements to arrive via `npm update @redocly/client-generator` — no regeneration, no diff in the generated file. The trade: the consuming app must have `@redocly/client-generator` installed as a regular dependency. Your application code is identical in both modes (same exports, same call shapes).
+
+The `satisfies Record<string, OperationDescriptor>` line doubles as a **build-time version-skew guard**: an incompatible generated-file/runtime pair fails the consumer's `tsc` instead of misbehaving at runtime.
+
+In both modes the generated module exports **both call styles** — the `client` instance (grouped-args methods) and the free-function operations (`--args-style` shapes those). Both runtimes work with both [output modes](#output-modes) and every generator.
 
 ## Resources
 
diff --git a/docs/@v2/configuration/reference/client.md b/docs/@v2/configuration/reference/client.md
index f942951c27..5ee4a39a8e 100644
--- a/docs/@v2/configuration/reference/client.md
+++ b/docs/@v2/configuration/reference/client.md
@@ -9,13 +9,13 @@ The [`generate-client`](../../commands/generate-client.md) command reads its set
 client: # shared defaults for every generated client
   generators:
     - sdk
-  facade: functions
+  argsStyle: flat
 apis:
   cafe:
     root: ./openapi.yaml # the input
     clientOutput: ./src/api/client.ts # optional; defaults to `cafe.client.ts`
     client: # per-API overrides (optional)
-      facade: service-class
+      argsStyle: grouped
 ```
 
 ```sh
@@ -26,7 +26,7 @@ redocly generate-client --config ./config/redocly.yaml
 
 ## Options
 
-The same fields are accepted at the top level (shared defaults) and under `apis.<name>.client` (per-API overrides): `generators`, `facade`, `name`, `argsStyle`, `serverUrl`, `outputMode`, `enumStyle`, `errorMode`, `dateType`, `queryFramework`, `mockData`, `mockSeed`, and `setup`. Each mirrors the matching CLI flag — see the [command options](../../commands/generate-client.md#options) for what every field does.
+The same fields are accepted at the top level (shared defaults) and under `apis.<name>.client` (per-API overrides): `generators`, `argsStyle`, `serverUrl`, `outputMode` (`single` or `split`), `runtime`, `enumStyle`, `errorMode`, `dateType`, `queryFramework`, `mockData`, `mockSeed`, and `setup`. Each mirrors the matching CLI flag — see the [command options](../../commands/generate-client.md#options) for what every field does.
 
 The input and output are **not** part of a `client` block:
 
diff --git a/docs/@v2/guides/use-generated-client.md b/docs/@v2/guides/use-generated-client.md
index ab42ac6bde..1e0f40b67e 100644
--- a/docs/@v2/guides/use-generated-client.md
+++ b/docs/@v2/guides/use-generated-client.md
@@ -4,7 +4,7 @@ How to consume the TypeScript client produced by [`generate-client`](../commands
 
 ## Generators
 
-`--generators` selects what to emit (default `sdk`). Each non-`sdk` generator adds a **standalone sibling module** next to the client; the client itself never imports it, so it stays dependency-free. Incompatible selections fail fast with an explanation.
+`--generators` selects what to emit (default `sdk`). Each non-`sdk` generator adds a **standalone sibling module** next to the client; the client itself never imports it, so an add-on never adds a dependency to the client. Incompatible selections fail fast with an explanation.
 
 | Generator        | Emits                                                                                     | App peer dependency                                      |
 | ---------------- | ----------------------------------------------------------------------------------------- | -------------------------------------------------------- |
@@ -19,11 +19,28 @@ How to consume the TypeScript client produced by [`generate-client`](../commands
 redocly generate-client openapi.yaml --output src/client.ts --generators sdk,zod,mock
 ```
 
-`tanstack-query` and `swr` wrap the **throw-mode** `sdk` functions, so they require `--facade functions` and `--error-mode throw`. `transformers` requires `--date-type Date`. See the [`zod`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/zod), [`tanstack-query`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/tanstack-query), and [`mock`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/mock) examples.
+`tanstack-query` and `swr` wrap the **throw-mode** `sdk` functions, so they require `--error-mode throw`. `transformers` requires `--date-type Date`. See the [`zod`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/zod), [`tanstack-query`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/tanstack-query), and [`mock`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/mock) examples.
+
+## Package runtime
+
+By default the runtime is embedded in the generated file, so the client is self-contained. With [`--runtime package`](../commands/generate-client.md#runtime-distribution) the generated file instead imports the runtime from `@redocly/client-generator` — your application code is **identical in both modes** (same exports, same call shapes); only where the engine lives changes. Choose `package` when you want engine fixes and improvements via `npm update @redocly/client-generator`, with no regeneration.
+
+Install the runtime as a regular dependency and set the mode in `redocly.yaml`:
+
+```sh
+npm install @redocly/client-generator
+```
+
+```yaml
+client:
+  runtime: package # default: inline (self-contained)
+```
+
+An incompatible generated-file/runtime pair fails your `tsc` build (the descriptor `satisfies` check) rather than misbehaving at runtime. Package mode works with both output modes and every generator. See the [`package-runtime` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/package-runtime).
 
 ## Authentication
 
-A setter is generated for each `securityScheme` the runtime can apply, and each operation automatically sends the credentials its `security` requires:
+Credentials are **per instance**: they live in the client's config (`ClientConfig.auth`), and each operation automatically sends the credentials its `security` requires. A setter is generated for each `securityScheme` the runtime can apply:
 
 | Scheme                         | Setter                                    | Applied as                               |
 | ------------------------------ | ----------------------------------------- | ---------------------------------------- |
@@ -31,7 +48,7 @@ A setter is generated for each `securityScheme` the runtime can apply, and each
 | HTTP `basic`                   | `setBasicAuth(user, pass)`                | `Authorization: Basic <base64>`          |
 | `apiKey` (header/query/cookie) | `setApiKey(key)` / `setApiKey<Name>(key)` | the named header, query param, or cookie |
 
-`setApiKey` is unsuffixed for a single apiKey scheme; otherwise each gets `setApiKey<SchemeName>`. `mutualTLS` is not injectable. Bearer and apiKey setters accept a **`TokenProvider`** — a string or a (possibly async) function called per request, handy for refresh flows:
+`setApiKey` is unsuffixed for a single apiKey scheme; otherwise each gets `setApiKey<SchemeName>`. `mutualTLS` is not injectable. Bearer and apiKey credentials accept a **`TokenProvider`** — a string or a (possibly async) function called per request, handy for refresh flows:
 
 ```ts
 import { setBearer } from './client.ts';
@@ -39,11 +56,19 @@ import { setBearer } from './client.ts';
 setBearer(async () => await getFreshAccessToken());
 ```
 
-These setters are **module-global**. With `--facade service-class`, give each instance its own credentials via `ClientConfig.auth` (it overrides the global setters for that instance):
+Each setter is sugar over the exported `client` instance's `auth` member (`export const setBearer = client.auth.bearer;`), so it configures **that instance** — equivalently, pass credentials up front with `configure({ auth: { … } })` or set them via `client.auth.bearer(…)` / `client.auth.basic(…)` / `client.auth.apiKey(scheme, …)`.
+
+For **multiple independent instances** with different credentials, build extra clients over the same generated descriptors — the generated module exports `createClient`, the `OPERATIONS` descriptors, and the `Ops` type in both runtimes:
 
 ```ts
-const internal = new Client({ auth: { basic: { username: 'svc', password: 's3cr3t' } } });
-const publicApi = new Client(); // no auth
+import { createClient } from '@redocly/client-generator';
+import { OPERATIONS, type Ops } from './client.ts';
+
+const internal = createClient<Ops>(OPERATIONS, {
+  serverUrl: 'https://api.example.com',
+  auth: { basic: { username: 'svc', password: 's3cr3t' } },
+});
+const publicApi = createClient<Ops>(OPERATIONS, { serverUrl: 'https://api.example.com' }); // no auth
 ```
 
 ## Argument style
@@ -80,7 +105,7 @@ Transport and abort failures still throw in both modes. The choice is fixed at g
 
 ## Middleware
 
-Beyond the single `onRequest`/`onResponse`/`onError` hooks on `ClientConfig`, the client takes **composable middleware** for cross-cutting concerns (auth refresh, logging, tracing, request IDs). Register with `use()` (functions facade) or `<Client>.use()` (service-class); both accept several at once:
+Beyond the single `onRequest`/`onResponse`/`onError` hooks on `ClientConfig`, the client takes **composable middleware** for cross-cutting concerns (auth refresh, logging, tracing, request IDs). Register with `use()` (sugar for `client.use()`); it accepts several at once:
 
 ```ts
 import { use } from './client.ts';
@@ -95,7 +120,7 @@ use({
 });
 ```
 
-`onRequest` runs in registration order; `onResponse` runs in reverse (onion). `onRequest` may mutate `ctx` (`url`/`method`/`headers`/`body` — body edits are serialized and sent); `onResponse` may return a replacement `Response`. `onError` (throw mode only) is threaded through each middleware. `ctx.operation`'s fields are typed literal unions (`OperationId`/`OperationPath`/`OperationTag`) for autocomplete and typo-checking. A single call's header instead goes in that operation's trailing `init` argument.
+`onRequest` runs in registration order; `onResponse` runs in reverse (onion). `onRequest` may mutate `ctx` (`url`/`method`/`headers`/`body` — body edits are serialized and sent); `onResponse` may return a replacement `Response`. `onError` (throw mode only) is threaded through each middleware. `ctx.operation`'s fields are typed as the spec's **literal unions** (`OperationId`/`OperationPath`/`OperationTag`), so `ctx.operation.id === '…'` and `ctx.operation.tags.includes('…')` autocomplete — and a misspelled operation id fails compilation instead of silently never matching. A single call's header instead goes in that operation's trailing `init` argument. Per-request headers merge lowest → highest: injected auth credentials → typed header parameters → the caller's `init.headers` — the caller always wins.
 
 `use()` **appends** to the middleware chain (it composes with any already-registered or baked-in middleware). `configure({ middleware: [...] })` **replaces** the whole chain — use it to reset, but prefer `use()` to add to existing (including [publisher-baked](#publisher-defaults)) middleware.
 
@@ -125,15 +150,15 @@ export default defineClientSetup({
 redocly generate-client openapi.yaml --output src/api/client.ts --setup ./client-setup.ts
 ```
 
-The baked block runs before the consumer's own setup. **Config values** are last-write-wins (a consumer overrides a baked default), while **middleware composes** (baked first, then the consumer's). Express un-bypassable behavior as middleware, not a baked `fetch`. A setup file may import **only** from `@redocly/client-generator`. See the [`baked-setup` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/baked-setup).
+The baked block runs before the consumer's own setup. **Config values** layer lowest → highest: the spec's defaults (e.g. `servers[0].url`) → the baked setup → the app's `configure()` — later always wins, so a consumer overrides a baked default. **Middleware composes** instead (baked first, then the consumer's). Express un-bypassable behavior as middleware, not a baked `fetch`. A setup file may import **only** from `@redocly/client-generator`. See the [`baked-setup` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/baked-setup).
 
 ## Retries
 
 Retry is **opt-in**, configured through `ClientConfig` with an optional per-call override:
 
 ```ts
-configure({ retry: { retries: 3 } }); // global (functions facade)
-const client = new Client({ retry: { retries: 3 } }); // per instance (service-class)
+configure({ retry: { retries: 3 } }); // the module's client instance
+const other = createClient<Ops>(OPERATIONS, { retry: { retries: 3 } }); // another instance
 await getOrderById('ord_123', {}, { retry: { retries: 5 } }); // per call
 ```
 
@@ -199,13 +224,13 @@ const res = await getMenuItemPhoto('prd_123', { parseAs: 'stream' });
 
 ## Operation metadata
 
-The client exports an `OPERATIONS` map keyed by operationId, holding each operation's `method`, `path` template, and `tags`:
+The client exports an `OPERATIONS` map keyed by operationId — the same **operation descriptors** the runtime routes requests by, holding each operation's `method`, `path` template, `tags`, and wire shape:
 
 ```ts
 export const OPERATIONS = {
-  getOrderById: { method: 'GET', path: '/orders/{orderId}', tags: ['Orders'] },
+  getOrderById: { id: 'getOrderById', method: 'GET', path: '/orders/{orderId}', tags: ['Orders'] },
   // …
-} as const;
+} as const satisfies Record<string, OperationDescriptor>;
 ```
 
 Because keys and values are plain string literals, they survive bundling/minification — making `OPERATIONS` the stable handle for cache keys, span names, or log labels (rather than `fn.name`, which a minifier can rename). The same `OperationId` / `OperationPath` / `OperationTag` unions type `ctx.operation` in middleware.
@@ -223,12 +248,12 @@ Guards are also emitted for unions nested inside another schema (array items, pr
 
 ## Server-Sent Events
 
-An operation whose `2xx` response declares `text/event-stream` is generated as a typed async iterator under an `sse` namespace — no flag required. Each event's `data` is typed from the OpenAPI 3.2 `itemSchema` (falling back to the media `schema`, then `string`) and `JSON.parse`d when structured:
+An operation whose `2xx` response declares `text/event-stream` is generated as a typed **async-generator function** (a client method plus the matching free function) — no flag required. Each event's `data` is typed from the OpenAPI 3.2 `itemSchema` (falling back to the media `schema`, then `string`) and `JSON.parse`d when structured:
 
 ```ts
-import { sse } from './client.ts';
+import { streamMessages } from './client.ts';
 
-for await (const ev of sse.streamMessages()) {
+for await (const ev of streamMessages()) {
   console.log(ev.id, ev.data.text); // ServerSentEvent<T>: { event?, data, id?, retry? }
 }
 ```
diff --git a/package.json b/package.json
index 9f314c7671..3a29897da8 100644
--- a/package.json
+++ b/package.json
@@ -79,6 +79,10 @@
     "zod": "^4.0.0"
   },
   "lint-staged": {
+    "packages/client-generator/src/runtime/*.ts": [
+      "node packages/client-generator/scripts/generate-runtime-sources.mjs",
+      "git add packages/client-generator/src/emitters/runtime-sources.ts"
+    ],
     "**/*.{ts,js,yaml,yml,json,md}": [
       "npm run lint",
       "oxfmt --write"
diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index 89a5640989..b1e93aee11 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -12,15 +12,14 @@ export type GenerateClientCommandArgv = {
   config?: string;
   'server-url'?: string;
   'enum-style'?: 'union' | 'const-object';
-  'output-mode'?: 'single' | 'split' | 'tags' | 'tags-split';
-  facade?: 'functions' | 'service-class';
+  'output-mode'?: 'single' | 'split';
+  runtime?: 'inline' | 'package';
   'args-style'?: 'flat' | 'grouped';
   'error-mode'?: 'throw' | 'result';
   'date-type'?: 'string' | 'Date';
   'query-framework'?: 'react' | 'vue' | 'svelte' | 'solid';
   'mock-data'?: 'baked' | 'faker';
   'mock-seed'?: number;
-  name?: string;
   // Built-in names, inline custom-generator names, or plugin import specifiers (path/package).
   generators?: string[];
   // Path to a publisher setup module baked into the generated client.
@@ -79,14 +78,13 @@ export async function handleGenerateClient({
     serverUrl: argv['server-url'],
     enumStyle: argv['enum-style'],
     outputMode: argv['output-mode'],
-    facade: argv.facade,
+    runtime: argv.runtime,
     argsStyle: argv['args-style'],
     errorMode: argv['error-mode'],
     dateType: argv['date-type'],
     queryFramework: argv['query-framework'],
     mockData: argv['mock-data'],
     mockSeed: argv['mock-seed'],
-    name: argv.name,
     generators: argv.generators,
     setup: argv.setup === undefined ? undefined : resolvePath(argv.setup),
   };
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index 1f12f13210..7d32862aa2 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -886,20 +886,20 @@ yargs(hideBin(process.argv))
           },
           'output-mode': {
             describe:
-              'How the client is split across files: `single` (default, one file), `split` (endpoints, schemas, and runtime in sibling files), `tags` (one endpoints file per OpenAPI tag), or `tags-split` (a folder per tag), all sharing the schemas and runtime modules.',
-            choices: ['single', 'split', 'tags', 'tags-split'] as const,
+              'How the client is split across files: `single` (default, one file) or `split` (schema types and guards in a sibling `<name>.schemas.ts` the entry re-exports).',
+            choices: ['single', 'split'] as const,
             requiresArg: true,
           },
-          setup: {
+          runtime: {
             describe:
-              'Path to a publisher setup module (export default defineClientSetup({ config, middleware })) baked into the generated client, so a published SDK ships its request/response defaults built in. Works across all output modes and both facades.',
-            type: 'string',
+              "Runtime distribution: 'inline' (default) embeds the runtime in the generated file; 'package' imports it from @redocly/client-generator.",
+            choices: ['inline', 'package'] as const,
             requiresArg: true,
           },
-          facade: {
+          setup: {
             describe:
-              'Developer-facing operation shape: `functions` (default) emits standalone async functions; `service-class` groups operations as class methods (one `Client` class in single/split, one service class per tag in tags/tags-split).',
-            choices: ['functions', 'service-class'] as const,
+              'Path to a publisher setup module (export default defineClientSetup({ config, middleware })) baked into the generated client, so a published SDK ships its request/response defaults built in. Works across all output modes.',
+            type: 'string',
             requiresArg: true,
           },
           'args-style': {
@@ -938,12 +938,6 @@ yargs(hideBin(process.argv))
             type: 'number',
             requiresArg: true,
           },
-          name: {
-            describe:
-              'Class name for the `service-class` facade in single/split layouts (ignored otherwise). Defaults to `Client`.',
-            type: 'string',
-            requiresArg: true,
-          },
           generators: {
             describe:
               'Generators to run, comma-separated (default: sdk). Built-in names (sdk, zod, tanstack-query, swr, transformers, mock) or a custom-generator path/package specifier. Example: --generators sdk,zod or --generators sdk,./my-generator.ts',
diff --git a/packages/client-generator/ARCHITECTURE.md b/packages/client-generator/ARCHITECTURE.md
index cefa539f2e..6b1e8d3a53 100644
--- a/packages/client-generator/ARCHITECTURE.md
+++ b/packages/client-generator/ARCHITECTURE.md
@@ -3,7 +3,7 @@
 How `@redocly/client-generator` is built.
 This is a **descriptive** map of the current shape — the pipeline, the modules, and the seams.
 It says _what is_; the **why** (the significant decisions and their trade-offs) lives in the Architecture Decision Records under [`docs/adr/`](./docs/adr/), linked inline below.
-For the vocabulary used here (IR, emitter, writer, runtime, facade, output mode, …), see [CONTEXT.md](./CONTEXT.md).
+For the vocabulary used here (IR, emitter, writer, runtime, output mode, …), see [CONTEXT.md](./CONTEXT.md).
 This is not a roadmap; planned refactors live in their own specs.
 
 ## Overview
@@ -16,8 +16,9 @@ It backs the `redocly generate-client` CLI command.
 Generated TypeScript is built as a **TypeScript AST** (`ts.factory` nodes) and emitted by the compiler's own printer (`ts.createPrinter`), **not** by string interpolation — rationale and trade-offs in [ADR-0001](./docs/adr/0001-ast-codegen.md).
 The one generation-time dependency is `typescript` itself, declared as a **peer** ([ADR-0002](./docs/adr/0002-typescript-peer-dep.md)); it is never emitted, so the generated client stays dependency-free.
 
-A foundation module (`emitters/ts.ts`) wraps the ergonomics: re-exports `ts` (the `factory`), `printNodes(nodes)` over a shared printer, `parseStatements(source)` to embed hand-authored constant code (the **runtime**) as parsed nodes routed through the same printer, and `jsdoc(node, text)`.
-Each emitter produces `ts.Statement[]` / `ts.TypeNode`s; the composition (`client.ts`) assembles the per-file statement list and prints **once**.
+A foundation module (`emitters/ts.ts`) wraps the ergonomics: re-exports `ts` (the `factory`), `printNodes(nodes)` over a shared printer, `parseStatements(source)` to parse hand-authored source (used by the inline assembler and the baked-setup emitter), and `jsdoc(node, text)`.
+Each emitter produces `ts.Statement[]` / `ts.TypeNode`s; the shared wiring emitter (`emitters/package-client.ts`) assembles the per-file content and prints **once**.
+The **runtime** is not emitter-built at all — it is real TypeScript under `src/runtime/`, imported (package mode) or embedded from a source snapshot (inline mode).
 Formatting is the printer's; a pretty-print pass is deferred to optional-formatter work (roadmap P7.3).
 
 ## Pipeline
@@ -46,15 +47,16 @@ flowchart LR
 
 ## Module map
 
-| Area       | Files                                                                                                                                                                                                                                                                                                                                                                                                                       | Owns                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | Depth                                                                                                                                                                         |
-| ---------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Entry      | `index.ts`, `types.ts`, `config.ts`, `config-file.ts`, `plugin.ts`                                                                                                                                                                                                                                                                                                                                                          | `generateClient` orchestration; public option/result types; config loading; the experimental `@redocly/client-generator` entry (`defineGenerator` + IR types + codegen toolkit)                                                                                                                                                                                                                                                                                              | thin orchestrator                                                                                                                                                             |
-| Load       | `loader.ts`                                                                                                                                                                                                                                                                                                                                                                                                                 | bundle + `$ref` resolution, preserving internal refs                                                                                                                                                                                                                                                                                                                                                                                                                         | deep (hides `openapi-core`)                                                                                                                                                   |
-| IR         | `intermediate-representation/build.ts`, `intermediate-representation/model.ts`, `intermediate-representation/refs.ts`, `intermediate-representation/normalize-swagger2.ts`, `intermediate-representation/sanitize-identifiers.ts`                                                                                                                                                                                           | OpenAPI → IR; the IR type model; ref collection; Swagger 2.0 → 3.x normalization; coerce document-derived names to safe unique identifiers (security boundary)                                                                                                                                                                                                                                                                                                               | deep (`buildApiModel` + `normalizeSwagger2` each one interface over a whole walk)                                                                                             |
-| Writers    | `writers/index.ts`, `single-file-writer.ts`, `split-writer.ts`, `tagged.ts`, `tags-writer.ts`, `tags-split-writer.ts`, `group-by-tag.ts`, `util.ts`, `types.ts`                                                                                                                                                                                                                                                             | file layout per output mode                                                                                                                                                                                                                                                                                                                                                                                                                                                  | thin adapters at the `getWriter` seam + `group-by-tag` (deep)                                                                                                                 |
-| Generators | `generators/index.ts` (registry + `validateGenerators`), `resolve.ts` (built-in / inline / specifier resolution), `types.ts`, `sdk.ts`, `zod.ts`, `tanstack-query.ts`, `swr.ts`, `transformers.ts`, `mock.ts`                                                                                                                                                                                                               | the generator registry seam: each descriptor declares its requires/facades/errorModes and produces `GeneratedFile[]` by calling an emitter; `resolve.ts` turns a selection (built-in names, inline `customGenerators`, or plugin import specifiers) into a name→descriptor registry                                                                                                                                                                                          | thin adapters at the `getGenerator` seam ([ADR-0004](./docs/adr/0004-registry-seams.md), [ADR-0012](./docs/adr/0012-plugin-api.md))                                           |
-| Emitters   | sdk: `emitters/client.ts` (composition), `types.ts`, `type-guards.ts`, `auth.ts`, `operations.ts` (+ `operation-aliases.ts`, `operation-types.ts`), `sse.ts`, `runtime.ts`; satellite: `zod.ts`, `transformers.ts`, `tanstack-query.ts`, `swr.ts` (+ shared `wrapper-support.ts`), `mock.ts`/`faker.ts`/`sample.ts`; foundation `ts.ts`; shared `operation-signature.ts`; private `support.ts`, `jsdoc.ts`, `identifier.ts` | IR → TypeScript AST (`ts.factory` nodes, printed via `ts.ts`); the emitted runtime; `operations.ts` splits the per-op assembly from its `<Op>*` alias builders (`operation-aliases.ts`) and shared param/body/response type builders (`operation-types.ts`); `sse.ts` is the SSE detection seam; `operation-signature.ts` is the single source of an operation’s calling convention; `wrapper-support.ts` is the shared eligibility/param model for `swr` + `tanstack-query` | each emitter is deep (one entry point builds nodes over hidden bulk); `client.ts` assembles the per-file statements and prints once; the runtime is the client library itself |
-| Errors     | `errors.ts`                                                                                                                                                                                                                                                                                                                                                                                                                 | `NotSupportedError`                                                                                                                                                                                                                                                                                                                                                                                                                                                          | trivial                                                                                                                                                                       |
+| Area       | Files                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | Owns                                                                                                                                                                                                                                                                                                                                                         | Depth                                                                                                                                    |
+| ---------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------- |
+| Entry      | `index.ts`, `types.ts`, `config.ts`, `config-file.ts`, `plugin.ts`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             | `generateClient` orchestration; public option/result types; config loading; the experimental `@redocly/client-generator` entry (`defineGenerator` + IR types + codegen toolkit)                                                                                                                                                                              | thin orchestrator                                                                                                                        |
+| Load       | `loader.ts`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | bundle + `$ref` resolution, preserving internal refs                                                                                                                                                                                                                                                                                                         | deep (hides `openapi-core`)                                                                                                              |
+| IR         | `intermediate-representation/build.ts`, `intermediate-representation/model.ts`, `intermediate-representation/refs.ts`, `intermediate-representation/normalize-swagger2.ts`, `intermediate-representation/sanitize-identifiers.ts`                                                                                                                                                                                                                                                                                                                                                                                              | OpenAPI → IR; the IR type model; ref collection; Swagger 2.0 → 3.x normalization; coerce document-derived names to safe unique identifiers (security boundary)                                                                                                                                                                                               | deep (`buildApiModel` + `normalizeSwagger2` each one interface over a whole walk)                                                        |
+| Writers    | `writers/index.ts`, `single-file-writer.ts`, `split-writer.ts`, `util.ts`, `types.ts`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | file layout per output mode (`single`, `split`) over the shared wiring emitter                                                                                                                                                                                                                                                                               | thin adapters at the `getWriter` seam                                                                                                    |
+| Generators | `generators/index.ts` (registry + `validateGenerators`), `resolve.ts` (built-in / inline / specifier resolution), `types.ts`, `sdk.ts`, `zod.ts`, `tanstack-query.ts`, `swr.ts`, `transformers.ts`, `mock.ts`                                                                                                                                                                                                                                                                                                                                                                                                                  | the generator registry seam: each descriptor declares its requires/errorModes/dateTypes/runtimes and produces `GeneratedFile[]` by calling an emitter; `resolve.ts` turns a selection (built-in names, inline `customGenerators`, or plugin import specifiers) into a name→descriptor registry                                                               | thin adapters at the `getGenerator` seam ([ADR-0004](./docs/adr/0004-registry-seams.md), [ADR-0012](./docs/adr/0012-plugin-api.md))      |
+| Runtime    | `runtime/types.ts`, `errors.ts`, `url.ts`, `parse.ts`, `retry.ts`, `multipart.ts`, `auth.ts`, `setup.ts`, `send.ts`, `sse.ts`, `create-client.ts`, `index.ts` (the package barrel)                                                                                                                                                                                                                                                                                                                                                                                                                                             | the client engine as real, unit-testable TypeScript modules: `createClient` builds a typed instance client over operation descriptors, dispatching optional behaviors (multipart, auth, SSE) through a capability seam; the barrel wires the full capability set for package-mode consumers                                                                  | deep (`createClient` is one interface over the whole engine)                                                                             |
+| Emitters   | sdk wiring: `emitters/package-client.ts` (the shared wiring emitter), `descriptor.ts` (OPERATIONS + `Ops`), `inline-runtime.ts` (the inline assembler) + generated `runtime-sources.ts`, `client.ts` (options + banners), `types.ts`, `type-guards.ts`, `auth.ts` (setter names), `operations.ts` (+ `operation-aliases.ts`, `operation-types.ts`), `sse.ts`, `setup-bake.ts`; satellite: `zod.ts`, `transformers.ts`, `tanstack-query.ts`, `swr.ts` (+ shared `wrapper-support.ts`), `mock.ts`/`faker.ts`/`sample.ts`; foundation `ts.ts`; shared `operation-signature.ts`; private `support.ts`, `jsdoc.ts`, `identifier.ts` | IR → TypeScript AST (`ts.factory` nodes, printed via `ts.ts`); `descriptor.ts` emits the pure-data operation descriptors and the `Ops` type; `sse.ts` is the SSE detection seam; `operation-signature.ts` is the single source of an operation’s calling convention; `wrapper-support.ts` is the shared eligibility/param model for `swr` + `tanstack-query` | each emitter is deep (one entry point builds nodes over hidden bulk); `package-client.ts` assembles the per-file content and prints once |
+| Errors     | `errors.ts`                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | `NotSupportedError`                                                                                                                                                                                                                                                                                                                                          | trivial                                                                                                                                  |
 
 The IR (`intermediate-representation/model.ts`) is a **pure type model** — no runtime code. It is the contract between the
 builder and the emitters ([ADR-0003](./docs/adr/0003-spec-agnostic-ir.md)).
@@ -70,24 +72,20 @@ Places where behavior varies without editing in place:
   Where new capabilities (zod, framework hooks) plug in.
   See [ADR-0004](./docs/adr/0004-registry-seams.md) and [ADR-0012](./docs/adr/0012-plugin-api.md).
 - **The `getWriter` seam** — `getWriter(outputMode)` maps an output mode to a `Writer`.
-  Four adapters: `single`, `split`, `tags`, `tags-split` (the tag layouts share `buildTaggedClient`).
-  Where a new file layout plugs in.
+  Two adapters: `single` (the whole client in one file) and `split` (schema types + type guards carved out into a sibling `<stem>.schemas.ts` the entry re-exports).
+  Both delegate to the shared wiring emitter (`emitClientSingleFile` / `emitClientSplit`); where a new file layout plugs in.
   See [ADR-0004](./docs/adr/0004-registry-seams.md).
-- **The emitter ↔ writer seam** — `emitModules(model, options): ClientModules` is the _only_ thing writers consume from the emitter.
-  `ClientModules` exposes each emitted module's content (`http`, `schemas`, `operations`) plus per-file wiring (`renderEndpoints`, `endpointImports`, `publicReexport`).
-  The emitter's internal **fragment** breakdown never crosses this seam.
-  `single` output bypasses this via `emitSingleFile`.
-- **Runtime emission** — the runtime is authored as reference TypeScript source and parsed into `ts.Statement[]` (`runtimeStatements`, `emitters/runtime.ts`) via `parseStatements`, with the base URL inlined and the public declarations optionally `export`ed (multi-file) or kept local (single-file).
-  `renderRuntime` prints those statements for the string-asserting unit tests.
-- **The runtime-terminals seam** — the fetch wrapper is a shared core (`__send` + `__parse`) plus one of two terminals selected by **error mode** (`__request` for throw, `__requestResult` for result).
-  Only the chosen terminal is emitted.
-  See [ADR-0005](./docs/adr/0005-error-mode-terminals.md).
-- **Response decoding is a runtime concern** — `__parse` decodes the body; the inferred kind comes from the operation's `responseKind` (a generate-time hint).
+- **The runtime seam** — the client engine is real TypeScript under `src/runtime/`, and the generated wiring (descriptors + `createClient` call + sugar) is identical for both distributions; only the runtime block differs.
+  `runtime: 'package'` emits an import of `createClient` from `@redocly/client-generator` (the barrel, `runtime/index.ts`, wires every capability); `runtime: 'inline'` (default) embeds the runtime sources in its place — a build step (`scripts/generate-runtime-sources.mjs`) snapshots `src/runtime/*.ts` into the tracked, generated `emitters/runtime-sources.ts` (drift-tested), and `emitters/inline-runtime.ts` walks the import graph in dependency order, strips module syntax via the TS AST, and appends a local `createClient` factory wiring **only** the capabilities the API needs.
+- **The capability seam** — `createClient` dispatches optional behaviors through a `Capabilities` object (`runtime/create-client.ts`): `serializeMultipart` (typed multipart bodies), `resolveAuth` (credential injection), `sse` (event streaming).
+  The core never statically imports them, so an inline client embeds only what its spec uses, and a package client gets the full set from the barrel.
+- **Error mode is config, not codegen** — `--error-mode` is baked into the client's initial config; the runtime's `execute` branches on it (throw `ApiError` vs return `Result`), and `configure()` ignores runtime attempts to flip it (the static types are fixed at generate time).
+  See [ADR-0005](./docs/adr/0005-error-mode-terminals.md) for the original decision (the terminals mechanism it describes is superseded).
+- **Response decoding is a runtime concern** — `runtime/parse.ts` decodes the body; the inferred kind comes from the operation descriptor's `responseKind` (a generate-time hint).
   The per-call `RequestOptions.parseAs` overrides it (e.g. `'stream'` for the raw `ReadableStream`); the static return type is **not** narrowed by `parseAs`, keeping operation signatures stable.
-- **The SSE seam** — an operation whose 2xx response declares `text/event-stream` is a **derived response kind**, detected by `emitters/sse.ts` and emitted under a separate `sse` namespace backed by a gated `__sse<T>` generator that reuses `__send`.
-  See [ADR-0006](./docs/adr/0006-sse-namespace.md).
-- **The async-auth seam** — credentials are resolved **at the call site** via an async `__auth(schemes, config)`, not in the runtime; non-authed operations emit no auth code.
-  Each scheme resolves from the instance's `config.auth?.<scheme>` (per-instance, `ClientConfig.auth`) falling back to the module-global `set*` slot.
+- **The SSE seam** — an operation whose 2xx response declares `text/event-stream` is a **derived response kind**, detected by `emitters/sse.ts` (`responseKind: 'sse'` on the descriptor) and surfaced as a typed async-generator client method plus the matching free function; the `sse` capability is wired only when a spec streams.
+- **The async-auth seam** — credentials are **per instance** (`ClientConfig.auth`), resolved per request by the `resolveAuth` capability (`runtime/auth.ts`); operations without declared `security` trigger no auth work.
+  The generated `set*` setters are instance-bound sugar over `client.auth.*`.
   See [ADR-0007](./docs/adr/0007-call-site-auth.md) and [ADR-0009](./docs/adr/0009-per-instance-auth.md).
 
 ## Configuration
@@ -100,12 +98,12 @@ See [ADR-0008](./docs/adr/0008-redocly-yaml-config.md).
 
 Three orthogonal knobs combine freely:
 
-- **Output mode** (`--output-mode`): `single` · `split` · `tags` · `tags-split` — file layout.
-- **Facade** (`--facade`): `functions` · `service-class` — operation shape.
-- **Args style** (`--args-style`): `flat` · `grouped` — how inputs are passed.
+- **Output mode** (`--output-mode`): `single` · `split` — file layout.
+- **Runtime** (`--runtime`): `inline` · `package` — where the client engine lives.
+- **Args style** (`--args-style`): `flat` · `grouped` — how inputs reach the free functions (the `client` instance's methods are always grouped).
 
-Plus **enum style** (`--enum-style`: `union` · `const-object`), **error mode** (`--error-mode`: `throw` · `result`), **date type** (`--date-type`: `string` · `Date`), and `--base-url` / `--name` modifiers.
-The **runtime** and **schemas** modules are identical across facade and args-style choices; only the **endpoints** differ.
+Plus **enum style** (`--enum-style`: `union` · `const-object`), **error mode** (`--error-mode`: `throw` · `result`), **date type** (`--date-type`: `string` · `Date`), and the `--server-url` / `--setup` modifiers.
+Every client exports **both call styles** — the instance and the free functions; args style only shapes the free-function sugar.
 
 Orthogonally, **`--generators`** selects which generators run (default `sdk`; plus `zod`, `tanstack-query`, `swr`, `transformers`, `mock`, and custom plugins), with per-generator knobs: `--query-framework` (`react` · `vue` · `svelte` · `solid`, for `tanstack-query`) and `--mock-data` (`baked` · `faker`) / `--mock-seed` (for `mock`).
 
@@ -115,20 +113,20 @@ Orthogonally, **`--generators`** selects which generators run (default `sdk`; pl
   This package is held to **100% per-file coverage**.
   The IR builder, ref collection, writers, and each emitter are tested directly through their interfaces, sharing `__tests__/fixtures.ts`; the emitters are largely covered by output-string assertions.
 - **E2E tests** (`VITEST_SUITE=e2e`, under `tests/e2e/generate-client/`) generate a client, type-check it under strict `tsc` (`--noUnusedLocals`), and — for behavioral cases — run it against a local mock server.
-- **The runtime** is emitted as a source string, so its behavior (retry, abort, body serialization, query building, SSE reconnection) is exercised through the e2e path.
+- **The runtime** is real modules (`src/runtime/`) with direct unit tests; its end-to-end behavior (retry, abort, body serialization, query building, SSE reconnection) is also exercised through the e2e path, and a drift test keeps the generated `emitters/runtime-sources.ts` snapshot in lockstep with the sources.
 
 Tests run from a single root `vitest.config.ts`; there are no per-package vitest configs.
 Compile (`npm run compile`) before running tests — they run against built output.
 
 ## How to add things
 
-- **A new output mode** — add the literal to `OutputMode` (`writers/types.ts`), write a `Writer` (or extend `buildTaggedClient`), and register it in the `WRITERS` map (`writers/index.ts`).
+- **A new output mode** — add the literal to `OutputMode` (`writers/types.ts`), write a `Writer` over the shared wiring emitter, and register it in the `WRITERS` map (`writers/index.ts`).
   Wire the CLI choice in the `generate-client` command.
-- **A new facade** — extend the `Facade` type and `operationsBlockStatements` in `emitters/operations.ts` (build the function/method nodes via `emitters/ts.ts`); both single and multi-file writers route through it.
 - **A new schema kind** — add the variant to `SchemaModel` (`intermediate-representation/model.ts`), produce it in `intermediate-representation/build.ts`, and build its `ts.TypeNode` in `schemaToTypeNode` (`emitters/types.ts`).
-- **A new runtime capability** — extend the authored source in `emitters/runtime.ts` (parsed into nodes via `parseStatements`); surface any new public type via `PUBLIC_RUNTIME_TYPES` so multi-file output re-exports it from the barrel.
+- **A new runtime capability** — add a module under `src/runtime/`, thread it through the `Capabilities` seam (`runtime/create-client.ts`), wire it in the barrel (`runtime/index.ts`), list it in `scripts/generate-runtime-sources.mjs`, and teach `emitters/inline-runtime.ts` when to embed it (a new `InlineRuntimeNeeds` flag).
+  Run `npm run compile` to regenerate the `runtime-sources.ts` snapshot.
 - **A new wrapper generator** (a framework adapter that forwards to the sdk functions) — reuse `emitters/wrapper-support.ts` for operation eligibility (SSE / `<Op>Variables`-collision skips) and the `vars`/`init` parameter shape, and derive the forwarding call's argument order and `<Op>Variables` naming from `operationSignature` (`emitters/operation-signature.ts`), the same source the sdk's parameter list uses, so the wrappers cannot drift.
-  Declare its compatibility contract (`requires`/`facades`/`errorModes`/`dateTypes`) in the generator registry (`generators/index.ts`).
+  Declare its compatibility contract (`requires`/`errorModes`/`dateTypes`/`runtimes`) in the generator registry (`generators/index.ts`).
   See [ADR-0011](./docs/adr/0011-wrapper-generators.md).
 - **A new mock data source** — the `mock` generator's data comes from `emitters/sample.ts` (baked literals) or `emitters/faker.ts` (faker calls), selected by `--mock-data`; both walk the IR with the same cycle semantics.
   See [ADR-0010](./docs/adr/0010-mock-data-baked-vs-faker.md).
diff --git a/packages/client-generator/CONTEXT.md b/packages/client-generator/CONTEXT.md
index 44707b2895..8abe258035 100644
--- a/packages/client-generator/CONTEXT.md
+++ b/packages/client-generator/CONTEXT.md
@@ -41,12 +41,10 @@ _Avoid_: streamSchema, eventSchema (in code identifiers — `itemSchema` mirrors
 **Emitter**:
 Builds a TypeScript **AST** (`ts.factory` nodes) from the IR.
 Lives in `emitters/`.
-Each emitter is deep — one narrow entry point over hidden node-building bulk — and owns a single concern: `types.ts` (`typesStatements`/`schemaToTypeNode`), `type-guards.ts` (`typeGuardStatements`), `auth.ts` (`authStatements`), `operations.ts` (`operationsBlockStatements`/`operationsMetaStatements`), `sse.ts` (the **SSE** detection seam: `isSseOp`/`partitionOps`/`sseEventType`/`sseDataKind`/`sseFragmentName`), and the **runtime** emitter `runtime.ts`.
-The foundation module `ts.ts` owns the shared printer and ergonomics: `printNodes` (nodes → source), `parseStatements` (embed hand-authored source as nodes), and `jsdoc` (attach a block comment).
-`client.ts` is the _composition_ emitter: it assembles each file's `ts.Statement[]` and prints **once** via `printNodes`, exposing `emitSingleFile` / `emitModules`.
-The writer-facing seam (`ClientModules`) stays string-based.
+Each emitter is deep — one narrow entry point over hidden node-building bulk — and owns a single concern: `types.ts` (`typesStatements`/`schemaToTypeNode`), `type-guards.ts` (`typeGuardStatements`), `descriptor.ts` (the `OPERATIONS` descriptor map + the `Ops` type), `operation-aliases.ts`/`operation-types.ts` (the `<Op>*` aliases and their type builders), `sse.ts` (the **SSE** detection seam: `isSseOp`/`partitionOps`/`sseEventType`/`sseDataKind`), and `inline-runtime.ts` (the **inline assembler**).
+The foundation module `ts.ts` owns the shared printer and ergonomics: `printNodes` (nodes → source), `parseStatements` (parse hand-authored source into nodes), and `jsdoc` (attach a block comment).
+`package-client.ts` is the shared _wiring_ emitter: it assembles each file's content — identical for both runtimes except the runtime block (import vs embed) — and prints **once**, exposing `emitClientSingleFile` / `emitClientSplit`.
 Low-level text helpers (`pascalCase`, `splitLines`, `joinSections`) stay private in `support.ts`, and the JSDoc-body builder in `jsdoc.ts` — consumed only by the deep emitters, never by writers.
-Each emitter also keeps a string-returning wrapper (`renderTypes`/`renderAuth`/… → `printNodes(…)`) that the unit tests assert against.
 _Avoid_: renderer, codegen.
 
 **Writer**:
@@ -64,8 +62,8 @@ The `zod` generator emits a standalone `<stem>.zod.ts` **schema module** (one `e
 The `tanstack-query` generator emits a TanStack Query v5 (React) module (`<stem>.tanstack.ts`) wrapping the sdk — per query op a `<op>QueryKey`/`<op>Options` (`queryOptions`) factory + query key, per mutation a `<op>Mutation` (`mutationKey`/`mutationFn`) factory (requires the `sdk` generator; the consumer installs `@tanstack/react-query`).
 The `transformers` generator emits a standalone `<stem>.transformers.ts` of `transform<Name>(data: <Name>): <Name>` functions — one per IR named schema that (recursively) carries a `date-time`/`date` field — that walk the value and rewrite wire ISO strings to `new Date(...)` in place, composing across refs (`transformPet` calls `transformOwner`); pair it with the **dateType** knob (`--date-type Date`) so the parsed value matches the type (it imports only the schema TYPES, so the client stays zero-dep).
 `generateClient` runs the configured generators (default `['sdk']`, selected via `--generators sdk,zod`) and merges their files.
-First-party only — no public plugin API yet.
-_Avoid_: plugin (reserved for a future public API), middleware.
+Custom generators are authored with `defineGenerator` and selected inline or by import specifier (the experimental **plugin** API, ADR-0012).
+_Avoid_: middleware (that's a runtime concept).
 
 **Schema module** (`zod` generator):
 The `<stem>.zod.ts` file the `zod` generator emits — `import { z } from 'zod'` plus one `export const <Name>Schema = z.object(…)` per IR named schema.
@@ -75,45 +73,44 @@ The generated **sdk** client never imports zod — `zod` is the _consumer's_ pee
 _Avoid_: validation runtime, zod runtime (the sdk has no zod dependency).
 
 **Runtime**:
-The zero-dependency code emitted into every generated client — the `fetch` wrapper, URL/query builder (`__buildUrl`), retry machinery, auth state, and the public setters (`configure`, `setBaseUrl`, `setBearer`, `setBasicAuth`, `setApiKey…`).
+The zero-dependency client engine — real TypeScript modules under `src/runtime/` (`send`, `url`, `parse`, `retry`, `errors`, `multipart`, `auth`, `setup`, `sse`, `create-client`), not emitter-built code.
 Uses only web-standard APIs.
-The wrapper is split into a shared core and one of two **terminals** (selected by **error mode**): `__send` runs the payload/header build + retry/fetch loop and returns the raw `Response`; `__parse` decodes a success body into the requested kind — `json` / `text` / `blob` / `arrayBuffer` / `formData` / `stream` (raw `ReadableStream` via `response.body`) / `auto` (content-type sniff, the generated default); `__request` (throw mode) delegates to both and throws `ApiError` on non-2xx, while `__requestResult` (result mode) returns the discriminated `Result<TData, TError>` instead.
-The per-call `RequestOptions` (the trailing `init` arg) carries `parseAs?: ParseAs` — a runtime escape hatch that overrides the inferred decode kind (static return type unchanged) — alongside the `retry` override.
-For **SSE** operations the runtime also emits `__sse<T>` — an `async function*` that wraps `__send`, parses `text/event-stream` frames into `ServerSentEvent<T>` (`{ event?, data, id?, retry? }`), and auto-reconnects (resuming with `Last-Event-ID`; backoff = server `retry:` → `reconnectDelay` → 1000ms, exponential + jitter, 30s cap).
+`createClient(operations, config)` builds a typed **instance client** over the operation descriptors: one bound method per operation plus the core members `configure` / `use` / `auth`; optional behaviors (multipart serialization, auth injection, SSE streaming) are dispatched through the **capability seam** (`Capabilities`, `runtime/create-client.ts`) and never statically imported by the core.
+Package mode imports the barrel (`runtime/index.ts`, all capabilities wired); inline mode embeds the same sources — snapshotted into the generated `emitters/runtime-sources.ts` and assembled per the API's needs by `emitters/inline-runtime.ts`, which appends a local `createClient` factory wiring only the needed capabilities.
+`parse` decodes a success body into the requested kind — `json` / `text` / `blob` / `arrayBuffer` / `formData` / `stream` (raw `ReadableStream` via `response.body`) / `auto` (content-type sniff, the default); the per-call `RequestOptions` (the trailing `init` arg) carries `parseAs?: ParseAs` — a runtime escape hatch that overrides the inferred decode kind (static return type unchanged) — alongside the `retry` override.
+**Error mode** lives in the instance config (fixed at generate time; `configure()` ignores attempts to flip it): throw mode throws `ApiError` on non-2xx, result mode returns the discriminated `Result<TData, TError>`.
+For **SSE** operations `runtime/sse.ts` provides `sse<T>` — an `async function*` that parses `text/event-stream` frames into `ServerSentEvent<T>` (`{ event?, data, id?, retry? }`) and auto-reconnects (resuming with `Last-Event-ID`; backoff = server `retry:` → `reconnectDelay` → 1000ms, exponential + jitter, 30s cap).
 `SseOptions` (`RequestInit & { reconnect?; reconnectDelay? }`) is the per-call init; aborting via `AbortSignal` or `break`ing the loop completes the iterator cleanly (no throw).
-The whole `__sse`/`ServerSentEvent`/`SseOptions` block is **gated** — emitted only when a model declares a streaming op.
+The `sse` capability (and module, in inline mode) is **gated** — wired only when a model declares a streaming op.
 _Avoid_: helpers, lib, sdk-core.
 
-**SSE** / the `sse` namespace:
+**SSE**:
 An operation whose 2xx response declares `text/event-stream` is an **SSE** operation.
-It is detection-driven — no flag — and is emitted under a separate `sse` surface rather than as a plain endpoint: a typed `async function*` returning `AsyncGenerator<ServerSentEvent<T>>`, where `T` comes from the response **`itemSchema`** → media `schema` → `string`.
-The functions facade exposes `export const sse = { streamX, … }`; the service-class facade a bound `readonly sse = { … }`; in multi-file modes each tag/class contributes a `__sse_<Class>` fragment that the **barrel** merges into the public `sse`.
+It is detection-driven — no flag — and marked `responseKind: 'sse'` on its descriptor: the client exposes it as a typed async-generator method (plus the matching free function) returning `AsyncGenerator<ServerSentEvent<T>>`, where `T` comes from the response **`itemSchema`** → media `schema` → `string`.
 SSE ops are error-mode-agnostic (they always throw on an initial non-2xx; never return the `Result` shape).
-_Avoid_: stream namespace, events client, subscribe.
+_Avoid_: sse namespace (removed), stream namespace, events client, subscribe.
 
-**Fragments** → **ClientModules**:
-**Fragments** are the emitter's _internal_ breakdown of a client (header, types, type guards, runtime, auth, operations, …) — never exposed to writers.
-**ClientModules** is the writer-facing interface `emitModules` returns: the _content_ of each emitted module (`http`, `schemas`, `operations`) plus the per-file wiring.
-Writers consume **ClientModules**, never **Fragments**.
-_Avoid_: sections, parts, chunks.
+**Descriptor** / **Wiring** / **Sugar**:
+The **descriptor** (`OperationDescriptor`) is the frozen data contract between generated code and the runtime — one operation's wire shape (`id`, `method`, `path`, `params`, `body`, `responseKind`, `security`), emitted into the `OPERATIONS` map (`as const satisfies Record<string, OperationDescriptor>`, which doubles as the version-skew guard in package mode).
+The **wiring** is the generated glue around it: schema types, `<Op>*` aliases, the `Ops` type, `OPERATIONS`, and the `export const client = createClient<Ops>(OPERATIONS, …)` instance — identical across both runtimes.
+The **sugar** is the derived conveniences bound to that instance: `export const { configure, use } = client`, the free-function operations (arrow consts in `flat` style, a destructure in `grouped`), and the auth setters (`export const setBearer = client.auth.bearer`).
+_Avoid_: fragments, ClientModules, barrel, endpoints (pre-runtime-module vocabulary).
 
-**Endpoints** / **Barrel**:
-**Endpoints** is the emitted operation code (the standalone functions or class methods).
-The **Barrel** is the entry file that re-exports the public surface from the other emitted files.
-_Avoid_: index (for the barrel), routes (for endpoints).
+**Entry file** / **Schemas module**:
+The **entry file** is the `--output` file — the whole client in `single` mode; in `split` mode the **schemas module** (`<stem>.schemas.ts`: schema types, enums, const-objects, type guards) is carved out and the entry `export *`s it.
+_Avoid_: index, barrel.
 
 ### Knobs
 
 **Output mode**:
-The file layout: `single` (one file), `split` (http + schemas + endpoints siblings), `tags` (one endpoints file per OpenAPI tag), `tags-split` (a folder per tag).
-Selected by `--output-mode`.
-_Avoid_: format, layout (in prose), split (as a synonym for the whole concept).
+The file layout: `single` (one file) or `split` (the schemas module in a sibling `<stem>.schemas.ts` the entry re-exports).
+Selected by `--output-mode`; works with both **runtime** distributions.
+_Avoid_: format, layout (in prose), split (as a synonym for the whole concept), tags / tags-split (removed modes).
 
-**Facade**:
-The developer-facing operation shape: `functions` (standalone async functions) or `service-class` (operations as class methods).
-Selected by `--facade`.
-Orthogonal to **output mode** and **args style**.
-_Avoid_: style, mode, flavor.
+**Runtime distribution** (`runtime` knob):
+Where the client engine lives: `inline` (default — the runtime sources embedded in the generated output, zero dependencies) or `package` (the generated file imports it from `@redocly/client-generator`, so engine fixes arrive via `npm update`).
+Selected by `--runtime`; the generated wiring and the app-facing surface are identical in both.
+_Avoid_: facade (removed knob — every client exports both the instance and the free functions), embedded mode (say inline).
 
 **Args style**:
 How an operation's inputs are passed: `flat` (path params then `params`/`body`/`headers` slots) or `grouped` (one **Variables** object).
@@ -147,24 +144,25 @@ _Avoid_: arguments, inputs, query-string (in code identifiers).
 How a query param's value is rendered onto the wire.
 The OpenAPI default is `form` + `explode: true` (arrays repeat the key; objects become `key[sub]=val`).
 `ParamModel` carries the spec's `style` / `explode` / `allowReserved` **only for query params**, and **only when present** — absence means the default, so the IR stays clean.
-The operation emits a per-param `styles` literal as `__buildUrl`'s 4th arg **only for non-default** params (style ≠ `form`, or `explode: false`, or `allowReserved`); default params get no entry, so `__buildUrl` runs its existing path and the output is byte-identical.
-`__buildUrl` honors `form`+`explode:false` (`key=a,b`), `spaceDelimited` (`key=a%20b`), `pipeDelimited` (`key=a|b`) — literal delimiters, values encoded — and `deepObject` (the bracket form); `allowReserved` skips percent-encoding of RFC-3986 reserved chars (built via `__encodeReserved`).
+The operation **descriptor** carries the hints the same way (only when the param deviates from the defaults); the runtime resolves them per request (`queryStyles`) and `buildUrl` (`runtime/url.ts`) serializes.
+`buildUrl` honors `form`+`explode:false` (`key=a,b`), `spaceDelimited` (`key=a%20b`), `pipeDelimited` (`key=a|b`) — literal delimiters, values encoded — and `deepObject` (the bracket form); `allowReserved` skips percent-encoding of RFC-3986 reserved chars (via `encodeReserved`).
 Known deviation: an **object** query param at the default `form` style still serializes as `key[sub]=val` (deepObject brackets), not the spec's `sub=val` spread.
 
 **Injectable security scheme**:
-A security scheme the **runtime** can auto-apply via a setter — HTTP `bearer` (`setBearer`), HTTP `basic` (`setBasicAuth`), and `apiKey` in header / query / cookie (`setApiKey…`).
+A security scheme the **runtime** can auto-apply from the instance's credentials (`ClientConfig.auth`) — HTTP `bearer`, HTTP `basic`, and `apiKey` in header / query / cookie.
 OAuth2 / OpenID Connect normalize to `bearer`.
 Only `mutualTLS` is skipped.
+The generated setters (`setBearer`, `setBasicAuth`, `setApiKey…`) are instance-bound sugar over `client.auth.*`.
 Bearer/apiKey credentials are a **`TokenProvider`** — a string or a (possibly async) function `() => string | Promise<string>`, resolved per request.
-`__auth` is **async**, returning `{ headers, query }`; query-auth merges into the URL, cookie-auth folds into a combined `Cookie` header.
-_Avoid_: auth (unqualified), credential.
+`resolveAuth` (`runtime/auth.ts`, the auth **capability**) is **async**, returning `{ headers, query }`; query-auth merges into the URL, cookie-auth folds into a combined `Cookie` header.
+_Avoid_: auth (unqualified), credential, global setters (credentials are per instance).
 
 ## Flagged ambiguities
 
 **"module"** — two senses, keep them straight:
 
-- _Architecture sense_ (interface + implementation) — used when discussing depth/seams.
-- _Emitted-file sense_ — the `http` / `schemas` / `endpoints` / barrel files a client is split into. `ClientModules` is the writer-facing interface describing these.
+- _Architecture sense_ (interface + implementation) — used when discussing depth/seams (e.g. the `src/runtime/` modules).
+- _Emitted-file sense_ — the entry file and (in `split` mode) the schemas module a client is split into.
 
 **`params` vs `Variables` vs `args style`** — easy to conflate:
 
@@ -178,15 +176,14 @@ _Avoid_: auth (unqualified), credential.
 
 > **Dev:** I want the generated calls to take one object instead of positional args.
 >
-> **Maintainer:** That's the `object` **args style**. It bundles each operation's inputs
+> **Maintainer:** That's the `grouped` **args style**. It bundles each operation's inputs
 > into its **Variables** type — so a call becomes `getPet({ id, params })` where `params`
-> is still the query object. It's orthogonal to the **facade**, so it works the same
-> whether you emit standalone functions or a service class.
+> is still the query object. The `client` instance's methods are always grouped;
+> **args style** only shapes the free-function **sugar**.
 >
-> **Dev:** Does that change the shared files?
+> **Dev:** Does that change the rest of the file?
 >
-> **Maintainer:** No. **Args style** only affects the **endpoints**. The **runtime** and
-> **schemas** **modules** are byte-identical across args styles and facades — the
-> **writer** just lays the same emitted content out across files per the **output mode**.
-> Internally the **emitter** builds **fragments**, but the writers only ever see
-> **ClientModules**.
+> **Maintainer:** No. The **descriptors**, the **wiring**, and the embedded **runtime**
+> are byte-identical across args styles — in `flat` the sugar is per-operation arrow
+> consts, in `grouped` it's a destructure from the instance. The **writer** just lays
+> the same emitted content out per the **output mode**.
diff --git a/packages/client-generator/README.md b/packages/client-generator/README.md
index 136c5b4763..a4bcb11215 100644
--- a/packages/client-generator/README.md
+++ b/packages/client-generator/README.md
@@ -5,7 +5,8 @@
 > Feedback is very welcome while we stabilize it.
 
 Generate a typed TypeScript client (inline types + `fetch` runtime) from an OpenAPI description.
-The emitted client has **zero runtime dependencies** — it uses only web-standard APIs (`fetch`, `AbortController`, `URLSearchParams`, …), so it runs in browsers, Node ≥ 18, Bun, Deno, and edge runtimes.
+The emitted client has **zero runtime dependencies** by default — it uses only web-standard APIs (`fetch`, `AbortController`, `URLSearchParams`, …), so it runs in browsers, Node ≥ 18, Bun, Deno, and edge runtimes.
+Opt in to `runtime: 'package'` to import the runtime from this package instead, so engine fixes arrive via `npm update` without regenerating.
 Code is produced through the TypeScript compiler AST (not string templates), so output is correct by construction; `typescript` is the only (peer) dependency.
 
 This package is the engine behind the **`redocly generate-client`** command.
@@ -16,9 +17,10 @@ The rest of this README covers using the package **programmatically**.
 
 - **Broad input** — OpenAPI **3.0, 3.1, and 3.2.0**, plus **Swagger 2.0** (normalized to 3.x before generation)
   `api` is a file path or URL.
-- **Zero-dependency client** built via the TS AST, with `typescript` as the only peer dep
-- **Output modes** — `single`, `split`, `tags`, `tags-split` (`outputMode`)
-- **Facades** — standalone `functions` or a `service-class` (`facade`), the latter supporting **per-instance configuration and credentials** (`new Client({ auth, serverUrl, … })`)
+- **Zero-dependency client** (the default `inline` runtime) built via the TS AST, with `typescript` as the only peer dep
+- **Output modes** — `single` or `split` (schema types in a sibling `<stem>.schemas.ts`) (`outputMode`)
+- **Runtime distribution** (`runtime`) — `inline` (default, self-contained) or `package`: the client imports its runtime from `@redocly/client-generator` (pure-data operation descriptors + a build-time version-skew guard), so engine fixes arrive via `npm update` — no regeneration
+- **Both call styles, always** — a typed `client` instance (grouped-args methods, **per-instance configuration and credentials** via `createClient(OPERATIONS, { auth, serverUrl, … })`) plus free-function operations bound to it
 - **Argument styles** — `flat` positional args or a `grouped` `vars` object (`argsStyle`)
 - **Rich types** — inline types for every schema:
   - string enums as unions or runtime `const` objects (`enumStyle`)
@@ -26,8 +28,8 @@ The rest of this README covers using the package **programmatically**.
   - validation keywords surfaced as JSDoc
   - `dateType: 'Date'`
   - **typed `multipart/form-data` bodies** (object fields, binary → `Blob`) auto-serialized to `FormData`
-- **Runtime** — `setServerUrl` + a typed `ClientConfig` (headers, `fetch` swap, hooks):
-  - **composable middleware** (`onRequest`/`onResponse`/`onError`)
+- **Runtime** — a typed `ClientConfig` (`serverUrl`, headers, `fetch` swap, hooks) applied via `configure()`:
+  - **composable middleware** (`onRequest`/`onResponse`/`onError`) whose `ctx.operation.id`/`path`/`tags` are the spec's **literal unions** — a misspelled operation id fails compilation
   - **opt-in, abort-aware retries** with backoff, jitter, `Retry-After`, and a custom `retryOn`
   - per-call response decoding (`parseAs`)
   - OpenAPI **query-serialization styles**
@@ -38,7 +40,7 @@ The rest of this README covers using the package **programmatically**.
 - **Generators** (`generators`) — `sdk` (default), `zod`, `tanstack-query` (React/Vue/Svelte/Solid), `swr`, `transformers`, `mock` (MSW handlers + baked or `faker` data), and a [custom-generator plugin API](#custom-generators)
 - **Hardened** — document-derived names coerced to safe unique identifiers, comment text escaped, and a bounded SSE reader
 
-Every add-on generator keeps the emitted client dependency-free; its peer library is needed only in your app.
+No add-on generator adds a dependency to the emitted client; its peer library is needed only in your app.
 
 ## Use programmatically
 
@@ -49,15 +51,15 @@ import { generateClient } from '@redocly/client-generator';
 
 const result = await generateClient({
   api: 'openapi.yaml', // file path or URL
-  output: 'src/client.ts', // entry file; siblings derive from it in multi-file modes
-  outputMode: 'single', // 'single' | 'split' | 'tags' | 'tags-split'
-  facade: 'functions', // 'functions' | 'service-class'
+  output: 'src/client.ts', // entry file; the .schemas.ts sibling derives from it in split mode
+  outputMode: 'single', // 'single' | 'split'
+  runtime: 'inline', // 'inline' | 'package' (import the runtime from this package)
   argsStyle: 'flat', // 'flat' | 'grouped'
   errorMode: 'throw', // 'throw' | 'result'
   dateType: 'string', // 'string' | 'Date' (pair 'Date' with the 'transformers' generator)
   enumStyle: 'const-object', // 'const-object' | 'union'
   generators: ['sdk'], // see "Generators" below
-  // serverUrl, name, queryFramework, mockData, mockSeed, customGenerators are also accepted
+  // serverUrl, queryFramework, mockData, mockSeed, customGenerators are also accepted
 });
 
 console.log(`Wrote ${result.files.length} file(s), ${result.bytes} bytes.`);
@@ -123,6 +125,7 @@ The default (`form` + `explode: true`) repeats array values.
 Declare `style` / `explode` / `allowReserved` on a parameter to get `form`+`explode:false` (`key=a,b`), `spaceDelimited` (`key=a%20b`), `pipeDelimited` (`key=a|b`), `deepObject`, or reserved-char passthrough.
 
 A setter is generated for each injectable scheme — `setBearer` (HTTP `bearer` / OAuth2), `setBasicAuth(username, password)` (HTTP `basic`), and `setApiKey…` for `apiKey` schemes in header, query, or cookie — and each operation sends the credentials its `security` requires.
+Each setter is instance-bound sugar over the exported client (`export const setBearer = client.auth.bearer;`); credentials are **per instance** (`ClientConfig.auth`), so independent instances built with `createClient(OPERATIONS, { auth })` carry independent credentials — the generated module exports `createClient` in both runtimes (see the [`multi-instance` example](./examples/multi-instance)).
 Bearer/apiKey credentials accept a `TokenProvider` (a string or a possibly-async function resolved per request) for refresh-token flows:
 
 ```ts
@@ -164,7 +167,7 @@ const queryKey = [OPERATIONS.getOrderById.path, orderId]; // "/orders/{orderId}"
 ### Customizing requests and responses
 
 You shape requests and responses from your own code — never by editing the generated client, so changes survive regeneration.
-Middleware (`use(...)` for the functions facade, `client.use(...)` per instance for the service-class facade) hooks the request lifecycle, and each `RequestContext` carries the operation's identity so you can target by operationId or tag instead of brittle URL matching.
+Middleware (`use(...)` — sugar for `client.use(...)`, so it registers on that instance) hooks the request lifecycle, and each `RequestContext` carries the operation's identity so you can target by operationId or tag instead of brittle URL matching.
 `onRequest` may mutate `ctx.url` / `ctx.method` / `ctx.headers` **and `ctx.body`**; `onResponse` may observe or replace the `Response`:
 
 ```ts
@@ -219,7 +222,7 @@ export default defineClientSetup({
 redocly generate-client openapi.yaml --output src/api/client.ts --setup ./client-setup.ts
 ```
 
-The generator bakes the `config`/`middleware` into the generated client, so the published package applies them on import — your users call operations with no setup of their own, and can still override (their `configure`/`use` run after the baked ones). Works across all output modes and both facades (functions and service-class — `new Client()` picks up the baked defaults). A setup file may import **only** from `@redocly/client-generator`, keeping the client zero-dependency.
+The generator bakes the `config`/`middleware` into the generated client, so the published package applies them on import — your users call operations with no setup of their own, and can still override (their `configure`/`use` run after the baked ones; config layers spec defaults → baked setup → app `configure()`, middleware composes). Works across both output modes and both runtimes. A setup file may import **only** from `@redocly/client-generator`, so it never adds a dependency to the client.
 
 See the [`baked-setup` example](./examples/baked-setup) and [ADR-0015](./docs/adr/0015-publisher-setup-bake-in.md).
 
@@ -267,7 +270,8 @@ example directory serves it on `http://localhost:5173` against the live demo API
 ## Generators
 
 `generators` (default `['sdk']`) selects which files to emit.
-The `sdk` client is always dependency-free; each add-on lands in its own sibling file and needs its peer library only in your app.
+The `sdk` client is dependency-free with the default `inline` runtime; each add-on lands in its own sibling file and needs its peer library only in your app.
+Every generator works with both runtimes and both output modes.
 
 ### Runtime validation with Zod
 
@@ -321,7 +325,7 @@ await trigger({ body: { name: 'Rex' } });
 ```
 
 Only the `*.swr.ts` module imports SWR (`swr` for queries, `swr/mutation` for mutations); install it as a peer — any `swr` `^2`.
-The hooks wrap the **throw-mode** sdk and support only the `functions` facade.
+The hooks wrap the **throw-mode** sdk functions.
 
 ### Date transformers
 
@@ -335,7 +339,7 @@ import { transformPet } from './client.transformers.ts';
 const pet = transformPet(await getPet(id)); // pet.createdAt is now a Date
 ```
 
-The transformers import only the schema **types**, so the client stays dependency-free (`Date` is a web standard).
+The transformers import only the schema **types**, so they add no dependency to the client (`Date` is a web standard).
 `int64` → `bigint` is deferred; without `dateType: 'Date'` the date fields stay `string`.
 
 ### MSW mocks
@@ -363,7 +367,7 @@ const special = createMenuItem({ name: 'Cold Brew', price: 499 });
 
 **Realistic data with faker** — mock data is **baked** by default (deterministic literals, no extra dependency).
 Set `mockData: 'faker'` to emit [`@faker-js/faker`](https://fakerjs.dev) calls for realistic data, and `mockSeed: <n>` to pin faker's PRNG so the data is reproducible.
-Factory signatures are identical in both modes; faker mode makes `@faker-js/faker` (`^9`) a dev dependency of your app (the client itself stays dependency-free).
+Factory signatures are identical in both modes; faker mode makes `@faker-js/faker` (`^9`) a dev dependency of your app (the client itself gains no dependency).
 
 ## Custom generators
 
@@ -407,19 +411,19 @@ await generateClient({
 ```
 
 `@redocly/client-generator` also exports the IR types and the codegen toolkit the built-ins use (`ts`, `printStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, …).
-A generator declares the same `requires`/`facades`/`errorModes`/`dateTypes` contract, validated up front.
-The generated client stays dependency-free.
+A generator declares the same `requires`/`errorModes`/`dateTypes`/`runtimes` contract, validated up front.
+A custom generator never adds dependencies to the generated client.
 See `examples/custom-generator` for a runnable example.
 
 ## Server-Sent Events (streaming)
 
-An operation whose `2xx` response declares `text/event-stream` is generated — with no option — as a typed async iterator under an `sse` namespace.
+An operation whose `2xx` response declares `text/event-stream` is generated — with no option — as a typed **async-generator** client method plus the matching free function.
 Each event's `data` is typed from the OpenAPI 3.2 `itemSchema` (falling back to the media `schema`, then `string`):
 
 ```ts
-import { sse } from './client.ts';
+import { streamMessages } from './client.ts';
 
-for await (const ev of sse.streamMessages()) {
+for await (const ev of streamMessages()) {
   console.log(ev.id, ev.data.text); // ev: ServerSentEvent<Message>
 }
 ```
@@ -430,7 +434,7 @@ SSE operations always throw `ApiError` on an initial non-2xx and never return th
 
 ## Examples
 
-Runnable examples live in [`examples/`](./examples): `fetch-functions`, `service-class`, `zod`, `tanstack-query`, `mock`, and `custom-generator`.
+Runnable examples live in [`examples/`](./examples): `zero-install-quickstart`, `fetch-functions`, `configure-and-middleware`, `customization`, `baked-setup`, `sse-streaming`, `zod`, `tanstack-query`, `mock`, `custom-generator`, `programmatic`, `vendored-edge`, `package-runtime` (`runtime: 'package'` — engine fixes via `npm update`), and `multi-instance` (per-tenant `createClient` instances over one generated module).
 Each is a standalone Vite app with a checked-in, drift-checked generated client.
 
 ## Documentation
@@ -448,4 +452,4 @@ npm run unit                    # unit tests (this package is held at 100% cover
 VITEST_SUITE=e2e npx vitest run tests/e2e/generate-client/   # behavioral e2e
 ```
 
-The emitted runtime lives in `src/emitters/runtime.ts` (a template string), the structural emitters in `src/emitters/`, the IR in `src/intermediate-representation/`, the generators in `src/generators/`, and the multi-file layout strategies in `src/writers/`.
+The client runtime lives in `src/runtime/` (real, unit-testable modules; package mode imports them, inline mode embeds them via the generated `src/emitters/runtime-sources.ts` snapshot and the `src/emitters/inline-runtime.ts` assembler), the structural emitters in `src/emitters/`, the IR in `src/intermediate-representation/`, the generators in `src/generators/`, and the file-layout writers in `src/writers/`.
diff --git a/packages/client-generator/docs/adr/0005-error-mode-terminals.md b/packages/client-generator/docs/adr/0005-error-mode-terminals.md
index f6daa39682..a02e6d9f47 100644
--- a/packages/client-generator/docs/adr/0005-error-mode-terminals.md
+++ b/packages/client-generator/docs/adr/0005-error-mode-terminals.md
@@ -1,5 +1,7 @@
 # ADR 0005: Error handling as a generate-time mode (throw vs result)
 
+> **Note (2026-07):** The terminals mechanism described here (`__send`/`__request`/`__requestResult`, `renderRuntime`) is superseded by the runtime-module architecture — error mode is still fixed at generate time, but the runtime's `execute` now branches on the instance config; see [ADR-0017](./0017-runtime-module-and-descriptor-client.md).
+
 - Status: Accepted
 - Date: 2026-06-10
 
diff --git a/packages/client-generator/docs/adr/0006-sse-namespace.md b/packages/client-generator/docs/adr/0006-sse-namespace.md
index 5a52aa352e..8bc6628c11 100644
--- a/packages/client-generator/docs/adr/0006-sse-namespace.md
+++ b/packages/client-generator/docs/adr/0006-sse-namespace.md
@@ -1,5 +1,7 @@
 # ADR 0006: SSE as a derived response kind under an `sse.*` namespace
 
+> **Note (2026-07):** Superseded by [ADR-0017](./0017-runtime-module-and-descriptor-client.md) — the `sse.*` namespace is removed; SSE operations are now flat async-generator client methods/functions wired through the runtime's `sse` capability.
+
 - Status: Accepted
 - Date: 2026-06-10
 
diff --git a/packages/client-generator/docs/adr/0007-call-site-auth.md b/packages/client-generator/docs/adr/0007-call-site-auth.md
index 7efc519d8d..b881cd0ff2 100644
--- a/packages/client-generator/docs/adr/0007-call-site-auth.md
+++ b/packages/client-generator/docs/adr/0007-call-site-auth.md
@@ -1,5 +1,7 @@
 # ADR 0007: Auth resolved at the call site via async `__auth`
 
+> **Note (2026-07):** Superseded by [ADR-0017](./0017-runtime-module-and-descriptor-client.md) — the module-global credential slots and emitted `__auth` call sites are gone; credentials are per instance (`ClientConfig.auth`) and resolved by the runtime's `resolveAuth` capability.
+
 - Status: Accepted (extended by [ADR-0009](./0009-per-instance-auth.md))
 - Date: 2026-06-10
 
diff --git a/packages/client-generator/docs/adr/0009-per-instance-auth.md b/packages/client-generator/docs/adr/0009-per-instance-auth.md
index 771516d423..0f7ad25669 100644
--- a/packages/client-generator/docs/adr/0009-per-instance-auth.md
+++ b/packages/client-generator/docs/adr/0009-per-instance-auth.md
@@ -1,5 +1,7 @@
 # ADR 0009: Per-instance auth via `ClientConfig.auth`
 
+> **Note (2026-07):** The decision (per-instance `ClientConfig.auth`) stands, but the mechanism text is superseded by the runtime-module architecture — the module-global setter slots and `__auth` are gone; the generated `set*` setters are now sugar over `client.auth.*`; see [ADR-0017](./0017-runtime-module-and-descriptor-client.md).
+
 - Status: Accepted
 - Date: 2026-06-10
 
diff --git a/packages/client-generator/docs/adr/0017-runtime-module-and-descriptor-client.md b/packages/client-generator/docs/adr/0017-runtime-module-and-descriptor-client.md
new file mode 100644
index 0000000000..f5c25668d2
--- /dev/null
+++ b/packages/client-generator/docs/adr/0017-runtime-module-and-descriptor-client.md
@@ -0,0 +1,38 @@
+# ADR 0017: Hand-written runtime module + descriptor-driven generated clients
+
+- Status: Accepted
+- Date: 2026-07-06
+
+## Context
+
+Until now the generated client's behavior — URL building, auth, retry, middleware, body serialization, SSE — lived in a 700+-line source-string template (`emitters/runtime.ts`) stamped verbatim into every output. That delivered the zero-dependency, self-contained file [ADR-0002](./0002-typescript-peer-dep.md) promised, at three compounding costs:
+
+1. **Fix distribution.** A runtime-behavior bug required every consumer to regenerate every API. Empirically, all of this branch's customer-visible fixes (body-after-`onRequest`, multipart-after-`onRequest`, retry body drain, SSE final-frame/reconnect) were runtime-behavior fixes — each would have shipped via a `^` semver range had the runtime been installable.
+2. **Testability.** The behavior existed only as an emitted string — unit-testable only through generated output and e2e suites, never directly.
+3. **Surface sprawl.** Two facades (`--facade functions|service-class` plus `--name`), four output modes (`single|split|tags|tags-split`), an `sse.*` namespace ([ADR-0006](./0006-sse-namespace.md)), module-global auth slots ([ADR-0007](./0007-call-site-auth.md)), and `setServerUrl` multiplied the emit paths the template had to serve.
+
+The market's two reference designs each fail one side of the trade. The leading OSS generator ran a separate-runtime-packages model and abandoned it (its stated reasons: slower onboarding, painful upgrades, bundling issues — failure modes of version pairing across six client packages with no frozen contract). The leading commercial platform inlines everything and distributes fixes by republishing whole SDKs. Neither offers both.
+
+Nothing is published (the package sits at `0.0.0`), so reshaping the output is free-breaking — and [ADR-0013](./0013-experimental-status.md)'s stabilization criteria require the generated-output shape frozen before that changes, which forces the decision now.
+
+## Decision
+
+**The runtime is a hand-written module; the generated client is data.**
+
+1. **One package, no separate runtime package.** The runtime lives at `packages/client-generator/src/runtime/` — eleven internally dependency-free source modules (`types`, `errors`, `url`, `parse`, `retry`, `multipart`, `auth`, `setup`, `send`, `sse`, `create-client`) behind an `index.ts` barrel, re-exported from the package's main entry and directly unit-tested at 100% per-file coverage. Package-mode clients import `@redocly/client-generator` itself; setup files ([ADR-0015](./0015-publisher-setup-bake-in.md)) keep their existing import, and the runtime-contract types become re-exports of `runtime/types.ts` (single source of truth). This avoids the version-pairing failure mode of a second package; extraction remains possible later at the cost of one regeneration.
+2. **The descriptor is the frozen seam.** Generated clients carry per-operation wire shapes as pure data — `OPERATIONS = { … } as const satisfies Record<string, OperationDescriptor>` — plus an `Ops` interface (per-op `args`/`result`, `kind: 'sse'` for streams) and `export const client = createClient<Ops, …>(OPERATIONS, { … })`. `createClient` attaches one real bound method per operation in a construction-time loop (no Proxy); `configure`/`use`/`auth` are assigned after the loop so they win name collisions. Additions to `OperationDescriptor` must be optional (additive within a major).
+3. **`runtime: inline` stays the default; `runtime: package` is the opt-in.** Inline preserves ADR-0002's headline — a self-contained, zero-dependency file — via a build-time snapshot: `npm run compile` regenerates `emitters/runtime-sources.ts` from the real `src/runtime/` sources, and `emitters/inline-runtime.ts` embeds them in import-graph order, whole modules only, stripped of module syntax. One source of truth; the inline copy cannot drift. Package mode replaces the embedded block with `import { createClient, … } from '@redocly/client-generator'`, so runtime fixes reach the app via `npm update` with zero regeneration; regeneration then tracks only spec changes.
+4. **Capability-seam assembly.** The send core never statically imports the optional modules (`multipart`, `auth`, `sse`, `setup`); they plug in through a `Capabilities` object wired at `createClient` time. The package barrel wires the full set; the inline assembler wires — and embeds — only what the spec needs, so exclusion can never break the core, `noUnusedLocals` holds, and both modes execute identical code paths.
+5. **The `satisfies` clause is the version-skew guard.** No bespoke contract versioning: plain npm semver, with the generated `satisfies Record<string, OperationDescriptor>` failing the consumer's **build** on an incompatible generated/runtime pair (package mode's only new failure axis). Accepted caveat: plain-JS consumers who never typecheck lose the guard.
+6. **Facade and surface collapse.** Every generated module always exports both call styles — the `client` instance (grouped-args methods) and free-function one-liners (`--args-style` shapes only the sugar) — so `--facade` and `--name` are removed (no generated class to name). `--output-mode` reduces to `single` | `split` (entry + `<stem>.schemas.ts`; endpoints are one-liners now, so per-tag splitting lost its point). `setServerUrl` is removed (`configure({ serverUrl })` covers it). SSE operations become flat async-generator methods driven by `kind: 'sse'` in `Ops` — the `sse.*` namespace is gone. Auth is per-instance only: the runtime's `resolveAuth` capability reads `ClientConfig.auth`, `client.auth.{bearer,basic,apiKey}` mutates it, and the generated `setBearer`/`setBasicAuth`/`setApiKey*` setters are sugar bound to the default instance — the module-global credential slots are gone.
+7. **Semantics carried over, not redesigned.** Error mode stays a generate-time knob ([ADR-0005](./0005-error-mode-terminals.md)): the generator writes `Result<…>` into `Ops` **and** bakes `errorMode: 'result'` into the `createClient` config; the runtime's `execute` branches on that flag, and `configure()` ignores `errorMode` (flipping it at runtime would desync the static types). Config layers lowest→highest as spec defaults → baked publisher setup (`mergeSetup`) → the app's `configure()`; `use()` appends, `configure({ middleware })` replaces. Middleware's `ctx.operation` keeps its literal-union typing (`OperationId`/`OperationPath`/`OperationTag`), now threaded through `createClient`'s type parameters.
+
+## Consequences
+
+- Runtime fixes finally have a `^`-range channel — for `runtime: package` users. Default (`inline`) users still fix by regenerating; one fan-out command covers a fleet. Both personas are served; the dual mode is a market unique.
+- The runtime gets direct unit tests (retry/backoff, middleware order, query styles, multipart, parse kinds, auth resolution, SSE framing/reconnect) instead of being reachable only through generated output.
+- The generator shrinks to emitting types + data + thin wiring; one emitter (`emitters/package-client.ts`) serves both runtimes and both output modes, and the wrapper generators' `facades: ['functions']` restriction is deleted (free functions always exist).
+- **Per-operation tree-shaking regresses** — the instance loop references the whole `OPERATIONS` map, so unused operations' descriptors ship. Accepted: descriptors are data-only (~100–200 B/op, gzips well; types never ship). If it bites, a per-op descriptor-export/client-subsetting mode restores shaking later — the pattern has commercial prior art and is on the roadmap, not in this change.
+- `satisfies` requires consumer TS >= 4.9 — well under the `>=5.5` peer floor.
+- The runtime module inherits the output's portability rule: web-standard APIs only (no Node builtins), ESM, `sideEffects: false` — enforced by the same strict-tsc e2e gates.
+- Relationship to earlier ADRs: **amends [ADR-0002](./0002-typescript-peer-dep.md)** (the zero-dep default is preserved; `package` mode is the documented opt-in that adds one dependency); **supersedes the mechanisms of [ADR-0005](./0005-error-mode-terminals.md)** (the `__send`/`__request`/`__requestResult` terminals are gone; the decision — error mode fixed at generate time — stands), **[ADR-0006](./0006-sse-namespace.md)** (namespace → flat methods), and **[ADR-0007](./0007-call-site-auth.md)/[ADR-0009](./0009-per-instance-auth.md)** (module-global slots and emitted `__auth` call sites → the runtime `resolveAuth` capability over per-instance `ClientConfig.auth`; 0009's per-instance decision stands and is now the only model).
diff --git a/packages/client-generator/docs/adr/README.md b/packages/client-generator/docs/adr/README.md
index de50285bdc..b536ea9685 100644
--- a/packages/client-generator/docs/adr/README.md
+++ b/packages/client-generator/docs/adr/README.md
@@ -9,24 +9,25 @@ ARCHITECTURE.md says _what is_; these ADRs say _why_.
 
 ## Index
 
-| #                                                | Decision                                                         | Status                  |
-| ------------------------------------------------ | ---------------------------------------------------------------- | ----------------------- |
-| [0001](./0001-ast-codegen.md)                    | Generate TypeScript via the TS AST (`ts.factory`), not strings   | Accepted                |
-| [0002](./0002-typescript-peer-dep.md)            | `typescript` as a peer dep; zero-runtime-dependency output       | Accepted                |
-| [0003](./0003-spec-agnostic-ir.md)               | A spec-agnostic IR as the builder↔emitter contract               | Accepted                |
-| [0004](./0004-registry-seams.md)                 | First-party `getGenerator` / `getWriter` registry seams          | Accepted                |
-| [0005](./0005-error-mode-terminals.md)           | Error handling as a generate-time mode (throw vs result)         | Accepted                |
-| [0006](./0006-sse-namespace.md)                  | SSE as a derived response kind under an `sse.*` namespace        | Accepted                |
-| [0007](./0007-call-site-auth.md)                 | Auth resolved at the call site via async `__auth`                | Accepted (ext. by 0009) |
-| [0008](./0008-redocly-yaml-config.md)            | `generate-client` config via `redocly.yaml` `x-client-generator` | Accepted                |
-| [0009](./0009-per-instance-auth.md)              | Per-instance auth via `ClientConfig.auth`                        | Accepted                |
-| [0010](./0010-mock-data-baked-vs-faker.md)       | Mock data: baked literals by default, faker opt-in               | Accepted                |
-| [0011](./0011-wrapper-generators.md)             | Data-fetching wrapper generators (`swr`, `tanstack-query`)       | Accepted                |
-| [0012](./0012-plugin-api.md)                     | Experimental custom-generator (plugin) API                       | Accepted (experimental) |
-| [0013](./0013-experimental-status.md)            | Experimental release status & stabilization criteria             | Accepted                |
-| [0014](./0014-request-response-customization.md) | Request/response customization as a runtime contract             | Accepted                |
-| [0015](./0015-publisher-setup-bake-in.md)        | Publisher setup bake-in via `--setup`                            | Accepted                |
-| [0016](./0016-msw-generator-vs-mock-server.md)   | In-process MSW mocks coexist with the out-of-process mock server | Accepted                |
+| #                                                      | Decision                                                          | Status                  |
+| ------------------------------------------------------ | ----------------------------------------------------------------- | ----------------------- |
+| [0001](./0001-ast-codegen.md)                          | Generate TypeScript via the TS AST (`ts.factory`), not strings    | Accepted                |
+| [0002](./0002-typescript-peer-dep.md)                  | `typescript` as a peer dep; zero-runtime-dependency output        | Accepted                |
+| [0003](./0003-spec-agnostic-ir.md)                     | A spec-agnostic IR as the builder↔emitter contract                | Accepted                |
+| [0004](./0004-registry-seams.md)                       | First-party `getGenerator` / `getWriter` registry seams           | Accepted                |
+| [0005](./0005-error-mode-terminals.md)                 | Error handling as a generate-time mode (throw vs result)          | Amended by 0017         |
+| [0006](./0006-sse-namespace.md)                        | SSE as a derived response kind under an `sse.*` namespace         | Superseded by 0017      |
+| [0007](./0007-call-site-auth.md)                       | Auth resolved at the call site via async `__auth`                 | Superseded by 0017      |
+| [0008](./0008-redocly-yaml-config.md)                  | `generate-client` config via `redocly.yaml` `x-client-generator`  | Accepted                |
+| [0009](./0009-per-instance-auth.md)                    | Per-instance auth via `ClientConfig.auth`                         | Amended by 0017         |
+| [0010](./0010-mock-data-baked-vs-faker.md)             | Mock data: baked literals by default, faker opt-in                | Accepted                |
+| [0011](./0011-wrapper-generators.md)                   | Data-fetching wrapper generators (`swr`, `tanstack-query`)        | Accepted                |
+| [0012](./0012-plugin-api.md)                           | Experimental custom-generator (plugin) API                        | Accepted (experimental) |
+| [0013](./0013-experimental-status.md)                  | Experimental release status & stabilization criteria              | Accepted                |
+| [0014](./0014-request-response-customization.md)       | Request/response customization as a runtime contract              | Accepted                |
+| [0015](./0015-publisher-setup-bake-in.md)              | Publisher setup bake-in via `--setup`                             | Accepted                |
+| [0016](./0016-msw-generator-vs-mock-server.md)         | In-process MSW mocks coexist with the out-of-process mock server  | Accepted                |
+| [0017](./0017-runtime-module-and-descriptor-client.md) | Hand-written runtime module + descriptor-driven generated clients | Accepted                |
 
 ## Template
 
diff --git a/packages/client-generator/package.json b/packages/client-generator/package.json
index dd20eb0926..6c8654c21a 100644
--- a/packages/client-generator/package.json
+++ b/packages/client-generator/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@redocly/client-generator",
   "version": "0.0.0",
-  "description": "Generate TypeScript clients (types, fetch, service-class) from OpenAPI descriptions.",
+  "description": "Generate typed, zero-dependency TypeScript clients (fetch, auth, retries, middleware, SSE) from OpenAPI descriptions.",
   "type": "module",
   "types": "lib/index.d.ts",
   "sideEffects": false,
@@ -18,6 +18,7 @@
   "engineStrict": true,
   "scripts": {
     "examples:regen": "node scripts/regenerate-examples.mjs",
+    "prepare": "node scripts/generate-runtime-sources.mjs",
     "typecheck:examples": "node scripts/typecheck-examples.mjs"
   },
   "license": "MIT",
diff --git a/packages/client-generator/scripts/generate-runtime-sources.mjs b/packages/client-generator/scripts/generate-runtime-sources.mjs
new file mode 100644
index 0000000000..df02d125fd
--- /dev/null
+++ b/packages/client-generator/scripts/generate-runtime-sources.mjs
@@ -0,0 +1,57 @@
+import { readFileSync, writeFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+// Snapshot src/runtime/*.ts source text into a tracked TS module so the inline assembler
+// can embed the real runtime (a readFileSync asset would not survive the CLI's esbuild
+// bundling). Order is the assembler's fixed dependency order; the barrel (index.ts) is
+// not embedded — the assembler emits its own local createClient wiring.
+const MODULES = [
+  'types',
+  'errors',
+  'url',
+  'parse',
+  'retry',
+  'multipart',
+  'auth',
+  'setup',
+  'send',
+  'sse',
+  'create-client',
+];
+
+const pkgRoot = join(dirname(fileURLToPath(import.meta.url)), '..');
+const runtimeDir = join(pkgRoot, 'src', 'runtime');
+const outFile = join(pkgRoot, 'src', 'emitters', 'runtime-sources.ts');
+
+// Emit the literal exactly as oxfmt (singleQuote: true) would format it, so that
+// compile → format is a no-op: prefer single quotes unless that needs more escapes.
+function toStringLiteral(source) {
+  const singles = (source.match(/'/g) ?? []).length;
+  const doubles = (source.match(/"/g) ?? []).length;
+  const json = JSON.stringify(source); // handles all escaping, double-quoted
+  if (singles > doubles) return json;
+  const inner = json
+    .slice(1, -1)
+    .replace(/\\\\|\\"|'/g, (m) => (m === '\\\\' ? m : m === '\\"' ? '"' : "\\'"));
+  return `'${inner}'`;
+}
+
+const entries = MODULES.map((name) => {
+  const source = readFileSync(join(runtimeDir, `${name}.ts`), 'utf-8');
+  const line = `  '${name}.ts': ${toStringLiteral(source)},`;
+  // oxfmt (printWidth: 100) breaks an over-width property onto a continuation line.
+  return line.length <= 100 ? line : `  '${name}.ts':\n    ${toStringLiteral(source)},`;
+});
+
+const content = [
+  '// GENERATED by scripts/generate-runtime-sources.mjs — do not edit. Regenerated on install (`prepare`) and on commit (lint-staged); manually: `npm run prepare -w @redocly/client-generator`.',
+  'export const RUNTIME_SOURCES = {',
+  ...entries,
+  '} as const;',
+  '',
+  'export type RuntimeModuleName = keyof typeof RUNTIME_SOURCES;',
+  '',
+].join('\n');
+
+writeFileSync(outFile, content);
diff --git a/packages/client-generator/scripts/regenerate-examples.mjs b/packages/client-generator/scripts/regenerate-examples.mjs
index 73433e27cb..e4e32ab700 100644
--- a/packages/client-generator/scripts/regenerate-examples.mjs
+++ b/packages/client-generator/scripts/regenerate-examples.mjs
@@ -14,12 +14,17 @@ const examples = [
   'fetch-functions',
   'customization',
   'baked-setup',
-  'service-class',
   'zod',
   'mock',
   'custom-generator',
   'tanstack-query',
   'programmatic',
+  'package-runtime',
+  'zero-install-quickstart',
+  'configure-and-middleware',
+  'multi-instance',
+  'sse-streaming',
+  'vendored-edge',
 ];
 
 for (const name of examples) {
diff --git a/packages/client-generator/scripts/typecheck-examples.mjs b/packages/client-generator/scripts/typecheck-examples.mjs
index f029149c37..49475e3cd6 100644
--- a/packages/client-generator/scripts/typecheck-examples.mjs
+++ b/packages/client-generator/scripts/typecheck-examples.mjs
@@ -14,12 +14,17 @@ const examples = [
   'fetch-functions',
   'customization',
   'baked-setup',
-  'service-class',
   'zod',
   'tanstack-query',
   'programmatic',
   'mock',
   'custom-generator',
+  'package-runtime',
+  'zero-install-quickstart',
+  'configure-and-middleware',
+  'multi-instance',
+  'sse-streaming',
+  'vendored-edge',
 ];
 
 let failed = false;
diff --git a/packages/client-generator/src/__tests__/config-file.test.ts b/packages/client-generator/src/__tests__/config-file.test.ts
index 0efed2a266..0570a8e066 100644
--- a/packages/client-generator/src/__tests__/config-file.test.ts
+++ b/packages/client-generator/src/__tests__/config-file.test.ts
@@ -4,13 +4,13 @@ describe('mergeConfig', () => {
   it('CLI overrides win over base values; undefined overrides are ignored', () => {
     const merged = mergeConfig(
       { api: 'spec.yaml', output: 'a.ts', outputMode: 'single' },
-      { output: 'b.ts', outputMode: undefined, facade: 'service-class' }
+      { output: 'b.ts', outputMode: undefined, argsStyle: 'grouped' }
     );
     expect(merged).toEqual({
       api: 'spec.yaml',
       output: 'b.ts',
       outputMode: 'single',
-      facade: 'service-class',
+      argsStyle: 'grouped',
     });
   });
 });
diff --git a/packages/client-generator/src/__tests__/index.test.ts b/packages/client-generator/src/__tests__/index.test.ts
index b0eea09a96..441257f74e 100644
--- a/packages/client-generator/src/__tests__/index.test.ts
+++ b/packages/client-generator/src/__tests__/index.test.ts
@@ -39,6 +39,18 @@ describe('collectGeneratedFiles', () => {
       })
     ).toThrow(/already emitted/);
   });
+
+  it('supports runtime: package with outputMode: split (the shared emitter serves both)', () => {
+    const files = collectGeneratedFiles(model(), {
+      outputPath: '/out/api.ts',
+      outputMode: 'split',
+      emit: { runtime: 'package' },
+      generators: ['sdk'],
+    });
+    // No schemas in the model → only the entry file.
+    expect(files.map((f) => f.path)).toEqual(['/out/api.ts']);
+    expect(files[0].content).toContain("from '@redocly/client-generator'");
+  });
 });
 
 describe('generateClient — end-to-end orchestration', () => {
@@ -82,7 +94,9 @@ describe('generateClient — end-to-end orchestration', () => {
     expect(result.bytes).toBeGreaterThan(0);
 
     const contents = await readFile(output, 'utf-8');
-    expect(contents).toContain('export async function ping(');
+    expect(contents).toContain(
+      'export const ping = (init: RequestOptions = {}) => client.ping({}, init);'
+    );
     expect(contents).toContain('// Generated by @redocly/client-generator');
     // bytes should match what we wrote.
     expect(result.bytes).toBe(Buffer.byteLength(contents, 'utf-8'));
@@ -114,14 +128,14 @@ describe('generateClient — end-to-end orchestration', () => {
     const resultOutput = join(workDir, 'result.ts');
     await generateClient({ api, output: resultOutput, errorMode: 'result' });
     const resultContents = await readFile(resultOutput, 'utf-8');
-    expect(resultContents).toContain('__requestResult');
-    expect(resultContents).toContain('export type Result<');
+    expect(resultContents).toContain('errorMode: "result"');
+    expect(resultContents).toContain('result: Result<PingResult, unknown>;');
 
     const throwOutput = join(workDir, 'throw.ts');
     await generateClient({ api, output: throwOutput });
     const throwContents = await readFile(throwOutput, 'utf-8');
-    expect(throwContents).not.toContain('__requestResult');
-    expect(throwContents).not.toContain('export type Result<');
+    expect(throwContents).not.toContain('errorMode: "result"');
+    expect(throwContents).toContain('result: PingResult;');
   });
 
   it('normalizes a Swagger 2.0 document before generating', async () => {
@@ -162,8 +176,8 @@ describe('generateClient — end-to-end orchestration', () => {
 
     expect(result.bytes).toBeGreaterThan(0);
     const contents = await readFile(output, 'utf-8');
-    expect(contents).toContain('export async function listItems(');
+    expect(contents).toContain('export const listItems = (');
     expect(contents).toContain('export type Item');
-    expect(contents).toContain('let BASE = "https://api.example.com/v1"');
+    expect(contents).toContain('serverUrl: "https://api.example.com/v1"');
   });
 });
diff --git a/packages/client-generator/src/__tests__/runtime-contract.test.ts b/packages/client-generator/src/__tests__/runtime-contract.test.ts
deleted file mode 100644
index b6fae3b0c4..0000000000
--- a/packages/client-generator/src/__tests__/runtime-contract.test.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { renderRuntime } from '../emitters/runtime.js';
-import { defineClientSetup } from '../runtime-contract.js';
-
-describe('defineClientSetup', () => {
-  it('returns its argument unchanged (identity helper)', () => {
-    const setup = { config: { serverUrl: 'https://x' }, middleware: [] };
-    expect(defineClientSetup(setup)).toBe(setup);
-  });
-});
-
-describe('contract types stay in lockstep with the emitted runtime', () => {
-  // Drift alarm: these spec-independent shapes are emitted verbatim into every client.
-  // If one changes here, update src/runtime-contract.ts to match (and vice-versa). The
-  // emitted types are re-printed by the TS printer (multi-line), so we assert on the
-  // distinctive field signatures rather than a one-line form.
-  const out = renderRuntime('https://x', false, false);
-  it.each([
-    ['OperationContext', 'export type OperationContext = {'],
-    ['OperationContext.tags', 'tags: string[];'],
-    ['RequestContext.operation', 'operation: OperationContext;'],
-    ['Middleware.onRequest', 'onRequest?: (ctx: RequestContext) => void | Promise<void>;'],
-    ['RetryStrategy', "export type RetryStrategy = 'fixed' | 'exponential';"],
-  ])('emits %s', (_name, signature) => {
-    expect(out).toContain(signature);
-  });
-});
diff --git a/packages/client-generator/src/config.ts b/packages/client-generator/src/config.ts
index d82b2b5067..a0420080cb 100644
--- a/packages/client-generator/src/config.ts
+++ b/packages/client-generator/src/config.ts
@@ -1,4 +1,4 @@
-import type { ArgsStyle, Facade } from './emitters/client.js';
+import type { ArgsStyle } from './emitters/client.js';
 // packages/client-generator/src/config.ts
 import type { CustomGenerator } from './generators/types.js';
 import type { OutputMode } from './writers/types.js';
@@ -16,12 +16,8 @@ export type Config = {
   output: string;
   /** File partitioning. Defaults to `single`. */
   outputMode?: OutputMode;
-  /** Developer-facing operation shape. Defaults to `functions`. */
-  facade?: Facade;
   /** How inputs are passed. Defaults to `flat`. */
   argsStyle?: ArgsStyle;
-  /** Class name for the service-class facade. Defaults to `Client`. */
-  name?: string;
   /** Override the inlined base URL (else derived from `servers[0].url`). */
   serverUrl?: string;
   /** Named-enum emission. Defaults to `const-object`. */
@@ -56,7 +52,9 @@ export type Config = {
   /**
    * Path to a publisher setup module (`export default defineClientSetup({ config, middleware })`)
    * baked into the generated client, so a published SDK ships its request/response defaults built
-   * in. Resolved against the config dir. Works across all output modes and both facades.
+   * in. Resolved against the config dir. Works across all output modes.
    */
   setup?: string;
+  /** Runtime distribution: 'inline' (default, self-contained) | 'package' (imports @redocly/client-generator). */
+  runtime?: 'inline' | 'package';
 };
diff --git a/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap b/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
new file mode 100644
index 0000000000..d5801b8933
--- /dev/null
+++ b/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
@@ -0,0 +1,1118 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`emitClientSingleFile (embed arm) > matches the golden output for a small model 1`] = `
+"// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run \`redocly generate-client\` to update.
+
+/**
+ * T (v1.0.0)
+ */
+
+export type Order = {
+    id: string;
+};
+
+export type Problem = {};
+
+export type Pet = {};
+
+export type OrderEvent = {};
+
+export type GetOrderResult = Order;
+
+export type GetOrderParams = {
+    expand?: string;
+};
+
+export type GetOrderVariables = {
+    orderId: string;
+    params?: GetOrderParams;
+};
+
+/**
+ * Per-operation \`args\`/\`result\` shapes (plus \`kind: 'sse'\` for event streams) — the
+ * type-level companion of \`OPERATIONS\` that gives \`createClient<Ops>\` its typed methods.
+ */
+export type Ops = {
+    getOrder: {
+        args: {
+            orderId: string;
+            params?: GetOrderParams;
+        };
+        result: GetOrderResult;
+    };
+    streamEvents: {
+        args: {};
+        result: OrderEvent;
+        kind: "sse";
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "expand", in: "query" }], security: [{ scheme: "bearerAuth", kind: "bearer" }] },
+    streamEvents: { id: "streamEvents", method: "GET", path: "/events", responseKind: "sse", sseDataKind: "json" }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — \`@redocly/client-generator\`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits \`OPERATIONS\` literals typed
+ * \`satisfies Record<string, OperationDescriptor>\` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (\`scheme\` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** \`multipart: true\` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to \`'json'\` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (\`ctx.operation\`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (\`OperationId\`/\`OperationPath\`/\`OperationTag\`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (\`runtime-contract.ts\`, the runtime internals) working
+ * with the base shape. \`tags\` stays mutable (\`Tag[]\`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom \`retryOn\`: exactly one of \`response\`/\`error\` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real \`ApiError\` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // \`globalThis.Error\` so a spec schema named \`Error\` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (\`'throw'\` when omitted); \`configure()\` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call \`parseAs\` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard \`RequestInit\` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of \`data\`/\`error\` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/** The generated \`Ops\` type's shape: per-operation args/result (and \`kind: 'sse'\` for streams). */
+export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note \`middleware\` REPLACES the chain (use \`use()\` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: \`{}\` has no required members, so
+ * \`{} extends A\` is true exactly when every member of \`A\` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : NoRequiredKeys<Ops[K]['args']> extends true
+      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(\`Request failed with status \${status}\`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// \`globalThis.Error\` (not bare \`Error\`) so a spec schema named \`Error\` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (\`style: 'form'\`, \`explode: true\`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for \`allowReserved: true\` params —
+ * \`filter=a/b\` survives instead of \`filter=a%2Fb\`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute \`{name}\` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\\{([^{}]+)\\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(\`Missing path parameter "\${name}"\`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: \`serverUrl\` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI \`style\`/\`explode\`/\`allowReserved\` (from \`styles\`);
+ * without a spec, arrays repeat the key (\`form\`+\`explode\`), objects serialize as
+ * \`deepObject\` brackets, and \`null\`/\`undefined\` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not \`/\\/+$/\` — an anchored \`+\` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use \`deepObject\` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(\`\${key}[\${subKey}]\`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(\`\${key}=\${encodeReserved(v)}\`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. \`%20\` (not \`+\`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(\`\${encodeURIComponent(key)}=\${items.map(enc).join(delim)}\`);
+      }
+    } else if (Object(value) === value) {
+      // \`deepObject\` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(\`\${key}[\${subKey}]=\${encodeReserved(String(subValue))}\`);
+          else params.append(\`\${key}[\${subKey}]\`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(\`\${key}=\${encodeReserved(String(value))}\`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? \`\${url}?\${qs}\` : url;
+}
+
+/**
+ * Read the response body per \`kind\`. \`'auto'\` negotiates from the content type
+ * (JSON, then \`text/*\`, then Blob); \`'void'\` and \`204\` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom \`retryOn\` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a \`Retry-After\` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over \`retryDelay\`, with full jitter
+ * unless \`jitter === false\`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after \`ms\`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/** Resolve a credential: a literal passes through; a function is awaited per request. */
+async function resolveToken(provider: TokenProvider): Promise<string> {
+  return typeof provider === 'function' ? await provider() : provider;
+}
+
+/**
+ * Build the auth headers/query for one operation's \`security\` requirements from the
+ * instance credentials (\`config.auth\`) — capability module, wired into \`createClient\`.
+ * A scheme with no configured credential contributes nothing (the request is sent
+ * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * Cookie-borne apiKeys fold into a single \`Cookie\` header joined with \`; \`.
+ */
+async function resolveAuth(
+  security: readonly SecuritySpec[],
+  config: ClientConfig
+): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const headers: Record<string, string> = {};
+  const query: Record<string, string> = {};
+  const cookies: string[] = [];
+  for (const scheme of security) {
+    if (scheme.kind === 'apiKey') {
+      const provider = config.auth?.apiKey?.[scheme.scheme];
+      if (provider === undefined) continue;
+      const value = await resolveToken(provider);
+      if (scheme.in === 'header') headers[scheme.name] = value;
+      else if (scheme.in === 'query') query[scheme.name] = value;
+      else cookies.push(\`\${scheme.name}=\${value}\`);
+    } else if (scheme.kind === 'bearer') {
+      const provider = config.auth?.bearer;
+      if (provider !== undefined) headers.Authorization = \`Bearer \${await resolveToken(provider)}\`;
+    } else {
+      const basic = config.auth?.basic;
+      if (basic !== undefined) {
+        headers.Authorization = \`Basic \${btoa(\`\${basic.username}:\${basic.password}\`)}\`;
+      }
+    }
+  }
+  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
+  return { headers, query };
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * \`createClient\` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single \`onRequest\`/\`onResponse\`/
+ * \`onError\` config hooks as one implicit first middleware, then \`config.middleware\`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * \`onRequest\` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, \`Retry-After\`, abandoned-body drain), and the reverse
+ * \`onResponse\` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * Consume a \`text/event-stream\` operation as typed events (capability module — wired
+ * into \`createClient\`). Auto-reconnects on dropped connections, resuming from the last
+ * seen event id via \`Last-Event-ID\` (backoff: the server's \`retry:\` value, then
+ * \`reconnectDelay\`, then 1s — exponential with jitter, capped at 30s). A clean stream
+ * end flushes a trailing frame and finishes; \`break\`/abort end the iterator cleanly.
+ */
+async function* sse<T>(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: SseOptions,
+  dataKind: 'json' | 'text' = 'text'
+): AsyncGenerator<ServerSentEvent<T>> {
+  const { reconnect = true, reconnectDelay, ...rest } = init;
+  const signal = rest.signal ?? undefined;
+  const headers: Record<string, string> = {
+    Accept: 'text/event-stream',
+    ...(rest.headers as Record<string, string> | undefined),
+  };
+  let lastEventId: string | undefined;
+  let serverRetry: number | undefined;
+  let failures = 0;
+  while (true) {
+    if (signal?.aborted) return;
+    const sendHeaders =
+      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
+    try {
+      const { response } = await send(
+        config,
+        op,
+        url,
+        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },
+        undefined,
+        false,
+        {}
+      );
+      if (!response.ok) {
+        const errorBody = await readError(response);
+        throw new ApiError(url, response.status, response.statusText, errorBody);
+      }
+      failures = 0;
+      const body = response.body;
+      if (!body) return;
+      const reader = body.getReader();
+      const decoder = new TextDecoder();
+      let buffer = '';
+      try {
+        while (true) {
+          const { done, value } = await reader.read();
+          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });
+          let index: number;
+          while ((index = buffer.search(/\\r\\n\\r\\n|\\n\\n|\\r\\r/)) !== -1) {
+            const raw = buffer.slice(0, index);
+            buffer = buffer.slice(
+              index + buffer.slice(index).match(/^(\\r\\n\\r\\n|\\n\\n|\\r\\r)/)![0].length
+            );
+            const event = parseSseFrame(raw, dataKind);
+            if (event) {
+              if (event.id !== undefined) lastEventId = event.id;
+              if (event.retry !== undefined) serverRetry = event.retry;
+              yield event as ServerSentEvent<T>;
+            }
+          }
+          if (done) {
+            // Stream closed cleanly. Flush a final event that arrived without a trailing
+            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.
+            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;
+            if (event) {
+              if (event.id !== undefined) lastEventId = event.id;
+              if (event.retry !== undefined) serverRetry = event.retry;
+              yield event as ServerSentEvent<T>;
+            }
+            return;
+          }
+          // Bound memory: a server that never sends a frame delimiter would otherwise
+          // grow \`buffer\` without limit. 1 MiB is far above any real SSE frame.
+          if (buffer.length > 1048576) {
+            throw new Error('SSE frame exceeded 1048576 characters without a delimiter');
+          }
+        }
+      } finally {
+        await reader.cancel().catch(() => undefined);
+      }
+    } catch (error) {
+      if (signal?.aborted) return;
+      // A non-OK HTTP response is a definitive error (4xx/5xx), not a transient drop —
+      // surface it instead of reconnecting in a loop.
+      if (error instanceof ApiError) throw error;
+      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream
+      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.
+      if (!reconnect) throw error;
+    }
+    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.
+    failures++;
+    const base = serverRetry ?? reconnectDelay ?? 1000;
+    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);
+    try {
+      await sleep(Math.random() * delay, signal);
+    } catch {
+      return; // sleep rejects only on abort — end the iterator cleanly
+    }
+  }
+}
+
+/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */
+function parseSseFrame(
+  raw: string,
+  dataKind: 'json' | 'text'
+): ServerSentEvent<unknown> | undefined {
+  let event: string | undefined;
+  const dataLines: string[] = [];
+  let id: string | undefined;
+  let retry: number | undefined;
+  let sawField = false;
+  for (const line of raw.split(/\\r\\n|\\n|\\r/)) {
+    if (line === '' || line.startsWith(':')) continue;
+    const colon = line.indexOf(':');
+    const field = colon === -1 ? line : line.slice(0, colon);
+    let val = colon === -1 ? '' : line.slice(colon + 1);
+    if (val.startsWith(' ')) val = val.slice(1);
+    sawField = true;
+    if (field === 'event') event = val;
+    else if (field === 'data') dataLines.push(val);
+    else if (field === 'id') id = val;
+    else if (field === 'retry') {
+      const n = Number(val);
+      if (!Number.isNaN(n)) retry = n;
+    }
+  }
+  if (!sawField) return undefined;
+  const dataText = dataLines.join('\\n');
+  const data = dataKind === 'json' && dataText !== '' ? JSON.parse(dataText) : dataText;
+  return { event, data, id, retry };
+}
+
+/**
+ * The optional behaviors \`createClientCore\` can dispatch to but never statically
+ * imports. The package's public \`createClient\` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+};
+
+/** The grouped args wire shape: path params by name plus the \`params\`/\`body\`/\`headers\` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call \`parseAs\` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (\`form\` + \`explode: true\`, encoded),
+ * and always fully resolved — so \`explode: false\` or \`allowReserved\` alone (no \`style\`)
+ * are honored, and an omitted \`explode\` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller \`init.headers\` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (\`configure\`/\`use\`/\`auth\`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // \`ClientConfig<Narrow>\` is not assignable to \`ClientConfig\` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so \`use()\` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(\`SSE capability not wired: cannot stream operation "\${op.id}"\`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // \`errorMode\` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from \`Client<Ops>\`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided \`middleware\` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
+/**
+ * The client factory: \`createClientCore\` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same \`OPERATIONS\`/\`Ops\`. The trailing string params carry the wiring's literal
+ * unions (\`OperationId\`/\`OperationPath\`/\`OperationTag\`) into \`ctx.operation\`.
+ */
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth, sse });
+}
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://cafe.example.com" });
+
+export const { configure, use } = client;
+export const setBearer = client.auth.bearer;
+export const getOrder = (orderId: string, params: {
+    expand?: string;
+} = {}, init: RequestOptions = {}) => client.getOrder({ orderId, params }, init);
+export const streamEvents = (init: SseOptions = {}) => client.streamEvents({}, init);
+"
+`;
+
+exports[`emitClientSingleFile (package arm) > matches the golden output for a small model 1`] = `
+"// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run \`redocly generate-client\` to update.
+
+/**
+ * T (v1.0.0)
+ */
+
+import { createClient, type OperationDescriptor, type RequestOptions, type SseOptions } from '@redocly/client-generator';
+
+export type Order = {
+    id: string;
+};
+
+export type Problem = {};
+
+export type Pet = {};
+
+export type OrderEvent = {};
+
+export type GetOrderResult = Order;
+
+export type GetOrderParams = {
+    expand?: string;
+};
+
+export type GetOrderVariables = {
+    orderId: string;
+    params?: GetOrderParams;
+};
+
+/**
+ * Per-operation \`args\`/\`result\` shapes (plus \`kind: 'sse'\` for event streams) — the
+ * type-level companion of \`OPERATIONS\` that gives \`createClient<Ops>\` its typed methods.
+ */
+export type Ops = {
+    getOrder: {
+        args: {
+            orderId: string;
+            params?: GetOrderParams;
+        };
+        result: GetOrderResult;
+    };
+    streamEvents: {
+        args: {};
+        result: OrderEvent;
+        kind: "sse";
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "expand", in: "query" }], security: [{ scheme: "bearerAuth", kind: "bearer" }] },
+    streamEvents: { id: "streamEvents", method: "GET", path: "/events", responseKind: "sse", sseDataKind: "json" }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://cafe.example.com" });
+
+export const { configure, use } = client;
+export const setBearer = client.auth.bearer;
+export const getOrder = (orderId: string, params: {
+    expand?: string;
+} = {}, init: RequestOptions = {}) => client.getOrder({ orderId, params }, init);
+export const streamEvents = (init: SseOptions = {}) => client.streamEvents({}, init);
+
+export { ApiError, createClient } from '@redocly/client-generator';
+export type { ClientConfig, Middleware, RequestOptions, ServerSentEvent, SseOptions } from '@redocly/client-generator';
+"
+`;
diff --git a/packages/client-generator/src/emitters/__tests__/auth.test.ts b/packages/client-generator/src/emitters/__tests__/auth.test.ts
index e4c8b086ee..8c89800339 100644
--- a/packages/client-generator/src/emitters/__tests__/auth.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/auth.test.ts
@@ -1,5 +1,5 @@
 import type { SecuritySchemeModel } from '../../intermediate-representation/model.js';
-import { authSetterNames, authTypeNames, renderAuth } from '../auth.js';
+import { apiKeySetterName, authSetterNames } from '../auth.js';
 
 /** A spec exercising all five injectable kinds at once. */
 const allKinds: SecuritySchemeModel[] = [
@@ -10,340 +10,57 @@ const allKinds: SecuritySchemeModel[] = [
   { kind: 'apiKeyCookie', key: 'CookieKey', cookieName: 'sid' },
 ];
 
-describe('renderAuth', () => {
-  it('returns "" when there are no schemes', () => {
-    expect(renderAuth([], true, true)).toBe('');
-    expect(renderAuth([], false, false)).toBe('');
+describe('apiKeySetterName', () => {
+  it('is the bare setApiKey for a sole apiKey scheme', () => {
+    expect(apiKeySetterName('anything', true)).toBe('setApiKey');
   });
 
-  describe('TokenProvider type', () => {
-    it('emits + exports TokenProvider when any bearer/apiKey scheme exists', () => {
-      const out = renderAuth([{ kind: 'bearer', key: 'OAuth2' }], false, false);
-      expect(out).toContain(
-        'export type TokenProvider = string | (() => string | Promise<string>);'
-      );
-    });
-
-    it('emits TokenProvider for an apiKey-only scheme set', () => {
-      const out = renderAuth(
-        [{ kind: 'apiKeyQuery', key: 'k', paramName: 'api_key' }],
-        false,
-        false
-      );
-      expect(out).toContain('export type TokenProvider =');
-    });
-
-    it('does NOT emit TokenProvider for a basic-only scheme set', () => {
-      const out = renderAuth([{ kind: 'basic', key: 'Basic' }], false, false);
-      expect(out).not.toContain('TokenProvider');
-    });
-  });
-
-  describe('AuthCredentials type (per-instance config.auth)', () => {
-    it('emits a field per declared scheme kind', () => {
-      const out = renderAuth(allKinds, true, true);
-      expect(out).toContain('export type AuthCredentials = {');
-      expect(out).toContain('bearer?: TokenProvider;');
-      expect(out).toContain('basic?: {');
-      expect(out).toContain('username: string;');
-      expect(out).toContain('password: string;');
-      expect(out).toContain('apiKey?: Record<string, TokenProvider>;');
-    });
-
-    it('a basic-only set has only the basic field (no TokenProvider reference)', () => {
-      const out = renderAuth([{ kind: 'basic', key: 'Basic' }], true, false);
-      expect(out).toContain('export type AuthCredentials = {');
-      expect(out).toContain('basic?: {');
-      expect(out).not.toContain('bearer?:');
-      expect(out).not.toContain('apiKey?:');
-      expect(out).not.toContain('TokenProvider');
-    });
-
-    it('is emitted whenever schemes exist, even with no authed operation', () => {
-      const out = renderAuth([{ kind: 'bearer', key: 'OAuth2' }], false, false);
-      expect(out).toContain('export type AuthCredentials = {');
-    });
-  });
-
-  describe('bearer', () => {
-    it('emits one shared slot + setBearer for bearer schemes', () => {
-      const out = renderAuth(
-        [
-          { kind: 'bearer', key: 'OAuth2' },
-          { kind: 'bearer', key: 'BearerHttp' },
-        ],
-        false,
-        false
-      );
-      expect(out).toContain('let __bearerToken: TokenProvider | null = null;');
-      expect(out.match(/let __bearerToken/g)).toHaveLength(1);
-      expect(out).toContain('export function setBearer(token: TokenProvider | null): void {');
-      expect(out).toContain('__bearerToken = token;');
-      expect(out.match(/export function setBearer\(/g)).toHaveLength(1);
-    });
-  });
-
-  describe('basic', () => {
-    it('emits one shared __basicAuth slot + setBasicAuth storing btoa(user:pass)', () => {
-      const out = renderAuth(
-        [
-          { kind: 'basic', key: 'Basic' },
-          { kind: 'basic', key: 'Basic2' },
-        ],
-        false,
-        false
-      );
-      expect(out).toContain('let __basicAuth: string | null = null;');
-      expect(out.match(/let __basicAuth/g)).toHaveLength(1);
-      expect(out).toContain(
-        'export function setBasicAuth(username: string, password: string): void {'
-      );
-      expect(out).toContain('__basicAuth = btoa(`${username}:${password}`);');
-      expect(out.match(/export function setBasicAuth\(/g)).toHaveLength(1);
-    });
-  });
-
-  describe('apiKey setters', () => {
-    it('emits a slot + setApiKey for a sole apiKey scheme (any in)', () => {
-      const out = renderAuth(
-        [{ kind: 'apiKeyQuery', key: 'QueryKey', paramName: 'api_key' }],
-        false,
-        false
-      );
-      expect(out).toContain('let __apiKey_QueryKey: TokenProvider | null = null;');
-      expect(out).toContain('export function setApiKey(key: TokenProvider | null): void {');
-      expect(out).toContain('__apiKey_QueryKey = key;');
-    });
-
-    it('treats a sole apiKey scheme as sole regardless of its in (cookie)', () => {
-      const out = renderAuth(
-        [{ kind: 'apiKeyCookie', key: 'CookieKey', cookieName: 'sid' }],
-        false,
-        false
-      );
-      expect(out).toContain('export function setApiKey(key: TokenProvider | null): void {');
-    });
-
-    it('keyed names when more than one apiKey scheme exists across different in', () => {
-      const out = renderAuth(
-        [
-          { kind: 'apiKeyHeader', key: 'HeaderKey', headerName: 'X-API-Key' },
-          { kind: 'apiKeyQuery', key: 'QueryKey', paramName: 'api_key' },
-        ],
-        false,
-        false
-      );
-      expect(out).toContain(
-        'export function setApiKeyHeaderKey(key: TokenProvider | null): void {'
-      );
-      expect(out).toContain('export function setApiKeyQueryKey(key: TokenProvider | null): void {');
-      expect(out).not.toContain('export function setApiKey(');
-    });
-
-    it('sanitizes non-identifier characters in the slot name', () => {
-      const out = renderAuth(
-        [{ kind: 'apiKeyHeader', key: 'my-key.v2', headerName: 'X-Key' }],
-        false,
-        false
-      );
-      expect(out).toContain('let __apiKey_my_key_v2: TokenProvider | null = null;');
-    });
-  });
-
-  describe('__resolve + __auth emission gating', () => {
-    it('emits neither __resolve nor __auth when no operation is authed', () => {
-      const out = renderAuth([{ kind: 'bearer', key: 'OAuth2' }], false, false);
-      expect(out).toContain('export function setBearer');
-      expect(out).not.toContain('function __auth(');
-      expect(out).not.toContain('function __resolve(');
-    });
-
-    it('emits __resolve + __auth when an operation is authed and a resolvable scheme exists', () => {
-      const out = renderAuth([{ kind: 'bearer', key: 'OAuth2' }], true, false);
-      expect(out).toContain(
-        'async function __resolve(slot: TokenProvider | null): Promise<string | null> {'
-      );
-      expect(out).toContain('return typeof slot === "function" ? slot() : slot;');
-      expect(out).toContain('async function __auth(schemes: string[], config: ClientConfig)');
-    });
-
-    it('does NOT emit __resolve for a basic-only authed set (nothing resolvable)', () => {
-      const out = renderAuth([{ kind: 'basic', key: 'Basic' }], true, false);
-      expect(out).not.toContain('function __resolve(');
-      // but __auth IS emitted (basic still needs a switch).
-      expect(out).toContain('async function __auth(schemes: string[], config: ClientConfig)');
-    });
-
-    it('references each write-only slot via `void` when no operation is authed (noUnusedLocals)', () => {
-      // With no __auth to read them, the setter-written slots are otherwise
-      // unused and would trip TS6133 under --noUnusedLocals.
-      const out = renderAuth(allKinds, false, false);
-      expect(out).toContain('void __bearerToken;');
-      expect(out).toContain('void __basicAuth;');
-      expect(out).toContain('void __apiKey_HeaderKey;');
-      expect(out).toContain('void __apiKey_QueryKey;');
-      expect(out).toContain('void __apiKey_CookieKey;');
-    });
-
-    it('omits the `void` no-op block when an operation IS authed (slots are read)', () => {
-      const out = renderAuth(allKinds, true, false);
-      expect(out).not.toContain('void __bearerToken;');
-      expect(out).not.toContain('void __basicAuth;');
-    });
-  });
-
-  describe('__auth body', () => {
-    const out = renderAuth(allKinds, true, true);
-
-    it('is async returning Promise<{ headers; query }> with the export prefix', () => {
-      expect(out).toContain(
-        'export async function __auth(schemes: string[], config: ClientConfig): Promise<{'
-      );
-      expect(out).toContain('headers: Record<string, string>;');
-      expect(out).toContain('query: Record<string, string>;');
-      expect(out).toContain('const headers: Record<string, string> = {};');
-      expect(out).toContain('const query: Record<string, string> = {};');
-      expect(out).toContain('const cookies: string[] = [];');
-      expect(out).toContain('if (cookies.length > 0)');
-      expect(out).toContain('headers["Cookie"] = cookies.join("; ");');
-      expect(out).toContain('return { headers, query };');
-    });
-
-    it('honors the export prefix toggle', () => {
-      const internal = renderAuth(allKinds, true, false);
-      expect(internal).toContain('async function __auth(schemes: string[], config: ClientConfig)');
-      expect(internal).not.toContain('export async function __auth(');
-    });
-
-    it('emits a bearer case awaiting __resolve(__bearerToken)', () => {
-      expect(out).toContain('case "OAuth2": {');
-      // Prefers the per-instance credential, falling back to the global slot.
-      expect(out).toContain('const v = await __resolve(config.auth?.bearer ?? __bearerToken);');
-      expect(out).toContain('headers["Authorization"] = `Bearer ${v}`;');
-    });
-
-    it('emits a basic case preferring config.auth.basic over the global __basicAuth', () => {
-      expect(out).toContain('case "Basic":');
-      expect(out).toContain('const b = config.auth?.basic;');
-      expect(out).toContain('const basic = b ? btoa(`${b.username}:${b.password}`) : __basicAuth;');
-      expect(out).toContain('if (basic !== null)');
-      expect(out).toContain('headers["Authorization"] = `Basic ${basic}`;');
-    });
-
-    it('emits an apiKeyHeader case assigning headers[name]', () => {
-      expect(out).toContain('case "HeaderKey": {');
-      expect(out).toContain(
-        'const v = await __resolve(config.auth?.apiKey?.["HeaderKey"] ?? __apiKey_HeaderKey);'
-      );
-      expect(out).toContain('headers["X-API-Key"] = v;');
-    });
-
-    it('emits an apiKeyQuery case assigning query[param]', () => {
-      expect(out).toContain('case "QueryKey": {');
-      expect(out).toContain(
-        'const v = await __resolve(config.auth?.apiKey?.["QueryKey"] ?? __apiKey_QueryKey);'
-      );
-      expect(out).toContain('query["api_key"] = v;');
-    });
-
-    it('emits an apiKeyCookie case pushing `<name>=<value>`', () => {
-      expect(out).toContain('case "CookieKey": {');
-      expect(out).toContain(
-        'const v = await __resolve(config.auth?.apiKey?.["CookieKey"] ?? __apiKey_CookieKey);'
-      );
-      expect(out).toContain('cookies.push("sid=" + v);');
-    });
-
-    it('escapes a cookieName containing a backtick and `${` without breaking out of a template', () => {
-      const out = renderAuth(
-        [{ kind: 'apiKeyCookie', key: 'CookieKey', cookieName: 'we`ird${x}' }],
-        true,
-        true
-      );
-      // The name is emitted as a JSON string literal concatenated with the value,
-      // never interpolated into a backtick template.
-      expect(out).toContain('cookies.push("we`ird${x}=" + v);');
-      // No backtick template literal anywhere in the emitted cookie handling.
-      expect(out).not.toContain('cookies.push(`');
-      // The dangerous template-break sequence is only ever inside the JSON literal,
-      // so the emitted body has no unterminated/escaped-into-template fragment.
-      expect(out).not.toContain('`we`ird');
-    });
-
-    it('produces no undefined-indexed assignment and every case references a declared slot', () => {
-      expect(out).not.toContain('out[undefined]');
-      expect(out).not.toContain('[undefined]');
-      // Every `case "<key>":` body references a known slot / __basicAuth.
-      const slots = ['__bearerToken', '__basicAuth', '__apiKey_'];
-      const cases = out.split(/case "/).slice(1);
-      for (const c of cases) {
-        const body = c.slice(0, c.indexOf('break;'));
-        expect(slots.some((s) => body.includes(s))).toBe(true);
-      }
-    });
-  });
-});
-
-describe('authTypeNames', () => {
-  it('returns [] when there are no schemes', () => {
-    expect(authTypeNames([])).toEqual([]);
-  });
-
-  it('returns [TokenProvider, AuthCredentials] when a bearer scheme exists', () => {
-    expect(authTypeNames([{ kind: 'bearer', key: 'oauth' }])).toEqual([
-      'TokenProvider',
-      'AuthCredentials',
-    ]);
-  });
-
-  it('returns [TokenProvider, AuthCredentials] when an apiKey scheme exists', () => {
-    expect(authTypeNames([{ kind: 'apiKeyQuery', key: 'k', paramName: 'api_key' }])).toEqual([
-      'TokenProvider',
-      'AuthCredentials',
-    ]);
-  });
-
-  it('returns [AuthCredentials] for a basic-only scheme set (no TokenProvider)', () => {
-    expect(authTypeNames([{ kind: 'basic', key: 'Basic' }])).toEqual(['AuthCredentials']);
+  it('suffixes the PascalCased scheme key when several apiKey schemes exist', () => {
+    expect(apiKeySetterName('cookieAuth', false)).toBe('setApiKeyCookieAuth');
+    expect(apiKeySetterName('QueryKey', false)).toBe('setApiKeyQueryKey');
   });
 });
 
 describe('authSetterNames', () => {
-  it('returns nothing when there are no schemes', () => {
+  it('returns no names when there are no schemes', () => {
     expect(authSetterNames([])).toEqual([]);
   });
 
-  it('names setBearer for a bearer scheme', () => {
-    expect(authSetterNames([{ kind: 'bearer', key: 'oauth' }])).toEqual(['setBearer']);
+  it('emits setBearer once for any number of bearer schemes', () => {
+    expect(
+      authSetterNames([
+        { kind: 'bearer', key: 'OAuth2' },
+        { kind: 'bearer', key: 'BearerHttp' },
+      ])
+    ).toEqual(['setBearer']);
   });
 
-  it('names setBasicAuth for a basic scheme', () => {
+  it('emits setBasicAuth for basic schemes', () => {
     expect(authSetterNames([{ kind: 'basic', key: 'Basic' }])).toEqual(['setBasicAuth']);
   });
 
-  it('names a sole apiKey scheme (any in) setApiKey', () => {
-    expect(authSetterNames([{ kind: 'apiKeyQuery', key: 'k', paramName: 'api_key' }])).toEqual([
-      'setApiKey',
-    ]);
+  it('names a sole apiKey scheme setApiKey regardless of its `in`', () => {
+    expect(
+      authSetterNames([{ kind: 'apiKeyCookie', key: 'CookieKey', cookieName: 'sid' }])
+    ).toEqual(['setApiKey']);
   });
 
-  it('orders setBearer, setBasicAuth, then apiKey setters in scheme order', () => {
+  it('disambiguates several apiKey schemes with the PascalCased key', () => {
     expect(
       authSetterNames([
-        { kind: 'apiKeyHeader', key: 'admin', headerName: 'X-Admin' },
-        { kind: 'basic', key: 'Basic' },
-        { kind: 'bearer', key: 'oauth' },
-        { kind: 'apiKeyCookie', key: 'tenant', cookieName: 'sid' },
+        { kind: 'apiKeyHeader', key: 'HeaderKey', headerName: 'X-API-Key' },
+        { kind: 'apiKeyQuery', key: 'QueryKey', paramName: 'api_key' },
       ])
-    ).toEqual(['setBearer', 'setBasicAuth', 'setApiKeyAdmin', 'setApiKeyTenant']);
+    ).toEqual(['setApiKeyHeaderKey', 'setApiKeyQueryKey']);
   });
 
-  it('counts all apiKey kinds (any in) for the sole-naming rule', () => {
-    expect(
-      authSetterNames([
-        { kind: 'apiKeyHeader', key: 'h', headerName: 'X-H' },
-        { kind: 'apiKeyQuery', key: 'q', paramName: 'api_key' },
-      ])
-    ).toEqual(['setApiKeyH', 'setApiKeyQ']);
+  it('orders the full surface bearer → basic → apiKey (emission order)', () => {
+    expect(authSetterNames(allKinds)).toEqual([
+      'setBearer',
+      'setBasicAuth',
+      'setApiKeyHeaderKey',
+      'setApiKeyQueryKey',
+      'setApiKeyCookieKey',
+    ]);
   });
 });
diff --git a/packages/client-generator/src/emitters/__tests__/client.test.ts b/packages/client-generator/src/emitters/__tests__/client.test.ts
index 0dcd1a0216..ca4d370caf 100644
--- a/packages/client-generator/src/emitters/__tests__/client.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/client.test.ts
@@ -1,590 +1,40 @@
-import type { ApiModel, OperationModel } from '../../intermediate-representation/model.js';
-import { emitModules, emitSingleFile, setupApply } from '../client.js';
-import { apiModel, emitWithOp, namedSchema, operation, param } from './fixtures.js';
+import { banner, HEADER, renderTitleComment } from '../client.js';
+import { apiModel } from './fixtures.js';
 
-describe('typed ctx.operation (OperationContext narrowing)', () => {
-  const tagged = apiModel({
-    services: [
-      {
-        name: 'Default',
-        operations: [operation({ name: 'listPets', path: '/pets', tags: ['Pets'] })],
-      },
-    ],
+describe('banner', () => {
+  it('joins non-empty sections with blank lines and appends a trailing newline', () => {
+    expect(banner(['a', 'b'])).toBe('a\n\nb\n');
   });
 
-  it('single-file narrows OperationContext to the operation unions', () => {
-    const out = emitSingleFile(tagged, {});
-    // The TS printer expands the type literal across lines.
-    expect(out).toContain('id: OperationId;');
-    expect(out).toContain('path: OperationPath;');
-    expect(out).toContain('tags: OperationTag[];');
-  });
-
-  it('multi-file http module type-imports the operation unions from schemas', () => {
-    const mods = emitModules(tagged, {});
-    expect(mods.http('client')).toContain(
-      'import type { OperationId, OperationPath, OperationTag } from "./client.schemas.js";'
-    );
-  });
-
-  it('falls back to all-string OperationContext (and no import) when there are no operations', () => {
-    const out = emitSingleFile(apiModel(), {});
-    expect(out).toContain('id: string;');
-    expect(out).toContain('tags: string[];');
-    expect(out).not.toContain('id: OperationId;');
-    expect(emitModules(apiModel(), {}).http('client')).not.toContain('from "./client.schemas.js"');
+  it('drops empty sections so no double separators appear', () => {
+    expect(banner(['a', '', 'b'])).toBe('a\n\nb\n');
   });
 });
 
-describe('setupApply — baked publisher setup (--setup)', () => {
-  const EXPR = '{ config: { serverUrl: "https://x" }, middleware: [] }';
-
-  it('functions facade: declares __redoclySetup then applies it via configure/use', () => {
-    const out = setupApply(EXPR, 'functions', false);
-    expect(out).toContain(
-      'const __redoclySetup: { config?: ClientConfig; middleware?: Middleware[] } = ' + EXPR + ';'
-    );
-    expect(out).toContain('configure(__redoclySetup.config ?? {});');
-    expect(out).toContain('use(...(__redoclySetup.middleware ?? []));');
-    expect(out).not.toContain('export const');
-  });
-
-  it('service-class facade: declaration only (no configure/use); exported when asked', () => {
-    const out = setupApply(EXPR, 'service-class', true);
-    expect(out).toContain('export const __redoclySetup');
-    expect(out).not.toContain('configure(');
-    expect(out).not.toContain('use(...');
-  });
-
-  it('single-file service-class constructor merges __redoclySetup into this.config', () => {
-    const out = emitSingleFile(apiModel(), { facade: 'service-class', setup: EXPR });
-    expect(out).toContain('...__redoclySetup.config');
-    expect(out).toContain('this.config = {');
-  });
-
-  it('single-file functions facade appends the configure/use application', () => {
-    const out = emitSingleFile(apiModel(), { setup: EXPR });
-    expect(out).toContain('configure(__redoclySetup.config ?? {});');
-  });
-
-  it('multi-file: the http module carries the baked setup', () => {
-    const mods = emitModules(apiModel(), { setup: EXPR });
-    expect(mods.http('client')).toContain('const __redoclySetup');
-    expect(mods.http('client')).toContain('configure(__redoclySetup.config ?? {});');
+describe('HEADER', () => {
+  it('names the generator and the regeneration command', () => {
+    expect(HEADER).toContain('Generated by @redocly/client-generator');
+    expect(HEADER).toContain('redocly generate-client');
   });
 });
 
-/** An SSE operation streaming `Message` events (event-stream success + itemSchema $ref). */
-function sseOperation(overrides: Partial<OperationModel> = {}): OperationModel {
-  return operation({
-    name: 'streamMessages',
-    path: '/stream',
-    successResponses: [
-      {
-        contentType: 'text/event-stream',
-        status: 200,
-        schema: { kind: 'unknown' },
-        itemSchema: { kind: 'ref', name: 'Message' },
-      },
-    ],
-    ...overrides,
+describe('renderTitleComment', () => {
+  it('emits a JSDoc block with the title and version', () => {
+    const out = renderTitleComment(apiModel({ title: 'My API', version: '2.0.0' }));
+    expect(out).toBe('/**\n * My API (v2.0.0)\n */');
   });
-}
 
-/** A model with one SSE op + the `Message` schema it streams. */
-function sseModel(overrides: Partial<ApiModel> = {}): ApiModel {
-  return apiModel({
-    schemas: [namedSchema('Message', { kind: 'object', properties: [] })],
-    services: [{ name: 'Default', operations: [sseOperation()] }],
-    ...overrides,
-  });
-}
-
-describe('emitSingleFile — top-level layout', () => {
-  it('includes the generated-by header and ends with a newline', () => {
-    const out = emitSingleFile(apiModel());
-    expect(out.startsWith('// Generated by @redocly/client-generator')).toBe(true);
-    expect(out.endsWith('\n')).toBe(true);
-  });
-
-  it('inlines the serverUrl as a mutable `let` binding so setServerUrl() can update it', () => {
-    const out = emitSingleFile(apiModel({ serverUrl: 'https://api.example.com/v1' }));
-    expect(out).toContain('let BASE = "https://api.example.com/v1";');
-    expect(out).not.toContain('const BASE = ');
-  });
-
-  it('always exports a setServerUrl() helper that reassigns the BASE binding', () => {
-    const out = emitSingleFile(apiModel({ serverUrl: 'https://api.example.com' }));
-    expect(out).toContain('export function setServerUrl(url: string): void');
-    expect(out).toMatch(/BASE\s*=\s*url/);
-  });
-
-  it('lets a caller override the spec-derived serverUrl via options.serverUrl', () => {
-    const out = emitSingleFile(apiModel({ serverUrl: 'https://from-spec.example.com' }), {
-      serverUrl: 'http://127.0.0.1:3101',
-    });
-    expect(out).toContain('let BASE = "http://127.0.0.1:3101";');
-    expect(out).not.toContain('from-spec.example.com');
-  });
-
-  it('emits a JSDoc title with the title and version', () => {
-    const out = emitSingleFile(apiModel({ title: 'My API', version: '2.0.0' }));
-    expect(out).toContain('* My API (v2.0.0)');
-  });
-
-  it('appends multi-line descriptions in the JSDoc title block', () => {
-    const out = emitSingleFile(apiModel({ title: 'D', description: 'line one\nline two' }));
+  it('appends multi-line descriptions in the block', () => {
+    const out = renderTitleComment(apiModel({ title: 'D', description: 'line one\nline two' }));
     expect(out).toContain(' * line one');
     expect(out).toContain(' * line two');
   });
-});
-
-describe('emitSingleFile — service-class facade', () => {
-  it('emits a Client class by default (name omitted)', () => {
-    const out = emitSingleFile(
-      apiModel({
-        services: [{ name: 'Default', operations: [operation({ name: 'ping' })] }],
-      }),
-      { facade: 'service-class' }
-    );
-    expect(out).toContain('export class Client {');
-    expect(out).toMatch(/\basync ping\(/);
-  });
-
-  it('honors a custom class name via options.name', () => {
-    const out = emitSingleFile(
-      apiModel({
-        services: [{ name: 'Default', operations: [operation({ name: 'ping' })] }],
-      }),
-      { facade: 'service-class', name: 'CafeClient' }
-    );
-    expect(out).toContain('export class CafeClient {');
-    expect(out).not.toContain('export class Client {');
-  });
-
-  it('shares the identical http + schemas modules with the functions facade (core unchanged)', () => {
-    const model = apiModel({
-      services: [{ name: 'Default', operations: [operation({ name: 'ping' })] }],
-    });
-    const fns = emitModules(model, { facade: 'functions' });
-    const cls = emitModules(model, { facade: 'service-class' });
-    // The facade changes only the endpoints; the shared http (runtime + auth) and
-    // schemas (types + guards) modules are byte-identical across facades.
-    expect(cls.http('client')).toBe(fns.http('client'));
-    expect(cls.schemas).toBe(fns.schemas);
-  });
-});
-
-describe('extension contract (ClientConfig)', () => {
-  it('emits the ClientConfig + RequestContext types, the global __config, and configure()', () => {
-    const out = emitSingleFile(apiModel());
-    expect(out).toContain('export type ClientConfig = {');
-    expect(out).toContain('export type RequestContext = {');
-    expect(out).toContain('const __config: ClientConfig = {};');
-    expect(out).toContain('export function configure(config: ClientConfig): void {');
-    expect(out).toContain('Object.assign(__config, config);');
-  });
-
-  it('threads the global __config through functions (both __buildUrl and __request)', () => {
-    const out = emitWithOp({ name: 'ping', path: '/p' });
-    expect(out).toContain('__buildUrl(__config, `/p`)');
-    // __request receives __config as its first argument.
-    expect(out).toContain('return __request<void>(__config,');
-  });
-
-  it('passes the operation { id, path, tags } literal into the runtime call', () => {
-    const out = emitWithOp({ name: 'ping', path: '/p' });
-    expect(out).toContain('__request<void>(__config, { id: "ping", path: "/p", tags: [] }');
-  });
-
-  it('runtime resolves config.serverUrl ?? BASE and config.fetch ?? fetch', () => {
-    const out = emitSingleFile(apiModel());
-    expect(out).toContain('(config.serverUrl ?? BASE)');
-    expect(out).toContain('const doFetch = config.fetch ?? fetch;');
-  });
-
-  it('runs the request through the composable middleware chain (single hooks + use())', () => {
-    const out = emitSingleFile(apiModel());
-    // The single config hooks are folded into one implicit first middleware.
-    expect(out).toContain('function __middleware(config: ClientConfig): Middleware[]');
-    expect(out).toContain('for (const mw of middleware)');
-    expect(out).toContain('if (mw.onRequest)');
-    // onResponse runs in reverse (onion).
-    expect(out).toContain('for (let i = middleware.length - 1; i >= 0; i--)');
-    // onError threads through each middleware.
-    expect(out).toContain('error = await mw.onError(error as ApiError, context);');
-    // The `use()` registrar is exported for the functions facade.
-    expect(out).toContain('export function use(...middleware: Middleware[]): void');
-  });
-
-  it('service-class takes a ClientConfig constructor and threads this.config', () => {
-    const out = emitSingleFile(
-      apiModel({
-        services: [
-          {
-            name: 'Default',
-            operations: [operation({ name: 'ping', path: '/p' })],
-          },
-        ],
-      }),
-      { facade: 'service-class' }
-    );
-    expect(out).toContain('constructor(private readonly config: ClientConfig = {}) { }');
-    expect(out).toContain('__buildUrl(this.config, `/p`)');
-    expect(out).toContain('return __request<void>(this.config,');
-  });
-});
-
-describe('runtime — retry config types', () => {
-  it('emits the retry types and a ClientConfig.retry field', () => {
-    const out = emitSingleFile(apiModel());
-    expect(out).toContain('export type RetryStrategy =');
-    expect(out).toContain('export type RetryConfig = {');
-    expect(out).toContain('export type RetryContext = {');
-    // The printer reflows the `RequestOptions` type literal across lines.
-    expect(out).toContain('export type RequestOptions = RequestInit & {');
-    expect(out).toContain('parseAs?: ParseAs;');
-    expect(out).toContain('retry?: RetryConfig;');
-  });
-
-  it('emits the retry loop, default predicate, backoff, and Retry-After handling', () => {
-    const out = emitSingleFile(apiModel());
-    expect(out).toContain('function __defaultRetryOn(ctx: RetryContext): boolean');
-    expect(out).toContain("['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']");
-    expect(out).toContain('[408, 429, 500, 502, 503, 504]');
-    expect(out).toContain('function __retryDelay(');
-    expect(out).toContain('function __sleep(');
-    expect(out).toContain("response.headers.get('retry-after')");
-    expect(out).toContain('const { retry: callRetry, ...fetchInit } = init;');
-    // The abort helper must use `globalThis.Error` so a spec-defined `Error`
-    // schema (e.g. cafe.yaml) does not shadow the built-in error type.
-    expect(out).toContain('function __abortError(signal: AbortSignal): globalThis.Error');
-  });
-});
-
-describe('renderRuntime contents (smoke)', () => {
-  it('embeds the QueryValue / __buildUrl / __request / readError surface', () => {
-    const out = emitSingleFile(apiModel());
-    expect(out).toContain('type QueryValue');
-    expect(out).toContain('function __buildUrl(');
-    expect(out).toContain('async function __request<T>(');
-    expect(out).toContain('async function readError(');
-    expect(out).toContain('class ApiError extends Error');
-  });
-});
-
-describe('emitModules — writer-facing module interface', () => {
-  it('exposes the http module (runtime + auth helpers exported) and the endpoints', () => {
-    const m = emitModules(apiModel({ services: [{ name: 'Default', operations: [operation()] }] }));
-    expect(m.http('client')).toContain('export function __buildUrl(');
-    expect(m.http('client')).toContain('export async function __request<T>(');
-    expect(m.operations).toContain('export async function op(');
-  });
-
-  it('reports hasSchemas and fills the schemas module from the model types', () => {
-    const withSchemas = emitModules(
-      apiModel({ schemas: [namedSchema('Foo', { kind: 'scalar', scalar: 'string' })] })
-    );
-    expect(withSchemas.hasSchemas).toBe(true);
-    expect(withSchemas.schemas).toContain('export type Foo = string;');
-
-    const noSchemas = emitModules(apiModel({ schemas: [] }));
-    expect(noSchemas.hasSchemas).toBe(false);
-  });
-
-  it('renderEndpoints renders a named subset; endpointImports wires the shared modules', () => {
-    const m = emitModules(
-      apiModel({
-        services: [
-          {
-            name: 'Default',
-            operations: [
-              operation({
-                name: 'getPet',
-                path: '/pets/{id}',
-                pathParams: [param('id', 'path', true)],
-                successResponses: [
-                  {
-                    contentType: 'application/json',
-                    schema: { kind: 'ref', name: 'Pet' },
-                    status: 200,
-                  },
-                ],
-              }),
-            ],
-          },
-        ],
-      })
-    );
-    const ops = [
-      operation({
-        name: 'getPet',
-        path: '/pets/{id}',
-        pathParams: [param('id', 'path', true)],
-        successResponses: [
-          { contentType: 'application/json', schema: { kind: 'ref', name: 'Pet' }, status: 200 },
-        ],
-      }),
-    ];
-    expect(m.renderEndpoints(ops, 'PetsService')).toContain('export async function getPet(');
-    const imports = m.endpointImports(ops, 'client');
-    expect(imports).toContain('from "./client.http.js"');
-    expect(imports).toContain('import type { Pet } from "./client.schemas.js";');
-    // `prefix` reaches one folder up for the tags-split layout.
-    expect(m.endpointImports(ops, 'client', '../')).toContain('from "../client.http.js"');
-  });
-
-  it('publicReexport re-exports the public runtime values and config types', () => {
-    const m = emitModules(apiModel());
-    const reexport = m.publicReexport('client');
-    expect(reexport).toContain(
-      'export { ApiError, configure, setServerUrl, use } from "./client.http.js";'
-    );
-    expect(reexport).toContain('export type {');
-  });
-});
-
-describe('SSE plumbing (single + multi-file)', () => {
-  it('emitSingleFile emits the __sse runtime block and the sse aggregate for an SSE op', () => {
-    const out = emitSingleFile(sseModel());
-    expect(out).toContain('async function* __sse');
-    expect(out).toContain('export const sse =');
-  });
-
-  it('emitSingleFile omits __sse and the sse aggregate when no op streams', () => {
-    const out = emitSingleFile(
-      apiModel({ services: [{ name: 'Default', operations: [operation()] }] })
-    );
-    expect(out).not.toContain('async function* __sse');
-    expect(out).not.toContain('export const sse =');
-  });
-
-  it('emitModules http exports the __sse generator for an SSE model', () => {
-    const m = emitModules(sseModel());
-    expect(m.http('client')).toContain('export async function* __sse');
-  });
-
-  it('publicReexport re-exports ServerSentEvent + SseOptions only for an SSE model', () => {
-    const sse = emitModules(sseModel()).publicReexport('client');
-    const typeLine = sse.split('\n').find((l) => l.startsWith('export type {')) ?? '';
-    expect(typeLine).toContain('ServerSentEvent');
-    expect(typeLine).toContain('SseOptions');
-
-    const plain = emitModules(apiModel()).publicReexport('client');
-    expect(plain).not.toContain('ServerSentEvent');
-    expect(plain).not.toContain('SseOptions');
-  });
-
-  it('endpointImports pulls __sse (value) + ServerSentEvent/SseOptions (types) + the event type', () => {
-    const ops = [sseOperation()];
-    const imports = emitModules(sseModel()).endpointImports(ops, 'client');
-    expect(imports).toContain('__sse');
-    expect(imports).toContain('type ServerSentEvent');
-    expect(imports).toContain('type SseOptions');
-    // The streamed event schema is imported from the schemas module.
-    expect(imports).toContain('import type { Message } from "./client.schemas.js";');
-    // An SSE-only file never references the regular request terminal or RequestOptions.
-    expect(imports).not.toMatch(/\b__request\b/);
-    expect(imports).not.toContain('RequestOptions');
-  });
-
-  it('a regular-only endpoints file imports no SSE symbols', () => {
-    const ops = [
-      operation({
-        name: 'getPet',
-        path: '/pets/{id}',
-        pathParams: [param('id', 'path', true)],
-        successResponses: [
-          { contentType: 'application/json', schema: { kind: 'ref', name: 'Pet' }, status: 200 },
-        ],
-      }),
-    ];
-    const imports = emitModules(sseModel()).endpointImports(ops, 'client');
-    expect(imports).not.toMatch(/\b__sse\b/);
-    expect(imports).not.toContain('ServerSentEvent');
-    expect(imports).not.toContain('SseOptions');
-  });
-});
-
-describe('query-auth + TokenProvider threading', () => {
-  const queryAuthModel = apiModel({
-    securitySchemes: [{ kind: 'apiKeyQuery', key: 'ApiKeyQuery', paramName: 'api_key' }],
-    services: [
-      {
-        name: 'Default',
-        operations: [operation({ name: 'ping', path: '/p', security: ['ApiKeyQuery'] })],
-      },
-    ],
-  });
-
-  it('emitSingleFile merges __a.query into the URL for an apiKey-query op (end-to-end)', () => {
-    const out = emitSingleFile(queryAuthModel, {});
-    expect(out).toContain('...__a.query');
-    expect(out).toContain('export type TokenProvider');
-    expect(out).toContain('export function setApiKey(');
-  });
-
-  it('publicReexport type list includes TokenProvider; value list includes setBearer', () => {
-    const bearerModel = apiModel({
-      securitySchemes: [{ kind: 'bearer', key: 'Bearer' }],
-    });
-    const reexport = emitModules(bearerModel, {}).publicReexport('client');
-    const valueLine = reexport.split('\n').find((l) => l.startsWith('export {')) ?? '';
-    const typeLine = reexport.split('\n').find((l) => l.startsWith('export type {')) ?? '';
-    expect(valueLine).toContain('setBearer');
-    expect(typeLine).toContain('TokenProvider');
-  });
-
-  it('publicReexport value list includes setBasicAuth + apiKey setters across all in', () => {
-    const mixed = apiModel({
-      securitySchemes: [
-        { kind: 'basic', key: 'Basic' },
-        { kind: 'apiKeyQuery', key: 'Q', paramName: 'q' },
-        { kind: 'apiKeyCookie', key: 'C', cookieName: 'c' },
-      ],
-    });
-    const reexport = emitModules(mixed, {}).publicReexport('client');
-    const valueLine = reexport.split('\n').find((l) => l.startsWith('export {')) ?? '';
-    const typeLine = reexport.split('\n').find((l) => l.startsWith('export type {')) ?? '';
-    expect(valueLine).toContain('setBasicAuth');
-    // Two apiKey schemes of distinct `in` → distinct setters.
-    expect(valueLine).toMatch(/setApiKey\w+/);
-    expect(typeLine).toContain('TokenProvider');
-  });
-
-  it('renderEndpoints threads queryAuthKeys into the per-tag endpoint render', () => {
-    const m = emitModules(queryAuthModel, {});
-    const ops = [operation({ name: 'ping', path: '/p', security: ['ApiKeyQuery'] })];
-    expect(m.renderEndpoints(ops, 'PingService')).toContain('...__a.query');
-  });
-});
-
-describe('errorMode threading', () => {
-  const resultModel = apiModel({
-    services: [{ name: 'Default', operations: [operation({ name: 'ping', path: '/p' })] }],
-  });
-
-  it('emitSingleFile honors errorMode: result in runtime + operations', () => {
-    const out = emitSingleFile(resultModel, { errorMode: 'result' });
-    expect(out).toContain('__requestResult');
-    expect(out).toContain('export type Result<');
-    expect(out).toContain('Promise<Result<');
-  });
-
-  it('emitSingleFile defaults to throw mode (no result surface)', () => {
-    const out = emitSingleFile(resultModel, {});
-    expect(out).not.toContain('__requestResult');
-    expect(out).not.toContain('export type Result<');
-    expect(out).not.toContain('Promise<Result<');
-  });
-
-  it('emitModules publicReexport re-exports Result only in result mode', () => {
-    const reexportLine = (out: string) =>
-      out.split('\n').find((l) => l.startsWith('export type {')) ?? '';
-
-    const result = emitModules(resultModel, { errorMode: 'result' }).publicReexport('client');
-    expect(reexportLine(result)).toContain('Result');
-
-    const thrown = emitModules(resultModel, {}).publicReexport('client');
-    expect(reexportLine(thrown)).not.toContain('Result');
-  });
-
-  it('renderEndpoints emits result-mode operations (the per-tag layout path)', () => {
-    const m = emitModules(resultModel, { errorMode: 'result' });
-    const ops = [operation({ name: 'ping', path: '/p' })];
-    const out = m.renderEndpoints(ops, 'PingService');
-    expect(out).toContain('__requestResult<');
-    expect(out).toContain('Promise<Result<');
-    expect(out).not.toContain('__request<');
-  });
-
-  it('endpointImports pulls __requestResult in result mode, __request in throw mode', () => {
-    const ops = [operation({ name: 'ping', path: '/p' })];
-
-    const result = emitModules(resultModel, { errorMode: 'result' });
-    const resultImports = result.endpointImports(ops, 'client');
-    expect(resultImports).toContain('__requestResult');
-    expect(resultImports).not.toContain('__request,');
-    expect(resultImports).not.toMatch(/\b__request\b(?!Result)/);
-    // Result-mode signatures reference `Result<…>`, so the endpoints file must
-    // import the type from the http module.
-    expect(resultImports).toContain('type Result');
-
-    const thrown = emitModules(resultModel, {});
-    const thrownImports = thrown.endpointImports(ops, 'client');
-    expect(thrownImports).toMatch(/\b__request\b/);
-    expect(thrownImports).not.toContain('__requestResult');
-    expect(thrownImports).not.toContain('type Result');
-  });
-
-  it('endpointImports imports error-body schemas only in result mode', () => {
-    // An op whose only named-schema reference is in its error response.
-    const ops = [
-      operation({
-        name: 'ping',
-        path: '/p',
-        errorResponses: [
-          {
-            contentType: 'application/json',
-            schema: { kind: 'ref', name: 'Problem' },
-            status: 200,
-          },
-        ],
-      }),
-    ];
-
-    // Result mode names the error body (`PingError = Problem`), so it imports `Problem`.
-    expect(
-      emitModules(resultModel, { errorMode: 'result' }).endpointImports(ops, 'client')
-    ).toContain('Problem');
-    // Throw mode never names the error body — importing it would trip `noUnusedLocals`.
-    expect(emitModules(resultModel, {}).endpointImports(ops, 'client')).not.toContain('Problem');
-  });
-});
-
-describe('multipart serialization helper (#5)', () => {
-  const uploadModel = apiModel({
-    services: [
-      {
-        name: 'Default',
-        operations: [
-          operation({
-            name: 'upload',
-            method: 'post',
-            requestBody: {
-              contentType: 'multipart/form-data',
-              required: true,
-              schema: {
-                kind: 'object',
-                properties: [
-                  {
-                    name: 'file',
-                    schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'binary' } },
-                    required: true,
-                  },
-                ],
-              },
-            },
-          }),
-        ],
-      },
-    ],
-  });
-
-  it('emits __toFormData when an operation has a typed multipart body', () => {
-    expect(emitSingleFile(uploadModel)).toContain('function __toFormData');
-  });
-
-  it('omits __toFormData when no operation needs it', () => {
-    expect(emitSingleFile(apiModel())).not.toContain('__toFormData');
-  });
 
-  it('does not import __toFormData into the endpoints module (the runtime serializes)', () => {
-    const ops = uploadModel.services[0].operations;
-    // `__send` (http module) serializes a multipart body after the onRequest chain, so
-    // `__toFormData` stays module-private there and the endpoints module never imports it.
-    expect(emitModules(uploadModel, {}).endpointImports(ops, 'client')).not.toContain(
-      '__toFormData'
+  it('escapes `*/` in attacker-controllable title/description text', () => {
+    const out = renderTitleComment(
+      apiModel({ title: 'X */ alert(1) /*', description: 'desc */ boom' })
     );
+    // The comment must not be closable from inside.
+    expect(out.slice(3, -2)).not.toContain('*/');
   });
 });
diff --git a/packages/client-generator/src/emitters/__tests__/descriptor.test.ts b/packages/client-generator/src/emitters/__tests__/descriptor.test.ts
new file mode 100644
index 0000000000..6e18d9a86f
--- /dev/null
+++ b/packages/client-generator/src/emitters/__tests__/descriptor.test.ts
@@ -0,0 +1,472 @@
+import type {
+  ApiModel,
+  OperationModel,
+  ResponseBodyModel,
+} from '../../intermediate-representation/model.js';
+import {
+  descriptorStatements,
+  literalExpr,
+  opsInterfaceStatements,
+  packageIdents,
+} from '../descriptor.js';
+import type { EmitContext } from '../operations.js';
+import { printStatements } from '../ts.js';
+import { apiModel, operation, param } from './fixtures.js';
+
+function op(name: string, extra: Partial<OperationModel> = {}): OperationModel {
+  return operation({ name, ...extra });
+}
+
+function modelWith(ops: OperationModel[], extra: Partial<ApiModel> = {}): ApiModel {
+  return apiModel({ services: [{ name: 'Default', operations: ops }], ...extra });
+}
+
+function emitDescriptors(model: ApiModel): string {
+  return printStatements(descriptorStatements(model, packageIdents(model), 'string'));
+}
+
+/** A JSON 200 response — keeps `responseKind` at its omitted `'json'` default. */
+const JSON_OK: ResponseBodyModel = {
+  contentType: 'application/json',
+  schema: { kind: 'ref', name: 'Pong' },
+  status: 200,
+};
+
+describe('packageIdents', () => {
+  it('renames colliding operation ids deterministically', () => {
+    const model = modelWith([op('configure'), op('createClient'), op('setBearer')], {
+      securitySchemes: [{ kind: 'bearer', key: 'bearerAuth' }],
+    });
+    const idents = packageIdents(model);
+    expect(idents.get('configure')).toBe('configure_2');
+    expect(idents.get('createClient')).toBe('createClient_2');
+    expect(idents.get('setBearer')).toBe('setBearer_2'); // auth sugar seeded first
+  });
+
+  it('keeps non-colliding names and sanitizes non-identifier ones', () => {
+    const idents = packageIdents(modelWith([op('ping'), op('get-thing')]));
+    expect(idents.get('ping')).toBe('ping');
+    expect(idents.get('get-thing')).toBe('get_thing');
+  });
+
+  it('reserves the TokenProvider import and the __redoclySetup const', () => {
+    const idents = packageIdents(modelWith([op('TokenProvider'), op('__redoclySetup')]));
+    expect(idents.get('TokenProvider')).toBe('TokenProvider_2');
+    expect(idents.get('__redoclySetup')).toBe('__redoclySetup_2');
+  });
+});
+
+describe('literalExpr', () => {
+  function print(value: unknown): string {
+    return printStatements([literalExpr(value)]);
+  }
+
+  it('converts scalars, null, arrays, and objects to expression source', () => {
+    expect(print('x')).toBe('"x"');
+    expect(print(42)).toBe('42');
+    expect(print(true)).toBe('true');
+    expect(print(false)).toBe('false');
+    expect(print(null)).toBe('null');
+    expect(print([1, 'a'])).toBe('[1, "a"]');
+    expect(print({ a: 1, b: [true] })).toBe('{ a: 1, b: [true] }');
+  });
+
+  it('quotes object keys that are not identifier-safe', () => {
+    expect(print({ 'a-b': 1, ok: 2 })).toBe('{ "a-b": 1, ok: 2 }');
+  });
+});
+
+describe('descriptorStatements', () => {
+  it('returns no statements for a model with no operations', () => {
+    expect(descriptorStatements(apiModel(), new Map(), 'string')).toEqual([]);
+  });
+
+  it('emits a minimal descriptor with only the non-default fields', () => {
+    const out = emitDescriptors(
+      modelWith([op('ping', { path: '/ping', successResponses: [JSON_OK] })])
+    );
+    expect(out).toContain('ping: { id: "ping", method: "GET", path: "/ping" }');
+    expect(out).toContain('as const satisfies Record<string, OperationDescriptor>;');
+    expect(out).not.toContain('tags:');
+    expect(out).not.toContain('params:');
+    expect(out).not.toContain('responseKind:');
+  });
+
+  it('matches the full minimal output', () => {
+    expect(emitDescriptors(modelWith([op('ping', { path: '/ping', successResponses: [JSON_OK] })])))
+      .toMatchInlineSnapshot(`
+        "/**
+         * The wire-shape descriptor for every operation, keyed by operationId — the data the
+         * runtime routes requests by. Also minification-safe static metadata (method, path,
+         * tags) for cache keys, tracing span names, and request logging.
+         */
+        export const OPERATIONS = {
+            ping: { id: "ping", method: "GET", path: "/ping" }
+        } as const satisfies Record<string, OperationDescriptor>;
+
+        export type OperationId = keyof typeof OPERATIONS;
+
+        export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];"
+      `);
+  });
+
+  it('keys a renamed operation by its emitted identifier but ids it by the spec operationId', () => {
+    // `id` drives middleware targeting (`ctx.operation.id`), so it stays the spec's
+    // operationId — matching inline mode's `operationMetaExpr` — even when the key is renamed.
+    const out = emitDescriptors(
+      modelWith([op('configure', { path: '/c', successResponses: [JSON_OK] })])
+    );
+    expect(out).toContain('configure_2: { id: "configure", method: "GET", path: "/c" }');
+  });
+
+  it('keeps id/params/security intact on a renamed operation', () => {
+    const out = emitDescriptors(
+      modelWith(
+        [
+          op('use', {
+            path: '/u/{id}',
+            pathParams: [param('id', 'path', true)],
+            security: ['bearerAuth'],
+            successResponses: [JSON_OK],
+          }),
+        ],
+        { securitySchemes: [{ kind: 'bearer', key: 'bearerAuth' }] }
+      )
+    );
+    expect(out).toContain(
+      'use_2: { id: "use", method: "GET", path: "/u/{id}", params: [{ name: "id", in: "path" }], security: [{ scheme: "bearerAuth", kind: "bearer" }] }'
+    );
+  });
+
+  it('records a non-identifier path param by its quoted wire name', () => {
+    const out = emitDescriptors(
+      modelWith([
+        op('getPet', {
+          path: '/pets/{pet-id}',
+          pathParams: [param('pet-id', 'path', true)],
+          successResponses: [JSON_OK],
+        }),
+      ])
+    );
+    expect(out).toContain('params: [{ name: "pet-id", in: "path" }]');
+    expect(out).not.toContain('pet_id');
+  });
+
+  it('emits params with in/style/explode/allowReserved only when present', () => {
+    const out = emitDescriptors(
+      modelWith([
+        op('getOrder', {
+          path: '/orders/{orderId}',
+          pathParams: [param('orderId', 'path', true)],
+          queryParams: [
+            { ...param('tags', 'query'), style: 'pipeDelimited', explode: false },
+            { ...param('q', 'query'), allowReserved: true },
+            param('limit', 'query'),
+          ],
+          headerParams: [param('X-Trace', 'header')],
+        }),
+      ])
+    );
+    expect(out).toContain('{ name: "orderId", in: "path" }');
+    expect(out).toContain('{ name: "tags", in: "query", style: "pipeDelimited", explode: false }');
+    expect(out).toContain('{ name: "q", in: "query", allowReserved: true }');
+    expect(out).toContain('{ name: "limit", in: "query" }');
+    expect(out).toContain('{ name: "X-Trace", in: "header" }');
+  });
+
+  it('derives body.multipart, responseKind, and sseDataKind', () => {
+    const multipart = emitDescriptors(
+      modelWith([
+        op('upload', {
+          method: 'post',
+          requestBody: {
+            contentType: 'multipart/form-data',
+            required: true,
+            schema: { kind: 'object', properties: [] },
+          },
+        }),
+      ])
+    );
+    expect(multipart).toContain('body: { contentType: "multipart/form-data", multipart: true }');
+
+    const json = emitDescriptors(
+      modelWith([
+        op('create', {
+          method: 'post',
+          requestBody: {
+            contentType: 'application/json',
+            required: true,
+            schema: { kind: 'ref', name: 'Pet' },
+          },
+          successResponses: [
+            { contentType: 'application/json', schema: { kind: 'ref', name: 'Pet' }, status: 200 },
+          ],
+        }),
+      ])
+    );
+    expect(json).toContain('body: { contentType: "application/json" }');
+    expect(json).not.toContain('multipart');
+    expect(json).not.toContain('responseKind'); // json is the default
+
+    const text = emitDescriptors(
+      modelWith([
+        op('readme', {
+          successResponses: [
+            {
+              contentType: 'text/plain',
+              schema: { kind: 'scalar', scalar: 'string' },
+              status: 200,
+            },
+          ],
+        }),
+      ])
+    );
+    expect(text).toContain('responseKind: "text"');
+
+    const none = emitDescriptors(modelWith([op('drop', { method: 'delete' })]));
+    expect(none).toContain('responseKind: "void"');
+
+    const blob = emitDescriptors(
+      modelWith([
+        op('getPhoto', {
+          successResponses: [
+            { contentType: 'image/png', schema: { kind: 'unknown' }, status: 200 },
+          ],
+        }),
+      ])
+    );
+    expect(blob).toContain('responseKind: "blob"');
+
+    const sse = emitDescriptors(
+      modelWith([
+        op('streamEvents', {
+          successResponses: [
+            {
+              contentType: 'text/event-stream',
+              schema: { kind: 'object', properties: [] },
+              status: 200,
+            },
+          ],
+        }),
+      ])
+    );
+    expect(sse).toContain('responseKind: "sse"');
+    expect(sse).toContain('sseDataKind: "json"');
+  });
+
+  it('denormalizes security from the model schemes, skipping unknown keys', () => {
+    const out = emitDescriptors(
+      modelWith([op('getOrder', { security: ['bearerAuth', 'apiCookie', 'ghost'] })], {
+        securitySchemes: [
+          { kind: 'bearer', key: 'bearerAuth' },
+          { kind: 'apiKeyCookie', key: 'apiCookie', cookieName: 'sid' },
+        ],
+      })
+    );
+    expect(out).toContain(
+      'security: [{ scheme: "bearerAuth", kind: "bearer" }, { scheme: "apiCookie", kind: "apiKey", name: "sid", in: "cookie" }]'
+    );
+    expect(out).not.toContain('ghost');
+  });
+
+  it('covers basic, apiKey header, and apiKey query schemes', () => {
+    const out = emitDescriptors(
+      modelWith([op('getOrder', { security: ['basicAuth', 'apiHeader', 'apiQuery'] })], {
+        securitySchemes: [
+          { kind: 'basic', key: 'basicAuth' },
+          { kind: 'apiKeyHeader', key: 'apiHeader', headerName: 'X-Key' },
+          { kind: 'apiKeyQuery', key: 'apiQuery', paramName: 'api_key' },
+        ],
+      })
+    );
+    expect(out).toContain('{ scheme: "basicAuth", kind: "basic" }');
+    expect(out).toContain('{ scheme: "apiHeader", kind: "apiKey", name: "X-Key", in: "header" }');
+    expect(out).toContain('{ scheme: "apiQuery", kind: "apiKey", name: "api_key", in: "query" }');
+  });
+
+  it('emits tags and the derived OperationId/OperationPath/OperationTag unions', () => {
+    const out = emitDescriptors(
+      modelWith([op('listPets', { path: '/pets', tags: ['Pets'] }), op('ping', { path: '/ping' })])
+    );
+    expect(out).toContain('tags: ["Pets"]');
+    expect(out).toContain('export type OperationId = keyof typeof OPERATIONS;');
+    expect(out).toContain('export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];');
+    // `tags` is present only on tagged entries, so the union is derived via Extract —
+    // a plain ["tags"] index would not compile against the untagged entries.
+    expect(out).toContain(
+      'export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {\n' +
+        '    tags: readonly string[];\n' +
+        '}>["tags"][number];'
+    );
+  });
+
+  it('omits OperationTag when no operation has a tag (avoids never)', () => {
+    const out = emitDescriptors(modelWith([op('ping')]));
+    expect(out).toContain('export type OperationId');
+    expect(out).toContain('export type OperationPath');
+    expect(out).not.toContain('OperationTag');
+  });
+});
+
+describe('opsInterfaceStatements', () => {
+  function emitOps(model: ApiModel, extra: Partial<EmitContext> = {}): string {
+    const ctx: EmitContext = {
+      argsStyle: 'flat',
+      errorMode: 'throw',
+      dateType: 'string',
+      queryAuthKeys: new Set(),
+      schemaNames: new Set(),
+      ...extra,
+    };
+    return printStatements(opsInterfaceStatements(model, packageIdents(model), ctx));
+  }
+
+  const getOrder = op('getOrder', {
+    path: '/orders/{orderId}',
+    pathParams: [param('orderId', 'path', true)],
+    successResponses: [
+      { contentType: 'application/json', schema: { kind: 'ref', name: 'Order' }, status: 200 },
+    ],
+  });
+  const streamOrders = op('streamOrders', {
+    path: '/orders/stream',
+    successResponses: [
+      {
+        contentType: 'text/event-stream',
+        schema: { kind: 'ref', name: 'OrderEvent' },
+        status: 200,
+      },
+    ],
+  });
+
+  it('returns no statements for a model with no operations', () => {
+    expect(emitOps(modelWith([]))).toBe('');
+  });
+
+  it('emits per-operation args (via the Variables shape) and result members', () => {
+    const out = emitOps(
+      modelWith([
+        op('getOrder', {
+          path: '/orders/{orderId}',
+          pathParams: [param('orderId', 'path', true)],
+          queryParams: [param('include', 'query')],
+          successResponses: [
+            {
+              contentType: 'application/json',
+              schema: { kind: 'ref', name: 'Order' },
+              status: 200,
+            },
+          ],
+        }),
+      ])
+    );
+    expect(out).toContain('export type Ops = {');
+    expect(out).toMatch(
+      /getOrder: \{\n {8}args: \{\n {12}orderId: string;\n {12}params\?: GetOrderParams;\n {8}\};\n {8}result: GetOrderResult;\n {4}\};/
+    );
+    expect(out).not.toContain('kind: "sse"');
+  });
+
+  it('keys args path params by wire name, quoted when not identifier-safe', () => {
+    // The runtime routes path values by wire name (`splitArgs` reads `args[param.name]`),
+    // so the args type must key them the same way — never by the sanitized ident.
+    const out = emitOps(
+      modelWith([
+        op('getPet', {
+          path: '/pets/{pet-id}',
+          pathParams: [param('pet-id', 'path', true)],
+        }),
+      ])
+    );
+    expect(out).toContain('"pet-id": string;');
+    expect(out).not.toContain('pet_id');
+  });
+
+  it('keeps path params that sanitize to the same ident distinct via their wire names', () => {
+    const out = emitOps(
+      modelWith([
+        op('compare', {
+          path: '/x/{a-b}/{a.b}',
+          pathParams: [param('a-b', 'path', true), param('a.b', 'path', true)],
+        }),
+      ])
+    );
+    expect(out).toContain('"a-b": string;');
+    expect(out).toContain('"a.b": string;');
+    expect(out).not.toContain('a_b');
+  });
+
+  it('emits args: {} for a no-input operation', () => {
+    const out = emitOps(modelWith([op('ping')]));
+    expect(out).toContain('ping: {\n        args: {};');
+    expect(out).toContain('result: PingResult;');
+  });
+
+  it('inlines the response type when the <Op>Result alias collides with a schema', () => {
+    const out = emitOps(modelWith([getOrder]), { schemaNames: new Set(['GetOrderResult']) });
+    expect(out).toContain('result: Order;');
+    expect(out).not.toContain('GetOrderResult');
+  });
+
+  it('keys members by the collision-renamed identifier', () => {
+    const out = emitOps(modelWith([op('configure')]));
+    expect(out).toContain('configure_2: {');
+  });
+
+  it('wraps the result in Result<…, <Op>Error> in result mode', () => {
+    const out = emitOps(
+      modelWith([
+        op('getOrder', {
+          ...getOrder,
+          errorResponses: [
+            {
+              contentType: 'application/json',
+              schema: { kind: 'ref', name: 'Problem' },
+              status: 404,
+            },
+          ],
+        }),
+      ]),
+      { errorMode: 'result' }
+    );
+    expect(out).toContain('result: Result<GetOrderResult, GetOrderError>;');
+  });
+
+  it('falls back to unknown in result mode when the op declares no error responses', () => {
+    const out = emitOps(modelWith([getOrder]), { errorMode: 'result' });
+    expect(out).toContain('result: Result<GetOrderResult, unknown>;');
+  });
+
+  it('inlines the error type when the <Op>Error alias collides with a schema', () => {
+    const errored = (errorResponses: OperationModel['errorResponses']) =>
+      op('getOrder', { ...getOrder, errorResponses });
+    const single = emitOps(
+      modelWith([
+        errored([
+          { contentType: 'application/json', schema: { kind: 'ref', name: 'E1' }, status: 400 },
+        ]),
+      ]),
+      { errorMode: 'result', schemaNames: new Set(['GetOrderError']) }
+    );
+    expect(single).toContain('result: Result<GetOrderResult, E1>;');
+
+    const union = emitOps(
+      modelWith([
+        errored([
+          { contentType: 'application/json', schema: { kind: 'ref', name: 'E1' }, status: 400 },
+          { contentType: 'application/json', schema: { kind: 'ref', name: 'E2' }, status: 500 },
+        ]),
+      ]),
+      { errorMode: 'result', schemaNames: new Set(['GetOrderError']) }
+    );
+    expect(union).toContain('result: Result<GetOrderResult, E1 | E2>;');
+  });
+
+  it('types an SSE op with the event payload and kind: "sse", never a Result wrapper', () => {
+    const out = emitOps(modelWith([streamOrders]), { errorMode: 'result' });
+    expect(out).toMatch(
+      /streamOrders: \{\n {8}args: \{\};\n {8}result: OrderEvent;\n {8}kind: "sse";\n {4}\};/
+    );
+    expect(out).not.toContain('Result<');
+  });
+});
diff --git a/packages/client-generator/src/emitters/__tests__/fixtures.ts b/packages/client-generator/src/emitters/__tests__/fixtures.ts
index 55fd2afda0..51614ba2a6 100644
--- a/packages/client-generator/src/emitters/__tests__/fixtures.ts
+++ b/packages/client-generator/src/emitters/__tests__/fixtures.ts
@@ -6,7 +6,7 @@ import type {
   ResponseBodyModel,
   SchemaModel,
 } from '../../intermediate-representation/model.js';
-import { emitSingleFile } from '../client.js';
+import { emitClientSingleFile } from '../package-client.js';
 
 /** A plain `string` scalar — the default schema for params and the most-reused leaf. */
 export const SCALAR: SchemaModel = { kind: 'scalar', scalar: 'string' };
@@ -63,7 +63,9 @@ export function response(overrides: Partial<ResponseBodyModel> = {}): ResponseBo
   return { contentType: 'application/json', schema: SCALAR, status: 200, ...overrides };
 }
 
-/** Emit a single-file client whose only operation is `operation(op)`. */
+/** Emit a single-file (inline-runtime) client whose only operation is `operation(op)`. */
 export function emitWithOp(op: Partial<OperationModel>): string {
-  return emitSingleFile(apiModel({ services: [{ name: 'Default', operations: [operation(op)] }] }));
+  return emitClientSingleFile(
+    apiModel({ services: [{ name: 'Default', operations: [operation(op)] }] })
+  );
 }
diff --git a/packages/client-generator/src/emitters/__tests__/inline-runtime.test.ts b/packages/client-generator/src/emitters/__tests__/inline-runtime.test.ts
new file mode 100644
index 0000000000..d5385e3792
--- /dev/null
+++ b/packages/client-generator/src/emitters/__tests__/inline-runtime.test.ts
@@ -0,0 +1,194 @@
+import { assembleInlineRuntime } from '../inline-runtime.js';
+import { ts } from '../ts.js';
+
+const NONE = { multipart: false, auth: false, sse: false, setup: false };
+const ALL = { multipart: true, auth: true, sse: true, setup: true };
+
+/** Positions of `markers` in `text`; asserts each is present and they appear in order. */
+function expectOrder(text: string, markers: string[]): void {
+  const positions = markers.map((marker) => {
+    const at = text.indexOf(marker);
+    expect(at, `missing marker: ${marker}`).toBeGreaterThanOrEqual(0);
+    return at;
+  });
+  expect(positions, `markers out of order: ${markers.join(' < ')}`).toEqual(
+    [...positions].sort((a, b) => a - b)
+  );
+}
+
+// Syntax-validity gate: `ts.createSourceFile` + its parse diagnostics. Pragmatic by
+// design — a full in-memory `ts.createProgram` typecheck is stage T3+'s e2e strict-tsc
+// job; here we assert the assembled text is at least syntactically sound TypeScript.
+function parseErrors(source: string): readonly unknown[] {
+  const file = ts.createSourceFile(
+    'inline.ts',
+    source,
+    ts.ScriptTarget.Latest,
+    true,
+    ts.ScriptKind.TS
+  );
+  return (file as unknown as { parseDiagnostics: readonly unknown[] }).parseDiagnostics;
+}
+
+describe('assembleInlineRuntime', () => {
+  describe('core-only', () => {
+    const out = assembleInlineRuntime(NONE);
+
+    it('keeps export on the public surface and strips it from internals', () => {
+      expect(out).toContain('export class ApiError');
+      expect(out).toContain('function buildUrl');
+      expect(out).not.toContain('export function buildUrl');
+      // The factory IS exported — the generated module's multi-instance surface
+      // (spec: it re-exports `createClient`/`OPERATIONS`/`Ops`).
+      expect(out).toContain('export function createClient<\n  Ops extends OpsShape,');
+      expect(out).toContain('Tag extends string = string,');
+    });
+
+    it('wires an empty capability object', () => {
+      expect(out).toContain('createClientCore<Ops, Id, Path, Tag>(operations, config, {})');
+    });
+
+    it('embeds no capability module', () => {
+      // The auth MODULE is absent (its function bodies); `resolveAuth` as a bare word
+      // still appears in create-client.ts's `Capabilities` seam type — that is expected.
+      expect(out).not.toContain('toFormData');
+      expect(out).not.toContain('async function resolveAuth');
+      expect(out).not.toContain('resolveToken');
+      expect(out).not.toContain('async function* sse');
+      expect(out).not.toContain('mergeSetup');
+    });
+
+    it('contains no import statements or package references', () => {
+      expect(out).not.toContain("from './");
+      expect(out).not.toContain("from '@redocly");
+      expect(out).not.toContain('import ');
+    });
+
+    it('starts with the embedded-runtime header and orders modules by dependency', () => {
+      expect(
+        out.startsWith(
+          "// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───\n\n"
+        )
+      ).toBe(true);
+      expectOrder(out, [
+        'export type ParamSpec',
+        'export class ApiError',
+        'function buildUrl',
+        'async function parse',
+        'function defaultRetryOn',
+        'async function send',
+        'function createClientCore',
+        'function createClient<\n  Ops extends OpsShape,',
+      ]);
+    });
+  });
+
+  describe('full capabilities', () => {
+    const out = assembleInlineRuntime(ALL);
+
+    it('wires all capabilities into the factory', () => {
+      expect(out).toContain('serializeMultipart: toFormData');
+      expect(out).toContain(
+        'createClientCore<Ops, Id, Path, Tag>(operations, config, { serializeMultipart: toFormData, resolveAuth, sse })'
+      );
+    });
+
+    it('embeds the capability modules module-local, mergeSetup exported', () => {
+      expect(out).toContain('function toFormData');
+      expect(out).not.toContain('export function toFormData');
+      expect(out).toContain('async function resolveAuth');
+      expect(out).not.toContain('export async function resolveAuth');
+      expect(out).toContain('async function* sse');
+      expect(out).not.toContain('export async function* sse');
+      expect(out).toContain('export function mergeSetup');
+    });
+
+    it('slots capability modules into the dependency order', () => {
+      expectOrder(out, [
+        'function defaultRetryOn',
+        'function toFormData',
+        'async function resolveAuth',
+        'export function mergeSetup',
+        'async function send',
+        'async function* sse',
+        'function createClientCore',
+      ]);
+    });
+  });
+
+  describe('each capability alone pulls exactly its module', () => {
+    it('multipart', () => {
+      const out = assembleInlineRuntime({ ...NONE, multipart: true });
+      expect(out).toContain('function toFormData');
+      expect(out).toContain(
+        'createClientCore<Ops, Id, Path, Tag>(operations, config, { serializeMultipart: toFormData })'
+      );
+      expect(out).not.toContain('resolveToken');
+      expect(out).not.toContain('parseSseFrame');
+      expect(out).not.toContain('mergeSetup');
+    });
+
+    it('auth', () => {
+      const out = assembleInlineRuntime({ ...NONE, auth: true });
+      expect(out).toContain('async function resolveAuth');
+      expect(out).toContain('resolveToken');
+      expect(out).toContain(
+        'createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth })'
+      );
+      expect(out).not.toContain('toFormData');
+      expect(out).not.toContain('parseSseFrame');
+      expect(out).not.toContain('mergeSetup');
+    });
+
+    it('sse', () => {
+      const out = assembleInlineRuntime({ ...NONE, sse: true });
+      expect(out).toContain('async function* sse');
+      expect(out).toContain('parseSseFrame');
+      expect(out).toContain('createClientCore<Ops, Id, Path, Tag>(operations, config, { sse })');
+      expect(out).not.toContain('toFormData');
+      expect(out).not.toContain('resolveToken');
+      expect(out).not.toContain('mergeSetup');
+    });
+
+    it('setup (exported for the wiring, not a factory capability)', () => {
+      const out = assembleInlineRuntime({ ...NONE, setup: true });
+      expect(out).toContain('export function mergeSetup');
+      expect(out).toContain('createClientCore<Ops, Id, Path, Tag>(operations, config, {})');
+      expect(out).not.toContain('toFormData');
+      expect(out).not.toContain('resolveToken');
+      expect(out).not.toContain('parseSseFrame');
+    });
+  });
+
+  describe('embedded type surface', () => {
+    const out = assembleInlineRuntime(NONE);
+
+    it('keeps every types.ts export (they replace package-mode type imports)', () => {
+      expect(out).toContain('export type ClientConfig');
+      expect(out).toContain('export type RequestOptions');
+      expect(out).toContain('export type OperationDescriptor');
+      expect(out).toContain(
+        'export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext>'
+      );
+    });
+
+    it('strips exports from internal types in non-types modules', () => {
+      expect(out).toContain('type QueryStyle');
+      expect(out).not.toContain('export type QueryStyle');
+      expect(out).toContain('type SendCapabilities');
+      expect(out).not.toContain('export type SendCapabilities');
+      expect(out).toContain('type Capabilities');
+      expect(out).not.toContain('export type Capabilities');
+    });
+  });
+
+  it('is deterministic', () => {
+    expect(assembleInlineRuntime(ALL)).toBe(assembleInlineRuntime(ALL));
+    expect(assembleInlineRuntime(NONE)).toBe(assembleInlineRuntime(NONE));
+  });
+
+  it('assembles syntactically valid TypeScript (core-only and full)', () => {
+    expect(parseErrors(assembleInlineRuntime(NONE))).toEqual([]);
+    expect(parseErrors(assembleInlineRuntime(ALL))).toEqual([]);
+  });
+});
diff --git a/packages/client-generator/src/emitters/__tests__/operations.test.ts b/packages/client-generator/src/emitters/__tests__/operations.test.ts
index f275da4258..800f76c419 100644
--- a/packages/client-generator/src/emitters/__tests__/operations.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/operations.test.ts
@@ -1,706 +1,65 @@
-import type {
-  OperationModel,
-  RequestBodyModel,
-  ResponseBodyModel,
-  SchemaModel,
-} from '../../intermediate-representation/model.js';
-import { emitSingleFile } from '../client.js';
-import { renderOperationsBlock, renderOperationsMeta, serviceClassName } from '../operations.js';
+// The flat sugar signatures (`renderArgList`) and the `<Op>*` operation aliases as
+// they appear in the descriptor-wired single-file client. The wiring itself (Ops,
+// OPERATIONS, client, auth sugar) is covered in package-client.test.ts; here the
+// focus is one operation's developer-facing surface.
+import type { OperationModel, RequestBodyModel } from '../../intermediate-representation/model.js';
+import { emitClientSingleFile } from '../package-client.js';
 import { SCALAR, apiModel, emitWithOp, namedSchema, operation, param } from './fixtures.js';
 
-describe('OPERATIONS carries tags + derived path/tag unions', () => {
-  it('emits tags on each entry and the derived OperationPath/OperationTag', () => {
-    const out = renderOperationsMeta([
-      operation({ name: 'listPets', method: 'get', path: '/pets', tags: ['Pets'] }),
-    ]);
-    expect(out).toContain('tags: ["Pets"]');
-    expect(out).toContain('export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];');
-    expect(out).toContain(
-      'export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];'
-    );
-    expect(out).toContain('readonly tags: readonly string[];');
-  });
-
-  it('omits OperationTag when no operation has a tag (avoids never)', () => {
-    const out = renderOperationsMeta([
-      operation({ name: 'ping', method: 'get', path: '/p', tags: [] }),
-    ]);
-    expect(out).toContain('tags: []');
-    expect(out).not.toContain('export type OperationTag');
-  });
-});
-
-describe('serviceClassName', () => {
-  it('PascalCases the label and appends Service', () => {
-    expect(serviceClassName('products')).toBe('ProductsService');
-    expect(serviceClassName('Orders')).toBe('OrdersService');
-  });
-
-  it('produces a valid identifier from non-identifier labels', () => {
-    expect(serviceClassName('pet-store')).toBe('PetStoreService');
-    expect(serviceClassName('default')).toBe('DefaultService');
-    expect(serviceClassName('user accounts')).toBe('UserAccountsService');
-  });
-
-  it('falls back to DefaultService when the label has no identifier chars', () => {
-    expect(serviceClassName('---')).toBe('DefaultService');
-  });
-
-  it('prefixes a leading digit so the result is a valid identifier', () => {
-    expect(serviceClassName('2023-api')).toBe('_2023ApiService');
-  });
-});
-
-describe('renderOperationsBlock — facade seam', () => {
-  const ops = [
-    operation({
-      name: 'getThing',
-      path: '/things/{id}',
-      pathParams: [param('id', 'path', true)],
+/** Emit a result-mode single-file client whose only operation is `operation(op)`. */
+function emitResult(op: Partial<OperationModel>, schemas: string[] = []): string {
+  return emitClientSingleFile(
+    apiModel({
+      schemas: schemas.map((name) => namedSchema(name, { kind: 'object', properties: [] })),
+      services: [{ name: 'Default', operations: [operation(op)] }],
     }),
-    operation({ name: 'listThings', path: '/things' }),
-  ];
-
-  it('functions facade emits standalone exported async functions joined by a blank line', () => {
-    const out = renderOperationsBlock(ops, {
-      facade: 'functions',
-      className: 'Ignored',
-    });
-    expect(out).toContain('export async function getThing(');
-    expect(out).toContain('export async function listThings(');
-    expect(out).not.toContain('export class');
-    // className is ignored by the functions facade.
-    expect(out).not.toContain('Ignored');
-  });
-
-  it('functions facade output equals the per-operation join (byte-identical seam)', () => {
-    const block = renderOperationsBlock(ops, {
-      facade: 'functions',
-      className: 'X',
-    });
-    const viaSingle = emitSingleFile(
-      apiModel({ services: [{ name: 'Default', operations: ops }] })
-    );
-    expect(viaSingle).toContain(block);
-  });
-
-  it('service-class facade wraps operations as methods of the named class', () => {
-    const out = renderOperationsBlock(ops, {
-      facade: 'service-class',
-      className: 'ThingsService',
-    });
-    expect(out).toContain('export class ThingsService {');
-    // Methods have no `export`/`function` keywords — they are class members.
-    expect(out).toMatch(/\basync getThing\(/);
-    expect(out).toMatch(/\basync listThings\(/);
-    expect(out).not.toContain('export async function');
-    // The method body calls the runtime via `this.config`.
-    expect(out).toContain('return __request<void>(this.config,');
-  });
-
-  it('service-class emits a chainable use() method that registers middleware on the instance', () => {
-    const out = renderOperationsBlock(ops, {
-      facade: 'service-class',
-      className: 'ThingsService',
-    });
-    expect(out).toContain('use(...middleware: Middleware[]): this {');
-    expect(out).toContain(
-      'this.config.middleware = [...this.config.middleware ?? [], ...middleware];'
-    );
-    expect(out).toContain('return this;');
-  });
-
-  describe('<Op>Result / schema name collision (#9)', () => {
-    const archive = operation({
-      name: 'archive',
-      path: '/pets/{id}/archive',
-      method: 'post',
-      pathParams: [param('id', 'path', true)],
-      // Returns `Pet`; the derived alias name `ArchiveResult` collides with a sibling schema.
-      successResponses: [
-        { contentType: 'application/json', schema: { kind: 'ref', name: 'Pet' }, status: 200 },
-      ],
-    });
-
-    it('suppresses the <Op>Result alias when its name collides with a schema (throw mode)', () => {
-      const out = renderOperationsBlock([archive], {
-        facade: 'functions',
-        className: 'C',
-        schemaNames: new Set(['ArchiveResult']),
-      });
-      expect(out).not.toContain('export type ArchiveResult');
-      // The function still returns the underlying response type.
-      expect(out).toContain('Promise<Pet>');
-    });
-
-    it('inlines the response type in result mode on collision (no resultRef)', () => {
-      const out = renderOperationsBlock([archive], {
-        facade: 'functions',
-        className: 'C',
-        errorMode: 'result',
-        schemaNames: new Set(['ArchiveResult']),
-      });
-      expect(out).not.toContain('export type ArchiveResult');
-      expect(out).toContain('Result<Pet,');
-      expect(out).not.toContain('Result<ArchiveResult,');
-    });
-
-    it('still emits the alias when there is no collision', () => {
-      const out = renderOperationsBlock([archive], {
-        facade: 'functions',
-        className: 'C',
-        schemaNames: new Set(['Pet']),
-      });
-      expect(out).toContain('export type ArchiveResult = Pet;');
-    });
-
-    it('suppresses *Error and inlines the error type on collision (result mode)', () => {
-      const login = operation({
-        name: 'login',
-        method: 'post',
-        successResponses: [
-          {
-            contentType: 'application/json',
-            schema: { kind: 'ref', name: 'Session' },
-            status: 200,
-          },
-        ],
-        errorResponses: [
-          {
-            contentType: 'application/json',
-            schema: { kind: 'ref', name: 'Problem' },
-            status: 200,
-          },
-        ],
-      });
-      const out = renderOperationsBlock([login], {
-        facade: 'functions',
-        className: 'C',
-        errorMode: 'result',
-        schemaNames: new Set(['LoginError']),
-      });
-      expect(out).not.toContain('export type LoginError');
-      // The Result error arg references the schema directly, not the (absent) alias.
-      expect(out).toContain('Result<LoginResult, Problem>');
-    });
-
-    it('suppresses *Params/*Body/*Headers aliases on collision (flat mode inlines them)', () => {
-      const list = operation({
-        name: 'list',
-        method: 'get',
-        queryParams: [param('q', 'query', false)],
-      });
-      const out = renderOperationsBlock([list], {
-        facade: 'functions',
-        className: 'C',
-        schemaNames: new Set(['ListParams']),
-      });
-      expect(out).not.toContain('export type ListParams');
-      // The flat signature still carries an inline params object.
-      expect(out).toMatch(/params\?: \{/);
-    });
-
-    it('suppresses *Variables and inlines it in the grouped signature on collision', () => {
-      const get = operation({
-        name: 'get',
-        method: 'get',
-        path: '/x/{id}',
-        pathParams: [param('id', 'path', true)],
-      });
-      const out = renderOperationsBlock([get], {
-        facade: 'functions',
-        className: 'C',
-        argsStyle: 'grouped',
-        schemaNames: new Set(['GetVariables']),
-      });
-      expect(out).not.toContain('export type GetVariables');
-      expect(out).toContain('vars: {'); // inline object, not a reference to GetVariables
-    });
-
-    it('inlines a *Params prop inside *Variables when *Params collides (grouped)', () => {
-      const list = operation({
-        name: 'list',
-        method: 'get',
-        queryParams: [param('q', 'query', true)],
-      });
-      const out = renderOperationsBlock([list], {
-        facade: 'functions',
-        className: 'C',
-        argsStyle: 'grouped',
-        schemaNames: new Set(['ListParams']),
-      });
-      expect(out).not.toContain('export type ListParams');
-      expect(out).toContain('export type ListVariables'); // Variables itself doesn't collide
-      expect(out).not.toMatch(/params\??: ListParams/); // the prop is inlined, not a ref
-    });
-
-    it('inlines colliding *Body and *Headers props in *Variables (grouped)', () => {
-      const send = operation({
-        name: 'send',
-        method: 'post',
-        requestBody: {
-          contentType: 'application/json',
-          required: true,
-          schema: { kind: 'ref', name: 'Payload' },
-        },
-        headerParams: [param('x-trace', 'header', false)],
-      });
-      const out = renderOperationsBlock([send], {
-        facade: 'functions',
-        className: 'C',
-        argsStyle: 'grouped',
-        schemaNames: new Set(['SendBody', 'SendHeaders']),
-      });
-      expect(out).not.toContain('export type SendBody');
-      expect(out).not.toContain('export type SendHeaders');
-      expect(out).toContain('export type SendVariables'); // inlines body/headers rather than referencing
-      expect(out).toContain('body: Payload;');
-    });
-
-    it('suppresses an SSE op input alias (<Op>Variables) that collides with a schema', () => {
-      const stream = operation({
-        name: 'streamEvents',
-        method: 'get',
-        path: '/events/{id}',
-        pathParams: [param('id', 'path', true)],
-        successResponses: [
-          {
-            contentType: 'text/event-stream',
-            schema: { kind: 'scalar', scalar: 'string' },
-            status: 200,
-          },
-        ],
-      });
-      const out = renderOperationsBlock([stream], {
-        facade: 'functions',
-        className: 'C',
-        schemaNames: new Set(['StreamEventsVariables']),
-      });
-      // SSE input aliases are not exempt from collision handling.
-      expect(out).not.toContain('export type StreamEventsVariables');
-    });
-
-    it('inlines a multi-member error union when *Error collides (result mode)', () => {
-      const op2 = operation({
-        name: 'op2',
-        method: 'post',
-        successResponses: [
-          { contentType: 'application/json', schema: { kind: 'ref', name: 'Ok' }, status: 200 },
-        ],
-        errorResponses: [
-          { contentType: 'application/json', schema: { kind: 'ref', name: 'E1' }, status: 200 },
-          { contentType: 'application/json', schema: { kind: 'ref', name: 'E2' }, status: 200 },
-        ],
-      });
-      const out = renderOperationsBlock([op2], {
-        facade: 'functions',
-        className: 'C',
-        errorMode: 'result',
-        schemaNames: new Set(['Op2Error']),
-      });
-      expect(out).not.toContain('export type Op2Error');
-      expect(out).toContain('Result<Op2Result, E1 | E2>'); // inline union, not the alias
-    });
-  });
-
-  describe('multipart request bodies (#5)', () => {
-    const uploadOp = operation({
-      name: 'upload',
-      method: 'post',
-      requestBody: {
-        contentType: 'multipart/form-data',
-        required: true,
-        schema: {
-          kind: 'object',
-          properties: [
-            {
-              name: 'file',
-              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'binary' } },
-              required: true,
-            },
-            { name: 'orgId', schema: { kind: 'scalar', scalar: 'string' }, required: true },
-            {
-              name: 'tags',
-              schema: { kind: 'array', items: { kind: 'scalar', scalar: 'string' } },
-              required: false,
-            },
-          ],
-        },
-      },
-    });
-
-    it('emits a typed body (binary→Blob) and defers FormData serialization to the runtime', () => {
-      const out = renderOperationsBlock([uploadOp], { facade: 'functions', className: 'C' });
-      expect(out).toContain('export type UploadBody = {');
-      expect(out).toContain('file: Blob;');
-      expect(out).toContain('orgId: string;');
-      expect(out).toContain('tags?: string[];');
-      expect(out).not.toContain('UploadBody = FormData');
-      // The call passes the plain object plus the multipart flag (trailing `true`); __send
-      // serializes it to FormData AFTER onRequest, so there is no inline __toFormData here.
-      expect(out).not.toContain('__toFormData');
-      expect(out).toContain('body, "void", true);');
-    });
-
-    it('falls back to raw FormData when the multipart schema is not an object', () => {
-      const out = renderOperationsBlock(
-        [
-          operation({
-            name: 'rawUpload',
-            method: 'post',
-            requestBody: {
-              contentType: 'multipart/form-data',
-              required: true,
-              schema: { kind: 'unknown' },
-            },
-          }),
-        ],
-        { facade: 'functions', className: 'C' }
-      );
-      expect(out).toContain('export type RawUploadBody = FormData;');
-      expect(out).not.toContain('__toFormData');
-    });
-  });
-
-  it('service-class hoists operation type aliases to module level (before the class)', () => {
-    const out = renderOperationsBlock(ops, {
-      facade: 'service-class',
-      className: 'C',
-    });
-    // `export type` aliases can't live inside a class body — they must precede it.
-    expect(out).toContain('export type GetThingResult');
-    expect(out.indexOf('export type GetThingResult')).toBeLessThan(out.indexOf('export class C {'));
-    // The alias is not re-emitted inside the class body.
-    const classBody = out.slice(out.indexOf('export class C {'));
-    expect(classBody).not.toContain('export type');
-  });
-});
-
-describe("errorMode: 'result' — result shape + typed errors", () => {
-  const okResponse: ResponseBodyModel = {
-    contentType: 'application/json',
-    status: 200,
-    schema: { kind: 'ref', name: 'Pet' },
-  };
-
-  function emitResult(op: Partial<OperationModel>): string {
-    return renderOperationsBlock([operation(op)], {
-      facade: 'functions',
-      className: 'Client',
-      argsStyle: 'flat',
-      errorMode: 'result',
-    });
-  }
-
-  it('emits a *Error alias and a Result-typed signature/body when the op declares an error response', () => {
-    const out = emitResult({
-      name: 'getPet',
-      successResponses: [okResponse],
-      errorResponses: [
-        {
-          contentType: 'application/json',
-          schema: { kind: 'ref', name: 'ProblemDetails' },
-          status: 200,
-        },
-      ],
-    });
-    expect(out).toContain('export type GetPetError = ProblemDetails;');
-    expect(out).toContain('): Promise<Result<GetPetResult, GetPetError>>');
-    expect(out).toContain('return __requestResult<GetPetResult, GetPetError>(');
-  });
-
-  it('falls back to `unknown` (and emits no *Error alias) when the op has no error responses', () => {
-    const out = emitResult({ name: 'getPet', successResponses: [okResponse] });
-    expect(out).not.toContain('GetPetError');
-    expect(out).toContain('): Promise<Result<GetPetResult, unknown>>');
-    expect(out).toContain('return __requestResult<GetPetResult, unknown>(');
-  });
-
-  it('unions multiple error-response body types in the *Error alias', () => {
-    const out = emitResult({
-      name: 'getPet',
-      successResponses: [okResponse],
-      errorResponses: [
-        { contentType: 'application/json', schema: { kind: 'ref', name: 'A' }, status: 200 },
-        { contentType: 'application/json', schema: { kind: 'ref', name: 'B' }, status: 200 },
-      ],
-    });
-    expect(out).toContain('export type GetPetError = A | B;');
-    expect(out).toContain('): Promise<Result<GetPetResult, GetPetError>>');
-  });
-
-  it('dedupes identical error-response body types in the *Error alias', () => {
-    const out = emitResult({
-      name: 'getPet',
-      successResponses: [okResponse],
-      errorResponses: [
-        {
-          contentType: 'application/json',
-          schema: { kind: 'ref', name: 'ProblemDetails' },
-          status: 200,
-        },
-        {
-          contentType: 'application/problem+json',
-          status: 200,
-          schema: { kind: 'ref', name: 'ProblemDetails' },
-        },
-      ],
-    });
-    expect(out).toContain('export type GetPetError = ProblemDetails;');
-    expect(out).not.toContain('ProblemDetails | ProblemDetails');
-  });
-
-  it('also applies under the service-class facade', () => {
-    const out = renderOperationsBlock(
-      [
-        operation({
-          name: 'getPet',
-          successResponses: [okResponse],
-          errorResponses: [
-            {
-              contentType: 'application/json',
-              schema: { kind: 'ref', name: 'ProblemDetails' },
-              status: 200,
-            },
-          ],
-        }),
-      ],
-      { facade: 'service-class', className: 'Client', errorMode: 'result' }
-    );
-    expect(out).toContain('export type GetPetError = ProblemDetails;');
-    expect(out).toContain('): Promise<Result<GetPetResult, GetPetError>>');
-    expect(out).toContain('return __requestResult<GetPetResult, GetPetError>(');
-  });
-
-  it('throw mode (no errorMode) is unchanged: no Result, no *Error, still __request<…>', () => {
-    const out = renderOperationsBlock(
-      [
-        operation({
-          name: 'getPet',
-          successResponses: [okResponse],
-          errorResponses: [
-            {
-              contentType: 'application/json',
-              schema: { kind: 'ref', name: 'ProblemDetails' },
-              status: 200,
-            },
-          ],
-        }),
-      ],
-      { facade: 'functions', className: 'Client', argsStyle: 'flat' }
-    );
-    expect(out).toContain('): Promise<Pet>');
-    expect(out).toContain('return __request<Pet>(');
-    expect(out).not.toContain('Result<');
-    expect(out).not.toContain('__requestResult');
-    expect(out).not.toContain('GetPetError');
-  });
-});
-
-describe('auth — await __auth, spread headers, merge query', () => {
-  const okResponse: ResponseBodyModel = {
-    contentType: 'application/json',
-    status: 200,
-    schema: { kind: 'ref', name: 'Pet' },
-  };
-
-  it('header-auth op awaits __auth, spreads ...__a.headers, leaves the URL unchanged', () => {
-    const out = renderOperationsBlock(
-      [operation({ name: 'getPet', security: ['Bearer'], successResponses: [okResponse] })],
-      { facade: 'functions', className: 'Client', argsStyle: 'flat', queryAuthKeys: new Set() }
-    );
-    expect(out).toContain('const __a = await __auth(["Bearer"], __config);');
-    expect(out).toContain('...__a.headers');
-    expect(out).not.toContain('...__auth(');
-    // No query param + no query auth ⇒ URL call has no third arg.
-    expect(out).toContain('__buildUrl(__config, `/p`)');
-    expect(out).not.toContain('__a.query');
-  });
-
-  it('query-auth op with a query param merges { ...params, ...__a.query } into __buildUrl', () => {
-    const out = renderOperationsBlock(
-      [
-        operation({
-          name: 'listPets',
-          security: ['QueryKey'],
-          queryParams: [param('limit', 'query', false)],
-        }),
-      ],
-      {
-        facade: 'functions',
-        className: 'Client',
-        argsStyle: 'flat',
-        queryAuthKeys: new Set(['QueryKey']),
-      }
-    );
-    expect(out).toContain('const __a = await __auth(["QueryKey"], __config);');
-    expect(out).toContain('__buildUrl(__config, `/p`, { ...params, ...__a.query })');
-  });
-
-  it('query-auth op with no query param passes { ...__a.query } as the third arg', () => {
-    const out = renderOperationsBlock([operation({ name: 'listPets', security: ['QueryKey'] })], {
-      facade: 'functions',
-      className: 'Client',
-      argsStyle: 'flat',
-      queryAuthKeys: new Set(['QueryKey']),
-    });
-    expect(out).toContain('__buildUrl(__config, `/p`, { ...__a.query })');
-  });
-
-  it('grouped args-style merges via vars.params: { ...vars.params, ...__a.query } / { ...__a.query }', () => {
-    const withQuery = renderOperationsBlock(
-      [
-        operation({
-          name: 'listPets',
-          security: ['QueryKey'],
-          queryParams: [param('limit', 'query', false)],
-        }),
-      ],
-      {
-        facade: 'functions',
-        className: 'Client',
-        argsStyle: 'grouped',
-        queryAuthKeys: new Set(['QueryKey']),
-      }
-    );
-    expect(withQuery).toContain('__buildUrl(__config, `/p`, { ...vars.params, ...__a.query })');
-
-    const noQuery = renderOperationsBlock(
-      [operation({ name: 'listPets', security: ['QueryKey'] })],
-      {
-        facade: 'functions',
-        className: 'Client',
-        argsStyle: 'grouped',
-        queryAuthKeys: new Set(['QueryKey']),
-      }
-    );
-    expect(noQuery).toContain('__buildUrl(__config, `/p`, { ...__a.query })');
-  });
-
-  it('composes with errorMode: result — awaits __auth then calls __requestResult', () => {
-    const out = renderOperationsBlock(
-      [
-        operation({
-          name: 'getPet',
-          security: ['Bearer'],
-          successResponses: [okResponse],
-          errorResponses: [
-            {
-              contentType: 'application/json',
-              schema: { kind: 'ref', name: 'ProblemDetails' },
-              status: 200,
-            },
-          ],
-        }),
-      ],
-      {
-        facade: 'functions',
-        className: 'Client',
-        argsStyle: 'flat',
-        errorMode: 'result',
-        queryAuthKeys: new Set(),
-      }
-    );
-    expect(out).toContain('const __a = await __auth(["Bearer"], __config);');
-    expect(out).toContain('...__a.headers');
-    expect(out).toContain('return __requestResult<GetPetResult, GetPetError>(');
-  });
-
-  it('service-class authed method indents the const __a line correctly', () => {
-    const out = renderOperationsBlock(
-      [operation({ name: 'getPet', security: ['Bearer'], successResponses: [okResponse] })],
-      { facade: 'service-class', className: 'Client', queryAuthKeys: new Set() }
-    );
-    // Method body lives one indent level deeper than the function form (4 spaces).
-    expect(out).toContain('    const __a = await __auth(["Bearer"], this.config);');
-    expect(out).toContain('...__a.headers');
-  });
-
-  it('non-authed op emits no __a/__auth and threads the plain runtime call', () => {
-    const out = renderOperationsBlock([operation({ name: 'op' })], {
-      facade: 'functions',
-      className: 'Client',
-      argsStyle: 'flat',
-      queryAuthKeys: new Set(),
-    });
-    expect(out).not.toContain('__a');
-    expect(out).not.toContain('__auth');
-    expect(out).toContain(
-      'return __request<void>(__config, { id: "op", path: "/p", tags: [] }, __buildUrl(__config, `/p`), { method: "GET", ...init }, undefined, "void");'
-    );
-  });
-});
+    { errorMode: 'result' }
+  );
+}
 
-describe('renderOperation — argument-list permutations', () => {
-  it('renders an operation with no params, no body, no responses → returns Promise<void>', () => {
+describe('flat sugar — argument-list permutations (renderArgList)', () => {
+  it('renders an operation with no inputs: only the trailing init, forwarding empty args', () => {
     const out = emitWithOp({});
-    expect(out).toContain('export async function op(');
-    expect(out).toContain('init: RequestOptions = {}');
-    expect(out).toContain('): Promise<void>');
-    expect(out).toContain('{ method: "GET", ...init }');
-    expect(out).toContain('"void"');
+    expect(out).toContain('export const op = (init: RequestOptions = {}) => client.op({}, init);');
   });
 
   it('orders path params by their position in the URL template, not in pathParams[]', () => {
     const out = emitWithOp({
+      name: 'getNested',
       path: '/x/{first}/y/{second}',
       pathParams: [
         param('second', 'path', true, { kind: 'scalar', scalar: 'number' }),
         param('first', 'path', true, { kind: 'scalar', scalar: 'string' }),
       ],
     });
-    const argLine = out.split('\n').find((l) => l.includes('first: string')) ?? '';
-    expect(argLine).toMatch(/first: string/);
-    expect(out.indexOf('first: string')).toBeLessThan(out.indexOf('second: number'));
+    expect(out).toContain(
+      'export const getNested = (first: string, second: number, init: RequestOptions = {}) => client.getNested({ first, second }, init);'
+    );
   });
 
   it('skips path params that are declared but missing from the URL template', () => {
-    const out = emitWithOp({
-      path: '/x',
-      pathParams: [param('ghost', 'path', true)],
-    });
+    const out = emitWithOp({ path: '/x', pathParams: [param('ghost', 'path', true)] });
     expect(out).not.toContain('ghost: string');
   });
 
-  it('leaves a path template variable with no matching declared pathParam as a literal', () => {
-    // Template references {missing} but the operation declares no path param for it.
-    const out = emitWithOp({ path: '/x/{missing}', pathParams: [] });
-    expect(out).not.toContain('missing:');
-    // No substitution: emitting `encodeURIComponent(String(missing))` would
-    // reference an undeclared variable and break the generated client. The
-    // segment is left literal instead.
-    expect(out).not.toContain('encodeURIComponent(String(missing))');
-    expect(out).toContain('`/x/{missing}`');
-  });
-
-  it('sanitizes a non-identifier path param name into a safe argument + URL ref', () => {
-    // `pet-id` is a legal OpenAPI name but not a usable JS identifier.
+  it('sanitizes a non-identifier path param name into a safe argument, keyed by wire name', () => {
     const out = emitWithOp({
+      name: 'getPet',
       path: '/pets/{pet-id}',
       pathParams: [param('pet-id', 'path', true)],
     });
-    expect(out).toContain('pet_id: string');
-    expect(out).toContain('${encodeURIComponent(String(pet_id))}');
-    // The quoted form (which would be a syntax error as a parameter) is gone.
-    expect(out).not.toContain('"pet-id": string');
-  });
-
-  it('prefixes a digit-leading path param name with `_`', () => {
-    const out = emitWithOp({
-      path: '/x/{2fa}',
-      pathParams: [param('2fa', 'path', true)],
-    });
-    expect(out).toContain('_2fa: string');
-    expect(out).toContain('${encodeURIComponent(String(_2fa))}');
+    expect(out).toContain(
+      'export const getPet = (pet_id: string, init: RequestOptions = {}) => client.getPet({ "pet-id": pet_id }, init);'
+    );
   });
 
-  it('prefixes a reserved-word path param name with `_`', () => {
-    const out = emitWithOp({
-      path: '/x/{new}',
-      pathParams: [param('new', 'path', true)],
-    });
-    expect(out).toContain('_new: string');
-    expect(out).toContain('${encodeURIComponent(String(_new))}');
+  it('prefixes digit-leading and reserved-word path param names with `_`', () => {
+    expect(emitWithOp({ path: '/x/{2fa}', pathParams: [param('2fa', 'path', true)] })).toContain(
+      '_2fa: string'
+    );
+    expect(emitWithOp({ path: '/x/{new}', pathParams: [param('new', 'path', true)] })).toContain(
+      '_new: string'
+    );
   });
 
   it('disambiguates path param names that sanitize to the same identifier', () => {
@@ -708,1207 +67,379 @@ describe('renderOperation — argument-list permutations', () => {
       path: '/x/{a-b}/{a.b}',
       pathParams: [param('a-b', 'path', true), param('a.b', 'path', true)],
     });
-    // First wins the base name; the colliding second gets a numeric suffix.
-    expect(out).toContain('a_b: string');
-    expect(out).toContain('a_b_2: string');
-    expect(out).toContain('${encodeURIComponent(String(a_b))}');
-    expect(out).toContain('${encodeURIComponent(String(a_b_2))}');
-  });
-
-  it('emits `params = {}` default when all query params are optional', () => {
-    const out = emitWithOp({
-      queryParams: [param('q', 'query', false), param('r', 'query', false)],
-    });
-    expect(out).toContain('params: {');
-    // All-optional ⇒ the params object arg defaults to `= {}`.
-    expect(out).toMatch(/\} = \{\}/);
-  });
-
-  it('makes `params` required when at least one query param is required', () => {
-    const out = emitWithOp({
-      queryParams: [param('q', 'query', true), param('r', 'query', false)],
-    });
-    // Multi-line layout so per-param JSDoc fits.
-    expect(out).toMatch(/params: \{\n {4}q: string;\n {4}r\?: string;\n\}/);
-    // Required (any required prop) ⇒ no `= {}` default.
-    expect(out).not.toMatch(/params: \{[\s\S]*?\} = \{\}/);
-  });
-
-  it('passes `params` into __buildUrl when query params are present', () => {
-    const out = emitWithOp({ queryParams: [param('q', 'query', true)] });
-    expect(out).toContain('__buildUrl(__config, `/p`, params)');
-  });
-
-  it('default-styled query params get NO 4th styles arg (byte-identical)', () => {
-    // `style: form` + `explode: true` is the OpenAPI default ⇒ no spec entry.
-    const out = emitWithOp({
-      queryParams: [
-        { name: 'q', in: 'query', schema: SCALAR, required: true },
-        { name: 'r', in: 'query', schema: SCALAR, required: false, style: 'form', explode: true },
-      ],
-    });
-    // The call is byte-identical to a plain query op: no 4th styles arg.
-    expect(out).toContain('__buildUrl(__config, `/p`, params)');
-    expect(out).not.toContain('__buildUrl(__config, `/p`, params, {');
-  });
-
-  it('passes a styles spec as the 4th arg for a non-default pipeDelimited+explode:false param', () => {
-    const out = emitWithOp({
-      queryParams: [
-        {
-          name: 'tags',
-          in: 'query',
-          schema: { kind: 'array', items: SCALAR },
-          required: false,
-          style: 'pipeDelimited',
-          explode: false,
-        },
-      ],
-    });
-    expect(out).toContain(
-      '__buildUrl(__config, `/p`, params, { "tags": { style: "pipeDelimited", explode: false } })'
-    );
-  });
-
-  it('explode:false alone (default style) is non-default and emits style "form"', () => {
-    const out = emitWithOp({
-      queryParams: [
-        {
-          name: 'ids',
-          in: 'query',
-          schema: { kind: 'array', items: SCALAR },
-          required: false,
-          explode: false,
-        },
-      ],
-    });
-    expect(out).toContain(
-      '__buildUrl(__config, `/p`, params, { "ids": { style: "form", explode: false } })'
-    );
-  });
-
-  it('allowReserved:true is non-default and emits allowReserved (defaults otherwise)', () => {
-    const out = emitWithOp({
-      queryParams: [
-        { name: 'x', in: 'query', schema: SCALAR, required: false, allowReserved: true },
-      ],
-    });
-    expect(out).toContain(
-      '__buildUrl(__config, `/p`, params, { "x": { style: "form", explode: true, allowReserved: true } })'
-    );
-  });
-
-  it('omits allowReserved when false; only includes non-default params', () => {
-    const out = emitWithOp({
-      queryParams: [
-        { name: 'a', in: 'query', schema: SCALAR, required: false },
-        {
-          name: 'b',
-          in: 'query',
-          schema: { kind: 'array', items: SCALAR },
-          required: false,
-          style: 'spaceDelimited',
-          explode: false,
-          allowReserved: false,
-        },
-      ],
-    });
-    // `b` is the only non-default param; `a` is default (no entry), and
-    // `allowReserved: false` is omitted from `b`'s spec.
-    expect(out).toContain(
-      '__buildUrl(__config, `/p`, params, { "b": { style: "spaceDelimited", explode: false } })'
-    );
-    expect(out).not.toContain('"a":');
-    expect(out).not.toContain('allowReserved:');
-  });
-
-  it('explicit deepObject is non-default and emits a spec entry', () => {
-    const out = emitWithOp({
-      queryParams: [
-        {
-          name: 'filter',
-          in: 'query',
-          schema: { kind: 'object', properties: [] },
-          required: false,
-          style: 'deepObject',
-          explode: true,
-        },
-      ],
-    });
-    expect(out).toContain(
-      '__buildUrl(__config, `/p`, params, { "filter": { style: "deepObject", explode: true } })'
-    );
-  });
-
-  it('composes the styles arg with the query-auth merge as the 4th arg', () => {
-    const out = renderOperationsBlock(
-      [
-        operation({
-          name: 'listPets',
-          security: ['QueryKey'],
-          queryParams: [
-            {
-              name: 'tags',
-              in: 'query',
-              schema: { kind: 'array', items: SCALAR },
-              required: false,
-              style: 'pipeDelimited',
-              explode: false,
-            },
-          ],
-        }),
-      ],
-      {
-        facade: 'functions',
-        className: 'Client',
-        argsStyle: 'flat',
-        queryAuthKeys: new Set(['QueryKey']),
-      }
-    );
-    expect(out).toContain(
-      '__buildUrl(__config, `/p`, { ...params, ...__a.query }, { "tags": { style: "pipeDelimited", explode: false } })'
-    );
-  });
-
-  it('produces `body: T` for required JSON bodies', () => {
-    const body: RequestBodyModel = {
-      contentType: 'application/json',
-      schema: { kind: 'ref', name: 'Pet' },
-      required: true,
-    };
-    const out = emitWithOp({ requestBody: body });
-    expect(out).toContain('body: Pet');
-  });
-
-  it('produces `body?: T` for optional JSON bodies', () => {
-    const body: RequestBodyModel = {
-      contentType: 'application/json',
-      schema: SCALAR,
-      required: false,
-    };
-    const out = emitWithOp({ requestBody: body });
-    expect(out).toContain('body?: string');
-  });
-
-  it('uses raw `FormData` for a multipart body that is not a concrete object', () => {
-    // A typed object multipart body is covered in the `multipart request bodies (#5)` block;
-    // here the schema isn't an object, so the raw FormData escape hatch is kept.
-    const body: RequestBodyModel = {
-      contentType: 'multipart/form-data',
-      schema: { kind: 'unknown' },
-      required: true,
-    };
-    const out = emitWithOp({ requestBody: body });
-    expect(out).toContain('body: FormData');
-  });
-
-  it('uses `URLSearchParams` for urlencoded bodies', () => {
-    const body: RequestBodyModel = {
-      contentType: 'application/x-www-form-urlencoded',
-      schema: { kind: 'object', properties: [] },
-      required: true,
-    };
-    const out = emitWithOp({ requestBody: body });
-    expect(out).toContain('body: URLSearchParams');
-  });
-
-  it('uses `Blob | ArrayBuffer` for octet-stream bodies', () => {
-    const body: RequestBodyModel = {
-      contentType: 'application/octet-stream',
-      schema: SCALAR,
-      required: true,
-    };
-    const out = emitWithOp({ requestBody: body });
-    expect(out).toContain('body: Blob | ArrayBuffer');
-  });
-
-  it('encodes path params via encodeURIComponent in the URL template', () => {
-    const out = emitWithOp({
-      path: '/x/{id}',
-      pathParams: [param('id', 'path', true)],
-    });
-    expect(out).toContain('${encodeURIComponent(String(id))}');
-  });
-
-  it('escapes backticks and backslashes in the path template', () => {
-    const out = emitWithOp({ path: '/x/`back\\slash' });
-    // Escaped string in the template literal.
-    expect(out).toContain('`/x/\\`back\\\\slash`');
-  });
-
-  it('upper-cases the HTTP method', () => {
-    const out = emitWithOp({ method: 'patch' });
-    expect(out).toContain('{ method: "PATCH", ...init }');
-  });
-
-  it('passes only url+init+body to __request when responseKind defaults to json', () => {
-    const responseSchema: SchemaModel = { kind: 'ref', name: 'Pet' };
-    const out = emitWithOp({
-      requestBody: {
-        contentType: 'application/json',
-        schema: { kind: 'ref', name: 'PetIn' },
-        required: true,
-      },
-      successResponses: [{ contentType: 'application/json', schema: responseSchema, status: 200 }],
-    });
-    expect(out).toContain('__request<Pet>(');
-    // No explicit 'json' arg since that's the default.
-    expect(out).not.toMatch(/"json"/);
-  });
-
-  it('passes undefined as body placeholder when responseKind is non-json but there is no body', () => {
-    const out = emitWithOp({
-      successResponses: [{ contentType: 'image/png', schema: { kind: 'unknown' }, status: 200 }],
-    });
-    // Blob response → kind 'blob' → emitter inserts `undefined` as body placeholder
-    // followed by `"blob"` so positional args line up.
-    expect(out).toContain('undefined, "blob"');
-  });
-});
-
-describe("argsStyle: 'grouped' — single options object", () => {
-  function emitObj(op: Partial<OperationModel>): string {
-    return emitSingleFile(
-      apiModel({ services: [{ name: 'Default', operations: [operation(op)] }] }),
-      { argsStyle: 'grouped' }
-    );
-  }
-
-  it('takes no vars object for an operation with no inputs — only the trailing init', () => {
-    const out = emitObj({ name: 'op' });
-    expect(out).toContain('export async function op(init: RequestOptions = {})');
-    expect(out).not.toContain('vars:');
-  });
-
-  it('bundles path params into a required `vars: <Op>Variables` and references them via `vars.*`', () => {
-    const out = emitObj({
-      name: 'getPet',
-      path: '/pets/{petId}',
-      pathParams: [param('petId', 'path', true)],
-    });
-    // Required (path params are always required) ⇒ no `= {}` default.
-    expect(out).toContain('vars: GetPetVariables,');
-    expect(out).not.toContain('vars: GetPetVariables = {}');
-    expect(out).toContain('${encodeURIComponent(String(vars.petId))}');
-  });
-
-  it('sanitizes non-identifier path param names the same way, prefixed by `vars.`', () => {
-    const out = emitObj({
-      name: 'getPet',
-      path: '/pets/{pet-id}',
-      pathParams: [param('pet-id', 'path', true)],
-    });
-    expect(out).toContain('${encodeURIComponent(String(vars.pet_id))}');
-  });
-
-  it('makes `vars` optional (`= {}`) when every input is optional (query only)', () => {
-    const out = emitObj({ name: 'listPets', queryParams: [param('q', 'query', false)] });
-    expect(out).toContain('vars: ListPetsVariables = {}');
-    expect(out).toContain('__buildUrl(__config, `/p`, vars.params)');
-  });
-
-  it('makes `vars` required when a query param is required', () => {
-    const out = emitObj({ name: 'searchPets', queryParams: [param('q', 'query', true)] });
-    expect(out).toContain('vars: SearchPetsVariables,');
-    expect(out).not.toContain('vars: SearchPetsVariables = {}');
-  });
-
-  it('passes `vars.body` to __request and requires `vars` for a required body', () => {
-    const out = emitObj({
-      name: 'createPet',
-      requestBody: {
-        contentType: 'application/json',
-        schema: { kind: 'ref', name: 'Pet' },
-        required: true,
-      },
-    });
-    expect(out).toContain('vars: CreatePetVariables,');
-    expect(out).not.toContain('vars: CreatePetVariables = {}');
-    expect(out).toContain('vars.body');
-  });
-
-  it('keeps `vars` optional when the only input is an optional body', () => {
-    const out = emitObj({
-      name: 'updatePet',
-      requestBody: {
-        contentType: 'application/json',
-        schema: { kind: 'ref', name: 'PetPatch' },
-        required: false,
-      },
-    });
-    expect(out).toContain('vars: UpdatePetVariables = {}');
-    expect(out).toContain('vars.body');
-  });
-
-  it('passes `vars.headers` straight to __headers for required header params', () => {
-    const out = emitObj({ name: 'op', headerParams: [param('X-Token', 'header', true)] });
-    expect(out).toContain('...__headers(vars.headers)');
-    expect(out).toContain('vars: OpVariables,');
-    expect(out).not.toContain('vars.headers ?? {}');
-  });
-
-  it('falls back to `{}` for optional header params (which may be absent on vars)', () => {
-    const out = emitObj({ name: 'op', headerParams: [param('X-Token', 'header', false)] });
-    expect(out).toContain('...__headers(vars.headers ?? {})');
-    expect(out).toContain('vars: OpVariables = {}');
-  });
-
-  it('works with the service-class facade — methods take the same `vars` object', () => {
-    const out = renderOperationsBlock(
-      [
-        operation({
-          name: 'getPet',
-          path: '/pets/{id}',
-          pathParams: [param('id', 'path', true)],
-        }),
-      ],
-      { facade: 'service-class', className: 'Client', argsStyle: 'grouped' }
-    );
-    expect(out).toContain('async getPet(vars: GetPetVariables,');
-    expect(out).toContain('${encodeURIComponent(String(vars.id))}');
-  });
-});
-
-describe('operation type aliases (*Result / *Params / *Body / *Variables)', () => {
-  it('emits <PascalCaseOpName>Result for every operation, even the trivial void ones', () => {
-    const out = emitWithOp({ name: 'ping' });
-    expect(out).toContain('export type PingResult = void;');
-  });
-
-  it('uses the same response type the function returns', () => {
-    const out = emitWithOp({
-      name: 'getPet',
-      successResponses: [
-        {
-          contentType: 'application/json',
-          status: 200,
-          schema: { kind: 'ref', name: 'Pet' },
-        },
-      ],
-    });
-    expect(out).toContain('export type GetPetResult = Pet;');
-    // The function itself still resolves to the explicit type — aliases are emit-only,
-    // they do not rewrite the function signature.
-    expect(out).toContain('Promise<Pet>');
-  });
-
-  it('skips the *Result alias when it collides with the response schema name (self-referential)', () => {
-    // Operation `search` → `SearchResult`, returning the schema named `SearchResult`.
-    // Emitting `export type SearchResult = SearchResult;` is circular and collides with
-    // the declared schema (TS2440 / barrel TS2308). The method references the schema
-    // directly, so the alias is redundant and must be omitted.
-    const out = emitSingleFile(
-      apiModel({
-        schemas: [namedSchema('SearchResult', { kind: 'object', properties: [] })],
-        services: [
-          {
-            name: 'Default',
-            operations: [
-              operation({
-                name: 'search',
-                method: 'post',
-                successResponses: [
-                  {
-                    contentType: 'application/json',
-                    status: 200,
-                    schema: { kind: 'ref', name: 'SearchResult' },
-                  },
-                ],
-              }),
-            ],
-          },
-        ],
-      })
-    );
-    expect(out).not.toContain('export type SearchResult = SearchResult;');
-    expect(out).toContain('Promise<SearchResult>');
-    // Exactly one `SearchResult` declaration — the schema, not a colliding alias.
-    expect(out.match(/export type SearchResult\b/g)).toHaveLength(1);
-  });
-
-  it('handles unions in the result type', () => {
-    const out = emitWithOp({
-      name: 'getPhoto',
-      successResponses: [
-        { contentType: 'image/png', schema: { kind: 'unknown' }, status: 200 },
-        { contentType: 'text/plain', schema: { kind: 'unknown' }, status: 200 },
-      ],
-    });
-    expect(out).toContain('export type GetPhotoResult = Blob | string;');
-  });
-
-  it('PascalCases an operationId that starts lowercase', () => {
-    const out = emitWithOp({ name: 'listMenuItems' });
-    expect(out).toContain('export type ListMenuItemsResult');
-  });
-
-  it('leaves an already-PascalCase operationId untouched', () => {
-    const out = emitWithOp({ name: 'CreateOrder' });
-    expect(out).toContain('export type CreateOrderResult');
-  });
-
-  it('emits the *Result alias BEFORE the function so it is declared top-down', () => {
-    const out = emitWithOp({ name: 'op' });
-    const aliasIdx = out.indexOf('export type OpResult');
-    const fnIdx = out.indexOf('export async function op(');
-    expect(aliasIdx).toBeGreaterThanOrEqual(0);
-    expect(fnIdx).toBeGreaterThanOrEqual(0);
-    expect(aliasIdx).toBeLessThan(fnIdx);
-  });
-
-  it('emits *Params for operations that have query params', () => {
-    const out = emitWithOp({
-      name: 'listPets',
-      queryParams: [
-        param('limit', 'query', false, { kind: 'scalar', scalar: 'integer' }),
-        param('cursor', 'query', false, SCALAR),
-      ],
-    });
-    expect(out).toContain('export type ListPetsParams =');
-    expect(out).toMatch(
-      /export type ListPetsParams = \{[\s\S]*?limit\?: number;[\s\S]*?cursor\?: string;[\s\S]*?\};/
-    );
-  });
-
-  it('omits *Params for operations with no query params', () => {
-    const out = emitWithOp({ name: 'ping' });
-    expect(out).not.toContain('PingParams');
-  });
-
-  it('carries the same per-prop JSDoc tags into the *Params alias as C6.1 emits inline', () => {
-    const out = emitWithOp({
-      name: 'listPets',
-      queryParams: [
-        {
-          name: 'limit',
-          in: 'query',
-          required: false,
-          description: 'Page size.',
-          schema: {
-            kind: 'scalar',
-            scalar: 'integer',
-            metadata: { minimum: 1, maximum: 100 },
-          },
-        },
-      ],
-    });
-    // Tags + description appear inside the alias body, not just the function sig.
-    expect(out).toMatch(
-      /export type ListPetsParams = \{[\s\S]*?Page size\.[\s\S]*?@minimum 1[\s\S]*?@maximum 100[\s\S]*?limit\?: number;[\s\S]*?\};/
-    );
-  });
-
-  it('marks the *Params alias optionality per-prop, independent of any function-sig default', () => {
-    const out = emitWithOp({
-      name: 'listPets',
-      queryParams: [param('required', 'query', true), param('optional', 'query', false)],
-    });
-    expect(out).toMatch(
-      /export type ListPetsParams = \{[\s\S]*required: string;[\s\S]*optional\?: string;[\s\S]*\};/
-    );
-  });
-
-  it('emits *Body for operations that have a JSON request body', () => {
-    const out = emitWithOp({
-      name: 'createPet',
-      requestBody: {
-        contentType: 'application/json',
-        schema: { kind: 'ref', name: 'Pet' },
-        required: true,
-      },
-    });
-    expect(out).toContain('export type CreatePetBody = Pet;');
-  });
-
-  it('emits *Body using the same content-type mapping as the function signature', () => {
-    const out = emitWithOp({
-      name: 'uploadPhoto',
-      requestBody: {
-        contentType: 'multipart/form-data',
-        schema: { kind: 'unknown' },
-        required: true,
-      },
-    });
-    expect(out).toContain('export type UploadPhotoBody = FormData;');
-  });
-
-  it('emits *Body as `URLSearchParams` for urlencoded bodies', () => {
-    const out = emitWithOp({
-      name: 'submitForm',
-      requestBody: {
-        contentType: 'application/x-www-form-urlencoded',
-        schema: { kind: 'object', properties: [] },
-        required: true,
-      },
-    });
-    expect(out).toContain('export type SubmitFormBody = URLSearchParams;');
-  });
-
-  it('omits *Body for operations with no request body', () => {
-    const out = emitWithOp({ name: 'ping' });
-    expect(out).not.toContain('PingBody');
-  });
-
-  it('omits *Variables entirely for operations with no inputs', () => {
-    const out = emitWithOp({ name: 'ping' });
-    expect(out).not.toContain('PingVariables');
-  });
-
-  it('emits *Variables with path params as required properties (path templating requires them)', () => {
-    const out = emitWithOp({
-      name: 'getPet',
-      path: '/pets/{petId}',
-      pathParams: [param('petId', 'path', true)],
-    });
-    expect(out).toMatch(/export type GetPetVariables = \{[\s\S]*petId: string;[\s\S]*\};/);
-  });
-
-  it('orders path-param props in URL-template order (not pathParams[] insertion order)', () => {
-    const out = emitWithOp({
-      name: 'getNested',
-      path: '/x/{first}/y/{second}',
-      pathParams: [
-        param('second', 'path', true, { kind: 'scalar', scalar: 'number' }),
-        param('first', 'path', true, { kind: 'scalar', scalar: 'string' }),
-      ],
-    });
-    const match = out.match(/export type GetNestedVariables = \{([\s\S]*?)\};/);
-    expect(match).not.toBeNull();
-    const body = match![1];
-    expect(body.indexOf('first:')).toBeGreaterThanOrEqual(0);
-    expect(body.indexOf('first:')).toBeLessThan(body.indexOf('second:'));
-  });
-
-  it('renders JSDoc (description + schema metadata) above path-param props in *Variables', () => {
-    const out = emitWithOp({
-      name: 'getOrder',
-      path: '/orders/{orderId}',
-      pathParams: [
-        {
-          name: 'orderId',
-          in: 'path',
-          required: true,
-          description: 'Order ID.',
-          schema: {
-            kind: 'scalar',
-            scalar: 'string',
-            metadata: { pattern: '^ord_[a-z0-9]+$' },
-          },
-        },
-      ],
-    });
-    expect(out).toMatch(
-      /export type GetOrderVariables = \{[\s\S]*Order ID\.[\s\S]*@pattern \^ord_\[a-z0-9\]\+\$[\s\S]*orderId: string;[\s\S]*\};/
-    );
-  });
-
-  it('references the *Params alias in *Variables when query params exist', () => {
-    const out = emitWithOp({
-      name: 'listPets',
-      queryParams: [param('limit', 'query', false, { kind: 'scalar', scalar: 'integer' })],
-    });
-    // `params?` (optional) because all query params are optional ⇒ function defaults to `= {}`.
-    expect(out).toMatch(
-      /export type ListPetsVariables = \{[\s\S]*params\?: ListPetsParams;[\s\S]*\};/
-    );
-  });
-
-  it('marks *Variables.params required when any query param is required', () => {
-    const out = emitWithOp({
-      name: 'searchPets',
-      queryParams: [param('q', 'query', true), param('limit', 'query', false)],
-    });
-    expect(out).toMatch(
-      /export type SearchPetsVariables = \{[\s\S]*params: SearchPetsParams;[\s\S]*\};/
-    );
-  });
-
-  it('references the *Body alias in *Variables when the op has a body', () => {
-    const out = emitWithOp({
-      name: 'createPet',
-      requestBody: {
-        contentType: 'application/json',
-        schema: { kind: 'ref', name: 'Pet' },
-        required: true,
-      },
-    });
-    expect(out).toMatch(/export type CreatePetVariables = \{[\s\S]*body: CreatePetBody;[\s\S]*\};/);
-  });
-
-  it('marks *Variables.body optional when the request body is optional', () => {
-    const out = emitWithOp({
-      name: 'updatePet',
-      requestBody: {
-        contentType: 'application/json',
-        schema: { kind: 'ref', name: 'PetPatch' },
-        required: false,
-      },
-    });
-    expect(out).toMatch(
-      /export type UpdatePetVariables = \{[\s\S]*body\?: UpdatePetBody;[\s\S]*\};/
-    );
-  });
-
-  it('combines path + params + body in *Variables in a stable order: path, params, body', () => {
-    const out = emitWithOp({
-      name: 'updateOrder',
-      path: '/orders/{orderId}',
-      pathParams: [param('orderId', 'path', true)],
-      queryParams: [param('include', 'query', false)],
-      requestBody: {
-        contentType: 'application/json',
-        schema: { kind: 'ref', name: 'Order' },
-        required: true,
-      },
-    });
-    const match = out.match(/export type UpdateOrderVariables = \{([\s\S]*?)\};/);
-    expect(match).not.toBeNull();
-    const body = match![1];
-    expect(body.indexOf('orderId')).toBeLessThan(body.indexOf('params'));
-    expect(body.indexOf('params')).toBeLessThan(body.indexOf('body'));
-  });
-
-  it('emits aliases in the order: Result, Params, Body, Variables', () => {
-    const out = emitWithOp({
-      name: 'updateOrder',
-      path: '/orders/{orderId}',
-      pathParams: [param('orderId', 'path', true)],
-      queryParams: [param('include', 'query', false)],
-      requestBody: {
-        contentType: 'application/json',
-        schema: { kind: 'ref', name: 'Order' },
-        required: true,
-      },
-      successResponses: [
-        {
-          contentType: 'application/json',
-          status: 200,
-          schema: { kind: 'ref', name: 'Order' },
-        },
-      ],
-    });
-    const order = [
-      'UpdateOrderResult',
-      'UpdateOrderParams',
-      'UpdateOrderBody',
-      'UpdateOrderVariables',
-    ].map((a) => ({ a, idx: out.indexOf(a) }));
-    for (const { a, idx } of order) {
-      expect(idx, `${a} should appear in the output`).toBeGreaterThanOrEqual(0);
-    }
-    for (let i = 1; i < order.length; i++) {
-      expect(order[i].idx, `${order[i].a} should appear after ${order[i - 1].a}`).toBeGreaterThan(
-        order[i - 1].idx
-      );
-    }
-  });
-});
-
-describe('header parameters (C6.7)', () => {
-  it('emits header params as a single `headers` object arg in the signature', () => {
-    const out = emitWithOp({
-      name: 'getThing',
-      headerParams: [param('X-Api-Version', 'header', true)],
-    });
-    expect(out).toContain('headers: {');
-    expect(out).toMatch(/"X-Api-Version": string;/);
-  });
-
-  it('makes the `headers` arg required (no `= {}`) when any header param is required', () => {
-    const out = emitWithOp({
-      name: 'getThing',
-      headerParams: [param('X-Api-Version', 'header', true)],
-    });
-    expect(out).not.toMatch(/headers: \{[\s\S]*?\} = \{\}/);
-  });
-
-  it('defaults the `headers` arg to `= {}` when all header params are optional', () => {
-    const out = emitWithOp({
-      name: 'getThing',
-      headerParams: [param('X-Trace', 'header', false)],
-    });
-    expect(out).toMatch(/headers: \{[\s\S]*?\} = \{\}/);
-    expect(out).toMatch(/"X-Trace"\?: string;/);
-  });
-
-  it('omits the `headers` arg entirely for operations with no header params', () => {
-    const out = emitWithOp({ name: 'ping' });
-    expect(out).not.toContain('headers: {');
-  });
-
-  it('injects header params into the request, with caller init.headers winning', () => {
-    const out = emitWithOp({
-      name: 'getThing',
-      headerParams: [param('X-Api-Version', 'header', true)],
-    });
-    // Generated header values come first, caller-supplied init.headers spread last (wins).
-    expect(out).toMatch(
-      /headers: \{ \.\.\.__headers\(headers\), \.\.\.init\.headers as Record<string, string> \| undefined \}/
-    );
-  });
-
-  it('emits the __headers runtime helper when any operation has header params', () => {
-    const out = emitWithOp({
-      name: 'getThing',
-      headerParams: [param('X-Api-Version', 'header', true)],
-    });
-    expect(out).toContain('function __headers(');
-  });
-
-  it('renders per-prop JSDoc (description + metadata) on header params', () => {
-    const out = emitWithOp({
-      name: 'getThing',
-      headerParams: [
-        {
-          name: 'X-Api-Version',
-          in: 'header',
-          required: true,
-          description: 'API version pin.',
-          schema: {
-            kind: 'scalar',
-            scalar: 'string',
-            metadata: { pattern: '^v\\d+$' },
-          },
-        },
-      ],
-    });
-    expect(out).toMatch(
-      /API version pin\.[\s\S]*@pattern \^v\\d\+\$[\s\S]*"X-Api-Version": string;/
-    );
-  });
-
-  it('emits a *Headers alias and a headers prop in *Variables', () => {
-    const out = emitWithOp({
-      name: 'getThing',
-      headerParams: [param('X-Api-Version', 'header', true)],
-    });
-    expect(out).toContain('export type GetThingHeaders =');
-    expect(out).toMatch(
-      /export type GetThingVariables = \{[\s\S]*headers: GetThingHeaders;[\s\S]*\};/
-    );
-  });
-
-  it('marks *Variables.headers optional when all header params are optional', () => {
-    const out = emitWithOp({
-      name: 'getThing',
-      headerParams: [param('X-Trace', 'header', false)],
-    });
-    expect(out).toMatch(
-      /export type GetThingVariables = \{[\s\S]*headers\?: GetThingHeaders;[\s\S]*\};/
-    );
-  });
-});
-
-describe('JSDoc on query-param object', () => {
-  it('renders each param on its own line so JSDoc can hang above it', () => {
-    const out = emitWithOp({
-      queryParams: [param('q', 'query', true), param('r', 'query', false)],
-    });
-    expect(out).toMatch(/params: \{\n {4}q: string;\n {4}r\?: string;\n\}/);
-  });
-
-  it('emits JSDoc tags from query param schema metadata', () => {
-    const out = emitWithOp({
-      queryParams: [
-        {
-          name: 'limit',
-          in: 'query',
-          required: false,
-          schema: {
-            kind: 'scalar',
-            scalar: 'integer',
-            metadata: { minimum: 1, maximum: 100 },
-          },
-        },
-      ],
-    });
-    expect(out).toContain('@minimum 1');
-    expect(out).toContain('@maximum 100');
-  });
-
-  it('emits a single-line JSDoc with the param description', () => {
-    const out = emitWithOp({
-      queryParams: [
-        {
-          name: 'q',
-          in: 'query',
-          required: false,
-          description: 'Free-text search.',
-          schema: SCALAR,
-        },
-      ],
-    });
-    expect(out).toMatch(/\/\*\*\n {5}\* Free-text search\.\n {5}\*\/\n {4}q\?: string;/);
+    expect(out).toContain('a_b: string');
+    expect(out).toContain('a_b_2: string');
   });
 
-  it('combines the param description and the schema metadata in one block', () => {
+  it('emits `params = {}` default when all query params are optional', () => {
     const out = emitWithOp({
-      queryParams: [
-        {
-          name: 'limit',
-          in: 'query',
-          required: false,
-          description: 'Page size.',
-          schema: {
-            kind: 'scalar',
-            scalar: 'integer',
-            metadata: { minimum: 1, maximum: 100 },
-          },
-        },
-      ],
+      queryParams: [param('q', 'query', false), param('r', 'query', false)],
     });
-    expect(out).toMatch(/Page size\.[\s\S]*@minimum 1[\s\S]*@maximum 100/);
+    expect(out).toMatch(/params: \{\n {4}q\?: string;\n {4}r\?: string;\n\} = \{\}/);
   });
 
-  it('omits the JSDoc block for a bare query param with no description and no metadata', () => {
+  it('makes `params` required when at least one query param is required', () => {
     const out = emitWithOp({
-      queryParams: [param('q', 'query', false)],
+      queryParams: [param('q', 'query', true), param('r', 'query', false)],
     });
-    // Param line is present, but no `/**` directly before it.
-    expect(out).toMatch(/\n {4}q\?: string;/);
-    expect(out).not.toMatch(/\/\*\*[^/]*\*\/\n {4}q\?: string;/);
+    expect(out).toMatch(/params: \{\n {4}q: string;\n {4}r\?: string;\n\}, init/);
   });
-});
 
-describe('JSDoc on operations', () => {
-  it('emits nothing when there is no summary or description', () => {
-    const out = emitWithOp({});
-    // No JSDoc immediately before the `export async function op` line.
-    expect(out).not.toMatch(/\*\/\nexport async function op\(/);
+  it('produces `body: T` for required JSON bodies and `body?: T` for optional ones', () => {
+    const required: RequestBodyModel = {
+      contentType: 'application/json',
+      schema: { kind: 'ref', name: 'Pet' },
+      required: true,
+    };
+    expect(emitWithOp({ requestBody: required })).toContain('body: Pet');
+    const optional: RequestBodyModel = {
+      contentType: 'application/json',
+      schema: SCALAR,
+      required: false,
+    };
+    expect(emitWithOp({ requestBody: optional })).toContain('body?: string');
   });
 
-  it('emits a JSDoc block when only summary is present', () => {
-    const out = emitWithOp({ summary: 'one liner' });
-    expect(out).toContain('/**\n * one liner\n */');
+  it('uses raw `FormData` for a non-object multipart body', () => {
+    const body: RequestBodyModel = {
+      contentType: 'multipart/form-data',
+      schema: { kind: 'unknown' },
+      required: true,
+    };
+    expect(emitWithOp({ requestBody: body })).toContain('body: FormData');
   });
 
-  it('emits block JSDoc when description spans multiple lines', () => {
-    const out = emitWithOp({ description: 'first\nsecond' });
-    expect(out).toContain('/**\n * first\n * second\n */');
+  it('uses `URLSearchParams` for urlencoded bodies', () => {
+    const body: RequestBodyModel = {
+      contentType: 'application/x-www-form-urlencoded',
+      schema: { kind: 'object', properties: [] },
+      required: true,
+    };
+    expect(emitWithOp({ requestBody: body })).toContain('body: URLSearchParams');
   });
 
-  it('inserts a blank line between summary and description', () => {
-    const out = emitWithOp({ summary: 'sum', description: 'more details' });
-    // The intermediate empty line renders as a bare ` *` (trailing space stripped).
-    expect(out).toMatch(/\/\*\*\n \* sum\n \*\n \* more details\n \*\//);
+  it('uses `Blob | ArrayBuffer` for octet-stream bodies', () => {
+    const body: RequestBodyModel = {
+      contentType: 'application/octet-stream',
+      schema: SCALAR,
+      required: true,
+    };
+    expect(emitWithOp({ requestBody: body })).toContain('body: Blob | ArrayBuffer');
   });
 
-  it('trims trailing blank lines so the block has no dangling ` *`', () => {
-    const out = emitWithOp({ description: 'details\n' });
-    expect(out).toContain('/**\n * details\n */');
-    expect(out).not.toMatch(/\* details\n \*\n \*\//);
+  it('emits header params as a typed `headers` slot, forwarded to the client method', () => {
+    const out = emitWithOp({
+      name: 'getThing',
+      headerParams: [param('X-Api-Version', 'header', true)],
+    });
+    expect(out).toMatch(/headers: \{\n {4}"X-Api-Version": string;\n\}, init/);
+    expect(out).toContain('=> client.getThing({ headers }, init);');
   });
-});
 
-describe('computeResponse — response type discovery', () => {
-  it('void when there are no responses', () => {
-    const out = emitWithOp({});
-    expect(out).toContain('Promise<void>');
+  it('defaults the `headers` slot to `= {}` when all header params are optional', () => {
+    const out = emitWithOp({
+      name: 'getThing',
+      headerParams: [param('X-Trace', 'header', false)],
+    });
+    expect(out).toMatch(/headers: \{\n {4}"X-Trace"\?: string;\n\} = \{\}/);
   });
 
-  it('JSON: uses the schema directly', () => {
+  it('renders per-param JSDoc (description + schema metadata) above sugar params', () => {
     const out = emitWithOp({
-      successResponses: [
+      name: 'listPets',
+      queryParams: [
         {
-          contentType: 'application/json',
-          status: 200,
-          schema: { kind: 'ref', name: 'Pet' },
+          name: 'limit',
+          in: 'query',
+          required: false,
+          description: 'Page size.',
+          schema: { kind: 'scalar', scalar: 'integer', metadata: { minimum: 1, maximum: 100 } },
         },
       ],
     });
-    expect(out).toContain('Promise<Pet>');
+    expect(out).toMatch(/Page size\.[\s\S]*@minimum 1[\s\S]*@maximum 100[\s\S]*limit\?: number;/);
   });
 
-  it('Binary-only responses → Blob and responseKind=blob', () => {
-    const out = emitWithOp({
-      successResponses: [{ contentType: 'image/png', schema: { kind: 'unknown' }, status: 200 }],
-    });
-    expect(out).toContain('Promise<Blob>');
-    expect(out).toContain('"blob"');
+  it('the SSE sugar takes `SseOptions`; regular ops take `RequestOptions`', () => {
+    const out = emitClientSingleFile(
+      apiModel({
+        services: [
+          {
+            name: 'Default',
+            operations: [
+              operation({
+                name: 'streamMessages',
+                path: '/stream',
+                successResponses: [
+                  { contentType: 'text/event-stream', status: 200, schema: { kind: 'unknown' } },
+                ],
+              }),
+              operation({ name: 'listThings', path: '/things' }),
+            ],
+          },
+        ],
+      })
+    );
+    expect(out).toContain(
+      'export const streamMessages = (init: SseOptions = {}) => client.streamMessages({}, init);'
+    );
+    expect(out).toContain(
+      'export const listThings = (init: RequestOptions = {}) => client.listThings({}, init);'
+    );
   });
+});
 
-  it('Text-only responses → string and responseKind=text', () => {
-    const out = emitWithOp({
-      successResponses: [{ contentType: 'text/plain', schema: { kind: 'unknown' }, status: 200 }],
-    });
-    expect(out).toContain('Promise<string>');
-    expect(out).toContain('"text"');
+describe('operation type aliases (*Result / *Params / *Body / *Headers / *Variables)', () => {
+  it('emits <PascalCaseOpName>Result for every operation, even the trivial void ones', () => {
+    expect(emitWithOp({ name: 'ping' })).toContain('export type PingResult = void;');
   });
 
-  it('Mixed binary + text responses pick blob (hasBinary wins) and dedupe types', () => {
+  it('uses the response type and PascalCases a lowercase operationId', () => {
     const out = emitWithOp({
+      name: 'getPet',
       successResponses: [
-        { contentType: 'image/png', schema: { kind: 'unknown' }, status: 200 },
-        { contentType: 'text/plain', schema: { kind: 'unknown' }, status: 200 },
+        { contentType: 'application/json', status: 200, schema: { kind: 'ref', name: 'Pet' } },
       ],
     });
-    expect(out).toContain('Promise<Blob | string>');
-    expect(out).toContain('"blob"');
+    expect(out).toContain('export type GetPetResult = Pet;');
   });
 
-  it('dedupes identical non-json response types into a single Blob', () => {
+  it('emits *Params/*Body/*Headers/*Variables per input kind, in a stable order', () => {
     const out = emitWithOp({
+      name: 'updateOrder',
+      path: '/orders/{orderId}',
+      pathParams: [param('orderId', 'path', true)],
+      queryParams: [param('include', 'query', false)],
+      headerParams: [param('X-Trace', 'header', false)],
+      requestBody: {
+        contentType: 'application/json',
+        schema: { kind: 'ref', name: 'Order' },
+        required: true,
+      },
       successResponses: [
-        { contentType: 'image/png', schema: { kind: 'unknown' }, status: 200 },
-        { contentType: 'image/jpeg', schema: { kind: 'unknown' }, status: 200 },
+        { contentType: 'application/json', status: 200, schema: { kind: 'ref', name: 'Order' } },
       ],
     });
-    // Both binary content types collapse to one `Blob` (no `Blob | Blob`).
-    expect(out).toContain('Promise<Blob>');
-    expect(out).not.toContain('Blob | Blob');
-    expect(out).toContain('"blob"');
+    const names = [
+      'UpdateOrderResult',
+      'UpdateOrderParams',
+      'UpdateOrderBody',
+      'UpdateOrderHeaders',
+      'UpdateOrderVariables',
+    ];
+    let last = -1;
+    for (const name of names) {
+      const idx = out.indexOf(`export type ${name}`);
+      expect(idx, `${name} should appear after its predecessor`).toBeGreaterThan(last);
+      last = idx;
+    }
+    expect(out).toMatch(
+      /export type UpdateOrderVariables = \{[\s\S]*orderId: string;[\s\S]*params\?: UpdateOrderParams;[\s\S]*body: UpdateOrderBody;[\s\S]*headers\?: UpdateOrderHeaders;[\s\S]*\};/
+    );
   });
 
-  it('Non-json/non-binary/non-text responses fall back to renderSchema with responseKind=json', () => {
-    const out = emitWithOp({
-      successResponses: [
-        {
-          contentType: 'application/xml',
-          status: 200,
-          schema: { kind: 'ref', name: 'XmlBody' },
-        },
-      ],
-    });
-    expect(out).toContain('Promise<XmlBody>');
-    // responseKind is 'json' (default) because hasBinary && hasText were both false.
-    expect(out).not.toContain('"blob"');
-    expect(out).not.toContain('"text"');
+  it('omits *Params/*Body/*Variables for operations without those inputs', () => {
+    const out = emitWithOp({ name: 'ping' });
+    expect(out).not.toContain('PingParams');
+    expect(out).not.toContain('PingBody');
+    expect(out).not.toContain('PingVariables');
   });
 
-  it('Picks JSON when both JSON and non-JSON content types coexist', () => {
+  it('types a typed multipart body as an object (binary→Blob), not FormData', () => {
     const out = emitWithOp({
-      successResponses: [
-        { contentType: 'application/xml', schema: { kind: 'ref', name: 'X' }, status: 200 },
-        { contentType: 'application/json', schema: { kind: 'ref', name: 'J' }, status: 200 },
-      ],
+      name: 'upload',
+      method: 'post',
+      requestBody: {
+        contentType: 'multipart/form-data',
+        required: true,
+        schema: {
+          kind: 'object',
+          properties: [
+            {
+              name: 'file',
+              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'binary' } },
+              required: true,
+            },
+          ],
+        },
+      },
     });
-    expect(out).toContain('Promise<J>');
+    expect(out).toContain('export type UploadBody = {');
+    expect(out).toContain('file: Blob;');
+    expect(out).not.toContain('UploadBody = FormData');
   });
 });
 
-describe('emitOperations — multiple operations', () => {
-  it('renders each operation across services', () => {
-    const op1 = operation({ name: 'a', path: '/a' });
-    const op2 = operation({ name: 'b', path: '/b' });
-    const op3 = operation({ name: 'c', path: '/c' });
-    const out = emitSingleFile(
+describe('<Op>* alias collision suppression', () => {
+  it('suppresses the *Result alias when it collides with the response schema name', () => {
+    const out = emitClientSingleFile(
       apiModel({
+        schemas: [namedSchema('SearchResult', { kind: 'object', properties: [] })],
         services: [
-          { name: 'S1', operations: [op1, op2] },
-          { name: 'S2', operations: [op3] },
+          {
+            name: 'Default',
+            operations: [
+              operation({
+                name: 'search',
+                method: 'post',
+                successResponses: [
+                  {
+                    contentType: 'application/json',
+                    status: 200,
+                    schema: { kind: 'ref', name: 'SearchResult' },
+                  },
+                ],
+              }),
+            ],
+          },
         ],
       })
     );
-    expect(out).toContain('export async function a(');
-    expect(out).toContain('export async function b(');
-    expect(out).toContain('export async function c(');
+    expect(out).not.toContain('export type SearchResult = SearchResult;');
+    // Exactly one `SearchResult` declaration — the schema, not a colliding alias.
+    expect(out.match(/export type SearchResult\b/g)).toHaveLength(1);
+    // The Ops member references the schema type directly.
+    expect(out).toContain('result: SearchResult;');
   });
-});
 
-describe('response argument layout in __request', () => {
-  it('emits body placeholder + responseKind together when both bodyVar exists and responseKind is non-json', () => {
-    const out = emitWithOp({
-      requestBody: {
-        contentType: 'application/json',
-        schema: SCALAR,
-        required: true,
+  it('suppresses *Error and references the error schema directly in result mode', () => {
+    const out = emitResult(
+      {
+        name: 'login',
+        method: 'post',
+        successResponses: [
+          {
+            contentType: 'application/json',
+            status: 200,
+            schema: { kind: 'ref', name: 'Session' },
+          },
+        ],
+        errorResponses: [
+          {
+            contentType: 'application/json',
+            status: 400,
+            schema: { kind: 'ref', name: 'Problem' },
+          },
+        ],
       },
-      successResponses: [{ contentType: 'image/png', schema: { kind: 'unknown' }, status: 200 }],
-    });
-    // Should have: config, url, init, body, "blob"
-    expect(out).toContain('body, "blob"');
-  });
-});
-
-describe('responses ignored details', () => {
-  // Belt-and-braces test to keep ResponseBodyModel non-trivial parsing exercised.
-  it('preserves a textual response schema when content-type is text/*', () => {
-    const resp: ResponseBodyModel = {
-      contentType: 'text/plain',
-      status: 200,
-      schema: { kind: 'unknown' },
-    };
-    const out = emitWithOp({ successResponses: [resp] });
-    expect(out).toContain('Promise<string>');
+      ['Session', 'Problem', 'LoginError']
+    );
+    // `LoginError` names the SCHEMA type only — no `<Op>Error` alias shadows it.
+    expect(out).not.toContain('export type LoginError = Problem');
+    expect(out).toContain('Result<LoginResult, Problem>');
   });
 });
 
-describe('SSE — async generators + sse aggregate', () => {
-  const sseResponse: ResponseBodyModel = {
-    contentType: 'text/event-stream',
+describe("errorMode: 'result' — typed error aliases", () => {
+  const okResponse = {
+    contentType: 'application/json',
     status: 200,
-    schema: { kind: 'unknown' },
-    itemSchema: { kind: 'ref', name: 'Message' },
-  };
-
-  function sseOp(over: Partial<OperationModel> = {}): OperationModel {
-    return operation({
-      name: 'streamMessages',
-      path: '/messages',
-      queryParams: [param('after', 'query', false)],
-      successResponses: [sseResponse],
-      ...over,
-    });
-  }
+    schema: { kind: 'ref', name: 'Pet' },
+  } as const;
 
-  it('functions facade: emits a NON-exported async generator + a `sse` aggregate', () => {
-    const out = renderOperationsBlock(
-      [sseOp(), operation({ name: 'listThings', path: '/things' })],
+  it('emits a *Error alias and wraps the Ops result when the op declares an error response', () => {
+    const out = emitResult(
       {
-        facade: 'functions',
-        className: 'Ignored',
-      }
+        name: 'getPet',
+        successResponses: [okResponse],
+        errorResponses: [
+          {
+            contentType: 'application/json',
+            status: 400,
+            schema: { kind: 'ref', name: 'Problem' },
+          },
+        ],
+      },
+      ['Pet', 'Problem']
     );
-    expect(out).toContain('async function* streamMessages(');
-    // The generator is not individually exported — only the aggregate is.
-    expect(out).not.toContain('export async function* streamMessages');
-    expect(out).toContain('yield* __sse<Message>');
-    expect(out).toContain(', "json");');
-    expect(out).toContain('export const sse = { streamMessages };');
-    // The regular op is still its own export, and is NOT in the sse object.
-    expect(out).toContain('export async function listThings(');
-    expect(out).not.toContain('sse = { streamMessages, listThings }');
+    expect(out).toContain('export type GetPetError = Problem;');
+    expect(out).toContain('result: Result<GetPetResult, GetPetError>;');
   });
 
-  it('functions facade: a string-event SSE op streams ServerSentEvent<string> via __sse<string> + text', () => {
-    const out = renderOperationsBlock(
-      [
-        sseOp({
-          successResponses: [
-            { contentType: 'text/event-stream', schema: { kind: 'unknown' }, status: 200 },
-          ],
-        }),
-      ],
-      { facade: 'functions', className: 'C' }
-    );
-    expect(out).toContain('yield* __sse<string>');
-    expect(out).toContain(', "text");');
-    expect(out).toContain('AsyncGenerator<ServerSentEvent<string>>');
+  it('falls back to `unknown` (and emits no *Error alias) when the op has no error responses', () => {
+    const out = emitResult({ name: 'getPet', successResponses: [okResponse] }, ['Pet']);
+    expect(out).not.toContain('GetPetError');
+    expect(out).toContain('result: Result<GetPetResult, unknown>;');
   });
 
-  it('the SSE op trailing init param is `SseOptions`; regular ops stay `RequestOptions`', () => {
-    const out = renderOperationsBlock(
-      [sseOp(), operation({ name: 'listThings', path: '/things' })],
+  it('unions and dedupes error-response body types in the *Error alias', () => {
+    const out = emitResult(
       {
-        facade: 'functions',
-        className: 'C',
-      }
+        name: 'getPet',
+        successResponses: [okResponse],
+        errorResponses: [
+          { contentType: 'application/json', status: 400, schema: { kind: 'ref', name: 'A' } },
+          { contentType: 'application/json', status: 500, schema: { kind: 'ref', name: 'B' } },
+          {
+            contentType: 'application/problem+json',
+            status: 502,
+            schema: { kind: 'ref', name: 'B' },
+          },
+        ],
+      },
+      ['Pet', 'A', 'B']
     );
-    expect(out).toContain('init: SseOptions');
-    expect(out).toContain('init: RequestOptions');
-  });
-
-  it('the SSE op exposes its input aliases but NOT a *Result alias', () => {
-    const out = renderOperationsBlock([sseOp()], { facade: 'functions', className: 'C' });
-    expect(out).toContain('export type StreamMessagesParams');
-    expect(out).not.toContain('StreamMessagesResult');
-  });
-
-  it('an authed SSE op awaits __auth before delegating to __sse, and merges __a.query/headers', () => {
-    const out = renderOperationsBlock([sseOp({ security: ['QueryKey'] })], {
-      facade: 'functions',
-      className: 'C',
-      queryAuthKeys: new Set(['QueryKey']),
-    });
-    // The auth prefix is resolved up front (lazily, on first iteration), then the
-    // generator delegates to __sse — credentials merge into URL query + headers.
-    expect(out).toContain('const __a = await __auth(["QueryKey"], __config);');
-    expect(out).toContain('...__a.query');
-    expect(out).toContain('...__a.headers');
-    expect(out).toContain('yield* __sse<Message>');
-  });
-
-  it('service-class facade: emits a `private async *` method + a `readonly sse` field', () => {
-    const out = renderOperationsBlock([sseOp()], {
-      facade: 'service-class',
-      className: 'MessagesService',
-    });
-    expect(out).toContain('private async *streamMessages(');
-    expect(out).toContain('readonly sse = { streamMessages: this.streamMessages.bind(this) };');
-  });
-
-  it('a block with NO SSE ops emits no sse aggregate / no __sse', () => {
-    const out = renderOperationsBlock([operation({ name: 'listThings', path: '/things' })], {
-      facade: 'functions',
-      className: 'C',
-    });
-    expect(out).not.toContain('export const sse');
-    expect(out).not.toContain('__sse');
-  });
-
-  it('service-class with NO SSE ops emits no readonly sse field', () => {
-    const out = renderOperationsBlock([operation({ name: 'listThings', path: '/things' })], {
-      facade: 'service-class',
-      className: 'C',
-    });
-    expect(out).not.toContain('readonly sse');
-    expect(out).not.toContain('__sse');
+    expect(out).toContain('export type GetPetError = A | B;');
+    expect(out).not.toContain('B | B');
   });
 
-  it('honors a custom sseExportName, defaulting to `sse`', () => {
-    const out = renderOperationsBlock([sseOp()], {
-      facade: 'functions',
-      className: 'C',
-      sseExportName: 'streams',
+  it('throw mode (the default) emits no Result wrapping and no *Error alias', () => {
+    const out = emitWithOp({
+      name: 'getPet',
+      successResponses: [okResponse],
+      errorResponses: [
+        { contentType: 'application/json', status: 400, schema: { kind: 'ref', name: 'Problem' } },
+      ],
     });
-    expect(out).toContain('export const streams = { streamMessages };');
+    expect(out).not.toContain('GetPetError');
+    // The Ops member holds the bare result type (the embedded runtime still
+    // declares the unused-in-throw-mode `Result` helper type).
+    expect(out).toContain('result: GetPetResult;');
+    expect(out).not.toContain('result: Result<');
   });
 });
 
-describe('renderOperationsMeta — OPERATIONS metadata map', () => {
-  it('returns an empty string when there are no operations', () => {
-    expect(renderOperationsMeta([])).toBe('');
-  });
-
-  it('emits one entry per operation keyed by operationId, with uppercased method and path template', () => {
-    const out = renderOperationsMeta([
-      operation({
-        name: 'getProjectById',
-        method: 'get',
-        path: '/orgs/{orgId}/projects/{projectId}',
-      }),
-      operation({
-        name: 'createProject',
-        method: 'post',
-        path: '/orgs/{orgId}/projects',
-      }),
-    ]);
-    expect(out).toContain(
-      'getProjectById: { method: "GET", path: "/orgs/{orgId}/projects/{projectId}", tags: [] }'
-    );
-    expect(out).toContain(
-      'createProject: { method: "POST", path: "/orgs/{orgId}/projects", tags: [] }'
-    );
-  });
-
-  it('emits the OperationId and OperationMetadata helper types', () => {
-    const out = renderOperationsMeta([operation({ name: 'getThing' })]);
-    expect(out).toContain('export const OPERATIONS = {');
-    expect(out).toContain('} as const;');
-    expect(out).toContain('export type OperationId = keyof typeof OPERATIONS;');
-    expect(out).toMatch(
-      /export type OperationMetadata = \{\n {4}readonly method: string;\n {4}readonly path: string;\n {4}readonly tags: readonly string\[\];\n\};/
-    );
+describe('response type discovery (computeResponse through *Result)', () => {
+  it('void when there are no responses', () => {
+    expect(emitWithOp({ name: 'ping' })).toContain('export type PingResult = void;');
   });
 
-  it('quotes operationIds that are not bare identifiers', () => {
-    const out = renderOperationsMeta([operation({ name: 'weird-op', path: '/w' })]);
-    expect(out).toContain('"weird-op": { method: "GET", path: "/w", tags: [] }');
+  it('binary-only responses → Blob; text-only → string', () => {
+    expect(
+      emitWithOp({
+        name: 'getPhoto',
+        successResponses: [{ contentType: 'image/png', schema: { kind: 'unknown' }, status: 200 }],
+      })
+    ).toContain('export type GetPhotoResult = Blob;');
+    expect(
+      emitWithOp({
+        name: 'getText',
+        successResponses: [{ contentType: 'text/plain', schema: { kind: 'unknown' }, status: 200 }],
+      })
+    ).toContain('export type GetTextResult = string;');
   });
 
-  it('is included in single-file output between the type guards and the runtime', () => {
+  it('unions mixed binary + text responses and dedupes identical types', () => {
     const out = emitWithOp({
-      name: 'listThings',
-      method: 'get',
-      path: '/things',
+      name: 'getPhoto',
+      successResponses: [
+        { contentType: 'image/png', schema: { kind: 'unknown' }, status: 200 },
+        { contentType: 'image/jpeg', schema: { kind: 'unknown' }, status: 200 },
+        { contentType: 'text/plain', schema: { kind: 'unknown' }, status: 200 },
+      ],
     });
-    expect(out).toContain('export const OPERATIONS = {');
-    expect(out).toContain('listThings: { method: "GET", path: "/things", tags: [] }');
-    // Metadata is declarative data, so it precedes the runtime (`let BASE`).
-    expect(out.indexOf('export const OPERATIONS = {')).toBeLessThan(out.indexOf('let BASE ='));
+    expect(out).toContain('export type GetPhotoResult = Blob | string;');
+    expect(out).not.toContain('Blob | Blob');
   });
 
-  it('is omitted from single-file output when the document has no operations', () => {
-    expect(emitSingleFile(apiModel())).not.toContain('export const OPERATIONS');
+  it('picks JSON when both JSON and non-JSON content types coexist', () => {
+    const out = emitWithOp({
+      name: 'get',
+      successResponses: [
+        { contentType: 'application/xml', schema: { kind: 'ref', name: 'X' }, status: 200 },
+        { contentType: 'application/json', schema: { kind: 'ref', name: 'J' }, status: 200 },
+      ],
+    });
+    expect(out).toContain('export type GetResult = J;');
   });
 });
diff --git a/packages/client-generator/src/emitters/__tests__/package-client.test.ts b/packages/client-generator/src/emitters/__tests__/package-client.test.ts
new file mode 100644
index 0000000000..cb12818d6c
--- /dev/null
+++ b/packages/client-generator/src/emitters/__tests__/package-client.test.ts
@@ -0,0 +1,449 @@
+import type { ApiModel, OperationModel } from '../../intermediate-representation/model.js';
+import type { EmitOptions } from '../client.js';
+import { emitClientSingleFile } from '../package-client.js';
+import { ts } from '../ts.js';
+import { apiModel, namedSchema, operation, param, response, SCALAR } from './fixtures.js';
+
+function modelWith(ops: OperationModel[], extra: Partial<ApiModel> = {}): ApiModel {
+  return apiModel({ services: [{ name: 'Default', operations: ops }], ...extra });
+}
+
+/** The package arm of the shared emitter. */
+function emit(model: ApiModel, options: EmitOptions = {}): string {
+  return emitClientSingleFile(model, { ...options, runtime: 'package' });
+}
+
+const getOrder = operation({
+  name: 'getOrder',
+  path: '/orders/{orderId}',
+  pathParams: [param('orderId', 'path', true)],
+  queryParams: [param('expand', 'query')],
+  successResponses: [response({ schema: { kind: 'ref', name: 'Order' } })],
+  errorResponses: [response({ status: 400, schema: { kind: 'ref', name: 'Problem' } })],
+  security: ['bearerAuth'],
+  tags: ['Orders'],
+});
+const createPet = operation({
+  name: 'createPet',
+  method: 'post',
+  path: '/pets',
+  requestBody: {
+    contentType: 'application/json',
+    schema: { kind: 'ref', name: 'Pet' },
+    required: true,
+  },
+  successResponses: [response({ schema: { kind: 'ref', name: 'Pet' } })],
+});
+const upload = operation({
+  name: 'upload',
+  method: 'post',
+  path: '/upload',
+  requestBody: {
+    contentType: 'multipart/form-data',
+    schema: { kind: 'object', properties: [] },
+    required: true,
+  },
+});
+const streamEvents = operation({
+  name: 'streamEvents',
+  path: '/events',
+  successResponses: [
+    response({ contentType: 'text/event-stream', schema: { kind: 'ref', name: 'OrderEvent' } }),
+  ],
+});
+const configureOp = operation({ name: 'configure', path: '/configure-op' });
+
+const SCHEMAS = [
+  namedSchema('Order', { kind: 'object', properties: [] }),
+  namedSchema('Problem', { kind: 'object', properties: [] }),
+  namedSchema('Pet', { kind: 'object', properties: [] }),
+  namedSchema('OrderEvent', { kind: 'object', properties: [] }),
+];
+const CAFE = modelWith([getOrder, createPet, upload, streamEvents, configureOp], {
+  schemas: SCHEMAS,
+  securitySchemes: [
+    { kind: 'bearer', key: 'bearerAuth' },
+    { kind: 'apiKeyCookie', key: 'cookieAuth', cookieName: 'sid' },
+  ],
+});
+
+describe('emitClientSingleFile (package arm)', () => {
+  const output = emit(CAFE, { serverUrl: 'https://x' });
+
+  it('imports from the package instead of inlining the runtime template', () => {
+    expect(output).toContain(
+      "import { createClient, type OperationDescriptor, type RequestOptions, type SseOptions, type TokenProvider } from '@redocly/client-generator';"
+    );
+    expect(output).not.toContain('__send');
+    expect(output).not.toContain('__buildUrl');
+    expect(output).not.toContain('let BASE');
+  });
+
+  it('escapes U+2028/U+2029 in generated string literals (code-shape hardening)', () => {
+    const out = emit(
+      modelWith([getOrder], {
+        schemas: SCHEMAS,
+        securitySchemes: [{ kind: 'apiKeyHeader', key: 'k\u2028evil', headerName: 'X-K' }],
+      }),
+      { serverUrl: 'https://x/\u2029path' }
+    );
+    expect(out).toContain('serverUrl: "https://x/\\u2029path"');
+    expect(out).toContain('client.auth.apiKey("k\\u2028evil", value)');
+    expect(out).not.toContain('\u2028');
+    expect(out).not.toContain('\u2029');
+  });
+
+  it('bakes the serverUrl into the createClient config and narrows ctx.operation', () => {
+    expect(output).toContain(
+      'export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://x" });'
+    );
+  });
+
+  it('emits schema types, type guards, aliases, Ops, and OPERATIONS', () => {
+    expect(output).toContain('export type Order =');
+    expect(output).toContain('export type GetOrderResult = Order;');
+    expect(output).toContain('export type Ops = {');
+    expect(output).toContain('as const satisfies Record<string, OperationDescriptor>;');
+  });
+
+  it('emits type guards for discriminated unions', () => {
+    const model = modelWith([getOrder], {
+      schemas: [
+        namedSchema('Cat', {
+          kind: 'object',
+          properties: [{ name: 'type', schema: { kind: 'literal', value: 'cat' }, required: true }],
+        }),
+        namedSchema('Dog', {
+          kind: 'object',
+          properties: [{ name: 'type', schema: { kind: 'literal', value: 'dog' }, required: true }],
+        }),
+        namedSchema('Animal', {
+          kind: 'union',
+          members: [
+            { kind: 'ref', name: 'Cat' },
+            { kind: 'ref', name: 'Dog' },
+          ],
+        }),
+        ...SCHEMAS,
+      ],
+    });
+    expect(emit(model)).toContain('export function isCat(');
+  });
+
+  it('emits core destructure and auth sugar bound to the instance', () => {
+    expect(output).toContain('export const { configure, use } = client;');
+    expect(output).toContain('export const setBearer = client.auth.bearer;');
+    // Sole apiKey scheme → unsuffixed setter, scheme key baked into the closure.
+    expect(output).toContain(
+      'export const setApiKey = (value: TokenProvider) => client.auth.apiKey("cookieAuth", value);'
+    );
+    expect(output).not.toContain('setBasicAuth');
+  });
+
+  it('emits flat sugar one-liners forwarding to the grouped client methods', () => {
+    // Same positional signature style as inline flat mode (`renderArgList`): inline
+    // param object types with `= {}` defaults, trailing `init: … = {}`.
+    expect(output).toContain('export const getOrder = (orderId: string, params: {');
+    expect(output).toContain('=> client.getOrder({ orderId, params }, init);');
+    expect(output).toContain(
+      'export const createPet = (body: Pet, init: RequestOptions = {}) => client.createPet({ body }, init);'
+    );
+    // SSE sugar takes SseOptions and returns the generator directly.
+    expect(output).toContain(
+      'export const streamEvents = (init: SseOptions = {}) => client.streamEvents({}, init);'
+    );
+  });
+
+  it('renames the colliding operation everywhere while the core members keep their names', () => {
+    expect(output).toContain('configure_2: {');
+    expect(output).toContain('id: "configure"'); // descriptor id stays the spec operationId
+    expect(output).toContain(
+      'export const configure_2 = (init: RequestOptions = {}) => client.configure_2({}, init);'
+    );
+  });
+
+  it('re-exports the public surface', () => {
+    expect(output).toContain("export { ApiError, createClient } from '@redocly/client-generator';");
+    expect(output).toContain(
+      "export type { ClientConfig, Middleware, RequestOptions, ServerSentEvent, SseOptions } from '@redocly/client-generator';"
+    );
+  });
+
+  it('keys flat-sugar path values by WIRE name when it differs from the ident', () => {
+    const model = modelWith([
+      operation({
+        name: 'getPet',
+        path: '/pets/{pet-id}',
+        pathParams: [param('pet-id', 'path', true)],
+        successResponses: [response()],
+      }),
+    ]);
+    // No options at all — the emitter's own defaults apply.
+    const out = emit(model);
+    expect(out).toContain(
+      'export const getPet = (pet_id: string, init: RequestOptions = {}) => client.getPet({ "pet-id": pet_id }, init);'
+    );
+    expect(out).toContain('"pet-id": string;'); // Ops args + Variables alias, wire-keyed
+  });
+
+  it('keeps sanitizer-collapsed path params distinct: identifier-safe wire name, renamed ident', () => {
+    const model = modelWith([
+      operation({
+        name: 'compare',
+        path: '/x/{a-b}/{a_b}',
+        pathParams: [param('a-b', 'path', true), param('a_b', 'path', true)],
+        successResponses: [response()],
+      }),
+    ]);
+    // `a-b` sanitizes to `a_b`, so the literal `a_b` param is deduped to `a_b_2` —
+    // but both forward under their wire names.
+    expect(emit(model)).toContain('client.compare({ "a-b": a_b, a_b: a_b_2 }, init);');
+  });
+
+  it('layers a baked setup OVER the spec defaults and imports the contract types', () => {
+    const out = emit(modelWith([getOrder], { schemas: SCHEMAS }), {
+      serverUrl: 'https://x',
+      setup: '{ config: { retry: { retries: 2 } } }',
+    });
+    expect(out).toContain(
+      "import { createClient, mergeSetup, type ClientConfig, type Middleware, type OperationDescriptor, type RequestOptions } from '@redocly/client-generator';"
+    );
+    expect(out).toContain(
+      'const __redoclySetup: { config?: ClientConfig; middleware?: Middleware[] } = { config: { retry: { retries: 2 } } };'
+    );
+    // Precedence lowest→highest: spec default → baked setup (→ app configure()).
+    expect(out).toContain(
+      'export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, mergeSetup({ config: { serverUrl: "https://x" } }, mergeSetup(__redoclySetup, {})));'
+    );
+  });
+
+  it('result mode with an SSE-only spec does not import the (unreferenced) Result type', () => {
+    const out = emit(modelWith([streamEvents], { schemas: SCHEMAS }), { errorMode: 'result' });
+    expect(out).not.toContain('type Result');
+    // The SSE member stays unwrapped, and the re-export list still offers Result.
+    expect(out).toContain('kind: "sse"');
+    expect(out).toContain(
+      "export type { ClientConfig, Middleware, RequestOptions, Result, ServerSentEvent, SseOptions } from '@redocly/client-generator';"
+    );
+  });
+
+  it('bakes errorMode: result into the config and wraps Ops results', () => {
+    const out = emit(modelWith([getOrder], { schemas: SCHEMAS }), {
+      serverUrl: 'https://x',
+      errorMode: 'result',
+    });
+    expect(out).toContain('{ serverUrl: "https://x", errorMode: "result" }');
+    expect(out).toContain('result: Result<GetOrderResult, GetOrderError>;');
+    expect(out).toContain('type Result');
+  });
+
+  it('grouped argsStyle destructures the client methods instead of flat one-liners', () => {
+    const out = emit(CAFE, { serverUrl: 'https://x', argsStyle: 'grouped' });
+    expect(out).toContain(
+      'export const { getOrder, createPet, upload, streamEvents, configure_2 } = client;'
+    );
+    expect(out).not.toContain('=> client.getOrder(');
+    // No flat sugar → the per-call option types are not imported (only re-exported).
+    expect(out).toContain(
+      "import { createClient, type OperationDescriptor, type TokenProvider } from '@redocly/client-generator';"
+    );
+  });
+
+  it('threads one schemaNames set: a suppressed alias is inlined in Ops, never referenced', () => {
+    const model = modelWith(
+      [
+        operation({
+          name: 'search',
+          path: '/search',
+          successResponses: [response({ schema: { kind: 'ref', name: 'SearchResult' } })],
+        }),
+      ],
+      { schemas: [namedSchema('SearchResult', { kind: 'object', properties: [] })] }
+    );
+    const out = emit(model);
+    expect(out).not.toContain('export type SearchResult = SearchResult;');
+    expect(out).toContain('result: SearchResult;'); // the schema type, inlined
+  });
+
+  it('suffixes apiKey setters when several apiKey schemes exist; emits setBasicAuth for basic', () => {
+    const out = emit(
+      modelWith([getOrder], {
+        schemas: SCHEMAS,
+        securitySchemes: [
+          { kind: 'basic', key: 'basicAuth' },
+          { kind: 'apiKeyHeader', key: 'keyA', headerName: 'X-A' },
+          { kind: 'apiKeyQuery', key: 'keyB', paramName: 'b' },
+        ],
+      })
+    );
+    expect(out).toContain('export const setBasicAuth = client.auth.basic;');
+    expect(out).toContain(
+      'export const setApiKeyKeyA = (value: TokenProvider) => client.auth.apiKey("keyA", value);'
+    );
+    expect(out).toContain(
+      'export const setApiKeyKeyB = (value: TokenProvider) => client.auth.apiKey("keyB", value);'
+    );
+  });
+
+  it('handles a spec with no operations: uniform wiring over empty maps', () => {
+    const out = emit(modelWith([]), {});
+    expect(out).toContain('export type Ops = Record<string, never>;');
+    expect(out).toContain(
+      'export const OPERATIONS = {} as const satisfies Record<string, OperationDescriptor>;'
+    );
+    // model fixture has a serverUrl — still baked.
+    expect(out).toContain(
+      'export const client = createClient<Ops>(OPERATIONS, { serverUrl: "https://api.example.com" });'
+    );
+    expect(out).toContain('export const { configure, use } = client;');
+  });
+
+  it('emits an empty config object when neither options nor the document set a serverUrl', () => {
+    const out = emit(modelWith([getOrder], { serverUrl: undefined, schemas: SCHEMAS }));
+    expect(out).toContain(
+      'export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, {});'
+    );
+  });
+
+  it('forwards the headers slot for operations with header params', () => {
+    const out = emit(
+      modelWith([
+        operation({
+          name: 'ping',
+          path: '/ping',
+          headerParams: [param('X-Trace', 'header')],
+          successResponses: [response()],
+        }),
+      ])
+    );
+    expect(out).toContain('=> client.ping({ headers }, init);');
+  });
+
+  it('matches the golden output for a small model', () => {
+    const model = modelWith([getOrder, streamEvents], {
+      schemas: [
+        namedSchema('Order', {
+          kind: 'object',
+          properties: [{ name: 'id', schema: SCALAR, required: true }],
+        }),
+        ...SCHEMAS.slice(1),
+      ],
+      securitySchemes: [{ kind: 'bearer', key: 'bearerAuth' }],
+    });
+    expect(emit(model, { serverUrl: 'https://cafe.example.com' })).toMatchSnapshot();
+  });
+});
+
+describe('emitClientSingleFile (embed arm)', () => {
+  const output = emitClientSingleFile(CAFE, { serverUrl: 'https://x' });
+
+  it('embeds the runtime block instead of importing the package', () => {
+    expect(output).toContain('// ─── Embedded runtime');
+    expect(output).toContain('export class ApiError');
+    expect(output).toContain('export function createClient<\n  Ops extends OpsShape,');
+    expect(output).not.toContain("from '@redocly/client-generator'");
+  });
+
+  it('emits no re-export section — the embedded surface is already exported in place', () => {
+    expect(output).not.toContain('export { ApiError }');
+    expect(output).not.toContain('export type {');
+    expect(output).toContain('export type ClientConfig'); // from the embedded types.ts
+  });
+
+  it('embeds every capability CAFE needs: multipart, auth, and sse', () => {
+    expect(output).toContain('function toFormData');
+    expect(output).toContain('async function resolveAuth');
+    expect(output).toContain('async function* sse');
+    expect(output).toContain(
+      'createClientCore<Ops, Id, Path, Tag>(operations, config, { serializeMultipart: toFormData, resolveAuth, sse })'
+    );
+  });
+
+  it('embeds no capability module a plain model does not need', () => {
+    const out = emitClientSingleFile(modelWith([createPet], { schemas: SCHEMAS }));
+    expect(out).not.toContain('toFormData');
+    // The auth MODULE is absent; `resolveAuth` as a bare word still names the
+    // (unwired) property in create-client.ts's `Capabilities` seam type.
+    expect(out).not.toContain('async function resolveAuth');
+    expect(out).not.toContain('async function* sse');
+    expect(out).toContain('createClientCore<Ops, Id, Path, Tag>(operations, config, {})');
+  });
+
+  it('embeds resolveAuth when a descriptor carries security even without declared schemes', () => {
+    const out = emitClientSingleFile(modelWith([getOrder], { schemas: SCHEMAS }));
+    expect(out).toContain('async function resolveAuth');
+    expect(out).toContain(
+      'createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth })'
+    );
+  });
+
+  it('embeds mergeSetup and bakes the setup const when --setup is given', () => {
+    const out = emitClientSingleFile(modelWith([createPet], { schemas: SCHEMAS }), {
+      serverUrl: 'https://x',
+      setup: '{ config: { retry: { retries: 2 } } }',
+    });
+    expect(out).toContain('export function mergeSetup');
+    expect(out).toContain(
+      'const __redoclySetup: { config?: ClientConfig; middleware?: Middleware[] } = { config: { retry: { retries: 2 } } };'
+    );
+    // Precedence lowest→highest: spec default → baked setup (→ app configure()).
+    expect(out).toContain(
+      'export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS, mergeSetup({ config: { serverUrl: "https://x" } }, mergeSetup(__redoclySetup, {})));'
+    );
+  });
+
+  it('survives a spec schema named Error: runtime type positions use globalThis.Error', () => {
+    const model = modelWith([getOrder], {
+      schemas: [
+        namedSchema('Error', {
+          kind: 'object',
+          properties: [{ name: 'code', schema: SCALAR, required: true }],
+        }),
+        ...SCHEMAS,
+      ],
+    });
+    const out = emitClientSingleFile(model, { serverUrl: 'https://x' });
+    // The schema type is emitted alongside the embedded runtime in one module…
+    expect(out).toContain('export type Error =');
+    // …so every runtime TYPE-position reference to Error must be shadow-proof.
+    expect(out).toContain('export type ApiErrorLike = globalThis.Error & {');
+    expect(out).toContain('=> globalThis.Error | Promise<globalThis.Error>;');
+    expect(out).toContain('let error: globalThis.Error');
+    expect(out).toContain('function abortError(signal: AbortSignal): globalThis.Error {');
+    // VALUE positions stay bare — `globalThis.Error === Error` at runtime anyway.
+    expect(out).toContain('class ApiError extends Error');
+    // Cheap semantic gate: the assembled module parses clean.
+    const sourceFile = ts.createSourceFile('client.ts', out, ts.ScriptTarget.Latest, true);
+    expect((sourceFile as unknown as { parseDiagnostics: unknown[] }).parseDiagnostics).toEqual([]);
+  });
+
+  it('emits wiring (Ops → OPERATIONS, client → sugar) byte-identical to the package arm', () => {
+    const packaged = emit(CAFE, { serverUrl: 'https://x' });
+    // `'export type Ops ='` — the trailing `=` skips the embedded `export type OpsShape`.
+    // In embed mode the runtime block sits between OPERATIONS and `client`, so the
+    // wiring is compared as its two contiguous segments around it.
+    const slice = (out: string, from: string, to: number) => out.slice(out.indexOf(from), to);
+    expect(
+      slice(output, 'export type Ops =', output.indexOf('// ─── Embedded runtime')).trim()
+    ).toBe(slice(packaged, 'export type Ops =', packaged.indexOf('export const client')).trim());
+    expect(slice(output, 'export const client', output.length).trim()).toBe(
+      slice(packaged, 'export const client', packaged.indexOf('export { ApiError,')).trim()
+    );
+  });
+
+  it('matches the golden output for a small model', () => {
+    const model = modelWith([getOrder, streamEvents], {
+      schemas: [
+        namedSchema('Order', {
+          kind: 'object',
+          properties: [{ name: 'id', schema: SCALAR, required: true }],
+        }),
+        ...SCHEMAS.slice(1),
+      ],
+      securitySchemes: [{ kind: 'bearer', key: 'bearerAuth' }],
+    });
+    expect(
+      emitClientSingleFile(model, { serverUrl: 'https://cafe.example.com' })
+    ).toMatchSnapshot();
+  });
+});
diff --git a/packages/client-generator/src/emitters/__tests__/runtime-sources.test.ts b/packages/client-generator/src/emitters/__tests__/runtime-sources.test.ts
new file mode 100644
index 0000000000..8c304cd504
--- /dev/null
+++ b/packages/client-generator/src/emitters/__tests__/runtime-sources.test.ts
@@ -0,0 +1,21 @@
+import { readdirSync, readFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+import { RUNTIME_SOURCES } from '../runtime-sources.js';
+
+const runtimeDir = join(dirname(fileURLToPath(import.meta.url)), '..', '..', 'runtime');
+
+describe('runtime-sources', () => {
+  it('the generated snapshot matches src/runtime (every module except the barrel)', () => {
+    const expected = Object.fromEntries(
+      readdirSync(runtimeDir)
+        .filter((name) => name.endsWith('.ts') && name !== 'index.ts')
+        .map((name) => [name, readFileSync(join(runtimeDir, name), 'utf-8')])
+    );
+    expect(
+      { ...RUNTIME_SOURCES },
+      'emitters/runtime-sources.ts is stale — run `npm run prepare -w @redocly/client-generator`'
+    ).toEqual(expected);
+  });
+});
diff --git a/packages/client-generator/src/emitters/__tests__/runtime.test.ts b/packages/client-generator/src/emitters/__tests__/runtime.test.ts
deleted file mode 100644
index 016321a41d..0000000000
--- a/packages/client-generator/src/emitters/__tests__/runtime.test.ts
+++ /dev/null
@@ -1,323 +0,0 @@
-import { renderRuntime, runtimeStatements, PUBLIC_RUNTIME_TYPES } from '../runtime.js';
-import { printStatements } from '../ts.js';
-
-describe('renderRuntime — shared core + terminal selection', () => {
-  describe('operation context', () => {
-    it('emits OperationContext, the operation field, and threads op through __send', () => {
-      const out = renderRuntime('https://api.example.com', false, false);
-      expect(out).toContain('export type OperationContext = {');
-      expect(out).toContain('tags: string[];');
-      expect(out).toContain('operation: op');
-      expect(out).toContain('op: OperationContext,');
-    });
-
-    it('lists OperationContext in PUBLIC_RUNTIME_TYPES', () => {
-      expect(PUBLIC_RUNTIME_TYPES).toContain('OperationContext');
-    });
-
-    it('narrows OperationContext field types when given operation-union types', () => {
-      const out = renderRuntime('https://x', false, false, 'throw', false, false, false, {
-        id: 'OperationId',
-        path: 'OperationPath',
-        tags: 'OperationTag[]',
-      });
-      expect(out).toContain('id: OperationId;');
-      expect(out).toContain('path: OperationPath;');
-      expect(out).toContain('tags: OperationTag[];');
-    });
-
-    it('serializes the body from context.body after the onRequest chain', () => {
-      const out = renderRuntime('https://api.example.com', false, false);
-      const sendStart = out.indexOf('async function __send(');
-      const onReq = out.indexOf('mw.onRequest(context)', sendStart);
-      const serialize = out.indexOf('payload = JSON.stringify(value)', sendStart);
-      expect(onReq).toBeGreaterThan(-1);
-      // Serialization must happen after the onRequest hook so body mutations are sent.
-      expect(serialize).toBeGreaterThan(onReq);
-    });
-  });
-
-  describe('throw mode (default)', () => {
-    it('emits __send, __parse, and __request<T> and no result terminal', () => {
-      const out = renderRuntime('https://api.example.com', false, false);
-      expect(out).toContain('async function __send(');
-      expect(out).toContain('async function __parse(');
-      expect(out).toContain('async function __request<T>(');
-      expect(out).not.toContain('__requestResult');
-      expect(out).not.toContain('export type Result<');
-    });
-
-    it("treats an explicit 'throw' identically to the default", () => {
-      expect(renderRuntime('https://api.example.com', false, false, 'throw')).toBe(
-        renderRuntime('https://api.example.com', false, false)
-      );
-    });
-  });
-
-  describe('runtimeStatements', () => {
-    it('returns parsed statements that print to the same source renderRuntime emits', () => {
-      const statements = runtimeStatements('https://api.example.com', false, false);
-      expect(statements.length).toBeGreaterThan(0);
-      expect(printStatements(statements)).toBe(
-        renderRuntime('https://api.example.com', false, false)
-      );
-    });
-
-    it('defaults errorMode to throw (emits __request, not __requestResult)', () => {
-      const out = printStatements(runtimeStatements('https://api.example.com', false, false));
-      expect(out).toContain('async function __request<T>(');
-      expect(out).not.toContain('__requestResult');
-    });
-  });
-
-  describe('result mode', () => {
-    const out = renderRuntime('https://api.example.com', false, true, 'result');
-
-    it('emits __send, __parse, the Result type, and __requestResult', () => {
-      expect(out).toContain('async function __send(');
-      expect(out).toContain('async function __parse(');
-      expect(out).toContain('export type Result<TData, TError>');
-      expect(out).toContain('async function __requestResult<TData, TError>(');
-    });
-
-    it('does not emit the throwing terminal', () => {
-      expect(out).not.toContain('async function __request<T>(');
-    });
-  });
-
-  describe('shared surface present in both modes', () => {
-    const cases: Array<['throw' | 'result', string]> = [
-      ['throw', renderRuntime('https://api.example.com', true, true, 'throw')],
-      ['result', renderRuntime('https://api.example.com', true, true, 'result')],
-    ];
-    it.each(cases)('keeps retry helpers + ApiError + header helper in %s mode', (_mode, out) => {
-      expect(out).toContain('function __defaultRetryOn(');
-      expect(out).toContain('function __retryDelay(');
-      expect(out).toContain('function __sleep(');
-      expect(out).toContain('function __abortError(');
-      expect(out).toContain('class ApiError extends Error');
-      expect(out).toContain('async function readError(');
-      expect(out).toContain('function __headers(');
-    });
-  });
-
-  it('honors the export prefix for __send/__parse and the terminal', () => {
-    const exported = renderRuntime('https://api.example.com', false, true);
-    expect(exported).toContain('export async function __send(');
-    expect(exported).toContain('export async function __parse(');
-    expect(exported).toContain('export async function __request<T>(');
-
-    const inlined = renderRuntime('https://api.example.com', false, false);
-    expect(inlined).toContain('async function __send(');
-    expect(inlined).not.toContain('export async function __send(');
-  });
-
-  it('documents onError as throw-mode only', () => {
-    const out = renderRuntime('https://api.example.com', false, false);
-    expect(out).toContain('(throw mode only)');
-  });
-
-  describe('__buildUrl query serialization styles', () => {
-    const out = renderRuntime('https://api.example.com', false, false);
-
-    it('accepts an optional per-key styles spec as the 4th param', () => {
-      expect(out).toContain("style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject'");
-      expect(out).toContain('explode: boolean');
-      expect(out).toContain('allowReserved?: boolean');
-      expect(out).toContain('const spec = styles?.[key];');
-    });
-
-    it('keeps the default branch (no spec) byte-identical to the unstyled path', () => {
-      // The pre-styles repeat/deepObject/scalar behavior, reached when spec is absent.
-      // The printer reflows `if (cond) stmt;` onto two lines, so assert the parts.
-      expect(out).toContain('if (!spec) {');
-      expect(out).toContain('if (v !== undefined && v !== null)');
-      expect(out).toContain('params.append(key, String(v));');
-      expect(out).toContain('params.append(`${key}[${subKey}]`, String(subValue));');
-    });
-
-    it('emits the delimited-array branches with literal delimiters', () => {
-      // The delimiter goes on the wire LITERAL; only values are encoded.
-      // pipeDelimited → '|', spaceDelimited → '%20' (NOT '+'), form non-explode → ','.
-      expect(out).toContain(
-        "const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';"
-      );
-      // Each value is encoded individually, then joined with the literal delimiter
-      // and pushed to `raw` — NOT run through params.append(key, joined).
-      expect(out).toContain(
-        'const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;'
-      );
-      expect(out).toContain(
-        'raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);'
-      );
-      expect(out).not.toContain('const joined = items.join(sep);');
-      expect(out).not.toContain('params.append(key, joined)');
-      expect(out).toContain("if (spec.style === 'form' && spec.explode)");
-    });
-
-    it('emits allowReserved handling that preserves reserved chars', () => {
-      expect(out).toContain('allowReserved');
-      // A helper that encodes everything except the RFC-3986 reserved set, plus
-      // raw query pieces appended after URLSearchParams.toString().
-      expect(out).toContain('function __encodeReserved(');
-      expect(out).toContain('const raw: string[] = [];');
-    });
-
-    it('assembles params + raw allowReserved pieces into the final query string', () => {
-      expect(out).toContain("const qs = [params.toString(), ...raw].filter(Boolean).join('&');");
-      expect(out).toContain('return qs ? `${url}?${qs}` : url;');
-    });
-  });
-
-  describe('parseAs escape hatch', () => {
-    it("lists 'ParseAs' in PUBLIC_RUNTIME_TYPES", () => {
-      expect(PUBLIC_RUNTIME_TYPES).toContain('ParseAs');
-    });
-
-    it('emits the ParseAs union type and parseAs on RequestOptions', () => {
-      const out = renderRuntime('https://api.example.com', false, false);
-      expect(out).toContain(
-        "export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';"
-      );
-      // The printer reflows the `RequestOptions` type literal across lines.
-      expect(out).toContain('export type RequestOptions = RequestInit & {');
-      expect(out).toContain('retry?: Partial<RetryConfig>;');
-      expect(out).toContain('parseAs?: ParseAs;');
-    });
-
-    it('extends __parse to accept ParseAs | void and decode every kind', () => {
-      const out = renderRuntime('https://api.example.com', false, false);
-      // The printer splits single-line `if (cond) return x;` onto two lines; assert
-      // each condition and its return value survive (semantics preserved, layout reflowed).
-      expect(out).toContain("kind: ParseAs | 'void'");
-      expect(out).toContain("if (kind === 'void' || response.status === 204)");
-      expect(out).toContain('return undefined;');
-      expect(out).toContain("if (kind === 'stream')");
-      expect(out).toContain('return response.body;');
-      expect(out).toContain("if (kind === 'blob')");
-      expect(out).toContain("if (kind === 'arrayBuffer')");
-      expect(out).toContain('return response.arrayBuffer();');
-      expect(out).toContain("if (kind === 'formData')");
-      expect(out).toContain('return response.formData();');
-      expect(out).toContain("if (kind === 'text')");
-      expect(out).toContain('return response.text();');
-      expect(out).toContain("if (kind === 'json')");
-      expect(out).toContain('return response.json();');
-      // 'auto' sniff branch — json → text/ → blob
-      expect(out).toContain("if (contentType.toLowerCase().includes('json'))");
-      expect(out).toContain("if (contentType.startsWith('text/'))");
-      expect(out).toContain('return response.blob();');
-    });
-
-    const terminals: Array<['throw' | 'result', string, string]> = [
-      [
-        'throw',
-        renderRuntime('https://api.example.com', false, false, 'throw'),
-        'const { response, context } = await __send(config, op, url, sendInit, body);',
-      ],
-      [
-        'result',
-        renderRuntime('https://api.example.com', false, true, 'result'),
-        'const { response } = await __send(config, op, url, sendInit, body);',
-      ],
-    ];
-    it.each(terminals)(
-      'in %s mode strips parseAs before __send and maps the default kind',
-      (_mode, out, sendLine) => {
-        expect(out).toContain('const { parseAs, ...sendInit } = init;');
-        expect(out).toContain(sendLine);
-        expect(out).toContain(
-          "const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);"
-        );
-        expect(out).toContain('__parse(response, kind)');
-        expect(out).not.toContain('__parse(response, responseKind)');
-      }
-    );
-  });
-
-  describe('SSE runtime (gated on needsSse)', () => {
-    it('omits all SSE surface when needsSse is false', () => {
-      const out = renderRuntime('https://api.example.com', false, false, 'throw', false);
-      expect(out).not.toContain('__sse');
-      expect(out).not.toContain('ServerSentEvent');
-      expect(out).not.toContain('SseOptions');
-    });
-
-    it('emits ServerSentEvent, SseOptions, and __sse when needsSse is true', () => {
-      const out = renderRuntime('https://api.example.com', false, false, 'throw', true);
-      // The printer reflows type literals across lines; assert the parts survive.
-      expect(out).toContain('export type ServerSentEvent<T> = {');
-      expect(out).toContain('event?: string;');
-      expect(out).toContain('data: T;');
-      expect(out).toContain('id?: string;');
-      expect(out).toContain('retry?: number;');
-      expect(out).toContain('export type SseOptions = RequestInit & {');
-      expect(out).toContain('reconnect?: boolean;');
-      expect(out).toContain('reconnectDelay?: number;');
-      expect(out).toContain('async function* __sse<T>(');
-      expect(out).toContain("dataKind: 'json' | 'text' = 'text'");
-      expect(out).toContain('AsyncGenerator<ServerSentEvent<T>>');
-      expect(out).toContain("Accept: 'text/event-stream'");
-      expect(out).toContain("'Last-Event-ID'");
-      expect(out).toContain('getReader()');
-      expect(out).toContain('new TextDecoder()');
-      expect(out).toContain('__parseSseFrame');
-      expect(out).toContain('JSON.parse');
-    });
-
-    it('exports __sse in multi-file but keeps __parseSseFrame module-private', () => {
-      const out = renderRuntime('https://api.example.com', false, true, 'throw', true);
-      expect(out).toContain('export async function* __sse');
-      expect(out).not.toContain('export function __parseSseFrame');
-      expect(out).not.toContain('export async function __parseSseFrame');
-    });
-  });
-
-  describe('multipart runtime (gated on needsMultipart)', () => {
-    it('omits the __toFormData helper and the multipart serialization path when false', () => {
-      const out = renderRuntime(
-        'https://api.example.com',
-        false,
-        false,
-        'throw',
-        false,
-        false,
-        false
-      );
-      expect(out).not.toContain('__toFormData');
-      expect(out).not.toContain('multipart: boolean');
-    });
-
-    it('emits __toFormData, the multipart flag, and the FormData serialization branch when true', () => {
-      const out = renderRuntime(
-        'https://api.example.com',
-        false,
-        false,
-        'throw',
-        false,
-        false,
-        true
-      );
-      expect(out).toContain('function __toFormData(');
-      // The body-serializing helpers thread a `multipart` flag through to __send.
-      expect(out).toContain('multipart: boolean = false');
-      // __send converts a plain body to FormData AFTER onRequest when the flag is set.
-      expect(out).toContain('else if (multipart) {');
-      expect(out).toContain('__toFormData(value as Record<string, unknown>)');
-    });
-
-    it('threads the multipart flag through the result-mode request helper too', () => {
-      const out = renderRuntime(
-        'https://api.example.com',
-        false,
-        false,
-        'result',
-        false,
-        false,
-        true
-      );
-      expect(out).toContain('multipart: boolean = false');
-      expect(out).toContain('__send(config, op, url, sendInit, body, multipart)');
-    });
-  });
-});
diff --git a/packages/client-generator/src/emitters/__tests__/setup-bake.test.ts b/packages/client-generator/src/emitters/__tests__/setup-bake.test.ts
index 50d81d2d63..ffb1fea43e 100644
--- a/packages/client-generator/src/emitters/__tests__/setup-bake.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/setup-bake.test.ts
@@ -17,7 +17,7 @@ describe('bakeSetup', () => {
     expect(out).not.toContain('defineClientSetup');
     expect(out).toContain("serverUrl: 'https://api.acme.com'");
     expect(out).toContain("ctx.headers['X-Acme'] = '1'");
-    // No facade-specific application — that is the emitter's job.
+    // A neutral expression only — applying it (mergeSetup) is the emitter's job.
     expect(out).not.toContain('configure(');
     expect(out).not.toContain('use(');
   });
diff --git a/packages/client-generator/src/emitters/__tests__/sse.deletion.test.ts b/packages/client-generator/src/emitters/__tests__/sse.deletion.test.ts
index aa2c3375ed..7555c98975 100644
--- a/packages/client-generator/src/emitters/__tests__/sse.deletion.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/sse.deletion.test.ts
@@ -1,9 +1,11 @@
-// Deletion test guarding the SSE gating seam: the `__sse` runtime block and the
-// public `sse` aggregate must appear ONLY when a model declares a
-// `text/event-stream` operation. A non-streaming model must be byte-free of
-// both — this protects the "non-SSE clients are unchanged" invariant.
+// Deletion test guarding the SSE surface of the descriptor-wired client: the old
+// template's `__sse` runtime block and the `export const sse = { … }` namespace are
+// gone for good. An SSE operation now exists as a descriptor (`responseKind: "sse"`),
+// a typed client method (`kind: "sse"` in Ops), and a flat sugar export; the runtime's
+// sse capability module is embedded ONLY when a model declares a `text/event-stream`
+// operation — a non-streaming model is byte-free of it.
 import type { ApiModel } from '../../intermediate-representation/model.js';
-import { emitSingleFile } from '../client.js';
+import { emitClientSingleFile } from '../package-client.js';
 import { apiModel, namedSchema, operation } from './fixtures.js';
 
 /** A model with one SSE op (event-stream success + an `itemSchema` ref). */
@@ -57,16 +59,29 @@ function plainModel(): ApiModel {
   });
 }
 
-describe('SSE gating seam (deletion test)', () => {
-  it('emits the __sse runtime + the sse aggregate when an op streams', () => {
-    const out = emitSingleFile(sseModel());
-    expect(out).toContain('async function* __sse');
-    expect(out).toContain('export const sse =');
+describe('SSE surface (deletion test)', () => {
+  it('never emits the old template surface: no __sse helper, no sse namespace', () => {
+    const out = emitClientSingleFile(sseModel());
+    expect(out).not.toContain('__sse');
+    expect(out).not.toContain('export const sse =');
   });
 
-  it('emits NEITHER __sse NOR the sse aggregate when no op streams', () => {
-    const out = emitSingleFile(plainModel());
-    expect(out).not.toContain('async function* __sse');
-    expect(out).not.toContain('export const sse =');
+  it('exposes an SSE op as descriptor + typed Ops member + flat sugar', () => {
+    const out = emitClientSingleFile(sseModel());
+    expect(out).toContain('responseKind: "sse"');
+    expect(out).toContain('kind: "sse";');
+    expect(out).toContain(
+      'export const streamMessages = (init: SseOptions = {}) => client.streamMessages({}, init);'
+    );
+    // The runtime's sse capability module is embedded and wired.
+    expect(out).toContain('async function* sse');
+    expect(out).toContain('createClientCore<Ops, Id, Path, Tag>(operations, config, { sse })');
+  });
+
+  it('embeds NO sse capability when no op streams', () => {
+    const out = emitClientSingleFile(plainModel());
+    expect(out).not.toContain('async function* sse');
+    expect(out).not.toContain('responseKind: "sse"');
+    expect(out).toContain('createClientCore<Ops, Id, Path, Tag>(operations, config, {})');
   });
 });
diff --git a/packages/client-generator/src/emitters/__tests__/sse.test.ts b/packages/client-generator/src/emitters/__tests__/sse.test.ts
index 21e22ad443..e2b14c64ed 100644
--- a/packages/client-generator/src/emitters/__tests__/sse.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/sse.test.ts
@@ -1,5 +1,5 @@
 import type { ResponseBodyModel, SchemaModel } from '../../intermediate-representation/model.js';
-import { isSseOp, partitionOps, sseDataKind, sseEventType, sseFragmentName } from '../sse.js';
+import { isSseOp, partitionOps, sseDataKind, sseEventType } from '../sse.js';
 import { printNodes } from '../ts.js';
 import { operation } from './fixtures.js';
 
@@ -117,9 +117,3 @@ describe('partitionOps', () => {
     expect(sse.map((o) => o.name)).toEqual(['s1', 's2']);
   });
 });
-
-describe('sseFragmentName', () => {
-  it('prefixes the class name with __sse_', () => {
-    expect(sseFragmentName('MessagesService')).toBe('__sse_MessagesService');
-  });
-});
diff --git a/packages/client-generator/src/emitters/__tests__/type-guards.test.ts b/packages/client-generator/src/emitters/__tests__/type-guards.test.ts
index 7becb8febb..45f556410a 100644
--- a/packages/client-generator/src/emitters/__tests__/type-guards.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/type-guards.test.ts
@@ -1,6 +1,11 @@
-import { emitSingleFile } from '../client.js';
+import { emitClientSingleFile } from '../package-client.js';
 import { apiModel, namedSchema } from './fixtures.js';
 
+// The package arm keeps the emitted text free of the embedded runtime, so the
+// absence assertions below test the schema types/guards alone.
+const emitPackage: typeof emitClientSingleFile = (model, options = {}) =>
+  emitClientSingleFile(model, { ...options, runtime: 'package' });
+
 describe('discriminated-union type guards (C6.4)', () => {
   const beverage = namedSchema('Beverage', {
     kind: 'object',
@@ -24,7 +29,7 @@ describe('discriminated-union type guards (C6.4)', () => {
   });
 
   it('emits is<Member>() guards for an explicit discriminator', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           beverage,
@@ -53,7 +58,7 @@ describe('discriminated-union type guards (C6.4)', () => {
   });
 
   it('skips a discriminator entry whose target is not a named schema', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           beverage,
@@ -76,7 +81,7 @@ describe('discriminated-union type guards (C6.4)', () => {
   });
 
   it('emits a single guard when two discriminant values map to the same type', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('Pet', { kind: 'object', properties: [] }),
@@ -106,7 +111,7 @@ describe('discriminated-union type guards (C6.4)', () => {
   });
 
   it('synthesizes an implicit discriminator from a shared distinct string const', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           beverage,
@@ -126,7 +131,7 @@ describe('discriminated-union type guards (C6.4)', () => {
   });
 
   it('finds the implicit discriminant through intersection (allOf) members', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('A', {
@@ -176,7 +181,7 @@ describe('discriminated-union type guards (C6.4)', () => {
   });
 
   it('emits no guards for an undiscriminated union (no shared const)', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('StringOrNumber', {
@@ -193,7 +198,7 @@ describe('discriminated-union type guards (C6.4)', () => {
   });
 
   it('emits no implicit guard when a member is not a ref to a named schema', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           beverage,
@@ -211,7 +216,7 @@ describe('discriminated-union type guards (C6.4)', () => {
   });
 
   it('emits no implicit guard when the shared const values are not distinct', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('X', {
@@ -248,7 +253,7 @@ describe('discriminated-union type guards (C6.4)', () => {
   });
 
   it('emits no implicit guard for a single-member union', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           beverage,
@@ -263,7 +268,7 @@ describe('discriminated-union type guards (C6.4)', () => {
   });
 
   it('emits no implicit guard when a member ref points to an unknown schema', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           beverage,
@@ -281,7 +286,7 @@ describe('discriminated-union type guards (C6.4)', () => {
   });
 
   it('emits no implicit guard when members pin different property names', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('P', {
@@ -318,7 +323,7 @@ describe('discriminated-union type guards (C6.4)', () => {
   });
 
   it('ignores non-literal properties while detecting the implicit discriminant', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('R1', {
@@ -366,7 +371,7 @@ describe('discriminated-union type guards (C6.4)', () => {
   });
 
   it('emits guards for a discriminated union nested as array items', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('SuccessItem', {
@@ -413,7 +418,7 @@ describe('discriminated-union type guards (C6.4)', () => {
   });
 
   it('emits guards for a discriminated union nested under a record value', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('Cat', {
@@ -446,7 +451,7 @@ describe('discriminated-union type guards (C6.4)', () => {
   });
 
   it('emits guards for a discriminated union nested under an object property', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('Cat', {
@@ -509,7 +514,7 @@ describe('discriminated-union type guards (C6.4)', () => {
           },
         },
       });
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           item('Ok', 'ok'),
@@ -524,7 +529,7 @@ describe('discriminated-union type guards (C6.4)', () => {
   });
 
   it('prefers the top-level named union param when a member also nests elsewhere', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           beverage,
@@ -570,7 +575,7 @@ describe('discriminated-union type guards (C6.4)', () => {
   });
 
   it('skips a nested union whose members are not all named refs', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           beverage,
@@ -595,7 +600,7 @@ describe('discriminated-union type guards (C6.4)', () => {
   });
 
   it('ignores non-string shared const when detecting implicit discriminators', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('N1', {
diff --git a/packages/client-generator/src/emitters/__tests__/types.test.ts b/packages/client-generator/src/emitters/__tests__/types.test.ts
index d3b090bc4f..a7672cbdec 100644
--- a/packages/client-generator/src/emitters/__tests__/types.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/types.test.ts
@@ -1,18 +1,23 @@
 import type { PropertyModel, SchemaModel } from '../../intermediate-representation/model.js';
-import { emitSingleFile } from '../client.js';
+import { emitClientSingleFile } from '../package-client.js';
 import { printNodes } from '../ts.js';
 import { renderSchema, schemaToTypeNode, typesStatements } from '../types.js';
 import { SCALAR, apiModel, namedSchema } from './fixtures.js';
 
+// The package arm keeps the emitted text free of the embedded runtime, so the
+// absence assertions below test the schema types/guards alone.
+const emitPackage: typeof emitClientSingleFile = (model, options = {}) =>
+  emitClientSingleFile(model, { ...options, runtime: 'package' });
+
 describe('renderTypes', () => {
   it('produces nothing when there are no schemas', () => {
-    const out = emitSingleFile(apiModel({ schemas: [] }));
+    const out = emitPackage(apiModel({ schemas: [] }));
     // Two consecutive blank lines would be a sign of an empty types block; check absence.
     expect(out).not.toContain('export type T');
   });
 
   it('emits each named schema with its description', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [namedSchema('Foo', { kind: 'scalar', scalar: 'string' }, 'a foo')],
       })
@@ -22,7 +27,7 @@ describe('renderTypes', () => {
   });
 
   it('prefers schema description over the named-schema description', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('Foo', { kind: 'scalar', scalar: 'string', description: 'inner' }, 'outer'),
@@ -35,7 +40,7 @@ describe('renderTypes', () => {
 
   it('omits JSDoc when the schema description is whitespace-only', () => {
     // Exercises the `!text.trim()` short-circuit inside renderJsDoc.
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [namedSchema('Foo', { kind: 'scalar', scalar: 'string' }, '   ')],
       })
@@ -46,7 +51,7 @@ describe('renderTypes', () => {
 
   it('trims leading and trailing blank lines from multi-line schema descriptions', () => {
     // Exercises both `start++` and `end--` arms of trimLines.
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('Foo', {
@@ -249,7 +254,7 @@ describe('renderSchema (and its branches)', () => {
 
 describe('JSDoc validation metadata (@minimum / @maxLength / @pattern / @format / @deprecated)', () => {
   it('renders numeric constraints as JSDoc tags on a named schema', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('Limit', {
@@ -266,7 +271,7 @@ describe('JSDoc validation metadata (@minimum / @maxLength / @pattern / @format
   });
 
   it('renders string constraints (minLength, maxLength, pattern, format) as JSDoc tags', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('Name', {
@@ -289,7 +294,7 @@ describe('JSDoc validation metadata (@minimum / @maxLength / @pattern / @format
   });
 
   it('renders array constraints (minItems, maxItems, uniqueItems) as JSDoc tags', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('Tags', {
@@ -308,7 +313,7 @@ describe('JSDoc validation metadata (@minimum / @maxLength / @pattern / @format
   });
 
   it('renders @exclusiveMinimum / @exclusiveMaximum in numeric form', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('Volume', {
@@ -324,7 +329,7 @@ describe('JSDoc validation metadata (@minimum / @maxLength / @pattern / @format
   });
 
   it('renders @deprecated as a presence-only tag', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('Old', {
@@ -340,7 +345,7 @@ describe('JSDoc validation metadata (@minimum / @maxLength / @pattern / @format
   });
 
   it('combines description text and tags in the same JSDoc block', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('Limit', {
@@ -408,7 +413,7 @@ describe('JSDoc validation metadata (@minimum / @maxLength / @pattern / @format
 
   it('escapes `*/` inside pattern strings so it cannot terminate the JSDoc block', () => {
     // Defensive guard: a regex pattern of `^a*/b$` would otherwise break the comment.
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('Tricky', {
@@ -483,14 +488,14 @@ describe('dateType knob (string → Date for date formats)', () => {
   });
 
   it('emits Date in the named-schema alias body under emitOptions dateType "Date"', () => {
-    const out = emitSingleFile(apiModel({ schemas: [namedSchema('Created', dateTime())] }), {
+    const out = emitPackage(apiModel({ schemas: [namedSchema('Created', dateTime())] }), {
       dateType: 'Date',
     });
     expect(out).toContain('export type Created = Date;');
   });
 
   it('leaves the named-schema alias as string by default', () => {
-    const out = emitSingleFile(apiModel({ schemas: [namedSchema('Created', dateTime())] }));
+    const out = emitPackage(apiModel({ schemas: [namedSchema('Created', dateTime())] }));
     expect(out).toContain('export type Created = string;');
   });
 
@@ -512,7 +517,7 @@ describe('enum style — const-object companion (C6.2)', () => {
   });
 
   it('emits a const-object companion for named string enums by default', () => {
-    const out = emitSingleFile(apiModel({ schemas: [orderStatus] }));
+    const out = emitPackage(apiModel({ schemas: [orderStatus] }));
     expect(out).toContain('export type OrderStatus = "placed" | "completed";');
     expect(out).toContain('export const OrderStatus = {');
     expect(out).toContain('placed: "placed",');
@@ -521,7 +526,7 @@ describe('enum style — const-object companion (C6.2)', () => {
   });
 
   it('emits only the union type when enumStyle is "union"', () => {
-    const out = emitSingleFile(apiModel({ schemas: [orderStatus] }), {
+    const out = emitPackage(apiModel({ schemas: [orderStatus] }), {
       enumStyle: 'union',
     });
     expect(out).toContain('export type OrderStatus = "placed" | "completed";');
@@ -529,7 +534,7 @@ describe('enum style — const-object companion (C6.2)', () => {
   });
 
   it('does not emit a const object for integer enums', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('Code', {
@@ -545,7 +550,7 @@ describe('enum style — const-object companion (C6.2)', () => {
   });
 
   it('does not emit a const object for boolean enums', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('Flag', {
@@ -560,7 +565,7 @@ describe('enum style — const-object companion (C6.2)', () => {
   });
 
   it('skips the const object when any value is not a valid identifier', () => {
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('Scope', {
@@ -578,7 +583,7 @@ describe('enum style — const-object companion (C6.2)', () => {
   it('skips the const object for a string-scalar enum that contains a non-string value', () => {
     // scalarForEnumValues can return 'string' for a mixed enum; the const-object
     // path must still bail when a value isn't actually a string.
-    const out = emitSingleFile(
+    const out = emitPackage(
       apiModel({
         schemas: [
           namedSchema('Mixed', {
diff --git a/packages/client-generator/src/emitters/auth.ts b/packages/client-generator/src/emitters/auth.ts
index 90b41b4051..8177306e50 100644
--- a/packages/client-generator/src/emitters/auth.ts
+++ b/packages/client-generator/src/emitters/auth.ts
@@ -1,747 +1,23 @@
+// The auth *naming* conventions of the generated surface. Credential injection itself
+// lives in the runtime (src/runtime/auth.ts); the wiring emitter only derives the
+// public setter names bound to the client instance's `auth` members.
+
 import type { SecuritySchemeModel } from '../intermediate-representation/model.js';
 import { pascalCase } from './support.js';
-import { constStatement, jsdoc, letStatement, printStatements, ts } from './ts.js';
-
-const { factory } = ts;
-
-/** A scheme whose credential resolves through `__resolve` (bearer or any apiKey). */
-function isResolvable(s: SecuritySchemeModel): boolean {
-  return s.kind === 'bearer' || s.kind.startsWith('apiKey');
-}
-
-/**
- * Emit the credential-injection layer: module-scoped credential slots, the
- * `set*` helpers that update them, and (when an operation is authed) the async
- * `__auth(schemes)` that turns the current slots into the request `headers` and
- * `query` for the schemes an operation accepts.
- *
- * - All `bearer`-kind schemes share one `__bearerToken` slot and one
- *   `setBearer()` helper (`Authorization: Bearer <token>`).
- * - All `basic`-kind schemes share one `__basicAuth` slot (the pre-encoded
- *   base64 `user:pass`) and one `setBasicAuth()` helper.
- * - Each apiKey scheme (header / query / cookie) gets its own slot + setter. The
- *   setter is named `setApiKey` when there's exactly one apiKey scheme of any
- *   `in`, else `setApiKey<Key>`.
- * - Bearer / apiKey credentials are `TokenProvider`s (a value or a possibly-async
- *   function), resolved per request via `__resolve`. `TokenProvider` is emitted
- *   only when such a scheme exists (a basic-only client never references it).
- * - `__resolve` / `__auth` are only emitted when at least one operation is
- *   actually authenticated; setters are always emitted when schemes exist so
- *   callers can wire credentials even for not-yet-used schemes.
- *
- * Returns `''` when the document declares no injectable schemes.
- */
-export function renderAuth(
-  schemes: SecuritySchemeModel[],
-  anyOperationAuthed: boolean,
-  exportHelpers: boolean
-): string {
-  return printStatements(authStatements(schemes, anyOperationAuthed, exportHelpers));
-}
-
-/** The credential-injection layer (slots, setters, `__resolve`/`__auth`) as nodes. */
-export function authStatements(
-  schemes: SecuritySchemeModel[],
-  anyOperationAuthed: boolean,
-  exportHelpers: boolean
-): ts.Statement[] {
-  if (schemes.length === 0) return [];
-
-  const hasBearer = schemes.some((s) => s.kind === 'bearer');
-  const hasBasic = schemes.some((s) => s.kind === 'basic');
-  const hasTokenScheme = schemes.some(isResolvable);
-  const apiKeySchemes = schemes.filter(
-    (
-      s
-    ): s is Extract<
-      SecuritySchemeModel,
-      { kind: 'apiKeyHeader' | 'apiKeyQuery' | 'apiKeyCookie' }
-    > => s.kind.startsWith('apiKey')
-  );
-  const soleApiKey = apiKeySchemes.length === 1;
-
-  const nodes: ts.Statement[] = [];
-
-  if (hasTokenScheme) nodes.push(tokenProviderType());
-  nodes.push(authCredentialsType(hasBearer, hasBasic, apiKeySchemes.length > 0));
-  if (hasBearer) nodes.push(...bearerBlock());
-  if (hasBasic) nodes.push(...basicBlock());
-  for (const scheme of apiKeySchemes) {
-    nodes.push(...apiKeyBlock(scheme.key, apiKeySetterName(scheme.key, soleApiKey)));
-  }
-
-  if (anyOperationAuthed) {
-    if (hasTokenScheme) nodes.push(resolveFn());
-    nodes.push(authFn(schemes, exportHelpers));
-  } else {
-    // No operation is authed, so nothing reads the credential slots; the setters
-    // above only write them. Under `noUnusedLocals` a write-only `let` trips
-    // TS6133, so reference each declared slot in a `void` no-op to keep the
-    // emitted file compiling. Setters stay public (callers may wire credentials
-    // for not-yet-used schemes), and `authSetterNames` stays consistent. Every
-    // scheme kind contributes exactly one slot, so with `schemes.length > 0`
-    // this list is always non-empty.
-    const slots: string[] = [];
-    if (hasBearer) slots.push('__bearerToken');
-    if (hasBasic) slots.push('__basicAuth');
-    for (const scheme of apiKeySchemes) slots.push(apiKeySlot(scheme.key));
-    for (const slot of slots) nodes.push(voidNoOp(slot));
-  }
-
-  return nodes;
-}
-
-const tokenProviderType_ = 'TokenProvider';
-
-/** `TokenProvider | null` — the type of every resolvable credential slot. */
-function tokenProviderOrNull(): ts.TypeNode {
-  return factory.createUnionTypeNode([
-    factory.createTypeReferenceNode(tokenProviderType_),
-    factory.createLiteralTypeNode(factory.createNull()),
-  ]);
-}
-
-/** `export type TokenProvider = string | (() => string | Promise<string>);` */
-function tokenProviderType(): ts.Statement {
-  const returns = factory.createUnionTypeNode([
-    factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
-    factory.createTypeReferenceNode('Promise', [
-      factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
-    ]),
-  ]);
-  const fnType = factory.createParenthesizedType(
-    factory.createFunctionTypeNode(undefined, [], returns)
-  );
-  return jsdoc(
-    factory.createTypeAliasDeclaration(
-      [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
-      tokenProviderType_,
-      undefined,
-      factory.createUnionTypeNode([
-        factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
-        fnType,
-      ])
-    ),
-    'A credential value, or a (possibly async) function that returns one per request.'
-  );
-}
-
-/**
- * `export type AuthCredentials = { … }` — the per-instance credential shape for
- * `ClientConfig.auth`, with one field per scheme kind the client actually declares.
- */
-function authCredentialsType(
-  hasBearer: boolean,
-  hasBasic: boolean,
-  hasApiKey: boolean
-): ts.Statement {
-  const opt = () => factory.createToken(ts.SyntaxKind.QuestionToken);
-  const str = () => factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
-  const members: ts.TypeElement[] = [];
-  if (hasBearer) {
-    members.push(
-      factory.createPropertySignature(
-        undefined,
-        'bearer',
-        opt(),
-        factory.createTypeReferenceNode(tokenProviderType_)
-      )
-    );
-  }
-  if (hasBasic) {
-    members.push(
-      factory.createPropertySignature(
-        undefined,
-        'basic',
-        opt(),
-        factory.createTypeLiteralNode([
-          factory.createPropertySignature(undefined, 'username', undefined, str()),
-          factory.createPropertySignature(undefined, 'password', undefined, str()),
-        ])
-      )
-    );
-  }
-  if (hasApiKey) {
-    members.push(
-      factory.createPropertySignature(
-        undefined,
-        'apiKey',
-        opt(),
-        factory.createTypeReferenceNode('Record', [
-          str(),
-          factory.createTypeReferenceNode(tokenProviderType_),
-        ])
-      )
-    );
-  }
-  return jsdoc(
-    factory.createTypeAliasDeclaration(
-      [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
-      'AuthCredentials',
-      undefined,
-      factory.createTypeLiteralNode(members)
-    ),
-    'Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global\n' +
-      '`set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back\n' +
-      'to the global slots.'
-  );
-}
-
-/** `let <name>: <type> = null;` */
-function nullableSlot(name: string, type: ts.TypeNode): ts.Statement {
-  return letStatement(name, factory.createNull(), type);
-}
-
-/** The shared `__bearerToken` slot + `setBearer` setter. */
-function bearerBlock(): ts.Statement[] {
-  const setter = factory.createFunctionDeclaration(
-    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
-    undefined,
-    'setBearer',
-    undefined,
-    [
-      factory.createParameterDeclaration(
-        undefined,
-        undefined,
-        'token',
-        undefined,
-        tokenProviderOrNull()
-      ),
-    ],
-    factory.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword),
-    factory.createBlock(
-      [
-        factory.createExpressionStatement(
-          factory.createBinaryExpression(
-            factory.createIdentifier('__bearerToken'),
-            factory.createToken(ts.SyntaxKind.EqualsToken),
-            factory.createIdentifier('token')
-          )
-        ),
-      ],
-      true
-    )
-  );
-  return [
-    nullableSlot('__bearerToken', tokenProviderOrNull()),
-    jsdoc(
-      setter,
-      'Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`\n' +
-        'on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a\n' +
-        '(possibly async) function resolved per request.'
-    ),
-  ];
-}
-
-/** The shared `__basicAuth` slot + `setBasicAuth` setter. */
-function basicBlock(): ts.Statement[] {
-  // `btoa(`${username}:${password}`)`
-  const encode = factory.createCallExpression(factory.createIdentifier('btoa'), undefined, [
-    factory.createTemplateExpression(factory.createTemplateHead(''), [
-      factory.createTemplateSpan(
-        factory.createIdentifier('username'),
-        factory.createTemplateMiddle(':')
-      ),
-      factory.createTemplateSpan(
-        factory.createIdentifier('password'),
-        factory.createTemplateTail('')
-      ),
-    ]),
-  ]);
-  const setter = factory.createFunctionDeclaration(
-    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
-    undefined,
-    'setBasicAuth',
-    undefined,
-    [
-      factory.createParameterDeclaration(
-        undefined,
-        undefined,
-        'username',
-        undefined,
-        factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)
-      ),
-      factory.createParameterDeclaration(
-        undefined,
-        undefined,
-        'password',
-        undefined,
-        factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)
-      ),
-    ],
-    factory.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword),
-    factory.createBlock(
-      [
-        factory.createExpressionStatement(
-          factory.createBinaryExpression(
-            factory.createIdentifier('__basicAuth'),
-            factory.createToken(ts.SyntaxKind.EqualsToken),
-            encode
-          )
-        ),
-      ],
-      true
-    )
-  );
-  return [
-    nullableSlot(
-      '__basicAuth',
-      factory.createUnionTypeNode([
-        factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
-        factory.createLiteralTypeNode(factory.createNull()),
-      ])
-    ),
-    jsdoc(setter, 'Set HTTP Basic credentials sent as `Authorization: Basic <base64>`.'),
-  ];
-}
-
-/** A per-apiKey scheme slot + its setter. */
-function apiKeyBlock(key: string, setterName: string): ts.Statement[] {
-  const slot = apiKeySlot(key);
-  const setter = factory.createFunctionDeclaration(
-    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
-    undefined,
-    setterName,
-    undefined,
-    [
-      factory.createParameterDeclaration(
-        undefined,
-        undefined,
-        'key',
-        undefined,
-        tokenProviderOrNull()
-      ),
-    ],
-    factory.createKeywordTypeNode(ts.SyntaxKind.VoidKeyword),
-    factory.createBlock(
-      [
-        factory.createExpressionStatement(
-          factory.createBinaryExpression(
-            factory.createIdentifier(slot),
-            factory.createToken(ts.SyntaxKind.EqualsToken),
-            factory.createIdentifier('key')
-          )
-        ),
-      ],
-      true
-    )
-  );
-  return [
-    nullableSlot(slot, tokenProviderOrNull()),
-    jsdoc(
-      setter,
-      `Set (or clear, with \`null\`) the credential for the \`${key}\` API-key scheme. Accepts a\n` +
-        'string or a (possibly async) function resolved per request.'
-    ),
-  ];
-}
-
-/**
- * `async function __resolve(slot: TokenProvider | null): Promise<string | null> {
- *    if (slot === null) return null;
- *    return typeof slot === 'function' ? slot() : slot;
- *  }`
- */
-function resolveFn(): ts.Statement {
-  const slotRef = factory.createIdentifier('slot');
-  const body = factory.createBlock(
-    [
-      factory.createIfStatement(
-        factory.createBinaryExpression(
-          slotRef,
-          factory.createToken(ts.SyntaxKind.EqualsEqualsEqualsToken),
-          factory.createNull()
-        ),
-        factory.createReturnStatement(factory.createNull())
-      ),
-      factory.createReturnStatement(
-        factory.createConditionalExpression(
-          factory.createBinaryExpression(
-            factory.createTypeOfExpression(slotRef),
-            factory.createToken(ts.SyntaxKind.EqualsEqualsEqualsToken),
-            factory.createStringLiteral('function')
-          ),
-          factory.createToken(ts.SyntaxKind.QuestionToken),
-          factory.createCallExpression(slotRef, undefined, []),
-          factory.createToken(ts.SyntaxKind.ColonToken),
-          slotRef
-        )
-      ),
-    ],
-    true
-  );
-  return jsdoc(
-    factory.createFunctionDeclaration(
-      [factory.createModifier(ts.SyntaxKind.AsyncKeyword)],
-      undefined,
-      '__resolve',
-      undefined,
-      [
-        factory.createParameterDeclaration(
-          undefined,
-          undefined,
-          'slot',
-          undefined,
-          tokenProviderOrNull()
-        ),
-      ],
-      factory.createTypeReferenceNode('Promise', [
-        factory.createUnionTypeNode([
-          factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
-          factory.createLiteralTypeNode(factory.createNull()),
-        ]),
-      ]),
-      body
-    ),
-    'Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.'
-  );
-}
-
-/** `const v = await __resolve(<source>);` — the per-case credential resolve. */
-function resolveConst(source: ts.Expression): ts.Statement {
-  return constStatement(
-    'v',
-    factory.createAwaitExpression(
-      factory.createCallExpression(factory.createIdentifier('__resolve'), undefined, [source])
-    )
-  );
-}
-
-/** `config.auth?.<prop>` — optional access into the per-instance credentials. */
-function configAuth(prop: string): ts.Expression {
-  return factory.createPropertyAccessChain(
-    factory.createPropertyAccessExpression(factory.createIdentifier('config'), 'auth'),
-    factory.createToken(ts.SyntaxKind.QuestionDotToken),
-    prop
-  );
-}
-
-/** `config.auth?.apiKey?.["<key>"]` — the per-instance apiKey credential for a scheme. */
-function configApiKey(key: string): ts.Expression {
-  return factory.createElementAccessChain(
-    factory.createPropertyAccessChain(
-      factory.createPropertyAccessExpression(factory.createIdentifier('config'), 'auth'),
-      factory.createToken(ts.SyntaxKind.QuestionDotToken),
-      'apiKey'
-    ),
-    factory.createToken(ts.SyntaxKind.QuestionDotToken),
-    factory.createStringLiteral(key)
-  );
-}
-
-/** `<perInstance> ?? <globalSlot>` — prefer the config's credential, fall back to the module slot. */
-function preferConfig(perInstance: ts.Expression, globalSlot: string): ts.Expression {
-  return factory.createBinaryExpression(
-    perInstance,
-    factory.createToken(ts.SyntaxKind.QuestionQuestionToken),
-    factory.createIdentifier(globalSlot)
-  );
-}
-
-/** `<target>[<key>] = <value>;` (string-literal element access). */
-function assignElement(target: string, key: string, value: ts.Expression): ts.Statement {
-  return factory.createExpressionStatement(
-    factory.createBinaryExpression(
-      factory.createElementAccessExpression(
-        factory.createIdentifier(target),
-        factory.createStringLiteral(key)
-      ),
-      factory.createToken(ts.SyntaxKind.EqualsToken),
-      value
-    )
-  );
-}
-
-/** `if (v !== null) <then>` — guard a resolved credential before injecting it. */
-function ifVResolved(then: ts.Statement): ts.Statement {
-  return factory.createIfStatement(
-    factory.createBinaryExpression(
-      factory.createIdentifier('v'),
-      factory.createToken(ts.SyntaxKind.ExclamationEqualsEqualsToken),
-      factory.createNull()
-    ),
-    then
-  );
-}
-
-/** The per-scheme `case "<key>":` clause that injects that scheme's credential. */
-function authCase(scheme: SecuritySchemeModel): ts.CaseClause {
-  const key = factory.createStringLiteral(scheme.key);
-  const breakStmt = factory.createBreakStatement();
-
-  if (scheme.kind === 'bearer') {
-    // `const v = await __resolve(__bearerToken); if (v !== null) headers['Authorization'] = `Bearer ${v}`;`
-    const bearerValue = factory.createTemplateExpression(factory.createTemplateHead('Bearer '), [
-      factory.createTemplateSpan(factory.createIdentifier('v'), factory.createTemplateTail('')),
-    ]);
-    return factory.createCaseClause(key, [
-      factory.createBlock(
-        [
-          resolveConst(preferConfig(configAuth('bearer'), '__bearerToken')),
-          ifVResolved(assignElement('headers', 'Authorization', bearerValue)),
-          breakStmt,
-        ],
-        true
-      ),
-    ]);
-  }
-
-  if (scheme.kind === 'basic') {
-    // Prefer per-instance `config.auth.basic` ({ username, password }, encoded here)
-    // over the module-global pre-encoded `__basicAuth`:
-    //   const b = config.auth?.basic;
-    //   const basic = b ? btoa(`${b.username}:${b.password}`) : __basicAuth;
-    //   if (basic !== null) headers['Authorization'] = `Basic ${basic}`;
-    const bDecl = constStatement('b', configAuth('basic'));
-    const encodeB = factory.createCallExpression(factory.createIdentifier('btoa'), undefined, [
-      factory.createTemplateExpression(factory.createTemplateHead(''), [
-        factory.createTemplateSpan(
-          factory.createPropertyAccessExpression(factory.createIdentifier('b'), 'username'),
-          factory.createTemplateMiddle(':')
-        ),
-        factory.createTemplateSpan(
-          factory.createPropertyAccessExpression(factory.createIdentifier('b'), 'password'),
-          factory.createTemplateTail('')
-        ),
-      ]),
-    ]);
-    const basicDecl = constStatement(
-      'basic',
-      factory.createConditionalExpression(
-        factory.createIdentifier('b'),
-        factory.createToken(ts.SyntaxKind.QuestionToken),
-        encodeB,
-        factory.createToken(ts.SyntaxKind.ColonToken),
-        factory.createIdentifier('__basicAuth')
-      )
-    );
-    const basicValue = factory.createTemplateExpression(factory.createTemplateHead('Basic '), [
-      factory.createTemplateSpan(factory.createIdentifier('basic'), factory.createTemplateTail('')),
-    ]);
-    return factory.createCaseClause(key, [
-      factory.createBlock(
-        [
-          bDecl,
-          basicDecl,
-          factory.createIfStatement(
-            factory.createBinaryExpression(
-              factory.createIdentifier('basic'),
-              factory.createToken(ts.SyntaxKind.ExclamationEqualsEqualsToken),
-              factory.createNull()
-            ),
-            assignElement('headers', 'Authorization', basicValue)
-          ),
-          breakStmt,
-        ],
-        true
-      ),
-    ]);
-  }
-
-  const slot = apiKeySlot(scheme.key);
-  const v = factory.createIdentifier('v');
-
-  if (scheme.kind === 'apiKeyHeader') {
-    return factory.createCaseClause(key, [
-      factory.createBlock(
-        [
-          resolveConst(preferConfig(configApiKey(scheme.key), slot)),
-          ifVResolved(assignElement('headers', scheme.headerName, v)),
-          breakStmt,
-        ],
-        true
-      ),
-    ]);
-  }
-
-  if (scheme.kind === 'apiKeyQuery') {
-    return factory.createCaseClause(key, [
-      factory.createBlock(
-        [
-          resolveConst(preferConfig(configApiKey(scheme.key), slot)),
-          ifVResolved(assignElement('query', scheme.paramName, v)),
-          breakStmt,
-        ],
-        true
-      ),
-    ]);
-  }
-
-  // apiKeyCookie: `cookies.push(<JSON-string of name+'='> + v)`. The name is a
-  // string literal concatenated with the runtime value — never interpolated into
-  // a backtick template, which a cookieName containing a backtick or `${` could
-  // break out of.
-  const push = factory.createExpressionStatement(
-    factory.createCallExpression(
-      factory.createPropertyAccessExpression(factory.createIdentifier('cookies'), 'push'),
-      undefined,
-      [
-        factory.createBinaryExpression(
-          factory.createStringLiteral(scheme.cookieName + '='),
-          factory.createToken(ts.SyntaxKind.PlusToken),
-          v
-        ),
-      ]
-    )
-  );
-  return factory.createCaseClause(key, [
-    factory.createBlock(
-      [resolveConst(preferConfig(configApiKey(scheme.key), slot)), ifVResolved(push), breakStmt],
-      true
-    ),
-  ]);
-}
-
-/** The async `__auth(schemes)` that builds request headers/query from the slots. */
-function authFn(schemes: SecuritySchemeModel[], exportHelpers: boolean): ts.Statement {
-  const recordStringString = factory.createTypeReferenceNode('Record', [
-    factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
-    factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
-  ]);
-
-  const declare = (name: string, type: ts.TypeNode, init: ts.Expression): ts.Statement =>
-    constStatement(name, init, type);
-
-  const loop = factory.createForOfStatement(
-    undefined,
-    factory.createVariableDeclarationList(
-      [factory.createVariableDeclaration('scheme')],
-      ts.NodeFlags.Const
-    ),
-    factory.createIdentifier('schemes'),
-    factory.createBlock(
-      [
-        factory.createSwitchStatement(
-          factory.createIdentifier('scheme'),
-          factory.createCaseBlock(schemes.map(authCase))
-        ),
-      ],
-      true
-    )
-  );
-
-  // `if (cookies.length > 0) headers['Cookie'] = cookies.join('; ');`
-  const cookieJoin = factory.createIfStatement(
-    factory.createBinaryExpression(
-      factory.createPropertyAccessExpression(factory.createIdentifier('cookies'), 'length'),
-      factory.createToken(ts.SyntaxKind.GreaterThanToken),
-      factory.createNumericLiteral('0')
-    ),
-    assignElement(
-      'headers',
-      'Cookie',
-      factory.createCallExpression(
-        factory.createPropertyAccessExpression(factory.createIdentifier('cookies'), 'join'),
-        undefined,
-        [factory.createStringLiteral('; ')]
-      )
-    )
-  );
-
-  const ret = factory.createReturnStatement(
-    factory.createObjectLiteralExpression(
-      [
-        factory.createShorthandPropertyAssignment('headers'),
-        factory.createShorthandPropertyAssignment('query'),
-      ],
-      false
-    )
-  );
-
-  const returnType = factory.createTypeReferenceNode('Promise', [
-    factory.createTypeLiteralNode([
-      factory.createPropertySignature(undefined, 'headers', undefined, recordStringString),
-      factory.createPropertySignature(undefined, 'query', undefined, recordStringString),
-    ]),
-  ]);
-
-  const modifiers: ts.ModifierLike[] = [];
-  if (exportHelpers) modifiers.push(factory.createModifier(ts.SyntaxKind.ExportKeyword));
-  modifiers.push(factory.createModifier(ts.SyntaxKind.AsyncKeyword));
-
-  return jsdoc(
-    factory.createFunctionDeclaration(
-      modifiers,
-      undefined,
-      '__auth',
-      undefined,
-      [
-        factory.createParameterDeclaration(
-          undefined,
-          undefined,
-          'schemes',
-          undefined,
-          factory.createArrayTypeNode(factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword))
-        ),
-        factory.createParameterDeclaration(
-          undefined,
-          undefined,
-          'config',
-          undefined,
-          factory.createTypeReferenceNode('ClientConfig')
-        ),
-      ],
-      returnType,
-      factory.createBlock(
-        [
-          declare('headers', recordStringString, factory.createObjectLiteralExpression([], false)),
-          declare('query', recordStringString, factory.createObjectLiteralExpression([], false)),
-          declare(
-            'cookies',
-            factory.createArrayTypeNode(factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)),
-            factory.createArrayLiteralExpression([], false)
-          ),
-          loop,
-          cookieJoin,
-          ret,
-        ],
-        true
-      )
-    ),
-    'Build the auth `headers` and `query` for an operation from the currently-set credentials.\n' +
-      'Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers\n' +
-      'can always override by passing their own `init.headers`.'
-  );
-}
-
-/** `void <slot>;` — keep a write-only slot from tripping `noUnusedLocals`. */
-function voidNoOp(slot: string): ts.Statement {
-  return factory.createExpressionStatement(
-    factory.createVoidExpression(factory.createIdentifier(slot))
-  );
-}
-
-/** Module-scoped variable name backing an apiKey scheme's current value. */
-function apiKeySlot(key: string): string {
-  return `__apiKey_${key.replace(/[^A-Za-z0-9]/g, '_')}`;
-}
 
 /**
  * Public setter name for an apiKey scheme: `setApiKey` when it's the only apiKey
  * scheme (of any `in`), else `setApiKey<Key>` to disambiguate.
  */
-function apiKeySetterName(key: string, sole: boolean): string {
+export function apiKeySetterName(key: string, sole: boolean): string {
   return sole ? 'setApiKey' : `setApiKey${pascalCase(key)}`;
 }
 
 /**
- * The public type names `renderAuth` exports for a set of schemes — `TokenProvider`
- * when any bearer/apiKey scheme exists, else none. Multi-file writers re-export
- * these from the entry module's type barrel.
- */
-export function authTypeNames(schemes: SecuritySchemeModel[]): string[] {
-  if (schemes.length === 0) return [];
-  const names: string[] = [];
-  if (schemes.some(isResolvable)) names.push('TokenProvider');
-  names.push('AuthCredentials');
-  return names;
-}
-
-/**
- * The public credential-setter names `renderAuth` exports for a set of schemes,
+ * The public credential-setter names the client exports for a set of schemes,
  * in emission order (`setBearer`, then `setBasicAuth`, then each apiKey setter).
- * Multi-file writers re-export these from the entry module so callers still get
- * one import.
+ * Also seeds the reserved-identifier set (`packageIdents`) so operation names
+ * can't collide with a setter.
  */
 export function authSetterNames(schemes: SecuritySchemeModel[]): string[] {
   const names: string[] = [];
diff --git a/packages/client-generator/src/emitters/client.ts b/packages/client-generator/src/emitters/client.ts
index 1b17d7e1b0..5a63a00a81 100644
--- a/packages/client-generator/src/emitters/client.ts
+++ b/packages/client-generator/src/emitters/client.ts
@@ -1,47 +1,21 @@
-import type {
-  ApiModel,
-  OperationModel,
-  SecuritySchemeModel,
-} from '../intermediate-representation/model.js';
-import { collectOperationRefs } from '../intermediate-representation/refs.js';
-import { authSetterNames, authStatements, authTypeNames } from './auth.js';
-import {
-  type ArgsStyle,
-  type Facade,
-  isTypedMultipart,
-  operationsBlockStatements,
-  operationsMetaStatements,
-  serviceClassName,
-} from './operations.js';
-import { PUBLIC_RUNTIME_TYPES, runtimeStatements, type OperationContextTypes } from './runtime.js';
-import { isSseOp, sseFragmentName } from './sse.js';
+import type { ApiModel } from '../intermediate-representation/model.js';
+import type { ArgsStyle } from './operations.js';
 import { splitLines } from './support.js';
-import { escapeJsDoc, printNodes, printStatements, ts } from './ts.js';
-import { typeGuardStatements } from './type-guards.js';
-import { type DateType, type EnumStyle, typesStatements } from './types.js';
+import { escapeJsDoc } from './ts.js';
+import type { DateType, EnumStyle } from './types.js';
 
-// The public option vocabulary and the writer-facing utilities are re-exported
-// from this composition module, so writers and the package barrel import the
-// emitter surface from one place — the carved-out structural emitters stay
-// internal to `emitters/`.
-export { serviceClassName } from './operations.js';
-export type { ArgsStyle, Facade } from './operations.js';
-
-const { factory } = ts;
+// The public option vocabulary is re-exported from this composition module, so
+// writers and the package barrel import the emitter surface from one place.
+export type { ArgsStyle } from './operations.js';
 
 /** The generated-by banner prepended to every emitted module. */
 export const HEADER = `// Generated by @redocly/client-generator — do not edit by hand.
 // Source: OpenAPI document. Re-run \`redocly generate-client\` to update.`;
 
-/** The security-scheme keys whose credential is injected as a URL query param. */
-function queryAuthKeysFor(schemes: SecuritySchemeModel[]): Set<string> {
-  return new Set(schemes.filter((s) => s.kind === 'apiKeyQuery').map((s) => s.key));
-}
-
 export type EmitOptions = {
   /**
-   * Override the BASE URL inlined into the emitted runtime. When omitted, the
-   * value is derived from `servers[0].url` in the source OpenAPI document.
+   * Override the server URL baked into the generated client config. When omitted,
+   * the value is derived from `servers[0].url` in the source OpenAPI document.
    */
   serverUrl?: string;
   /**
@@ -52,18 +26,11 @@ export type EmitOptions = {
    *   the values at runtime (`X.a`).
    */
   enumStyle?: EnumStyle;
-  /** Developer-facing operation shape. Defaults to `'functions'`. */
-  facade?: Facade;
   /**
-   * How operation inputs are passed to each function/method. Defaults to
-   * `'flat'`; `'grouped'` bundles inputs into a single `args` object.
+   * How operation inputs are passed to each call. Defaults to `'flat'`;
+   * `'grouped'` bundles inputs into a single `args` object.
    */
   argsStyle?: ArgsStyle;
-  /**
-   * Class name for the `service-class` facade in single/split layouts. Ignored by
-   * the `functions` facade and by per-tag service classes. Defaults to `'Client'`.
-   */
-  name?: string;
   /** Error-handling shape of the generated client. Defaults to `'throw'`. */
   errorMode?: 'throw' | 'result';
   /**
@@ -87,454 +54,25 @@ export type EmitOptions = {
   /** Seed for faker-mode mocks: emits a top-level `faker.seed(<n>)` so runs reproduce. */
   mockSeed?: number;
   /**
-   * A pre-baked publisher setup block (from `bakeSetup`) appended at the end of the single-file
-   * client, after the runtime + `configure`/`use` definitions. Absent when no `--setup` is given.
+   * A pre-baked publisher setup block (from `bakeSetup`) merged into the client's config
+   * via `mergeSetup`. Absent when no `--setup` is given.
    */
   setup?: string;
+  /** Runtime distribution: 'inline' (default, self-contained) | 'package' (imports @redocly/client-generator). */
+  runtime?: 'inline' | 'package';
 };
 
-/**
- * The independent code fragments that make up a generated client — an *internal*
- * breakdown, each a list of `ts.Statement`s. `emitSingleFile` concatenates them
- * into one file and prints once; `emitModules` composes them into the shared
- * modules writers consume. Never exposed to writers, so the fragment set can
- * change without touching them.
- */
-type ClientFragments = {
-  title: string;
-  types: ts.Statement[];
-  typeGuards: ts.Statement[];
-  /**
-   * The `OPERATIONS` metadata map (+ `OperationId` / `OperationMetadata` types).
-   * Pure data with no runtime or type dependencies, so multi-file writers place it
-   * in the shared schemas module alongside the model types.
-   */
-  operationsMeta: ts.Statement[];
-  runtime: ts.Statement[];
-  auth: ts.Statement[];
-  operations: ts.Statement[];
-};
-
-/**
- * The operation-union wiring derived from the model: `opCtx` narrows the runtime's `OperationContext`
- * field types, and `opNames` is the type-only import list the http module pulls from the schemas
- * module in multi-file layouts. Falls back to all-`string` (and no import) when the spec has no
- * operations; tags fall back to `string[]` (no `OperationTag`) when no operation is tagged.
- */
-function operationUnionInfo(allOps: OperationModel[]): {
-  opCtx: OperationContextTypes;
-  opNames: string[];
-} {
-  const hasOps = allOps.length > 0;
-  const hasTags = allOps.some((op) => op.tags.length > 0);
-  return {
-    opCtx: {
-      id: hasOps ? 'OperationId' : 'string',
-      path: hasOps ? 'OperationPath' : 'string',
-      tags: hasTags ? 'OperationTag[]' : 'string[]',
-    },
-    opNames: hasOps
-      ? hasTags
-        ? ['OperationId', 'OperationPath', 'OperationTag']
-        : ['OperationId', 'OperationPath']
-      : [],
-  };
-}
-
-function renderFragments(
-  model: ApiModel,
-  options: EmitOptions,
-  exportHelpers: boolean
-): ClientFragments {
-  const serverUrl = options.serverUrl ?? model.serverUrl;
-  const enumStyle: EnumStyle = options.enumStyle ?? 'const-object';
-  const errorMode = options.errorMode ?? 'throw';
-  const dateType: DateType = options.dateType ?? 'string';
-  const needsHeaderHelper = model.services.some((s) =>
-    s.operations.some((op) => op.headerParams.length > 0)
-  );
-  const needsAuthHelper = model.services.some((s) =>
-    s.operations.some((op) => op.security.length > 0)
-  );
-  const allOps = model.services.flatMap((s) => s.operations);
-  const needsSse = allOps.some(isSseOp);
-  // The `__toFormData` runtime helper is emitted only when some operation has a typed
-  // multipart body (object schema); `__send` serializes it after the onRequest chain.
-  const needsMultipart = allOps.some((op) => op.requestBody && isTypedMultipart(op.requestBody));
-  // ClientConfig gains an `auth?: AuthCredentials` field (per-instance credentials)
-  // whenever the client has injectable security schemes — the type the auth emitter
-  // produces. Gated so non-auth clients are byte-identical.
-  const authConfig = model.securitySchemes.length > 0;
-  return {
-    title: renderTitleComment(model),
-    types: typesStatements(model.schemas, enumStyle, dateType),
-    typeGuards: typeGuardStatements(model.schemas),
-    operationsMeta: operationsMetaStatements(allOps),
-    runtime: runtimeStatements(
-      serverUrl,
-      needsHeaderHelper,
-      exportHelpers,
-      errorMode,
-      needsSse,
-      authConfig,
-      needsMultipart,
-      operationUnionInfo(allOps).opCtx
-    ),
-    auth: authStatements(model.securitySchemes, needsAuthHelper, exportHelpers),
-    operations: operationsBlockStatements(allOps, {
-      facade: options.facade ?? 'functions',
-      className: options.name ?? 'Client',
-      argsStyle: options.argsStyle ?? 'flat',
-      errorMode,
-      dateType,
-      queryAuthKeys: queryAuthKeysFor(model.securitySchemes),
-      schemaNames: new Set(model.schemas.map((s) => s.name)),
-      bakedSetup: !!options.setup,
-    }),
-  };
-}
-
-export function emitSingleFile(model: ApiModel, options: EmitOptions = {}): string {
-  const f = renderFragments(model, options, false);
-  return banner([
-    HEADER,
-    f.title,
-    printStatements([
-      ...f.types,
-      ...f.typeGuards,
-      ...f.operationsMeta,
-      ...f.runtime,
-      ...f.auth,
-      ...f.operations,
-    ]),
-    // Publisher setup baked in last, so `configure`/`use` are already defined when it runs.
-    ...(options.setup ? [setupApply(options.setup, options.facade ?? 'functions', false)] : []),
-  ]);
-}
-
-/**
- * Render the baked publisher setup (`--setup`). `setupExpr` is the neutral expression from
- * `bakeSetup`; it becomes a module-scoped `const __redoclySetup`. Applied per facade:
- * - `functions`: also call `configure`/`use` so the global config + middleware chain are set.
- * - `service-class`: declaration only — the generated class constructor merges `__redoclySetup`
- *   into each instance's `config`. `exported` re-exports it from the http module so per-tag service
- *   classes in multi-file layouts can import it.
- */
-export function setupApply(setupExpr: string, facade: Facade, exported: boolean): string {
-  // Annotated so `.config`/`.middleware` are always accessible (a setup with only `config` would
-  // otherwise infer a type without a `middleware` property, breaking the service-class merge).
-  const decl = `${exported ? 'export ' : ''}const __redoclySetup: { config?: ClientConfig; middleware?: Middleware[] } = ${setupExpr};`;
-  const header = '// ─── Baked-in setup (--setup) ───';
-  if (facade === 'service-class') return `${header}\n${decl}`;
-  return `${header}\n${decl}\nconfigure(__redoclySetup.config ?? {});\nuse(...(__redoclySetup.middleware ?? []));`;
-}
-
 /**
  * Assemble file content from a header banner and a printed body: the leading
  * `// Generated by …` comment and the `/** title *​/` block are structural
  * banners (not part of the printed AST), prepended with blank-line separation.
  * Trailing newline mirrors a hand-authored file.
  */
-function banner(sections: string[]): string {
+export function banner(sections: string[]): string {
   return sections.filter((s) => s.length > 0).join('\n\n') + '\n';
 }
 
-/**
- * The writer-facing view of an emitted client. The shared-module contents are
- * eager strings; the per-file wiring (`renderEndpoints`, `endpointImports`,
- * `publicReexport`) are methods because they depend on the writer's chosen file
- * names (`stem`, `prefix`) and operation grouping. `emitSingleFile` is the
- * single-file counterpart that needs none of this.
- */
-export type ClientModules = {
-  /** The generated-by header comment, prepended to every emitted file. */
-  header: string;
-  /**
-   * Shared http module: runtime + auth state + public setters. A method (not a string) because the
-   * narrowed `OperationContext` type-imports `OperationId`/`OperationPath`/`OperationTag` from the
-   * `<stem>.schemas` module, so the content depends on the writer's chosen stem.
-   */
-  http(stem: string): string;
-  /** Shared schemas module: model types + type guards + operation metadata. */
-  schemas: string;
-  /** Whether the schemas module exports anything (else its file + re-export are skipped). */
-  hasSchemas: boolean;
-  /** Every operation rendered together (the `split` entry file's endpoints). */
-  operations: string;
-  /** Render a subset of operations as their own block, for per-tag layouts. */
-  renderEndpoints(ops: OperationModel[], className: string): string;
-  /**
-   * The import header an endpoints file needs: the schema types it references and
-   * the runtime helpers it uses. `prefix` is the relative path back to the shared
-   * modules (`./` beside them, `../` one folder deeper, as in `tags-split`).
-   */
-  endpointImports(ops: OperationModel[], stem: string, prefix?: string): string;
-  /** Re-export the public runtime surface (values + config types) from the http module. */
-  publicReexport(stem: string): string;
-  /**
-   * The entry-barrel `export const sse = { ...frag }` merging per-tag SSE fragments
-   * (functions facade). Empty string when none.
-   */
-  sseBarrel(groups: { tagStem: string; moduleSpec: string; ops: OperationModel[] }[]): string;
-};
-
-/**
- * Build the multi-file view of a client. The operation-facing runtime helpers are
- * `export`ed (endpoints import them from the shared http module); `facade` and
- * `argsStyle` are captured here so writers needn't thread them through.
- */
-export function emitModules(model: ApiModel, options: EmitOptions = {}): ClientModules {
-  const f = renderFragments(model, options, true);
-  const facade = options.facade ?? 'functions';
-  const argsStyle = options.argsStyle ?? 'flat';
-  const errorMode = options.errorMode ?? 'throw';
-  const dateType: DateType = options.dateType ?? 'string';
-  const queryAuthKeys = queryAuthKeysFor(model.securitySchemes);
-  const schemaNames = new Set(model.schemas.map((s) => s.name));
-  const allOps = model.services.flatMap((s) => s.operations);
-  const hasSse = allOps.some(isSseOp);
-  const { opNames } = operationUnionInfo(allOps);
-  return {
-    header: HEADER,
-    http: (stem) => httpModuleContent(f, options, stem, opNames),
-    schemas: schemasModuleContent(f),
-    hasSchemas: hasSchemas(f),
-    operations: printStatements(f.operations),
-    renderEndpoints: (ops, className) =>
-      printStatements(
-        operationsBlockStatements(ops, {
-          facade,
-          className,
-          argsStyle,
-          errorMode,
-          dateType,
-          queryAuthKeys,
-          schemaNames,
-          bakedSetup: !!options.setup,
-          // Per-tag SSE aggregates carry the class-derived name so the barrel can
-          // re-merge them without collisions.
-          sseExportName: sseFragmentName(className),
-        })
-      ),
-    endpointImports: (ops, stem, prefix) =>
-      printNodes(endpointImportNodes(ops, stem, facade, errorMode, prefix, !!options.setup)),
-    publicReexport: (stem) =>
-      printNodes(publicReexportNodes(stem, model.securitySchemes, options.errorMode, hasSse)),
-    sseBarrel: (groups) => {
-      if (facade !== 'functions') return '';
-      const withSse = groups.filter((g) => g.ops.some(isSseOp));
-      if (withSse.length === 0) return '';
-      // `serviceClassName` is applied exactly once (on the raw tag stem) here and in
-      // `renderEndpoints`, so the producer fragment and this import agree.
-      const frags = withSse.map((g) => sseFragmentName(serviceClassName(g.tagStem)));
-      const imports = withSse
-        .map((g, i) => `import { ${frags[i]} } from '${g.moduleSpec}';`)
-        .join('\n');
-      const spread = frags.map((f) => `...${f}`).join(', ');
-      return `${imports}\nexport const sse = { ${spread} };`;
-    },
-  };
-}
-
-/**
- * The relative-import basename for emitting `from './<stem>.<kind>.js'`. The `.js`
- * extension is required for `nodenext` (node-style) module resolution and accepted by
- * bundler resolution, so generated imports stay portable. Writers also use this to
- * wire the barrel's cross-module re-exports.
- */
-export function moduleSpecifier(stem: string, kind: 'schemas' | 'http', prefix = './'): string {
-  return `${prefix}${stem}.${kind}.js`;
-}
-
-/** The shared http module's content: runtime + auth state + public setters. */
-function httpModuleContent(
-  f: ClientFragments,
-  options: EmitOptions,
-  stem: string,
-  opNames: string[]
-): string {
-  const facade = options.facade ?? 'functions';
-  // The narrowed `OperationContext` references the operation unions, which live in the schemas
-  // module; pull them in type-only (erased, zero-dep, acyclic). Empty when the spec has no operations.
-  const importLine =
-    opNames.length > 0
-      ? `import type { ${opNames.join(', ')} } from "${moduleSpecifier(stem, 'schemas')}";`
-      : '';
-  // The baked setup lives in the shared http module: `configure`/`use` are defined here, and every
-  // layout's entry imports it, so it runs on load. Service-class exports `__redoclySetup` so each
-  // per-tag class module can import and merge it.
-  const setup = options.setup
-    ? [setupApply(options.setup, facade, facade === 'service-class')]
-    : [];
-  return banner(
-    [HEADER, importLine, printStatements([...f.runtime, ...f.auth]), ...setup].filter(Boolean)
-  );
-}
-
-/** The shared schemas module's content: model types + type guards + operation metadata. */
-function schemasModuleContent(f: ClientFragments): string {
-  return banner([HEADER, printStatements([...f.types, ...f.typeGuards, ...f.operationsMeta])]);
-}
-
-/** True when the schemas module actually exports anything. */
-function hasSchemas(f: ClientFragments): boolean {
-  return f.types.length > 0 || f.typeGuards.length > 0 || f.operationsMeta.length > 0;
-}
-
-/** The named types a set of operations references, sorted for deterministic imports. */
-function typeNamesFor(ops: OperationModel[], errorMode: 'throw' | 'result'): string[] {
-  const refs = new Set<string>();
-  for (const op of ops) {
-    for (const ref of collectOperationRefs(op, errorMode)) refs.add(ref);
-  }
-  return [...refs].sort();
-}
-
-/** The runtime helpers a set of operations imports from the http module. */
-function helperNamesFor(ops: OperationModel[], errorMode: 'throw' | 'result'): string[] {
-  const helpers: string[] = [];
-  // `__buildUrl` is used by both SSE and regular ops; the request terminal
-  // (`__requestResult` in result mode, `__request` in throw mode) only by regular
-  // ops, and `__sse` only by SSE ops — guard each so an SSE-only or regular-only
-  // file never imports a helper it doesn't reference (`noUnusedLocals`).
-  if (ops.length > 0) helpers.push('__buildUrl');
-  if (ops.some((op) => !isSseOp(op)))
-    helpers.push(errorMode === 'result' ? '__requestResult' : '__request');
-  if (ops.some(isSseOp)) helpers.push('__sse');
-  if (ops.some((op) => op.security.length > 0)) helpers.push('__auth');
-  if (ops.some((op) => op.headerParams.length > 0)) helpers.push('__headers');
-  // `__toFormData` is not imported here: `__send` (in the runtime module) serializes a
-  // multipart body itself, so the endpoints module never references the helper.
-  return helpers.sort();
-}
-
-/**
- * The import declarations an endpoints file needs: referenced types + used helpers.
- *
- * The `facade` decides how the config is reached: the functions facade imports the
- * global `__config` value; the service-class facade imports the `ClientConfig` type
- * for its constructor (each instance carries its own config).
- */
-function endpointImportNodes(
-  ops: OperationModel[],
-  stem: string,
-  facade: Facade,
-  errorMode: 'throw' | 'result',
-  prefix = './',
-  bakedSetup = false
-): ts.ImportDeclaration[] {
-  const typeNames = typeNamesFor(ops, errorMode);
-  const httpValues = helperNamesFor(ops, errorMode);
-  if (facade === 'functions') httpValues.push('__config');
-  // A service-class constructor merges the baked `__redoclySetup` (exported from the http module).
-  if (facade === 'service-class' && bakedSetup) httpValues.push('__redoclySetup');
-  httpValues.sort();
-  // The class constructor needs the `ClientConfig` *type*; pull it from the http
-  // module via an inline `type` modifier so the value/type imports stay one
-  // declaration. Every listed type must be referenced by this file's emitted code,
-  // else `noUnusedLocals` trips: `RequestOptions` is only the per-call init of a
-  // regular op (SSE ops take `SseOptions`); `Result<…>` is only named by a
-  // regular op in result mode; `ServerSentEvent`/`SseOptions` only by an SSE op.
-  const hasRegular = ops.some((op) => !isSseOp(op));
-  const hasSse = ops.some(isSseOp);
-  const httpTypeNames = [
-    // The class constructor needs `ClientConfig`; its `use()` method needs `Middleware`.
-    ...(facade === 'service-class' ? ['ClientConfig', 'Middleware'] : []),
-    ...(hasRegular ? ['RequestOptions'] : []),
-    ...(errorMode === 'result' && hasRegular ? ['Result'] : []),
-    ...(hasSse ? ['ServerSentEvent', 'SseOptions'] : []),
-  ];
-
-  const decls: ts.ImportDeclaration[] = [];
-  if (typeNames.length > 0) {
-    decls.push(importDeclaration(true, typeNames, moduleSpecifier(stem, 'schemas', prefix)));
-  }
-  // Always non-empty: every facade reaches the http module — the functions facade
-  // for `__config`, the service-class facade for the `ClientConfig` type. Inline
-  // `type` modifiers keep value and type imports in one declaration.
-  decls.push(
-    importDeclaration(
-      false,
-      [
-        ...httpValues.map((name) => ({ name })),
-        ...httpTypeNames.map((name) => ({ name, typeOnly: true })),
-      ],
-      moduleSpecifier(stem, 'http', prefix)
-    )
-  );
-  return decls;
-}
-
-/**
- * Re-export the public runtime surface from the http module: the values
- * (`ApiError`, `setServerUrl`, `configure`, auth setters) and the config types
- * (`PUBLIC_RUNTIME_TYPES` — `ClientConfig`, `RequestContext`, `RequestOptions`,
- * and the retry types) so callers get the whole surface from the entry.
- */
-function publicReexportNodes(
-  stem: string,
-  schemes: SecuritySchemeModel[],
-  errorMode: 'throw' | 'result' | undefined,
-  hasSse: boolean
-): ts.ExportDeclaration[] {
-  const values = [
-    'ApiError',
-    'configure',
-    'use',
-    'setServerUrl',
-    ...authSetterNames(schemes),
-  ].sort();
-  const types = [
-    ...PUBLIC_RUNTIME_TYPES,
-    ...authTypeNames(schemes),
-    ...(errorMode === 'result' ? ['Result'] : []),
-    // `ServerSentEvent`/`SseOptions` are conditionally re-exported (not in
-    // PUBLIC_RUNTIME_TYPES) so a non-SSE client's barrel stays free of them.
-    ...(hasSse ? ['ServerSentEvent', 'SseOptions'] : []),
-  ].sort();
-  const spec = moduleSpecifier(stem, 'http');
-  return [exportDeclaration(false, values, spec), exportDeclaration(true, types, spec)];
-}
-
-/** `import [type] { <a>, type <b>, … } from '<spec>';` */
-function importDeclaration(
-  typeOnly: boolean,
-  names: readonly (string | { name: string; typeOnly?: boolean })[],
-  spec: string
-): ts.ImportDeclaration {
-  const specifiers = names.map((n) => {
-    const { name, typeOnly: inline } = typeof n === 'string' ? { name: n, typeOnly: false } : n;
-    return factory.createImportSpecifier(
-      inline ?? false,
-      undefined,
-      factory.createIdentifier(name)
-    );
-  });
-  return factory.createImportDeclaration(
-    undefined,
-    // Boolean overload (not the phase-modifier `SyntaxKind.TypeKeyword` overload, which
-    // only exists in TS 5.9+): runtime-stable across our `>=5.5` peer range. The TS6387
-    // deprecation hint on TS 6.x is harmless — emitted output is byte-identical.
-    factory.createImportClause(typeOnly, undefined, factory.createNamedImports(specifiers)),
-    factory.createStringLiteral(spec)
-  );
-}
-
-/** `export [type] { <a>, <b>, … } from '<spec>';` */
-function exportDeclaration(typeOnly: boolean, names: string[], spec: string): ts.ExportDeclaration {
-  return factory.createExportDeclaration(
-    undefined,
-    typeOnly,
-    factory.createNamedExports(
-      names.map((name) =>
-        factory.createExportSpecifier(false, undefined, factory.createIdentifier(name))
-      )
-    ),
-    factory.createStringLiteral(spec)
-  );
-}
-
-function renderTitleComment(model: ApiModel): string {
+export function renderTitleComment(model: ApiModel): string {
   // This banner is a raw string (it does not flow through `jsdoc()`), so escape
   // `*/` here too — `info.title`/`info.description` are attacker-controllable and
   // would otherwise close the comment and inject code at the top of every file.
diff --git a/packages/client-generator/src/emitters/descriptor.ts b/packages/client-generator/src/emitters/descriptor.ts
new file mode 100644
index 0000000000..8e47b1b407
--- /dev/null
+++ b/packages/client-generator/src/emitters/descriptor.ts
@@ -0,0 +1,276 @@
+// Package-mode descriptor emission: the identifier plan for a generated module that
+// shares scope with the `@redocly/client-generator` wiring, plus the `OPERATIONS`
+// descriptor map (`satisfies Record<string, OperationDescriptor>` — the semver skew
+// guard against the runtime contract in src/runtime/types.ts).
+
+import type {
+  ApiModel,
+  OperationModel,
+  SecuritySchemeModel,
+} from '../intermediate-representation/model.js';
+import type { SecuritySpec } from '../runtime/types.js';
+import { allOperations } from '../writers/util.js';
+import { authSetterNames } from './auth.js';
+import { isIdentifier, uniqueIdent } from './identifier.js';
+import { variablesTypeLiteral } from './operation-aliases.js';
+import { operationSignature } from './operation-signature.js';
+import { computeResponse, errorTypeNodes, isTypedMultipart } from './operation-types.js';
+import type { EmitContext } from './operations.js';
+import { isSseOp, sseDataKind, sseEventType } from './sse.js';
+import { pascalCase } from './support.js';
+import { jsdoc, parseStatements, ts } from './ts.js';
+import type { DateType } from './types.js';
+
+const { factory } = ts;
+
+/** Module-scope identifiers every package-mode file emits or imports — never renamed. */
+const WIRING_NAMES = [
+  'client',
+  'OPERATIONS',
+  'Ops',
+  'OperationId',
+  'OperationPath',
+  'OperationTag',
+  'createClient',
+  'mergeSetup',
+  'ApiError',
+  'configure',
+  'use',
+  'auth',
+  'ClientConfig',
+  'RequestOptions',
+  'SseOptions',
+  'Middleware',
+  'OperationDescriptor',
+  'ServerSentEvent',
+  'Result',
+  'TokenProvider',
+  '__redoclySetup',
+];
+
+/**
+ * Operation-name → emitted-identifier plan. The full reserved set (wiring + imported
+ * bindings + auth sugar, computed from the model FIRST) is seeded before any operation
+ * is sanitized, so collisions rename the operation (`configure` → `configure_2`)
+ * deterministically regardless of document order.
+ */
+export function packageIdents(model: ApiModel): Map<string, string> {
+  const used = new Set<string>([...WIRING_NAMES, ...authSetterNames(model.securitySchemes)]);
+  const idents = new Map<string, string>();
+  for (const op of allOperations(model.services)) idents.set(op.name, uniqueIdent(op.name, used));
+  return idents;
+}
+
+/** Plain JSON value → ts.Expression (strings/numbers/booleans/null/arrays/objects). */
+export function literalExpr(value: unknown): ts.Expression {
+  if (typeof value === 'string') return factory.createStringLiteral(value);
+  if (typeof value === 'number') return factory.createNumericLiteral(value);
+  if (typeof value === 'boolean') return value ? factory.createTrue() : factory.createFalse();
+  if (value === null) return factory.createNull();
+  if (Array.isArray(value)) {
+    return factory.createArrayLiteralExpression(value.map(literalExpr), false);
+  }
+  return factory.createObjectLiteralExpression(
+    // Keys quoted only when they fail the identifier GRAMMAR — reserved words
+    // (the descriptor's `in` field) are legal bare object-literal keys.
+    Object.entries(value as Record<string, unknown>).map(([k, v]) =>
+      factory.createPropertyAssignment(
+        isIdentifier(k) ? k : factory.createStringLiteral(k),
+        literalExpr(v)
+      )
+    ),
+    false
+  );
+}
+
+/** One operation's OperationDescriptor as plain data (only non-default fields present). */
+function descriptorValue(op: OperationModel, schemes: SecuritySchemeModel[], dateType: DateType) {
+  const params = [...op.pathParams, ...op.queryParams, ...op.headerParams].map((p) => ({
+    name: p.name,
+    in: p.in,
+    ...(p.style !== undefined ? { style: p.style } : {}),
+    ...(p.explode !== undefined ? { explode: p.explode } : {}),
+    ...(p.allowReserved !== undefined ? { allowReserved: p.allowReserved } : {}),
+  }));
+  const security = op.security.flatMap((key): SecuritySpec[] => {
+    const s = schemes.find((scheme) => scheme.key === key);
+    if (!s) return [];
+    if (s.kind === 'bearer' || s.kind === 'basic') return [{ scheme: key, kind: s.kind }];
+    if (s.kind === 'apiKeyHeader') {
+      return [{ scheme: key, kind: 'apiKey', name: s.headerName, in: 'header' }];
+    }
+    if (s.kind === 'apiKeyQuery') {
+      return [{ scheme: key, kind: 'apiKey', name: s.paramName, in: 'query' }];
+    }
+    return [{ scheme: key, kind: 'apiKey', name: s.cookieName, in: 'cookie' }];
+  });
+  const sse = isSseOp(op);
+  const responseKind = sse ? 'sse' : computeResponse(op.successResponses, dateType).responseKind;
+  return {
+    // The spec's operationId, NOT the (possibly renamed) map key: `id` drives middleware
+    // targeting (`ctx.operation.id`) and must match inline mode's `operationMetaExpr`.
+    id: op.name,
+    method: op.method.toUpperCase(),
+    path: op.path,
+    ...(op.tags.length > 0 ? { tags: op.tags } : {}),
+    ...(params.length > 0 ? { params } : {}),
+    ...(op.requestBody
+      ? {
+          body: {
+            contentType: op.requestBody.contentType,
+            ...(isTypedMultipart(op.requestBody) ? { multipart: true } : {}),
+          },
+        }
+      : {}),
+    ...(responseKind !== 'json' ? { responseKind } : {}),
+    ...(sse ? { sseDataKind: sseDataKind(op) } : {}),
+    ...(security.length > 0 ? { security } : {}),
+  };
+}
+
+/** `export const OPERATIONS = {…} as const satisfies Record<string, OperationDescriptor>;` + unions. */
+export function descriptorStatements(
+  model: ApiModel,
+  idents: Map<string, string>,
+  dateType: DateType
+): ts.Statement[] {
+  const ops = allOperations(model.services);
+  if (ops.length === 0) return [];
+  const entries = ops.map((op) =>
+    factory.createPropertyAssignment(
+      idents.get(op.name)!,
+      literalExpr(descriptorValue(op, model.securitySchemes, dateType))
+    )
+  );
+  const operations = jsdoc(
+    factory.createVariableStatement(
+      [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+      factory.createVariableDeclarationList(
+        [
+          factory.createVariableDeclaration(
+            'OPERATIONS',
+            undefined,
+            undefined,
+            factory.createSatisfiesExpression(
+              factory.createAsExpression(
+                factory.createObjectLiteralExpression(entries, true),
+                factory.createTypeReferenceNode('const')
+              ),
+              factory.createTypeReferenceNode('Record', [
+                factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+                factory.createTypeReferenceNode('OperationDescriptor'),
+              ])
+            )
+          ),
+        ],
+        ts.NodeFlags.Const
+      )
+    ),
+    'The wire-shape descriptor for every operation, keyed by operationId — the data the\n' +
+      'runtime routes requests by. Also minification-safe static metadata (method, path,\n' +
+      'tags) for cache keys, tracing span names, and request logging.'
+  );
+  // `tags` is present only on tagged entries, so `OperationTag` is derived via `Extract`
+  // (a plain `["tags"]` index would not compile against the untagged entries), and is
+  // omitted entirely when no operation has a tag (it would be `never`).
+  const hasTags = ops.some((op) => op.tags.length > 0);
+  const derived = parseStatements(
+    'export type OperationId = keyof typeof OPERATIONS;\n' +
+      'export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];' +
+      (hasTags
+        ? '\nexport type OperationTag = Extract<(typeof OPERATIONS)[OperationId], { tags: readonly string[] }>["tags"][number];'
+        : '')
+  );
+  return [operations, ...derived];
+}
+
+/**
+ * `export type Ops = { <ident>: { args: …; result: …; kind?: "sse" } }` — the type map
+ * `createClient<Ops>` consumes. A type alias (not an interface) on purpose: aliases get
+ * an implicit index signature, so `Ops` satisfies the runtime's `OpsShape` constraint;
+ * an interface would need an explicit `[key: string]` member.
+ */
+export function opsInterfaceStatements(
+  model: ApiModel,
+  idents: Map<string, string>,
+  ctx: EmitContext
+): ts.Statement[] {
+  const ops = allOperations(model.services);
+  if (ops.length === 0) return [];
+  return [
+    jsdoc(
+      factory.createTypeAliasDeclaration(
+        [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+        'Ops',
+        undefined,
+        factory.createTypeLiteralNode(ops.map((op) => opsMember(op, idents.get(op.name)!, ctx)))
+      ),
+      "Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the\n" +
+        'type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.'
+    ),
+  ];
+}
+
+/** One `<ident>: { args; result; kind? }` member of the `Ops` type. */
+function opsMember(op: OperationModel, ident: string, ctx: EmitContext): ts.PropertySignature {
+  const { pathParams } = operationSignature(op);
+  // Path params are keyed by WIRE name — the runtime routes `args[param.name]`.
+  const args = variablesTypeLiteral(
+    op,
+    pascalCase(op.name),
+    pathParams.map((p) => p.param),
+    new Map(pathParams.map((p) => [p.param.name, p.ident])),
+    ctx,
+    'wire'
+  );
+  const members = [
+    factory.createPropertySignature(undefined, 'args', undefined, args),
+    factory.createPropertySignature(undefined, 'result', undefined, resultType(op, ctx)),
+  ];
+  if (isSseOp(op)) {
+    members.push(
+      factory.createPropertySignature(
+        undefined,
+        'kind',
+        undefined,
+        factory.createLiteralTypeNode(factory.createStringLiteral('sse'))
+      )
+    );
+  }
+  return factory.createPropertySignature(
+    undefined,
+    ident,
+    undefined,
+    factory.createTypeLiteralNode(members)
+  );
+}
+
+/** The `result` slot: SSE event payload, or the response type — `Result`-wrapped in result mode. */
+function resultType(op: OperationModel, ctx: EmitContext): ts.TypeNode {
+  if (isSseOp(op)) return sseEventType(op, ctx.dateType);
+  const { responseType } = computeResponse(op.successResponses, ctx.dateType);
+  // Same suppression rule as renderOperationParts: reference the emitted `<Op>Result`
+  // alias, or inline the response type when that name collides with a schema.
+  const resultName = `${pascalCase(op.name)}Result`;
+  const resultRef = ctx.schemaNames.has(resultName)
+    ? responseType
+    : factory.createTypeReferenceNode(resultName);
+  if (ctx.errorMode !== 'result') return resultRef;
+  return factory.createTypeReferenceNode('Result', [resultRef, errorTypeArg(op, ctx)]);
+}
+
+/**
+ * The `Result<…, E>` error argument — the same composition `renderOperationParts` uses for
+ * `__requestResult<R, E>`: `unknown` when the operation declares no error responses, the
+ * emitted `<Op>Error` alias otherwise, or the inline (union of) error type(s) when that
+ * alias name collides with a schema and is suppressed.
+ */
+function errorTypeArg(op: OperationModel, ctx: EmitContext): ts.TypeNode {
+  const errorMembers = errorTypeNodes(op.errorResponses, ctx.dateType);
+  if (errorMembers.length === 0) {
+    return factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
+  }
+  const errorAlias = `${pascalCase(op.name)}Error`;
+  if (!ctx.schemaNames.has(errorAlias)) return factory.createTypeReferenceNode(errorAlias);
+  return errorMembers.length === 1 ? errorMembers[0] : factory.createUnionTypeNode(errorMembers);
+}
diff --git a/packages/client-generator/src/emitters/inline-runtime.ts b/packages/client-generator/src/emitters/inline-runtime.ts
new file mode 100644
index 0000000000..36e5548a64
--- /dev/null
+++ b/packages/client-generator/src/emitters/inline-runtime.ts
@@ -0,0 +1,100 @@
+// Assembles the embedded runtime block for inline-mode clients: the real
+// `src/runtime/` sources (snapshotted into `RUNTIME_SOURCES`) in import-graph
+// order, stripped of module syntax, followed by a local `createClient` factory
+// wiring only the capabilities this API needs — the embedded equivalent of the
+// package barrel (`runtime/index.ts`), which is never embedded itself.
+
+import { RUNTIME_SOURCES, type RuntimeModuleName } from './runtime-sources.js';
+import { parseStatements, ts } from './ts.js';
+
+/** Which optional runtime capabilities the generated client must embed. */
+export type InlineRuntimeNeeds = {
+  multipart: boolean;
+  auth: boolean;
+  sse: boolean;
+  setup: boolean;
+};
+
+const HEADER =
+  "// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───";
+
+// The embedded block keeps `export` only on the surface the generated wiring and its
+// type re-exports reference; everything else becomes module-local. `types.ts` is the
+// public type surface (it replaces package-mode type imports — and TS `noUnusedLocals`
+// never flags exported declarations, so unused types in a given output are fine).
+const KEEP_EXPORTS: Partial<Record<RuntimeModuleName, (statement: ts.Statement) => boolean>> = {
+  'types.ts': () => true,
+  'errors.ts': ts.isClassDeclaration, // ApiError stays public; abortError goes local
+  'setup.ts': () => true, // mergeSetup — the baked-setup wiring calls it
+};
+
+/** The embedded runtime source block: stripped modules in dependency order + the factory. */
+export function assembleInlineRuntime(needs: InlineRuntimeNeeds): string {
+  // Import-graph topological order; the optional capability modules slot in where the
+  // package barrel would import them (core never imports them statically).
+  const modules: RuntimeModuleName[] = ['types.ts', 'errors.ts', 'url.ts', 'parse.ts', 'retry.ts'];
+  if (needs.multipart) modules.push('multipart.ts');
+  if (needs.auth) modules.push('auth.ts');
+  if (needs.setup) modules.push('setup.ts');
+  modules.push('send.ts');
+  if (needs.sse) modules.push('sse.ts');
+  modules.push('create-client.ts');
+  return [HEADER, ...modules.map(embedModule), clientFactory(needs)].join('\n\n');
+}
+
+// Strip module syntax from one runtime source: drop every import declaration (all are
+// relative `./x.js` imports within the runtime) and remove the `export` modifier from
+// declarations outside the kept surface. Slices are driven by AST positions from
+// `parseStatements` (no regexes), so comments and formatting survive byte-for-byte.
+function embedModule(name: RuntimeModuleName): string {
+  const source = RUNTIME_SOURCES[name];
+  const keeps = KEEP_EXPORTS[name];
+  const parts: string[] = [];
+  for (const statement of parseStatements(source)) {
+    if (ts.isImportDeclaration(statement)) continue;
+    // Full text includes leading trivia (JSDoc, blank lines), so spacing is preserved.
+    const text = source.slice(statement.getFullStart(), statement.end);
+    // Every top-level runtime statement is a declaration (`getModifiers` is total —
+    // it returns undefined when the node carries no modifiers).
+    const exportModifier = ts
+      .getModifiers(statement as ts.HasModifiers)
+      ?.find((modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword);
+    if (exportModifier && !keeps?.(statement)) {
+      const at = exportModifier.getStart() - statement.getFullStart();
+      parts.push(text.slice(0, at) + text.slice(at + 'export '.length));
+    } else {
+      parts.push(text);
+    }
+  }
+  return parts.join('').trim();
+}
+
+// The embedded equivalent of the package barrel's `createClient`: `createClientCore`
+// with only the included capabilities wired. EXPORTED — the design spec promises the
+// generated module re-exports `createClient`/`OPERATIONS`/`Ops` so apps can build
+// additional per-tenant instances over the same descriptors.
+function clientFactory(needs: InlineRuntimeNeeds): string {
+  const caps = [
+    ...(needs.multipart ? ['serializeMultipart: toFormData'] : []),
+    ...(needs.auth ? ['resolveAuth'] : []),
+    ...(needs.sse ? ['sse'] : []),
+  ];
+  const wired = caps.length > 0 ? `{ ${caps.join(', ')} }` : '{}';
+  return `/**
+ * The client factory: \`createClientCore\` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same \`OPERATIONS\`/\`Ops\`. The trailing string params carry the wiring's literal
+ * unions (\`OperationId\`/\`OperationPath\`/\`OperationTag\`) into \`ctx.operation\`.
+ */
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, ${wired});
+}`;
+}
diff --git a/packages/client-generator/src/emitters/operation-aliases.ts b/packages/client-generator/src/emitters/operation-aliases.ts
index 4b6dddb622..b24424d8ab 100644
--- a/packages/client-generator/src/emitters/operation-aliases.ts
+++ b/packages/client-generator/src/emitters/operation-aliases.ts
@@ -4,9 +4,10 @@
 // `EmitContext` (a type-only import from operations.ts — erased, so there is no runtime cycle).
 
 import type { OperationModel, ParamModel } from '../intermediate-representation/model.js';
+import { safeIdent } from './identifier.js';
 import { jsdocText } from './jsdoc.js';
 import { operationSignature } from './operation-signature.js';
-import { bodyTypeNode, paramsTypeLiteral } from './operation-types.js';
+import { bodyTypeNode, paramsTypeLiteral, propertyKey } from './operation-types.js';
 import type { EmitContext } from './operations.js';
 import { pascalCase } from './support.js';
 import { jsdoc, ts } from './ts.js';
@@ -32,7 +33,9 @@ export function renderOperationAliases(
   ctx: EmitContext,
   // SSE ops have no one-shot response, so they omit `*Result`/`*Error` and keep only the input
   // aliases. (Previously done by a `.slice(1)` on the result; an explicit flag is collision-safe.)
-  emitResultAndError = true
+  emitResultAndError = true,
+  // Threaded to the `<Op>Variables` body — see `variablesTypeLiteral`.
+  pathKeys: 'ident' | 'wire' = 'ident'
 ): ts.Statement[] {
   const { dateType, schemaNames } = ctx;
   const name = pascalCase(op.name);
@@ -80,7 +83,14 @@ export function renderOperationAliases(
   }
 
   if (!schemaNames.has(`${name}Variables`)) {
-    const variables = renderVariablesAlias(op, name, orderedPathParams, pathParamIdent, ctx);
+    const variables = renderVariablesAlias(
+      op,
+      name,
+      orderedPathParams,
+      pathParamIdent,
+      ctx,
+      pathKeys
+    );
     if (variables) aliases.push(variables);
   }
 
@@ -97,7 +107,8 @@ export function sseAliases(
   op: OperationModel,
   orderedPathParams: ParamModel[],
   pathParamIdent: Map<string, string>,
-  ctx: EmitContext
+  ctx: EmitContext,
+  pathKeys: 'ident' | 'wire' = 'ident'
 ): ts.Statement[] {
   return renderOperationAliases(
     op,
@@ -107,7 +118,8 @@ export function sseAliases(
     '',
     [],
     ctx,
-    false
+    false,
+    pathKeys
   );
 }
 
@@ -144,12 +156,13 @@ function renderVariablesAlias(
   name: string,
   orderedPathParams: ParamModel[],
   pathParamIdent: Map<string, string>,
-  ctx: EmitContext
+  ctx: EmitContext,
+  pathKeys: 'ident' | 'wire'
 ): ts.TypeAliasDeclaration | undefined {
   if (!hasInputs(op)) return undefined;
   return exportType(
     name + 'Variables',
-    variablesTypeLiteral(op, name, orderedPathParams, pathParamIdent, ctx)
+    variablesTypeLiteral(op, name, orderedPathParams, pathParamIdent, ctx, pathKeys)
   );
 }
 
@@ -174,17 +187,21 @@ export function variablesTypeLiteral(
   name: string,
   orderedPathParams: ParamModel[],
   pathParamIdent: Map<string, string>,
-  ctx: EmitContext
+  ctx: EmitContext,
+  // How path-param properties are keyed: `'ident'` (default) uses the sanitized identifier
+  // that doubles as the flat positional argument; `'wire'` (package mode) uses the spec's
+  // param name — quoted when needed — because the runtime routes `args[param.name]`.
+  pathKeys: 'ident' | 'wire' = 'ident'
 ): ts.TypeNode {
   const { dateType, schemaNames } = ctx;
   const props: ts.PropertySignature[] = [];
 
   for (const p of orderedPathParams) {
-    // Same safe identifier the function uses, so a wrapper can map
+    // Ident mode: same safe identifier the function uses, so a wrapper can map
     // `vars.<ident>` straight onto the positional argument.
     const sig = factory.createPropertySignature(
       undefined,
-      pathParamIdent.get(p.name)!,
+      pathKeys === 'wire' ? propertyKey(safeIdent(p.name)) : pathParamIdent.get(p.name)!,
       undefined,
       schemaToTypeNode(p.schema, dateType)
     );
diff --git a/packages/client-generator/src/emitters/operation-types.ts b/packages/client-generator/src/emitters/operation-types.ts
index 44b99f81ca..f9cc54eaea 100644
--- a/packages/client-generator/src/emitters/operation-types.ts
+++ b/packages/client-generator/src/emitters/operation-types.ts
@@ -69,8 +69,8 @@ export function propertyKey(safe: string): ts.PropertyName {
 
 /**
  * A multipart body whose schema is a concrete object — the case worth typing. Such a body
- * is emitted as its object shape (binary fields → `Blob`); the runtime's `__send` serializes
- * it to `FormData` (via `__toFormData`) after the onRequest chain. Multipart bodies with a
+ * is emitted as its object shape (binary fields → `Blob`); the runtime serializes it to
+ * `FormData` (`runtime/multipart.ts`) after the onRequest chain. Multipart bodies with a
  * non-object schema can't be typed field-by-field, so they keep the raw `FormData` escape hatch.
  */
 export function isTypedMultipart(rb: RequestBodyModel): boolean {
diff --git a/packages/client-generator/src/emitters/operations.ts b/packages/client-generator/src/emitters/operations.ts
index 6576607219..2c867114c3 100644
--- a/packages/client-generator/src/emitters/operations.ts
+++ b/packages/client-generator/src/emitters/operations.ts
@@ -1,848 +1,78 @@
 import type { OperationModel, ParamModel } from '../intermediate-representation/model.js';
-import { safeIdent } from './identifier.js';
-import { renderOperationAliases, sseAliases, variablesTypeLiteral } from './operation-aliases.js';
-import { operationSignature } from './operation-signature.js';
-import {
-  bodyTypeNode,
-  computeResponse,
-  errorTypeNodes,
-  isTypedMultipart,
-  propertyKey,
-  renderParamsObjectArg,
-  simpleParam,
-} from './operation-types.js';
-import { isSseOp, partitionOps, sseDataKind, sseEventType } from './sse.js';
-import { pascalCase, splitLines } from './support.js';
-import { jsdoc, parseStatements, printStatements, ts } from './ts.js';
+import { bodyTypeNode, renderParamsObjectArg, simpleParam } from './operation-types.js';
+import { isSseOp } from './sse.js';
+import { ts } from './ts.js';
 import { type DateType, schemaToTypeNode } from './types.js';
 
-// `isTypedMultipart` lives in operation-types now; re-export it so existing importers
-// (client.ts) keep resolving it from operations.ts.
-export { isTypedMultipart };
-
 const { factory } = ts;
 
-/**
- * The developer-facing API shape emitted for the operations.
- * - `'functions'` (default): standalone `export async function`s.
- * - `'service-class'`: the operations grouped as methods of a class.
- */
-export type Facade = 'functions' | 'service-class';
-
 /** Error-handling shape of the generated client: throw on non-2xx, or return a result union. */
 export type ErrorMode = 'throw' | 'result';
 
 /**
- * How an operation's inputs are passed to the generated function/method.
+ * How an operation's inputs are passed to the generated call.
  * - `'flat'` (default): path params spread as positional args, then the
- *   `params`/`body`/`headers` slots.
- * - `'grouped'`: a single `args: <Op>Variables` object bundling every input
- *   (path params, `params`, `body`, `headers`). The per-call `init:
- *   RequestOptions` stays a separate trailing argument in both styles.
+ *   `params`/`body`/`headers` slots — one exported sugar arrow per operation.
+ * - `'grouped'`: the client methods' own shape — a single `args` object bundling
+ *   every input; the sugar is a plain destructure of the client. The per-call
+ *   `init: RequestOptions` stays a separate trailing argument in both styles.
  */
 export type ArgsStyle = 'flat' | 'grouped';
 
 /**
- * Emit `OPERATIONS`: a static map from operationId to the operation's HTTP
- * `method` and `path` template (with `{param}` placeholders intact), plus the
- * `OperationId` / `OperationMetadata` types.
- *
- * This is the one stable, runtime-readable handle on an operation's identity that
- * survives bundling and minification — function and method names can be mangled,
- * but these string literals cannot. Consumers use it to build cache/query keys,
- * tracing span names, and logging labels without re-deriving them from each call
- * site (and without fragile `fn.toString()` parsing).
- *
- * Facade- and output-mode-independent: the same map is emitted for both facades
- * and lives in the shared schemas module in multi-file layouts. Returns `''` when
- * the document declares no operations.
- */
-export function renderOperationsMeta(ops: OperationModel[]): string {
-  return printStatements(operationsMetaStatements(ops));
-}
-
-/** The `OPERATIONS` map + `OperationId`/`OperationMetadata` types as nodes (empty when no ops). */
-export function operationsMetaStatements(ops: OperationModel[]): ts.Statement[] {
-  if (ops.length === 0) return [];
-
-  const entries = ops.map((op) =>
-    factory.createPropertyAssignment(
-      propertyKey(safeIdent(op.name)),
-      factory.createObjectLiteralExpression(
-        [
-          factory.createPropertyAssignment(
-            'method',
-            factory.createStringLiteral(op.method.toUpperCase())
-          ),
-          factory.createPropertyAssignment('path', factory.createStringLiteral(op.path)),
-          // No inner `as const`: the enclosing `OPERATIONS … as const` already makes this a
-          // readonly tuple of string literals, which is what `["tags"][number]` needs.
-          factory.createPropertyAssignment(
-            'tags',
-            factory.createArrayLiteralExpression(
-              op.tags.map((t) => factory.createStringLiteral(t)),
-              false
-            )
-          ),
-        ],
-        false
-      )
-    )
-  );
-
-  const operations = jsdoc(
-    factory.createVariableStatement(
-      [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
-      factory.createVariableDeclarationList(
-        [
-          factory.createVariableDeclaration(
-            'OPERATIONS',
-            undefined,
-            undefined,
-            factory.createAsExpression(
-              factory.createObjectLiteralExpression(entries, true),
-              factory.createTypeReferenceNode('const')
-            )
-          ),
-        ],
-        ts.NodeFlags.Const
-      )
-    ),
-    'Static metadata for every operation, keyed by operationId: the HTTP `method`\n' +
-      'and the `path` template (with `{param}` placeholders intact). Minification-safe\n' +
-      '— useful for building cache/query keys, tracing span names, and request logging\n' +
-      'without re-deriving them at each call site.'
-  );
-
-  const operationId = jsdoc(
-    factory.createTypeAliasDeclaration(
-      [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
-      'OperationId',
-      undefined,
-      factory.createTypeOperatorNode(
-        ts.SyntaxKind.KeyOfKeyword,
-        factory.createTypeQueryNode(factory.createIdentifier('OPERATIONS'))
-      )
-    ),
-    'The operationId of any operation in this client.'
-  );
-
-  const operationMetadata = jsdoc(
-    factory.createTypeAliasDeclaration(
-      [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
-      'OperationMetadata',
-      undefined,
-      factory.createTypeLiteralNode([
-        readonlyStringProp('method'),
-        readonlyStringProp('path'),
-        factory.createPropertySignature(
-          [factory.createModifier(ts.SyntaxKind.ReadonlyKeyword)],
-          'tags',
-          undefined,
-          factory.createTypeOperatorNode(
-            ts.SyntaxKind.ReadonlyKeyword,
-            factory.createArrayTypeNode(factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword))
-          )
-        ),
-      ])
-    ),
-    'Static metadata describing one operation: its HTTP method, path template, and tags.'
-  );
-
-  // Derived literal unions of every path template and tag — used to narrow `RequestContext.operation`.
-  // `OperationTag` is omitted when no operation has a tag (its `["tags"][number]` would be `never`),
-  // so the narrowed `tags` field falls back to `string[]`.
-  const hasTags = ops.some((op) => op.tags.length > 0);
-  const derived = parseStatements(
-    'export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];' +
-      (hasTags
-        ? '\nexport type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];'
-        : '')
-  );
-
-  return [operations, operationId, operationMetadata, ...derived];
-}
-
-/** A `readonly <name>: string` property signature for the `OperationMetadata` type. */
-function readonlyStringProp(name: string): ts.PropertySignature {
-  return factory.createPropertySignature(
-    [factory.createModifier(ts.SyntaxKind.ReadonlyKeyword)],
-    name,
-    undefined,
-    factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword)
-  );
-}
-
-/**
- * Render a block of operations in the chosen facade shape. This is the facade
- * seam: the `functions` adapter emits standalone `export async function`s; the
- * `service-class` adapter groups the same operations as methods of `className`.
- * Both reuse the identical runtime — only the developer-facing wrapper differs.
- */
-export type OperationsBlockOptions = {
-  facade: Facade;
-  className: string;
-  argsStyle?: ArgsStyle;
-  errorMode?: 'throw' | 'result';
-  /**
-   * How `date-time`/`date` string fields are typed in param/body/response types.
-   * Defaults to `'string'`; `'Date'` keeps operation types in sync with the schemas.
-   */
-  dateType?: DateType;
-  /** Security-scheme keys whose credential is sent as a URL query param. */
-  queryAuthKeys?: Set<string>;
-  /**
-   * Names of every exported schema. A `<Op>Result` alias whose name is in this set is
-   * suppressed (the underlying response type is used inline instead) so it can't collide
-   * with the schema's `export type` — a duplicate-identifier compile error otherwise.
-   */
-  schemaNames?: Set<string>;
-  /**
-   * The exported aggregate name bundling this block's SSE async generators
-   * (functions facade). Defaults to `'sse'`; multi-file modes override it to keep
-   * per-tag SSE bundles from colliding.
-   */
-  sseExportName?: string;
-  /**
-   * Whether a publisher `--setup` was baked in. When true, the service-class constructor merges the
-   * module-scoped `__redoclySetup` ({@link setupApply}) into each instance's config. Functions-facade
-   * blocks are unaffected (the setup applies globally via `configure`/`use`).
-   */
-  bakedSetup?: boolean;
-};
-
-/**
- * The block-wide emit configuration every operation in a block shares. Bundling it
- * into one value keeps it out of the positional parameter lists of the operation
- * emitters (which would otherwise thread the same five arguments through every layer,
- * inviting transposition bugs). Per-call structural data (response type, ordered path
- * params, …) stays an explicit argument; only this cross-cutting config travels as `ctx`.
+ * The emit configuration every operation shares. Bundling it into one value keeps
+ * it out of the positional parameter lists of the operation emitters (which would
+ * otherwise thread the same arguments through every layer, inviting transposition
+ * bugs). Per-call structural data (response type, ordered path params, …) stays an
+ * explicit argument; only this cross-cutting config travels as `ctx`.
  */
 export type EmitContext = {
   argsStyle: ArgsStyle;
-  errorMode: 'throw' | 'result';
+  errorMode: ErrorMode;
   dateType: DateType;
   /** Security-scheme keys whose credential is sent as a URL query param. */
   queryAuthKeys: Set<string>;
   /** Names of every exported schema, used for `<Op>*` alias collision suppression. */
   schemaNames: Set<string>;
-  /** Whether a publisher `--setup` was baked in (service-class constructor merges `__redoclySetup`). */
-  bakedSetup: boolean;
 };
 
-export function renderOperationsBlock(
-  ops: OperationModel[],
-  options: OperationsBlockOptions
-): string {
-  return printStatements(operationsBlockStatements(ops, options));
-}
-
-/** A block of operations (functions or a service class) as nodes. */
-export function operationsBlockStatements(
-  ops: OperationModel[],
-  options: OperationsBlockOptions
-): ts.Statement[] {
-  const ctx: EmitContext = {
-    argsStyle: options.argsStyle ?? 'flat',
-    errorMode: options.errorMode ?? 'throw',
-    dateType: options.dateType ?? 'string',
-    queryAuthKeys: options.queryAuthKeys ?? new Set<string>(),
-    schemaNames: options.schemaNames ?? new Set<string>(),
-    bakedSetup: options.bakedSetup ?? false,
-  };
-  const sseExportName = options.sseExportName ?? 'sse';
-  if (options.facade === 'service-class')
-    return serviceClassStatements(ops, options.className, ctx);
-
-  const { regular, sse } = partitionOps(ops);
-  const nodes: ts.Statement[] = [];
-  for (const op of regular) {
-    const { aliases, fn } = renderFunction(op, ctx);
-    nodes.push(...aliases, fn);
-  }
-  // SSE ops are module-private async generators reached through the `sse`
-  // aggregate (a stable namespace that survives output-mode partitioning),
-  // never exported individually.
-  for (const op of sse) {
-    const { aliases, fn } = renderSseFunction(op, ctx);
-    nodes.push(...aliases, fn);
-  }
-  if (sse.length > 0) nodes.push(sseAggregate(sseExportName, sse));
-  return nodes;
-}
-
-/** Functions facade: a module-private `async function* <op>` for an SSE operation. */
-function renderSseFunction(
-  op: OperationModel,
-  ctx: EmitContext
-): { aliases: ts.Statement[]; fn: ts.FunctionDeclaration } {
-  const parts = renderOperationParts(op, '__config', ctx);
-  const fn = withDoc(
-    factory.createFunctionDeclaration(
-      [factory.createModifier(ts.SyntaxKind.AsyncKeyword)],
-      factory.createToken(ts.SyntaxKind.AsteriskToken),
-      op.name,
-      undefined,
-      parts.params,
-      parts.returnType,
-      factory.createBlock(parts.body, true)
-    ),
-    parts.doc
-  );
-  return { aliases: parts.aliases, fn };
-}
-
-/** `export const <name> = { <op>, … };` — the namespace bundling a block's SSE generators. */
-function sseAggregate(name: string, sse: OperationModel[]): ts.Statement {
-  return factory.createVariableStatement(
-    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
-    factory.createVariableDeclarationList(
-      [
-        factory.createVariableDeclaration(
-          name,
-          undefined,
-          undefined,
-          factory.createObjectLiteralExpression(
-            sse.map((op) => factory.createShorthandPropertyAssignment(op.name)),
-            false
-          )
-        ),
-      ],
-      ts.NodeFlags.Const
-    )
-  );
-}
-
-/**
- * The conventional class name for a tag's service in `tags`/`tags-split` modes.
- * Tag stems can contain `-`/`_`/spaces, so each segment is PascalCased and joined
- * into a valid identifier; a leading digit is prefixed with `_`.
- */
-export function serviceClassName(label: string): string {
-  const pascal = label
-    .split(/[^A-Za-z0-9]+/)
-    .filter(Boolean)
-    .map((segment) => segment[0].toUpperCase() + segment.slice(1))
-    .join('');
-  const name = `${pascal || 'Default'}Service`;
-  return /^[0-9]/.test(name) ? `_${name}` : name;
-}
-
-/** Functions facade: one standalone `export async function` per operation. */
-function renderFunction(
-  op: OperationModel,
-  ctx: EmitContext
-): { aliases: ts.Statement[]; fn: ts.FunctionDeclaration } {
-  const parts = renderOperationParts(op, '__config', ctx);
-  const fn = withDoc(
-    factory.createFunctionDeclaration(
-      [
-        factory.createModifier(ts.SyntaxKind.ExportKeyword),
-        factory.createModifier(ts.SyntaxKind.AsyncKeyword),
-      ],
-      undefined,
-      op.name,
-      undefined,
-      parts.params,
-      parts.returnType,
-      factory.createBlock(parts.body, true)
-    ),
-    parts.doc
-  );
-  return { aliases: parts.aliases, fn };
-}
-
-/**
- * `use(...middleware): this` — appends interceptors to this instance's
- * `config.middleware`, mirroring the functions facade's `use()`. Returns `this`
- * for chaining. Reassigns (rather than pushes) so a caller-provided `middleware`
- * array isn't mutated and can't leak across instances. (`config` is `readonly`,
- * but reassigning its `middleware` field — not `config` itself — is allowed.)
- */
-function serviceUseMethod(): ts.ClassElement {
-  // this.config.middleware = [...(this.config.middleware ?? []), ...middleware];
-  const target = factory.createPropertyAccessExpression(
-    factory.createPropertyAccessExpression(factory.createThis(), 'config'),
-    'middleware'
-  );
-  const assign = factory.createExpressionStatement(
-    factory.createAssignment(
-      target,
-      factory.createArrayLiteralExpression(
-        [
-          factory.createSpreadElement(
-            factory.createBinaryExpression(
-              target,
-              factory.createToken(ts.SyntaxKind.QuestionQuestionToken),
-              factory.createArrayLiteralExpression([], false)
-            )
-          ),
-          factory.createSpreadElement(factory.createIdentifier('middleware')),
-        ],
-        false
-      )
-    )
-  );
-  return jsdoc(
-    factory.createMethodDeclaration(
-      undefined,
-      undefined,
-      'use',
-      undefined,
-      undefined,
-      [
-        factory.createParameterDeclaration(
-          undefined,
-          factory.createToken(ts.SyntaxKind.DotDotDotToken),
-          'middleware',
-          undefined,
-          factory.createArrayTypeNode(factory.createTypeReferenceNode('Middleware'))
-        ),
-      ],
-      factory.createThisTypeNode(),
-      factory.createBlock([assign, factory.createReturnStatement(factory.createThis())], true)
-    ),
-    'Register interceptors on this instance (see `ClientConfig.middleware`). Returns `this`.'
-  );
-}
-
-/**
- * Service-class facade: one class named `className` whose methods are `ops`.
- * Operation type aliases (`<Op>Result`, …) can't live inside a class body, so
- * they're hoisted to module level ahead of the class; each method is the same
- * signature + body as the function form.
- *
- * The class takes an optional `ClientConfig` and stores it; methods thread
- * `this.config` to the runtime, so each instance is independently configured.
- * With no config it falls back to the global `BASE` + auth (back-compat).
- */
-/**
- * The service-class constructor (+ its `config` field). Without a baked setup it is the historical
- * parameter-property form (`private readonly config: ClientConfig = {}`) — byte-identical. With a
- * baked setup, the constructor merges the module-scoped `__redoclySetup` into each instance's config:
- * `{ ...__redoclySetup.config, ...config, middleware: [...baked, ...passed] }` — so `new Client()`
- * gets the publisher defaults and a passed `config` overrides them (consumer wins; baked middleware
- * runs first).
- */
-function constructorMembers(bakedSetup: boolean): ts.ClassElement[] {
-  const configType = factory.createTypeReferenceNode('ClientConfig');
-  if (!bakedSetup) {
-    return [
-      factory.createConstructorDeclaration(
-        undefined,
-        [
-          factory.createParameterDeclaration(
-            [
-              factory.createModifier(ts.SyntaxKind.PrivateKeyword),
-              factory.createModifier(ts.SyntaxKind.ReadonlyKeyword),
-            ],
-            undefined,
-            'config',
-            undefined,
-            configType,
-            factory.createObjectLiteralExpression([], false)
-          ),
-        ],
-        factory.createBlock([], false)
-      ),
-    ];
-  }
-
-  const id = (n: string) => factory.createIdentifier(n);
-  const setupMember = (name: string) =>
-    factory.createPropertyAccessExpression(id('__redoclySetup'), name);
-  const orEmptyArray = (e: ts.Expression) =>
-    factory.createBinaryExpression(
-      e,
-      factory.createToken(ts.SyntaxKind.QuestionQuestionToken),
-      factory.createArrayLiteralExpression([], false)
-    );
-  const merged = factory.createObjectLiteralExpression(
-    [
-      factory.createSpreadAssignment(setupMember('config')),
-      factory.createSpreadAssignment(id('config')),
-      factory.createPropertyAssignment(
-        'middleware',
-        factory.createArrayLiteralExpression(
-          [
-            factory.createSpreadElement(orEmptyArray(setupMember('middleware'))),
-            factory.createSpreadElement(
-              orEmptyArray(factory.createPropertyAccessExpression(id('config'), 'middleware'))
-            ),
-          ],
-          false
-        )
-      ),
-    ],
-    true
-  );
-  return [
-    factory.createPropertyDeclaration(
-      [
-        factory.createModifier(ts.SyntaxKind.PrivateKeyword),
-        factory.createModifier(ts.SyntaxKind.ReadonlyKeyword),
-      ],
-      'config',
-      undefined,
-      configType,
-      undefined
-    ),
-    factory.createConstructorDeclaration(
-      undefined,
-      [
-        factory.createParameterDeclaration(
-          undefined,
-          undefined,
-          'config',
-          undefined,
-          configType,
-          factory.createObjectLiteralExpression([], false)
-        ),
-      ],
-      factory.createBlock(
-        [
-          factory.createExpressionStatement(
-            factory.createBinaryExpression(
-              factory.createPropertyAccessExpression(factory.createThis(), 'config'),
-              factory.createToken(ts.SyntaxKind.EqualsToken),
-              merged
-            )
-          ),
-        ],
-        true
-      )
-    ),
-  ];
-}
-
-function serviceClassStatements(
-  ops: OperationModel[],
-  className: string,
-  ctx: EmitContext
-): ts.Statement[] {
-  const aliases: ts.Statement[] = [];
-  const members: ts.ClassElement[] = [...constructorMembers(ctx.bakedSetup), serviceUseMethod()];
-
-  const { regular, sse } = partitionOps(ops);
-  for (const op of regular) {
-    const parts = renderOperationParts(op, 'this.config', ctx);
-    aliases.push(...parts.aliases);
-    members.push(
-      withDoc(
-        factory.createMethodDeclaration(
-          [factory.createModifier(ts.SyntaxKind.AsyncKeyword)],
-          undefined,
-          op.name,
-          undefined,
-          undefined,
-          parts.params,
-          parts.returnType,
-          factory.createBlock(parts.body, true)
-        ),
-        parts.doc
-      )
-    );
-  }
-
-  // SSE ops are private async generators, reached through the `readonly sse`
-  // field of bound generators below — the public, namespace-style handle.
-  for (const op of sse) {
-    const parts = renderOperationParts(op, 'this.config', ctx);
-    aliases.push(...parts.aliases);
-    members.push(
-      withDoc(
-        factory.createMethodDeclaration(
-          [
-            factory.createModifier(ts.SyntaxKind.PrivateKeyword),
-            factory.createModifier(ts.SyntaxKind.AsyncKeyword),
-          ],
-          factory.createToken(ts.SyntaxKind.AsteriskToken),
-          op.name,
-          undefined,
-          undefined,
-          parts.params,
-          parts.returnType,
-          factory.createBlock(parts.body, true)
-        ),
-        parts.doc
-      )
-    );
-  }
-  if (sse.length > 0) members.push(sseFieldDeclaration(sse));
-
-  const cls = factory.createClassDeclaration(
-    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
-    className,
-    undefined,
-    undefined,
-    members
-  );
-
-  return [...aliases, cls];
-}
-
-/**
- * `readonly sse = { <op>: this.<op>.bind(this), … };` — the namespace field
- * exposing a class's private SSE generators, each `this`-bound so callers can
- * destructure them off the instance without losing their receiver.
- */
-function sseFieldDeclaration(sse: OperationModel[]): ts.ClassElement {
-  return factory.createPropertyDeclaration(
-    [factory.createModifier(ts.SyntaxKind.ReadonlyKeyword)],
-    'sse',
-    undefined,
-    undefined,
-    factory.createObjectLiteralExpression(
-      sse.map((op) =>
-        factory.createPropertyAssignment(
-          op.name,
-          factory.createCallExpression(
-            factory.createPropertyAccessExpression(
-              factory.createPropertyAccessExpression(factory.createThis(), op.name),
-              'bind'
-            ),
-            undefined,
-            [factory.createThis()]
-          )
-        )
-      ),
-      false
-    )
-  );
-}
-
-/**
- * Decompose an operation into the parts both facades assemble: the module-level
- * type `aliases`, the `doc` comment text, the `params` list, the `returnType`,
- * and the `body` statements (`return __request<R>(…)`, possibly preceded by the
- * `const __a = await __auth(...)` auth prefix).
- *
- * `configRef` is the `ClientConfig` expression each request threads: the functions
- * facade passes the global `__config`; service-class methods pass `this.config`.
- */
-function renderOperationParts(
-  op: OperationModel,
-  configRef: string,
-  ctx: EmitContext
-): {
-  aliases: ts.Statement[];
-  doc: string | undefined;
-  params: ts.ParameterDeclaration[];
-  returnType: ts.TypeNode;
-  body: ts.Statement[];
-} {
-  const { argsStyle, errorMode, dateType, queryAuthKeys, schemaNames } = ctx;
-  const groupedMode = argsStyle === 'grouped';
-  const result = errorMode === 'result';
-  const authed = op.security.length > 0;
-  const hasQueryAuth = authed && op.security.some((k) => queryAuthKeys.has(k));
-  const { orderedPathParams, pathParamIdent } = orderPathParams(op);
-  const { responseType, responseKind } = computeResponse(op.successResponses, dateType);
-
-  const params = renderArgList(op, orderedPathParams, pathParamIdent, ctx);
-  const urlExpr = renderUrlExpr(op, configRef, groupedMode, pathParamIdent, hasQueryAuth);
-  const initExpr = renderInitExpr(op, groupedMode, authed);
-  const requestArgs = renderRequestArgs(
-    op,
-    configRef,
-    urlExpr,
-    initExpr,
-    groupedMode,
-    responseKind
-  );
-
-  // In result mode the operation returns `Result<<Op>Result, <Op>Error | unknown>`
-  // and calls `__requestResult`. The `*Error` alias is emitted only when the
-  // operation declares error responses; otherwise the error is `unknown` inline.
-  const errorMembers = result ? errorTypeNodes(op.errorResponses, dateType) : [];
-  const errorAlias = errorMembers.length > 0 ? `${pascalCase(op.name)}Error` : '';
-  // Like `<Op>Result`, suppress the `<Op>Error` alias when its name collides with a schema
-  // (`renderOperationAliases` skips it); the `Result<…>` error arg then references the inline
-  // error type rather than the absent alias.
-  const errorTypeArg: ts.TypeNode =
-    errorMembers.length === 0
-      ? factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword)
-      : schemaNames.has(errorAlias)
-        ? errorMembers.length === 1
-          ? errorMembers[0]
-          : factory.createUnionTypeNode(errorMembers)
-        : factory.createTypeReferenceNode(errorAlias);
-
-  const aliases = renderOperationAliases(
-    op,
-    responseType,
-    orderedPathParams,
-    pathParamIdent,
-    errorAlias,
-    errorMembers,
-    ctx
-  );
-
-  // Authed ops resolve their (possibly async) credentials once, up front, then
-  // spread `__a.headers` / merge `__a.query` at the call site.
-  const body: ts.Statement[] = [];
-  if (authed) body.push(authPrefixStatement(op.security, configRef));
-
-  // SSE ops are async generators: instead of `return __request(...)` they
-  // `yield* __sse<Event>(config, url, init, dataKind)`, and expose
-  // `AsyncGenerator<ServerSentEvent<Event>>` (no `*Result` alias).
-  if (isSseOp(op)) {
-    const eventType = sseEventType(op, dateType);
-    const returnType = factory.createTypeReferenceNode('AsyncGenerator', [
-      factory.createTypeReferenceNode('ServerSentEvent', [eventType]),
-    ]);
-    body.push(
-      factory.createExpressionStatement(
-        factory.createYieldExpression(
-          factory.createToken(ts.SyntaxKind.AsteriskToken),
-          factory.createCallExpression(
-            factory.createIdentifier('__sse'),
-            [eventType],
-            [
-              configExpr(configRef),
-              operationMetaExpr(op),
-              urlExpr,
-              initExpr,
-              factory.createStringLiteral(sseDataKind(op)),
-            ]
-          )
-        )
-      )
-    );
-    return {
-      aliases: sseAliases(op, orderedPathParams, pathParamIdent, ctx),
-      doc: renderOperationDoc(op),
-      params,
-      returnType,
-      body,
-    };
-  }
-
-  const resultName = `${pascalCase(op.name)}Result`;
-  // When `<Op>Result` would collide with an exported schema, the alias is suppressed
-  // (see `renderOperationAliases`), so reference the underlying response type directly
-  // instead of the (now non-existent) alias — otherwise the name resolves to the schema.
-  const resultRef = schemaNames.has(resultName)
-    ? responseType
-    : factory.createTypeReferenceNode(resultName);
-  let returnType: ts.TypeNode;
-  let call: ts.Expression;
-  if (result) {
-    returnType = factory.createTypeReferenceNode('Promise', [
-      factory.createTypeReferenceNode('Result', [resultRef, errorTypeArg]),
-    ]);
-    call = factory.createCallExpression(
-      factory.createIdentifier('__requestResult'),
-      [resultRef, errorTypeArg],
-      requestArgs
-    );
-  } else {
-    returnType = factory.createTypeReferenceNode('Promise', [responseType]);
-    call = factory.createCallExpression(
-      factory.createIdentifier('__request'),
-      [responseType],
-      requestArgs
-    );
-  }
-  body.push(factory.createReturnStatement(call));
-
-  return { aliases, doc: renderOperationDoc(op), params, returnType, body };
-}
-
-/** `const __a = await __auth([...security], <config>);` — the up-front credential resolve. */
-function authPrefixStatement(security: string[], configRef: string): ts.Statement {
-  return factory.createVariableStatement(
-    undefined,
-    factory.createVariableDeclarationList(
-      [
-        factory.createVariableDeclaration(
-          '__a',
-          undefined,
-          undefined,
-          factory.createAwaitExpression(
-            factory.createCallExpression(factory.createIdentifier('__auth'), undefined, [
-              factory.createArrayLiteralExpression(
-                security.map((k) => factory.createStringLiteral(k)),
-                false
-              ),
-              configExpr(configRef),
-            ])
-          )
-        ),
-      ],
-      ts.NodeFlags.Const
-    )
-  );
-}
-
 /**
- * Path params in URL-template order, each mapped to a safe, collision-free JS
- * identifier. Template names are matched liberally (`{pet-id}`, not `\w+`) since
- * OpenAPI names aren't constrained to identifiers; the safe ident serves as both
- * the function argument and the URL substitution (a parameter, unlike an object
- * key, cannot be quoted) and keys the `<Op>Variables` alias.
+ * The flat sugar's parameter list: path params spread as positional args (in URL
+ * template order), then the `params`/`body`/`headers` slots, ending with the
+ * trailing `init: RequestOptions` (`SseOptions` for streams). Optional slots
+ * default to `= {}` so trailing arguments can be omitted.
  */
-function orderPathParams(op: OperationModel): {
-  orderedPathParams: ParamModel[];
-  pathParamIdent: Map<string, string>;
-} {
-  const { pathParams } = operationSignature(op);
-  return {
-    orderedPathParams: pathParams.map((p) => p.param),
-    pathParamIdent: new Map(pathParams.map((p) => [p.param.name, p.ident])),
-  };
-}
-
-/**
- * The function/method parameter list. `flat` spreads path params then the
- * `params`/`body`/`headers` slots; `grouped` bundles every input into one
- * `vars: <Op>Variables` (optional `= {}` only when every field is). Both modes end
- * with the trailing `init: RequestOptions`.
- */
-function renderArgList(
+export function renderArgList(
   op: OperationModel,
   orderedPathParams: ParamModel[],
   pathParamIdent: Map<string, string>,
   ctx: EmitContext
 ): ts.ParameterDeclaration[] {
-  const { dateType, schemaNames } = ctx;
-  const groupedMode = ctx.argsStyle === 'grouped';
+  const { dateType } = ctx;
   const args: ts.ParameterDeclaration[] = [];
-  if (groupedMode) {
-    const sig = operationSignature(op);
-    if (sig.hasInputs) {
-      // Reference `<Op>Variables`, or inline its object type when that alias name collides
-      // with a schema (the alias is then suppressed — see `renderOperationAliases`).
-      const varsType = schemaNames.has(sig.variablesTypeName)
-        ? variablesTypeLiteral(op, pascalCase(op.name), orderedPathParams, pathParamIdent, ctx)
-        : factory.createTypeReferenceNode(sig.variablesTypeName);
-      args.push(simpleParam('vars', varsType, !sig.varsRequired));
-    }
-  } else {
-    for (const p of orderedPathParams) {
-      args.push(
-        simpleParam(pathParamIdent.get(p.name)!, schemaToTypeNode(p.schema, dateType), false)
-      );
-    }
-    if (op.queryParams.length > 0)
-      args.push(renderParamsObjectArg('params', op.queryParams, dateType));
-    if (op.requestBody) {
-      const type = bodyTypeNode(op.requestBody, dateType);
-      args.push(
-        factory.createParameterDeclaration(
-          undefined,
-          undefined,
-          'body',
-          op.requestBody.required ? undefined : factory.createToken(ts.SyntaxKind.QuestionToken),
-          type
-        )
-      );
-    }
-    // Operation header params are explicit, typed inputs; security-scheme headers
-    // are injected globally (in `renderInitExpr`) and live underneath them.
-    if (op.headerParams.length > 0)
-      args.push(renderParamsObjectArg('headers', op.headerParams, dateType));
+  for (const p of orderedPathParams) {
+    args.push(
+      simpleParam(pathParamIdent.get(p.name)!, schemaToTypeNode(p.schema, dateType), false)
+    );
   }
+  if (op.queryParams.length > 0)
+    args.push(renderParamsObjectArg('params', op.queryParams, dateType));
+  if (op.requestBody) {
+    const type = bodyTypeNode(op.requestBody, dateType);
+    args.push(
+      factory.createParameterDeclaration(
+        undefined,
+        undefined,
+        'body',
+        op.requestBody.required ? undefined : factory.createToken(ts.SyntaxKind.QuestionToken),
+        type
+      )
+    );
+  }
+  // Operation header params are explicit, typed inputs; security-scheme headers
+  // are injected by the runtime and live underneath them.
+  if (op.headerParams.length > 0)
+    args.push(renderParamsObjectArg('headers', op.headerParams, dateType));
   // SSE ops take per-stream `SseOptions` (reconnect knobs); everyone else the
   // standard per-call `RequestOptions`.
   args.push(
@@ -854,289 +84,3 @@ function renderArgList(
   );
   return args;
 }
-
-/**
- * The `__buildUrl(config, \`/path\`, params?)` expression. Path params are
- * substituted via `encodeURIComponent`; a `{name}` with no matching declared param
- * is left literal (substituting it would reference an undeclared variable).
- */
-function renderUrlExpr(
-  op: OperationModel,
-  configRef: string,
-  groupedMode: boolean,
-  pathParamIdent: Map<string, string>,
-  hasQueryAuth: boolean
-): ts.Expression {
-  const pathExpr = pathTemplate(op.path, groupedMode, pathParamIdent);
-  const args: ts.Expression[] = [configExpr(configRef), pathExpr];
-
-  const queryRef = factory.createPropertyAccessExpression(
-    groupedMode ? factory.createIdentifier('vars') : factory.createIdentifier('params'),
-    'params'
-  );
-  const plainQueryRef = groupedMode ? queryRef : factory.createIdentifier('params');
-  const authQuery = factory.createSpreadAssignment(
-    factory.createPropertyAccessExpression(factory.createIdentifier('__a'), 'query')
-  );
-
-  if (op.queryParams.length === 0) {
-    // Query-auth with no regular query params still needs to inject `__a.query`.
-    if (hasQueryAuth) args.push(factory.createObjectLiteralExpression([authQuery], false));
-  } else if (hasQueryAuth) {
-    args.push(
-      factory.createObjectLiteralExpression(
-        [factory.createSpreadAssignment(plainQueryRef), authQuery],
-        false
-      )
-    );
-  } else {
-    args.push(plainQueryRef);
-  }
-
-  // A 4th `styles` spec is emitted only for non-default query params, so
-  // default operations stay byte-identical (no 4th arg, the runtime's default
-  // serialization path runs). A styled query param is definitionally a query
-  // param, so the 3rd (query) arg above is always present here.
-  const styles = stylesLiteral(op.queryParams);
-  if (styles) args.push(styles);
-
-  return factory.createCallExpression(factory.createIdentifier('__buildUrl'), undefined, args);
-}
-
-/**
- * The per-param query-serialization `styles` object literal for `__buildUrl`,
- * containing entries ONLY for non-default params, or `undefined` when every
- * query param is at the OpenAPI default (`form` + `explode: true`).
- *
- * A param is non-default when ANY of: `style` is set and ≠ `form`, OR
- * `explode === false`, OR `allowReserved === true`. Keyed by the wire param
- * name (a StringLiteral, since names may contain non-identifier chars); the
- * value carries the resolved `style`/`explode` and `allowReserved` only when set.
- */
-function stylesLiteral(queryParams: ParamModel[]): ts.ObjectLiteralExpression | undefined {
-  const entries: ts.PropertyAssignment[] = [];
-  for (const p of queryParams) {
-    const styled = (p.style !== undefined && p.style !== 'form') || p.explode === false;
-    if (!styled && !p.allowReserved) continue;
-    const props: ts.PropertyAssignment[] = [
-      factory.createPropertyAssignment('style', factory.createStringLiteral(p.style ?? 'form')),
-      factory.createPropertyAssignment(
-        'explode',
-        (p.explode ?? true) ? factory.createTrue() : factory.createFalse()
-      ),
-    ];
-    if (p.allowReserved)
-      props.push(factory.createPropertyAssignment('allowReserved', factory.createTrue()));
-    entries.push(
-      factory.createPropertyAssignment(
-        factory.createStringLiteral(p.name),
-        factory.createObjectLiteralExpression(props, false)
-      )
-    );
-  }
-  return entries.length > 0 ? factory.createObjectLiteralExpression(entries, false) : undefined;
-}
-
-/**
- * The path template literal with `{name}` placeholders substituted by
- * `${encodeURIComponent(String(<ident>))}`. A placeholder with no declared param
- * is left literal. No placeholders ⇒ a no-substitution template literal.
- */
-function pathTemplate(
-  path: string,
-  groupedMode: boolean,
-  pathParamIdent: Map<string, string>
-): ts.TemplateLiteral {
-  // Split the path on declared `{name}` placeholders into literal chunks and
-  // substitution expressions. An undeclared placeholder stays in the literal text.
-  const literals: string[] = [];
-  const exprs: ts.Expression[] = [];
-  let buffer = '';
-  let last = 0;
-  for (const match of path.matchAll(/\{([^{}]+)\}/g)) {
-    const ident = pathParamIdent.get(match[1]);
-    if (!ident) continue;
-    buffer += path.slice(last, match.index);
-    literals.push(buffer);
-    buffer = '';
-    last = match.index! + match[0].length;
-    const ref = groupedMode
-      ? factory.createPropertyAccessExpression(factory.createIdentifier('vars'), ident)
-      : factory.createIdentifier(ident);
-    exprs.push(
-      factory.createCallExpression(factory.createIdentifier('encodeURIComponent'), undefined, [
-        factory.createCallExpression(factory.createIdentifier('String'), undefined, [ref]),
-      ])
-    );
-  }
-  buffer += path.slice(last);
-
-  if (exprs.length === 0) return factory.createNoSubstitutionTemplateLiteral(buffer);
-
-  const head = factory.createTemplateHead(literals[0]);
-  const spans = exprs.map((expr, i) =>
-    factory.createTemplateSpan(
-      expr,
-      i === exprs.length - 1
-        ? factory.createTemplateTail(buffer)
-        : factory.createTemplateMiddle(literals[i + 1])
-    )
-  );
-  return factory.createTemplateExpression(head, spans);
-}
-
-/**
- * The `RequestInit` literal: method + caller `init`, plus a merged `headers`
- * object when the operation injects auth or declares header params. Header
- * precedence, lowest → highest (later spreads win): injected auth (`__a.headers`,
- * resolved by the up-front `const __a = await __auth(...)`) → explicit
- * header-param values → caller `init.headers`. So an explicit header overrides
- * auto-injected auth, and the caller always overrides both.
- */
-function renderInitExpr(op: OperationModel, groupedMode: boolean, authed: boolean): ts.Expression {
-  const method = op.method.toUpperCase();
-  const baseProps: ts.ObjectLiteralElementLike[] = [
-    factory.createPropertyAssignment('method', factory.createStringLiteral(method)),
-    factory.createSpreadAssignment(factory.createIdentifier('init')),
-  ];
-
-  const headerSources: ts.ObjectLiteralElementLike[] = [];
-  if (authed) {
-    headerSources.push(
-      factory.createSpreadAssignment(
-        factory.createPropertyAccessExpression(factory.createIdentifier('__a'), 'headers')
-      )
-    );
-  }
-  if (op.headerParams.length > 0) {
-    headerSources.push(factory.createSpreadAssignment(headersHelperCall(op, groupedMode)));
-  }
-  if (headerSources.length === 0) {
-    return factory.createObjectLiteralExpression(baseProps, false);
-  }
-  // `...(init.headers as Record<string, string> | undefined)` — caller wins.
-  headerSources.push(
-    factory.createSpreadAssignment(
-      factory.createAsExpression(
-        factory.createPropertyAccessExpression(factory.createIdentifier('init'), 'headers'),
-        factory.createUnionTypeNode([
-          factory.createTypeReferenceNode('Record', [
-            factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
-            factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
-          ]),
-          factory.createKeywordTypeNode(ts.SyntaxKind.UndefinedKeyword),
-        ])
-      )
-    )
-  );
-  return factory.createObjectLiteralExpression(
-    [
-      ...baseProps,
-      factory.createPropertyAssignment(
-        'headers',
-        factory.createObjectLiteralExpression(headerSources, false)
-      ),
-    ],
-    false
-  );
-}
-
-/** `__headers(<headersRef>)` for the explicit header-param slot. */
-function headersHelperCall(op: OperationModel, groupedMode: boolean): ts.Expression {
-  // Optional headers may be absent on `vars`, so they fall back to `{}`.
-  let headersRef: ts.Expression;
-  if (groupedMode) {
-    const varsHeaders = factory.createPropertyAccessExpression(
-      factory.createIdentifier('vars'),
-      'headers'
-    );
-    headersRef = op.headerParams.some((p) => p.required)
-      ? varsHeaders
-      : factory.createBinaryExpression(
-          varsHeaders,
-          factory.createToken(ts.SyntaxKind.QuestionQuestionToken),
-          factory.createObjectLiteralExpression([], false)
-        );
-  } else {
-    headersRef = factory.createIdentifier('headers');
-  }
-  return factory.createCallExpression(factory.createIdentifier('__headers'), undefined, [
-    headersRef,
-  ]);
-}
-
-/** The `{ id, path, tags }` literal passed to the runtime as the operation's identity. */
-function operationMetaExpr(op: OperationModel): ts.Expression {
-  return factory.createObjectLiteralExpression(
-    [
-      factory.createPropertyAssignment('id', factory.createStringLiteral(op.name)),
-      factory.createPropertyAssignment('path', factory.createStringLiteral(op.path)),
-      factory.createPropertyAssignment(
-        'tags',
-        factory.createArrayLiteralExpression(
-          op.tags.map((t) => factory.createStringLiteral(t)),
-          false
-        )
-      ),
-    ],
-    false
-  );
-}
-
-/**
- * The positional arguments to `__request<T>` / `__requestResult`: config, the operation
- * identity (`operationMetaExpr`), url, init, then an optional body, an explicit response-kind,
- * and a trailing `true` for a typed-multipart body. A non-json response with no body still
- * passes `undefined` as the body placeholder so the later args land in the right positions.
- */
-function renderRequestArgs(
-  op: OperationModel,
-  configRef: string,
-  urlExpr: ts.Expression,
-  initExpr: ts.Expression,
-  groupedMode: boolean,
-  responseKind: 'json' | 'blob' | 'text' | 'void'
-): ts.Expression[] {
-  const args: ts.Expression[] = [configExpr(configRef), operationMetaExpr(op), urlExpr, initExpr];
-  const multipart = !!op.requestBody && isTypedMultipart(op.requestBody);
-  if (op.requestBody) {
-    // Pass the plain body object; __send serializes it (JSON or, for a typed multipart
-    // body, FormData) AFTER the onRequest chain, so a middleware that mutates or replaces
-    // ctx.body has its change sent.
-    args.push(
-      groupedMode
-        ? factory.createPropertyAccessExpression(factory.createIdentifier('vars'), 'body')
-        : factory.createIdentifier('body')
-    );
-  } else if (responseKind !== 'json') {
-    args.push(factory.createIdentifier('undefined'));
-  }
-  // responseKind must be present (even when 'json') when the multipart flag follows it.
-  if (responseKind !== 'json' || multipart) args.push(factory.createStringLiteral(responseKind));
-  if (multipart) args.push(factory.createTrue());
-  return args;
-}
-
-/** The `ClientConfig` expression threaded into the runtime: `__config` or `this.config`. */
-function configExpr(configRef: string): ts.Expression {
-  return configRef === 'this.config'
-    ? factory.createPropertyAccessExpression(factory.createThis(), 'config')
-    : factory.createIdentifier(configRef);
-}
-
-/** The operation's JSDoc body: summary, then a blank line and the description. */
-function renderOperationDoc(op: OperationModel): string | undefined {
-  const docLines: string[] = [];
-  if (op.summary) docLines.push(op.summary);
-  if (op.description) {
-    if (op.summary) docLines.push('');
-    for (const line of splitLines(op.description)) docLines.push(line);
-  }
-  while (docLines.length > 0 && docLines[docLines.length - 1] === '') docLines.pop();
-  return docLines.length > 0 ? docLines.join('\n') : undefined;
-}
-
-/** Attach an operation/param JSDoc block to a node, when there is one. */
-function withDoc<T extends ts.Node>(node: T, doc: string | undefined): T {
-  return doc === undefined ? node : jsdoc(node, doc);
-}
diff --git a/packages/client-generator/src/emitters/package-client.ts b/packages/client-generator/src/emitters/package-client.ts
new file mode 100644
index 0000000000..a930600be3
--- /dev/null
+++ b/packages/client-generator/src/emitters/package-client.ts
@@ -0,0 +1,365 @@
+// Client assembly, shared by both runtime distributions and both output modes. The
+// wiring (descriptor map + `Ops` interface, emitters/descriptor.ts) is identical; only
+// the runtime block differs — `runtime: 'package'` imports `createClient` from
+// `@redocly/client-generator`, everything else (inline, the default) embeds the
+// assembled runtime sources in its place (emitters/inline-runtime.ts). Single-file
+// layout: runtime (import line | embedded block) → schema types → type guards →
+// `<Op>*` aliases → Ops → OPERATIONS → (baked setup) → client instance → sugar →
+// (package mode only) type re-exports — the embedded types are already exported in
+// place, so the embed arm needs none. Split mode moves the schema types + guards into
+// a sibling `<stem>.schemas.ts` the entry re-exports (`emitClientSplit`).
+
+import type {
+  ApiModel,
+  OperationModel,
+  SecuritySchemeModel,
+} from '../intermediate-representation/model.js';
+import { allOperations } from '../writers/util.js';
+import { apiKeySetterName } from './auth.js';
+import { banner, type EmitOptions, HEADER, renderTitleComment } from './client.js';
+import { descriptorStatements, opsInterfaceStatements, packageIdents } from './descriptor.js';
+import { isIdentifier } from './identifier.js';
+import { assembleInlineRuntime } from './inline-runtime.js';
+import { renderOperationAliases, sseAliases } from './operation-aliases.js';
+import { operationSignature } from './operation-signature.js';
+import { computeResponse, errorTypeNodes, isTypedMultipart } from './operation-types.js';
+import { type EmitContext, renderArgList } from './operations.js';
+import { isSseOp } from './sse.js';
+import { pascalCase } from './support.js';
+import {
+  arrow,
+  exportConstStatement,
+  parseStatements,
+  printNodes,
+  printStatements,
+  ts,
+} from './ts.js';
+import { typeGuardStatements } from './type-guards.js';
+import { typesStatements } from './types.js';
+
+const { factory } = ts;
+
+const PACKAGE_SPECIFIER = '@redocly/client-generator';
+
+/**
+ * A double-quoted TS string literal for generated code. `JSON.stringify` alone leaves
+ * U+2028/U+2029 raw (legal JSON, line terminators in code contexts) — escape them so a
+ * hostile spec value can never alter the shape of the emitted statement.
+ */
+function codeString(value: string): string {
+  return JSON.stringify(value)
+    .replace(/\u2028/g, '\\u2028')
+    .replace(/\u2029/g, '\\u2029');
+}
+
+export function emitClientSingleFile(model: ApiModel, options: EmitOptions = {}): string {
+  return emitClient(model, options).entry;
+}
+
+/**
+ * `split` mode: the same client with the schema types + type guards carved out into a
+ * sibling `<stem>.schemas.ts`. The entry file re-exports the schemas module
+ * (`export *`) and type-imports exactly the schema names its own code references, so
+ * both files hold under `noUnusedLocals`. `schemas` is absent when the document
+ * declares no schema statements (the entry is then self-contained).
+ */
+export function emitClientSplit(
+  model: ApiModel,
+  options: EmitOptions,
+  stem: string
+): { entry: string; schemas?: string } {
+  return emitClient(model, options, stem);
+}
+
+/** The shared assembly; `splitStem` (when given) selects the two-file split layout. */
+function emitClient(
+  model: ApiModel,
+  options: EmitOptions,
+  splitStem?: string
+): { entry: string; schemas?: string } {
+  const embed = options.runtime !== 'package';
+  const ops = allOperations(model.services);
+  const idents = packageIdents(model);
+  const ctx: EmitContext = {
+    argsStyle: options.argsStyle ?? 'flat',
+    errorMode: options.errorMode ?? 'throw',
+    dateType: options.dateType ?? 'string',
+    queryAuthKeys: new Set(
+      model.securitySchemes.filter((s) => s.kind === 'apiKeyQuery').map((s) => s.key)
+    ),
+    schemaNames: new Set(model.schemas.map((s) => s.name)),
+  };
+  const flat = ctx.argsStyle === 'flat';
+  const hasSse = ops.some(isSseOp);
+  const hasRegular = ops.some((op) => !isSseOp(op));
+  const apiKeySchemes = model.securitySchemes.filter(
+    (s) => s.kind === 'apiKeyHeader' || s.kind === 'apiKeyQuery' || s.kind === 'apiKeyCookie'
+  );
+
+  const wiring =
+    ops.length > 0
+      ? [
+          ...opsInterfaceStatements(model, idents, ctx),
+          ...descriptorStatements(model, idents, ctx.dateType),
+        ]
+      : // A spec with no operations still gets the uniform wiring shape.
+        parseStatements(
+          'export type Ops = Record<string, never>;\n' +
+            'export const OPERATIONS = {} as const satisfies Record<string, OperationDescriptor>;'
+        );
+
+  const runtimeSection = embed
+    ? assembleInlineRuntime({
+        multipart: ops.some((op) => op.requestBody && isTypedMultipart(op.requestBody)),
+        // Auth sugar needs schemes; `resolveAuth` fires when a descriptor carries
+        // `security` — a valid spec implies the former, but embed on either.
+        auth: model.securitySchemes.length > 0 || ops.some((op) => op.security.length > 0),
+        sse: hasSse,
+        setup: !!options.setup,
+      })
+    : importLine(options, ctx, {
+        hasFlatSse: hasSse && flat,
+        hasFlatRegular: hasRegular && flat,
+        hasRegular,
+        hasApiKey: apiKeySchemes.length > 0,
+      });
+  const schemaStatements = [
+    ...typesStatements(model.schemas, options.enumStyle ?? 'const-object', ctx.dateType),
+    ...typeGuardStatements(model.schemas),
+  ];
+  const bodyStatements = [...ops.flatMap((op) => aliasStatements(op, ctx)), ...wiring];
+  const sugar = printNodes(sugarStatements(ops, idents, ctx, model.securitySchemes, apiKeySchemes));
+  // Embed mode exports its whole public surface in place; only the package arm re-exports.
+  const reexports = embed ? '' : reexportLines(ctx, hasSse);
+
+  // Layout puts the reader's OWN API first (types → aliases → Ops → OPERATIONS) and the
+  // machinery after it. In embed mode the runtime block sits between the descriptors and
+  // the `client` initializer — after it for readability, before `client` so every
+  // declaration the module-init call chain touches (hoisted functions AND any future
+  // top-level const) is already evaluated; in package mode the import line leads.
+  if (splitStem === undefined) {
+    return {
+      entry: banner([
+        HEADER,
+        renderTitleComment(model),
+        ...(embed ? [] : [runtimeSection]),
+        printStatements([...schemaStatements, ...bodyStatements]),
+        ...(embed ? [runtimeSection] : []),
+        clientSection(options, ctx, model),
+        sugar,
+        reexports,
+      ]),
+    };
+  }
+
+  const body = printStatements(bodyStatements);
+  const hasSchemas = schemaStatements.length > 0;
+  return {
+    entry: banner([
+      HEADER,
+      renderTitleComment(model),
+      hasSchemas
+        ? schemaLinks(body + '\n' + sugar, ctx.schemaNames, `./${splitStem}.schemas.js`)
+        : '',
+      ...(embed ? [] : [runtimeSection]),
+      body,
+      ...(embed ? [runtimeSection] : []),
+      clientSection(options, ctx, model),
+      sugar,
+      reexports,
+    ]),
+    schemas: hasSchemas
+      ? banner([HEADER, renderTitleComment(model), printStatements(schemaStatements)])
+      : undefined,
+  };
+}
+
+/**
+ * The entry ⇄ schemas linkage of the split layout: a type-only import of exactly the
+ * schema names the entry's own code references, plus the public `export *` re-export.
+ * Referenced names are found by walking the printed entry code's identifiers (an AST
+ * pass over the emitted text, not a substring search — operation JSDoc may mention a
+ * schema name, and importing an unreferenced type would trip `noUnusedLocals`).
+ */
+function schemaLinks(entryCode: string, schemaNames: Set<string>, specifier: string): string {
+  const referenced = new Set<string>();
+  const visit = (node: ts.Node): void => {
+    if (ts.isIdentifier(node) && schemaNames.has(node.text)) referenced.add(node.text);
+    node.forEachChild(visit);
+  };
+  for (const statement of parseStatements(entryCode)) visit(statement);
+  const names = [...referenced].sort();
+  const importLine =
+    names.length > 0 ? `import type { ${names.join(', ')} } from '${specifier}';\n` : '';
+  return `${importLine}export * from '${specifier}';`;
+}
+
+/** The single import from the runtime package — only names the file actually references. */
+function importLine(
+  options: EmitOptions,
+  ctx: EmitContext,
+  refs: { hasFlatSse: boolean; hasFlatRegular: boolean; hasRegular: boolean; hasApiKey: boolean }
+): string {
+  const values = ['createClient', ...(options.setup ? ['mergeSetup'] : [])];
+  const types = [
+    ...(options.setup ? ['ClientConfig', 'Middleware'] : []),
+    'OperationDescriptor',
+    // Flat sugar signatures reference the per-call option types.
+    ...(refs.hasFlatRegular ? ['RequestOptions'] : []),
+    // `Ops` wraps results in `Result` in result mode — but only NON-SSE members
+    // (an SSE-only spec would otherwise import it unused and fail noUnusedLocals).
+    ...(ctx.errorMode === 'result' && refs.hasRegular ? ['Result'] : []),
+    ...(refs.hasFlatSse ? ['SseOptions'] : []),
+    // The apiKey sugar closures take a `TokenProvider`.
+    ...(refs.hasApiKey ? ['TokenProvider'] : []),
+  ].sort();
+  const names = [...values, ...types.map((t) => `type ${t}`)].join(', ');
+  return `import { ${names} } from '${PACKAGE_SPECIFIER}';`;
+}
+
+/** One operation's `<Op>*` aliases — the same emitters and suppression rules as inline mode. */
+function aliasStatements(op: OperationModel, ctx: EmitContext): ts.Statement[] {
+  const { pathParams } = operationSignature(op);
+  const ordered = pathParams.map((p) => p.param);
+  const identMap = new Map(pathParams.map((p) => [p.param.name, p.ident]));
+  if (isSseOp(op)) return sseAliases(op, ordered, identMap, ctx, 'wire');
+  const { responseType } = computeResponse(op.successResponses, ctx.dateType);
+  const errorMembers =
+    ctx.errorMode === 'result' ? errorTypeNodes(op.errorResponses, ctx.dateType) : [];
+  const errorAlias = errorMembers.length > 0 ? `${pascalCase(op.name)}Error` : '';
+  return renderOperationAliases(
+    op,
+    responseType,
+    ordered,
+    identMap,
+    errorAlias,
+    errorMembers,
+    ctx,
+    true,
+    'wire'
+  );
+}
+
+/** The (optional) baked setup + the default `client` instance. */
+function clientSection(options: EmitOptions, ctx: EmitContext, model: ApiModel): string {
+  const serverUrl = options.serverUrl ?? model.serverUrl;
+  const fields = [
+    // Always baked when the document declares one: the runtime's fallback is a
+    // relative URL, which Node's fetch rejects.
+    ...(serverUrl !== undefined ? [`serverUrl: ${codeString(serverUrl)}`] : []),
+    ...(ctx.errorMode === 'result' ? ['errorMode: "result"'] : []),
+  ];
+  const config = fields.length > 0 ? `{ ${fields.join(', ')} }` : '{}';
+  // Precedence, lowest → highest: spec defaults → baked publisher setup → app `configure()`.
+  // The inner merge flattens the setup into a ClientConfig; the outer layers it OVER the
+  // spec defaults (mergeSetup's second argument wins per-field; middleware composes).
+  const configArg = options.setup
+    ? `mergeSetup({ config: ${config} }, mergeSetup(__redoclySetup, {}))`
+    : config;
+  // The trailing type args narrow `ctx.operation` to the spec's literal unions.
+  // `OperationTag` mirrors descriptorStatements' gate: derived only when some
+  // operation is tagged (it would otherwise be `never`); zero-ops specs have no
+  // derived unions at all, so they keep the string defaults.
+  const ops = allOperations(model.services);
+  const hasTags = ops.some((op) => op.tags.length > 0);
+  const typeArgs =
+    ops.length > 0
+      ? `<Ops, OperationId, OperationPath, ${hasTags ? 'OperationTag' : 'string'}>`
+      : '<Ops>';
+  const client = `export const client = createClient${typeArgs}(OPERATIONS, ${configArg});`;
+  if (!options.setup) return client;
+  return (
+    '// ─── Baked-in setup (--setup) ───\n' +
+    `const __redoclySetup: { config?: ClientConfig; middleware?: Middleware[] } = ${options.setup};\n` +
+    client
+  );
+}
+
+/** Core destructure + per-scheme auth setters + per-operation call sugar. */
+function sugarStatements(
+  ops: OperationModel[],
+  idents: Map<string, string>,
+  ctx: EmitContext,
+  schemes: SecuritySchemeModel[],
+  apiKeySchemes: SecuritySchemeModel[]
+): ts.Statement[] {
+  const statements = [...parseStatements('export const { configure, use } = client;')];
+  // Auth sugar in `authSetterNames` order: bearer, basic, then each apiKey scheme.
+  // The runtime's auth members close over the instance config (no `this`), so
+  // direct bindings are safe.
+  if (schemes.some((s) => s.kind === 'bearer')) {
+    statements.push(...parseStatements('export const setBearer = client.auth.bearer;'));
+  }
+  if (schemes.some((s) => s.kind === 'basic')) {
+    statements.push(...parseStatements('export const setBasicAuth = client.auth.basic;'));
+  }
+  for (const scheme of apiKeySchemes) {
+    const name = apiKeySetterName(scheme.key, apiKeySchemes.length === 1);
+    statements.push(
+      ...parseStatements(
+        `export const ${name} = (value: TokenProvider) => client.auth.apiKey(${codeString(scheme.key)}, value);`
+      )
+    );
+  }
+  if (ops.length === 0) return statements;
+  if (ctx.argsStyle === 'grouped') {
+    // Grouped style: the client methods already take the grouped args shape.
+    const names = ops.map((op) => idents.get(op.name)!).join(', ');
+    statements.push(...parseStatements(`export const { ${names} } = client;`));
+    return statements;
+  }
+  for (const op of ops) statements.push(flatSugarStatement(op, idents.get(op.name)!, ctx));
+  return statements;
+}
+
+/**
+ * One flat one-liner: today's positional signature forwarding to the grouped client
+ * method. Path values are keyed by the WIRE name (the runtime routes
+ * `args[param.name]`); a path param literally named `params`/`body`/`headers` would
+ * collide with the slot keys — a spec-acknowledged runtime-contract limitation.
+ */
+function flatSugarStatement(op: OperationModel, ident: string, ctx: EmitContext): ts.Statement {
+  const { pathParams } = operationSignature(op);
+  const params = renderArgList(
+    op,
+    pathParams.map((p) => p.param),
+    new Map(pathParams.map((p) => [p.param.name, p.ident])),
+    ctx
+  );
+  const props: ts.ObjectLiteralElementLike[] = pathParams.map(({ param, ident: paramIdent }) =>
+    param.name === paramIdent
+      ? factory.createShorthandPropertyAssignment(paramIdent)
+      : factory.createPropertyAssignment(
+          isIdentifier(param.name) ? param.name : factory.createStringLiteral(param.name),
+          factory.createIdentifier(paramIdent)
+        )
+  );
+  if (op.queryParams.length > 0) props.push(factory.createShorthandPropertyAssignment('params'));
+  if (op.requestBody) props.push(factory.createShorthandPropertyAssignment('body'));
+  if (op.headerParams.length > 0) {
+    props.push(factory.createShorthandPropertyAssignment('headers'));
+  }
+  const call = factory.createCallExpression(
+    factory.createPropertyAccessExpression(factory.createIdentifier('client'), ident),
+    undefined,
+    [factory.createObjectLiteralExpression(props, false), factory.createIdentifier('init')]
+  );
+  return exportConstStatement(ident, arrow(params, call));
+}
+
+/** Public type surface re-exported for single-import DX (plus the `ApiError` class). */
+function reexportLines(ctx: EmitContext, hasSse: boolean): string {
+  const types = [
+    'ClientConfig',
+    'Middleware',
+    'RequestOptions',
+    ...(ctx.errorMode === 'result' ? ['Result'] : []),
+    ...(hasSse ? ['ServerSentEvent', 'SseOptions'] : []),
+  ].sort();
+  return (
+    // `createClient` is re-exported so package-mode consumers can build additional
+    // instances from the generated module alone — symmetric with inline output.
+    `export { ApiError, createClient } from '${PACKAGE_SPECIFIER}';\n` +
+    `export type { ${types.join(', ')} } from '${PACKAGE_SPECIFIER}';`
+  );
+}
diff --git a/packages/client-generator/src/emitters/runtime-sources.ts b/packages/client-generator/src/emitters/runtime-sources.ts
new file mode 100644
index 0000000000..46ac612f94
--- /dev/null
+++ b/packages/client-generator/src/emitters/runtime-sources.ts
@@ -0,0 +1,27 @@
+// GENERATED by scripts/generate-runtime-sources.mjs — do not edit. Regenerated on install (`prepare`) and on commit (lint-staged); manually: `npm run prepare -w @redocly/client-generator`.
+export const RUNTIME_SOURCES = {
+  'types.ts':
+    "/**\n * The public type surface of the client runtime — `@redocly/client-generator`'s\n * app-facing runtime module. Pure types, no runtime code (excluded from coverage).\n * The generator emits `OPERATIONS` literals typed\n * `satisfies Record<string, OperationDescriptor>` against this module, so an\n * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).\n */\n\n/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */\nexport type ParamSpec = {\n  name: string;\n  in: 'path' | 'query' | 'header';\n  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';\n  explode?: boolean;\n  allowReserved?: boolean;\n};\n\n/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */\nexport type SecuritySpec =\n  | { scheme: string; kind: 'bearer' | 'basic' }\n  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };\n\n/** The frozen data contract between generated code and the runtime: one operation's wire shape. */\nexport type OperationDescriptor = {\n  id: string;\n  method: string;\n  path: string;\n  tags?: readonly string[];\n  params?: readonly ParamSpec[];\n  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */\n  body?: { contentType: string; multipart?: boolean };\n  /** Defaults to `'json'` (content-type negotiation on parse). */\n  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';\n  sseDataKind?: 'json' | 'text';\n  security?: readonly SecuritySpec[];\n};\n\n/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */\nexport type QueryValue =\n  | string\n  | number\n  | boolean\n  | null\n  | undefined\n  | Array<string | number | boolean | null | undefined>\n  | Record<string, unknown>;\n\n/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */\nexport type TokenProvider = string | (() => string | Promise<string>);\n\n/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */\nexport type AuthCredentials = {\n  bearer?: TokenProvider;\n  basic?: { username: string; password: string };\n  apiKey?: Record<string, TokenProvider>;\n};\n\n/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */\nexport type RetryStrategy = 'fixed' | 'exponential';\n\n/**\n * The operation's identity, exposed to middleware for targeting (`ctx.operation`).\n * Generated clients instantiate the type parameters with the spec's literal unions\n * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a\n * middleware comparison fails to compile; the string defaults keep every\n * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working\n * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types\n * (byte-locked to generated output) remain assignable through middleware callbacks.\n */\nexport type OperationContext<\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n> = { id: Id; path: Path; tags: Tag[] };\n\n/** The mutable request context threaded through the middleware chain. */\nexport type RequestContext<Op extends OperationContext = OperationContext> = {\n  url: string;\n  method: string;\n  headers: Record<string, string>;\n  body?: unknown;\n  operation: Op;\n};\n\n/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */\nexport type RetryContext<Op extends OperationContext = OperationContext> = {\n  attempt: number;\n  request: RequestContext<Op>;\n  response?: Response;\n  error?: unknown;\n};\n\n/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */\nexport type RetryConfig<Op extends OperationContext = OperationContext> = {\n  retries?: number;\n  retryDelay?: number;\n  retryStrategy?: RetryStrategy;\n  jitter?: boolean;\n  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;\n};\n\n/**\n * Structural stand-in for the runtime's ApiError so this module stays import-free\n * (pure types); the real `ApiError` class is assignable to it.\n */\nexport type ApiErrorLike = globalThis.Error & {\n  url: string;\n  status: number;\n  statusText: string;\n  body: unknown;\n};\n\n/** One interceptor: any subset of the three hooks. */\nexport type Middleware<Op extends OperationContext = OperationContext> = {\n  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;\n  onResponse?: (\n    response: Response,\n    ctx: RequestContext<Op>\n  ) => Response | void | Promise<Response | void>;\n  /** Throw mode only: may map/replace the error. */\n  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.\n  onError?: (\n    error: ApiErrorLike,\n    ctx: RequestContext<Op>\n  ) => globalThis.Error | Promise<globalThis.Error>;\n};\n\n/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */\nexport type ClientConfig<Op extends OperationContext = OperationContext> = {\n  serverUrl?: string;\n  fetch?: typeof fetch;\n  headers?:\n    | Record<string, string>\n    | (() => Record<string, string> | Promise<Record<string, string>>);\n  retry?: RetryConfig<Op>;\n  middleware?: Middleware<Op>[];\n  auth?: AuthCredentials;\n  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */\n  errorMode?: 'throw' | 'result';\n  onRequest?: Middleware<Op>['onRequest'];\n  onResponse?: Middleware<Op>['onResponse'];\n  onError?: Middleware<Op>['onError'];\n};\n\n/** Response readers for the per-call `parseAs` override. */\nexport type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';\n\n/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */\nexport type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };\n\n/** Per-call options for an SSE stream; reconnect defaults to true. */\nexport type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };\n\n/** A single decoded Server-Sent Event with its payload typed from the spec. */\nexport type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };\n\n/** Result-mode return shape: exactly one of `data`/`error` is set. */\nexport type Result<TData, TError> =\n  | { data: TData; error: undefined; response: Response }\n  | { data: undefined; error: TError; response: Response };\n\n/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */\nexport type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;\n\n/** The always-present client members (assigned after the operation loop — they win collisions). */\nexport type ClientCore<Op extends OperationContext = OperationContext> = {\n  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */\n  configure(config: ClientConfig<Op>): void;\n  /** Append interceptors (composes with baked/publisher middleware). */\n  use(...middleware: Middleware<Op>[]): void;\n  auth: {\n    bearer(token: TokenProvider): void;\n    basic(username: string, password: string): void;\n    apiKey(scheme: string, value: TokenProvider): void;\n  };\n};\n\n/**\n * The standard TypeScript optionality probe: `{}` has no required members, so\n * `{} extends A` is true exactly when every member of `A` is optional.\n */\n// oxlint-disable-next-line typescript/no-empty-object-type\ntype NoRequiredKeys<A> = {} extends A ? true : false;\n\n/** The typed instance client: one bound method per operation plus the core members. */\nexport type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {\n  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }\n    ? NoRequiredKeys<Ops[K]['args']> extends true\n      ? (\n          args?: Ops[K]['args'],\n          init?: SseOptions\n        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>\n      : (\n          args: Ops[K]['args'],\n          init?: SseOptions\n        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>\n    : NoRequiredKeys<Ops[K]['args']> extends true\n      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>\n      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;\n} & ClientCore<Op>;\n",
+  'errors.ts':
+    "/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */\nexport class ApiError extends Error {\n  public readonly url: string;\n  public readonly status: number;\n  public readonly statusText: string;\n  public readonly body: unknown;\n  constructor(url: string, status: number, statusText: string, body: unknown) {\n    super(`Request failed with status ${status}`);\n    this.name = 'ApiError';\n    this.url = url;\n    this.status = status;\n    this.statusText = statusText;\n    this.body = body;\n  }\n}\n\n/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */\n// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it\n// when this module is embedded alongside generated types (inline mode).\nexport function abortError(signal: AbortSignal): globalThis.Error {\n  const reason = (signal as { reason?: unknown }).reason;\n  if (reason instanceof Error) return reason;\n  return new DOMException('The operation was aborted.', 'AbortError');\n}\n",
+  'url.ts':
+    "import type { ParamSpec, QueryValue } from './types.js';\n\n/**\n * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the\n * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.\n */\nexport type QueryStyle = {\n  style: NonNullable<ParamSpec['style']>;\n  explode: boolean;\n  allowReserved?: boolean;\n};\n\n/**\n * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —\n * `filter=a/b` survives instead of `filter=a%2Fb`.\n */\nexport function encodeReserved(value: string): string {\n  return encodeURIComponent(value).replace(\n    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,\n    (match) => decodeURIComponent(match)\n  );\n}\n\n/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */\nexport function substitutePath(template: string, values: Record<string, unknown>): string {\n  return template.replace(/\\{([^{}]+)\\}/g, (_match, name: string) => {\n    const value = values[name];\n    if (value === undefined) throw new Error(`Missing path parameter \"${name}\"`);\n    return encodeURIComponent(String(value));\n  });\n}\n\n/**\n * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.\n * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);\n * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as\n * `deepObject` brackets, and `null`/`undefined` entries are skipped.\n */\nexport function buildUrl(\n  serverUrl: string,\n  path: string,\n  query?: Record<string, QueryValue>,\n  styles?: Record<string, QueryStyle>\n): string {\n  // Trim trailing slashes with a scan, not `/\\/+$/` — an anchored `+` regex is\n  // quadratic on adversarial many-slash input (the server URL is caller data).\n  let end = serverUrl.length;\n  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;\n  const url = serverUrl.slice(0, end) + path;\n  if (!query) return url;\n  const params = new URLSearchParams();\n  const raw: string[] = [];\n  for (const [key, value] of Object.entries(query)) {\n    if (value === undefined || value === null) continue;\n    const spec = styles?.[key];\n    if (!spec) {\n      if (Array.isArray(value)) {\n        for (const v of value) {\n          if (v !== undefined && v !== null) params.append(key, String(v));\n        }\n      } else if (Object(value) === value) {\n        // Object-valued query params use `deepObject` style: key[subKey]=subValue.\n        for (const [subKey, subValue] of Object.entries(value)) {\n          if (subValue !== undefined && subValue !== null) {\n            params.append(`${key}[${subKey}]`, String(subValue));\n          }\n        }\n      } else {\n        params.append(key, String(value));\n      }\n      continue;\n    }\n    if (Array.isArray(value)) {\n      const items = value.filter((v) => v !== undefined && v !== null).map(String);\n      if (spec.style === 'form' && spec.explode) {\n        for (const v of items) {\n          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);\n          else params.append(key, v);\n        }\n      } else {\n        // Delimited styles put the LITERAL delimiter on the wire; only the\n        // values are encoded. `%20` (not `+`) is the literal space delimiter.\n        const delim =\n          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';\n        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;\n        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);\n      }\n    } else if (Object(value) === value) {\n      // `deepObject` (and any object spec, for now): key[subKey]=subValue.\n      for (const [subKey, subValue] of Object.entries(value)) {\n        if (subValue !== undefined && subValue !== null) {\n          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);\n          else params.append(`${key}[${subKey}]`, String(subValue));\n        }\n      }\n    } else if (spec.allowReserved) {\n      raw.push(`${key}=${encodeReserved(String(value))}`);\n    } else {\n      params.append(key, String(value));\n    }\n  }\n  const qs = [params.toString(), ...raw].filter(Boolean).join('&');\n  return qs ? `${url}?${qs}` : url;\n}\n",
+  'parse.ts':
+    "import type { ParseAs } from './types.js';\n\n/**\n * Read the response body per `kind`. `'auto'` negotiates from the content type\n * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.\n */\nexport async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {\n  if (kind === 'void' || response.status === 204) return undefined;\n  if (kind === 'stream') return response.body;\n  if (kind === 'blob') return response.blob();\n  if (kind === 'arrayBuffer') return response.arrayBuffer();\n  if (kind === 'formData') return response.formData();\n  if (kind === 'text') return response.text();\n  if (kind === 'json') return response.json();\n  // 'auto' — negotiate from the response's content type.\n  const contentType = response.headers.get('content-type') ?? '';\n  if (contentType.toLowerCase().includes('json')) return response.json();\n  if (contentType.startsWith('text/')) return response.text();\n  return response.blob();\n}\n\n/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */\nexport async function readError(response: Response): Promise<unknown> {\n  const contentType = response.headers.get('content-type') ?? '';\n  if (contentType.toLowerCase().includes('json')) {\n    return response.json().catch(() => undefined);\n  }\n  return response.text().catch(() => undefined);\n}\n",
+  'retry.ts':
+    "import { abortError } from './errors.js';\nimport type { RetryConfig, RetryContext } from './types.js';\n\nconst IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);\nconst TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);\n\n/**\n * The default retry predicate: idempotent methods only, on a transport error or a\n * transient status. A custom `retryOn` fully replaces this (no method check kept).\n */\nexport function defaultRetryOn(ctx: RetryContext): boolean {\n  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;\n  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);\n}\n\n/**\n * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)\n * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter\n * unless `jitter === false`.\n */\nexport function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {\n  if (retryAfter) {\n    const seconds = Number(retryAfter);\n    if (!Number.isNaN(seconds)) return seconds * 1000;\n    const when = Date.parse(retryAfter);\n    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());\n  }\n  const base = retry.retryDelay ?? 1000;\n  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);\n  return retry.jitter === false ? raw : Math.random() * raw;\n}\n\n/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */\nexport function sleep(ms: number, signal?: AbortSignal): Promise<void> {\n  return new Promise((resolve, reject) => {\n    if (signal?.aborted) {\n      reject(abortError(signal));\n      return;\n    }\n    const onAbort = () => {\n      clearTimeout(timer);\n      reject(abortError(signal as AbortSignal));\n    };\n    const timer = setTimeout(() => {\n      if (signal) signal.removeEventListener('abort', onAbort);\n      resolve();\n    }, ms);\n    if (signal) signal.addEventListener('abort', onAbort, { once: true });\n  });\n}\n",
+  'multipart.ts':
+    "/**\n * Serialize a plain object into `FormData` for a typed `multipart/form-data` body\n * (capability module — wired into `createClient`, never imported by the send core).\n * `Blob`/`File` and strings pass through; `Date`s become ISO strings; arrays append\n * one field per item; other objects are JSON-encoded; everything else is stringified.\n * `undefined`/`null` entries are skipped.\n */\nexport function toFormData(body: Record<string, unknown>): FormData {\n  const fd = new FormData();\n  const append = (key: string, value: unknown): void => {\n    if (value === undefined || value === null) return;\n    if (value instanceof Blob || typeof value === 'string') fd.append(key, value);\n    else if (value instanceof Date) fd.append(key, value.toISOString());\n    else if (Object(value) === value) fd.append(key, JSON.stringify(value));\n    else fd.append(key, String(value));\n  };\n  for (const [key, value] of Object.entries(body)) {\n    if (Array.isArray(value)) for (const item of value) append(key, item);\n    else append(key, value);\n  }\n  return fd;\n}\n",
+  'auth.ts':
+    "import type { ClientConfig, SecuritySpec, TokenProvider } from './types.js';\n\n/** Resolve a credential: a literal passes through; a function is awaited per request. */\nasync function resolveToken(provider: TokenProvider): Promise<string> {\n  return typeof provider === 'function' ? await provider() : provider;\n}\n\n/**\n * Build the auth headers/query for one operation's `security` requirements from the\n * instance credentials (`config.auth`) — capability module, wired into `createClient`.\n * A scheme with no configured credential contributes nothing (the request is sent\n * unauthenticated and the server rejects it, mirroring the generated-client behavior).\n * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.\n */\nexport async function resolveAuth(\n  security: readonly SecuritySpec[],\n  config: ClientConfig\n): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {\n  const headers: Record<string, string> = {};\n  const query: Record<string, string> = {};\n  const cookies: string[] = [];\n  for (const scheme of security) {\n    if (scheme.kind === 'apiKey') {\n      const provider = config.auth?.apiKey?.[scheme.scheme];\n      if (provider === undefined) continue;\n      const value = await resolveToken(provider);\n      if (scheme.in === 'header') headers[scheme.name] = value;\n      else if (scheme.in === 'query') query[scheme.name] = value;\n      else cookies.push(`${scheme.name}=${value}`);\n    } else if (scheme.kind === 'bearer') {\n      const provider = config.auth?.bearer;\n      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;\n    } else {\n      const basic = config.auth?.basic;\n      if (basic !== undefined) {\n        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;\n      }\n    }\n  }\n  if (cookies.length > 0) headers.Cookie = cookies.join('; ');\n  return { headers, query };\n}\n",
+  'setup.ts':
+    "import type { ClientConfig, Middleware } from './types.js';\n\n/**\n * Merge a publisher's baked setup (`defineClientSetup({...})`) with the app's config:\n * app config fields win per-field over baked defaults, while middleware composes —\n * baked middleware runs first, then the app's.\n */\nexport function mergeSetup(\n  setup: { config?: ClientConfig; middleware?: Middleware[] } | undefined,\n  config: ClientConfig = {}\n): ClientConfig {\n  return {\n    ...setup?.config,\n    ...config,\n    middleware: [...(setup?.middleware ?? []), ...(config.middleware ?? [])],\n  };\n}\n",
+  'send.ts':
+    "import { abortError } from './errors.js';\nimport { defaultRetryOn, retryDelay, sleep } from './retry.js';\nimport type {\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  RequestContext,\n  RequestOptions,\n  RetryConfig,\n} from './types.js';\n\n/**\n * Optional behaviors the send core can use but never statically imports — wired by\n * `createClient` (the same seam the future inline-mode assembler relies on).\n */\nexport type SendCapabilities = {\n  /** Serialize a typed multipart body (a plain object) to FormData. */\n  serializeMultipart?: (body: Record<string, unknown>) => FormData;\n};\n\n/**\n * The effective middleware chain for a request: the single `onRequest`/`onResponse`/\n * `onError` config hooks as one implicit first middleware, then `config.middleware`.\n */\nexport function middlewareChain(config: ClientConfig): Middleware[] {\n  const single =\n    config.onRequest || config.onResponse || config.onError\n      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]\n      : [];\n  return [...single, ...(config.middleware ?? [])];\n}\n\n/**\n * The fetch core shared by every operation: default + config + per-call headers, the\n * `onRequest` chain (BEFORE body serialization, so mutations are sent), body\n * serialization (JSON, or FormData via the multipart capability), the retry loop\n * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse\n * `onResponse` onion. Returns the final response plus the request context.\n */\nexport async function send(\n  config: ClientConfig,\n  op: OperationContext,\n  url: string,\n  init: RequestOptions,\n  body: unknown | undefined,\n  multipart: boolean,\n  caps: SendCapabilities\n): Promise<{ response: Response; context: RequestContext }> {\n  const { retry: callRetry, ...fetchInit } = init;\n  const retry: RetryConfig = { ...config.retry, ...callRetry };\n  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;\n  const headers: Record<string, string> = {\n    Accept: 'application/json',\n    ...extra,\n    ...(fetchInit.headers as Record<string, string> | undefined),\n  };\n  const context: RequestContext = {\n    url,\n    method: fetchInit.method ?? 'GET',\n    headers,\n    body,\n    operation: op,\n  };\n  const middleware = middlewareChain(config);\n  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);\n  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.\n  let payload: BodyInit | undefined;\n  if (context.body !== undefined) {\n    const value = context.body;\n    const isBinary =\n      value instanceof Blob ||\n      value instanceof ArrayBuffer ||\n      ArrayBuffer.isView(value as ArrayBufferView);\n    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;\n    const isURLSearchParams = value instanceof URLSearchParams;\n    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {\n      payload = value as BodyInit;\n    } else if (multipart) {\n      if (!caps.serializeMultipart) {\n        throw new Error('Multipart capability not wired: cannot serialize the request body');\n      }\n      payload = caps.serializeMultipart(value as Record<string, unknown>);\n    } else {\n      payload = JSON.stringify(value);\n      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {\n        context.headers['Content-Type'] = 'application/json';\n      }\n    }\n  }\n  const doFetch = config.fetch ?? fetch;\n  const maxAttempts = 1 + (retry.retries ?? 0);\n  const retryOn = retry.retryOn ?? defaultRetryOn;\n  const signal = fetchInit.signal ?? undefined;\n\n  let attempt = 0;\n  while (true) {\n    attempt++;\n    if (signal?.aborted) throw abortError(signal);\n    let response: Response;\n    try {\n      response = await doFetch(context.url, {\n        ...fetchInit,\n        method: context.method,\n        headers: context.headers,\n        body: payload,\n      });\n    } catch (error) {\n      if (\n        attempt < maxAttempts &&\n        !signal?.aborted &&\n        (await retryOn({ attempt, request: context, error }))\n      ) {\n        await sleep(retryDelay(retry, attempt, null), signal);\n        continue;\n      }\n      throw error;\n    }\n    // Reverse order: the last-registered middleware wraps closest to the network (onion).\n    for (let i = middleware.length - 1; i >= 0; i--) {\n      const onResponse = middleware[i].onResponse;\n      if (onResponse) {\n        const replaced = await onResponse(response, context);\n        if (replaced) response = replaced;\n      }\n    }\n    if (\n      !response.ok &&\n      attempt < maxAttempts &&\n      !signal?.aborted &&\n      (await retryOn({ attempt, request: context, response }))\n    ) {\n      const retryAfter = response.headers.get('retry-after');\n      // Drain the abandoned response body before the next attempt: an unread body\n      // keeps the connection checked out (and can stall the pool) under Node/undici\n      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).\n      await response.body?.cancel().catch(() => undefined);\n      await sleep(retryDelay(retry, attempt, retryAfter), signal);\n      continue;\n    }\n    return { response, context };\n  }\n}\n",
+  'sse.ts':
+    "import { ApiError } from './errors.js';\nimport { readError } from './parse.js';\nimport { sleep } from './retry.js';\nimport { send } from './send.js';\nimport type { ClientConfig, OperationContext, ServerSentEvent, SseOptions } from './types.js';\n\n/**\n * Consume a `text/event-stream` operation as typed events (capability module — wired\n * into `createClient`). Auto-reconnects on dropped connections, resuming from the last\n * seen event id via `Last-Event-ID` (backoff: the server's `retry:` value, then\n * `reconnectDelay`, then 1s — exponential with jitter, capped at 30s). A clean stream\n * end flushes a trailing frame and finishes; `break`/abort end the iterator cleanly.\n */\nexport async function* sse<T>(\n  config: ClientConfig,\n  op: OperationContext,\n  url: string,\n  init: SseOptions,\n  dataKind: 'json' | 'text' = 'text'\n): AsyncGenerator<ServerSentEvent<T>> {\n  const { reconnect = true, reconnectDelay, ...rest } = init;\n  const signal = rest.signal ?? undefined;\n  const headers: Record<string, string> = {\n    Accept: 'text/event-stream',\n    ...(rest.headers as Record<string, string> | undefined),\n  };\n  let lastEventId: string | undefined;\n  let serverRetry: number | undefined;\n  let failures = 0;\n  while (true) {\n    if (signal?.aborted) return;\n    const sendHeaders =\n      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };\n    try {\n      const { response } = await send(\n        config,\n        op,\n        url,\n        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },\n        undefined,\n        false,\n        {}\n      );\n      if (!response.ok) {\n        const errorBody = await readError(response);\n        throw new ApiError(url, response.status, response.statusText, errorBody);\n      }\n      failures = 0;\n      const body = response.body;\n      if (!body) return;\n      const reader = body.getReader();\n      const decoder = new TextDecoder();\n      let buffer = '';\n      try {\n        while (true) {\n          const { done, value } = await reader.read();\n          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });\n          let index: number;\n          while ((index = buffer.search(/\\r\\n\\r\\n|\\n\\n|\\r\\r/)) !== -1) {\n            const raw = buffer.slice(0, index);\n            buffer = buffer.slice(\n              index + buffer.slice(index).match(/^(\\r\\n\\r\\n|\\n\\n|\\r\\r)/)![0].length\n            );\n            const event = parseSseFrame(raw, dataKind);\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n          }\n          if (done) {\n            // Stream closed cleanly. Flush a final event that arrived without a trailing\n            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.\n            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n            return;\n          }\n          // Bound memory: a server that never sends a frame delimiter would otherwise\n          // grow `buffer` without limit. 1 MiB is far above any real SSE frame.\n          if (buffer.length > 1048576) {\n            throw new Error('SSE frame exceeded 1048576 characters without a delimiter');\n          }\n        }\n      } finally {\n        await reader.cancel().catch(() => undefined);\n      }\n    } catch (error) {\n      if (signal?.aborted) return;\n      // A non-OK HTTP response is a definitive error (4xx/5xx), not a transient drop —\n      // surface it instead of reconnecting in a loop.\n      if (error instanceof ApiError) throw error;\n      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream\n      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.\n      if (!reconnect) throw error;\n    }\n    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.\n    failures++;\n    const base = serverRetry ?? reconnectDelay ?? 1000;\n    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);\n    try {\n      await sleep(Math.random() * delay, signal);\n    } catch {\n      return; // sleep rejects only on abort — end the iterator cleanly\n    }\n  }\n}\n\n/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */\nexport function parseSseFrame(\n  raw: string,\n  dataKind: 'json' | 'text'\n): ServerSentEvent<unknown> | undefined {\n  let event: string | undefined;\n  const dataLines: string[] = [];\n  let id: string | undefined;\n  let retry: number | undefined;\n  let sawField = false;\n  for (const line of raw.split(/\\r\\n|\\n|\\r/)) {\n    if (line === '' || line.startsWith(':')) continue;\n    const colon = line.indexOf(':');\n    const field = colon === -1 ? line : line.slice(0, colon);\n    let val = colon === -1 ? '' : line.slice(colon + 1);\n    if (val.startsWith(' ')) val = val.slice(1);\n    sawField = true;\n    if (field === 'event') event = val;\n    else if (field === 'data') dataLines.push(val);\n    else if (field === 'id') id = val;\n    else if (field === 'retry') {\n      const n = Number(val);\n      if (!Number.isNaN(n)) retry = n;\n    }\n  }\n  if (!sawField) return undefined;\n  const dataText = dataLines.join('\\n');\n  const data = dataKind === 'json' && dataText !== '' ? JSON.parse(dataText) : dataText;\n  return { event, data, id, retry };\n}\n",
+  'create-client.ts':
+    "import { ApiError } from './errors.js';\nimport { parse, readError } from './parse.js';\nimport { middlewareChain, send, type SendCapabilities } from './send.js';\nimport type {\n  ApiErrorLike,\n  Client,\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  OperationDescriptor,\n  OpsShape,\n  ParseAs,\n  QueryValue,\n  RequestOptions,\n  SecuritySpec,\n  ServerSentEvent,\n  SseOptions,\n  TokenProvider,\n} from './types.js';\nimport { buildUrl, substitutePath, type QueryStyle } from './url.js';\n\n/**\n * The optional behaviors `createClientCore` can dispatch to but never statically\n * imports. The package's public `createClient` wires the full set; the future\n * inline-mode assembler wires only the capabilities a spec needs.\n */\nexport type Capabilities = SendCapabilities & {\n  resolveAuth?: (\n    security: readonly SecuritySpec[],\n    config: ClientConfig\n  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;\n  sse?: (\n    config: ClientConfig,\n    op: OperationContext,\n    url: string,\n    init: SseOptions,\n    dataKind: 'json' | 'text'\n  ) => AsyncGenerator<ServerSentEvent<unknown>>;\n};\n\n/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */\ntype OperationArgs = {\n  params?: Record<string, QueryValue>;\n  body?: unknown;\n  headers?: Record<string, unknown>;\n} & Record<string, unknown>;\n\n/** The response reader implied by the descriptor (before any per-call `parseAs` override). */\nfunction kindFor(op: OperationDescriptor): ParseAs | 'void' {\n  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {\n    return op.responseKind;\n  }\n  return 'auto';\n}\n\n/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */\nfunction splitArgs(op: OperationDescriptor, args: OperationArgs) {\n  const path: Record<string, unknown> = {};\n  for (const param of op.params ?? []) {\n    if (param.in === 'path') path[param.name] = args[param.name];\n  }\n  return { path, query: args.params, body: args.body, headers: args.headers };\n}\n\n/**\n * The query-serialization hints for the descriptor's query params. A spec is built only\n * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),\n * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)\n * are honored, and an omitted `explode` keeps the exploded default.\n */\nfunction queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {\n  let styles: Record<string, QueryStyle> | undefined;\n  for (const param of op.params ?? []) {\n    if (param.in !== 'query') continue;\n    const deviates =\n      (param.style !== undefined && param.style !== 'form') ||\n      param.explode === false ||\n      param.allowReserved === true;\n    if (!deviates) continue;\n    styles ??= {};\n    styles[param.name] = {\n      style: param.style ?? 'form',\n      explode: param.explode ?? true,\n      allowReserved: param.allowReserved,\n    };\n  }\n  return styles;\n}\n\n/** Stringify caller-supplied extra headers, skipping empty entries. */\nfunction stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {\n  const out: Record<string, string> = {};\n  for (const [key, value] of Object.entries(headers ?? {})) {\n    if (value !== undefined && value !== null) out[key] = String(value);\n  }\n  return out;\n}\n\n/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */\nasync function prepareRequest(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions | SseOptions,\n  caps: Capabilities\n): Promise<{ url: string; init: RequestOptions; body: unknown }> {\n  const { path, query, body, headers } = splitArgs(op, args);\n  const authed =\n    op.security?.length && caps.resolveAuth\n      ? await caps.resolveAuth(op.security, config)\n      : { headers: {}, query: {} };\n  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };\n  const url = buildUrl(\n    config.serverUrl ?? '',\n    substitutePath(op.path, path),\n    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,\n    queryStyles(op)\n  );\n  const mergedInit: RequestOptions = {\n    ...init,\n    method: op.method.toUpperCase(),\n    // Precedence, lowest → highest (later spreads win): injected auth → explicit\n    // header params → caller `init.headers` — the caller always overrides both.\n    headers: {\n      ...authed.headers,\n      ...stringHeaders(headers),\n      ...(init.headers as Record<string, string> | undefined),\n    },\n  };\n  return { url, init: mergedInit, body };\n}\n\n/** One non-SSE call: send, then branch on the configured error mode. */\nasync function execute(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions,\n  caps: Capabilities\n): Promise<unknown> {\n  const prepared = await prepareRequest(config, op, args, init, caps);\n  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n  const { parseAs, ...sendInit } = prepared.init;\n  const { response, context } = await send(\n    config,\n    opCtx,\n    prepared.url,\n    sendInit,\n    prepared.body,\n    op.body?.multipart === true,\n    caps\n  );\n  const readKind = parseAs ?? kindFor(op);\n  if (config.errorMode === 'result') {\n    if (!response.ok) {\n      return { data: undefined, error: await readError(response), response };\n    }\n    return { data: await parse(response, readKind), error: undefined, response };\n  }\n  if (!response.ok) {\n    let error: globalThis.Error = new ApiError(\n      context.url,\n      response.status,\n      response.statusText,\n      await readError(response)\n    );\n    // Thread the error through each middleware's onError in turn (each may replace it).\n    for (const mw of middlewareChain(config)) {\n      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);\n    }\n    throw error;\n  }\n  return parse(response, readKind);\n}\n\n/**\n * Build a typed instance client over operation descriptors: one real bound method per\n * operation (attached by a construction-time loop — no Proxy), plus the core members\n * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name\n * collision with an operation. All behavior dispatches through the capability seam.\n */\nexport function createClientCore<\n  Ops extends OpsShape,\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n>(\n  operations: Record<string, OperationDescriptor>,\n  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},\n  caps: Capabilities = {}\n): Client<Ops, OperationContext<Id, Path, Tag>> {\n  // The literal-union narrowing is a compile-time DX contract only; internally the\n  // runtime works with the base (string-typed) context. One cast at this boundary —\n  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx\n  // params are contravariant).\n  const given = initial as ClientConfig;\n  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.\n  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };\n  const client = {} as Record<string, unknown>;\n\n  for (const [name, op] of Object.entries(operations)) {\n    if (op.responseKind === 'sse') {\n      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {\n        if (!caps.sse) {\n          throw new Error(`SSE capability not wired: cannot stream operation \"${op.id}\"`);\n        }\n        const stream = caps.sse;\n        return (async function* () {\n          const prepared = await prepareRequest(config, op, args, init, caps);\n          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');\n        })();\n      };\n    } else {\n      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>\n        execute(config, op, args, init, caps);\n    }\n  }\n\n  // Core members are assigned AFTER the operation loop — they win over colliding op names.\n  client.configure = (next: ClientConfig): void => {\n    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at\n    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.\n    const { errorMode: _fixed, ...rest } = next;\n    Object.assign(config, rest);\n  };\n  client.use = (...middleware: Middleware[]): void => {\n    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.\n    config.middleware = [...(config.middleware ?? []), ...middleware];\n  };\n  client.auth = {\n    bearer(token: TokenProvider): void {\n      config.auth = { ...config.auth, bearer: token };\n    },\n    basic(username: string, password: string): void {\n      config.auth = { ...config.auth, basic: { username, password } };\n    },\n    apiKey(scheme: string, value: TokenProvider): void {\n      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };\n    },\n  };\n\n  return client as Client<Ops, OperationContext<Id, Path, Tag>>;\n}\n",
+} as const;
+
+export type RuntimeModuleName = keyof typeof RUNTIME_SOURCES;
diff --git a/packages/client-generator/src/emitters/runtime.ts b/packages/client-generator/src/emitters/runtime.ts
deleted file mode 100644
index 44c43fa5a5..0000000000
--- a/packages/client-generator/src/emitters/runtime.ts
+++ /dev/null
@@ -1,761 +0,0 @@
-/**
- * The static runtime inlined verbatim into every generated client: the config /
- * extension contract, the error type, the URL/query builder, the fetch wrapper,
- * and the optional header normalizer.
- *
- * Several parts are gated by call: the inlined `BASE` value; whether `__headers` is
- * emitted (only when some operation declares header params, so `noUnusedLocals`
- * consumers don't trip over dead code); whether the operation-facing helpers
- * (`__buildUrl` / `__request` / `__headers` / `__config`) are `export`ed (multi-file
- * modes) or module-private (single-file); and the optional SSE, per-instance-auth,
- * multipart, and result-mode blocks.
- */
-/**
- * The public `export type`s the runtime/http module exposes. Multi-file writers
- * re-export exactly these from the entry barrel so a consumer gets the whole
- * config surface from one import (and the same names resolve in single-file
- * output, where the types live inline). Kept here, beside the template that emits
- * them, so the list and the emitted `export type`s stay in lockstep — add a
- * public type to the template below and add its name here.
- */
-export const PUBLIC_RUNTIME_TYPES = [
-  'ClientConfig',
-  'Middleware',
-  'OperationContext',
-  'ParseAs',
-  'RequestContext',
-  'RequestOptions',
-  'RetryConfig',
-  'RetryContext',
-  'RetryStrategy',
-] as const;
-
-import { printStatements, parseStatements, type ts } from './ts.js';
-
-/**
- * TS *type* source strings for the `RequestContext.operation` fields. Defaults to the spec-agnostic
- * all-`string` form; the emitter narrows them to the client's `OperationId`/`OperationPath`/
- * `OperationTag` literal unions when the spec has operations (and tags).
- */
-export type OperationContextTypes = { id: string; path: string; tags: string };
-const DEFAULT_OPERATION_CONTEXT: OperationContextTypes = {
-  id: 'string',
-  path: 'string',
-  tags: 'string[]',
-};
-
-export function renderRuntime(
-  serverUrl: string,
-  needsHeaderHelper: boolean,
-  exportHelpers: boolean,
-  errorMode: 'throw' | 'result' = 'throw',
-  needsSse: boolean = false,
-  authConfig: boolean = false,
-  needsMultipart: boolean = false,
-  opCtx: OperationContextTypes = DEFAULT_OPERATION_CONTEXT
-): string {
-  return printStatements(
-    runtimeStatements(
-      serverUrl,
-      needsHeaderHelper,
-      exportHelpers,
-      errorMode,
-      needsSse,
-      authConfig,
-      needsMultipart,
-      opCtx
-    )
-  );
-}
-
-/**
- * The runtime as parsed `ts.Statement[]` — the same hand-authored reference
- * source, embedded via `parseStatements` so the composition can fold it
- * into the single-file / module statement lists. `renderRuntime` prints these.
- */
-export function runtimeStatements(
-  serverUrl: string,
-  needsHeaderHelper: boolean,
-  exportHelpers: boolean,
-  errorMode: 'throw' | 'result' = 'throw',
-  needsSse: boolean = false,
-  authConfig: boolean = false,
-  needsMultipart: boolean = false,
-  opCtx: OperationContextTypes = DEFAULT_OPERATION_CONTEXT
-): ts.Statement[] {
-  return parseStatements(
-    runtimeSource(
-      serverUrl,
-      needsHeaderHelper,
-      exportHelpers,
-      errorMode,
-      needsSse,
-      authConfig,
-      needsMultipart,
-      opCtx
-    )
-  );
-}
-
-function runtimeSource(
-  serverUrl: string,
-  needsHeaderHelper: boolean,
-  exportHelpers: boolean,
-  errorMode: 'throw' | 'result',
-  needsSse: boolean,
-  authConfig: boolean,
-  needsMultipart: boolean,
-  opCtx: OperationContextTypes
-): string {
-  const base = JSON.stringify(serverUrl);
-  const ex = exportHelpers ? 'export ' : '';
-  const multipartBlock = needsMultipart
-    ? `
-
-/**
- * Serialize a plain object into \`FormData\` for a \`multipart/form-data\` body. Called by
- * \`__send\` after the onRequest chain — module-private, never imported across files. \`Blob\`/\`File\`
- * and strings pass through; arrays append one field per item; other objects are JSON-encoded;
- * everything else is stringified. \`undefined\` / \`null\` entries are skipped.
- */
-function __toFormData(body: Record<string, unknown>): FormData {
-  const fd = new FormData();
-  const append = (key: string, value: unknown): void => {
-    if (value === undefined || value === null) return;
-    if (value instanceof Blob || typeof value === 'string') fd.append(key, value);
-    else if (value instanceof Date) fd.append(key, value.toISOString());
-    else if (typeof value === 'object') fd.append(key, JSON.stringify(value));
-    else fd.append(key, String(value));
-  };
-  for (const [key, value] of Object.entries(body)) {
-    if (Array.isArray(value)) for (const item of value) append(key, item);
-    else append(key, value);
-  }
-  return fd;
-}`
-    : '';
-  const headerHelper = needsHeaderHelper
-    ? `
-
-/**
- * Normalize an operation's header-parameter object into a plain string record,
- * dropping any \`undefined\` / \`null\` entries (optional headers the caller omitted)
- * and stringifying the rest. Mirrors __buildUrl's handling of query values.
- */
-${ex}function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(values)) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}`
-    : '';
-  const sseBlock = needsSse
-    ? `
-
-/** A single decoded Server-Sent Event. \`data\` is the parsed payload (\`T\`). */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Per-call options for an SSE stream. \`reconnect\` defaults to true (auto-reconnect). */
-export type SseOptions = RequestInit & {
-  /** Opt out of automatic reconnection; the iterator then ends/throws on the first stream end/error. */
-  reconnect?: boolean;
-  /** Override the base reconnect backoff in ms. The server's \`retry:\` value still takes precedence. */
-  reconnectDelay?: number;
-};
-
-${ex}async function* __sse<T>(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: SseOptions,
-  dataKind: 'json' | 'text' = 'text'
-): AsyncGenerator<ServerSentEvent<T>> {
-  const { reconnect = true, reconnectDelay, ...rest } = init;
-  const signal = rest.signal ?? undefined;
-  const headers: Record<string, string> = {
-    Accept: 'text/event-stream',
-    ...(rest.headers as Record<string, string> | undefined),
-  };
-  let lastEventId: string | undefined;
-  let serverRetry: number | undefined;
-  let failures = 0;
-  while (true) {
-    if (signal?.aborted) return;
-    const sendHeaders = lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
-    try {
-      const { response } = await __send(config, op, url, { ...rest, method: rest.method ?? 'GET', headers: sendHeaders });
-      if (!response.ok) {
-        const errorBody = await readError(response);
-        throw new ApiError(url, response.status, response.statusText, errorBody);
-      }
-      failures = 0;
-      const body = response.body;
-      if (!body) return;
-      const reader = body.getReader();
-      const decoder = new TextDecoder();
-      let buffer = '';
-      try {
-        while (true) {
-          const { done, value } = await reader.read();
-          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });
-          let index: number;
-          while ((index = buffer.search(/\\r\\n\\r\\n|\\n\\n|\\r\\r/)) !== -1) {
-            const raw = buffer.slice(0, index);
-            buffer = buffer.slice(index + buffer.slice(index).match(/^(\\r\\n\\r\\n|\\n\\n|\\r\\r)/)![0].length);
-            const event = __parseSseFrame(raw, dataKind);
-            if (event) {
-              if (event.id !== undefined) lastEventId = event.id;
-              if (event.retry !== undefined) serverRetry = event.retry;
-              yield event as ServerSentEvent<T>;
-            }
-          }
-          if (done) {
-            // Stream closed cleanly. Flush a final event that arrived without a trailing
-            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.
-            const event = buffer.length > 0 ? __parseSseFrame(buffer, dataKind) : undefined;
-            if (event) {
-              if (event.id !== undefined) lastEventId = event.id;
-              if (event.retry !== undefined) serverRetry = event.retry;
-              yield event as ServerSentEvent<T>;
-            }
-            return;
-          }
-          // Bound memory: a server that never sends a frame delimiter would otherwise
-          // grow \`buffer\` without limit. 1 MiB is far above any real SSE frame.
-          if (buffer.length > 1048576) {
-            throw new Error('SSE frame exceeded 1048576 characters without a delimiter');
-          }
-        }
-      } finally {
-        await reader.cancel().catch(() => undefined);
-      }
-    } catch (error) {
-      if (signal?.aborted) return;
-      // A non-OK HTTP response is a definitive error (4xx/5xx), not a transient drop —
-      // surface it instead of reconnecting in a loop.
-      if (error instanceof ApiError) throw error;
-      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream
-      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.
-      if (!reconnect) throw error;
-    }
-    if (!reconnect || signal?.aborted) return;
-    failures++;
-    const base = serverRetry ?? reconnectDelay ?? 1000;
-    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);
-    try {
-      await __sleep(Math.random() * delay, signal);
-    } catch (error) {
-      if (signal?.aborted) return;
-      throw error;
-    }
-  }
-}
-
-/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */
-function __parseSseFrame(raw: string, dataKind: 'json' | 'text'): ServerSentEvent<unknown> | undefined {
-  let event: string | undefined;
-  const dataLines: string[] = [];
-  let id: string | undefined;
-  let retry: number | undefined;
-  let sawField = false;
-  for (const line of raw.split(/\\r\\n|\\n|\\r/)) {
-    if (line === '' || line.startsWith(':')) continue;
-    const colon = line.indexOf(':');
-    const field = colon === -1 ? line : line.slice(0, colon);
-    let val = colon === -1 ? '' : line.slice(colon + 1);
-    if (val.startsWith(' ')) val = val.slice(1);
-    sawField = true;
-    if (field === 'event') event = val;
-    else if (field === 'data') dataLines.push(val);
-    else if (field === 'id') id = val;
-    else if (field === 'retry') { const n = Number(val); if (!Number.isNaN(n)) retry = n; }
-  }
-  if (!sawField) return undefined;
-  const dataText = dataLines.join('\\n');
-  const data = dataKind === 'json' && dataText !== '' ? JSON.parse(dataText) : dataText;
-  return { event, data, id, retry };
-}`
-    : '';
-  const terminal =
-    errorMode === 'result'
-      ? `/**
- * The discriminated result returned by every operation under \`errorMode: 'result'\`.
- * On success \`error\` is \`undefined\`; on a non-2xx response \`data\` is \`undefined\` and
- * \`error\` is the typed response body. \`response\` is always the raw \`Response\` (use
- * \`response.status\` for the HTTP code). Transport/abort failures still throw.
- */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-${ex}async function __requestResult<TData, TError>(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body?: unknown,
-  responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'${needsMultipart ? ',\n  multipart: boolean = false' : ''}
-): Promise<Result<TData, TError>> {
-  const { parseAs, ...sendInit } = init;
-  const { response } = await __send(config, op, url, sendInit, body${needsMultipart ? ', multipart' : ''});
-  if (!response.ok) {
-    const error = (await readError(response)) as TError;
-    return { data: undefined, error, response };
-  }
-  const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
-  const data = (await __parse(response, kind)) as TData;
-  return { data, error: undefined, response };
-}`
-      : `${ex}async function __request<T>(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body?: unknown,
-  responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'${needsMultipart ? ',\n  multipart: boolean = false' : ''}
-): Promise<T> {
-  const { parseAs, ...sendInit } = init;
-  const { response, context } = await __send(config, op, url, sendInit, body${needsMultipart ? ', multipart' : ''});
-  if (!response.ok) {
-    const errorBody = await readError(response);
-    let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of __middleware(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiError, context);
-    }
-    throw error;
-  }
-  const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
-  return (await __parse(response, kind)) as T;
-}`;
-  // Per-instance credentials field on ClientConfig, emitted only when the client has
-  // injectable security schemes (so the `AuthCredentials` type exists). Lets each
-  // service-class instance carry its own credentials instead of sharing the module
-  // globals — see ADR-0009.
-  const authField = authConfig
-    ? `
-  /**
-   * Per-instance auth credentials. When set, they override the module-global
-   * \`set*\` helpers for requests made through this config (each scheme falls back
-   * to its global slot when omitted here). Only the schemes an operation declares
-   * in its \`security\` are ever sent.
-   */
-  auth?: AuthCredentials;`
-    : '';
-  return `let BASE = ${base};
-
-/** Identity of the operation a request belongs to. Stable across path interpolation. */
-export type OperationContext = { id: ${opCtx.id}; path: ${opCtx.path}; tags: ${opCtx.tags} };
-
-/** The mutable request context handed to \`onRequest\` (mutate \`url\`/\`method\`/\`headers\`/\`body\`). */
-export type RequestContext = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  /** The operation being called: its id (operationId), path template, and tags. */
-  operation: OperationContext;
-};
-
-/**
- * Configuration and extension hooks for a client. Supplied per-instance via
- * \`new <Client>(config)\` (service-class facade) or globally via \`configure(config)\`
- * (functions facade).
- */
-export type ClientConfig = {
-  /** Base URL for this client; overrides the inlined default and \`setServerUrl()\`. */
-  serverUrl?: string;
-  /** Extra headers merged into every request; a function is invoked per request. */
-  headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
-  /** Transport used to issue requests. Defaults to the global \`fetch\`. */
-  fetch?: typeof fetch;
-  /** Mutate the request (\`url\` / \`method\` / \`headers\`) before it is sent. */
-  onRequest?: (ctx: RequestContext) => void | Promise<void>;
-  /** Observe — or replace, by returning a \`Response\` — the response before parsing. */
-  onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-  /**
-   * Map a failed request's \`ApiError\` into a custom error to throw instead (throw mode only).
-   * Synchronous, kept so for backward compatibility; \`Middleware.onError\` additionally allows async.
-   */
-  onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
-  /**
-   * Composable interceptors run around every request, alongside the single
-   * \`onRequest\`/\`onResponse\`/\`onError\` hooks above (which act as one implicit, first
-   * middleware). \`onRequest\` runs in array order; \`onResponse\` in reverse — an onion, so
-   * the last-registered middleware wraps closest to the network. Register more at runtime
-   * with \`use()\` (functions facade) or \`<Client>.use()\` (service-class facade).
-   */
-  middleware?: Middleware[];
-  /** Retry policy for transient failures. Omitted ⇒ no retries (\`retries\` defaults to 0). */
-  retry?: RetryConfig;${authField}
-};
-
-/**
- * A request interceptor; every field is optional, so a middleware can hook any subset of
- * the lifecycle. \`onRequest\` may mutate the request \`ctx\` (\`url\`/\`method\`/\`headers\`);
- * \`onResponse\` may return a replacement \`Response\`; \`onError\` (throw mode only) maps the
- * failure into the error to throw, threaded through each middleware in turn.
- */
-export type Middleware = {
-  onRequest?: (ctx: RequestContext) => void | Promise<void>;
-  onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-  // \`globalThis.Error\` (not bare \`Error\`) so a spec schema named \`Error\` can't shadow it.
-  onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/** Context handed to \`retryOn\` for the attempt that just failed. */
-export type RetryContext = {
-  /** 1-based number of the attempt that just failed. */
-  attempt: number;
-  /** The request that was attempted. */
-  request: RequestContext;
-  /** Present when the server returned a (non-ok) response. */
-  response?: Response;
-  /** Present when the transport threw (network error, DNS, connection reset). */
-  error?: unknown;
-};
-
-/** Retry policy; all fields optional with sensible defaults. */
-export type RetryConfig = {
-  /** Number of *extra* attempts after the first. Default 0 (opt-in). */
-  retries?: number;
-  /** Base delay in milliseconds. Default 1000. */
-  retryDelay?: number;
-  /** Backoff shape. Default 'exponential'. */
-  retryStrategy?: RetryStrategy;
-  /** Apply full jitter over the computed delay. Default true. */
-  jitter?: boolean;
-  /**
-   * Decide whether to retry a failed attempt. Default: retry only idempotent
-   * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
-   * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
-   */
-  retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
-};
-
-/**
- * How the response body is read. \`'auto'\` negotiates from the content type (the
- * generated default); \`'stream'\` returns the raw \`ReadableStream\` (\`response.body\`).
- */
-export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
-
-/**
- * The trailing per-operation argument: standard \`RequestInit\` plus an optional
- * per-call retry override and a \`parseAs\` escape hatch.
- *
- * \`parseAs\` forces how the response body is read; overrides the inferred kind.
- * \`'stream'\` returns the raw \`ReadableStream\` (\`response.body\`). This is a runtime
- * override — the static return type is unchanged.
- */
-export type RequestOptions = RequestInit & { retry?: Partial<RetryConfig>; parseAs?: ParseAs };
-
-/**
- * Override the base URL used by every generated operation. Useful when the
- * runtime environment differs from the value declared in \`servers[0].url\`
- * (e.g. dev / staging / prod toggles in a single-page app).
- *
- * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with \`new Client({ serverUrl })\`.
- */
-export function setServerUrl(url: string): void {
-  BASE = url;
-}
-
-/** The global config used by the functions facade (see \`configure\`). */
-${ex}const __config: ClientConfig = {};
-
-/**
- * Merge \`config\` into the global configuration used by the functions facade —
- * set a custom \`fetch\`, default \`headers\`, or \`onRequest\`/\`onResponse\`/\`onError\`
- * hooks once for every free function. The service-class facade configures per
- * instance instead (\`new Client(config)\`).
- */
-export function configure(config: ClientConfig): void {
-  Object.assign(__config, config);
-}
-
-/**
- * Append interceptors to the functions facade's global middleware chain (see
- * \`ClientConfig.middleware\`). The service-class facade registers per instance via
- * \`<Client>.use(...)\` instead.
- */
-export function use(...middleware: Middleware[]): void {
-  // Reassign (don't push) so a caller-provided \`middleware\` array isn't mutated.
-  __config.middleware = [...(__config.middleware ?? []), ...middleware];
-}
-
-/**
- * The effective middleware chain for a request: the single \`onRequest\`/\`onResponse\`/
- * \`onError\` config hooks as one implicit first middleware, then \`config.middleware\`.
- */
-function __middleware(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(\`Request failed with status \${status}\`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-type QueryPrimitive = string | number | boolean;
-type QueryValue =
-  | QueryPrimitive
-  | null
-  | undefined
-  | Array<QueryPrimitive>
-  | Record<string, unknown>;
-
-/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (\`form\`, \`explode: true\`). */
-type QueryStyle = {
-  style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Percent-encode \`value\` but leave the RFC-3986 reserved set
- * (\`:/?#[]@!$&'()*+,;=\`) un-escaped, for query params declaring \`allowReserved\`.
- */
-function __encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-${ex}function __buildUrl(
-  config: ClientConfig,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  const url = (config.serverUrl ?? BASE).replace(/\\/+$/, '') + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (typeof value === 'object') {
-        // Object-valued query params use \`deepObject\` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(\`\${key}[\${subKey}]\`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(\`\${key}=\${__encodeReserved(v)}\`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. \`%20\` (not \`+\`) is the literal space delimiter.
-        const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
-        raw.push(\`\${encodeURIComponent(key)}=\${items.map(enc).join(delim)}\`);
-      }
-    } else if (typeof value === 'object') {
-      // \`deepObject\` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(\`\${key}[\${subKey}]=\${__encodeReserved(String(subValue))}\`);
-          else params.append(\`\${key}[\${subKey}]\`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(\`\${key}=\${__encodeReserved(String(value))}\`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? \`\${url}?\${qs}\` : url;
-}
-
-${ex}async function __send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body?: unknown${needsMultipart ? ',\n  multipart: boolean = false' : ''}
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
-  };
-  const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
-  const middleware = __middleware(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    }${needsMultipart ? ' else if (multipart) {\n      payload = __toFormData(value as Record<string, unknown>);\n    }' : ''} else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? __defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw __abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
-        await __sleep(__retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-${ex}async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-${terminal}
-
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-function __defaultRetryOn(ctx: RetryContext): boolean {
-  if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(__abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(__abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-function __abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}${sseBlock}${headerHelper}${multipartBlock}`;
-}
diff --git a/packages/client-generator/src/emitters/setup-bake.ts b/packages/client-generator/src/emitters/setup-bake.ts
index 39f49af42f..098ad0892b 100644
--- a/packages/client-generator/src/emitters/setup-bake.ts
+++ b/packages/client-generator/src/emitters/setup-bake.ts
@@ -4,9 +4,9 @@ import { ts } from './ts.js';
 const SETUP_IMPORT = '@redocly/client-generator';
 
 /**
- * Transform a publisher `--setup` module into the neutral **setup expression** the emitters splice
- * into a client as `const __redoclySetup = <expr>` — applied per-facade (functions → `configure`/
- * `use`; service-class → constructor merge). Strips the (package-only) imports, extracts the default
+ * Transform a publisher `--setup` module into the neutral **setup expression** the emitter splices
+ * into a client as `const __redoclySetup = <expr>` — merged into the client's config via
+ * `mergeSetup`. Strips the (package-only) imports, extracts the default
  * export's `defineClientSetup({ config, middleware })` argument, and — when the file declares
  * helpers — wraps them in an IIFE so they are preserved yet scoped (only `__redoclySetup` lands in
  * module scope, avoiding collisions):
diff --git a/packages/client-generator/src/emitters/sse.ts b/packages/client-generator/src/emitters/sse.ts
index a93c37f21c..1483f00253 100644
--- a/packages/client-generator/src/emitters/sse.ts
+++ b/packages/client-generator/src/emitters/sse.ts
@@ -64,8 +64,3 @@ export function sseDataKind(op: OperationModel): 'json' | 'text' {
     ? 'json'
     : 'text';
 }
-
-/** The barrel fragment export name carrying a tag/class's SSE members (functions facade, multi-file). */
-export function sseFragmentName(className: string): string {
-  return `__sse_${className}`;
-}
diff --git a/packages/client-generator/src/emitters/ts.ts b/packages/client-generator/src/emitters/ts.ts
index 2bd28b1426..539ff72bf7 100644
--- a/packages/client-generator/src/emitters/ts.ts
+++ b/packages/client-generator/src/emitters/ts.ts
@@ -92,40 +92,17 @@ const { factory } = ts;
  */
 
 /** A `const`/`let` variable statement: `[export] const|let <name>[: type] = <init>;`. */
-function variableStatement(
-  flag: ts.NodeFlags.Const | ts.NodeFlags.Let,
-  name: string,
-  init: ts.Expression,
-  opts: { type?: ts.TypeNode; export?: boolean }
-): ts.Statement {
+/** `export const <name> = <init>;` */
+export function exportConstStatement(name: string, init: ts.Expression): ts.Statement {
   return factory.createVariableStatement(
-    opts.export ? [factory.createModifier(ts.SyntaxKind.ExportKeyword)] : undefined,
+    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
     factory.createVariableDeclarationList(
-      [factory.createVariableDeclaration(name, undefined, opts.type, init)],
-      flag
+      [factory.createVariableDeclaration(name, undefined, undefined, init)],
+      ts.NodeFlags.Const
     )
   );
 }
 
-/** `const <name>[: type] = <init>;` */
-export function constStatement(
-  name: string,
-  init: ts.Expression,
-  type?: ts.TypeNode
-): ts.Statement {
-  return variableStatement(ts.NodeFlags.Const, name, init, { type });
-}
-
-/** `export const <name> = <init>;` */
-export function exportConstStatement(name: string, init: ts.Expression): ts.Statement {
-  return variableStatement(ts.NodeFlags.Const, name, init, { export: true });
-}
-
-/** `let <name>[: type] = <init>;` */
-export function letStatement(name: string, init: ts.Expression, type?: ts.TypeNode): ts.Statement {
-  return variableStatement(ts.NodeFlags.Let, name, init, { type });
-}
-
 /** An arrow function `(<params>) => <body>` (no explicit return type). */
 export function arrow(params: ts.ParameterDeclaration[], body: ts.ConciseBody): ts.ArrowFunction {
   return factory.createArrowFunction(
diff --git a/packages/client-generator/src/emitters/wrapper-support.ts b/packages/client-generator/src/emitters/wrapper-support.ts
index 644aef336c..857ea4a601 100644
--- a/packages/client-generator/src/emitters/wrapper-support.ts
+++ b/packages/client-generator/src/emitters/wrapper-support.ts
@@ -18,8 +18,8 @@ const { factory } = ts;
  * The operations a wrapper generator can wrap, with skips reported to the user under
  * `label` (the generator name). Two kinds are dropped:
  *
- * - **SSE operations** — the sdk emits these as a private `sse.*` async-iterator surface,
- *   not exported request/response functions, so there is nothing to wrap.
+ * - **SSE operations** — the sdk exposes these as async generators (streams), not
+ *   request/response functions, so a query/mutation hook cannot wrap them.
  * - **`<Op>Variables` name collisions** — a wrapper types its inputs as the sdk's
  *   `<Op>Variables`; when that name collides with a schema the sdk suppresses the alias,
  *   so the import would resolve to the schema (a wrong/broken type). The sdk function still
@@ -30,7 +30,7 @@ export function wrappableOperations(model: ApiModel, label: string): OperationMo
   const sse = all.filter(isSseOp);
   if (sse.length > 0) {
     logger.warn(
-      `generate-client: ${label} skipped ${sse.length} server-sent-events operation(s) — consume them via the sdk \`sse.*\` surface: ${sse
+      `generate-client: ${label} skipped ${sse.length} server-sent-events operation(s) — iterate the sdk's exported async generators directly: ${sse
         .map((op) => op.name)
         .join(', ')}.\n`
     );
diff --git a/packages/client-generator/src/generators/__tests__/index.test.ts b/packages/client-generator/src/generators/__tests__/index.test.ts
index b3082079b5..303ddc0cf4 100644
--- a/packages/client-generator/src/generators/__tests__/index.test.ts
+++ b/packages/client-generator/src/generators/__tests__/index.test.ts
@@ -1,5 +1,5 @@
 import { NotSupportedError } from '../../errors.js';
-import { getGenerator, validateGenerators } from '../index.js';
+import { builtinGenerators, getGenerator, validateGenerators } from '../index.js';
 import { sdkGenerator } from '../sdk.js';
 import { zodGenerator } from '../zod.js';
 
@@ -26,7 +26,7 @@ describe('validateGenerators', () => {
     expect(() => validateGenerators(['zod'], {})).not.toThrow();
   });
 
-  it('accepts sdk + tanstack-query with the default facade/error-mode', () => {
+  it('accepts sdk + tanstack-query with the default error-mode', () => {
     expect(() => validateGenerators(['sdk', 'tanstack-query'], {})).not.toThrow();
   });
 
@@ -50,22 +50,12 @@ describe('validateGenerators', () => {
     expect(() => validateGenerators(['sdk', 'transformers'], { dateType: 'Date' })).not.toThrow();
   });
 
-  it('rejects tanstack-query with the service-class facade', () => {
-    expect(() =>
-      validateGenerators(['sdk', 'tanstack-query'], { facade: 'service-class' })
-    ).toThrow(/does not support --facade "service-class".*functions/);
-  });
-
   it('rejects tanstack-query with result error mode', () => {
     expect(() => validateGenerators(['sdk', 'tanstack-query'], { errorMode: 'result' })).toThrow(
       /does not support --error-mode "result".*throw/
     );
   });
 
-  it('allows the service-class facade for sdk (unconstrained)', () => {
-    expect(() => validateGenerators(['sdk'], { facade: 'service-class' })).not.toThrow();
-  });
-
   it('throws NotSupportedError for an unknown generator name', () => {
     expect(() => validateGenerators(['nope' as never], {})).toThrow(NotSupportedError);
   });
@@ -84,16 +74,10 @@ describe('swr generator', () => {
     );
   });
 
-  it('accepts sdk + swr with the default facade/error-mode', () => {
+  it('accepts sdk + swr with the default error-mode', () => {
     expect(() => validateGenerators(['sdk', 'swr'], {})).not.toThrow();
   });
 
-  it('rejects swr with the service-class facade', () => {
-    expect(() => validateGenerators(['sdk', 'swr'], { facade: 'service-class' })).toThrow(
-      /does not support --facade "service-class".*functions/
-    );
-  });
-
   it('rejects swr with result error mode', () => {
     expect(() => validateGenerators(['sdk', 'swr'], { errorMode: 'result' })).toThrow(
       /does not support --error-mode "result".*throw/
@@ -101,6 +85,38 @@ describe('swr generator', () => {
   });
 });
 
+describe('validateGenerators — runtime compatibility', () => {
+  /** A registry with one runtimes-restricted generator (no built-in restricts runtimes anymore). */
+  function registryWith(runtimes: ('inline' | 'package')[]) {
+    const registry = builtinGenerators();
+    registry.set('inline-only', { run: () => [], runtimes });
+    return registry;
+  }
+
+  it('rejects a runtimes-restricted generator with runtime: package, naming both', () => {
+    expect(() =>
+      validateGenerators(['inline-only'], { runtime: 'package' }, registryWith(['inline']))
+    ).toThrow(/"inline-only".*runtime "package".*inline/);
+  });
+
+  it('accepts a runtimes-restricted generator when the runtime matches (or is defaulted)', () => {
+    expect(() =>
+      validateGenerators(['inline-only'], { runtime: 'inline' }, registryWith(['inline']))
+    ).not.toThrow();
+    expect(() => validateGenerators(['inline-only'], {}, registryWith(['inline']))).not.toThrow();
+  });
+
+  it('accepts the wrapper generators with runtime: package (no longer restricted)', () => {
+    expect(() =>
+      validateGenerators(
+        ['sdk', 'tanstack-query', 'swr'],
+        { runtime: 'package', queryFramework: 'react' },
+        builtinGenerators()
+      )
+    ).not.toThrow();
+  });
+});
+
 describe('mock generator', () => {
   it('is registered and requires sdk', () => {
     const descriptor = getGenerator('mock');
diff --git a/packages/client-generator/src/generators/__tests__/sdk.test.ts b/packages/client-generator/src/generators/__tests__/sdk.test.ts
index cafe53fba9..38c4b2961c 100644
--- a/packages/client-generator/src/generators/__tests__/sdk.test.ts
+++ b/packages/client-generator/src/generators/__tests__/sdk.test.ts
@@ -40,13 +40,15 @@ describe('sdkGenerator', () => {
     expect(viaGenerator).toEqual(viaWriter);
   });
 
-  it('honors the output mode (split produces multiple files)', () => {
+  it('honors the output mode (split carves the schemas into a sibling file)', () => {
+    const model = apiModel();
+    model.schemas = [{ name: 'Thing', schema: { kind: 'object', properties: [] } }];
     const files = sdkGenerator({
-      model: apiModel(),
+      model,
       outputPath: '/out/api.ts',
       outputMode: 'split',
       emit: {},
     });
-    expect(files.length).toBeGreaterThan(1);
+    expect(files.map((f) => f.path)).toEqual(['/out/api.schemas.ts', '/out/api.ts']);
   });
 });
diff --git a/packages/client-generator/src/generators/index.ts b/packages/client-generator/src/generators/index.ts
index 4c90d438b4..692037421c 100644
--- a/packages/client-generator/src/generators/index.ts
+++ b/packages/client-generator/src/generators/index.ts
@@ -23,20 +23,11 @@ const GENERATORS: Record<GeneratorName, GeneratorDescriptor> = {
   // transformers import the schema *types* from the sdk entry module (so sdk must run) and
   // assign `Date` values to those fields, which only type-checks when the sdk types dates as `Date`.
   transformers: { run: transformersGenerator, requires: ['sdk'], dateTypes: ['Date'] },
-  // tanstack-query wraps the sdk's exported, throw-mode, free operation functions.
-  'tanstack-query': {
-    run: tanstackQueryGenerator,
-    requires: ['sdk'],
-    facades: ['functions'],
-    errorModes: ['throw'],
-  },
-  // swr wraps the sdk's exported, throw-mode, free operation functions as SWR hooks.
-  swr: {
-    run: swrGenerator,
-    requires: ['sdk'],
-    facades: ['functions'],
-    errorModes: ['throw'],
-  },
+  // tanstack-query wraps the sdk's exported, throw-mode operation functions — present in
+  // both runtime distributions, so no runtime restriction.
+  'tanstack-query': { run: tanstackQueryGenerator, requires: ['sdk'], errorModes: ['throw'] },
+  // swr wraps the sdk's exported, throw-mode operation functions as SWR hooks.
+  swr: { run: swrGenerator, requires: ['sdk'], errorModes: ['throw'] },
   // mock emits a standalone MSW handlers/factories module referencing the sdk's types.
   mock: { run: mockGenerator, requires: ['sdk'] },
 };
@@ -69,9 +60,9 @@ export function validateGenerators(
   registry: Map<string, GeneratorDescriptor> = builtinGenerators()
 ): void {
   const selected = new Set(names);
-  const facade = emit.facade ?? 'functions';
   const errorMode = emit.errorMode ?? 'throw';
   const dateType = emit.dateType ?? 'string';
+  const runtime = emit.runtime ?? 'inline';
   for (const name of names) {
     const descriptor = registry.get(name);
     if (!descriptor) {
@@ -85,11 +76,6 @@ export function validateGenerators(
         );
       }
     }
-    if (descriptor.facades && !descriptor.facades.includes(facade)) {
-      throw new NotSupportedError(
-        `The "${name}" generator does not support --facade "${facade}" (supported: ${descriptor.facades.join(', ')}).`
-      );
-    }
     if (descriptor.errorModes && !descriptor.errorModes.includes(errorMode)) {
       throw new NotSupportedError(
         `The "${name}" generator does not support --error-mode "${errorMode}" (supported: ${descriptor.errorModes.join(', ')}).`
@@ -100,5 +86,10 @@ export function validateGenerators(
         `The "${name}" generator requires --date-type ${descriptor.dateTypes.join(' or ')} (got "${dateType}") so the runtime values match the generated types.`
       );
     }
+    if (descriptor.runtimes && !descriptor.runtimes.includes(runtime)) {
+      throw new NotSupportedError(
+        `The "${name}" generator does not support runtime "${runtime}" (supported: ${descriptor.runtimes.join(', ')}).`
+      );
+    }
   }
 }
diff --git a/packages/client-generator/src/generators/resolve.ts b/packages/client-generator/src/generators/resolve.ts
index 5d8c138934..9921a52dc8 100644
--- a/packages/client-generator/src/generators/resolve.ts
+++ b/packages/client-generator/src/generators/resolve.ts
@@ -71,9 +71,9 @@ function register(registry: Map<string, GeneratorDescriptor>, custom: CustomGene
   registry.set(custom.name, {
     run: custom.run,
     requires: custom.requires,
-    facades: custom.facades,
     errorModes: custom.errorModes,
     dateTypes: custom.dateTypes,
+    runtimes: custom.runtimes,
   });
 }
 
diff --git a/packages/client-generator/src/generators/swr.ts b/packages/client-generator/src/generators/swr.ts
index 3f40b6f794..8dba1b06f3 100644
--- a/packages/client-generator/src/generators/swr.ts
+++ b/packages/client-generator/src/generators/swr.ts
@@ -10,7 +10,7 @@ import type { Generator } from './types.js';
  * sdk operation functions — `<op>Key` + `use<Op>` (`useSWR`) per query (GET/HEAD),
  * `use<Op>` (`useSWRMutation`) per mutation. It imports the operation functions +
  * their `<Op>Variables` types from the sdk entry (`./<stem>.js`), so it requires the
- * `sdk` generator and targets its throw-mode functions facade. `swr`/`swr/mutation`
+ * `sdk` generator and targets its throw-mode operation functions. `swr`/`swr/mutation`
  * are the consumer's peer; the sdk client stays dependency-free.
  *
  * Output-mode-agnostic: `./<stem>.js` resolves to the single-file client or the
diff --git a/packages/client-generator/src/generators/tanstack-query.ts b/packages/client-generator/src/generators/tanstack-query.ts
index bc1a6af622..124fa3954c 100644
--- a/packages/client-generator/src/generators/tanstack-query.ts
+++ b/packages/client-generator/src/generators/tanstack-query.ts
@@ -11,7 +11,7 @@ import type { Generator } from './types.js';
  * `<op>QueryKey`/`<op>Options` per query (GET/HEAD), `<op>Mutation` per mutation.
  * It imports the operation functions + their `<Op>Variables` types from the sdk
  * entry (`./<stem>.js`), so it requires the `sdk` generator and targets its
- * throw-mode functions facade. The framework-agnostic `queryOptions` helper is
+ * throw-mode operation functions. The framework-agnostic `queryOptions` helper is
  * imported from `@tanstack/${queryFramework}-query` (`react` default; the body is
  * byte-identical across frameworks — `@tanstack/<framework>-query` is the consumer's peer).
  *
diff --git a/packages/client-generator/src/generators/types.ts b/packages/client-generator/src/generators/types.ts
index f9f01e3c2e..c1f730f261 100644
--- a/packages/client-generator/src/generators/types.ts
+++ b/packages/client-generator/src/generators/types.ts
@@ -1,6 +1,6 @@
 // packages/client-generator/src/generators/types.ts
 import type { EmitOptions } from '../emitters/client.js';
-import type { ErrorMode, Facade } from '../emitters/operations.js';
+import type { ErrorMode } from '../emitters/operations.js';
 import type { DateType } from '../emitters/types.js';
 import type { ApiModel } from '../intermediate-representation/model.js';
 import type { GeneratedFile, OutputMode } from '../writers/types.js';
@@ -15,7 +15,7 @@ export type GeneratorInput = {
   outputPath: string;
   /** File partitioning the generator should honor. */
   outputMode: OutputMode;
-  /** Emit options — serverUrl, facade, and the generator knobs (dateType, mockData, queryFramework, …); see `EmitOptions`. */
+  /** Emit options — serverUrl, runtime, and the generator knobs (dateType, mockData, queryFramework, …); see `EmitOptions`. */
   emit: EmitOptions;
 };
 
@@ -33,19 +33,20 @@ export type Generator = (input: GeneratorInput) => GeneratedFile[];
  *
  * - `requires`: other generators that must also be selected (e.g. `tanstack-query`
  *   imports the sdk's operation functions, so it requires `sdk`).
- * - `facades` / `errorModes` / `dateTypes`: the subset this generator supports;
- *   `undefined` means "all". (`tanstack-query` wraps free throw-mode functions, so it
- *   supports only the `functions` facade in `throw` mode; `transformers` only type-checks
- *   when the sdk types date fields as `Date`, so it supports only `dateType: 'Date'`.)
+ * - `errorModes` / `dateTypes` / `runtimes`: the subset this generator supports;
+ *   `undefined` means "all". (`tanstack-query` wraps throw-mode functions, so it
+ *   supports only `throw` mode; `transformers` only type-checks when the sdk types
+ *   date fields as `Date`, so it supports only `dateType: 'Date'`.)
  */
 export type GeneratorDescriptor = {
   run: Generator;
   // `string[]` (not `GeneratorName[]`) so a custom generator may require a built-in or another
   // custom generator by name; built-in descriptors still type-check (their names are strings).
   requires?: string[];
-  facades?: Facade[];
   errorModes?: ErrorMode[];
   dateTypes?: DateType[];
+  /** Runtime modes this generator supports; absent = compatible with both. */
+  runtimes?: ('inline' | 'package')[];
 };
 
 /**
diff --git a/packages/client-generator/src/index.ts b/packages/client-generator/src/index.ts
index c5c03e8edc..25b7b46cb6 100644
--- a/packages/client-generator/src/index.ts
+++ b/packages/client-generator/src/index.ts
@@ -25,11 +25,34 @@ export type {
   RetryContext,
   RetryStrategy,
 } from './runtime-contract.js';
+// The app-facing client runtime (package-mode clients import these from the package root).
+// The setup-contract names above (Middleware, OperationContext, RequestContext, RetryConfig,
+// RetryContext, RetryStrategy) are re-exports of the same runtime types — one definition,
+// two entry points; the rest of the runtime's type surface is re-exported here.
+export { ApiError, createClient, mergeSetup } from './runtime/index.js';
+export type {
+  ApiErrorLike,
+  AuthCredentials,
+  Client,
+  ClientConfig,
+  ClientCore,
+  OperationDescriptor,
+  OpsShape,
+  ParamSpec,
+  ParseAs,
+  QueryValue,
+  RequestOptions,
+  Result,
+  SecuritySpec,
+  ServerSentEvent,
+  SseOptions,
+  TokenProvider,
+} from './runtime/index.js';
 export type { Config } from './config.js';
 export type { GenerateClientOptions, GenerateClientResult, LoadResult } from './types.js';
 export { mergeConfig } from './config-file.js';
 // The custom-generator plugin API + codegen toolkit + IR types (also re-exports the shared
-// `Generator`/`GeneratedFile`/`OutputMode`/`ArgsStyle`/`Facade` types).
+// `Generator`/`GeneratedFile`/`OutputMode`/`ArgsStyle` types).
 export * from './plugin.js';
 
 /**
@@ -50,7 +73,7 @@ export function collectGeneratedFiles(
 ): GeneratedFile[] {
   const registry = options.registry ?? builtinGenerators();
   // Fail fast on an incompatible selection (missing prerequisite, unsupported
-  // facade/error-mode) before producing any file.
+  // error-mode/date-type/runtime) before producing any file.
   validateGenerators(options.generators, options.emit, registry);
   const files: GeneratedFile[] = [];
   const seen = new Set<string>();
@@ -84,7 +107,7 @@ export async function generateClient(
   const model = buildApiModel(normalized);
 
   // A publisher `--setup` module is read, validated, and transformed into the neutral setup
-  // expression baked into the client. Applied per facade and across all output modes by the emitter.
+  // expression baked into the client. Applied across all output modes by the emitter.
   let setupBlock: string | undefined;
   if (options.setup) {
     // Resolve a relative setup path against the cwd, consistent with `output` above.
@@ -110,15 +133,14 @@ export async function generateClient(
     emit: {
       serverUrl: options.serverUrl,
       enumStyle: options.enumStyle,
-      facade: options.facade,
       argsStyle: options.argsStyle,
-      name: options.name,
       errorMode: options.errorMode,
       dateType: options.dateType,
       queryFramework: options.queryFramework,
       mockData: options.mockData,
       mockSeed: options.mockSeed,
       setup: setupBlock,
+      runtime: options.runtime,
     },
     generators: selected,
     registry,
diff --git a/packages/client-generator/src/intermediate-representation/__tests__/refs.test.ts b/packages/client-generator/src/intermediate-representation/__tests__/refs.test.ts
deleted file mode 100644
index 9adb6a1162..0000000000
--- a/packages/client-generator/src/intermediate-representation/__tests__/refs.test.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-import type { OperationModel, SchemaModel } from '../model.js';
-import { collectOperationRefs, collectSchemaRefs } from '../refs.js';
-
-const ref = (name: string): SchemaModel => ({ kind: 'ref', name });
-
-function operation(overrides: Partial<OperationModel> = {}): OperationModel {
-  return {
-    name: 'op',
-    method: 'get',
-    path: '/p',
-    pathParams: [],
-    queryParams: [],
-    headerParams: [],
-    successResponses: [],
-    errorResponses: [],
-    security: [],
-    tags: [],
-    ...overrides,
-  };
-}
-
-describe('collectSchemaRefs', () => {
-  it('collects a direct ref', () => {
-    expect([...collectSchemaRefs(ref('Pet'))]).toEqual(['Pet']);
-  });
-
-  it('collects the base of an omit schema', () => {
-    expect([...collectSchemaRefs({ kind: 'omit', base: 'Pet', keys: ['id'] })]).toEqual(['Pet']);
-  });
-
-  it('returns nothing for scalar / literal / enum / null / unknown', () => {
-    expect([...collectSchemaRefs({ kind: 'scalar', scalar: 'string' })]).toEqual([]);
-    expect([...collectSchemaRefs({ kind: 'literal', value: 'a' })]).toEqual([]);
-    expect([...collectSchemaRefs({ kind: 'enum', values: ['a', 'b'], scalar: 'string' })]).toEqual(
-      []
-    );
-    expect([...collectSchemaRefs({ kind: 'null' })]).toEqual([]);
-    expect([...collectSchemaRefs({ kind: 'unknown' })]).toEqual([]);
-  });
-
-  it('recurses into array items', () => {
-    expect([...collectSchemaRefs({ kind: 'array', items: ref('Pet') })]).toEqual(['Pet']);
-  });
-
-  it('recurses into record values', () => {
-    expect([...collectSchemaRefs({ kind: 'record', value: ref('Pet') })]).toEqual(['Pet']);
-  });
-
-  it('recurses into object properties', () => {
-    const schema: SchemaModel = {
-      kind: 'object',
-      properties: [
-        { name: 'pet', schema: ref('Pet'), required: true },
-        { name: 'owner', schema: ref('Owner'), required: false },
-        { name: 'count', schema: { kind: 'scalar', scalar: 'integer' }, required: false },
-      ],
-    };
-    expect([...collectSchemaRefs(schema)]).toEqual(['Pet', 'Owner']);
-  });
-
-  it('recurses into union members', () => {
-    const schema: SchemaModel = { kind: 'union', members: [ref('Cat'), ref('Dog')] };
-    expect([...collectSchemaRefs(schema)]).toEqual(['Cat', 'Dog']);
-  });
-
-  it('recurses into intersection members', () => {
-    const schema: SchemaModel = { kind: 'intersection', members: [ref('A'), ref('B')] };
-    expect([...collectSchemaRefs(schema)]).toEqual(['A', 'B']);
-  });
-
-  it('dedupes a ref that appears more than once', () => {
-    const schema: SchemaModel = {
-      kind: 'array',
-      items: { kind: 'union', members: [ref('Pet'), ref('Pet')] },
-    };
-    expect([...collectSchemaRefs(schema)]).toEqual(['Pet']);
-  });
-
-  it('accumulates into a caller-provided set', () => {
-    const into = new Set<string>(['Existing']);
-    collectSchemaRefs(ref('Pet'), into);
-    expect([...into]).toEqual(['Existing', 'Pet']);
-  });
-});
-
-describe('collectOperationRefs', () => {
-  it('gathers refs across path/query/header params, body, and responses', () => {
-    const op = operation({
-      pathParams: [{ name: 'id', in: 'path', required: true, schema: ref('PetId') }],
-      queryParams: [{ name: 'filter', in: 'query', required: false, schema: ref('PetFilter') }],
-      headerParams: [{ name: 'x', in: 'header', required: false, schema: ref('TraceId') }],
-      requestBody: { contentType: 'application/json', schema: ref('PetInput'), required: true },
-      successResponses: [
-        {
-          contentType: 'application/json',
-          schema: { kind: 'array', items: ref('Pet') },
-          status: 200,
-        },
-      ],
-    });
-    expect([...collectOperationRefs(op)]).toEqual([
-      'PetId',
-      'PetFilter',
-      'TraceId',
-      'PetInput',
-      'Pet',
-    ]);
-  });
-
-  it('walks error responses for referenced types only in result mode', () => {
-    const op = operation({
-      errorResponses: [{ contentType: 'application/json', schema: ref('ApiErr'), status: 200 }],
-    });
-    // Result mode emits the `<Op>Error` union that names the body, so it must import it.
-    expect([...collectOperationRefs(op, 'result')]).toContain('ApiErr');
-    // Throw mode never names the error body — importing it would trip `noUnusedLocals`.
-    expect([...collectOperationRefs(op)]).not.toContain('ApiErr');
-    expect([...collectOperationRefs(op, 'throw')]).not.toContain('ApiErr');
-  });
-
-  it('returns an empty set for an operation with no referenced types', () => {
-    expect([...collectOperationRefs(operation())]).toEqual([]);
-  });
-
-  it('includes itemSchema refs from success responses', () => {
-    const op = operation({
-      successResponses: [
-        {
-          contentType: 'text/event-stream',
-          status: 200,
-          schema: { kind: 'unknown' },
-          itemSchema: ref('Message'),
-        },
-      ],
-    });
-    expect([...collectOperationRefs(op)]).toContain('Message');
-  });
-});
diff --git a/packages/client-generator/src/intermediate-representation/refs.ts b/packages/client-generator/src/intermediate-representation/refs.ts
deleted file mode 100644
index 4dbca0e21e..0000000000
--- a/packages/client-generator/src/intermediate-representation/refs.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import type { OperationModel, SchemaModel } from './model.js';
-
-/**
- * Collect the names of every top-level (named) schema a `SchemaModel` references,
- * recursing through the structural kinds (array items, record values, object
- * properties, union/intersection members) down to each `ref`.
- *
- * Used by multi-file output writers to emit a precise
- * `import type { … } from './…schemas'` header — only the names actually
- * referenced, so the emitted file type-checks cleanly under `noUnusedLocals`.
- *
- * Insertion order is preserved (and deduped) so import lists are deterministic.
- * Scalars, literals, enums, `null`, and `unknown` reference nothing.
- */
-export function collectSchemaRefs(schema: SchemaModel, into: Set<string> = new Set()): Set<string> {
-  switch (schema.kind) {
-    case 'ref':
-      into.add(schema.name);
-      break;
-    case 'omit':
-      // `Omit<Base, …>` still references the named base type.
-      into.add(schema.base);
-      break;
-    case 'array':
-      collectSchemaRefs(schema.items, into);
-      break;
-    case 'record':
-      collectSchemaRefs(schema.value, into);
-      break;
-    case 'object':
-      for (const property of schema.properties) collectSchemaRefs(property.schema, into);
-      break;
-    case 'union':
-    case 'intersection':
-      for (const member of schema.members) collectSchemaRefs(member, into);
-      break;
-  }
-  return into;
-}
-
-/**
- * Collect every named schema referenced by an operation's signature: its path,
- * query, and header params, its request body, and its success responses. Error
- * responses are walked only under `errorMode: 'result'`, since that is the only
- * mode that emits the `<Op>Error` union that references them — in `throw` mode the
- * error bodies are never named, so importing them would trip `noUnusedLocals`.
- * This is exactly the set of type imports an endpoints file needs from the schemas
- * module.
- */
-export function collectOperationRefs(
-  op: OperationModel,
-  errorMode: 'throw' | 'result' = 'throw'
-): Set<string> {
-  const into = new Set<string>();
-  for (const param of op.pathParams) collectSchemaRefs(param.schema, into);
-  for (const param of op.queryParams) collectSchemaRefs(param.schema, into);
-  for (const param of op.headerParams) collectSchemaRefs(param.schema, into);
-  if (op.requestBody) collectSchemaRefs(op.requestBody.schema, into);
-  for (const response of op.successResponses) {
-    collectSchemaRefs(response.schema, into);
-    if (response.itemSchema) collectSchemaRefs(response.itemSchema, into);
-  }
-  if (errorMode === 'result')
-    for (const response of op.errorResponses) collectSchemaRefs(response.schema, into);
-  return into;
-}
diff --git a/packages/client-generator/src/intermediate-representation/sanitize-identifiers.ts b/packages/client-generator/src/intermediate-representation/sanitize-identifiers.ts
index 48002157b9..f8b6597db7 100644
--- a/packages/client-generator/src/intermediate-representation/sanitize-identifiers.ts
+++ b/packages/client-generator/src/intermediate-representation/sanitize-identifiers.ts
@@ -74,10 +74,9 @@ export function sanitizeIdentifiers(model: ApiModel): void {
  *
  * This gates the three names that land *directly* in a binding slot from the model:
  * schema names, security-scheme keys, and operation names. Identifiers an emitter
- * *derives* from these — path-parameter binding names (`uniqueIdent`), enum
- * const-object keys (`isIdentifier`-gated), and tag-derived service-class names
- * (`serviceClassName`) — are sanitized at their point of use, not here, so they stay
- * safe even though this gate does not re-check them.
+ * *derives* from these — path-parameter binding names (`uniqueIdent`) and enum
+ * const-object keys (`isIdentifier`-gated) — are sanitized at their point of use,
+ * not here, so they stay safe even though this gate does not re-check them.
  */
 export function assertSafeIdentifiers(model: ApiModel): void {
   for (const schema of model.schemas) {
diff --git a/packages/client-generator/src/plugin.ts b/packages/client-generator/src/plugin.ts
index dd83aab66a..a408b54933 100644
--- a/packages/client-generator/src/plugin.ts
+++ b/packages/client-generator/src/plugin.ts
@@ -44,7 +44,7 @@ export type {
   GeneratorName,
 } from './generators/types.js';
 export type { GeneratedFile, OutputMode } from './writers/types.js';
-export type { ArgsStyle, ErrorMode, Facade } from './emitters/operations.js';
+export type { ArgsStyle, ErrorMode } from './emitters/operations.js';
 export type { DateType } from './emitters/types.js';
 
 // --- The intermediate representation (the `model` a generator walks) ---------------------------
diff --git a/packages/client-generator/src/runtime-contract.ts b/packages/client-generator/src/runtime-contract.ts
index 52715ec7c7..ba149069e0 100644
--- a/packages/client-generator/src/runtime-contract.ts
+++ b/packages/client-generator/src/runtime-contract.ts
@@ -1,42 +1,18 @@
 // The public, spec-independent runtime contract a publisher's `--setup` file imports.
-// These MUST stay byte-identical to the spec-independent types emitted into every client
-// (see emitters/runtime.ts); a lockstep test guards against drift.
-
-export type OperationContext = { id: string; path: string; tags: string[] };
-
-export type RequestContext = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: OperationContext;
-};
-
-export type Middleware = {
-  onRequest?: (ctx: RequestContext) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext
-  ) => Response | void | Promise<Response | void>;
-  onError?: (error: Error, ctx: RequestContext) => Error | Promise<Error>;
-};
-
-export type RetryStrategy = 'fixed' | 'exponential';
-
-export type RetryContext = {
-  attempt: number;
-  request: RequestContext;
-  response?: Response;
-  error?: unknown;
-};
-
-export type RetryConfig = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
-};
+// These are the runtime's own types (src/runtime/types.ts) — the very module the
+// generated client embeds (inline) or imports (package) — so the contract cannot
+// drift from the generated output.
+
+import type { Middleware, RequestContext, RetryConfig } from './runtime/types.js';
+
+export type {
+  Middleware,
+  OperationContext,
+  RequestContext,
+  RetryConfig,
+  RetryContext,
+  RetryStrategy,
+} from './runtime/types.js';
 
 /**
  * The spec-independent subset of a client's `ClientConfig` a publisher may bake in
diff --git a/packages/client-generator/src/runtime/__tests__/auth.test.ts b/packages/client-generator/src/runtime/__tests__/auth.test.ts
new file mode 100644
index 0000000000..41a82a8f88
--- /dev/null
+++ b/packages/client-generator/src/runtime/__tests__/auth.test.ts
@@ -0,0 +1,45 @@
+import { resolveAuth } from '../auth.js';
+
+const bearer = [{ scheme: 's', kind: 'bearer' }] as const;
+
+describe('resolveAuth', () => {
+  it('applies bearer (incl. async TokenProvider), basic, and apiKey in header/query/cookie', async () => {
+    expect((await resolveAuth(bearer, { auth: { bearer: 't1' } })).headers.Authorization).toBe(
+      'Bearer t1'
+    );
+    expect(
+      (await resolveAuth(bearer, { auth: { bearer: async () => 't2' } })).headers.Authorization
+    ).toBe('Bearer t2');
+
+    const basic = await resolveAuth([{ scheme: 'b', kind: 'basic' }], {
+      auth: { basic: { username: 'u', password: 'p' } },
+    });
+    expect(basic.headers.Authorization).toBe(`Basic ${btoa('u:p')}`);
+
+    const key = await resolveAuth(
+      [
+        { scheme: 'h', kind: 'apiKey', name: 'X-Key', in: 'header' },
+        { scheme: 'q', kind: 'apiKey', name: 'k', in: 'query' },
+        { scheme: 'c', kind: 'apiKey', name: 'sid', in: 'cookie' },
+        { scheme: 'c2', kind: 'apiKey', name: 'ses', in: 'cookie' },
+      ],
+      { auth: { apiKey: { h: 'H', q: 'Q', c: 'C', c2: 'D' } } }
+    );
+    expect(key.headers['X-Key']).toBe('H');
+    expect(key.query.k).toBe('Q');
+    expect(key.headers.Cookie).toBe('sid=C; ses=D');
+  });
+
+  it('skips schemes with no configured credential', async () => {
+    const out = await resolveAuth(
+      [
+        ...bearer,
+        { scheme: 'b', kind: 'basic' },
+        { scheme: 'k', kind: 'apiKey', name: 'X', in: 'header' },
+      ],
+      {}
+    );
+    expect(out.headers).toEqual({});
+    expect(out.query).toEqual({});
+  });
+});
diff --git a/packages/client-generator/src/runtime/__tests__/create-client.test.ts b/packages/client-generator/src/runtime/__tests__/create-client.test.ts
new file mode 100644
index 0000000000..67be7fa8d8
--- /dev/null
+++ b/packages/client-generator/src/runtime/__tests__/create-client.test.ts
@@ -0,0 +1,291 @@
+import { createClientCore } from '../create-client.js';
+import type { OperationDescriptor } from '../types.js';
+
+const OPS = {
+  getOrder: {
+    id: 'getOrder',
+    method: 'GET',
+    path: '/orders/{orderId}',
+    params: [
+      { name: 'orderId', in: 'path' },
+      { name: 'expand', in: 'query' },
+      { name: 'X-Trace', in: 'header' },
+    ],
+    tags: ['Orders'],
+  },
+  createPet: {
+    id: 'createPet',
+    method: 'post',
+    path: '/pets',
+    body: { contentType: 'application/json' },
+  },
+  listRaw: {
+    id: 'listRaw',
+    method: 'GET',
+    path: '/raw',
+    responseKind: 'text',
+    params: [{ name: 'filter', in: 'query', style: 'pipeDelimited', explode: false }],
+  },
+  secured: {
+    id: 'secured',
+    method: 'GET',
+    path: '/private',
+    security: [{ scheme: 's', kind: 'bearer' }],
+  },
+  stream: {
+    id: 'stream',
+    method: 'GET',
+    path: '/events',
+    responseKind: 'sse',
+    sseDataKind: 'json',
+  },
+  search: {
+    id: 'search',
+    method: 'GET',
+    path: '/search',
+    params: [
+      { name: 'ids', in: 'query', explode: false },
+      { name: 'path', in: 'query', allowReserved: true },
+    ],
+  },
+  streamPlain: { id: 'streamPlain', method: 'GET', path: '/plain-events', responseKind: 'sse' },
+  configure: { id: 'configure', method: 'GET', path: '/configure-op' }, // collision: core must win
+} satisfies Record<string, OperationDescriptor>;
+
+interface Ops {
+  getOrder: {
+    args: { orderId: string; params?: { expand?: string }; headers?: Record<string, unknown> };
+    result: { id: string };
+  };
+  createPet: { args: { body: { name: string } }; result: { id: string } };
+  listRaw: { args: { params?: { filter?: string[] } }; result: string };
+  search: { args: { params?: { ids?: string[]; path?: string } }; result: string };
+  secured: { args: Record<string, never>; result: string };
+  stream: { args: Record<string, never>; result: { n: number }; kind: 'sse' };
+  streamPlain: { args: Record<string, never>; result: string; kind: 'sse' };
+  configure: { args: Record<string, never>; result: string };
+  [k: string]: { args: object; result: unknown; kind?: 'sse' };
+}
+
+const jsonOk = (body: unknown) =>
+  new Response(JSON.stringify(body), {
+    status: 200,
+    headers: { 'content-type': 'application/json' },
+  });
+
+function spy(responses: Response[]) {
+  const calls: Array<{ url: string; init: RequestInit }> = [];
+  const fetchImpl = (async (url: string, init: RequestInit) => {
+    calls.push({ url, init });
+    return responses.shift()!;
+  }) as unknown as typeof fetch;
+  return { calls, fetchImpl };
+}
+
+describe('createClientCore', () => {
+  it('routes args: path substitution + query + body + header slot; methods survive destructuring', async () => {
+    const { calls, fetchImpl } = spy([jsonOk({ id: 'o1' }), jsonOk({ id: 'p1' })]);
+    const client = createClientCore<Ops>(OPS, { serverUrl: 'https://x', fetch: fetchImpl });
+    const { getOrder, createPet } = client;
+
+    expect(
+      await getOrder({
+        orderId: 'a/b',
+        params: { expand: 'items' },
+        headers: { 'X-Trace': 7, 'X-Skip': null },
+      })
+    ).toEqual({ id: 'o1' });
+    expect(calls[0].url).toBe('https://x/orders/a%2Fb?expand=items');
+    expect((calls[0].init.headers as Record<string, string>)['X-Trace']).toBe('7');
+    expect('X-Skip' in (calls[0].init.headers as Record<string, string>)).toBe(false);
+    expect(calls[0].init.method).toBe('GET');
+
+    await createPet({ body: { name: 'Rex' } });
+    expect(calls[1].init.method).toBe('POST'); // method upper-cased from the descriptor
+    expect(JSON.parse(calls[1].init.body as string)).toEqual({ name: 'Rex' });
+  });
+
+  it('honors descriptor query styles and responseKind (text) + per-call parseAs override', async () => {
+    const { calls, fetchImpl } = spy([
+      new Response('plain', { headers: { 'content-type': 'text/plain' } }),
+      jsonOk(['x']),
+    ]);
+    const client = createClientCore<Ops>(OPS, { serverUrl: 'https://x', fetch: fetchImpl });
+
+    expect(await client.listRaw({ params: { filter: ['a', 'b'] } })).toBe('plain');
+    expect(calls[0].url).toBe('https://x/raw?filter=a|b');
+
+    // parseAs overrides the descriptor's kind at runtime.
+    expect(await client.listRaw({}, { parseAs: 'json' })).toEqual(['x']);
+  });
+
+  it('resolves OpenAPI style defaults: explode:false alone comma-joins, allowReserved alone skips encoding', async () => {
+    const { calls, fetchImpl } = spy([jsonOk('s')]);
+    const client = createClientCore<Ops>(OPS, { serverUrl: 'https://x', fetch: fetchImpl });
+    await client.search({ params: { ids: ['a', 'b'], path: 'a/b' } });
+    expect(calls[0].url).toBe('https://x/search?ids=a,b&path=a/b');
+  });
+
+  it('throw mode: non-ok becomes ApiError threaded through onError', async () => {
+    const { fetchImpl } = spy([
+      new Response('{"title":"x"}', {
+        status: 500,
+        headers: { 'content-type': 'application/json' },
+      }),
+    ]);
+    const client = createClientCore<Ops>(OPS, { fetch: fetchImpl, serverUrl: 'https://x' });
+    client.use(
+      { onRequest: () => {} }, // no onError — skipped by the error chain
+      { onError: (e) => new Error(`wrapped:${(e as { status: number }).status}`) }
+    );
+    await expect(client.getOrder({ orderId: '1' })).rejects.toThrow('wrapped:500');
+  });
+
+  it('result mode: non-ok returns { error }, ok returns { data } — without throwing', async () => {
+    const { fetchImpl } = spy([
+      new Response('{"title":"x"}', {
+        status: 500,
+        headers: { 'content-type': 'application/json' },
+      }),
+      jsonOk({ id: 'ok' }),
+    ]);
+    const client = createClientCore<Ops>(OPS, {
+      fetch: fetchImpl,
+      serverUrl: 'https://x',
+      errorMode: 'result',
+    });
+    const bad = (await client.getOrder({ orderId: '1' })) as unknown as {
+      error: { title: string };
+      response: Response;
+    };
+    expect(bad.error).toEqual({ title: 'x' });
+    expect(bad.response.status).toBe(500);
+    const good = (await client.getOrder({ orderId: '1' })) as unknown as { data: { id: string } };
+    expect(good.data).toEqual({ id: 'ok' });
+  });
+
+  it('auth capability merges resolved headers/query before the request; auth setters feed it', async () => {
+    const { calls, fetchImpl } = spy([jsonOk('ok'), jsonOk('ok'), jsonOk('ok')]);
+    const client = createClientCore<Ops>(
+      OPS,
+      { fetch: fetchImpl, serverUrl: 'https://x' },
+      {
+        resolveAuth: async (_security, config) => {
+          const headers: Record<string, string> = {};
+          if (config.auth?.bearer) headers.Authorization = `Bearer ${config.auth.bearer as string}`;
+          return { headers, query: { sig: 'v' } };
+        },
+      }
+    );
+    client.auth.bearer('T');
+    await client.secured({});
+    expect((calls[0].init.headers as Record<string, string>).Authorization).toBe('Bearer T');
+    expect(calls[0].url).toBe('https://x/private?sig=v');
+
+    client.auth.basic('u', 'p');
+    client.auth.apiKey('k', 'v');
+    await client.secured({});
+    expect(calls[1].url).toContain('sig=v');
+
+    // Ops without security skip resolveAuth entirely.
+    await client.getOrder({ orderId: '1' });
+    expect((calls[2].init.headers as Record<string, string>).Authorization).toBeUndefined();
+  });
+
+  it('header precedence: caller init.headers beats header params, which beat injected auth', async () => {
+    const { calls, fetchImpl } = spy([jsonOk('ok'), jsonOk({ id: '1' })]);
+    const client = createClientCore<Ops>(
+      OPS,
+      { fetch: fetchImpl, serverUrl: 'https://x' },
+      {
+        resolveAuth: async () => ({
+          headers: { Authorization: 'Bearer injected' },
+          query: {},
+        }),
+      }
+    );
+    // Caller overrides injected auth.
+    await client.secured({}, { headers: { Authorization: 'Bearer mine' } });
+    expect((calls[0].init.headers as Record<string, string>).Authorization).toBe('Bearer mine');
+
+    // Caller overrides the explicit header-param slot too.
+    await client.getOrder(
+      { orderId: '1', headers: { 'X-Trace': 'from-args' } },
+      { headers: { 'X-Trace': 'from-caller' } }
+    );
+    expect((calls[1].init.headers as Record<string, string>)['X-Trace']).toBe('from-caller');
+  });
+
+  it('configure() ignores errorMode — the generate-time mode cannot be flipped at runtime', async () => {
+    const { fetchImpl } = spy([
+      new Response('{"title":"x"}', {
+        status: 500,
+        headers: { 'content-type': 'application/json' },
+      }),
+    ]);
+    const client = createClientCore<Ops>(OPS, { fetch: fetchImpl, serverUrl: 'https://x' });
+    client.configure({ errorMode: 'result' });
+    await expect(client.getOrder({ orderId: '1' })).rejects.toMatchObject({ status: 500 });
+  });
+
+  it('sse ops dispatch to the sse capability (with prepared url); absent capability throws sync', async () => {
+    const seenUrls: string[] = [];
+    const seenKinds: string[] = [];
+    async function* fake(
+      _config: unknown,
+      _op: unknown,
+      url: string,
+      _init: unknown,
+      dataKind: string
+    ): AsyncGenerator<{ data: { n: number } }> {
+      seenUrls.push(url);
+      seenKinds.push(dataKind);
+      yield { data: { n: 1 } };
+    }
+    const withCap = createClientCore<Ops>(OPS, { serverUrl: 'https://x' }, { sse: fake as never });
+    const events = [];
+    for await (const ev of withCap.stream({})) events.push(ev);
+    expect(events).toEqual([{ data: { n: 1 } }]);
+
+    // A bare call (no args) on an op without sseDataKind → dataKind defaults to 'text'.
+    for await (const _ of withCap.streamPlain()) void _;
+    expect(seenUrls).toEqual(['https://x/events', 'https://x/plain-events']);
+    expect(seenKinds).toEqual(['json', 'text']);
+
+    const noCap = createClientCore<Ops>(OPS, { serverUrl: 'https://x' });
+    expect(() => noCap.stream({})).toThrow(/capability/i);
+  });
+
+  it('core members win over a colliding operation name; configure merges; use appends without mutating caller arrays', async () => {
+    const mine: never[] = [];
+    const client = createClientCore<Ops>(OPS, { middleware: mine });
+    client.configure({ serverUrl: 'https://later' }); // the core member, not the colliding op
+    client.use({ onRequest: () => {} });
+    expect(mine.length).toBe(0);
+
+    // use() also tolerates a configure() that reset middleware to undefined.
+    client.configure({ middleware: undefined });
+    client.use({ onRequest: () => {} });
+
+    // The merged serverUrl is actually used.
+    const { calls, fetchImpl } = spy([jsonOk({ id: '1' })]);
+    client.configure({ fetch: fetchImpl });
+    await client.getOrder({ orderId: '1' });
+    expect(calls[0].url).toBe('https://later/orders/1');
+  });
+
+  it('defaults args to {} so no-input operations can be called bare', async () => {
+    const { calls, fetchImpl } = spy([jsonOk('s')]);
+    const client = createClientCore<Ops>(OPS, { fetch: fetchImpl, serverUrl: 'https://x' });
+    await client.secured();
+    expect(calls[0].url).toBe('https://x/private');
+  });
+
+  it('works without any initial config: serverUrl falls back to a relative URL', async () => {
+    const { calls, fetchImpl } = spy([jsonOk({ id: '1' })]);
+    const client = createClientCore<Ops>(OPS);
+    client.configure({ fetch: fetchImpl });
+    await client.getOrder({ orderId: '1' });
+    expect(calls[0].url).toBe('/orders/1');
+  });
+});
diff --git a/packages/client-generator/src/runtime/__tests__/errors.test.ts b/packages/client-generator/src/runtime/__tests__/errors.test.ts
new file mode 100644
index 0000000000..c62f5194ee
--- /dev/null
+++ b/packages/client-generator/src/runtime/__tests__/errors.test.ts
@@ -0,0 +1,31 @@
+import { ApiError, abortError } from '../errors.js';
+
+describe('ApiError', () => {
+  it('carries url/status/statusText/body and a readable message', () => {
+    const err = new ApiError('https://x/api', 404, 'Not Found', { title: 'gone' });
+    expect(err).toBeInstanceOf(Error);
+    expect(err.url).toBe('https://x/api');
+    expect(err.status).toBe(404);
+    expect(err.statusText).toBe('Not Found');
+    expect(err.body).toEqual({ title: 'gone' });
+    expect(err.message).toContain('404');
+    expect(err.name).toBe('ApiError');
+  });
+});
+
+describe('abortError', () => {
+  it('returns the signal reason when it is an Error', () => {
+    const controller = new AbortController();
+    const reason = new Error('caller reason');
+    controller.abort(reason);
+    expect(abortError(controller.signal)).toBe(reason);
+  });
+
+  it('falls back to a DOMException AbortError otherwise', () => {
+    const controller = new AbortController();
+    controller.abort('a string reason');
+    const err = abortError(controller.signal);
+    expect(err).toBeInstanceOf(DOMException);
+    expect((err as DOMException).name).toBe('AbortError');
+  });
+});
diff --git a/packages/client-generator/src/runtime/__tests__/index.test.ts b/packages/client-generator/src/runtime/__tests__/index.test.ts
new file mode 100644
index 0000000000..e751cc4b56
--- /dev/null
+++ b/packages/client-generator/src/runtime/__tests__/index.test.ts
@@ -0,0 +1,127 @@
+import { defineClientSetup, type Middleware } from '../../runtime-contract.js';
+import { ApiError, createClient, mergeSetup, type OperationDescriptor } from '../index.js';
+
+const OPS = {
+  upload: {
+    id: 'upload',
+    method: 'POST',
+    path: '/up',
+    body: { contentType: 'multipart/form-data', multipart: true },
+  },
+  secured: {
+    id: 'secured',
+    method: 'GET',
+    path: '/private',
+    security: [{ scheme: 's', kind: 'bearer' }],
+  },
+  stream: {
+    id: 'stream',
+    method: 'GET',
+    path: '/events',
+    responseKind: 'sse',
+    sseDataKind: 'json',
+  },
+} satisfies Record<string, OperationDescriptor>;
+
+interface Ops {
+  upload: { args: { body: { file: string } }; result: unknown };
+  secured: { args: Record<string, never>; result: unknown };
+  stream: { args: Record<string, never>; result: { n: number }; kind: 'sse' };
+  [k: string]: { args: object; result: unknown; kind?: 'sse' };
+}
+
+describe('public surface', () => {
+  it('createClient wires all capabilities: multipart, auth, and sse work without manual caps', async () => {
+    const calls: Array<{ url: string; init: RequestInit }> = [];
+    const fetchImpl = (async (url: string, init: RequestInit) => {
+      calls.push({ url, init });
+      if (url.endsWith('/events')) {
+        return new Response(new TextEncoder().encode('data: {"n":1}\n\n'), {
+          status: 200,
+          headers: { 'content-type': 'text/event-stream' },
+        });
+      }
+      return new Response('{}', { status: 200, headers: { 'content-type': 'application/json' } });
+    }) as unknown as typeof fetch;
+
+    const client = createClient<Ops>(OPS, { serverUrl: 'https://x', fetch: fetchImpl });
+
+    await client.upload({ body: { file: 'f' } });
+    expect(calls[0].init.body).toBeInstanceOf(FormData);
+
+    client.auth.bearer('T');
+    await client.secured();
+    expect((calls[1].init.headers as Record<string, string>).Authorization).toBe('Bearer T');
+
+    const events = [];
+    for await (const ev of client.stream({}, { reconnect: false })) events.push(ev.data);
+    expect(events).toEqual([{ n: 1 }]);
+  });
+
+  it('mergeSetup: config wins per-field; middleware composes setup-first', () => {
+    const setup = {
+      config: { serverUrl: 'https://baked', retry: { retries: 3 } },
+      middleware: [{ onRequest: () => {} }],
+    };
+    const merged = mergeSetup(setup, {
+      serverUrl: 'https://mine',
+      middleware: [{ onResponse: () => {} }],
+    });
+    expect(merged.serverUrl).toBe('https://mine');
+    expect(merged.retry).toEqual({ retries: 3 });
+    expect(merged.middleware!.length).toBe(2);
+    expect(merged.middleware![0].onRequest).toBeDefined(); // baked first
+  });
+
+  it('mergeSetup tolerates an absent setup and absent config', () => {
+    expect(mergeSetup(undefined)).toEqual({ middleware: [] });
+  });
+
+  it('accepts a contract-typed setup from defineClientSetup (assignability pin)', () => {
+    // Compiles only while runtime-contract types stay assignable to the runtime's.
+    const setup = defineClientSetup({
+      config: { serverUrl: 'https://baked', retry: { retries: 2 } },
+      middleware: [
+        {
+          onRequest: (ctx) => {
+            ctx.headers['X-Op'] = ctx.operation.id;
+          },
+        },
+      ],
+    });
+    const merged = mergeSetup(setup, {});
+    expect(merged.serverUrl).toBe('https://baked');
+    expect(merged.middleware).toHaveLength(1);
+  });
+
+  it('narrowed createClient: literal ctx.operation, contract middleware and mergeSetup accepted', () => {
+    // The generated wiring's shape: literal type args + a mergeSetup-produced (base) config.
+    const narrowed = createClient<Ops, 'upload' | 'secured' | 'stream'>(
+      OPS,
+      mergeSetup(defineClientSetup({ config: { serverUrl: 'https://baked' } }), {})
+    );
+    // A contract-typed (base) middleware is accepted by the narrowed use().
+    const contractMiddleware: Middleware = {
+      onRequest: (ctx) => {
+        ctx.headers['X-Op'] = ctx.operation.id;
+      },
+    };
+    narrowed.use(contractMiddleware);
+    expect(typeof narrowed.upload).toBe('function');
+
+    const _typeOnly = (): void => {
+      narrowed.use({
+        onRequest: (ctx) => {
+          expectTypeOf(ctx.operation.id).toEqualTypeOf<'upload' | 'secured' | 'stream'>();
+          // @ts-expect-error a misspelled operationId has no overlap with the literal union
+          if (ctx.operation.id === 'uploda') return;
+        },
+      });
+    };
+    void _typeOnly;
+  });
+
+  it('exports ApiError', () => {
+    expect(new ApiError('u', 500, 'x', null)).toBeInstanceOf(Error);
+  });
+});
diff --git a/packages/client-generator/src/runtime/__tests__/multipart.test.ts b/packages/client-generator/src/runtime/__tests__/multipart.test.ts
new file mode 100644
index 0000000000..55b1afeea0
--- /dev/null
+++ b/packages/client-generator/src/runtime/__tests__/multipart.test.ts
@@ -0,0 +1,29 @@
+import { toFormData } from '../multipart.js';
+
+describe('toFormData', () => {
+  it('serializes fields per the port rules', () => {
+    const fd = toFormData({
+      file: new Blob(['x']),
+      name: 'n',
+      when: new Date('2026-01-02T03:04:05Z'),
+      tags: ['a', 'b'],
+      meta: { k: 'v' },
+      price: 42,
+      skip: undefined,
+      gone: null,
+    });
+    expect(fd.get('file')).toBeInstanceOf(Blob);
+    expect(fd.get('name')).toBe('n');
+    expect(fd.get('when')).toBe('2026-01-02T03:04:05.000Z');
+    expect(fd.getAll('tags')).toEqual(['a', 'b']);
+    expect(fd.get('meta')).toBe('{"k":"v"}');
+    expect(fd.get('price')).toBe('42');
+    expect(fd.has('skip')).toBe(false);
+    expect(fd.has('gone')).toBe(false);
+  });
+
+  it('skips null/undefined items inside arrays', () => {
+    const fd = toFormData({ tags: ['a', null, undefined, 'b'] });
+    expect(fd.getAll('tags')).toEqual(['a', 'b']);
+  });
+});
diff --git a/packages/client-generator/src/runtime/__tests__/parse.test.ts b/packages/client-generator/src/runtime/__tests__/parse.test.ts
new file mode 100644
index 0000000000..73e42b6da8
--- /dev/null
+++ b/packages/client-generator/src/runtime/__tests__/parse.test.ts
@@ -0,0 +1,75 @@
+import { parse, readError } from '../parse.js';
+
+const json = (body: unknown, status = 200) =>
+  new Response(JSON.stringify(body), { status, headers: { 'content-type': 'application/json' } });
+
+describe('parse', () => {
+  it('void and 204 return undefined', async () => {
+    expect(await parse(json({ a: 1 }), 'void')).toBeUndefined();
+    expect(await parse(new Response(null, { status: 204 }), 'json')).toBeUndefined();
+  });
+
+  it('explicit kinds decode accordingly', async () => {
+    expect(await parse(json({ a: 1 }), 'json')).toEqual({ a: 1 });
+    expect(await parse(new Response('hi'), 'text')).toBe('hi');
+    expect(await parse(new Response('x'), 'blob')).toBeInstanceOf(Blob);
+    expect(await parse(new Response('x'), 'arrayBuffer')).toBeInstanceOf(ArrayBuffer);
+    const stream = await parse(new Response('x'), 'stream');
+    expect(stream).toBeInstanceOf(ReadableStream);
+  });
+
+  it('reads multipart bodies as FormData', async () => {
+    const fd = new FormData();
+    fd.append('a', '1');
+    const out = (await parse(new Response(fd), 'formData')) as FormData;
+    expect(out).toBeInstanceOf(FormData);
+    expect(out.get('a')).toBe('1');
+  });
+
+  it('auto negotiates by content-type: json, then text/*, then blob', async () => {
+    expect(await parse(json({ a: 1 }), 'auto')).toEqual({ a: 1 });
+    expect(
+      await parse(new Response('plain', { headers: { 'content-type': 'text/plain' } }), 'auto')
+    ).toBe('plain');
+    expect(
+      await parse(
+        new Response('bin', { headers: { 'content-type': 'application/octet-stream' } }),
+        'auto'
+      )
+    ).toBeInstanceOf(Blob);
+    // No content-type header at all → Blob fallback.
+    const headerless = new Response('x');
+    headerless.headers.delete('content-type');
+    expect(await parse(headerless, 'auto')).toBeInstanceOf(Blob);
+  });
+});
+
+describe('readError', () => {
+  it('reads a JSON error body, falls back to text', async () => {
+    expect(await readError(json({ title: 'bad' }, 400))).toEqual({ title: 'bad' });
+    expect(
+      await readError(
+        new Response('oops', { status: 500, headers: { 'content-type': 'text/plain' } })
+      )
+    ).toBe('oops');
+  });
+
+  it('returns undefined when the declared-JSON body does not parse', async () => {
+    const broken = new Response('not-json', {
+      status: 500,
+      headers: { 'content-type': 'application/json' },
+    });
+    expect(await readError(broken)).toBeUndefined();
+  });
+
+  it('returns undefined on a content-type-less body whose read fails', async () => {
+    const body = new ReadableStream<Uint8Array>({
+      start(controller) {
+        controller.error(new Error('boom'));
+      },
+    });
+    const failing = new Response(body, { status: 500 });
+    failing.headers.delete('content-type');
+    expect(await readError(failing)).toBeUndefined();
+  });
+});
diff --git a/packages/client-generator/src/runtime/__tests__/retry.test.ts b/packages/client-generator/src/runtime/__tests__/retry.test.ts
new file mode 100644
index 0000000000..b4c3a4b563
--- /dev/null
+++ b/packages/client-generator/src/runtime/__tests__/retry.test.ts
@@ -0,0 +1,86 @@
+import { defaultRetryOn, retryDelay, sleep } from '../retry.js';
+import type { RetryContext } from '../types.js';
+
+const ctx = (method: string, part: Partial<RetryContext>): RetryContext => ({
+  attempt: 1,
+  request: { url: 'u', method, headers: {}, operation: { id: 'x', path: '/x', tags: [] } },
+  ...part,
+});
+
+describe('defaultRetryOn', () => {
+  it('retries idempotent methods on transport errors and transient statuses', () => {
+    expect(defaultRetryOn(ctx('GET', { error: new Error('net') }))).toBe(true);
+    expect(defaultRetryOn(ctx('get', { error: new Error('net') }))).toBe(true); // case-insensitive
+    expect(defaultRetryOn(ctx('DELETE', { response: new Response(null, { status: 503 }) }))).toBe(
+      true
+    );
+  });
+
+  it('never retries POST/PATCH; never retries non-transient statuses', () => {
+    expect(defaultRetryOn(ctx('POST', { error: new Error('net') }))).toBe(false);
+    expect(defaultRetryOn(ctx('PATCH', { response: new Response(null, { status: 503 }) }))).toBe(
+      false
+    );
+    expect(defaultRetryOn(ctx('GET', { response: new Response(null, { status: 400 }) }))).toBe(
+      false
+    );
+  });
+});
+
+describe('retryDelay', () => {
+  it('honors Retry-After seconds over the computed backoff', () => {
+    expect(retryDelay({ retryDelay: 100, jitter: false }, 1, '2')).toBe(2000);
+  });
+
+  it('honors an HTTP-date Retry-After (clamped at 0 for past dates)', () => {
+    const past = new Date(Date.now() - 60_000).toUTCString();
+    expect(retryDelay({ jitter: false }, 1, past)).toBe(0);
+    const future = new Date(Date.now() + 5_000).toUTCString();
+    const delay = retryDelay({ jitter: false }, 1, future);
+    expect(delay).toBeGreaterThan(0);
+    expect(delay).toBeLessThanOrEqual(5_000);
+  });
+
+  it('falls through an unparseable Retry-After to the backoff', () => {
+    expect(retryDelay({ retryDelay: 100, jitter: false }, 1, 'not-a-date-or-number')).toBe(100);
+  });
+
+  it('exponential doubles per attempt; fixed stays constant (jitter off)', () => {
+    expect(retryDelay({ retryDelay: 100, jitter: false }, 3, null)).toBe(400);
+    expect(retryDelay({ retryDelay: 100, retryStrategy: 'fixed', jitter: false }, 3, null)).toBe(
+      100
+    );
+    // Defaults: base 1000, exponential.
+    expect(retryDelay({ jitter: false }, 2, null)).toBe(2000);
+  });
+
+  it('full jitter stays within [0, computed]', () => {
+    const d = retryDelay({ retryDelay: 100 }, 3, null);
+    expect(d).toBeGreaterThanOrEqual(0);
+    expect(d).toBeLessThanOrEqual(400);
+  });
+});
+
+describe('sleep', () => {
+  it('resolves after the delay', async () => {
+    await expect(sleep(1)).resolves.toBeUndefined();
+  });
+
+  it('rejects immediately when the signal is already aborted', async () => {
+    const controller = new AbortController();
+    controller.abort(new Error('pre-aborted'));
+    await expect(sleep(5000, controller.signal)).rejects.toThrow('pre-aborted');
+  });
+
+  it('rejects when the signal aborts mid-sleep', async () => {
+    const controller = new AbortController();
+    const p = sleep(5000, controller.signal);
+    controller.abort(new Error('stop'));
+    await expect(p).rejects.toThrow('stop');
+  });
+
+  it('resolves normally when a signal is present but never aborts', async () => {
+    const controller = new AbortController();
+    await expect(sleep(1, controller.signal)).resolves.toBeUndefined();
+  });
+});
diff --git a/packages/client-generator/src/runtime/__tests__/send.test.ts b/packages/client-generator/src/runtime/__tests__/send.test.ts
new file mode 100644
index 0000000000..068fd46648
--- /dev/null
+++ b/packages/client-generator/src/runtime/__tests__/send.test.ts
@@ -0,0 +1,320 @@
+import { middlewareChain, send } from '../send.js';
+import type { ClientConfig, RequestContext } from '../types.js';
+
+const op = { id: 'createPet', path: '/pets', tags: [] as string[] };
+const ok = () =>
+  new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
+
+function fetchSpy(responses: Array<Response | Error>) {
+  const calls: Array<{ url: string; init: RequestInit }> = [];
+  const fetchImpl = (async (url: string, init: RequestInit) => {
+    calls.push({ url, init });
+    const next = responses.shift()!;
+    if (next instanceof Error) throw next;
+    return next;
+  }) as unknown as typeof fetch;
+  return { calls, fetchImpl };
+}
+
+describe('send', () => {
+  it('serializes the body AFTER onRequest so middleware mutations are sent', async () => {
+    const { calls, fetchImpl } = fetchSpy([ok()]);
+    const config: ClientConfig = {
+      fetch: fetchImpl,
+      middleware: [
+        {
+          onRequest: (ctx: RequestContext) => {
+            (ctx.body as { name: string }).name = 'Mutated';
+          },
+        },
+      ],
+    };
+    await send(config, op, 'https://x/pets', { method: 'POST' }, { name: 'Rex' }, false, {});
+    expect(JSON.parse(calls[0].init.body as string)).toEqual({ name: 'Mutated' });
+    expect((calls[0].init.headers as Record<string, string>)['Content-Type']).toBe(
+      'application/json'
+    );
+  });
+
+  it('passes string/FormData/URLSearchParams/binary bodies through untouched', async () => {
+    const { calls, fetchImpl } = fetchSpy([ok(), ok(), ok(), ok()]);
+    const config: ClientConfig = { fetch: fetchImpl };
+    await send(config, op, 'u', { method: 'POST' }, 'raw-string', false, {});
+    expect(calls[0].init.body).toBe('raw-string');
+    const fd = new FormData();
+    await send(config, op, 'u', { method: 'POST' }, fd, false, {});
+    expect(calls[1].init.body).toBe(fd);
+    const usp = new URLSearchParams('a=1');
+    await send(config, op, 'u', { method: 'POST' }, usp, false, {});
+    expect(calls[2].init.body).toBe(usp);
+    const bytes = new Uint8Array([1, 2]);
+    await send(config, op, 'u', { method: 'POST' }, bytes, false, {});
+    expect(calls[3].init.body).toBe(bytes);
+  });
+
+  it('keeps an explicit Content-Type instead of forcing application/json', async () => {
+    const { calls, fetchImpl } = fetchSpy([ok()]);
+    await send(
+      { fetch: fetchImpl },
+      op,
+      'u',
+      { method: 'POST', headers: { 'content-type': 'application/vnd.custom+json' } },
+      { a: 1 },
+      false,
+      {}
+    );
+    const headers = calls[0].init.headers as Record<string, string>;
+    expect(headers['content-type']).toBe('application/vnd.custom+json');
+    expect(headers['Content-Type']).toBeUndefined();
+  });
+
+  it('runs onResponse in reverse order (onion) and lets it replace the response', async () => {
+    const order: string[] = [];
+    const { fetchImpl } = fetchSpy([ok()]);
+    const config: ClientConfig = {
+      fetch: fetchImpl,
+      middleware: [
+        {
+          onResponse: () => {
+            order.push('A');
+          },
+        },
+        {
+          onResponse: () => {
+            order.push('B');
+            return new Response('replaced');
+          },
+        },
+      ],
+    };
+    const { response } = await send(
+      config,
+      op,
+      'https://x/pets',
+      { method: 'GET' },
+      undefined,
+      false,
+      {}
+    );
+    expect(order).toEqual(['B', 'A']);
+    expect(await response.text()).toBe('replaced');
+  });
+
+  it('retries an idempotent request on 503, drains the abandoned body, and honors Retry-After=0', async () => {
+    const drained = vi.fn().mockResolvedValue(undefined);
+    const bad = new Response('busy', { status: 503, headers: { 'retry-after': '0' } });
+    Object.defineProperty(bad, 'body', { value: { cancel: drained } });
+    const { calls, fetchImpl } = fetchSpy([bad, ok()]);
+    const { response } = await send(
+      { fetch: fetchImpl, retry: { retries: 1, jitter: false } },
+      op,
+      'https://x/pets',
+      { method: 'GET' },
+      undefined,
+      false,
+      {}
+    );
+    expect(response.status).toBe(200);
+    expect(calls.length).toBe(2);
+    expect(drained).toHaveBeenCalled();
+  });
+
+  it('retries a transport error and merges per-call retry over the config policy', async () => {
+    const { calls, fetchImpl } = fetchSpy([new Error('ECONNRESET'), ok()]);
+    const { response } = await send(
+      { fetch: fetchImpl, retry: { retries: 0 } },
+      op,
+      'u',
+      { method: 'GET', retry: { retries: 2, retryDelay: 1, jitter: false } },
+      undefined,
+      false,
+      {}
+    );
+    expect(response.status).toBe(200);
+    expect(calls.length).toBe(2);
+  });
+
+  it('rethrows a transport error when retries are exhausted', async () => {
+    const { fetchImpl } = fetchSpy([new Error('down'), new Error('down')]);
+    await expect(
+      send(
+        { fetch: fetchImpl, retry: { retries: 1, retryDelay: 1, jitter: false } },
+        op,
+        'u',
+        { method: 'GET' },
+        undefined,
+        false,
+        {}
+      )
+    ).rejects.toThrow('down');
+  });
+
+  it('does not retry POST by default; retries when a custom retryOn opts in', async () => {
+    const first = fetchSpy([new Response(null, { status: 503 }), ok()]);
+    const out1 = await send(
+      { fetch: first.fetchImpl, retry: { retries: 2, jitter: false } },
+      op,
+      'u',
+      { method: 'POST' },
+      undefined,
+      false,
+      {}
+    );
+    expect(out1.response.status).toBe(503);
+    expect(first.calls.length).toBe(1);
+
+    const second = fetchSpy([new Response(null, { status: 503 }), ok()]);
+    const out2 = await send(
+      {
+        fetch: second.fetchImpl,
+        retry: { retries: 2, retryDelay: 1, jitter: false, retryOn: () => true },
+      },
+      op,
+      'u',
+      { method: 'POST' },
+      undefined,
+      false,
+      {}
+    );
+    expect(out2.response.status).toBe(200);
+  });
+
+  it('resolves async config.headers once and merges per-call headers over them', async () => {
+    const { calls, fetchImpl } = fetchSpy([ok()]);
+    await send(
+      { fetch: fetchImpl, headers: async () => ({ 'X-A': 'from-config', 'X-B': 'kept' }) },
+      op,
+      'u',
+      { method: 'GET', headers: { 'X-A': 'per-call' } },
+      undefined,
+      false,
+      {}
+    );
+    const headers = calls[0].init.headers as Record<string, string>;
+    expect(headers['X-A']).toBe('per-call');
+    expect(headers['X-B']).toBe('kept');
+    expect(headers.Accept).toBe('application/json');
+  });
+
+  it('merges a plain-object config.headers too', async () => {
+    const { calls, fetchImpl } = fetchSpy([ok()]);
+    await send(
+      { fetch: fetchImpl, headers: { 'X-S': 'static' } },
+      op,
+      'u',
+      { method: 'GET' },
+      undefined,
+      false,
+      {}
+    );
+    expect((calls[0].init.headers as Record<string, string>)['X-S']).toBe('static');
+  });
+
+  it('multipart body uses the wired capability after onRequest; throws without it', async () => {
+    const { calls, fetchImpl } = fetchSpy([ok()]);
+    await send({ fetch: fetchImpl }, op, 'u', { method: 'POST' }, { orgId: '1' }, true, {
+      serializeMultipart: (b) => {
+        const fd = new FormData();
+        fd.append('orgId', String((b as { orgId: string }).orgId));
+        return fd;
+      },
+    });
+    expect(calls[0].init.body).toBeInstanceOf(FormData);
+    await expect(
+      send({ fetch: fetchImpl }, op, 'u', { method: 'POST' }, { a: 1 }, true, {})
+    ).rejects.toThrow(/capability/i);
+  });
+
+  it('throws abortError when the signal is already aborted', async () => {
+    const controller = new AbortController();
+    controller.abort(new Error('gone'));
+    const { fetchImpl } = fetchSpy([ok()]);
+    await expect(
+      send(
+        { fetch: fetchImpl },
+        op,
+        'u',
+        { method: 'GET', signal: controller.signal },
+        undefined,
+        false,
+        {}
+      )
+    ).rejects.toThrow('gone');
+  });
+
+  it('falls back to the global fetch when config.fetch is not set', async () => {
+    const globalFetch = vi.fn().mockResolvedValue(ok());
+    vi.stubGlobal('fetch', globalFetch);
+    try {
+      const { response } = await send(
+        {},
+        op,
+        'https://x/pets',
+        { method: 'GET' },
+        undefined,
+        false,
+        {}
+      );
+      expect(response.status).toBe(200);
+      expect(globalFetch).toHaveBeenCalledOnce();
+    } finally {
+      vi.unstubAllGlobals();
+    }
+  });
+
+  it('ignores a drain failure on the abandoned retry body (e.g. already locked)', async () => {
+    const bad = new Response('busy', { status: 503, headers: { 'retry-after': '0' } });
+    bad.body!.getReader(); // lock the stream so cancel() rejects
+    const { calls, fetchImpl } = fetchSpy([bad, ok()]);
+    const { response } = await send(
+      { fetch: fetchImpl, retry: { retries: 1, jitter: false } },
+      op,
+      'https://x/pets',
+      { method: 'GET' },
+      undefined,
+      false,
+      {}
+    );
+    expect(response.status).toBe(200);
+    expect(calls.length).toBe(2);
+  });
+
+  it('defaults the method to GET in the request context', async () => {
+    const seen: string[] = [];
+    const { fetchImpl } = fetchSpy([ok()]);
+    await send(
+      {
+        fetch: fetchImpl,
+        middleware: [
+          {
+            onRequest: (ctx) => {
+              seen.push(ctx.method);
+            },
+          },
+        ],
+      },
+      op,
+      'u',
+      {},
+      undefined,
+      false,
+      {}
+    );
+    expect(seen).toEqual(['GET']);
+  });
+});
+
+describe('middlewareChain', () => {
+  it('folds the single config hooks in as an implicit FIRST middleware', () => {
+    const onRequest = vi.fn();
+    const chain = middlewareChain({ onRequest, middleware: [{ onRequest: vi.fn() }] });
+    expect(chain.length).toBe(2);
+    expect(chain[0].onRequest).toBe(onRequest);
+  });
+
+  it('is just config.middleware when no single hooks are set', () => {
+    const mw = { onRequest: vi.fn() };
+    expect(middlewareChain({ middleware: [mw] })).toEqual([mw]);
+    expect(middlewareChain({})).toEqual([]);
+  });
+});
diff --git a/packages/client-generator/src/runtime/__tests__/sse.test.ts b/packages/client-generator/src/runtime/__tests__/sse.test.ts
new file mode 100644
index 0000000000..18c7d8ca37
--- /dev/null
+++ b/packages/client-generator/src/runtime/__tests__/sse.test.ts
@@ -0,0 +1,235 @@
+import { parseSseFrame, sse } from '../sse.js';
+
+const enc = new TextEncoder();
+function streamResponse(chunks: string[], opts: { status?: number } = {}) {
+  const body = new ReadableStream<Uint8Array>({
+    start(controller) {
+      for (const chunk of chunks) controller.enqueue(enc.encode(chunk));
+      controller.close();
+    },
+  });
+  return new Response(body, {
+    status: opts.status ?? 200,
+    headers: { 'content-type': 'text/event-stream' },
+  });
+}
+const op = { id: 'stream', path: '/events', tags: [] as string[] };
+
+describe('parseSseFrame', () => {
+  it('parses event/id/retry and multi-line data (joined with \\n); json dataKind parses', () => {
+    const ev = parseSseFrame('event: tick\nid: 7\nretry: 250\ndata: {"n":1}', 'json');
+    expect(ev).toEqual({ event: 'tick', id: '7', retry: 250, data: { n: 1 } });
+    const multi = parseSseFrame('data: line1\ndata: line2', 'text');
+    expect(multi?.data).toBe('line1\nline2');
+  });
+
+  it('handles bare field names, no-space values, and invalid retry', () => {
+    const ev = parseSseFrame('data\nretry: soon', 'text');
+    expect(ev).toEqual({ event: undefined, data: '', id: undefined, retry: undefined });
+    expect(parseSseFrame('data:tight', 'text')?.data).toBe('tight');
+  });
+
+  it('returns undefined for comment-only frames and ignores unknown fields', () => {
+    expect(parseSseFrame(': keepalive', 'text')).toBeUndefined();
+    expect(parseSseFrame('foo: bar\ndata: x', 'text')?.data).toBe('x');
+  });
+});
+
+describe('sse', () => {
+  it('yields events and FLUSHES a final frame that lacks a trailing separator', async () => {
+    const fetchImpl = (async () =>
+      streamResponse(['data: a\n\n', 'id: 9\nretry: 5\ndata: final'])) as unknown as typeof fetch;
+    const seen: unknown[] = [];
+    for await (const ev of sse(
+      { fetch: fetchImpl },
+      op,
+      'https://x/events',
+      { reconnect: false },
+      'text'
+    )) {
+      seen.push(ev.data);
+    }
+    expect(seen).toEqual(['a', 'final']);
+  });
+
+  it('skips comment-only frames mid-stream and flushes a plain (no id/retry) final frame', async () => {
+    const fetchImpl = (async () =>
+      streamResponse(['data: a\n\n', ': ping\n\n', 'data: tail'])) as unknown as typeof fetch;
+    const seen: unknown[] = [];
+    for await (const ev of sse({ fetch: fetchImpl }, op, 'u', { reconnect: false }, 'text')) {
+      seen.push(ev.data);
+    }
+    expect(seen).toEqual(['a', 'tail']);
+  });
+
+  it('reconnects after a drop, resuming with Last-Event-ID', async () => {
+    const headersSeen: Array<Record<string, string>> = [];
+    let call = 0;
+    const fetchImpl = (async (_url: string, init: RequestInit) => {
+      headersSeen.push({ ...(init.headers as Record<string, string>) });
+      call++;
+      if (call === 1) {
+        // enqueue in start, error in pull: the chunk is read first, THEN the stream drops
+        const body = new ReadableStream<Uint8Array>({
+          start(controller) {
+            controller.enqueue(enc.encode('id: 5\ndata: one\n\n'));
+          },
+          pull(controller) {
+            controller.error(new Error('drop'));
+          },
+        });
+        return new Response(body, { status: 200 });
+      }
+      return streamResponse(['data: two\n\n']);
+    }) as unknown as typeof fetch;
+    const seen: unknown[] = [];
+    for await (const ev of sse({ fetch: fetchImpl }, op, 'u', { reconnectDelay: 1 }, 'text')) {
+      seen.push(ev.data);
+      if (seen.length === 2) break;
+    }
+    expect(seen).toEqual(['one', 'two']);
+    expect(headersSeen[1]['Last-Event-ID']).toBe('5');
+  });
+
+  it('honors the server retry: field for the backoff base and reconnects on empty bodies', async () => {
+    let call = 0;
+    const fetchImpl = (async () => {
+      call++;
+      if (call === 1) {
+        const body = new ReadableStream<Uint8Array>({
+          start(controller) {
+            controller.enqueue(enc.encode('retry: 1\ndata: first\n\n'));
+          },
+          pull(controller) {
+            controller.error(new Error('drop'));
+          },
+        });
+        return new Response(body, { status: 200 });
+      }
+      return streamResponse(['data: second\n\n']);
+    }) as unknown as typeof fetch;
+    const seen: unknown[] = [];
+    for await (const ev of sse({ fetch: fetchImpl }, op, 'u', {}, 'text')) {
+      seen.push(ev.data);
+      if (seen.length === 2) break;
+    }
+    expect(seen).toEqual(['first', 'second']);
+  });
+
+  it('throws ApiError on a non-2xx initial response (no reconnect loop)', async () => {
+    const bad = (async () => new Response('nope', { status: 500 })) as unknown as typeof fetch;
+    await expect(
+      (async () => {
+        for await (const _ of sse({ fetch: bad }, op, 'u', {}, 'text')) void _;
+      })()
+    ).rejects.toMatchObject({ status: 500 });
+  });
+
+  it('propagates transport errors when reconnect is off', async () => {
+    const failing = (async () => {
+      throw new Error('net down');
+    }) as unknown as typeof fetch;
+    await expect(
+      (async () => {
+        for await (const _ of sse({ fetch: failing }, op, 'u', { reconnect: false }, 'text'))
+          void _;
+      })()
+    ).rejects.toThrow('net down');
+  });
+
+  it('returns cleanly on a pre-aborted signal and on a body-less response', async () => {
+    const controller = new AbortController();
+    controller.abort();
+    const okFetch = (async () => streamResponse(['data: x\n\n'])) as unknown as typeof fetch;
+    const seen: unknown[] = [];
+    for await (const ev of sse(
+      { fetch: okFetch },
+      op,
+      'u',
+      { signal: controller.signal },
+      'text'
+    )) {
+      seen.push(ev);
+    }
+    expect(seen).toEqual([]);
+
+    const noBody = (async () => {
+      const r = new Response(null, { status: 200 });
+      Object.defineProperty(r, 'body', { value: null });
+      return r;
+    }) as unknown as typeof fetch;
+    const seen2: unknown[] = [];
+    for await (const ev of sse({ fetch: noBody }, op, 'u', {})) seen2.push(ev); // dataKind defaults to 'text'
+    expect(seen2).toEqual([]);
+  });
+
+  it('ends cleanly when the signal aborts during streaming (no reconnect attempt)', async () => {
+    const controller = new AbortController();
+    const fetchImpl = (async () => {
+      const body = new ReadableStream<Uint8Array>({
+        start(c) {
+          c.enqueue(enc.encode('data: one\n\n'));
+        },
+        pull(c) {
+          c.error(new Error('drop'));
+        },
+      });
+      return new Response(body, { status: 200 });
+    }) as unknown as typeof fetch;
+    const seen: unknown[] = [];
+    for await (const ev of sse(
+      { fetch: fetchImpl },
+      op,
+      'u',
+      { signal: controller.signal },
+      'text'
+    )) {
+      seen.push(ev.data);
+      controller.abort(); // the subsequent read error must be treated as an abort, not a drop
+    }
+    expect(seen).toEqual(['one']);
+  });
+
+  it('ends cleanly when the signal aborts during the reconnect backoff (default 1s base)', async () => {
+    const random = vi.spyOn(Math, 'random').mockReturnValue(0.5); // deterministic 500ms backoff
+    try {
+      const controller = new AbortController();
+      const failing = (async () => {
+        setTimeout(() => controller.abort(), 10); // abort while sse sleeps before reconnecting
+        throw new Error('net down');
+      }) as unknown as typeof fetch;
+      const seen: unknown[] = [];
+      for await (const ev of sse(
+        { fetch: failing },
+        op,
+        'u',
+        { signal: controller.signal },
+        'text'
+      )) {
+        seen.push(ev);
+      }
+      expect(seen).toEqual([]);
+    } finally {
+      random.mockRestore();
+    }
+  });
+
+  it('guards against unbounded frames (no delimiter past 1 MiB)', async () => {
+    const big = 'data: ' + 'x'.repeat(1_100_000); // no trailing delimiter, single chunk
+    const fetchImpl = (async () => {
+      const body = new ReadableStream<Uint8Array>({
+        start(controller) {
+          controller.enqueue(enc.encode(big));
+          // keep the stream open so `done` stays false after the big chunk
+        },
+      });
+      return new Response(body, { status: 200 });
+    }) as unknown as typeof fetch;
+    await expect(
+      (async () => {
+        for await (const _ of sse({ fetch: fetchImpl }, op, 'u', { reconnect: false }, 'text'))
+          void _;
+      })()
+    ).rejects.toThrow(/1048576/);
+  });
+});
diff --git a/packages/client-generator/src/runtime/__tests__/types.test.ts b/packages/client-generator/src/runtime/__tests__/types.test.ts
new file mode 100644
index 0000000000..63f6a0a3e3
--- /dev/null
+++ b/packages/client-generator/src/runtime/__tests__/types.test.ts
@@ -0,0 +1,105 @@
+import type {
+  Client,
+  ClientConfig,
+  Middleware,
+  OperationContext,
+  OperationDescriptor,
+  RequestContext,
+  RequestOptions,
+  Result,
+  ServerSentEvent,
+  SseOptions,
+} from '../types.js';
+
+interface TestOps {
+  requiredArgs: { args: { orderId: string }; result: { id: string } };
+  optionalArgs: { args: { params?: { limit?: number } }; result: string[] };
+  streaming: { args: Record<string, never>; result: { text: string }; kind: 'sse' };
+  [key: string]: { args: object; result: unknown; kind?: 'sse' };
+}
+
+describe('Client<Ops> mapped type', () => {
+  it('types methods, optionality, and sse per the Ops entry', () => {
+    // Runtime stub — expectTypeOf reads only the static type, but property access must not throw.
+    const client = { auth: {} } as unknown as Client<TestOps>;
+
+    expectTypeOf(client.requiredArgs).toBeCallableWith({ orderId: 'ord_1' });
+    expectTypeOf(client.requiredArgs).toBeCallableWith({ orderId: 'ord_1' }, { parseAs: 'json' });
+    expectTypeOf(client.requiredArgs).returns.resolves.toEqualTypeOf<{ id: string }>();
+
+    // All-optional args → the args object itself is optional.
+    expectTypeOf(client.optionalArgs).toBeCallableWith();
+    expectTypeOf(client.optionalArgs).toBeCallableWith({ params: { limit: 5 } });
+    expectTypeOf(client.optionalArgs).returns.resolves.toEqualTypeOf<string[]>();
+
+    // SSE entries return typed async generators and take SseOptions.
+    expectTypeOf(client.streaming).returns.toEqualTypeOf<
+      AsyncGenerator<ServerSentEvent<{ text: string }>>
+    >();
+    expectTypeOf(client.streaming).toBeCallableWith({}, { reconnect: false } satisfies SseOptions);
+
+    // Core members are always present.
+    expectTypeOf(client.configure).toBeFunction();
+    expectTypeOf(client.use).toBeFunction();
+    expectTypeOf(client.auth.bearer).toBeCallableWith('token');
+    expectTypeOf(client.auth.basic).toBeCallableWith('user', 'pass');
+    expectTypeOf(client.auth.apiKey).toBeCallableWith('scheme', 'key');
+
+    const _typeOnly = (): void => {
+      // @ts-expect-error required args cannot be omitted
+      void client.requiredArgs();
+    };
+    void _typeOnly;
+  });
+
+  it('descriptor literals satisfy OperationDescriptor', () => {
+    const op = {
+      id: 'getOrder',
+      method: 'GET',
+      path: '/orders/{orderId}',
+      params: [{ name: 'orderId', in: 'path' }],
+      security: [{ scheme: 'bearerAuth', kind: 'bearer' }],
+    } as const satisfies OperationDescriptor;
+    expect(op.id).toBe('getOrder');
+  });
+
+  it('narrows ctx.operation to the literal unions on a narrowed client', () => {
+    type Narrow = OperationContext<'listPets' | 'getPet', '/pets' | '/pets/{id}', 'pets'>;
+    const client = { auth: {} } as unknown as Client<TestOps, Narrow>;
+
+    // Type-only: `use` narrows the callback ctx; a base (contract-shaped) middleware
+    // and a base config stay accepted (contravariance of the callback params).
+    const _typeOnly = (): void => {
+      client.use({
+        onRequest: (ctx) => {
+          expectTypeOf(ctx.operation.id).toEqualTypeOf<'listPets' | 'getPet'>();
+          expectTypeOf(ctx.operation.path).toEqualTypeOf<'/pets' | '/pets/{id}'>();
+          expectTypeOf(ctx.operation.tags).toEqualTypeOf<'pets'[]>();
+          // @ts-expect-error a misspelled operationId has no overlap with the literal union
+          if (ctx.operation.id === 'listPetss') return;
+        },
+      });
+      const baseMiddleware: Middleware = { onRequest: (ctx) => void ctx.operation.id };
+      client.use(baseMiddleware);
+      const baseConfig: ClientConfig = { middleware: [baseMiddleware] };
+      client.configure(baseConfig);
+    };
+    void _typeOnly;
+
+    // The narrowed context stays assignable to the base shape (covariance).
+    expectTypeOf<RequestContext<Narrow>>().toExtend<RequestContext>();
+    expectTypeOf<ClientConfig>().toExtend<ClientConfig<Narrow>>();
+  });
+
+  it('Result discriminates on error', () => {
+    // When error is present, data is typed undefined (and vice versa).
+    expectTypeOf<
+      Extract<Result<string, { title: string }>, { error: { title: string } }>['data']
+    >().toEqualTypeOf<undefined>();
+    expectTypeOf<
+      Extract<Result<string, { title: string }>, { error: undefined }>['data']
+    >().toEqualTypeOf<string>();
+    const init: RequestOptions = { retry: { retries: 1 }, parseAs: 'auto' };
+    expect(init.parseAs).toBe('auto');
+  });
+});
diff --git a/packages/client-generator/src/runtime/__tests__/url.test.ts b/packages/client-generator/src/runtime/__tests__/url.test.ts
new file mode 100644
index 0000000000..3e5c668f2c
--- /dev/null
+++ b/packages/client-generator/src/runtime/__tests__/url.test.ts
@@ -0,0 +1,125 @@
+import { buildUrl, encodeReserved, substitutePath } from '../url.js';
+
+describe('substitutePath', () => {
+  it('substitutes and encodes path params', () => {
+    expect(substitutePath('/orders/{orderId}/items/{itemId}', { orderId: 'a/b', itemId: 42 })).toBe(
+      '/orders/a%2Fb/items/42'
+    );
+  });
+
+  it('throws on a missing param', () => {
+    expect(() => substitutePath('/orders/{orderId}', {})).toThrow(/orderId/);
+  });
+});
+
+describe('encodeReserved', () => {
+  it('keeps the RFC-3986 reserved set literal while encoding the rest', () => {
+    expect(encodeReserved("a/b?c#d[e]@f!g$h&i'j(k)l*m+n,o;p=q r")).toBe(
+      "a/b?c#d[e]@f!g$h&i'j(k)l*m+n,o;p=q%20r"
+    );
+  });
+});
+
+describe('buildUrl', () => {
+  it('trims any run of trailing slashes in linear time', () => {
+    expect(buildUrl('https://x///', '/p')).toBe('https://x/p');
+    // Adversarial many-slash input must not blow up (the old regex was quadratic).
+    const start = Date.now();
+    expect(buildUrl('https://x' + '/'.repeat(100_000), '/p')).toBe('https://x/p');
+    expect(Date.now() - start).toBeLessThan(1_000);
+  });
+
+  const base = 'https://api.example.com/';
+
+  it('trims trailing slashes and appends the path; no query → no ?', () => {
+    expect(buildUrl(base, '/menu')).toBe('https://api.example.com/menu');
+    expect(buildUrl(base, '/menu', {})).toBe('https://api.example.com/menu');
+  });
+
+  it('default form+explode repeats arrays, skips null/undefined (top level and in arrays)', () => {
+    expect(
+      buildUrl(base, '/m', {
+        tags: ['a', 'b', null, undefined],
+        skip: undefined,
+        gone: null,
+        limit: 5,
+      })
+    ).toBe('https://api.example.com/m?tags=a&tags=b&limit=5');
+  });
+
+  it('object values without a spec serialize as deepObject brackets, skipping empty entries', () => {
+    expect(buildUrl(base, '/m', { f: { color: 'red', size: 'L', none: null } })).toBe(
+      'https://api.example.com/m?f%5Bcolor%5D=red&f%5Bsize%5D=L'
+    );
+  });
+
+  it('form explode=true with allowReserved emits raw pairs; without it appends params', () => {
+    expect(
+      buildUrl(
+        base,
+        '/m',
+        { t: ['a/b', 'c'] },
+        { t: { style: 'form', explode: true, allowReserved: true } }
+      )
+    ).toBe('https://api.example.com/m?t=a/b&t=c');
+    expect(buildUrl(base, '/m', { t: ['a b'] }, { t: { style: 'form', explode: true } })).toBe(
+      'https://api.example.com/m?t=a+b'
+    );
+  });
+
+  it('delimited styles use LITERAL delimiters with encoded values', () => {
+    expect(buildUrl(base, '/m', { t: ['a', 'b'] }, { t: { style: 'form', explode: false } })).toBe(
+      'https://api.example.com/m?t=a,b'
+    );
+    expect(
+      buildUrl(base, '/m', { t: ['a b', 'c'] }, { t: { style: 'pipeDelimited', explode: false } })
+    ).toBe('https://api.example.com/m?t=a%20b|c');
+    expect(
+      buildUrl(base, '/m', { t: ['a', 'c'] }, { t: { style: 'spaceDelimited', explode: false } })
+    ).toBe('https://api.example.com/m?t=a%20c');
+    expect(
+      buildUrl(
+        base,
+        '/m',
+        { t: ['a/b'] },
+        { t: { style: 'pipeDelimited', explode: false, allowReserved: true } }
+      )
+    ).toBe('https://api.example.com/m?t=a/b');
+  });
+
+  it('objects with a spec serialize as brackets (allowReserved switches to raw pairs)', () => {
+    expect(
+      buildUrl(
+        base,
+        '/m',
+        { f: { a: '1', skip: null } },
+        { f: { style: 'deepObject', explode: true } }
+      )
+    ).toBe('https://api.example.com/m?f%5Ba%5D=1');
+    expect(
+      buildUrl(
+        base,
+        '/m',
+        { f: { a: 'x/y' } },
+        { f: { style: 'deepObject', explode: true, allowReserved: true } }
+      )
+    ).toBe('https://api.example.com/m?f[a]=x/y');
+  });
+
+  it('scalars with a spec: allowReserved raw vs encoded append; skipped when null', () => {
+    expect(
+      buildUrl(
+        base,
+        '/m',
+        { filter: 'a/b' },
+        { filter: { style: 'form', explode: true, allowReserved: true } }
+      )
+    ).toBe('https://api.example.com/m?filter=a/b');
+    expect(
+      buildUrl(base, '/m', { filter: 'a b' }, { filter: { style: 'form', explode: true } })
+    ).toBe('https://api.example.com/m?filter=a+b');
+    expect(
+      buildUrl(base, '/m', { filter: null }, { filter: { style: 'form', explode: true } })
+    ).toBe('https://api.example.com/m');
+  });
+});
diff --git a/packages/client-generator/src/runtime/auth.ts b/packages/client-generator/src/runtime/auth.ts
new file mode 100644
index 0000000000..c0166ec4e7
--- /dev/null
+++ b/packages/client-generator/src/runtime/auth.ts
@@ -0,0 +1,42 @@
+import type { ClientConfig, SecuritySpec, TokenProvider } from './types.js';
+
+/** Resolve a credential: a literal passes through; a function is awaited per request. */
+async function resolveToken(provider: TokenProvider): Promise<string> {
+  return typeof provider === 'function' ? await provider() : provider;
+}
+
+/**
+ * Build the auth headers/query for one operation's `security` requirements from the
+ * instance credentials (`config.auth`) — capability module, wired into `createClient`.
+ * A scheme with no configured credential contributes nothing (the request is sent
+ * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
+ */
+export async function resolveAuth(
+  security: readonly SecuritySpec[],
+  config: ClientConfig
+): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const headers: Record<string, string> = {};
+  const query: Record<string, string> = {};
+  const cookies: string[] = [];
+  for (const scheme of security) {
+    if (scheme.kind === 'apiKey') {
+      const provider = config.auth?.apiKey?.[scheme.scheme];
+      if (provider === undefined) continue;
+      const value = await resolveToken(provider);
+      if (scheme.in === 'header') headers[scheme.name] = value;
+      else if (scheme.in === 'query') query[scheme.name] = value;
+      else cookies.push(`${scheme.name}=${value}`);
+    } else if (scheme.kind === 'bearer') {
+      const provider = config.auth?.bearer;
+      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
+    } else {
+      const basic = config.auth?.basic;
+      if (basic !== undefined) {
+        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+      }
+    }
+  }
+  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
+  return { headers, query };
+}
diff --git a/packages/client-generator/src/runtime/create-client.ts b/packages/client-generator/src/runtime/create-client.ts
new file mode 100644
index 0000000000..0b9e171155
--- /dev/null
+++ b/packages/client-generator/src/runtime/create-client.ts
@@ -0,0 +1,244 @@
+import { ApiError } from './errors.js';
+import { parse, readError } from './parse.js';
+import { middlewareChain, send, type SendCapabilities } from './send.js';
+import type {
+  ApiErrorLike,
+  Client,
+  ClientConfig,
+  Middleware,
+  OperationContext,
+  OperationDescriptor,
+  OpsShape,
+  ParseAs,
+  QueryValue,
+  RequestOptions,
+  SecuritySpec,
+  ServerSentEvent,
+  SseOptions,
+  TokenProvider,
+} from './types.js';
+import { buildUrl, substitutePath, type QueryStyle } from './url.js';
+
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+export type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+};
+
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+export function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
diff --git a/packages/client-generator/src/runtime/errors.ts b/packages/client-generator/src/runtime/errors.ts
new file mode 100644
index 0000000000..a08cc058de
--- /dev/null
+++ b/packages/client-generator/src/runtime/errors.ts
@@ -0,0 +1,24 @@
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+export function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
diff --git a/packages/client-generator/src/runtime/index.ts b/packages/client-generator/src/runtime/index.ts
new file mode 100644
index 0000000000..1991ab968c
--- /dev/null
+++ b/packages/client-generator/src/runtime/index.ts
@@ -0,0 +1,39 @@
+import { resolveAuth } from './auth.js';
+import { createClientCore } from './create-client.js';
+import { toFormData } from './multipart.js';
+import { sse } from './sse.js';
+import type {
+  Client,
+  ClientConfig,
+  OperationContext,
+  OperationDescriptor,
+  OpsShape,
+} from './types.js';
+
+/**
+ * The public client factory for package-mode generated clients: `createClientCore`
+ * with the full capability set wired (multipart, auth, SSE). The capability seam
+ * itself stays internal — the future inline assembler wires only what a spec needs.
+ * The trailing string params carry the generated literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation` for
+ * middleware targeting; their defaults keep spec-independent callers untyped.
+ */
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, {
+    serializeMultipart: toFormData,
+    resolveAuth,
+    sse,
+  });
+}
+
+export { ApiError } from './errors.js';
+export { mergeSetup } from './setup.js';
+export type * from './types.js';
diff --git a/packages/client-generator/src/runtime/multipart.ts b/packages/client-generator/src/runtime/multipart.ts
new file mode 100644
index 0000000000..7c4da05341
--- /dev/null
+++ b/packages/client-generator/src/runtime/multipart.ts
@@ -0,0 +1,22 @@
+/**
+ * Serialize a plain object into `FormData` for a typed `multipart/form-data` body
+ * (capability module — wired into `createClient`, never imported by the send core).
+ * `Blob`/`File` and strings pass through; `Date`s become ISO strings; arrays append
+ * one field per item; other objects are JSON-encoded; everything else is stringified.
+ * `undefined`/`null` entries are skipped.
+ */
+export function toFormData(body: Record<string, unknown>): FormData {
+  const fd = new FormData();
+  const append = (key: string, value: unknown): void => {
+    if (value === undefined || value === null) return;
+    if (value instanceof Blob || typeof value === 'string') fd.append(key, value);
+    else if (value instanceof Date) fd.append(key, value.toISOString());
+    else if (Object(value) === value) fd.append(key, JSON.stringify(value));
+    else fd.append(key, String(value));
+  };
+  for (const [key, value] of Object.entries(body)) {
+    if (Array.isArray(value)) for (const item of value) append(key, item);
+    else append(key, value);
+  }
+  return fd;
+}
diff --git a/packages/client-generator/src/runtime/parse.ts b/packages/client-generator/src/runtime/parse.ts
new file mode 100644
index 0000000000..cd3f686be3
--- /dev/null
+++ b/packages/client-generator/src/runtime/parse.ts
@@ -0,0 +1,29 @@
+import type { ParseAs } from './types.js';
+
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+export async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+export async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
diff --git a/packages/client-generator/src/runtime/retry.ts b/packages/client-generator/src/runtime/retry.ts
new file mode 100644
index 0000000000..d1d6648108
--- /dev/null
+++ b/packages/client-generator/src/runtime/retry.ts
@@ -0,0 +1,50 @@
+import { abortError } from './errors.js';
+import type { RetryConfig, RetryContext } from './types.js';
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+export function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+export function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+export function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
diff --git a/packages/client-generator/src/runtime/send.ts b/packages/client-generator/src/runtime/send.ts
new file mode 100644
index 0000000000..c6bc0ab643
--- /dev/null
+++ b/packages/client-generator/src/runtime/send.ts
@@ -0,0 +1,142 @@
+import { abortError } from './errors.js';
+import { defaultRetryOn, retryDelay, sleep } from './retry.js';
+import type {
+  ClientConfig,
+  Middleware,
+  OperationContext,
+  RequestContext,
+  RequestOptions,
+  RetryConfig,
+} from './types.js';
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+export type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+export function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+export async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
diff --git a/packages/client-generator/src/runtime/setup.ts b/packages/client-generator/src/runtime/setup.ts
new file mode 100644
index 0000000000..4c5e1c0153
--- /dev/null
+++ b/packages/client-generator/src/runtime/setup.ts
@@ -0,0 +1,17 @@
+import type { ClientConfig, Middleware } from './types.js';
+
+/**
+ * Merge a publisher's baked setup (`defineClientSetup({...})`) with the app's config:
+ * app config fields win per-field over baked defaults, while middleware composes —
+ * baked middleware runs first, then the app's.
+ */
+export function mergeSetup(
+  setup: { config?: ClientConfig; middleware?: Middleware[] } | undefined,
+  config: ClientConfig = {}
+): ClientConfig {
+  return {
+    ...setup?.config,
+    ...config,
+    middleware: [...(setup?.middleware ?? []), ...(config.middleware ?? [])],
+  };
+}
diff --git a/packages/client-generator/src/runtime/sse.ts b/packages/client-generator/src/runtime/sse.ts
new file mode 100644
index 0000000000..f1a89af0f0
--- /dev/null
+++ b/packages/client-generator/src/runtime/sse.ts
@@ -0,0 +1,141 @@
+import { ApiError } from './errors.js';
+import { readError } from './parse.js';
+import { sleep } from './retry.js';
+import { send } from './send.js';
+import type { ClientConfig, OperationContext, ServerSentEvent, SseOptions } from './types.js';
+
+/**
+ * Consume a `text/event-stream` operation as typed events (capability module — wired
+ * into `createClient`). Auto-reconnects on dropped connections, resuming from the last
+ * seen event id via `Last-Event-ID` (backoff: the server's `retry:` value, then
+ * `reconnectDelay`, then 1s — exponential with jitter, capped at 30s). A clean stream
+ * end flushes a trailing frame and finishes; `break`/abort end the iterator cleanly.
+ */
+export async function* sse<T>(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: SseOptions,
+  dataKind: 'json' | 'text' = 'text'
+): AsyncGenerator<ServerSentEvent<T>> {
+  const { reconnect = true, reconnectDelay, ...rest } = init;
+  const signal = rest.signal ?? undefined;
+  const headers: Record<string, string> = {
+    Accept: 'text/event-stream',
+    ...(rest.headers as Record<string, string> | undefined),
+  };
+  let lastEventId: string | undefined;
+  let serverRetry: number | undefined;
+  let failures = 0;
+  while (true) {
+    if (signal?.aborted) return;
+    const sendHeaders =
+      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
+    try {
+      const { response } = await send(
+        config,
+        op,
+        url,
+        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },
+        undefined,
+        false,
+        {}
+      );
+      if (!response.ok) {
+        const errorBody = await readError(response);
+        throw new ApiError(url, response.status, response.statusText, errorBody);
+      }
+      failures = 0;
+      const body = response.body;
+      if (!body) return;
+      const reader = body.getReader();
+      const decoder = new TextDecoder();
+      let buffer = '';
+      try {
+        while (true) {
+          const { done, value } = await reader.read();
+          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });
+          let index: number;
+          while ((index = buffer.search(/\r\n\r\n|\n\n|\r\r/)) !== -1) {
+            const raw = buffer.slice(0, index);
+            buffer = buffer.slice(
+              index + buffer.slice(index).match(/^(\r\n\r\n|\n\n|\r\r)/)![0].length
+            );
+            const event = parseSseFrame(raw, dataKind);
+            if (event) {
+              if (event.id !== undefined) lastEventId = event.id;
+              if (event.retry !== undefined) serverRetry = event.retry;
+              yield event as ServerSentEvent<T>;
+            }
+          }
+          if (done) {
+            // Stream closed cleanly. Flush a final event that arrived without a trailing
+            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.
+            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;
+            if (event) {
+              if (event.id !== undefined) lastEventId = event.id;
+              if (event.retry !== undefined) serverRetry = event.retry;
+              yield event as ServerSentEvent<T>;
+            }
+            return;
+          }
+          // Bound memory: a server that never sends a frame delimiter would otherwise
+          // grow `buffer` without limit. 1 MiB is far above any real SSE frame.
+          if (buffer.length > 1048576) {
+            throw new Error('SSE frame exceeded 1048576 characters without a delimiter');
+          }
+        }
+      } finally {
+        await reader.cancel().catch(() => undefined);
+      }
+    } catch (error) {
+      if (signal?.aborted) return;
+      // A non-OK HTTP response is a definitive error (4xx/5xx), not a transient drop —
+      // surface it instead of reconnecting in a loop.
+      if (error instanceof ApiError) throw error;
+      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream
+      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.
+      if (!reconnect) throw error;
+    }
+    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.
+    failures++;
+    const base = serverRetry ?? reconnectDelay ?? 1000;
+    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);
+    try {
+      await sleep(Math.random() * delay, signal);
+    } catch {
+      return; // sleep rejects only on abort — end the iterator cleanly
+    }
+  }
+}
+
+/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */
+export function parseSseFrame(
+  raw: string,
+  dataKind: 'json' | 'text'
+): ServerSentEvent<unknown> | undefined {
+  let event: string | undefined;
+  const dataLines: string[] = [];
+  let id: string | undefined;
+  let retry: number | undefined;
+  let sawField = false;
+  for (const line of raw.split(/\r\n|\n|\r/)) {
+    if (line === '' || line.startsWith(':')) continue;
+    const colon = line.indexOf(':');
+    const field = colon === -1 ? line : line.slice(0, colon);
+    let val = colon === -1 ? '' : line.slice(colon + 1);
+    if (val.startsWith(' ')) val = val.slice(1);
+    sawField = true;
+    if (field === 'event') event = val;
+    else if (field === 'data') dataLines.push(val);
+    else if (field === 'id') id = val;
+    else if (field === 'retry') {
+      const n = Number(val);
+      if (!Number.isNaN(n)) retry = n;
+    }
+  }
+  if (!sawField) return undefined;
+  const dataText = dataLines.join('\n');
+  const data = dataKind === 'json' && dataText !== '' ? JSON.parse(dataText) : dataText;
+  return { event, data, id, retry };
+}
diff --git a/packages/client-generator/src/runtime/types.ts b/packages/client-generator/src/runtime/types.ts
new file mode 100644
index 0000000000..db495b6f0c
--- /dev/null
+++ b/packages/client-generator/src/runtime/types.ts
@@ -0,0 +1,200 @@
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
+export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : NoRequiredKeys<Ops[K]['args']> extends true
+      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+} & ClientCore<Op>;
diff --git a/packages/client-generator/src/runtime/url.ts b/packages/client-generator/src/runtime/url.ts
new file mode 100644
index 0000000000..bdc4ae2e62
--- /dev/null
+++ b/packages/client-generator/src/runtime/url.ts
@@ -0,0 +1,104 @@
+import type { ParamSpec, QueryValue } from './types.js';
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
+ */
+export type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
+ */
+export function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+export function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+export function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
diff --git a/packages/client-generator/src/types.ts b/packages/client-generator/src/types.ts
index 4f1184eb12..3601f18224 100644
--- a/packages/client-generator/src/types.ts
+++ b/packages/client-generator/src/types.ts
@@ -1,6 +1,6 @@
 import type { Config as RedoclyConfig, Oas3Definition, detectSpec } from '@redocly/openapi-core';
 
-import type { ArgsStyle, Facade } from './emitters/client.js';
+import type { ArgsStyle } from './emitters/client.js';
 import type { CustomGenerator } from './generators/types.js';
 import type { OutputMode } from './writers/types.js';
 
@@ -15,11 +15,6 @@ export type GenerateClientOptions = {
    * (one self-contained file).
    */
   outputMode?: OutputMode;
-  /**
-   * Developer-facing operation shape: `'functions'` (default) emits standalone
-   * async functions; `'service-class'` groups operations as class methods.
-   */
-  facade?: Facade;
   /**
    * How operation inputs are passed to each generated function/method:
    * `'flat'` (default) spreads path params as positional args followed by
@@ -27,11 +22,6 @@ export type GenerateClientOptions = {
    * `args` object. The per-call `init` argument stays separate in both styles.
    */
   argsStyle?: ArgsStyle;
-  /**
-   * Class name for the `service-class` facade in single/split layouts (ignored
-   * by `functions` and by per-tag service classes). Defaults to `'Client'`.
-   */
-  name?: string;
   /**
    * Override the BASE URL inlined into the generated runtime. When omitted,
    * the value is derived from `servers[0].url` in the source OpenAPI document.
@@ -96,10 +86,11 @@ export type GenerateClientOptions = {
   configDir?: string;
   /**
    * Path to a publisher setup module (`export default defineClientSetup({ config, middleware })`)
-   * baked into the generated client. Resolved against `configDir`. Works across all output modes
-   * and both facades (functions: global `configure`/`use`; service-class: constructor merge).
+   * baked into the generated client. Resolved against `configDir`. Works across all output modes.
    */
   setup?: string;
+  /** Runtime distribution: 'inline' (default, self-contained) | 'package' (imports @redocly/client-generator). */
+  runtime?: 'inline' | 'package';
 };
 
 export type GenerateClientResult = {
diff --git a/packages/client-generator/src/writers/__tests__/group-by-tag.test.ts b/packages/client-generator/src/writers/__tests__/group-by-tag.test.ts
deleted file mode 100644
index 1a7b6cbf36..0000000000
--- a/packages/client-generator/src/writers/__tests__/group-by-tag.test.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import type { ApiModel, OperationModel } from '../../intermediate-representation/model.js';
-import { groupByTag, sanitizeTagStem } from '../group-by-tag.js';
-
-function op(name: string, tags: string[] = []): OperationModel {
-  return {
-    name,
-    method: 'get',
-    path: `/${name}`,
-    pathParams: [],
-    queryParams: [],
-    headerParams: [],
-    successResponses: [],
-    errorResponses: [],
-    security: [],
-    tags,
-  };
-}
-
-function model(ops: OperationModel[]): ApiModel {
-  return {
-    title: 'T',
-    version: '1.0.0',
-    serverUrl: '',
-    services: [{ name: 'Default', operations: ops }],
-    schemas: [],
-    securitySchemes: [],
-  };
-}
-
-describe('sanitizeTagStem', () => {
-  it('keeps safe characters and replaces the rest with dashes', () => {
-    expect(sanitizeTagStem('Pets')).toBe('Pets');
-    expect(sanitizeTagStem('Pet Store')).toBe('Pet-Store');
-    expect(sanitizeTagStem('pets/v2')).toBe('pets-v2');
-    expect(sanitizeTagStem('a.b.c')).toBe('a-b-c');
-  });
-
-  it('collapses repeats and trims edge dashes', () => {
-    expect(sanitizeTagStem('  **weird**  ')).toBe('weird');
-  });
-
-  it('falls back to `tag` when nothing survives', () => {
-    expect(sanitizeTagStem('***')).toBe('tag');
-  });
-});
-
-describe('groupByTag', () => {
-  it('assigns each operation to its first tag, in first-seen order', () => {
-    const groups = groupByTag(
-      model([op('a', ['pets', 'public']), op('b', ['orders']), op('c', ['pets'])]),
-      'client'
-    );
-    expect(groups.map((g) => g.stem)).toEqual(['pets', 'orders']);
-    expect(groups[0].operations.map((o) => o.name)).toEqual(['a', 'c']);
-    expect(groups[1].operations.map((o) => o.name)).toEqual(['b']);
-  });
-
-  it('routes untagged operations to the `default` group', () => {
-    const groups = groupByTag(model([op('health')]), 'client');
-    expect(groups).toHaveLength(1);
-    expect(groups[0].stem).toBe('default');
-    expect(groups[0].operations.map((o) => o.name)).toEqual(['health']);
-  });
-
-  it('de-duplicates stems that collide after sanitization', () => {
-    const groups = groupByTag(model([op('a', ['Pet Store']), op('b', ['Pet/Store'])]), 'client');
-    expect(groups.map((g) => g.stem)).toEqual(['Pet-Store', 'Pet-Store-2']);
-  });
-
-  it('reserves the anchor stem so a tag cannot overwrite the entry file', () => {
-    const groups = groupByTag(model([op('a', ['client'])]), 'client');
-    expect(groups[0].stem).toBe('client-2');
-  });
-});
diff --git a/packages/client-generator/src/writers/__tests__/index.test.ts b/packages/client-generator/src/writers/__tests__/index.test.ts
index 083b3731bd..71c861ae70 100644
--- a/packages/client-generator/src/writers/__tests__/index.test.ts
+++ b/packages/client-generator/src/writers/__tests__/index.test.ts
@@ -2,8 +2,6 @@ import type { ApiModel } from '../../intermediate-representation/model.js';
 import { getWriter } from '../index.js';
 import { singleFileWriter } from '../single-file-writer.js';
 import { splitWriter } from '../split-writer.js';
-import { tagsSplitWriter } from '../tags-split-writer.js';
-import { tagsWriter } from '../tags-writer.js';
 
 const model: ApiModel = {
   title: 'Tiny',
@@ -40,14 +38,6 @@ describe('getWriter', () => {
   it('returns the split writer for the `split` mode', () => {
     expect(getWriter('split')).toBe(splitWriter);
   });
-
-  it('returns the tags writer for the `tags` mode', () => {
-    expect(getWriter('tags')).toBe(tagsWriter);
-  });
-
-  it('returns the tags-split writer for the `tags-split` mode', () => {
-    expect(getWriter('tags-split')).toBe(tagsSplitWriter);
-  });
 });
 
 describe('singleFileWriter', () => {
@@ -59,7 +49,31 @@ describe('singleFileWriter', () => {
     });
     expect(files).toHaveLength(1);
     expect(files[0].path).toBe('/out/api.ts');
-    expect(files[0].content).toContain('export async function ping(');
     expect(files[0].content).toContain('// Generated by @redocly/client-generator');
+    // The default (inline) arm embeds the runtime and wires the descriptor client.
+    expect(files[0].content).toContain('// ─── Embedded runtime');
+    expect(files[0].content).toContain(
+      'export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS,'
+    );
+    expect(files[0].content).toContain('export const ping = (init: RequestOptions = {})');
+  });
+
+  it('emits the package import instead of the embedded runtime for runtime: package', () => {
+    const files = singleFileWriter({
+      model,
+      outputPath: '/out/api.ts',
+      emit: { runtime: 'package' },
+    });
+    expect(files).toHaveLength(1);
+    expect(files[0].content).toContain("from '@redocly/client-generator'");
+    expect(files[0].content).not.toContain('// ─── Embedded runtime');
+    // An explicit `inline` embeds.
+    const inline = singleFileWriter({
+      model,
+      outputPath: '/out/api.ts',
+      emit: { runtime: 'inline' },
+    });
+    expect(inline[0].content).toContain('// ─── Embedded runtime');
+    expect(inline[0].content).not.toContain("from '@redocly/client-generator'");
   });
 });
diff --git a/packages/client-generator/src/writers/__tests__/split-writer.test.ts b/packages/client-generator/src/writers/__tests__/split-writer.test.ts
index ab7575db51..38cc989124 100644
--- a/packages/client-generator/src/writers/__tests__/split-writer.test.ts
+++ b/packages/client-generator/src/writers/__tests__/split-writer.test.ts
@@ -1,3 +1,4 @@
+import type { EmitOptions } from '../../emitters/client.js';
 import type { ApiModel, OperationModel } from '../../intermediate-representation/model.js';
 import { splitWriter } from '../split-writer.js';
 
@@ -29,190 +30,159 @@ function model(overrides: Partial<ApiModel> = {}): ApiModel {
   };
 }
 
-function run(m: ApiModel) {
-  const files = splitWriter({
-    model: m,
-    outputPath: '/out/client.ts',
-    emit: {},
-  });
-  const byName = (suffix: string) => files.find((f) => f.path.endsWith(suffix))!;
+const PET_MODEL = model({
+  schemas: [
+    {
+      name: 'Pet',
+      schema: {
+        kind: 'object',
+        properties: [{ name: 'id', schema: { kind: 'scalar', scalar: 'integer' }, required: true }],
+      },
+    },
+    // Never referenced by an operation — must NOT be imported by the entry.
+    { name: 'Unreferenced', schema: { kind: 'object', properties: [] } },
+  ],
+  services: [
+    {
+      name: 'Default',
+      operations: [
+        operation({
+          name: 'getPet',
+          path: '/pets/{id}',
+          pathParams: [
+            {
+              name: 'id',
+              in: 'path',
+              schema: { kind: 'scalar', scalar: 'string' },
+              required: true,
+            },
+          ],
+          successResponses: [
+            { contentType: 'application/json', status: 200, schema: { kind: 'ref', name: 'Pet' } },
+          ],
+        }),
+      ],
+    },
+  ],
+});
+
+function run(m: ApiModel, emit: EmitOptions = {}) {
+  const files = splitWriter({ model: m, outputPath: '/out/client.ts', emit });
   return {
     files,
-    http: byName('client.http.ts'),
-    schemas: byName('client.schemas.ts'),
-    entry: byName('/out/client.ts'),
+    schemas: files.find((f) => f.path === '/out/client.schemas.ts'),
+    entry: files.find((f) => f.path === '/out/client.ts')!,
   };
 }
 
 describe('splitWriter — file set & paths', () => {
-  it('emits exactly http, schemas, and the entry file', () => {
-    const { files } = run(model());
-    expect(files.map((f) => f.path).sort()).toEqual([
-      '/out/client.http.ts',
-      '/out/client.schemas.ts',
-      '/out/client.ts',
-    ]);
+  it('emits exactly the schemas file and the entry file', () => {
+    const { files } = run(PET_MODEL);
+    expect(files.map((f) => f.path)).toEqual(['/out/client.schemas.ts', '/out/client.ts']);
   });
-});
 
-describe('splitWriter — http module', () => {
-  it('exports the operation-facing runtime helpers and public setters', () => {
-    const { http } = run(
-      model({
-        services: [{ name: 'Default', operations: [operation()] }],
-      })
+  it('omits the schemas file entirely when the document declares no schemas', () => {
+    const { files, entry } = run(
+      model({ services: [{ name: 'Default', operations: [operation()] }] })
     );
-    expect(http.content).toContain('export function setServerUrl(');
-    expect(http.content).toContain('export class ApiError');
-    expect(http.content).toContain('export function __buildUrl(');
-    expect(http.content).toContain('export async function __request<T>(');
+    expect(files.map((f) => f.path)).toEqual(['/out/client.ts']);
+    expect(entry.content).not.toContain('.schemas.js');
   });
 });
 
 describe('splitWriter — schemas module', () => {
-  it('contains the model types and nothing runtime-related', () => {
-    const { schemas } = run(
+  it('contains the model types + type guards and nothing runtime-related', () => {
+    const withUnion = run(
       model({
         schemas: [
           {
-            name: 'Pet',
+            name: 'Cat',
             schema: {
               kind: 'object',
               properties: [
-                {
-                  name: 'id',
-                  schema: { kind: 'scalar', scalar: 'integer' },
-                  required: true,
-                },
+                { name: 'type', schema: { kind: 'literal', value: 'cat' }, required: true },
+              ],
+            },
+          },
+          {
+            name: 'Dog',
+            schema: {
+              kind: 'object',
+              properties: [
+                { name: 'type', schema: { kind: 'literal', value: 'dog' }, required: true },
+              ],
+            },
+          },
+          {
+            name: 'Animal',
+            schema: {
+              kind: 'union',
+              members: [
+                { kind: 'ref', name: 'Cat' },
+                { kind: 'ref', name: 'Dog' },
               ],
             },
           },
         ],
       })
     );
-    expect(schemas.content).toContain('export type Pet');
-    expect(schemas.content).not.toContain('__request');
+    const schemas = withUnion.schemas!.content;
+    expect(schemas).toContain('// Generated by @redocly/client-generator');
+    expect(schemas).toContain('export type Cat = {');
+    expect(schemas).toContain('export function isCat(');
+    expect(schemas).not.toContain('createClient');
+    expect(schemas).not.toContain('OPERATIONS');
   });
 });
 
-describe('splitWriter — entry imports & re-exports', () => {
-  it('imports only the referenced types and the helpers actually used', () => {
-    const { entry } = run(
-      model({
-        schemas: [{ name: 'Pet', schema: { kind: 'object', properties: [] } }],
-        services: [
-          {
-            name: 'Default',
-            operations: [
-              operation({
-                name: 'getPet',
-                successResponses: [
-                  {
-                    contentType: 'application/json',
-                    status: 200,
-                    schema: { kind: 'ref', name: 'Pet' },
-                  },
-                ],
-              }),
-            ],
-          },
-        ],
-      })
-    );
-    expect(entry.content).toContain('import type { Pet } from "./client.schemas.js";');
-    // Functions facade pulls the global __config alongside the runtime helpers.
-    expect(entry.content).toContain(
-      'import { __buildUrl, __config, __request, type RequestOptions } from "./client.http.js";'
-    );
+describe('splitWriter — entry (inline runtime, the default)', () => {
+  it('embeds the runtime, re-exports the schemas module, and imports only referenced schema types', () => {
+    const { entry } = run(PET_MODEL);
+    expect(entry.content).toContain("import type { Pet } from './client.schemas.js';");
     expect(entry.content).toContain("export * from './client.schemas.js';");
+    // `Unreferenced` is exported via the `export *` but never imported by name.
+    expect(entry.content).not.toContain('Unreferenced }');
+    expect(entry.content).toContain('// ─── Embedded runtime');
     expect(entry.content).toContain(
-      'export { ApiError, configure, setServerUrl, use } from "./client.http.js";'
+      'export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS,'
     );
+    expect(entry.content).toContain('export const { configure, use } = client;');
     expect(entry.content).toContain(
-      'export type { ClientConfig, Middleware, OperationContext, ParseAs, RequestContext, RequestOptions, RetryConfig, RetryContext, RetryStrategy } from "./client.http.js";'
+      'export const getPet = (id: string, init: RequestOptions = {}) => client.getPet({ id }, init);'
     );
-    expect(entry.content).toContain('export async function getPet(');
-    // No auth/header helpers used by this operation.
-    expect(entry.content).not.toContain('__auth');
-    expect(entry.content).not.toContain('__headers');
+    // The schema types themselves live only in the schemas module.
+    expect(entry.content).not.toContain('export type Pet = {');
   });
 
-  it('imports __auth and __headers when operations need them, and re-exports auth setters', () => {
-    const { entry, http } = run(
+  it('skips the type import when no schema name is referenced by the entry code', () => {
+    const { entry, schemas } = run(
       model({
-        securitySchemes: [{ kind: 'bearer', key: 'oauth' }],
-        services: [
-          {
-            name: 'Default',
-            operations: [
-              operation({
-                name: 'secure',
-                security: ['oauth'],
-                headerParams: [
-                  {
-                    name: 'X-Trace',
-                    in: 'header',
-                    schema: { kind: 'scalar', scalar: 'string' },
-                    required: false,
-                  },
-                ],
-              }),
-            ],
-          },
-        ],
+        schemas: [{ name: 'Orphan', schema: { kind: 'object', properties: [] } }],
+        services: [{ name: 'Default', operations: [operation({ name: 'ping' })] }],
       })
     );
-    expect(entry.content).toContain(
-      'import { __auth, __buildUrl, __config, __headers, __request, type RequestOptions } from "./client.http.js";'
-    );
-    expect(entry.content).toContain(
-      'export { ApiError, configure, setBearer, setServerUrl, use } from "./client.http.js";'
-    );
-    expect(http.content).toContain('export async function __auth(');
-    expect(http.content).toContain('export function setBearer(');
-  });
-
-  it('endpoint file imports RequestOptions and the entry re-exports it', () => {
-    const { entry, http } = run(
-      model({ services: [{ name: 'Default', operations: [operation()] }] })
-    );
-    // endpoints reference RequestOptions in signatures → must import the type
-    expect(entry.content).toContain('type RequestOptions');
-    // and the public surface re-exports it from the http module
-    expect(http.content).toContain('export type RequestOptions');
+    expect(schemas!.content).toContain('export type Orphan');
+    expect(entry.content).toContain("export * from './client.schemas.js';");
+    expect(entry.content).not.toContain('import type {');
   });
+});
 
-  it('omits the schemas re-export entirely when there are no schemas and no operations', () => {
-    const { entry } = run(model());
-    expect(entry.content).not.toContain('.schemas.js');
+describe('splitWriter — entry (package runtime)', () => {
+  it('imports the runtime from the package and keeps the schemas linkage + re-export tail', () => {
+    const { entry, schemas } = run(PET_MODEL, { runtime: 'package' });
+    expect(schemas!.content).toContain('export type Pet = {');
+    expect(entry.content).toContain("import type { Pet } from './client.schemas.js';");
+    expect(entry.content).toContain("export * from './client.schemas.js';");
+    expect(entry.content).toContain("from '@redocly/client-generator';");
+    expect(entry.content).not.toContain('// ─── Embedded runtime');
     expect(entry.content).toContain(
-      'export { ApiError, configure, setServerUrl, use } from "./client.http.js";'
+      "export { ApiError, createClient } from '@redocly/client-generator';"
     );
   });
-
-  it('keeps the OPERATIONS map in the schemas module (and re-exports it) even without named types', () => {
-    const { schemas, entry } = run(
-      model({
-        services: [
-          {
-            name: 'Default',
-            operations: [operation({ name: 'ping', path: '/ping' })],
-          },
-        ],
-      })
-    );
-    // No named schemas, but the metadata map still belongs in the schemas module…
-    expect(schemas.content).toContain('export const OPERATIONS = {');
-    expect(schemas.content).toContain('ping: { method: "GET", path: "/ping", tags: [] }');
-    expect(schemas.content).not.toContain('export type Pet');
-    // …so the barrel re-exports it, while the endpoint file imports no named types.
-    expect(entry.content).toContain("export * from './client.schemas.js';");
-    expect(entry.content).not.toContain('import type {');
-  });
 });
 
 describe('splitWriter — SSE', () => {
-  it('emits the sse aggregate in the entry file for an SSE op', () => {
+  it('keeps SSE descriptors + flat sugar in the entry file', () => {
     const { entry } = run(
       model({
         schemas: [{ name: 'Message', schema: { kind: 'object', properties: [] } }],
@@ -237,32 +207,11 @@ describe('splitWriter — SSE', () => {
         ],
       })
     );
-    expect(entry.content).toContain('export const sse = {');
-    expect(entry.content).toContain('async function* streamMessages(');
-  });
-});
-
-describe('splitWriter — service-class facade', () => {
-  it('puts the Client class in the entry (with the chosen name) instead of functions', () => {
-    const files = splitWriter({
-      model: model({
-        services: [{ name: 'Default', operations: [operation({ name: 'ping' })] }],
-      }),
-      outputPath: '/out/client.ts',
-      emit: { facade: 'service-class', name: 'CafeClient' },
-    });
-    const entry = files.find((f) => f.path.endsWith('/out/client.ts'))!;
-    expect(entry.content).toContain('export class CafeClient {');
-    expect(entry.content).toMatch(/\basync ping\(/);
-    expect(entry.content).not.toContain('export async function');
-    // The class constructor imports the ClientConfig type, not the global __config.
+    expect(entry.content).toContain('responseKind: "sse"');
     expect(entry.content).toContain(
-      'type ClientConfig, type Middleware, type RequestOptions } from "./client.http.js";'
-    );
-    expect(entry.content).not.toContain('__config');
-    // The shared http/schemas modules are unchanged by the facade choice.
-    expect(files.find((f) => f.path.endsWith('client.http.ts'))!.content).toContain(
-      'export async function __request<T>('
+      'export const streamMessages = (init: SseOptions = {}) => client.streamMessages({}, init);'
     );
+    // The streamed event type is imported from the schemas module (Ops references it).
+    expect(entry.content).toContain("import type { Message } from './client.schemas.js';");
   });
 });
diff --git a/packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts b/packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts
deleted file mode 100644
index 6f44c37b81..0000000000
--- a/packages/client-generator/src/writers/__tests__/tags-split-writer.test.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import type { ApiModel, OperationModel } from '../../intermediate-representation/model.js';
-import { tagsSplitWriter } from '../tags-split-writer.js';
-
-function operation(overrides: Partial<OperationModel> = {}): OperationModel {
-  return {
-    name: 'op',
-    method: 'get',
-    path: '/p',
-    pathParams: [],
-    queryParams: [],
-    headerParams: [],
-    successResponses: [],
-    errorResponses: [],
-    security: [],
-    tags: [],
-    ...overrides,
-  };
-}
-
-function model(overrides: Partial<ApiModel> = {}): ApiModel {
-  return {
-    title: 'T',
-    version: '1.0.0',
-    serverUrl: 'https://api.example.com',
-    services: [{ name: 'Default', operations: [] }],
-    schemas: [],
-    securitySchemes: [],
-    ...overrides,
-  };
-}
-
-function run(m: ApiModel) {
-  const files = tagsSplitWriter({ model: m, outputPath: '/out/client.ts', emit: {} });
-  const find = (suffix: string) => files.find((f) => f.path.endsWith(suffix));
-  return { files, paths: files.map((f) => f.path), find };
-}
-
-describe('tagsSplitWriter', () => {
-  it('puts each tag in its own folder, with shared modules at the root', () => {
-    const { paths } = run(
-      model({
-        services: [
-          {
-            name: 'Default',
-            operations: [
-              operation({ name: 'listPets', path: '/pets', tags: ['pets'] }),
-              operation({ name: 'health', path: '/health' }),
-            ],
-          },
-        ],
-      })
-    );
-    expect(paths.sort()).toEqual([
-      '/out/client.http.ts',
-      '/out/client.schemas.ts',
-      '/out/client.ts',
-      '/out/default/client.ts',
-      '/out/pets/client.ts',
-    ]);
-  });
-
-  it('imports shared modules one level up from inside a tag folder', () => {
-    const { find } = run(
-      model({
-        schemas: [{ name: 'Pet', schema: { kind: 'object', properties: [] } }],
-        services: [
-          {
-            name: 'Default',
-            operations: [
-              operation({
-                name: 'getPet',
-                path: '/pets',
-                tags: ['pets'],
-                successResponses: [
-                  {
-                    contentType: 'application/json',
-                    schema: { kind: 'ref', name: 'Pet' },
-                    status: 200,
-                  },
-                ],
-              }),
-            ],
-          },
-        ],
-      })
-    );
-    const pets = find('/out/pets/client.ts')!;
-    expect(pets.content).toContain('import type { Pet } from "../client.schemas.js";');
-    expect(pets.content).toContain(
-      'import { __buildUrl, __config, __request, type RequestOptions } from "../client.http.js";'
-    );
-    expect(pets.content).toContain('export async function getPet(');
-  });
-
-  it('merges per-tag SSE fragments into the barrel using nested folder specifiers', () => {
-    const { find } = run(
-      model({
-        schemas: [{ name: 'Message', schema: { kind: 'object', properties: [] } }],
-        services: [
-          {
-            name: 'Default',
-            operations: [
-              operation({
-                name: 'streamPets',
-                path: '/pets/stream',
-                tags: ['pets'],
-                successResponses: [
-                  {
-                    contentType: 'text/event-stream',
-                    status: 200,
-                    schema: { kind: 'unknown' },
-                    itemSchema: { kind: 'ref', name: 'Message' },
-                  },
-                ],
-              }),
-            ],
-          },
-        ],
-      })
-    );
-    expect(find('/out/pets/client.ts')!.content).toContain('export const __sse_PetsService = {');
-    const entry = find('/out/client.ts')!.content;
-    expect(entry).toContain("import { __sse_PetsService } from './pets/client.js';");
-    expect(entry).toContain('export const sse = { ...__sse_PetsService };');
-  });
-
-  it('barrel re-exports each tag folder file plus shared schemas and setters', () => {
-    const { find } = run(
-      model({
-        securitySchemes: [{ kind: 'bearer', key: 'oauth' }],
-        services: [
-          {
-            name: 'Default',
-            operations: [operation({ name: 'listPets', path: '/pets', tags: ['pets'] })],
-          },
-        ],
-      })
-    );
-    const entry = find('/out/client.ts')!;
-    expect(entry.content).toContain(
-      'export { ApiError, configure, setBearer, setServerUrl, use } from "./client.http.js";'
-    );
-    expect(entry.content).toContain(
-      'export type { AuthCredentials, ClientConfig, Middleware, OperationContext, ParseAs, RequestContext, RequestOptions, RetryConfig, RetryContext, RetryStrategy, TokenProvider } from "./client.http.js";'
-    );
-    expect(entry.content).toContain("export * from './pets/client.js';");
-  });
-});
diff --git a/packages/client-generator/src/writers/__tests__/tags-writer.test.ts b/packages/client-generator/src/writers/__tests__/tags-writer.test.ts
deleted file mode 100644
index 15aebbf7dd..0000000000
--- a/packages/client-generator/src/writers/__tests__/tags-writer.test.ts
+++ /dev/null
@@ -1,245 +0,0 @@
-import type { ApiModel, OperationModel } from '../../intermediate-representation/model.js';
-import { tagsWriter } from '../tags-writer.js';
-
-function operation(overrides: Partial<OperationModel> = {}): OperationModel {
-  return {
-    name: 'op',
-    method: 'get',
-    path: '/p',
-    pathParams: [],
-    queryParams: [],
-    headerParams: [],
-    successResponses: [],
-    errorResponses: [],
-    security: [],
-    tags: [],
-    ...overrides,
-  };
-}
-
-function model(overrides: Partial<ApiModel> = {}): ApiModel {
-  return {
-    title: 'T',
-    version: '1.0.0',
-    serverUrl: 'https://api.example.com',
-    services: [{ name: 'Default', operations: [] }],
-    schemas: [],
-    securitySchemes: [],
-    ...overrides,
-  };
-}
-
-function run(m: ApiModel) {
-  const files = tagsWriter({
-    model: m,
-    outputPath: '/out/client.ts',
-    emit: {},
-  });
-  const find = (suffix: string) => files.find((f) => f.path.endsWith(suffix));
-  return { files, paths: files.map((f) => f.path), find };
-}
-
-describe('tagsWriter', () => {
-  it('emits shared http + schemas, one file per tag, and the barrel entry', () => {
-    const { paths } = run(
-      model({
-        services: [
-          {
-            name: 'Default',
-            operations: [
-              operation({ name: 'listPets', path: '/pets', tags: ['pets'] }),
-              operation({
-                name: 'listOrders',
-                path: '/orders',
-                tags: ['orders'],
-              }),
-              operation({ name: 'health', path: '/health' }),
-            ],
-          },
-        ],
-      })
-    );
-    expect(paths.sort()).toEqual([
-      '/out/client.http.ts',
-      '/out/client.schemas.ts',
-      '/out/client.ts',
-      '/out/default.ts',
-      '/out/orders.ts',
-      '/out/pets.ts',
-    ]);
-  });
-
-  it('places each operation in its first tag file and imports its own helpers', () => {
-    const { find } = run(
-      model({
-        securitySchemes: [{ kind: 'bearer', key: 'oauth' }],
-        services: [
-          {
-            name: 'Default',
-            operations: [
-              operation({ name: 'listPets', path: '/pets', tags: ['pets'] }),
-              operation({
-                name: 'createPet',
-                path: '/pets',
-                method: 'post',
-                tags: ['pets'],
-                security: ['oauth'],
-              }),
-              operation({
-                name: 'listOrders',
-                path: '/orders',
-                tags: ['orders'],
-              }),
-            ],
-          },
-        ],
-      })
-    );
-    const pets = find('pets.ts')!;
-    expect(pets.content).toContain('export async function listPets(');
-    expect(pets.content).toContain('export async function createPet(');
-    // pets has an authed op → it imports __auth; orders does not.
-    expect(pets.content).toContain(
-      'import { __auth, __buildUrl, __config, __request, type RequestOptions } from "./client.http.js";'
-    );
-    const orders = find('orders.ts')!;
-    expect(orders.content).toContain('export async function listOrders(');
-    expect(orders.content).not.toContain('__auth');
-  });
-
-  it('service-class facade emits one <Tag>Service class per tag file', () => {
-    const files = tagsWriter({
-      model: model({
-        services: [
-          {
-            name: 'Default',
-            operations: [
-              operation({ name: 'listPets', path: '/pets', tags: ['pets'] }),
-              operation({
-                name: 'listOrders',
-                path: '/orders',
-                tags: ['orders'],
-              }),
-              operation({ name: 'health', path: '/health' }),
-            ],
-          },
-        ],
-      }),
-      outputPath: '/out/client.ts',
-      emit: { facade: 'service-class' },
-    });
-    const find = (suffix: string) => files.find((f) => f.path.endsWith(suffix))!;
-    expect(find('pets.ts').content).toContain('export class PetsService {');
-    expect(find('orders.ts').content).toContain('export class OrdersService {');
-    // Untagged operations land in a DefaultService.
-    expect(find('default.ts').content).toContain('export class DefaultService {');
-    expect(find('pets.ts').content).not.toContain('export async function');
-    // The class constructor needs the ClientConfig type from the http module.
-    expect(find('pets.ts').content).toContain(
-      'type ClientConfig, type Middleware, type RequestOptions } from "./client.http.js";'
-    );
-    expect(find('pets.ts').content).not.toContain('__config');
-  });
-
-  it('barrel re-exports every tag file plus schemas and the public http surface', () => {
-    const { find } = run(
-      model({
-        schemas: [{ name: 'Pet', schema: { kind: 'object', properties: [] } }],
-        securitySchemes: [{ kind: 'bearer', key: 'oauth' }],
-        services: [
-          {
-            name: 'Default',
-            operations: [operation({ name: 'listPets', path: '/pets', tags: ['pets'] })],
-          },
-        ],
-      })
-    );
-    const entry = find('/out/client.ts')!;
-    expect(entry.content).toContain("export * from './client.schemas.js';");
-    expect(entry.content).toContain(
-      'export { ApiError, configure, setBearer, setServerUrl, use } from "./client.http.js";'
-    );
-    expect(entry.content).toContain(
-      'export type { AuthCredentials, ClientConfig, Middleware, OperationContext, ParseAs, RequestContext, RequestOptions, RetryConfig, RetryContext, RetryStrategy, TokenProvider } from "./client.http.js";'
-    );
-    expect(entry.content).toContain("export * from './pets.js';");
-  });
-
-  it('merges per-tag SSE fragments into the barrel; each tag file exports its own fragment', () => {
-    const sseOp = (name: string, tag: string) =>
-      operation({
-        name,
-        path: `/${tag}/stream`,
-        tags: [tag],
-        successResponses: [
-          {
-            contentType: 'text/event-stream',
-            status: 200,
-            schema: { kind: 'unknown' },
-            itemSchema: { kind: 'ref', name: 'Message' },
-          },
-        ],
-      });
-    const { find } = run(
-      model({
-        schemas: [{ name: 'Message', schema: { kind: 'object', properties: [] } }],
-        services: [
-          {
-            name: 'Default',
-            operations: [sseOp('streamPets', 'pets'), sseOp('streamOrders', 'orders')],
-          },
-        ],
-      })
-    );
-    // Each tag file exposes its own `__sse_<Class>` fragment.
-    expect(find('pets.ts')!.content).toContain('export const __sse_PetsService = {');
-    expect(find('orders.ts')!.content).toContain('export const __sse_OrdersService = {');
-    // The barrel imports the fragments and merges them into the public `sse`.
-    const entry = find('/out/client.ts')!.content;
-    expect(entry).toContain('export const sse = { ...__sse_PetsService, ...__sse_OrdersService };');
-    expect(entry).toContain("import { __sse_PetsService } from './pets.js';");
-  });
-
-  it('service-class facade emits no sse barrel (per-tag classes carry their own .sse)', () => {
-    const files = tagsWriter({
-      model: model({
-        schemas: [{ name: 'Message', schema: { kind: 'object', properties: [] } }],
-        services: [
-          {
-            name: 'Default',
-            operations: [
-              operation({
-                name: 'streamPets',
-                path: '/pets/stream',
-                tags: ['pets'],
-                successResponses: [
-                  {
-                    contentType: 'text/event-stream',
-                    status: 200,
-                    schema: { kind: 'unknown' },
-                    itemSchema: { kind: 'ref', name: 'Message' },
-                  },
-                ],
-              }),
-            ],
-          },
-        ],
-      }),
-      outputPath: '/out/client.ts',
-      emit: { facade: 'service-class' },
-    });
-    const entry = files.find((f) => f.path.endsWith('/out/client.ts'))!;
-    expect(entry.content).not.toContain('export const sse =');
-  });
-
-  it('omits the schemas re-export when there are no schemas and no operations', () => {
-    // No operations ⇒ no OPERATIONS map either, so the schemas module is empty and
-    // the barrel skips its re-export (exercises the `hasSchemas === false` path).
-    const { find } = run(model());
-    const entry = find('/out/client.ts')!;
-    expect(entry.content).not.toContain("export * from './client.schemas.js';");
-    expect(entry.content).toContain(
-      'export { ApiError, configure, setServerUrl, use } from "./client.http.js";'
-    );
-  });
-});
diff --git a/packages/client-generator/src/writers/group-by-tag.ts b/packages/client-generator/src/writers/group-by-tag.ts
deleted file mode 100644
index f49eb5f3cf..0000000000
--- a/packages/client-generator/src/writers/group-by-tag.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import type { ApiModel, OperationModel } from '../intermediate-representation/model.js';
-
-export type TagGroup = {
-  /** The safe file stem for this group (without extension). */
-  stem: string;
-  operations: OperationModel[];
-};
-
-/**
- * Sanitize a tag into a file stem: keep alphanumerics, `_`, and `-`; replace any
- * other character (spaces, slashes, dots) with `-`; collapse repeats; trim edge
- * dashes. Dots are intentionally dropped so a tag can never collide with the
- * `.http`/`.schemas` sibling files. Falls back to `tag` if nothing survives.
- */
-export function sanitizeTagStem(tag: string): string {
-  const stem = tag
-    .replace(/[^A-Za-z0-9_-]/g, '-')
-    .replace(/-+/g, '-')
-    .replace(/^-|-$/g, '');
-  return stem.length > 0 ? stem : 'tag';
-}
-
-/**
- * Group a model's operations into per-file buckets for `tags` / `tags-split`
- * output, using **first-tag assignment**: each operation lands in exactly one
- * group (its first tag, or `default` when untagged). Buckets are returned in
- * first-seen order for deterministic file ordering.
- *
- * Stems are sanitized and de-duplicated (a `-2`, `-3`, … suffix on collision),
- * and the `--output` anchor stem is reserved so a tag can't overwrite the entry
- * or shared files.
- */
-export function groupByTag(model: ApiModel, anchorStem: string): TagGroup[] {
-  const order: string[] = [];
-  const buckets = new Map<string, OperationModel[]>();
-  for (const service of model.services) {
-    for (const op of service.operations) {
-      const key = op.tags[0] ?? '';
-      let bucket = buckets.get(key);
-      if (!bucket) {
-        bucket = [];
-        buckets.set(key, bucket);
-        order.push(key);
-      }
-      bucket.push(op);
-    }
-  }
-
-  const used = new Set<string>([anchorStem]);
-  const groups: TagGroup[] = [];
-  for (const key of order) {
-    const base = key === '' ? 'default' : sanitizeTagStem(key);
-    let stem = base;
-    let n = 2;
-    while (used.has(stem)) stem = `${base}-${n++}`;
-    used.add(stem);
-    groups.push({ stem, operations: buckets.get(key)! });
-  }
-  return groups;
-}
diff --git a/packages/client-generator/src/writers/index.ts b/packages/client-generator/src/writers/index.ts
index f7c55ef16d..5af3ea70d0 100644
--- a/packages/client-generator/src/writers/index.ts
+++ b/packages/client-generator/src/writers/index.ts
@@ -1,7 +1,5 @@
 import { singleFileWriter } from './single-file-writer.js';
 import { splitWriter } from './split-writer.js';
-import { tagsSplitWriter } from './tags-split-writer.js';
-import { tagsWriter } from './tags-writer.js';
 import type { OutputMode, Writer } from './types.js';
 
 export type { GeneratedFile, OutputMode, Writer, WriterInput } from './types.js';
@@ -9,8 +7,6 @@ export type { GeneratedFile, OutputMode, Writer, WriterInput } from './types.js'
 const WRITERS: Record<OutputMode, Writer> = {
   single: singleFileWriter,
   split: splitWriter,
-  tags: tagsWriter,
-  'tags-split': tagsSplitWriter,
 };
 
 /** Select the writer for an output mode. */
diff --git a/packages/client-generator/src/writers/single-file-writer.ts b/packages/client-generator/src/writers/single-file-writer.ts
index f75e1762db..2cd55c7a67 100644
--- a/packages/client-generator/src/writers/single-file-writer.ts
+++ b/packages/client-generator/src/writers/single-file-writer.ts
@@ -1,11 +1,11 @@
-import { emitSingleFile } from '../emitters/client.js';
+import { emitClientSingleFile } from '../emitters/package-client.js';
 import type { Writer } from './types.js';
 
 /**
- * The default writer: the whole client in one file at the `--output` path.
- * Delegates straight to `emitSingleFile`, so its output is unchanged from before
- * the writer seam existed.
+ * The default writer: the whole client in one file at the `--output` path. The shared
+ * emitter branches on `emit.runtime` internally — `inline` (the default) embeds the
+ * runtime sources, `package` imports them from `@redocly/client-generator`.
  */
-export const singleFileWriter: Writer = ({ model, outputPath, emit }) => {
-  return [{ path: outputPath, content: emitSingleFile(model, emit) }];
-};
+export const singleFileWriter: Writer = ({ model, outputPath, emit }) => [
+  { path: outputPath, content: emitClientSingleFile(model, emit) },
+];
diff --git a/packages/client-generator/src/writers/split-writer.ts b/packages/client-generator/src/writers/split-writer.ts
index 6b013c098d..b46307ae75 100644
--- a/packages/client-generator/src/writers/split-writer.ts
+++ b/packages/client-generator/src/writers/split-writer.ts
@@ -1,40 +1,25 @@
 import { join } from 'node:path';
 
-import { emitModules, moduleSpecifier } from '../emitters/client.js';
-import { joinSections } from '../emitters/support.js';
+import { emitClientSplit } from '../emitters/package-client.js';
 import type { Writer } from './types.js';
-import { allOperations, anchor } from './util.js';
+import { anchor } from './util.js';
 
 /**
- * `split` mode: three sibling files derived from the `--output` anchor.
+ * `split` mode: two sibling files derived from the `--output` anchor, for both
+ * runtime distributions.
  *
- *   <stem>.http.ts     shared runtime + auth state + public setters
  *   <stem>.schemas.ts  model types, enums, const-objects, and type guards
- *   <stem>.ts          endpoints + the entry that re-exports the public surface
+ *   <stem>.ts          everything else (runtime, wiring, client, sugar), which
+ *                      `export *`s the schemas module and type-imports exactly
+ *                      the schema names it references
  *
- * The endpoints file imports exactly the types it references (from the schemas
- * module) and exactly the runtime helpers it uses (from the http module), so each
- * file type-checks cleanly under `noUnusedLocals`.
+ * The schemas file is skipped entirely when the document declares no schemas.
  */
 export const splitWriter: Writer = ({ model, outputPath, emit }) => {
   const { dir, stem } = anchor(outputPath);
-  const m = emitModules(model, emit);
-  const ops = allOperations(model.services);
-
-  const reexports: string[] = [];
-  if (m.hasSchemas) reexports.push(`export * from '${moduleSpecifier(stem, 'schemas')}';`);
-  reexports.push(m.publicReexport(stem));
-
-  const entryContent = joinSections([
-    m.header,
-    m.endpointImports(ops, stem),
-    reexports.join('\n'),
-    m.operations,
-  ]);
-
+  const { entry, schemas } = emitClientSplit(model, emit, stem);
   return [
-    { path: join(dir, `${stem}.http.ts`), content: m.http(stem) },
-    { path: join(dir, `${stem}.schemas.ts`), content: m.schemas },
-    { path: outputPath, content: entryContent },
+    ...(schemas === undefined ? [] : [{ path: join(dir, `${stem}.schemas.ts`), content: schemas }]),
+    { path: outputPath, content: entry },
   ];
 };
diff --git a/packages/client-generator/src/writers/tagged.ts b/packages/client-generator/src/writers/tagged.ts
deleted file mode 100644
index 062bddf709..0000000000
--- a/packages/client-generator/src/writers/tagged.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { join } from 'node:path';
-
-import { emitModules, moduleSpecifier, serviceClassName } from '../emitters/client.js';
-import { joinSections } from '../emitters/support.js';
-import { groupByTag } from './group-by-tag.js';
-import type { GeneratedFile, WriterInput } from './types.js';
-import { anchor } from './util.js';
-
-/**
- * Shared builder for the two tag-based layouts:
- *
- * - `nested = false` → `tags` mode: one `<tag>.ts` per tag beside the shared
- *   `<stem>.http.ts` / `<stem>.schemas.ts`.
- * - `nested = true` → `tags-split` mode: a `<tag>/<stem>.ts` folder per tag, with
- *   the shared modules still at the root.
- *
- * Both share the root http + schemas modules and a `<stem>.ts` barrel entry that
- * re-exports everything; only the per-tag file paths and their relative imports
- * differ. Operations are grouped first-tag-wins; untagged → `default`.
- */
-export function buildTaggedClient(
-  { model, outputPath, emit }: WriterInput,
-  nested: boolean
-): GeneratedFile[] {
-  const { dir, stem } = anchor(outputPath);
-  const m = emitModules(model, emit);
-  const groups = groupByTag(model, stem);
-  const importPrefix = nested ? '../' : './';
-
-  const files: GeneratedFile[] = [
-    { path: join(dir, `${stem}.http.ts`), content: m.http(stem) },
-    { path: join(dir, `${stem}.schemas.ts`), content: m.schemas },
-  ];
-
-  for (const group of groups) {
-    const operations = m.renderEndpoints(group.operations, serviceClassName(group.stem));
-    const path = nested ? join(dir, group.stem, `${stem}.ts`) : join(dir, `${group.stem}.ts`);
-    files.push({
-      path,
-      content: joinSections([
-        m.header,
-        m.endpointImports(group.operations, stem, importPrefix),
-        operations,
-      ]),
-    });
-  }
-
-  const reexports: string[] = [];
-  if (m.hasSchemas) reexports.push(`export * from '${moduleSpecifier(stem, 'schemas')}';`);
-  reexports.push(m.publicReexport(stem));
-  for (const group of groups) {
-    const spec = nested ? `./${group.stem}/${stem}.js` : `./${group.stem}.js`;
-    reexports.push(`export * from '${spec}';`);
-  }
-  // Functions facade: per-tag SSE aggregates aren't `export *`-reachable (they're
-  // named `__sse_<Class>`), so merge them into a single barrel-level `sse`.
-  const sseBarrel = m.sseBarrel(
-    groups.map((group) => ({
-      tagStem: group.stem,
-      moduleSpec: nested ? `./${group.stem}/${stem}.js` : `./${group.stem}.js`,
-      ops: group.operations,
-    }))
-  );
-  if (sseBarrel) reexports.push(sseBarrel);
-  files.push({ path: outputPath, content: joinSections([m.header, reexports.join('\n')]) });
-
-  return files;
-}
diff --git a/packages/client-generator/src/writers/tags-split-writer.ts b/packages/client-generator/src/writers/tags-split-writer.ts
deleted file mode 100644
index 2d6e7e94ff..0000000000
--- a/packages/client-generator/src/writers/tags-split-writer.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { buildTaggedClient } from './tagged.js';
-import type { Writer } from './types.js';
-
-/**
- * `tags-split` mode: a `<tag>/<stem>.ts` folder per OpenAPI tag (untagged →
- * `default/<stem>.ts`), with the shared `<stem>.http.ts` and `<stem>.schemas.ts`
- * at the root and a `<stem>.ts` barrel entry. Schemas stay shared at the root
- * (they are not partitioned per tag).
- */
-export const tagsSplitWriter: Writer = (input) => buildTaggedClient(input, true);
diff --git a/packages/client-generator/src/writers/tags-writer.ts b/packages/client-generator/src/writers/tags-writer.ts
deleted file mode 100644
index bb8f5b16b7..0000000000
--- a/packages/client-generator/src/writers/tags-writer.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { buildTaggedClient } from './tagged.js';
-import type { Writer } from './types.js';
-
-/**
- * `tags` mode: shared `<stem>.http.ts` + `<stem>.schemas.ts`, one `<tag>.ts`
- * endpoints file per OpenAPI tag (untagged → `default.ts`), and a `<stem>.ts`
- * barrel that re-exports every tag file, the schemas, and the public setters.
- */
-export const tagsWriter: Writer = (input) => buildTaggedClient(input, false);
diff --git a/packages/client-generator/src/writers/types.ts b/packages/client-generator/src/writers/types.ts
index b32170721e..e20c6b3d6c 100644
--- a/packages/client-generator/src/writers/types.ts
+++ b/packages/client-generator/src/writers/types.ts
@@ -5,11 +5,10 @@ import type { ApiModel } from '../intermediate-representation/model.js';
  * How the generated client is partitioned across files.
  *
  * - `single` (default): one self-contained file.
- * - `split`: endpoints, schemas, and the shared HTTP runtime in sibling files.
- * - `tags`: one endpoints file per OpenAPI tag; shared schemas + runtime.
- * - `tags-split`: a folder per tag; shared schemas + runtime at the root.
+ * - `split`: schema types + guards in a sibling `<stem>.schemas.ts`; everything
+ *   else in the entry file, which re-exports the schemas module.
  */
-export type OutputMode = 'single' | 'split' | 'tags' | 'tags-split';
+export type OutputMode = 'single' | 'split';
 
 /** A single file the generator will write to disk. */
 export type GeneratedFile = { path: string; content: string };
@@ -27,6 +26,6 @@ export type WriterInput = {
 /**
  * A Writer turns the IR + emit options into the set of files to write. This is
  * the one seam output modes vary at; the emitter (which renders code) stays
- * mode-agnostic. Future Phase D facades (functions, framework hooks) plug in here.
+ * mode-agnostic.
  */
 export type Writer = (input: WriterInput) => GeneratedFile[];
diff --git a/packages/core/src/__tests__/__snapshots__/redocly-yaml.test.ts.snap b/packages/core/src/__tests__/__snapshots__/redocly-yaml.test.ts.snap
index 404c69c770..599cd5bb91 100644
--- a/packages/core/src/__tests__/__snapshots__/redocly-yaml.test.ts.snap
+++ b/packages/core/src/__tests__/__snapshots__/redocly-yaml.test.ts.snap
@@ -237,12 +237,6 @@ exports[`createConfigTypes > matches snapshot for the default config schema 1`]
           "result",
         ],
       },
-      "facade": {
-        "enum": [
-          "functions",
-          "service-class",
-        ],
-      },
       "generators": {
         "items": {
           "type": "string",
@@ -258,15 +252,10 @@ exports[`createConfigTypes > matches snapshot for the default config schema 1`]
       "mockSeed": {
         "type": "number",
       },
-      "name": {
-        "type": "string",
-      },
       "outputMode": {
         "enum": [
           "single",
           "split",
-          "tags",
-          "tags-split",
         ],
       },
       "queryFramework": {
@@ -277,6 +266,12 @@ exports[`createConfigTypes > matches snapshot for the default config schema 1`]
           "solid",
         ],
       },
+      "runtime": {
+        "enum": [
+          "inline",
+          "package",
+        ],
+      },
       "serverUrl": {
         "type": "string",
       },
diff --git a/packages/core/src/types/redocly-yaml.ts b/packages/core/src/types/redocly-yaml.ts
index b8784ca540..4887baebbc 100644
--- a/packages/core/src/types/redocly-yaml.ts
+++ b/packages/core/src/types/redocly-yaml.ts
@@ -350,11 +350,10 @@ const ConfigHTTP: NodeType = {
 const Client: NodeType = {
   properties: {
     generators: { type: 'array', items: { type: 'string' } },
-    facade: { enum: ['functions', 'service-class'] },
-    name: { type: 'string' },
     argsStyle: { enum: ['flat', 'grouped'] },
     serverUrl: { type: 'string' },
-    outputMode: { enum: ['single', 'split', 'tags', 'tags-split'] },
+    outputMode: { enum: ['single', 'split'] },
+    runtime: { enum: ['inline', 'package'] },
     enumStyle: { enum: ['union', 'const-object'] },
     errorMode: { enum: ['throw', 'result'] },
     dateType: { enum: ['string', 'Date'] },
diff --git a/tests/e2e/generate-client/args-grouped.test.ts b/tests/e2e/generate-client/args-grouped.test.ts
index b7c428ef8e..34db9ff56a 100644
--- a/tests/e2e/generate-client/args-grouped.test.ts
+++ b/tests/e2e/generate-client/args-grouped.test.ts
@@ -1,12 +1,13 @@
 /**
- * E2E for `--args-style grouped`: every operation takes a single `vars:
- * <Op>Variables` object bundling its inputs (path params, query `params`, `body`,
- * header `headers`) instead of positional arguments, while the per-call request
- * `init` stays a separate trailing argument.
+ * E2E for `--args-style grouped`: instead of flat positional call sugar, the
+ * operations are exported by destructuring the client (`export const { getOrderById,
+ * ... } = client;`), so every operation takes the grouped args object (path params,
+ * query `params`, `body`, header `headers`) with the per-call request `init` as a
+ * separate trailing argument — the client method signature itself.
  *
  * The generated single file must compile under strict `tsc` with
- * `--noUnusedLocals`, which proves the `vars.*` member references line up with
- * the `<Op>Variables` aliases. Uses cafe.yaml because it exercises path params,
+ * `--noUnusedLocals`, which proves the grouped members line up with the
+ * `<Op>Variables` aliases. Uses cafe.yaml because it exercises path params,
  * query params, request bodies, header params, and auth together.
  */
 import { spawnSync } from 'node:child_process';
@@ -35,7 +36,7 @@ describe('generate-client end-to-end (--args-style grouped)', () => {
     }
   });
 
-  test('emits a single `vars` object per operation with the inputs as members', () => {
+  test('exports the operations by destructuring the client (grouped args = client methods)', () => {
     const result = spawnSync(
       'node',
       [cliEntry, 'generate-client', fixture, '--output', entry, '--args-style', 'grouped'],
@@ -46,16 +47,15 @@ describe('generate-client end-to-end (--args-style grouped)', () => {
 
     const src = readFileSync(entry, 'utf-8');
 
-    // getOrderById has a single `orderId` path param: grouped mode bundles it into
-    // a required `vars: GetOrderByIdVariables` and reads it back as `vars.orderId`.
-    expect(src).toContain('export async function getOrderById(vars: GetOrderByIdVariables,');
-    expect(src).toContain('${encodeURIComponent(String(vars.orderId))}');
+    // Grouped mode re-exports the client methods directly — one destructure export.
+    expect(src).toMatch(/export const \{ [^}]*getOrderById[^}]* \} = client;/);
+    // The grouped `<Op>Variables` aliases are still emitted for consumers.
+    expect(src).toContain('export type GetOrderByIdVariables = {');
+    // getOrderById's grouped args carry the path param as a member in Ops.
+    expect(src).toMatch(/getOrderById: \{\s*args: \{[\s\S]*?orderId: string;/);
 
-    // The per-call `init` stays a separate trailing argument (not folded into vars).
-    expect(src).toContain('init: RequestOptions = {})');
-
-    // No positional `orderId: string` argument leaks through in grouped mode.
-    expect(src).not.toContain('getOrderById(orderId: string');
+    // No flat positional sugar leaks through in grouped mode.
+    expect(src).not.toContain('export const getOrderById = (orderId: string');
   }, 90_000);
 
   test('the grouped-style client type-checks under strict mode with no unused locals', () => {
diff --git a/tests/e2e/generate-client/auth.test.ts b/tests/e2e/generate-client/auth.test.ts
index 49efd32253..43dc61adbe 100644
--- a/tests/e2e/generate-client/auth.test.ts
+++ b/tests/e2e/generate-client/auth.test.ts
@@ -50,44 +50,54 @@ describe('generate-client auth breadth (auth.yaml)', () => {
   it('emits all five injectable scheme kinds and strict-tsc accepts the single-file client', () => {
     const generated = generateSingleFile();
 
-    // Token machinery for the resolvable (bearer + apiKey) schemes.
+    // Token machinery for the resolvable (bearer + apiKey) schemes lives in the embedded runtime.
     expect(generated).toContain('export type TokenProvider');
-    expect(generated).toContain('async function __auth');
-    expect(generated).toContain('async function __resolve');
-
-    // One setter per scheme kind. Three apiKey schemes (none sole) → keyed names.
-    expect(generated).toContain('export function setBearer(token: TokenProvider | null)');
-    expect(generated).toContain('export function setBasicAuth(username: string, password: string)');
-    expect(generated).toContain('export function setApiKeyQueryKey(key: TokenProvider | null)'); // query
-    expect(generated).toContain('export function setApiKeyHeaderKey(key: TokenProvider | null)'); // header
-    expect(generated).toContain('export function setApiKeyCookieKey(key: TokenProvider | null)'); // cookie
-    expect(generated).toContain('__basicAuth = btoa(`${username}:${password}`)');
-
-    // Per-kind injection inside __auth — each prefers per-instance config.auth, then the global slot.
-    expect(generated).toContain('headers["Authorization"] = `Bearer ${v}`');
+    expect(generated).toContain('async function resolveAuth(');
+    expect(generated).toContain('async function resolveToken(');
+
+    // One setter per scheme kind, as instance-bound sugar. Three apiKey schemes (none sole) → keyed names.
+    expect(generated).toContain('export const setBearer = client.auth.bearer;');
+    expect(generated).toContain('export const setBasicAuth = client.auth.basic;');
+    expect(generated).toContain(
+      'export const setApiKeyQueryKey = (value: TokenProvider) => client.auth.apiKey("QueryKey", value);'
+    );
+    expect(generated).toContain(
+      'export const setApiKeyHeaderKey = (value: TokenProvider) => client.auth.apiKey("HeaderKey", value);'
+    );
+    expect(generated).toContain(
+      'export const setApiKeyCookieKey = (value: TokenProvider) => client.auth.apiKey("CookieKey", value);'
+    );
+
+    // Per-kind injection inside resolveAuth, driven by the descriptors' security specs.
+    expect(generated).toContain('headers.Authorization = `Bearer ${await resolveToken(provider)}`');
     expect(generated).toContain(
-      'const basic = b ? btoa(`${b.username}:${b.password}`) : __basicAuth;'
+      'headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`'
     );
-    expect(generated).toContain('headers["Authorization"] = `Basic ${basic}`');
-    expect(generated).toContain('query["api_key"] = v'); // apiKeyQuery
-    expect(generated).toContain('cookies.push("sid=" + v)'); // apiKeyCookie
-    expect(generated).toContain('headers["X-Key"] = v'); // apiKeyHeader
+    expect(generated).toContain("if (scheme.in === 'header') headers[scheme.name] = value;");
+    expect(generated).toContain("else if (scheme.in === 'query') query[scheme.name] = value;");
+    expect(generated).toContain('else cookies.push(`${scheme.name}=${value}`);');
 
     // Per-instance credentials type + ClientConfig field.
     expect(generated).toContain('export type AuthCredentials = {');
     expect(generated).toContain('auth?: AuthCredentials;');
 
-    // Authed operations resolve credentials at the call site (threading the config).
-    expect(generated).toContain('const __a = await __auth(["Bearer"], __config);');
-    expect(generated).toContain('const __a = await __auth(["HeaderKey"], __config);'); // header-kind awaits too
-    expect(generated).toContain('...__a.headers');
-    // Query-auth merges into the URL query object.
-    expect(generated).toContain('{ ...params, ...__a.query }');
+    // Every scheme kind is denormalized onto its operation descriptor.
+    expect(generated).toContain('security: [{ scheme: "Bearer", kind: "bearer" }]');
+    expect(generated).toContain('security: [{ scheme: "Basic", kind: "basic" }]');
+    expect(generated).toContain(
+      'security: [{ scheme: "QueryKey", kind: "apiKey", name: "api_key", in: "query" }]'
+    );
+    expect(generated).toContain(
+      'security: [{ scheme: "CookieKey", kind: "apiKey", name: "sid", in: "cookie" }]'
+    );
+    expect(generated).toContain(
+      'security: [{ scheme: "HeaderKey", kind: "apiKey", name: "X-Key", in: "header" }]'
+    );
   }, 60_000);
 
-  it('strict-tsc accepts the tags-split multi-file client (guards multi-file auth)', () => {
-    // Multi-file modes derive their folder from a `.ts` entry path, so --output
-    // must still point at a file; the generator fans out the tree around it.
+  it('strict-tsc accepts the split two-file client (guards multi-file auth)', () => {
+    // Split mode derives its folder from a `.ts` entry path, so --output
+    // must still point at a file; the generator emits the schemas file beside it.
     const dir = mkdtempSync(join(tmpdir(), 'ots-auth-split-'));
     const res = spawnSync(
       'node',
@@ -98,7 +108,7 @@ describe('generate-client auth breadth (auth.yaml)', () => {
         '--output',
         join(dir, 'client.ts'),
         '--output-mode',
-        'tags-split',
+        'split',
       ],
       { encoding: 'utf-8', cwd: repoRoot }
     );
@@ -116,11 +126,11 @@ describe('generate-client auth breadth (auth.yaml)', () => {
   // Behavioral check on a real wire. The cafe mock-server harness is bound to
   // cafe.yaml and heavy to clone, so we drive the generated client against a tiny
   // throwaway http server instead — enough to prove (a) an async `setBearer`
-  // token function resolves through `await __auth` onto the `Authorization`
-  // header and (b) a query-key scheme lands `api_key=` in the request URL.
+  // token function resolves through the runtime's auth capability onto the
+  // `Authorization` header and (b) a query-key scheme lands `api_key=` in the URL.
   it('async setBearer resolves onto Authorization and query-key lands in the URL', () => {
-    // The driver owns its own throwaway http server (and binds BASE to it at
-    // runtime via setServerUrl), so a single `spawnSync` runs the whole behavioral
+    // The driver owns its own throwaway http server (and points the client at it
+    // via configure({ serverUrl })), so a single `spawnSync` runs the whole behavioral
     // probe — the server can't be starved by the test process's blocking spawn.
     const dir = mkdtempSync(join(tmpdir(), 'ots-auth-run-'));
     const out = join(dir, 'client.ts');
@@ -135,7 +145,7 @@ describe('generate-client auth breadth (auth.yaml)', () => {
       driver,
       outdent`
         import * as http from 'node:http';
-        import { getBearer, getQuery, setServerUrl, setBearer, setApiKeyQueryKey } from './client.js';
+        import { configure, getBearer, getQuery, setBearer, setApiKeyQueryKey } from './client.js';
 
         const captured: Array<{ url: string; auth?: string }> = [];
         const server = http.createServer((req, res) => {
@@ -147,7 +157,7 @@ describe('generate-client auth breadth (auth.yaml)', () => {
         async function main() {
           await new Promise<void>((r) => server.listen(0, '127.0.0.1', r));
           const port = (server.address() as { port: number }).port;
-          setServerUrl('http://127.0.0.1:' + port);
+          configure({ serverUrl: 'http://127.0.0.1:' + port });
           setBearer(async () => 'tok');
           await getBearer();
           setApiKeyQueryKey('secret-key');
diff --git a/tests/e2e/generate-client/base-consumer/api.ts b/tests/e2e/generate-client/base-consumer/api.ts
index 639ab7fba2..d7f8573f29 100644
--- a/tests/e2e/generate-client/base-consumer/api.ts
+++ b/tests/e2e/generate-client/base-consumer/api.ts
@@ -95,585 +95,912 @@ export function isPetBulkErrorItem(value: PetBulkSuccessItem | PetBulkErrorItem)
     return (value as Record<string, unknown>)["status"] === "error";
 }
 
-/**
- * Static metadata for every operation, keyed by operationId: the HTTP `method`
- * and the `path` template (with `{param}` placeholders intact). Minification-safe
- * — useful for building cache/query keys, tracing span names, and request logging
- * without re-deriving them at each call site.
- */
-export const OPERATIONS = {
-    getPetById: { method: "GET", path: "/pets/{id}", tags: [] },
-    listPets: { method: "GET", path: "/pets", tags: [] },
-    createPet: { method: "POST", path: "/pets", tags: [] },
-    getSlowPet: { method: "GET", path: "/pets/{id}/cancel-test", tags: [] },
-    search: { method: "POST", path: "/search", tags: [] },
-    bulkUpsertPets: { method: "POST", path: "/pets/bulk", tags: [] },
-    getStatus: { method: "GET", path: "/status", tags: [] }
-} as const;
+export type GetPetByIdResult = Pet;
 
-/**
- * The operationId of any operation in this client.
- */
-export type OperationId = keyof typeof OPERATIONS;
+export type GetPetByIdVariables = {
+    id: number;
+};
 
-/**
- * Static metadata describing one operation: its HTTP method, path template, and tags.
- */
-export type OperationMetadata = {
-    readonly method: string;
-    readonly path: string;
-    readonly tags: readonly string[];
+export type ListPetsResult = Pet[];
+
+export type ListPetsParams = {
+    /**
+     * Object-valued filter serialized as deepObject.
+     */
+    filter?: PetFilter;
 };
 
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+export type ListPetsVariables = {
+    params?: ListPetsParams;
+};
+
+export type CreatePetResult = Pet;
 
-let BASE = "http://localhost:3102";
+export type CreatePetBody = Omit<Pet, "id">;
 
-/** Identity of the operation a request belongs to. Stable across path interpolation. */
-export type OperationContext = {
-    id: OperationId;
-    path: OperationPath;
-    tags: string[];
+export type CreatePetVariables = {
+    body: CreatePetBody;
+};
+
+export type GetSlowPetResult = Pet;
+
+export type GetSlowPetVariables = {
+    id: number;
+};
+
+export type SearchBody = PetFilter;
+
+export type SearchVariables = {
+    body: SearchBody;
 };
 
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
-export type RequestContext = {
-    url: string;
-    method: string;
-    headers: Record<string, string>;
-    body?: unknown;
-    /** The operation being called: its id (operationId), path template, and tags. */
-    operation: OperationContext;
+export type BulkUpsertPetsResult = PetBulkResult;
+
+export type BulkUpsertPetsBody = Pet[];
+
+export type BulkUpsertPetsVariables = {
+    body: BulkUpsertPetsBody;
 };
 
 /**
- * Configuration and extension hooks for a client. Supplied per-instance via
- * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
- * (functions facade).
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
  */
-export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
-    serverUrl?: string;
-    /** Extra headers merged into every request; a function is invoked per request. */
-    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
-    /** Transport used to issue requests. Defaults to the global `fetch`. */
-    fetch?: typeof fetch;
-    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    /** Observe — or replace, by returning a `Response` — the response before parsing. */
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    /**
-     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
-     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
-     */
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
-    /**
-     * Composable interceptors run around every request, alongside the single
-     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
-     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
-     * the last-registered middleware wraps closest to the network. Register more at runtime
-     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
-     */
-    middleware?: Middleware[];
-    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
-    retry?: RetryConfig;
+export type Ops = {
+    getPetById: {
+        args: {
+            id: number;
+        };
+        result: GetPetByIdResult;
+    };
+    listPets: {
+        args: {
+            params?: ListPetsParams;
+        };
+        result: ListPetsResult;
+    };
+    createPet: {
+        args: {
+            body: CreatePetBody;
+        };
+        result: CreatePetResult;
+    };
+    getSlowPet: {
+        args: {
+            id: number;
+        };
+        result: GetSlowPetResult;
+    };
+    search: {
+        args: {
+            body: SearchBody;
+        };
+        result: SearchResult;
+    };
+    bulkUpsertPets: {
+        args: {
+            body: BulkUpsertPetsBody;
+        };
+        result: BulkUpsertPetsResult;
+    };
+    getStatus: {
+        args: {};
+        result: Pet;
+    };
 };
 
 /**
- * A request interceptor; every field is optional, so a middleware can hook any subset of
- * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
- * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
- * failure into the error to throw, threaded through each middleware in turn.
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    getPetById: { id: "getPetById", method: "GET", path: "/pets/{id}", params: [{ name: "id", in: "path" }] },
+    listPets: { id: "listPets", method: "GET", path: "/pets", params: [{ name: "filter", in: "query", style: "deepObject", explode: true }] },
+    createPet: { id: "createPet", method: "POST", path: "/pets", body: { contentType: "application/json" } },
+    getSlowPet: { id: "getSlowPet", method: "GET", path: "/pets/{id}/cancel-test", params: [{ name: "id", in: "path" }] },
+    search: { id: "search", method: "POST", path: "/search", body: { contentType: "application/json" } },
+    bulkUpsertPets: { id: "bulkUpsertPets", method: "POST", path: "/pets/bulk", body: { contentType: "application/json" } },
+    getStatus: { id: "getStatus", method: "GET", path: "/status" }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
  */
-export type Middleware = {
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
 };
 
 /** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
 export type RetryStrategy = 'fixed' | 'exponential';
 
-/** Context handed to `retryOn` for the attempt that just failed. */
-export type RetryContext = {
-    /** 1-based number of the attempt that just failed. */
-    attempt: number;
-    /** The request that was attempted. */
-    request: RequestContext;
-    /** Present when the server returned a (non-ok) response. */
-    response?: Response;
-    /** Present when the transport threw (network error, DNS, connection reset). */
-    error?: unknown;
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
 };
 
-/** Retry policy; all fields optional with sensible defaults. */
-export type RetryConfig = {
-    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
-    retries?: number;
-    /** Base delay in milliseconds. Default 1000. */
-    retryDelay?: number;
-    /** Backoff shape. Default 'exponential'. */
-    retryStrategy?: RetryStrategy;
-    /** Apply full jitter over the computed delay. Default true. */
-    jitter?: boolean;
-    /**
-     * Decide whether to retry a failed attempt. Default: retry only idempotent
-     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
-     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
-     */
-    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
 };
 
 /**
- * How the response body is read. `'auto'` negotiates from the content type (the
- * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
  */
-export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
 
-/**
- * The trailing per-operation argument: standard `RequestInit` plus an optional
- * per-call retry override and a `parseAs` escape hatch.
- *
- * `parseAs` forces how the response body is read; overrides the inferred kind.
- * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
- * override — the static return type is unchanged.
- */
-export type RequestOptions = RequestInit & {
-    retry?: Partial<RetryConfig>;
-    parseAs?: ParseAs;
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
 };
 
-/**
- * Override the base URL used by every generated operation. Useful when the
- * runtime environment differs from the value declared in `servers[0].url`
- * (e.g. dev / staging / prod toggles in a single-page app).
- *
- * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ serverUrl })`.
- */
-export function setServerUrl(url: string): void {
-    BASE = url;
-}
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
 
-/** The global config used by the functions facade (see `configure`). */
-const __config: ClientConfig = {};
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
+export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
 
 /**
- * Merge `config` into the global configuration used by the functions facade —
- * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
- * hooks once for every free function. The service-class facade configures per
- * instance instead (`new Client(config)`).
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
  */
-export function configure(config: ClientConfig): void {
-    Object.assign(__config, config);
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : NoRequiredKeys<Ops[K]['args']> extends true
+      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
 }
 
-/**
- * Append interceptors to the functions facade's global middleware chain (see
- * `ClientConfig.middleware`). The service-class facade registers per instance via
- * `<Client>.use(...)` instead.
- */
-export function use(...middleware: Middleware[]): void {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    __config.middleware = [...(__config.middleware ?? []), ...middleware];
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
 }
 
 /**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
  */
-function __middleware(config: ClientConfig): Middleware[] {
-    const single = config.onRequest || config.onResponse || config.onError
-        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-        : [];
-    return [...single, ...(config.middleware ?? [])];
-}
-
-export class ApiError extends Error {
-    public readonly url: string;
-    public readonly status: number;
-    public readonly statusText: string;
-    public readonly body: unknown;
-    constructor(url: string, status: number, statusText: string, body: unknown) {
-        super(`Request failed with status ${status}`);
-        this.name = 'ApiError';
-        this.url = url;
-        this.status = status;
-        this.statusText = statusText;
-        this.body = body;
-    }
-}
-
-type QueryPrimitive = string | number | boolean;
-
-type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
-
-/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
 type QueryStyle = {
-    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-    explode: boolean;
-    allowReserved?: boolean;
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
 };
 
 /**
- * Percent-encode `value` but leave the RFC-3986 reserved set
- * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
  */
-function __encodeReserved(value: string): string {
-    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
 }
 
-function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
-    if (!query)
-        return url;
-    const params = new URLSearchParams();
-    const raw: string[] = [];
-    for (const [key, value] of Object.entries(query)) {
-        if (value === undefined || value === null)
-            continue;
-        const spec = styles?.[key];
-        if (!spec) {
-            if (Array.isArray(value)) {
-                for (const v of value) {
-                    if (v !== undefined && v !== null)
-                        params.append(key, String(v));
-                }
-            }
-            else if (typeof value === 'object') {
-                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-                for (const [subKey, subValue] of Object.entries(value)) {
-                    if (subValue !== undefined && subValue !== null) {
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                    }
-                }
-            }
-            else {
-                params.append(key, String(value));
-            }
-            continue;
-        }
-        if (Array.isArray(value)) {
-            const items = value.filter((v) => v !== undefined && v !== null).map(String);
-            if (spec.style === 'form' && spec.explode) {
-                for (const v of items) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}=${__encodeReserved(v)}`);
-                    else
-                        params.append(key, v);
-                }
-            }
-            else {
-                // Delimited styles put the LITERAL delimiter on the wire; only the
-                // values are encoded. `%20` (not `+`) is the literal space delimiter.
-                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
-                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-            }
-        }
-        else if (typeof value === 'object') {
-            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-            for (const [subKey, subValue] of Object.entries(value)) {
-                if (subValue !== undefined && subValue !== null) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
-                    else
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                }
-            }
-        }
-        else if (spec.allowReserved) {
-            raw.push(`${key}=${__encodeReserved(String(value))}`);
-        }
-        else {
-            params.append(key, String(value));
-        }
-    }
-    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-    return qs ? `${url}?${qs}` : url;
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
 }
 
-async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
-    response: Response;
-    context: RequestContext;
-}> {
-    const { retry: callRetry, ...fetchInit } = init;
-    const retry: RetryConfig = { ...config.retry, ...callRetry };
-    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-    const headers: Record<string, string> = {
-        Accept: 'application/json',
-        ...extra,
-        ...(fetchInit.headers as Record<string, string> | undefined),
-    };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
-    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-    let payload: BodyInit | undefined;
-    if (context.body !== undefined) {
-        const value = context.body;
-        const isBinary = value instanceof Blob ||
-            value instanceof ArrayBuffer ||
-            ArrayBuffer.isView(value as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-        const isURLSearchParams = value instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-            payload = value as BodyInit;
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
         }
-        else {
-            payload = JSON.stringify(value);
-            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-                context.headers['Content-Type'] = 'application/json';
-            }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
         }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
     }
-    const doFetch = config.fetch ?? fetch;
-    const maxAttempts = 1 + (retry.retries ?? 0);
-    const retryOn = retry.retryOn ?? __defaultRetryOn;
-    const signal = fetchInit.signal ?? undefined;
-    let attempt = 0;
-    while (true) {
-        attempt++;
-        if (signal?.aborted)
-            throw __abortError(signal);
-        let response: Response;
-        try {
-            response = await doFetch(context.url, {
-                ...fetchInit,
-                method: context.method,
-                headers: context.headers,
-                body: payload,
-            });
-        }
-        catch (error) {
-            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
-                await __sleep(__retryDelay(retry, attempt, null), signal);
-                continue;
-            }
-            throw error;
-        }
-        // Reverse order: the last-registered middleware wraps closest to the network (onion).
-        for (let i = middleware.length - 1; i >= 0; i--) {
-            const onResponse = middleware[i].onResponse;
-            if (onResponse) {
-                const replaced = await onResponse(response, context);
-                if (replaced)
-                    response = replaced;
-            }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
         }
-        if (!response.ok &&
-            attempt < maxAttempts &&
-            !signal?.aborted &&
-            (await retryOn({ attempt, request: context, response }))) {
-            const retryAfter = response.headers.get('retry-after');
-            // Drain the abandoned response body before the next attempt: an unread body
-            // keeps the connection checked out (and can stall the pool) under Node/undici
-            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-            await response.body?.cancel().catch(() => undefined);
-            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
-            continue;
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
         }
-        return { response, context };
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
     }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
 }
 
-async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-    if (kind === 'void' || response.status === 204)
-        return undefined;
-    if (kind === 'stream')
-        return response.body;
-    if (kind === 'blob')
-        return response.blob();
-    if (kind === 'arrayBuffer')
-        return response.arrayBuffer();
-    if (kind === 'formData')
-        return response.formData();
-    if (kind === 'text')
-        return response.text();
-    if (kind === 'json')
-        return response.json();
-    // 'auto' — negotiate from the response's content type.
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json'))
-        return response.json();
-    if (contentType.startsWith('text/'))
-        return response.text();
-    return response.blob();
-}
-
-async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
-    const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, op, url, sendInit, body);
-    if (!response.ok) {
-        const errorBody = await readError(response);
-        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
-        // Thread the error through each middleware's onError in turn (each may replace it).
-        for (const mw of __middleware(config)) {
-            if (mw.onError)
-                error = await mw.onError(error as ApiError, context);
-        }
-        throw error;
-    }
-    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
-    return (await __parse(response, kind)) as T;
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
 }
 
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
 async function readError(response: Response): Promise<unknown> {
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json')) {
-        return response.json().catch(() => undefined);
-    }
-    return response.text().catch(() => undefined);
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
 }
 
-const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-
-const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
 
-function __defaultRetryOn(ctx: RetryContext): boolean {
-    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
-        return false;
-    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-    if (retryAfter) {
-        const seconds = Number(retryAfter);
-        if (!Number.isNaN(seconds))
-            return seconds * 1000;
-        const when = Date.parse(retryAfter);
-        if (!Number.isNaN(when))
-            return Math.max(0, when - Date.now());
-    }
-    const base = retry.retryDelay ?? 1000;
-    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-    return retry.jitter === false ? raw : Math.random() * raw;
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
 }
 
-function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
-    return new Promise((resolve, reject) => {
-        if (signal?.aborted) {
-            reject(__abortError(signal));
-            return;
-        }
-        const onAbort = () => {
-            clearTimeout(timer);
-            reject(__abortError(signal as AbortSignal));
-        };
-        const timer = setTimeout(() => {
-            if (signal)
-                signal.removeEventListener('abort', onAbort);
-            resolve();
-        }, ms);
-        if (signal)
-            signal.addEventListener('abort', onAbort, { once: true });
-    });
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
 }
 
-function __abortError(signal: AbortSignal): globalThis.Error {
-    const reason = (signal as {
-        reason?: unknown;
-    }).reason;
-    if (reason instanceof Error)
-        return reason;
-    return new DOMException('The operation was aborted.', 'AbortError');
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
 }
 
-export type GetPetByIdResult = Pet;
-
-export type GetPetByIdVariables = {
-    id: number;
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
-export async function getPetById(id: number, init: RequestOptions = {}): Promise<Pet> {
-    return __request<Pet>(__config, { id: "getPetById", path: "/pets/{id}", tags: [] }, __buildUrl(__config, `/pets/${encodeURIComponent(String(id))}`), { method: "GET", ...init });
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
 }
 
-export type ListPetsResult = Pet[];
-
-export type ListPetsParams = {
-    /**
-     * Object-valued filter serialized as deepObject.
-     */
-    filter?: PetFilter;
-};
-
-export type ListPetsVariables = {
-    params?: ListPetsParams;
-};
-
-export async function listPets(params: {
-    /**
-     * Object-valued filter serialized as deepObject.
-     */
-    filter?: PetFilter;
-} = {}, init: RequestOptions = {}): Promise<Pet[]> {
-    return __request<Pet[]>(__config, { id: "listPets", path: "/pets", tags: [] }, __buildUrl(__config, `/pets`, params, { "filter": { style: "deepObject", explode: true } }), { method: "GET", ...init });
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
 }
 
-export type CreatePetResult = Pet;
-
-export type CreatePetBody = Omit<Pet, "id">;
-
-export type CreatePetVariables = {
-    body: CreatePetBody;
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
 };
 
-export async function createPet(body: Omit<Pet, "id">, init: RequestOptions = {}): Promise<Pet> {
-    return __request<Pet>(__config, { id: "createPet", path: "/pets", tags: [] }, __buildUrl(__config, `/pets`), { method: "POST", ...init }, body);
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
 }
 
-export type GetSlowPetResult = Pet;
-
-export type GetSlowPetVariables = {
-    id: number;
-};
-
-export async function getSlowPet(id: number, init: RequestOptions = {}): Promise<Pet> {
-    return __request<Pet>(__config, { id: "getSlowPet", path: "/pets/{id}/cancel-test", tags: [] }, __buildUrl(__config, `/pets/${encodeURIComponent(String(id))}/cancel-test`), { method: "GET", ...init });
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
 }
 
-export type SearchBody = PetFilter;
-
-export type SearchVariables = {
-    body: SearchBody;
-};
-
 /**
- * Name-collision regression: `operationId: search` makes the result alias name
- * match the SearchResult schema it returns. The generator must not emit a circular
- * self-referential alias (TS2440/TS2308 in multi-file output).
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
  */
-export async function search(body: PetFilter, init: RequestOptions = {}): Promise<SearchResult> {
-    return __request<SearchResult>(__config, { id: "search", path: "/search", tags: [] }, __buildUrl(__config, `/search`), { method: "POST", ...init }, body);
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
 }
 
-export type BulkUpsertPetsResult = PetBulkResult;
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
 
-export type BulkUpsertPetsBody = Pet[];
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
 
-export type BulkUpsertPetsVariables = {
-    body: BulkUpsertPetsBody;
-};
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
 
 /**
- * The 200 body is an array whose items are an *inline* discriminated union
- * (`status`). The generator must emit `is<Member>` guards for that nested
- * union, narrowing the items to the named member types.
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
  */
-export async function bulkUpsertPets(body: Pet[], init: RequestOptions = {}): Promise<PetBulkResult> {
-    return __request<PetBulkResult>(__config, { id: "bulkUpsertPets", path: "/pets/bulk", tags: [] }, __buildUrl(__config, `/pets/bulk`), { method: "POST", ...init }, body);
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
 }
 
 /**
- * Name-collision regression (non-self-referential): operationId `getStatus` derives a
- * result alias whose name also exists as an unrelated schema below. The generator must
- * suppress the operation result alias so the two don't both declare the same type name
- * (a duplicate-identifier error).
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
  */
-export async function getStatus(init: RequestOptions = {}): Promise<Pet> {
-    return __request<Pet>(__config, { id: "getStatus", path: "/status", tags: [] }, __buildUrl(__config, `/status`), { method: "GET", ...init });
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, {});
 }
+
+export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS, { serverUrl: "http://localhost:3102" });
+
+export const { configure, use } = client;
+export const getPetById = (id: number, init: RequestOptions = {}) => client.getPetById({ id }, init);
+export const listPets = (params: {
+    /**
+     * Object-valued filter serialized as deepObject.
+     */
+    filter?: PetFilter;
+} = {}, init: RequestOptions = {}) => client.listPets({ params }, init);
+export const createPet = (body: Omit<Pet, "id">, init: RequestOptions = {}) => client.createPet({ body }, init);
+export const getSlowPet = (id: number, init: RequestOptions = {}) => client.getSlowPet({ id }, init);
+export const search = (body: PetFilter, init: RequestOptions = {}) => client.search({ body }, init);
+export const bulkUpsertPets = (body: Pet[], init: RequestOptions = {}) => client.bulkUpsertPets({ body }, init);
+export const getStatus = (init: RequestOptions = {}) => client.getStatus({}, init);
diff --git a/tests/e2e/generate-client/base.test.ts b/tests/e2e/generate-client/base.test.ts
index 9cc3f0a551..895dd02de1 100644
--- a/tests/e2e/generate-client/base.test.ts
+++ b/tests/e2e/generate-client/base.test.ts
@@ -94,11 +94,17 @@ describe('generate-client base consumer (single-file output)', () => {
     const generated = readFileSync(generatedFile, 'utf-8');
     expect(generated).toContain('export type Pet');
     expect(generated).toContain('export class ApiError');
-    expect(generated).toContain('export async function getPetById');
-    expect(generated).toContain('export async function getSlowPet');
-    expect(generated).toContain('export async function listPets');
-    // BASE is emitted as a mutable binding so setServerUrl() can override it.
-    expect(generated).toContain('let BASE = "http://localhost:3102"');
+    // The descriptor wiring with the embedded runtime, plus flat call sugar per operation.
+    expect(generated).toContain('// ─── Embedded runtime');
+    expect(generated).toContain('as const satisfies Record<string, OperationDescriptor>');
+    expect(generated).toContain('export const { configure, use } = client;');
+    expect(generated).toContain('export const getPetById = (');
+    expect(generated).toContain('export const getSlowPet = (');
+    expect(generated).toContain('export const listPets = (');
+    // The spec's server URL is baked into the client instance.
+    expect(generated).toContain(
+      'export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS, { serverUrl: "http://localhost:3102" });'
+    );
     // An OAS 3.1 enum that includes null renders as a nullable union.
     expect(generated).toMatch(/status\?:\s*\("available" \| "pending" \| "sold"\) \| null;/);
     // A free-form object (`type: object`, no properties) renders as a record, not `{}`.
diff --git a/tests/e2e/generate-client/cafe-consumer/api.ts b/tests/e2e/generate-client/cafe-consumer/api.ts
index 17e544556e..e30ede388a 100644
--- a/tests/e2e/generate-client/cafe-consumer/api.ts
+++ b/tests/e2e/generate-client/cafe-consumer/api.ts
@@ -412,599 +412,6 @@ export function isDessert(value: MenuItem): value is Dessert {
     return (value as Record<string, unknown>)["category"] === "dessert";
 }
 
-/**
- * Static metadata for every operation, keyed by operationId: the HTTP `method`
- * and the `path` template (with `{param}` placeholders intact). Minification-safe
- * — useful for building cache/query keys, tracing span names, and request logging
- * without re-deriving them at each call site.
- */
-export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
-    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
-    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
-    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
-    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
-    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
-    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
-} as const;
-
-/**
- * The operationId of any operation in this client.
- */
-export type OperationId = keyof typeof OPERATIONS;
-
-/**
- * Static metadata describing one operation: its HTTP method, path template, and tags.
- */
-export type OperationMetadata = {
-    readonly method: string;
-    readonly path: string;
-    readonly tags: readonly string[];
-};
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
-
-let BASE = "http://127.0.0.1:3101";
-
-/** Identity of the operation a request belongs to. Stable across path interpolation. */
-export type OperationContext = {
-    id: OperationId;
-    path: OperationPath;
-    tags: OperationTag[];
-};
-
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
-export type RequestContext = {
-    url: string;
-    method: string;
-    headers: Record<string, string>;
-    body?: unknown;
-    /** The operation being called: its id (operationId), path template, and tags. */
-    operation: OperationContext;
-};
-
-/**
- * Configuration and extension hooks for a client. Supplied per-instance via
- * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
- * (functions facade).
- */
-export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
-    serverUrl?: string;
-    /** Extra headers merged into every request; a function is invoked per request. */
-    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
-    /** Transport used to issue requests. Defaults to the global `fetch`. */
-    fetch?: typeof fetch;
-    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    /** Observe — or replace, by returning a `Response` — the response before parsing. */
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    /**
-     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
-     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
-     */
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
-    /**
-     * Composable interceptors run around every request, alongside the single
-     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
-     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
-     * the last-registered middleware wraps closest to the network. Register more at runtime
-     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
-     */
-    middleware?: Middleware[];
-    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
-    retry?: RetryConfig;
-    /**
-     * Per-instance auth credentials. When set, they override the module-global
-     * `set*` helpers for requests made through this config (each scheme falls back
-     * to its global slot when omitted here). Only the schemes an operation declares
-     * in its `security` are ever sent.
-     */
-    auth?: AuthCredentials;
-};
-
-/**
- * A request interceptor; every field is optional, so a middleware can hook any subset of
- * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
- * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
- * failure into the error to throw, threaded through each middleware in turn.
- */
-export type Middleware = {
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/** Context handed to `retryOn` for the attempt that just failed. */
-export type RetryContext = {
-    /** 1-based number of the attempt that just failed. */
-    attempt: number;
-    /** The request that was attempted. */
-    request: RequestContext;
-    /** Present when the server returned a (non-ok) response. */
-    response?: Response;
-    /** Present when the transport threw (network error, DNS, connection reset). */
-    error?: unknown;
-};
-
-/** Retry policy; all fields optional with sensible defaults. */
-export type RetryConfig = {
-    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
-    retries?: number;
-    /** Base delay in milliseconds. Default 1000. */
-    retryDelay?: number;
-    /** Backoff shape. Default 'exponential'. */
-    retryStrategy?: RetryStrategy;
-    /** Apply full jitter over the computed delay. Default true. */
-    jitter?: boolean;
-    /**
-     * Decide whether to retry a failed attempt. Default: retry only idempotent
-     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
-     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
-     */
-    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
-};
-
-/**
- * How the response body is read. `'auto'` negotiates from the content type (the
- * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
- */
-export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
-
-/**
- * The trailing per-operation argument: standard `RequestInit` plus an optional
- * per-call retry override and a `parseAs` escape hatch.
- *
- * `parseAs` forces how the response body is read; overrides the inferred kind.
- * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
- * override — the static return type is unchanged.
- */
-export type RequestOptions = RequestInit & {
-    retry?: Partial<RetryConfig>;
-    parseAs?: ParseAs;
-};
-
-/**
- * Override the base URL used by every generated operation. Useful when the
- * runtime environment differs from the value declared in `servers[0].url`
- * (e.g. dev / staging / prod toggles in a single-page app).
- *
- * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ serverUrl })`.
- */
-export function setServerUrl(url: string): void {
-    BASE = url;
-}
-
-/** The global config used by the functions facade (see `configure`). */
-const __config: ClientConfig = {};
-
-/**
- * Merge `config` into the global configuration used by the functions facade —
- * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
- * hooks once for every free function. The service-class facade configures per
- * instance instead (`new Client(config)`).
- */
-export function configure(config: ClientConfig): void {
-    Object.assign(__config, config);
-}
-
-/**
- * Append interceptors to the functions facade's global middleware chain (see
- * `ClientConfig.middleware`). The service-class facade registers per instance via
- * `<Client>.use(...)` instead.
- */
-export function use(...middleware: Middleware[]): void {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    __config.middleware = [...(__config.middleware ?? []), ...middleware];
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function __middleware(config: ClientConfig): Middleware[] {
-    const single = config.onRequest || config.onResponse || config.onError
-        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-        : [];
-    return [...single, ...(config.middleware ?? [])];
-}
-
-export class ApiError extends Error {
-    public readonly url: string;
-    public readonly status: number;
-    public readonly statusText: string;
-    public readonly body: unknown;
-    constructor(url: string, status: number, statusText: string, body: unknown) {
-        super(`Request failed with status ${status}`);
-        this.name = 'ApiError';
-        this.url = url;
-        this.status = status;
-        this.statusText = statusText;
-        this.body = body;
-    }
-}
-
-type QueryPrimitive = string | number | boolean;
-
-type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
-
-/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
-type QueryStyle = {
-    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-    explode: boolean;
-    allowReserved?: boolean;
-};
-
-/**
- * Percent-encode `value` but leave the RFC-3986 reserved set
- * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
- */
-function __encodeReserved(value: string): string {
-    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
-}
-
-function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
-    if (!query)
-        return url;
-    const params = new URLSearchParams();
-    const raw: string[] = [];
-    for (const [key, value] of Object.entries(query)) {
-        if (value === undefined || value === null)
-            continue;
-        const spec = styles?.[key];
-        if (!spec) {
-            if (Array.isArray(value)) {
-                for (const v of value) {
-                    if (v !== undefined && v !== null)
-                        params.append(key, String(v));
-                }
-            }
-            else if (typeof value === 'object') {
-                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-                for (const [subKey, subValue] of Object.entries(value)) {
-                    if (subValue !== undefined && subValue !== null) {
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                    }
-                }
-            }
-            else {
-                params.append(key, String(value));
-            }
-            continue;
-        }
-        if (Array.isArray(value)) {
-            const items = value.filter((v) => v !== undefined && v !== null).map(String);
-            if (spec.style === 'form' && spec.explode) {
-                for (const v of items) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}=${__encodeReserved(v)}`);
-                    else
-                        params.append(key, v);
-                }
-            }
-            else {
-                // Delimited styles put the LITERAL delimiter on the wire; only the
-                // values are encoded. `%20` (not `+`) is the literal space delimiter.
-                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
-                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-            }
-        }
-        else if (typeof value === 'object') {
-            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-            for (const [subKey, subValue] of Object.entries(value)) {
-                if (subValue !== undefined && subValue !== null) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
-                    else
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                }
-            }
-        }
-        else if (spec.allowReserved) {
-            raw.push(`${key}=${__encodeReserved(String(value))}`);
-        }
-        else {
-            params.append(key, String(value));
-        }
-    }
-    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-    return qs ? `${url}?${qs}` : url;
-}
-
-async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
-    response: Response;
-    context: RequestContext;
-}> {
-    const { retry: callRetry, ...fetchInit } = init;
-    const retry: RetryConfig = { ...config.retry, ...callRetry };
-    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-    const headers: Record<string, string> = {
-        Accept: 'application/json',
-        ...extra,
-        ...(fetchInit.headers as Record<string, string> | undefined),
-    };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
-    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-    let payload: BodyInit | undefined;
-    if (context.body !== undefined) {
-        const value = context.body;
-        const isBinary = value instanceof Blob ||
-            value instanceof ArrayBuffer ||
-            ArrayBuffer.isView(value as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-        const isURLSearchParams = value instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-            payload = value as BodyInit;
-        }
-        else {
-            payload = JSON.stringify(value);
-            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-                context.headers['Content-Type'] = 'application/json';
-            }
-        }
-    }
-    const doFetch = config.fetch ?? fetch;
-    const maxAttempts = 1 + (retry.retries ?? 0);
-    const retryOn = retry.retryOn ?? __defaultRetryOn;
-    const signal = fetchInit.signal ?? undefined;
-    let attempt = 0;
-    while (true) {
-        attempt++;
-        if (signal?.aborted)
-            throw __abortError(signal);
-        let response: Response;
-        try {
-            response = await doFetch(context.url, {
-                ...fetchInit,
-                method: context.method,
-                headers: context.headers,
-                body: payload,
-            });
-        }
-        catch (error) {
-            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
-                await __sleep(__retryDelay(retry, attempt, null), signal);
-                continue;
-            }
-            throw error;
-        }
-        // Reverse order: the last-registered middleware wraps closest to the network (onion).
-        for (let i = middleware.length - 1; i >= 0; i--) {
-            const onResponse = middleware[i].onResponse;
-            if (onResponse) {
-                const replaced = await onResponse(response, context);
-                if (replaced)
-                    response = replaced;
-            }
-        }
-        if (!response.ok &&
-            attempt < maxAttempts &&
-            !signal?.aborted &&
-            (await retryOn({ attempt, request: context, response }))) {
-            const retryAfter = response.headers.get('retry-after');
-            // Drain the abandoned response body before the next attempt: an unread body
-            // keeps the connection checked out (and can stall the pool) under Node/undici
-            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-            await response.body?.cancel().catch(() => undefined);
-            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
-            continue;
-        }
-        return { response, context };
-    }
-}
-
-async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-    if (kind === 'void' || response.status === 204)
-        return undefined;
-    if (kind === 'stream')
-        return response.body;
-    if (kind === 'blob')
-        return response.blob();
-    if (kind === 'arrayBuffer')
-        return response.arrayBuffer();
-    if (kind === 'formData')
-        return response.formData();
-    if (kind === 'text')
-        return response.text();
-    if (kind === 'json')
-        return response.json();
-    // 'auto' — negotiate from the response's content type.
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json'))
-        return response.json();
-    if (contentType.startsWith('text/'))
-        return response.text();
-    return response.blob();
-}
-
-async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
-    const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, op, url, sendInit, body);
-    if (!response.ok) {
-        const errorBody = await readError(response);
-        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
-        // Thread the error through each middleware's onError in turn (each may replace it).
-        for (const mw of __middleware(config)) {
-            if (mw.onError)
-                error = await mw.onError(error as ApiError, context);
-        }
-        throw error;
-    }
-    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
-    return (await __parse(response, kind)) as T;
-}
-
-async function readError(response: Response): Promise<unknown> {
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json')) {
-        return response.json().catch(() => undefined);
-    }
-    return response.text().catch(() => undefined);
-}
-
-const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-
-const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-function __defaultRetryOn(ctx: RetryContext): boolean {
-    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
-        return false;
-    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-    if (retryAfter) {
-        const seconds = Number(retryAfter);
-        if (!Number.isNaN(seconds))
-            return seconds * 1000;
-        const when = Date.parse(retryAfter);
-        if (!Number.isNaN(when))
-            return Math.max(0, when - Date.now());
-    }
-    const base = retry.retryDelay ?? 1000;
-    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-    return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
-    return new Promise((resolve, reject) => {
-        if (signal?.aborted) {
-            reject(__abortError(signal));
-            return;
-        }
-        const onAbort = () => {
-            clearTimeout(timer);
-            reject(__abortError(signal as AbortSignal));
-        };
-        const timer = setTimeout(() => {
-            if (signal)
-                signal.removeEventListener('abort', onAbort);
-            resolve();
-        }, ms);
-        if (signal)
-            signal.addEventListener('abort', onAbort, { once: true });
-    });
-}
-
-function __abortError(signal: AbortSignal): globalThis.Error {
-    const reason = (signal as {
-        reason?: unknown;
-    }).reason;
-    if (reason instanceof Error)
-        return reason;
-    return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * Normalize an operation's header-parameter object into a plain string record,
- * dropping any `undefined` / `null` entries (optional headers the caller omitted)
- * and stringifying the rest. Mirrors __buildUrl's handling of query values.
- */
-function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
-    const out: Record<string, string> = {};
-    for (const [key, value] of Object.entries(values)) {
-        if (value !== undefined && value !== null)
-            out[key] = String(value);
-    }
-    return out;
-}
-
-/**
- * A credential value, or a (possibly async) function that returns one per request.
- */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/**
- * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
- * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
- * to the global slots.
- */
-export type AuthCredentials = {
-    bearer?: TokenProvider;
-    apiKey?: Record<string, TokenProvider>;
-};
-
-let __bearerToken: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
- * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
- * (possibly async) function resolved per request.
- */
-export function setBearer(token: TokenProvider | null): void {
-    __bearerToken = token;
-}
-
-let __apiKey_ApiKey: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
- * string or a (possibly async) function resolved per request.
- */
-export function setApiKey(key: TokenProvider | null): void {
-    __apiKey_ApiKey = key;
-}
-
-/**
- * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
- */
-async function __resolve(slot: TokenProvider | null): Promise<string | null> {
-    if (slot === null)
-        return null;
-    return typeof slot === "function" ? slot() : slot;
-}
-
-/**
- * Build the auth `headers` and `query` for an operation from the currently-set credentials.
- * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
- * can always override by passing their own `init.headers`.
- */
-async function __auth(schemes: string[], config: ClientConfig): Promise<{
-    headers: Record<string, string>;
-    query: Record<string, string>;
-}> {
-    const headers: Record<string, string> = {};
-    const query: Record<string, string> = {};
-    const cookies: string[] = [];
-    for (const scheme of schemes) {
-        switch (scheme) {
-            case "OAuth2": {
-                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
-                if (v !== null)
-                    headers["Authorization"] = `Bearer ${v}`;
-                break;
-            }
-            case "ApiKey": {
-                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
-                if (v !== null)
-                    headers["X-API-Key"] = v;
-                break;
-            }
-        }
-    }
-    if (cookies.length > 0)
-        headers["Cookie"] = cookies.join("; ");
-    return { headers, query };
-}
-
 export type ListMenuItemsResult = MenuItemList;
 
 export type ListMenuItemsParams = {
@@ -1062,64 +469,6 @@ export type ListMenuItemsVariables = {
     params?: ListMenuItemsParams;
 };
 
-/**
- * List all menu items
- *
- * Retrieve a collection of menu items with optional filtering and pagination.
- */
-export async function listMenuItems(params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-    return __request<MenuItemList>(__config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
-}
-
 export type CreateMenuItemResult = MenuItem;
 
 export type CreateMenuItemBody = FormData;
@@ -1128,16 +477,6 @@ export type CreateMenuItemVariables = {
     body: CreateMenuItemBody;
 };
 
-/**
- * Create menu item
- *
- * Create a new menu item.
- */
-export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<MenuItem>(__config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
 export type DeleteMenuItemResult = void;
 
 export type DeleteMenuItemVariables = {
@@ -1148,16 +487,6 @@ export type DeleteMenuItemVariables = {
     menuItemId: string;
 };
 
-/**
- * Delete a menu item
- *
- * Delete an existing menu item.
- */
-export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
 export type GetMenuItemPhotoResult = Blob | string;
 
 export type GetMenuItemPhotoParams = {
@@ -1176,20 +505,6 @@ export type GetMenuItemPhotoVariables = {
     params?: GetMenuItemPhotoParams;
 };
 
-/**
- * Retrieve a menu item photo
- *
- * Retrieve the product photo image for a specific menu item.
- */
-export async function getMenuItemPhoto(menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}): Promise<Blob | string> {
-    return __request<Blob | string>(__config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
-}
-
 export type ListOrdersResult = OrderList;
 
 export type ListOrdersParams = {
@@ -1247,95 +562,25 @@ export type ListOrdersVariables = {
     params?: ListOrdersParams;
 };
 
-/**
- * List all orders
- *
- * Retrieve a collection of orders with optional filtering and pagination.
- */
-export async function listOrders(params: {
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
     /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
      */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderList> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderList>(__config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-/**
- * Create order
- *
- * Create a new order.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
     /**
      * ID of the order to retrieve.
      * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
@@ -1344,22 +589,6 @@ export type GetOrderByIdVariables = {
     headers?: GetOrderByIdHeaders;
 };
 
-/**
- * Retrieve an order
- *
- * Retrieve a single order by its ID.
- */
-export async function getOrderById(orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
-}
-
 export type DeleteOrderResult = void;
 
 export type DeleteOrderVariables = {
@@ -1370,17 +599,6 @@ export type DeleteOrderVariables = {
     orderId: string;
 };
 
-/**
- * Delete an order
- *
- * Delete the order.
- * To keep the order history, the order should be canceled instead of deleted.
- */
-export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
 export type UpdateOrderResult = Order;
 
 export type UpdateOrderBody = {
@@ -1396,19 +614,6 @@ export type UpdateOrderVariables = {
     body?: UpdateOrderBody;
 };
 
-/**
- * Partially update an order
- *
- * Update an existing order status.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function updateOrder(orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
 export type ListOrderItemsResult = OrderItem[];
 
 export type ListOrderItemsParams = {
@@ -1436,13 +641,1006 @@ export type ListOrderItemsVariables = {
     params?: ListOrderItemsParams;
 };
 
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    listMenuItems: {
+        args: {
+            params?: ListMenuItemsParams;
+        };
+        result: ListMenuItemsResult;
+    };
+    createMenuItem: {
+        args: {
+            body: CreateMenuItemBody;
+        };
+        result: CreateMenuItemResult;
+    };
+    deleteMenuItem: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+        };
+        result: DeleteMenuItemResult;
+    };
+    getMenuItemPhoto: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+            params?: GetMenuItemPhotoParams;
+        };
+        result: GetMenuItemPhotoResult;
+    };
+    listOrders: {
+        args: {
+            params?: ListOrdersParams;
+        };
+        result: ListOrdersResult;
+    };
+    createOrder: {
+        args: {
+            body: CreateOrderBody;
+        };
+        result: CreateOrderResult;
+    };
+    getOrderById: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            headers?: GetOrderByIdHeaders;
+        };
+        result: GetOrderByIdResult;
+    };
+    deleteOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+        };
+        result: DeleteOrderResult;
+    };
+    updateOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            body?: UpdateOrderBody;
+        };
+        result: UpdateOrderResult;
+    };
+    listOrderItems: {
+        args: {
+            params?: ListOrderItemsParams;
+        };
+        result: ListOrderItemsResult;
+    };
+    getRevenue: {
+        args: {
+            params?: GetRevenueParams;
+        };
+        result: GetRevenueResult;
+    };
+    registerOAuth2Client: {
+        args: {
+            body: RegisterOAuth2ClientBody;
+        };
+        result: RegisterOAuth2ClientResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
+export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : NoRequiredKeys<Ops[K]['args']> extends true
+      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
+
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/** Resolve a credential: a literal passes through; a function is awaited per request. */
+async function resolveToken(provider: TokenProvider): Promise<string> {
+  return typeof provider === 'function' ? await provider() : provider;
+}
+
+/**
+ * Build the auth headers/query for one operation's `security` requirements from the
+ * instance credentials (`config.auth`) — capability module, wired into `createClient`.
+ * A scheme with no configured credential contributes nothing (the request is sent
+ * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
+ */
+async function resolveAuth(
+  security: readonly SecuritySpec[],
+  config: ClientConfig
+): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const headers: Record<string, string> = {};
+  const query: Record<string, string> = {};
+  const cookies: string[] = [];
+  for (const scheme of security) {
+    if (scheme.kind === 'apiKey') {
+      const provider = config.auth?.apiKey?.[scheme.scheme];
+      if (provider === undefined) continue;
+      const value = await resolveToken(provider);
+      if (scheme.in === 'header') headers[scheme.name] = value;
+      else if (scheme.in === 'query') query[scheme.name] = value;
+      else cookies.push(`${scheme.name}=${value}`);
+    } else if (scheme.kind === 'bearer') {
+      const provider = config.auth?.bearer;
+      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
+    } else {
+      const basic = config.auth?.basic;
+      if (basic !== undefined) {
+        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+      }
+    }
+  }
+  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
+  return { headers, query };
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+};
+
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
 /**
- * List all order items with menu item details
- *
- * Returns an array of order items for a specific order.
- * Use the `filter` parameter to filter by order ID.
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
  */
-export async function listOrderItems(params: {
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
+}
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "http://127.0.0.1:3101" });
+
+export const { configure, use } = client;
+export const setBearer = client.auth.bearer;
+export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
+export const listMenuItems = (params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
     /**
      * Filters the collection items using space-separated `field:value` pairs.
      *
@@ -1461,39 +1659,115 @@ export async function listOrderItems(params: {
      * - `status:placed createdAt:7d` - Combine multiple filters.
      */
     filter?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderItem[]>(__config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
     /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
      */
-    startDate?: string;
+    search?: string;
     /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
      */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-/**
- * Get revenue statistics
- *
- * Retrieve revenue statistics for a configurable date range.
- * Returns revenue, order counts, average order amount, and other useful statistics.
- */
-export async function getRevenue(params: {
+    limit?: number;
+} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
+export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
+export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
+export const getMenuItemPhoto = (menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
+export const listOrders = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
+export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
+export const getOrderById = (orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
+export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
+export const updateOrder = (orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
+export const listOrderItems = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
+export const getRevenue = (params: {
     /**
      * Start date for the revenue calculation period (ISO 8601 datetime format).
      * Defaults to 30 days ago if not provided.
@@ -1506,29 +1780,5 @@ export async function getRevenue(params: {
      * @format date
      */
     endDate?: string;
-} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
-    const __a = await __auth(["ApiKey"], __config);
-    return __request<RevenueStatistics>(__config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Create OAuth2 client
- *
- * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
- * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
- *   `redirectUris` must be provided (per RFC 7591 Section 2).
- * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
- * Returns the registered client information per RFC 7591, including:
- * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
- */
-export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-    return __request<OAuth2Client>(__config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
-}
+} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
+export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
diff --git a/tests/e2e/generate-client/cafe-consumer/index-setbaseurl.ts b/tests/e2e/generate-client/cafe-consumer/index-configure.ts
similarity index 62%
rename from tests/e2e/generate-client/cafe-consumer/index-setbaseurl.ts
rename to tests/e2e/generate-client/cafe-consumer/index-configure.ts
index d88bcf7a97..9a7f2013c2 100644
--- a/tests/e2e/generate-client/cafe-consumer/index-setbaseurl.ts
+++ b/tests/e2e/generate-client/cafe-consumer/index-configure.ts
@@ -1,11 +1,13 @@
-import { listMenuItems, setServerUrl } from './api.js';
+import { configure, listMenuItems } from './api.js';
 
 type StepResult = { kind: 'ok'; name: string } | { kind: 'err'; name: string; error: string };
 
 function requireEnv(name: string): string {
   const value = process.env[name];
   if (!value) {
-    process.stderr.write(`${name} env var required for the setServerUrl mid-flight test\n`);
+    process.stderr.write(
+      `${name} env var required for the configure({ serverUrl }) mid-flight test\n`
+    );
     process.exit(1);
   }
   return value;
@@ -14,7 +16,7 @@ function requireEnv(name: string): string {
 const liveBase = requireEnv('CAFE_BASE');
 
 // Port 1 is reserved/unassigned — any connect attempt fails fast (ECONNREFUSED / ENOTFOUND).
-// We use it as the "obviously unreachable" base to prove BASE actually moved.
+// We use it as the "obviously unreachable" base to prove serverUrl actually moved.
 const UNREACHABLE = 'http://127.0.0.1:1';
 
 async function step(name: string, run: () => Promise<unknown>): Promise<StepResult> {
@@ -37,16 +39,16 @@ async function main(): Promise<void> {
   //    call should succeed against the mock server.
   results.push(await step('initial-call-against-mock', () => listMenuItems({ limit: 1 })));
 
-  // 2) Flip BASE to an unreachable host. The same operation should now fail to connect.
-  //    This is the proof that setServerUrl() actually mutated the module-scoped binding.
-  setServerUrl(UNREACHABLE);
+  // 2) Flip serverUrl to an unreachable host. The same operation should now fail to
+  //    connect. This is the proof that configure() actually mutated the instance config.
+  configure({ serverUrl: UNREACHABLE });
   results.push(
-    await step('call-after-setServerUrl-to-unreachable', () => listMenuItems({ limit: 1 }))
+    await step('call-after-configure-to-unreachable', () => listMenuItems({ limit: 1 }))
   );
 
-  // 3) Flip BASE back to the live mock and confirm the binding restored cleanly.
-  setServerUrl(liveBase);
-  results.push(await step('call-after-setServerUrl-restored', () => listMenuItems({ limit: 1 })));
+  // 3) Flip serverUrl back to the live mock and confirm the config restored cleanly.
+  configure({ serverUrl: liveBase });
+  results.push(await step('call-after-configure-restored', () => listMenuItems({ limit: 1 })));
 
   process.stdout.write(JSON.stringify(results, null, 2) + '\n');
 }
diff --git a/tests/e2e/generate-client/cafe.snapshot.ts b/tests/e2e/generate-client/cafe.snapshot.ts
index 804e48df94..1ad55ad78b 100644
--- a/tests/e2e/generate-client/cafe.snapshot.ts
+++ b/tests/e2e/generate-client/cafe.snapshot.ts
@@ -412,599 +412,6 @@ export function isDessert(value: MenuItem): value is Dessert {
     return (value as Record<string, unknown>)["category"] === "dessert";
 }
 
-/**
- * Static metadata for every operation, keyed by operationId: the HTTP `method`
- * and the `path` template (with `{param}` placeholders intact). Minification-safe
- * — useful for building cache/query keys, tracing span names, and request logging
- * without re-deriving them at each call site.
- */
-export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
-    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
-    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
-    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
-    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
-    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
-    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
-} as const;
-
-/**
- * The operationId of any operation in this client.
- */
-export type OperationId = keyof typeof OPERATIONS;
-
-/**
- * Static metadata describing one operation: its HTTP method, path template, and tags.
- */
-export type OperationMetadata = {
-    readonly method: string;
-    readonly path: string;
-    readonly tags: readonly string[];
-};
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
-
-let BASE = "https://api.cafe.redocly.com";
-
-/** Identity of the operation a request belongs to. Stable across path interpolation. */
-export type OperationContext = {
-    id: OperationId;
-    path: OperationPath;
-    tags: OperationTag[];
-};
-
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
-export type RequestContext = {
-    url: string;
-    method: string;
-    headers: Record<string, string>;
-    body?: unknown;
-    /** The operation being called: its id (operationId), path template, and tags. */
-    operation: OperationContext;
-};
-
-/**
- * Configuration and extension hooks for a client. Supplied per-instance via
- * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
- * (functions facade).
- */
-export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
-    serverUrl?: string;
-    /** Extra headers merged into every request; a function is invoked per request. */
-    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
-    /** Transport used to issue requests. Defaults to the global `fetch`. */
-    fetch?: typeof fetch;
-    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    /** Observe — or replace, by returning a `Response` — the response before parsing. */
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    /**
-     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
-     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
-     */
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
-    /**
-     * Composable interceptors run around every request, alongside the single
-     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
-     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
-     * the last-registered middleware wraps closest to the network. Register more at runtime
-     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
-     */
-    middleware?: Middleware[];
-    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
-    retry?: RetryConfig;
-    /**
-     * Per-instance auth credentials. When set, they override the module-global
-     * `set*` helpers for requests made through this config (each scheme falls back
-     * to its global slot when omitted here). Only the schemes an operation declares
-     * in its `security` are ever sent.
-     */
-    auth?: AuthCredentials;
-};
-
-/**
- * A request interceptor; every field is optional, so a middleware can hook any subset of
- * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
- * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
- * failure into the error to throw, threaded through each middleware in turn.
- */
-export type Middleware = {
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/** Context handed to `retryOn` for the attempt that just failed. */
-export type RetryContext = {
-    /** 1-based number of the attempt that just failed. */
-    attempt: number;
-    /** The request that was attempted. */
-    request: RequestContext;
-    /** Present when the server returned a (non-ok) response. */
-    response?: Response;
-    /** Present when the transport threw (network error, DNS, connection reset). */
-    error?: unknown;
-};
-
-/** Retry policy; all fields optional with sensible defaults. */
-export type RetryConfig = {
-    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
-    retries?: number;
-    /** Base delay in milliseconds. Default 1000. */
-    retryDelay?: number;
-    /** Backoff shape. Default 'exponential'. */
-    retryStrategy?: RetryStrategy;
-    /** Apply full jitter over the computed delay. Default true. */
-    jitter?: boolean;
-    /**
-     * Decide whether to retry a failed attempt. Default: retry only idempotent
-     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
-     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
-     */
-    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
-};
-
-/**
- * How the response body is read. `'auto'` negotiates from the content type (the
- * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
- */
-export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
-
-/**
- * The trailing per-operation argument: standard `RequestInit` plus an optional
- * per-call retry override and a `parseAs` escape hatch.
- *
- * `parseAs` forces how the response body is read; overrides the inferred kind.
- * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
- * override — the static return type is unchanged.
- */
-export type RequestOptions = RequestInit & {
-    retry?: Partial<RetryConfig>;
-    parseAs?: ParseAs;
-};
-
-/**
- * Override the base URL used by every generated operation. Useful when the
- * runtime environment differs from the value declared in `servers[0].url`
- * (e.g. dev / staging / prod toggles in a single-page app).
- *
- * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ serverUrl })`.
- */
-export function setServerUrl(url: string): void {
-    BASE = url;
-}
-
-/** The global config used by the functions facade (see `configure`). */
-const __config: ClientConfig = {};
-
-/**
- * Merge `config` into the global configuration used by the functions facade —
- * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
- * hooks once for every free function. The service-class facade configures per
- * instance instead (`new Client(config)`).
- */
-export function configure(config: ClientConfig): void {
-    Object.assign(__config, config);
-}
-
-/**
- * Append interceptors to the functions facade's global middleware chain (see
- * `ClientConfig.middleware`). The service-class facade registers per instance via
- * `<Client>.use(...)` instead.
- */
-export function use(...middleware: Middleware[]): void {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    __config.middleware = [...(__config.middleware ?? []), ...middleware];
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function __middleware(config: ClientConfig): Middleware[] {
-    const single = config.onRequest || config.onResponse || config.onError
-        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-        : [];
-    return [...single, ...(config.middleware ?? [])];
-}
-
-export class ApiError extends Error {
-    public readonly url: string;
-    public readonly status: number;
-    public readonly statusText: string;
-    public readonly body: unknown;
-    constructor(url: string, status: number, statusText: string, body: unknown) {
-        super(`Request failed with status ${status}`);
-        this.name = 'ApiError';
-        this.url = url;
-        this.status = status;
-        this.statusText = statusText;
-        this.body = body;
-    }
-}
-
-type QueryPrimitive = string | number | boolean;
-
-type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
-
-/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
-type QueryStyle = {
-    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-    explode: boolean;
-    allowReserved?: boolean;
-};
-
-/**
- * Percent-encode `value` but leave the RFC-3986 reserved set
- * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
- */
-function __encodeReserved(value: string): string {
-    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
-}
-
-function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
-    if (!query)
-        return url;
-    const params = new URLSearchParams();
-    const raw: string[] = [];
-    for (const [key, value] of Object.entries(query)) {
-        if (value === undefined || value === null)
-            continue;
-        const spec = styles?.[key];
-        if (!spec) {
-            if (Array.isArray(value)) {
-                for (const v of value) {
-                    if (v !== undefined && v !== null)
-                        params.append(key, String(v));
-                }
-            }
-            else if (typeof value === 'object') {
-                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-                for (const [subKey, subValue] of Object.entries(value)) {
-                    if (subValue !== undefined && subValue !== null) {
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                    }
-                }
-            }
-            else {
-                params.append(key, String(value));
-            }
-            continue;
-        }
-        if (Array.isArray(value)) {
-            const items = value.filter((v) => v !== undefined && v !== null).map(String);
-            if (spec.style === 'form' && spec.explode) {
-                for (const v of items) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}=${__encodeReserved(v)}`);
-                    else
-                        params.append(key, v);
-                }
-            }
-            else {
-                // Delimited styles put the LITERAL delimiter on the wire; only the
-                // values are encoded. `%20` (not `+`) is the literal space delimiter.
-                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
-                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-            }
-        }
-        else if (typeof value === 'object') {
-            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-            for (const [subKey, subValue] of Object.entries(value)) {
-                if (subValue !== undefined && subValue !== null) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
-                    else
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                }
-            }
-        }
-        else if (spec.allowReserved) {
-            raw.push(`${key}=${__encodeReserved(String(value))}`);
-        }
-        else {
-            params.append(key, String(value));
-        }
-    }
-    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-    return qs ? `${url}?${qs}` : url;
-}
-
-async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
-    response: Response;
-    context: RequestContext;
-}> {
-    const { retry: callRetry, ...fetchInit } = init;
-    const retry: RetryConfig = { ...config.retry, ...callRetry };
-    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-    const headers: Record<string, string> = {
-        Accept: 'application/json',
-        ...extra,
-        ...(fetchInit.headers as Record<string, string> | undefined),
-    };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
-    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-    let payload: BodyInit | undefined;
-    if (context.body !== undefined) {
-        const value = context.body;
-        const isBinary = value instanceof Blob ||
-            value instanceof ArrayBuffer ||
-            ArrayBuffer.isView(value as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-        const isURLSearchParams = value instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-            payload = value as BodyInit;
-        }
-        else {
-            payload = JSON.stringify(value);
-            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-                context.headers['Content-Type'] = 'application/json';
-            }
-        }
-    }
-    const doFetch = config.fetch ?? fetch;
-    const maxAttempts = 1 + (retry.retries ?? 0);
-    const retryOn = retry.retryOn ?? __defaultRetryOn;
-    const signal = fetchInit.signal ?? undefined;
-    let attempt = 0;
-    while (true) {
-        attempt++;
-        if (signal?.aborted)
-            throw __abortError(signal);
-        let response: Response;
-        try {
-            response = await doFetch(context.url, {
-                ...fetchInit,
-                method: context.method,
-                headers: context.headers,
-                body: payload,
-            });
-        }
-        catch (error) {
-            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
-                await __sleep(__retryDelay(retry, attempt, null), signal);
-                continue;
-            }
-            throw error;
-        }
-        // Reverse order: the last-registered middleware wraps closest to the network (onion).
-        for (let i = middleware.length - 1; i >= 0; i--) {
-            const onResponse = middleware[i].onResponse;
-            if (onResponse) {
-                const replaced = await onResponse(response, context);
-                if (replaced)
-                    response = replaced;
-            }
-        }
-        if (!response.ok &&
-            attempt < maxAttempts &&
-            !signal?.aborted &&
-            (await retryOn({ attempt, request: context, response }))) {
-            const retryAfter = response.headers.get('retry-after');
-            // Drain the abandoned response body before the next attempt: an unread body
-            // keeps the connection checked out (and can stall the pool) under Node/undici
-            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-            await response.body?.cancel().catch(() => undefined);
-            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
-            continue;
-        }
-        return { response, context };
-    }
-}
-
-async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-    if (kind === 'void' || response.status === 204)
-        return undefined;
-    if (kind === 'stream')
-        return response.body;
-    if (kind === 'blob')
-        return response.blob();
-    if (kind === 'arrayBuffer')
-        return response.arrayBuffer();
-    if (kind === 'formData')
-        return response.formData();
-    if (kind === 'text')
-        return response.text();
-    if (kind === 'json')
-        return response.json();
-    // 'auto' — negotiate from the response's content type.
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json'))
-        return response.json();
-    if (contentType.startsWith('text/'))
-        return response.text();
-    return response.blob();
-}
-
-async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
-    const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, op, url, sendInit, body);
-    if (!response.ok) {
-        const errorBody = await readError(response);
-        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
-        // Thread the error through each middleware's onError in turn (each may replace it).
-        for (const mw of __middleware(config)) {
-            if (mw.onError)
-                error = await mw.onError(error as ApiError, context);
-        }
-        throw error;
-    }
-    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
-    return (await __parse(response, kind)) as T;
-}
-
-async function readError(response: Response): Promise<unknown> {
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json')) {
-        return response.json().catch(() => undefined);
-    }
-    return response.text().catch(() => undefined);
-}
-
-const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-
-const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-function __defaultRetryOn(ctx: RetryContext): boolean {
-    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
-        return false;
-    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-    if (retryAfter) {
-        const seconds = Number(retryAfter);
-        if (!Number.isNaN(seconds))
-            return seconds * 1000;
-        const when = Date.parse(retryAfter);
-        if (!Number.isNaN(when))
-            return Math.max(0, when - Date.now());
-    }
-    const base = retry.retryDelay ?? 1000;
-    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-    return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
-    return new Promise((resolve, reject) => {
-        if (signal?.aborted) {
-            reject(__abortError(signal));
-            return;
-        }
-        const onAbort = () => {
-            clearTimeout(timer);
-            reject(__abortError(signal as AbortSignal));
-        };
-        const timer = setTimeout(() => {
-            if (signal)
-                signal.removeEventListener('abort', onAbort);
-            resolve();
-        }, ms);
-        if (signal)
-            signal.addEventListener('abort', onAbort, { once: true });
-    });
-}
-
-function __abortError(signal: AbortSignal): globalThis.Error {
-    const reason = (signal as {
-        reason?: unknown;
-    }).reason;
-    if (reason instanceof Error)
-        return reason;
-    return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * Normalize an operation's header-parameter object into a plain string record,
- * dropping any `undefined` / `null` entries (optional headers the caller omitted)
- * and stringifying the rest. Mirrors __buildUrl's handling of query values.
- */
-function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
-    const out: Record<string, string> = {};
-    for (const [key, value] of Object.entries(values)) {
-        if (value !== undefined && value !== null)
-            out[key] = String(value);
-    }
-    return out;
-}
-
-/**
- * A credential value, or a (possibly async) function that returns one per request.
- */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/**
- * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
- * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
- * to the global slots.
- */
-export type AuthCredentials = {
-    bearer?: TokenProvider;
-    apiKey?: Record<string, TokenProvider>;
-};
-
-let __bearerToken: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
- * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
- * (possibly async) function resolved per request.
- */
-export function setBearer(token: TokenProvider | null): void {
-    __bearerToken = token;
-}
-
-let __apiKey_ApiKey: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
- * string or a (possibly async) function resolved per request.
- */
-export function setApiKey(key: TokenProvider | null): void {
-    __apiKey_ApiKey = key;
-}
-
-/**
- * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
- */
-async function __resolve(slot: TokenProvider | null): Promise<string | null> {
-    if (slot === null)
-        return null;
-    return typeof slot === "function" ? slot() : slot;
-}
-
-/**
- * Build the auth `headers` and `query` for an operation from the currently-set credentials.
- * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
- * can always override by passing their own `init.headers`.
- */
-async function __auth(schemes: string[], config: ClientConfig): Promise<{
-    headers: Record<string, string>;
-    query: Record<string, string>;
-}> {
-    const headers: Record<string, string> = {};
-    const query: Record<string, string> = {};
-    const cookies: string[] = [];
-    for (const scheme of schemes) {
-        switch (scheme) {
-            case "OAuth2": {
-                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
-                if (v !== null)
-                    headers["Authorization"] = `Bearer ${v}`;
-                break;
-            }
-            case "ApiKey": {
-                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
-                if (v !== null)
-                    headers["X-API-Key"] = v;
-                break;
-            }
-        }
-    }
-    if (cookies.length > 0)
-        headers["Cookie"] = cookies.join("; ");
-    return { headers, query };
-}
-
 export type ListMenuItemsResult = MenuItemList;
 
 export type ListMenuItemsParams = {
@@ -1062,64 +469,6 @@ export type ListMenuItemsVariables = {
     params?: ListMenuItemsParams;
 };
 
-/**
- * List all menu items
- *
- * Retrieve a collection of menu items with optional filtering and pagination.
- */
-export async function listMenuItems(params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-    return __request<MenuItemList>(__config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
-}
-
 export type CreateMenuItemResult = MenuItem;
 
 export type CreateMenuItemBody = FormData;
@@ -1128,16 +477,6 @@ export type CreateMenuItemVariables = {
     body: CreateMenuItemBody;
 };
 
-/**
- * Create menu item
- *
- * Create a new menu item.
- */
-export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<MenuItem>(__config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
 export type DeleteMenuItemResult = void;
 
 export type DeleteMenuItemVariables = {
@@ -1148,16 +487,6 @@ export type DeleteMenuItemVariables = {
     menuItemId: string;
 };
 
-/**
- * Delete a menu item
- *
- * Delete an existing menu item.
- */
-export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
 export type GetMenuItemPhotoResult = Blob | string;
 
 export type GetMenuItemPhotoParams = {
@@ -1176,20 +505,6 @@ export type GetMenuItemPhotoVariables = {
     params?: GetMenuItemPhotoParams;
 };
 
-/**
- * Retrieve a menu item photo
- *
- * Retrieve the product photo image for a specific menu item.
- */
-export async function getMenuItemPhoto(menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}): Promise<Blob | string> {
-    return __request<Blob | string>(__config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
-}
-
 export type ListOrdersResult = OrderList;
 
 export type ListOrdersParams = {
@@ -1247,95 +562,25 @@ export type ListOrdersVariables = {
     params?: ListOrdersParams;
 };
 
-/**
- * List all orders
- *
- * Retrieve a collection of orders with optional filtering and pagination.
- */
-export async function listOrders(params: {
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
     /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
      */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderList> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderList>(__config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-/**
- * Create order
- *
- * Create a new order.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
     /**
      * ID of the order to retrieve.
      * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
@@ -1344,22 +589,6 @@ export type GetOrderByIdVariables = {
     headers?: GetOrderByIdHeaders;
 };
 
-/**
- * Retrieve an order
- *
- * Retrieve a single order by its ID.
- */
-export async function getOrderById(orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
-}
-
 export type DeleteOrderResult = void;
 
 export type DeleteOrderVariables = {
@@ -1370,17 +599,6 @@ export type DeleteOrderVariables = {
     orderId: string;
 };
 
-/**
- * Delete an order
- *
- * Delete the order.
- * To keep the order history, the order should be canceled instead of deleted.
- */
-export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
 export type UpdateOrderResult = Order;
 
 export type UpdateOrderBody = {
@@ -1396,19 +614,6 @@ export type UpdateOrderVariables = {
     body?: UpdateOrderBody;
 };
 
-/**
- * Partially update an order
- *
- * Update an existing order status.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function updateOrder(orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
 export type ListOrderItemsResult = OrderItem[];
 
 export type ListOrderItemsParams = {
@@ -1436,13 +641,1006 @@ export type ListOrderItemsVariables = {
     params?: ListOrderItemsParams;
 };
 
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    listMenuItems: {
+        args: {
+            params?: ListMenuItemsParams;
+        };
+        result: ListMenuItemsResult;
+    };
+    createMenuItem: {
+        args: {
+            body: CreateMenuItemBody;
+        };
+        result: CreateMenuItemResult;
+    };
+    deleteMenuItem: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+        };
+        result: DeleteMenuItemResult;
+    };
+    getMenuItemPhoto: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+            params?: GetMenuItemPhotoParams;
+        };
+        result: GetMenuItemPhotoResult;
+    };
+    listOrders: {
+        args: {
+            params?: ListOrdersParams;
+        };
+        result: ListOrdersResult;
+    };
+    createOrder: {
+        args: {
+            body: CreateOrderBody;
+        };
+        result: CreateOrderResult;
+    };
+    getOrderById: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            headers?: GetOrderByIdHeaders;
+        };
+        result: GetOrderByIdResult;
+    };
+    deleteOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+        };
+        result: DeleteOrderResult;
+    };
+    updateOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            body?: UpdateOrderBody;
+        };
+        result: UpdateOrderResult;
+    };
+    listOrderItems: {
+        args: {
+            params?: ListOrderItemsParams;
+        };
+        result: ListOrderItemsResult;
+    };
+    getRevenue: {
+        args: {
+            params?: GetRevenueParams;
+        };
+        result: GetRevenueResult;
+    };
+    registerOAuth2Client: {
+        args: {
+            body: RegisterOAuth2ClientBody;
+        };
+        result: RegisterOAuth2ClientResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
+export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : NoRequiredKeys<Ops[K]['args']> extends true
+      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
+
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/** Resolve a credential: a literal passes through; a function is awaited per request. */
+async function resolveToken(provider: TokenProvider): Promise<string> {
+  return typeof provider === 'function' ? await provider() : provider;
+}
+
+/**
+ * Build the auth headers/query for one operation's `security` requirements from the
+ * instance credentials (`config.auth`) — capability module, wired into `createClient`.
+ * A scheme with no configured credential contributes nothing (the request is sent
+ * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
+ */
+async function resolveAuth(
+  security: readonly SecuritySpec[],
+  config: ClientConfig
+): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const headers: Record<string, string> = {};
+  const query: Record<string, string> = {};
+  const cookies: string[] = [];
+  for (const scheme of security) {
+    if (scheme.kind === 'apiKey') {
+      const provider = config.auth?.apiKey?.[scheme.scheme];
+      if (provider === undefined) continue;
+      const value = await resolveToken(provider);
+      if (scheme.in === 'header') headers[scheme.name] = value;
+      else if (scheme.in === 'query') query[scheme.name] = value;
+      else cookies.push(`${scheme.name}=${value}`);
+    } else if (scheme.kind === 'bearer') {
+      const provider = config.auth?.bearer;
+      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
+    } else {
+      const basic = config.auth?.basic;
+      if (basic !== undefined) {
+        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+      }
+    }
+  }
+  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
+  return { headers, query };
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+};
+
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
 /**
- * List all order items with menu item details
- *
- * Returns an array of order items for a specific order.
- * Use the `filter` parameter to filter by order ID.
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
  */
-export async function listOrderItems(params: {
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
+}
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe.redocly.com" });
+
+export const { configure, use } = client;
+export const setBearer = client.auth.bearer;
+export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
+export const listMenuItems = (params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
     /**
      * Filters the collection items using space-separated `field:value` pairs.
      *
@@ -1461,39 +1659,115 @@ export async function listOrderItems(params: {
      * - `status:placed createdAt:7d` - Combine multiple filters.
      */
     filter?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderItem[]>(__config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
     /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
      */
-    startDate?: string;
+    search?: string;
     /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
      */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-/**
- * Get revenue statistics
- *
- * Retrieve revenue statistics for a configurable date range.
- * Returns revenue, order counts, average order amount, and other useful statistics.
- */
-export async function getRevenue(params: {
+    limit?: number;
+} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
+export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
+export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
+export const getMenuItemPhoto = (menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
+export const listOrders = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
+export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
+export const getOrderById = (orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
+export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
+export const updateOrder = (orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
+export const listOrderItems = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
+export const getRevenue = (params: {
     /**
      * Start date for the revenue calculation period (ISO 8601 datetime format).
      * Defaults to 30 days ago if not provided.
@@ -1506,29 +1780,5 @@ export async function getRevenue(params: {
      * @format date
      */
     endDate?: string;
-} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
-    const __a = await __auth(["ApiKey"], __config);
-    return __request<RevenueStatistics>(__config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Create OAuth2 client
- *
- * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
- * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
- *   `redirectUris` must be provided (per RFC 7591 Section 2).
- * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
- * Returns the registered client information per RFC 7591, including:
- * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
- */
-export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-    return __request<OAuth2Client>(__config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
-}
+} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
+export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
diff --git a/tests/e2e/generate-client/cafe.test.ts b/tests/e2e/generate-client/cafe.test.ts
index ad5822f821..f0f959edcc 100644
--- a/tests/e2e/generate-client/cafe.test.ts
+++ b/tests/e2e/generate-client/cafe.test.ts
@@ -11,7 +11,7 @@ const consumerDir = join(__dirname, 'cafe-consumer');
 const generatedFile = join(consumerDir, 'api.ts');
 const serverScript = join(consumerDir, 'server.ts');
 const indexScript = join(consumerDir, 'index.ts');
-const setBaseUrlScript = join(consumerDir, 'index-setbaseurl.ts');
+const configureScript = join(consumerDir, 'index-configure.ts');
 
 const SERVER_PORT = 3101;
 const SERVER_BASE = `http://127.0.0.1:${SERVER_PORT}`;
@@ -74,7 +74,7 @@ describe('generate-client end-to-end (cafe.yaml)', () => {
   let log: LogEntry[] = [];
   /** Raw generator output — what the CLI emits from cafe.yaml without any overrides. */
   let rawGenerated = '';
-  /** Generator output the consumer imports — same source, but BASE pinned at the mock via --server-url. */
+  /** Generator output the consumer imports — same source, but serverUrl pinned at the mock via --server-url. */
   let generated = '';
 
   beforeAll(async () => {
@@ -94,7 +94,7 @@ describe('generate-client end-to-end (cafe.yaml)', () => {
 
     await waitForServerReady(15_000);
 
-    // First pass: capture the *canonical* output (spec-derived BASE) for the file snapshot.
+    // First pass: capture the *canonical* output (spec-derived serverUrl) for the file snapshot.
     // We don't keep this on disk — the consumer needs the mock-targeted variant.
     const snapshotGen = spawnSync(
       'node',
@@ -125,8 +125,10 @@ describe('generate-client end-to-end (cafe.yaml)', () => {
       throw new Error(`generate-client (consumer pass) failed:\n${consumerGen.stderr}`);
     }
     generated = readFileSync(generatedFile, 'utf-8');
-    if (!generated.includes(`let BASE = "${SERVER_BASE}"`)) {
-      throw new Error(`--server-url was not honoured; expected \`let BASE = "${SERVER_BASE}"\``);
+    if (!generated.includes(`{ serverUrl: "${SERVER_BASE}" }`)) {
+      throw new Error(
+        `--server-url was not honoured; expected \`{ serverUrl: "${SERVER_BASE}" }\``
+      );
     }
 
     // Type-check the consumer.
@@ -177,7 +179,7 @@ describe('generate-client end-to-end (cafe.yaml)', () => {
     expect(generated).toContain('export type OAuth2Client = {');
   });
 
-  test('generated file declares one function per operation', () => {
+  test('generated file declares one flat call-sugar function per operation', () => {
     const expected = [
       'listMenuItems',
       'createMenuItem',
@@ -193,39 +195,41 @@ describe('generate-client end-to-end (cafe.yaml)', () => {
       'registerOAuth2Client',
     ];
     for (const name of expected) {
-      expect(generated).toContain(`export async function ${name}`);
+      expect(generated).toContain(`export const ${name} = (`);
     }
   });
 
-  test('exports an OPERATIONS metadata map keyed by operationId (method + path template)', () => {
+  test('exports an OPERATIONS descriptor map keyed by operationId (method + path template)', () => {
     expect(generated).toContain('export const OPERATIONS = {');
-    expect(generated).toContain('} as const;');
+    expect(generated).toContain('} as const satisfies Record<string, OperationDescriptor>;');
     expect(generated).toContain('export type OperationId = keyof typeof OPERATIONS;');
-    expect(generated).toMatch(
-      /export type OperationMetadata = \{\s*readonly method: string;\s*readonly path: string;\s*readonly tags: readonly string\[\];\s*\};/
-    );
     // A path-param operation keeps its `{param}` template, uppercased method, and tags.
     expect(generated).toContain(
-      'getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] }'
+      'getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"]'
+    );
+    expect(generated).toContain(
+      'updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"]'
     );
     expect(generated).toContain(
-      'updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] }'
+      'createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"]'
     );
+    // The typed instance client is built over the descriptors.
     expect(generated).toContain(
-      'createOrder: { method: "POST", path: "/orders", tags: ["Orders"] }'
+      'export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS,'
     );
+    expect(generated).toContain('export const { configure, use } = client;');
   });
 
   test('generated file uses ergonomic signatures (positional path params + params object + body)', () => {
-    expect(generated).toContain('export async function deleteMenuItem(menuItemId: string,');
-    expect(generated).toContain('export async function getMenuItemPhoto(menuItemId: string,');
-    expect(generated).toContain('export async function updateOrder(orderId: string,');
-    expect(generated).toContain('export async function listMenuItems(params:');
+    expect(generated).toContain('export const deleteMenuItem = (menuItemId: string,');
+    expect(generated).toContain('export const getMenuItemPhoto = (menuItemId: string,');
+    expect(generated).toContain('export const updateOrder = (orderId: string,');
+    expect(generated).toContain('export const listMenuItems = (params:');
     // readOnly fields are dropped from the create body (Bucket C).
     expect(generated).toContain(
-      'export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">,'
+      'export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">,'
     );
-    expect(generated).toContain('export async function createMenuItem(body: FormData,');
+    expect(generated).toContain('export const createMenuItem = (body: FormData,');
   });
 
   // Named string enums get a runtime const-object companion by default, which the
@@ -400,22 +404,22 @@ describe('generate-client end-to-end (cafe.yaml)', () => {
     }
   });
 
-  // `setServerUrl()` is exercised mid-flight: the first call hits the mock, the
-  // second (after flipping to an unreachable host) fails to connect, and the
+  // `configure({ serverUrl })` is exercised mid-flight: the first call hits the mock,
+  // the second (after flipping to an unreachable host) fails to connect, and the
   // third (after restoring) succeeds again.
-  test('setServerUrl() switches the BASE binding for subsequent operations', () => {
-    const run = spawnSync('npx', ['tsx', setBaseUrlScript], {
+  test('configure({ serverUrl }) switches the base URL for subsequent operations', () => {
+    const run = spawnSync('npx', ['tsx', configureScript], {
       encoding: 'utf-8',
       cwd: consumerDir,
       env: { ...process.env, CAFE_BASE: SERVER_BASE },
     });
-    expect(run.status, `setServerUrl consumer stderr:\n${run.stderr}`).toBe(0);
+    expect(run.status, `configure consumer stderr:\n${run.stderr}`).toBe(0);
     const steps = JSON.parse(run.stdout.trim()) as Array<
       { kind: 'ok'; name: string } | { kind: 'err'; name: string; error: string }
     >;
     expect(steps.find((s) => s.name === 'initial-call-against-mock')?.kind).toBe('ok');
-    const flipped = steps.find((s) => s.name === 'call-after-setServerUrl-to-unreachable');
+    const flipped = steps.find((s) => s.name === 'call-after-configure-to-unreachable');
     expect(flipped?.kind).toBe('err');
-    expect(steps.find((s) => s.name === 'call-after-setServerUrl-restored')?.kind).toBe('ok');
+    expect(steps.find((s) => s.name === 'call-after-configure-restored')?.kind).toBe('ok');
   });
 });
diff --git a/tests/e2e/generate-client/error-mode.test.ts b/tests/e2e/generate-client/error-mode.test.ts
index b161afed88..2238952239 100644
--- a/tests/e2e/generate-client/error-mode.test.ts
+++ b/tests/e2e/generate-client/error-mode.test.ts
@@ -1,14 +1,14 @@
 // e2e for `--error-mode result`: the result-shape / typed-errors client.
 //
 // We assert on the generated source (string checks) and strict-tsc the output
-// (single-file and the whole tags-split dir) — this is the same lightweight
+// (single-file and the split two-file set) — this is the same lightweight
 // harness used by spec-versions.test.ts. We deliberately do NOT spin up the
 // mock-server behavioral harness (base.test.ts / cafe.test.ts), which needs a
 // dedicated consumer dir with server.ts/index.ts: strict tsc over the
 // discriminated `Result<TData, TError>` already proves the typed `error` flows
-// through, and the behavioral retry/abort path is shared (`__send`) and covered
-// by the existing throw-mode base e2e. The tags-split case guards the Task-4
-// fix that multi-file modes call `__requestResult` (not `__request`).
+// through, and the behavioral retry/abort path is shared (the runtime's `send`)
+// and covered by the existing throw-mode base e2e. The split case guards that
+// the entry bakes `errorMode: "result"` into the client config too.
 import { spawnSync } from 'node:child_process';
 import {
   existsSync,
@@ -73,10 +73,11 @@ describe('generate-client error mode', () => {
     expect(existsSync(out)).toBe(true);
 
     const generated = readFileSync(out, 'utf-8');
-    expect(generated).toContain('export async function getThing');
-    expect(generated).toContain('Promise<Result<');
+    expect(generated).toContain('export const getThing = (');
+    expect(generated).toContain('result: Result<GetThingResult, GetThingError>;');
     expect(generated).toContain('export type GetThingError = ProblemDetails;');
-    expect(generated).toContain('__requestResult');
+    // The mode is baked into the client instance config (configure() cannot flip it).
+    expect(generated).toContain('errorMode: "result"');
 
     writeFileSync(
       join(dir, 'tsconfig.json'),
@@ -88,9 +89,9 @@ describe('generate-client error mode', () => {
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
-  it('tags-split result mode: per-tag endpoints call __requestResult, strict tsc passes over the dir', () => {
+  it('split result mode: the entry bakes errorMode result, strict tsc passes over both files', () => {
     const dir = mkdtempSync(join(tmpdir(), 'ots-errmode-split-'));
-    // Multi-file modes take a `.ts` entry path; per-tag dirs are written beside it.
+    // Split mode takes a `.ts` entry path; the schemas file is written beside it.
     const entry = join(dir, 'client.ts');
     const res = spawnSync(
       'node',
@@ -103,7 +104,7 @@ describe('generate-client error mode', () => {
         '--error-mode',
         'result',
         '--output-mode',
-        'tags-split',
+        'split',
       ],
       { encoding: 'utf-8', cwd: repoRoot }
     );
@@ -111,19 +112,12 @@ describe('generate-client error mode', () => {
     expect(existsSync(entry)).toBe(true);
 
     const files = collectTsFiles(dir);
-    const contents = files.map((f) => ({ f, src: readFileSync(f, 'utf-8') }));
+    expect(files.map((f) => f.split('/').pop()).sort()).toEqual(['client.schemas.ts', 'client.ts']);
 
-    // The endpoint call site must use the result terminal in multi-file modes
-    // (Task-4 fix) — at least one file calls `__requestResult`, and no file
-    // contains a bare throw-mode `__request<` call.
-    expect(contents.some(({ src }) => src.includes('__requestResult'))).toBe(true);
-    for (const { f, src } of contents) {
-      // `__requestResult<` is fine; a bare throw-mode `__request<` is not.
-      expect(
-        /__request</.test(src.replace(/__requestResult/g, '')),
-        `bare __request< in ${f}`
-      ).toBe(false);
-    }
+    // The result shape is baked into the entry: typed Ops results and the instance config.
+    const entrySrc = readFileSync(entry, 'utf-8');
+    expect(entrySrc).toContain('errorMode: "result"');
+    expect(entrySrc).toContain('Result<');
 
     // Strict tsc over the whole tree (bundler resolution handles the `.js` ESM imports).
     const tsc = spawnSync(
diff --git a/tests/e2e/generate-client/examples.test.ts b/tests/e2e/generate-client/examples.test.ts
index b44fcba686..37f24553c3 100644
--- a/tests/e2e/generate-client/examples.test.ts
+++ b/tests/e2e/generate-client/examples.test.ts
@@ -14,11 +14,16 @@ const EXAMPLES = [
   'fetch-functions',
   'customization',
   'baked-setup',
-  'service-class',
   'zod',
   'mock',
   'tanstack-query',
   'programmatic',
+  'package-runtime',
+  'zero-install-quickstart',
+  'configure-and-middleware',
+  'multi-instance',
+  'sse-streaming',
+  'vendored-edge',
 ];
 
 /**
diff --git a/tests/e2e/generate-client/examples/README.md b/tests/e2e/generate-client/examples/README.md
index 7ebdc5d038..c362f129c2 100644
--- a/tests/e2e/generate-client/examples/README.md
+++ b/tests/e2e/generate-client/examples/README.md
@@ -2,27 +2,33 @@
 
 Runnable examples of clients generated by `@redocly/client-generator`. Each is standalone with its
 own dependencies; the generated client under `src/api/` is checked in and **drift-checked against the
-generator in CI** (`tests/e2e/generate-client/examples.test.ts`). The first five are Vite apps that _consume_ a client
+generator in CI** (`tests/e2e/generate-client/examples.test.ts`). Most are Vite apps that _consume_ a client
 generated via the `redocly generate-client` CLI (a `redocly.yaml`); `programmatic` _generates_ one with
 the `generateClient(...)` API.
 
-| Example                              | How it's generated            | Shows                                                                                   |
-| ------------------------------------ | ----------------------------- | --------------------------------------------------------------------------------------- |
-| [fetch-functions](./fetch-functions) | CLI · `sdk`, functions        | free functions + `ApiError`                                                             |
-| [customization](./customization)     | CLI · `sdk`, functions        | request/response middleware, `ctx.operation` targeting, body mutation, custom transport |
-| [baked-setup](./baked-setup)         | CLI · `sdk`, functions        | publisher defaults baked into the client via `--setup` (`defineClientSetup`)            |
-| [service-class](./service-class)     | CLI · `sdk`, service-class    | `new Client({ serverUrl })`, per-instance `auth`                                        |
-| [zod](./zod)                         | CLI · `sdk`, `zod`            | validating responses with generated zod schemas                                         |
-| [tanstack-query](./tanstack-query)   | CLI · `sdk`, `tanstack-query` | React `useQuery(<op>Options())`                                                         |
-| [mock](./mock)                       | CLI · `sdk`, `mock`           | MSW handlers from generated `handlers`                                                  |
-| [programmatic](./programmatic)       | `generateClient(...)` API     | generating the client from a Node script                                                |
+| Example                                                | How it's generated            | Shows                                                                                                                                     |
+| ------------------------------------------------------ | ----------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
+| [fetch-functions](./fetch-functions)                   | CLI · `sdk`, functions        | free functions + `ApiError`                                                                                                               |
+| [customization](./customization)                       | CLI · `sdk`, functions        | request/response middleware, `ctx.operation` targeting, body mutation, custom transport                                                   |
+| [baked-setup](./baked-setup)                           | CLI · `sdk`, functions        | publisher defaults baked into the client via `--setup` (`defineClientSetup`)                                                              |
+| [zod](./zod)                                           | CLI · `sdk`, `zod`            | validating responses with generated zod schemas                                                                                           |
+| [tanstack-query](./tanstack-query)                     | CLI · `sdk`, `tanstack-query` | React `useQuery(<op>Options())`                                                                                                           |
+| [mock](./mock)                                         | CLI · `sdk`, `mock`           | MSW handlers from generated `handlers`                                                                                                    |
+| [programmatic](./programmatic)                         | `generateClient(...)` API     | generating the client from a Node script                                                                                                  |
+| [package-runtime](./package-runtime)                   | CLI · `sdk`, package runtime  | `runtime: package` — types + descriptors only; the versioned runtime is imported from `@redocly/client-generator`, fixes via `npm update` |
+| [zero-install-quickstart](./zero-install-quickstart)   | CLI · `sdk`                   | the first-touch loop: generate → import → call; one self-contained file, zero runtime dependencies                                        |
+| [configure-and-middleware](./configure-and-middleware) | CLI · `sdk`                   | `configure({ serverUrl, retry })`, `use()` targeting `ctx.operation.id` (literal union), auth setter, typed `ApiError.body`               |
+| [multi-instance](./multi-instance)                     | CLI · `sdk`, package runtime  | per-tenant instances via `createClient(OPERATIONS)` — works in both runtimes; this example uses `runtime: package`                        |
+| [sse-streaming](./sse-streaming)                       | CLI · `sdk`                   | typed `for await` over SSE, auto-reconnect via `Last-Event-ID` (`reconnectDelay`/`reconnect: false`), clean abort                         |
+| [vendored-edge](./vendored-edge)                       | CLI · `sdk`                   | the generated file copied into a no-npm edge worker (`export default { fetch }`); `typescript` is the only dev tool                       |
 
 ## Run one
 
 ```bash
 cd tests/e2e/generate-client/examples/<name>
 npm install
-npm run dev        # the Vite apps; the `programmatic` example uses `npm run generate`
+npm run dev        # the Vite apps; `programmatic` uses `npm run generate`,
+                   # `zero-install-quickstart` `npm start`, `vendored-edge` `npm run typecheck`
 ```
 
 To regenerate every example's client from the local generator, from the repo root:
diff --git a/tests/e2e/generate-client/examples/baked-setup/redocly.yaml b/tests/e2e/generate-client/examples/baked-setup/redocly.yaml
index 019a947412..9ff1fc402e 100644
--- a/tests/e2e/generate-client/examples/baked-setup/redocly.yaml
+++ b/tests/e2e/generate-client/examples/baked-setup/redocly.yaml
@@ -8,5 +8,4 @@ apis:
     client:
       generators:
         - sdk
-      facade: functions
       setup: ./client-setup.ts
diff --git a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
index 616f0c0e6c..1603af2ecc 100644
--- a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
@@ -412,599 +412,6 @@ export function isDessert(value: MenuItem): value is Dessert {
     return (value as Record<string, unknown>)["category"] === "dessert";
 }
 
-/**
- * Static metadata for every operation, keyed by operationId: the HTTP `method`
- * and the `path` template (with `{param}` placeholders intact). Minification-safe
- * — useful for building cache/query keys, tracing span names, and request logging
- * without re-deriving them at each call site.
- */
-export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
-    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
-    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
-    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
-    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
-    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
-    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
-} as const;
-
-/**
- * The operationId of any operation in this client.
- */
-export type OperationId = keyof typeof OPERATIONS;
-
-/**
- * Static metadata describing one operation: its HTTP method, path template, and tags.
- */
-export type OperationMetadata = {
-    readonly method: string;
-    readonly path: string;
-    readonly tags: readonly string[];
-};
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
-
-let BASE = "https://api.cafe.redocly.com";
-
-/** Identity of the operation a request belongs to. Stable across path interpolation. */
-export type OperationContext = {
-    id: OperationId;
-    path: OperationPath;
-    tags: OperationTag[];
-};
-
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
-export type RequestContext = {
-    url: string;
-    method: string;
-    headers: Record<string, string>;
-    body?: unknown;
-    /** The operation being called: its id (operationId), path template, and tags. */
-    operation: OperationContext;
-};
-
-/**
- * Configuration and extension hooks for a client. Supplied per-instance via
- * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
- * (functions facade).
- */
-export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
-    serverUrl?: string;
-    /** Extra headers merged into every request; a function is invoked per request. */
-    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
-    /** Transport used to issue requests. Defaults to the global `fetch`. */
-    fetch?: typeof fetch;
-    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    /** Observe — or replace, by returning a `Response` — the response before parsing. */
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    /**
-     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
-     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
-     */
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
-    /**
-     * Composable interceptors run around every request, alongside the single
-     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
-     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
-     * the last-registered middleware wraps closest to the network. Register more at runtime
-     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
-     */
-    middleware?: Middleware[];
-    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
-    retry?: RetryConfig;
-    /**
-     * Per-instance auth credentials. When set, they override the module-global
-     * `set*` helpers for requests made through this config (each scheme falls back
-     * to its global slot when omitted here). Only the schemes an operation declares
-     * in its `security` are ever sent.
-     */
-    auth?: AuthCredentials;
-};
-
-/**
- * A request interceptor; every field is optional, so a middleware can hook any subset of
- * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
- * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
- * failure into the error to throw, threaded through each middleware in turn.
- */
-export type Middleware = {
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/** Context handed to `retryOn` for the attempt that just failed. */
-export type RetryContext = {
-    /** 1-based number of the attempt that just failed. */
-    attempt: number;
-    /** The request that was attempted. */
-    request: RequestContext;
-    /** Present when the server returned a (non-ok) response. */
-    response?: Response;
-    /** Present when the transport threw (network error, DNS, connection reset). */
-    error?: unknown;
-};
-
-/** Retry policy; all fields optional with sensible defaults. */
-export type RetryConfig = {
-    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
-    retries?: number;
-    /** Base delay in milliseconds. Default 1000. */
-    retryDelay?: number;
-    /** Backoff shape. Default 'exponential'. */
-    retryStrategy?: RetryStrategy;
-    /** Apply full jitter over the computed delay. Default true. */
-    jitter?: boolean;
-    /**
-     * Decide whether to retry a failed attempt. Default: retry only idempotent
-     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
-     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
-     */
-    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
-};
-
-/**
- * How the response body is read. `'auto'` negotiates from the content type (the
- * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
- */
-export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
-
-/**
- * The trailing per-operation argument: standard `RequestInit` plus an optional
- * per-call retry override and a `parseAs` escape hatch.
- *
- * `parseAs` forces how the response body is read; overrides the inferred kind.
- * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
- * override — the static return type is unchanged.
- */
-export type RequestOptions = RequestInit & {
-    retry?: Partial<RetryConfig>;
-    parseAs?: ParseAs;
-};
-
-/**
- * Override the base URL used by every generated operation. Useful when the
- * runtime environment differs from the value declared in `servers[0].url`
- * (e.g. dev / staging / prod toggles in a single-page app).
- *
- * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ serverUrl })`.
- */
-export function setServerUrl(url: string): void {
-    BASE = url;
-}
-
-/** The global config used by the functions facade (see `configure`). */
-const __config: ClientConfig = {};
-
-/**
- * Merge `config` into the global configuration used by the functions facade —
- * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
- * hooks once for every free function. The service-class facade configures per
- * instance instead (`new Client(config)`).
- */
-export function configure(config: ClientConfig): void {
-    Object.assign(__config, config);
-}
-
-/**
- * Append interceptors to the functions facade's global middleware chain (see
- * `ClientConfig.middleware`). The service-class facade registers per instance via
- * `<Client>.use(...)` instead.
- */
-export function use(...middleware: Middleware[]): void {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    __config.middleware = [...(__config.middleware ?? []), ...middleware];
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function __middleware(config: ClientConfig): Middleware[] {
-    const single = config.onRequest || config.onResponse || config.onError
-        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-        : [];
-    return [...single, ...(config.middleware ?? [])];
-}
-
-export class ApiError extends Error {
-    public readonly url: string;
-    public readonly status: number;
-    public readonly statusText: string;
-    public readonly body: unknown;
-    constructor(url: string, status: number, statusText: string, body: unknown) {
-        super(`Request failed with status ${status}`);
-        this.name = 'ApiError';
-        this.url = url;
-        this.status = status;
-        this.statusText = statusText;
-        this.body = body;
-    }
-}
-
-type QueryPrimitive = string | number | boolean;
-
-type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
-
-/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
-type QueryStyle = {
-    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-    explode: boolean;
-    allowReserved?: boolean;
-};
-
-/**
- * Percent-encode `value` but leave the RFC-3986 reserved set
- * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
- */
-function __encodeReserved(value: string): string {
-    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
-}
-
-function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
-    if (!query)
-        return url;
-    const params = new URLSearchParams();
-    const raw: string[] = [];
-    for (const [key, value] of Object.entries(query)) {
-        if (value === undefined || value === null)
-            continue;
-        const spec = styles?.[key];
-        if (!spec) {
-            if (Array.isArray(value)) {
-                for (const v of value) {
-                    if (v !== undefined && v !== null)
-                        params.append(key, String(v));
-                }
-            }
-            else if (typeof value === 'object') {
-                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-                for (const [subKey, subValue] of Object.entries(value)) {
-                    if (subValue !== undefined && subValue !== null) {
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                    }
-                }
-            }
-            else {
-                params.append(key, String(value));
-            }
-            continue;
-        }
-        if (Array.isArray(value)) {
-            const items = value.filter((v) => v !== undefined && v !== null).map(String);
-            if (spec.style === 'form' && spec.explode) {
-                for (const v of items) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}=${__encodeReserved(v)}`);
-                    else
-                        params.append(key, v);
-                }
-            }
-            else {
-                // Delimited styles put the LITERAL delimiter on the wire; only the
-                // values are encoded. `%20` (not `+`) is the literal space delimiter.
-                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
-                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-            }
-        }
-        else if (typeof value === 'object') {
-            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-            for (const [subKey, subValue] of Object.entries(value)) {
-                if (subValue !== undefined && subValue !== null) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
-                    else
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                }
-            }
-        }
-        else if (spec.allowReserved) {
-            raw.push(`${key}=${__encodeReserved(String(value))}`);
-        }
-        else {
-            params.append(key, String(value));
-        }
-    }
-    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-    return qs ? `${url}?${qs}` : url;
-}
-
-async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
-    response: Response;
-    context: RequestContext;
-}> {
-    const { retry: callRetry, ...fetchInit } = init;
-    const retry: RetryConfig = { ...config.retry, ...callRetry };
-    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-    const headers: Record<string, string> = {
-        Accept: 'application/json',
-        ...extra,
-        ...(fetchInit.headers as Record<string, string> | undefined),
-    };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
-    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-    let payload: BodyInit | undefined;
-    if (context.body !== undefined) {
-        const value = context.body;
-        const isBinary = value instanceof Blob ||
-            value instanceof ArrayBuffer ||
-            ArrayBuffer.isView(value as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-        const isURLSearchParams = value instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-            payload = value as BodyInit;
-        }
-        else {
-            payload = JSON.stringify(value);
-            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-                context.headers['Content-Type'] = 'application/json';
-            }
-        }
-    }
-    const doFetch = config.fetch ?? fetch;
-    const maxAttempts = 1 + (retry.retries ?? 0);
-    const retryOn = retry.retryOn ?? __defaultRetryOn;
-    const signal = fetchInit.signal ?? undefined;
-    let attempt = 0;
-    while (true) {
-        attempt++;
-        if (signal?.aborted)
-            throw __abortError(signal);
-        let response: Response;
-        try {
-            response = await doFetch(context.url, {
-                ...fetchInit,
-                method: context.method,
-                headers: context.headers,
-                body: payload,
-            });
-        }
-        catch (error) {
-            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
-                await __sleep(__retryDelay(retry, attempt, null), signal);
-                continue;
-            }
-            throw error;
-        }
-        // Reverse order: the last-registered middleware wraps closest to the network (onion).
-        for (let i = middleware.length - 1; i >= 0; i--) {
-            const onResponse = middleware[i].onResponse;
-            if (onResponse) {
-                const replaced = await onResponse(response, context);
-                if (replaced)
-                    response = replaced;
-            }
-        }
-        if (!response.ok &&
-            attempt < maxAttempts &&
-            !signal?.aborted &&
-            (await retryOn({ attempt, request: context, response }))) {
-            const retryAfter = response.headers.get('retry-after');
-            // Drain the abandoned response body before the next attempt: an unread body
-            // keeps the connection checked out (and can stall the pool) under Node/undici
-            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-            await response.body?.cancel().catch(() => undefined);
-            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
-            continue;
-        }
-        return { response, context };
-    }
-}
-
-async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-    if (kind === 'void' || response.status === 204)
-        return undefined;
-    if (kind === 'stream')
-        return response.body;
-    if (kind === 'blob')
-        return response.blob();
-    if (kind === 'arrayBuffer')
-        return response.arrayBuffer();
-    if (kind === 'formData')
-        return response.formData();
-    if (kind === 'text')
-        return response.text();
-    if (kind === 'json')
-        return response.json();
-    // 'auto' — negotiate from the response's content type.
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json'))
-        return response.json();
-    if (contentType.startsWith('text/'))
-        return response.text();
-    return response.blob();
-}
-
-async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
-    const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, op, url, sendInit, body);
-    if (!response.ok) {
-        const errorBody = await readError(response);
-        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
-        // Thread the error through each middleware's onError in turn (each may replace it).
-        for (const mw of __middleware(config)) {
-            if (mw.onError)
-                error = await mw.onError(error as ApiError, context);
-        }
-        throw error;
-    }
-    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
-    return (await __parse(response, kind)) as T;
-}
-
-async function readError(response: Response): Promise<unknown> {
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json')) {
-        return response.json().catch(() => undefined);
-    }
-    return response.text().catch(() => undefined);
-}
-
-const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-
-const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-function __defaultRetryOn(ctx: RetryContext): boolean {
-    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
-        return false;
-    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-    if (retryAfter) {
-        const seconds = Number(retryAfter);
-        if (!Number.isNaN(seconds))
-            return seconds * 1000;
-        const when = Date.parse(retryAfter);
-        if (!Number.isNaN(when))
-            return Math.max(0, when - Date.now());
-    }
-    const base = retry.retryDelay ?? 1000;
-    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-    return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
-    return new Promise((resolve, reject) => {
-        if (signal?.aborted) {
-            reject(__abortError(signal));
-            return;
-        }
-        const onAbort = () => {
-            clearTimeout(timer);
-            reject(__abortError(signal as AbortSignal));
-        };
-        const timer = setTimeout(() => {
-            if (signal)
-                signal.removeEventListener('abort', onAbort);
-            resolve();
-        }, ms);
-        if (signal)
-            signal.addEventListener('abort', onAbort, { once: true });
-    });
-}
-
-function __abortError(signal: AbortSignal): globalThis.Error {
-    const reason = (signal as {
-        reason?: unknown;
-    }).reason;
-    if (reason instanceof Error)
-        return reason;
-    return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * Normalize an operation's header-parameter object into a plain string record,
- * dropping any `undefined` / `null` entries (optional headers the caller omitted)
- * and stringifying the rest. Mirrors __buildUrl's handling of query values.
- */
-function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
-    const out: Record<string, string> = {};
-    for (const [key, value] of Object.entries(values)) {
-        if (value !== undefined && value !== null)
-            out[key] = String(value);
-    }
-    return out;
-}
-
-/**
- * A credential value, or a (possibly async) function that returns one per request.
- */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/**
- * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
- * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
- * to the global slots.
- */
-export type AuthCredentials = {
-    bearer?: TokenProvider;
-    apiKey?: Record<string, TokenProvider>;
-};
-
-let __bearerToken: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
- * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
- * (possibly async) function resolved per request.
- */
-export function setBearer(token: TokenProvider | null): void {
-    __bearerToken = token;
-}
-
-let __apiKey_ApiKey: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
- * string or a (possibly async) function resolved per request.
- */
-export function setApiKey(key: TokenProvider | null): void {
-    __apiKey_ApiKey = key;
-}
-
-/**
- * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
- */
-async function __resolve(slot: TokenProvider | null): Promise<string | null> {
-    if (slot === null)
-        return null;
-    return typeof slot === "function" ? slot() : slot;
-}
-
-/**
- * Build the auth `headers` and `query` for an operation from the currently-set credentials.
- * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
- * can always override by passing their own `init.headers`.
- */
-async function __auth(schemes: string[], config: ClientConfig): Promise<{
-    headers: Record<string, string>;
-    query: Record<string, string>;
-}> {
-    const headers: Record<string, string> = {};
-    const query: Record<string, string> = {};
-    const cookies: string[] = [];
-    for (const scheme of schemes) {
-        switch (scheme) {
-            case "OAuth2": {
-                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
-                if (v !== null)
-                    headers["Authorization"] = `Bearer ${v}`;
-                break;
-            }
-            case "ApiKey": {
-                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
-                if (v !== null)
-                    headers["X-API-Key"] = v;
-                break;
-            }
-        }
-    }
-    if (cookies.length > 0)
-        headers["Cookie"] = cookies.join("; ");
-    return { headers, query };
-}
-
 export type ListMenuItemsResult = MenuItemList;
 
 export type ListMenuItemsParams = {
@@ -1062,64 +469,6 @@ export type ListMenuItemsVariables = {
     params?: ListMenuItemsParams;
 };
 
-/**
- * List all menu items
- *
- * Retrieve a collection of menu items with optional filtering and pagination.
- */
-export async function listMenuItems(params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-    return __request<MenuItemList>(__config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
-}
-
 export type CreateMenuItemResult = MenuItem;
 
 export type CreateMenuItemBody = FormData;
@@ -1128,16 +477,6 @@ export type CreateMenuItemVariables = {
     body: CreateMenuItemBody;
 };
 
-/**
- * Create menu item
- *
- * Create a new menu item.
- */
-export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<MenuItem>(__config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
 export type DeleteMenuItemResult = void;
 
 export type DeleteMenuItemVariables = {
@@ -1148,16 +487,6 @@ export type DeleteMenuItemVariables = {
     menuItemId: string;
 };
 
-/**
- * Delete a menu item
- *
- * Delete an existing menu item.
- */
-export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
 export type GetMenuItemPhotoResult = Blob | string;
 
 export type GetMenuItemPhotoParams = {
@@ -1176,20 +505,6 @@ export type GetMenuItemPhotoVariables = {
     params?: GetMenuItemPhotoParams;
 };
 
-/**
- * Retrieve a menu item photo
- *
- * Retrieve the product photo image for a specific menu item.
- */
-export async function getMenuItemPhoto(menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}): Promise<Blob | string> {
-    return __request<Blob | string>(__config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
-}
-
 export type ListOrdersResult = OrderList;
 
 export type ListOrdersParams = {
@@ -1247,95 +562,25 @@ export type ListOrdersVariables = {
     params?: ListOrdersParams;
 };
 
-/**
- * List all orders
- *
- * Retrieve a collection of orders with optional filtering and pagination.
- */
-export async function listOrders(params: {
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
     /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
      */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderList> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderList>(__config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-/**
- * Create order
- *
- * Create a new order.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
     /**
      * ID of the order to retrieve.
      * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
@@ -1344,22 +589,6 @@ export type GetOrderByIdVariables = {
     headers?: GetOrderByIdHeaders;
 };
 
-/**
- * Retrieve an order
- *
- * Retrieve a single order by its ID.
- */
-export async function getOrderById(orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
-}
-
 export type DeleteOrderResult = void;
 
 export type DeleteOrderVariables = {
@@ -1370,17 +599,6 @@ export type DeleteOrderVariables = {
     orderId: string;
 };
 
-/**
- * Delete an order
- *
- * Delete the order.
- * To keep the order history, the order should be canceled instead of deleted.
- */
-export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
 export type UpdateOrderResult = Order;
 
 export type UpdateOrderBody = {
@@ -1396,19 +614,6 @@ export type UpdateOrderVariables = {
     body?: UpdateOrderBody;
 };
 
-/**
- * Partially update an order
- *
- * Update an existing order status.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function updateOrder(orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
 export type ListOrderItemsResult = OrderItem[];
 
 export type ListOrderItemsParams = {
@@ -1436,36 +641,6 @@ export type ListOrderItemsVariables = {
     params?: ListOrderItemsParams;
 };
 
-/**
- * List all order items with menu item details
- *
- * Returns an array of order items for a specific order.
- * Use the `filter` parameter to filter by order ID.
- */
-export async function listOrderItems(params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderItem[]>(__config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
 export type GetRevenueResult = RevenueStatistics;
 
 export type GetRevenueParams = {
@@ -1487,30 +662,6 @@ export type GetRevenueVariables = {
     params?: GetRevenueParams;
 };
 
-/**
- * Get revenue statistics
- *
- * Retrieve revenue statistics for a configurable date range.
- * Returns revenue, order counts, average order amount, and other useful statistics.
- */
-export async function getRevenue(params: {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
-    const __a = await __auth(["ApiKey"], __config);
-    return __request<RevenueStatistics>(__config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
 export type RegisterOAuth2ClientResult = OAuth2Client;
 
 export type RegisterOAuth2ClientBody = RegisterClientObject;
@@ -1520,17 +671,971 @@ export type RegisterOAuth2ClientVariables = {
 };
 
 /**
- * Create OAuth2 client
- *
- * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
- * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
- *   `redirectUris` must be provided (per RFC 7591 Section 2).
- * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
- * Returns the registered client information per RFC 7591, including:
- * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    listMenuItems: {
+        args: {
+            params?: ListMenuItemsParams;
+        };
+        result: ListMenuItemsResult;
+    };
+    createMenuItem: {
+        args: {
+            body: CreateMenuItemBody;
+        };
+        result: CreateMenuItemResult;
+    };
+    deleteMenuItem: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+        };
+        result: DeleteMenuItemResult;
+    };
+    getMenuItemPhoto: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+            params?: GetMenuItemPhotoParams;
+        };
+        result: GetMenuItemPhotoResult;
+    };
+    listOrders: {
+        args: {
+            params?: ListOrdersParams;
+        };
+        result: ListOrdersResult;
+    };
+    createOrder: {
+        args: {
+            body: CreateOrderBody;
+        };
+        result: CreateOrderResult;
+    };
+    getOrderById: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            headers?: GetOrderByIdHeaders;
+        };
+        result: GetOrderByIdResult;
+    };
+    deleteOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+        };
+        result: DeleteOrderResult;
+    };
+    updateOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            body?: UpdateOrderBody;
+        };
+        result: UpdateOrderResult;
+    };
+    listOrderItems: {
+        args: {
+            params?: ListOrderItemsParams;
+        };
+        result: ListOrderItemsResult;
+    };
+    getRevenue: {
+        args: {
+            params?: GetRevenueParams;
+        };
+        result: GetRevenueResult;
+    };
+    registerOAuth2Client: {
+        args: {
+            body: RegisterOAuth2ClientBody;
+        };
+        result: RegisterOAuth2ClientResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
+export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : NoRequiredKeys<Ops[K]['args']> extends true
+      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
+
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/** Resolve a credential: a literal passes through; a function is awaited per request. */
+async function resolveToken(provider: TokenProvider): Promise<string> {
+  return typeof provider === 'function' ? await provider() : provider;
+}
+
+/**
+ * Build the auth headers/query for one operation's `security` requirements from the
+ * instance credentials (`config.auth`) — capability module, wired into `createClient`.
+ * A scheme with no configured credential contributes nothing (the request is sent
+ * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
+ */
+async function resolveAuth(
+  security: readonly SecuritySpec[],
+  config: ClientConfig
+): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const headers: Record<string, string> = {};
+  const query: Record<string, string> = {};
+  const cookies: string[] = [];
+  for (const scheme of security) {
+    if (scheme.kind === 'apiKey') {
+      const provider = config.auth?.apiKey?.[scheme.scheme];
+      if (provider === undefined) continue;
+      const value = await resolveToken(provider);
+      if (scheme.in === 'header') headers[scheme.name] = value;
+      else if (scheme.in === 'query') query[scheme.name] = value;
+      else cookies.push(`${scheme.name}=${value}`);
+    } else if (scheme.kind === 'bearer') {
+      const provider = config.auth?.bearer;
+      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
+    } else {
+      const basic = config.auth?.basic;
+      if (basic !== undefined) {
+        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+      }
+    }
+  }
+  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
+  return { headers, query };
+}
+
+/**
+ * Merge a publisher's baked setup (`defineClientSetup({...})`) with the app's config:
+ * app config fields win per-field over baked defaults, while middleware composes —
+ * baked middleware runs first, then the app's.
+ */
+export function mergeSetup(
+  setup: { config?: ClientConfig; middleware?: Middleware[] } | undefined,
+  config: ClientConfig = {}
+): ClientConfig {
+  return {
+    ...setup?.config,
+    ...config,
+    middleware: [...(setup?.middleware ?? []), ...(config.middleware ?? [])],
+  };
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+};
+
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
  */
-export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-    return __request<OAuth2Client>(__config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
+/**
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
+ */
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
 }
 
 // ─── Baked-in setup (--setup) ───
@@ -1547,5 +1652,163 @@ const __redoclySetup: { config?: ClientConfig; middleware?: Middleware[] } = {
     },
   ],
 };
-configure(__redoclySetup.config ?? {});
-use(...(__redoclySetup.middleware ?? []));
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, mergeSetup({ config: { serverUrl: "https://api.cafe.redocly.com" } }, mergeSetup(__redoclySetup, {})));
+
+export const { configure, use } = client;
+export const setBearer = client.auth.bearer;
+export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
+export const listMenuItems = (params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
+export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
+export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
+export const getMenuItemPhoto = (menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
+export const listOrders = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
+export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
+export const getOrderById = (orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
+export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
+export const updateOrder = (orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
+export const listOrderItems = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
+export const getRevenue = (params: {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
+export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
diff --git a/tests/e2e/generate-client/examples/service-class/.gitignore b/tests/e2e/generate-client/examples/configure-and-middleware/.gitignore
similarity index 100%
rename from tests/e2e/generate-client/examples/service-class/.gitignore
rename to tests/e2e/generate-client/examples/configure-and-middleware/.gitignore
diff --git a/tests/e2e/generate-client/examples/configure-and-middleware/README.md b/tests/e2e/generate-client/examples/configure-and-middleware/README.md
new file mode 100644
index 0000000000..20066963fd
--- /dev/null
+++ b/tests/e2e/generate-client/examples/configure-and-middleware/README.md
@@ -0,0 +1,18 @@
+# configure-and-middleware example
+
+The client's DX knobs together: `configure({ serverUrl, retry })` with an exponential,
+`Retry-After`-aware retry policy; `use()` middleware that targets `ctx.operation.id`
+(a literal union — typos fail the build); the generated `setApiKey()` auth setter; and
+`ApiError` handling with the spec's problem document on `error.body`.
+
+## Run
+
+```bash
+npm install
+npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
+npm run dev        # open the printed local URL
+```
+
+The app uses a canned `fetch` so it runs offline and the retry is deterministic: the first
+`GET /payments` attempt returns 503 and the policy resends it. The generated client under
+`src/api/` is committed and drift-checked against the generator in CI.
diff --git a/tests/e2e/generate-client/examples/configure-and-middleware/index.html b/tests/e2e/generate-client/examples/configure-and-middleware/index.html
new file mode 100644
index 0000000000..1bdd570742
--- /dev/null
+++ b/tests/e2e/generate-client/examples/configure-and-middleware/index.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>Redocly client-generator — configure-and-middleware example</title>
+  </head>
+  <body>
+    <pre id="out">Loading…</pre>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
diff --git a/tests/e2e/generate-client/examples/configure-and-middleware/openapi.yaml b/tests/e2e/generate-client/examples/configure-and-middleware/openapi.yaml
new file mode 100644
index 0000000000..3b4f9e163a
--- /dev/null
+++ b/tests/e2e/generate-client/examples/configure-and-middleware/openapi.yaml
@@ -0,0 +1,169 @@
+openapi: 3.2.0
+info:
+  title: Payments API
+  description: Demo payments API for the configure-and-middleware example.
+  version: 1.0.0
+servers:
+  - url: https://api.payments.example.com
+tags:
+  - name: Payments
+    description: Payment operations.
+security:
+  - ApiKeyAuth: []
+paths:
+  /payments:
+    get:
+      tags:
+        - Payments
+      summary: List payments
+      operationId: listPayments
+      parameters:
+        - name: status
+          in: query
+          required: false
+          description: Filter by payment status.
+          schema:
+            $ref: '#/components/schemas/PaymentStatus'
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/PaymentList'
+        '503':
+          description: Temporarily unavailable — retry later.
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+    post:
+      tags:
+        - Payments
+      summary: Create a payment
+      operationId: createPayment
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/PaymentRequest'
+      responses:
+        '201':
+          description: Payment created.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Payment'
+        '402':
+          description: Payment declined.
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+  /payments/{paymentId}:
+    get:
+      tags:
+        - Payments
+      summary: Retrieve a payment
+      operationId: getPayment
+      parameters:
+        - name: paymentId
+          in: path
+          required: true
+          description: ID of the payment.
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Payment'
+        '404':
+          description: Payment not found.
+          content:
+            application/problem+json:
+              schema:
+                $ref: '#/components/schemas/ProblemDetails'
+components:
+  securitySchemes:
+    ApiKeyAuth:
+      type: apiKey
+      in: header
+      name: X-Api-Key
+      description: API key for server-to-server access.
+  schemas:
+    PaymentStatus:
+      type: string
+      description: Payment status.
+      enum:
+        - pending
+        - settled
+        - failed
+    Payment:
+      type: object
+      properties:
+        id:
+          description: Payment ID.
+          type: string
+        amount:
+          description: Amount in cents.
+          type: integer
+          minimum: 0
+        currency:
+          description: ISO 4217 currency code.
+          type: string
+        status:
+          $ref: '#/components/schemas/PaymentStatus'
+      required:
+        - id
+        - amount
+        - currency
+        - status
+    PaymentRequest:
+      type: object
+      properties:
+        amount:
+          description: Amount in cents.
+          type: integer
+          minimum: 1
+        currency:
+          description: ISO 4217 currency code.
+          type: string
+        reference:
+          description: Free-form merchant reference.
+          type: string
+      required:
+        - amount
+        - currency
+    PaymentList:
+      type: object
+      properties:
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/Payment'
+      required:
+        - items
+    ProblemDetails:
+      type: object
+      description: RFC 9457 problem document.
+      properties:
+        type:
+          description: URI reference that identifies the problem type.
+          type: string
+          default: about:blank
+        title:
+          description: Short summary of the problem type.
+          type: string
+        status:
+          description: HTTP status code.
+          type: integer
+        detail:
+          description: Occurrence-specific explanation.
+          type: string
+      required:
+        - title
+        - status
diff --git a/tests/e2e/generate-client/examples/configure-and-middleware/package.json b/tests/e2e/generate-client/examples/configure-and-middleware/package.json
new file mode 100644
index 0000000000..87ffbcff76
--- /dev/null
+++ b/tests/e2e/generate-client/examples/configure-and-middleware/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "@redocly-examples/configure-and-middleware",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "generate": "redocly generate-client",
+    "dev": "vite",
+    "build": "vite build"
+  },
+  "devDependencies": {
+    "@redocly/cli": "latest",
+    "typescript": "^5.5.0",
+    "vite": "^5.4.0"
+  }
+}
diff --git a/tests/e2e/generate-client/examples/configure-and-middleware/redocly.yaml b/tests/e2e/generate-client/examples/configure-and-middleware/redocly.yaml
new file mode 100644
index 0000000000..e8e7e00d44
--- /dev/null
+++ b/tests/e2e/generate-client/examples/configure-and-middleware/redocly.yaml
@@ -0,0 +1,8 @@
+# redocly.yaml — drives `redocly generate-client` for this example.
+apis:
+  configure-and-middleware:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
diff --git a/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts b/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
new file mode 100644
index 0000000000..68315fc686
--- /dev/null
+++ b/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
@@ -0,0 +1,989 @@
+// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Payments API (v1.0.0)
+ * Demo payments API for the configure-and-middleware example.
+ */
+
+/**
+ * Payment status.
+ */
+export type PaymentStatus = "pending" | "settled" | "failed";
+
+export const PaymentStatus = {
+    pending: "pending",
+    settled: "settled",
+    failed: "failed"
+} as const;
+
+export type Payment = {
+    /**
+     * Payment ID.
+     */
+    id: string;
+    /**
+     * Amount in cents.
+     * @minimum 0
+     */
+    amount: number;
+    /**
+     * ISO 4217 currency code.
+     */
+    currency: string;
+    status: PaymentStatus;
+};
+
+export type PaymentRequest = {
+    /**
+     * Amount in cents.
+     * @minimum 1
+     */
+    amount: number;
+    /**
+     * ISO 4217 currency code.
+     */
+    currency: string;
+    /**
+     * Free-form merchant reference.
+     */
+    reference?: string;
+};
+
+export type PaymentList = {
+    items: Payment[];
+};
+
+/**
+ * RFC 9457 problem document.
+ */
+export type ProblemDetails = {
+    /**
+     * URI reference that identifies the problem type.
+     */
+    type?: string;
+    /**
+     * Short summary of the problem type.
+     */
+    title: string;
+    /**
+     * HTTP status code.
+     */
+    status: number;
+    /**
+     * Occurrence-specific explanation.
+     */
+    detail?: string;
+};
+
+export type ListPaymentsResult = PaymentList;
+
+export type ListPaymentsParams = {
+    /**
+     * Filter by payment status.
+     */
+    status?: PaymentStatus;
+};
+
+export type ListPaymentsVariables = {
+    params?: ListPaymentsParams;
+};
+
+export type CreatePaymentResult = Payment;
+
+export type CreatePaymentBody = PaymentRequest;
+
+export type CreatePaymentVariables = {
+    body: CreatePaymentBody;
+};
+
+export type GetPaymentResult = Payment;
+
+export type GetPaymentVariables = {
+    /**
+     * ID of the payment.
+     */
+    paymentId: string;
+};
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    listPayments: {
+        args: {
+            params?: ListPaymentsParams;
+        };
+        result: ListPaymentsResult;
+    };
+    createPayment: {
+        args: {
+            body: CreatePaymentBody;
+        };
+        result: CreatePaymentResult;
+    };
+    getPayment: {
+        args: {
+            /**
+             * ID of the payment.
+             */
+            paymentId: string;
+        };
+        result: GetPaymentResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listPayments: { id: "listPayments", method: "GET", path: "/payments", tags: ["Payments"], params: [{ name: "status", in: "query" }], security: [{ scheme: "ApiKeyAuth", kind: "apiKey", name: "X-Api-Key", in: "header" }] },
+    createPayment: { id: "createPayment", method: "POST", path: "/payments", tags: ["Payments"], body: { contentType: "application/json" }, security: [{ scheme: "ApiKeyAuth", kind: "apiKey", name: "X-Api-Key", in: "header" }] },
+    getPayment: { id: "getPayment", method: "GET", path: "/payments/{paymentId}", tags: ["Payments"], params: [{ name: "paymentId", in: "path" }], security: [{ scheme: "ApiKeyAuth", kind: "apiKey", name: "X-Api-Key", in: "header" }] }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
+export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : NoRequiredKeys<Ops[K]['args']> extends true
+      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
+
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/** Resolve a credential: a literal passes through; a function is awaited per request. */
+async function resolveToken(provider: TokenProvider): Promise<string> {
+  return typeof provider === 'function' ? await provider() : provider;
+}
+
+/**
+ * Build the auth headers/query for one operation's `security` requirements from the
+ * instance credentials (`config.auth`) — capability module, wired into `createClient`.
+ * A scheme with no configured credential contributes nothing (the request is sent
+ * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
+ */
+async function resolveAuth(
+  security: readonly SecuritySpec[],
+  config: ClientConfig
+): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const headers: Record<string, string> = {};
+  const query: Record<string, string> = {};
+  const cookies: string[] = [];
+  for (const scheme of security) {
+    if (scheme.kind === 'apiKey') {
+      const provider = config.auth?.apiKey?.[scheme.scheme];
+      if (provider === undefined) continue;
+      const value = await resolveToken(provider);
+      if (scheme.in === 'header') headers[scheme.name] = value;
+      else if (scheme.in === 'query') query[scheme.name] = value;
+      else cookies.push(`${scheme.name}=${value}`);
+    } else if (scheme.kind === 'bearer') {
+      const provider = config.auth?.bearer;
+      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
+    } else {
+      const basic = config.auth?.basic;
+      if (basic !== undefined) {
+        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+      }
+    }
+  }
+  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
+  return { headers, query };
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+};
+
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
+/**
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
+ */
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
+}
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.payments.example.com" });
+
+export const { configure, use } = client;
+export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKeyAuth", value);
+export const listPayments = (params: {
+    /**
+     * Filter by payment status.
+     */
+    status?: PaymentStatus;
+} = {}, init: RequestOptions = {}) => client.listPayments({ params }, init);
+export const createPayment = (body: PaymentRequest, init: RequestOptions = {}) => client.createPayment({ body }, init);
+export const getPayment = (paymentId: string, init: RequestOptions = {}) => client.getPayment({ paymentId }, init);
diff --git a/tests/e2e/generate-client/examples/configure-and-middleware/src/main.ts b/tests/e2e/generate-client/examples/configure-and-middleware/src/main.ts
new file mode 100644
index 0000000000..4f1564af57
--- /dev/null
+++ b/tests/e2e/generate-client/examples/configure-and-middleware/src/main.ts
@@ -0,0 +1,97 @@
+// configure-and-middleware — the client's DX knobs in one place.
+//
+// * `configure()`: server URL + a retry policy (idempotent methods only by default;
+//   `Retry-After` honored; per-call override via `init.retry`).
+// * `use()`: middleware that targets `ctx.operation.id` — a LITERAL UNION of this
+//   spec's operation ids, so a typo fails the build instead of silently never matching.
+// * `setApiKey()`: per-scheme auth sugar; injected only on operations whose
+//   `security` names the scheme.
+// * `ApiError`: a non-2xx response throws, carrying the decoded problem document
+//   on `error.body`.
+import {
+  ApiError,
+  configure,
+  createPayment,
+  getPayment,
+  listPayments,
+  setApiKey,
+  use,
+  type ProblemDetails,
+} from './api/client.js';
+
+const out = document.querySelector<HTMLPreElement>('#out')!;
+const log: string[] = [];
+
+// A canned transport so the example runs offline — and fails deterministically:
+// the FIRST `GET /payments` attempt returns 503 with `Retry-After: 0`, so the
+// configured retry policy resends it; an unknown payment id returns a 404 problem.
+let listAttempts = 0;
+const canned = (async (url: string, init: RequestInit) => {
+  const { pathname } = new URL(url);
+  const problem = (status: number, title: string, detail: string) =>
+    new Response(JSON.stringify({ type: 'about:blank', title, status, detail }), {
+      status,
+      headers: { 'content-type': 'application/problem+json', 'retry-after': '0' },
+    });
+  if (init.method === 'GET' && pathname === '/payments') {
+    if (++listAttempts === 1) return problem(503, 'Service Unavailable', 'Warming up — retry.');
+    return new Response(
+      JSON.stringify({
+        items: [{ id: 'pay_1', amount: 1250, currency: 'EUR', status: 'settled' }],
+      }),
+      { headers: { 'content-type': 'application/json' } }
+    );
+  }
+  if (init.method === 'POST' && pathname === '/payments') {
+    return new Response(
+      JSON.stringify({ id: 'pay_2', status: 'pending', ...JSON.parse(String(init.body)) }),
+      { status: 201, headers: { 'content-type': 'application/json' } }
+    );
+  }
+  return problem(404, 'Payment not found', `No payment at ${pathname}.`);
+}) as unknown as typeof fetch;
+
+configure({
+  serverUrl: 'https://api.payments.example.com',
+  fetch: canned,
+  // Retries apply to idempotent methods on transport errors and transient statuses
+  // (408/429/5xx); `Retry-After` wins over the backoff when the server sends it.
+  retry: { retries: 2, retryDelay: 100, retryStrategy: 'exponential' },
+});
+
+// Auth sugar generated from the spec's `ApiKeyAuth` scheme: every operation whose
+// `security` requires it gets an `X-Api-Key` header — nothing to wire by hand.
+setApiKey('demo-key-123');
+
+use({
+  onRequest: (ctx) => {
+    // `ctx.operation.id` is typed 'listPayments' | 'createPayment' | 'getPayment' —
+    // misspell it and the comparison fails to compile.
+    if (ctx.operation.id === 'createPayment') {
+      ctx.headers['Idempotency-Key'] = crypto.randomUUID();
+    }
+    log.push(`→ ${ctx.operation.id} ${ctx.method} ${ctx.operation.path}`);
+  },
+  // `onResponse` runs per ATTEMPT — watch the 503 and the retried 200 both arrive.
+  onResponse: (response, ctx) => {
+    log.push(`← ${ctx.operation.id} ${response.status}`);
+  },
+});
+
+async function main() {
+  const payments = await listPayments(); // 503 first, then retried to 200
+  const payment = await createPayment({ amount: 4200, currency: 'EUR', reference: 'INV-17' });
+  try {
+    await getPayment('pay_missing');
+  } catch (error) {
+    if (error instanceof ApiError) {
+      // `error.body` is the decoded response body; per the spec's 4xx contract
+      // it is a problem document, so narrow it to the generated type.
+      const problem = error.body as ProblemDetails;
+      log.push(`✗ getPayment ${error.status}: ${problem.title} — ${problem.detail}`);
+    }
+  }
+  out.textContent = [...log, '', JSON.stringify({ payments, payment }, null, 2)].join('\n');
+}
+
+void main();
diff --git a/tests/e2e/generate-client/examples/service-class/tsconfig.json b/tests/e2e/generate-client/examples/configure-and-middleware/tsconfig.json
similarity index 100%
rename from tests/e2e/generate-client/examples/service-class/tsconfig.json
rename to tests/e2e/generate-client/examples/configure-and-middleware/tsconfig.json
diff --git a/tests/e2e/generate-client/examples/service-class/vite.config.ts b/tests/e2e/generate-client/examples/configure-and-middleware/vite.config.ts
similarity index 100%
rename from tests/e2e/generate-client/examples/service-class/vite.config.ts
rename to tests/e2e/generate-client/examples/configure-and-middleware/vite.config.ts
diff --git a/tests/e2e/generate-client/examples/custom-generator/redocly.yaml b/tests/e2e/generate-client/examples/custom-generator/redocly.yaml
index 564217cd50..3b54bd12d0 100644
--- a/tests/e2e/generate-client/examples/custom-generator/redocly.yaml
+++ b/tests/e2e/generate-client/examples/custom-generator/redocly.yaml
@@ -9,4 +9,3 @@ apis:
       generators:
         - sdk
         - ./route-map-generator.mjs
-      facade: functions
diff --git a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
index 804e48df94..1ad55ad78b 100644
--- a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
@@ -412,599 +412,6 @@ export function isDessert(value: MenuItem): value is Dessert {
     return (value as Record<string, unknown>)["category"] === "dessert";
 }
 
-/**
- * Static metadata for every operation, keyed by operationId: the HTTP `method`
- * and the `path` template (with `{param}` placeholders intact). Minification-safe
- * — useful for building cache/query keys, tracing span names, and request logging
- * without re-deriving them at each call site.
- */
-export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
-    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
-    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
-    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
-    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
-    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
-    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
-} as const;
-
-/**
- * The operationId of any operation in this client.
- */
-export type OperationId = keyof typeof OPERATIONS;
-
-/**
- * Static metadata describing one operation: its HTTP method, path template, and tags.
- */
-export type OperationMetadata = {
-    readonly method: string;
-    readonly path: string;
-    readonly tags: readonly string[];
-};
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
-
-let BASE = "https://api.cafe.redocly.com";
-
-/** Identity of the operation a request belongs to. Stable across path interpolation. */
-export type OperationContext = {
-    id: OperationId;
-    path: OperationPath;
-    tags: OperationTag[];
-};
-
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
-export type RequestContext = {
-    url: string;
-    method: string;
-    headers: Record<string, string>;
-    body?: unknown;
-    /** The operation being called: its id (operationId), path template, and tags. */
-    operation: OperationContext;
-};
-
-/**
- * Configuration and extension hooks for a client. Supplied per-instance via
- * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
- * (functions facade).
- */
-export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
-    serverUrl?: string;
-    /** Extra headers merged into every request; a function is invoked per request. */
-    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
-    /** Transport used to issue requests. Defaults to the global `fetch`. */
-    fetch?: typeof fetch;
-    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    /** Observe — or replace, by returning a `Response` — the response before parsing. */
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    /**
-     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
-     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
-     */
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
-    /**
-     * Composable interceptors run around every request, alongside the single
-     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
-     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
-     * the last-registered middleware wraps closest to the network. Register more at runtime
-     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
-     */
-    middleware?: Middleware[];
-    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
-    retry?: RetryConfig;
-    /**
-     * Per-instance auth credentials. When set, they override the module-global
-     * `set*` helpers for requests made through this config (each scheme falls back
-     * to its global slot when omitted here). Only the schemes an operation declares
-     * in its `security` are ever sent.
-     */
-    auth?: AuthCredentials;
-};
-
-/**
- * A request interceptor; every field is optional, so a middleware can hook any subset of
- * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
- * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
- * failure into the error to throw, threaded through each middleware in turn.
- */
-export type Middleware = {
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/** Context handed to `retryOn` for the attempt that just failed. */
-export type RetryContext = {
-    /** 1-based number of the attempt that just failed. */
-    attempt: number;
-    /** The request that was attempted. */
-    request: RequestContext;
-    /** Present when the server returned a (non-ok) response. */
-    response?: Response;
-    /** Present when the transport threw (network error, DNS, connection reset). */
-    error?: unknown;
-};
-
-/** Retry policy; all fields optional with sensible defaults. */
-export type RetryConfig = {
-    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
-    retries?: number;
-    /** Base delay in milliseconds. Default 1000. */
-    retryDelay?: number;
-    /** Backoff shape. Default 'exponential'. */
-    retryStrategy?: RetryStrategy;
-    /** Apply full jitter over the computed delay. Default true. */
-    jitter?: boolean;
-    /**
-     * Decide whether to retry a failed attempt. Default: retry only idempotent
-     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
-     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
-     */
-    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
-};
-
-/**
- * How the response body is read. `'auto'` negotiates from the content type (the
- * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
- */
-export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
-
-/**
- * The trailing per-operation argument: standard `RequestInit` plus an optional
- * per-call retry override and a `parseAs` escape hatch.
- *
- * `parseAs` forces how the response body is read; overrides the inferred kind.
- * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
- * override — the static return type is unchanged.
- */
-export type RequestOptions = RequestInit & {
-    retry?: Partial<RetryConfig>;
-    parseAs?: ParseAs;
-};
-
-/**
- * Override the base URL used by every generated operation. Useful when the
- * runtime environment differs from the value declared in `servers[0].url`
- * (e.g. dev / staging / prod toggles in a single-page app).
- *
- * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ serverUrl })`.
- */
-export function setServerUrl(url: string): void {
-    BASE = url;
-}
-
-/** The global config used by the functions facade (see `configure`). */
-const __config: ClientConfig = {};
-
-/**
- * Merge `config` into the global configuration used by the functions facade —
- * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
- * hooks once for every free function. The service-class facade configures per
- * instance instead (`new Client(config)`).
- */
-export function configure(config: ClientConfig): void {
-    Object.assign(__config, config);
-}
-
-/**
- * Append interceptors to the functions facade's global middleware chain (see
- * `ClientConfig.middleware`). The service-class facade registers per instance via
- * `<Client>.use(...)` instead.
- */
-export function use(...middleware: Middleware[]): void {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    __config.middleware = [...(__config.middleware ?? []), ...middleware];
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function __middleware(config: ClientConfig): Middleware[] {
-    const single = config.onRequest || config.onResponse || config.onError
-        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-        : [];
-    return [...single, ...(config.middleware ?? [])];
-}
-
-export class ApiError extends Error {
-    public readonly url: string;
-    public readonly status: number;
-    public readonly statusText: string;
-    public readonly body: unknown;
-    constructor(url: string, status: number, statusText: string, body: unknown) {
-        super(`Request failed with status ${status}`);
-        this.name = 'ApiError';
-        this.url = url;
-        this.status = status;
-        this.statusText = statusText;
-        this.body = body;
-    }
-}
-
-type QueryPrimitive = string | number | boolean;
-
-type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
-
-/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
-type QueryStyle = {
-    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-    explode: boolean;
-    allowReserved?: boolean;
-};
-
-/**
- * Percent-encode `value` but leave the RFC-3986 reserved set
- * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
- */
-function __encodeReserved(value: string): string {
-    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
-}
-
-function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
-    if (!query)
-        return url;
-    const params = new URLSearchParams();
-    const raw: string[] = [];
-    for (const [key, value] of Object.entries(query)) {
-        if (value === undefined || value === null)
-            continue;
-        const spec = styles?.[key];
-        if (!spec) {
-            if (Array.isArray(value)) {
-                for (const v of value) {
-                    if (v !== undefined && v !== null)
-                        params.append(key, String(v));
-                }
-            }
-            else if (typeof value === 'object') {
-                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-                for (const [subKey, subValue] of Object.entries(value)) {
-                    if (subValue !== undefined && subValue !== null) {
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                    }
-                }
-            }
-            else {
-                params.append(key, String(value));
-            }
-            continue;
-        }
-        if (Array.isArray(value)) {
-            const items = value.filter((v) => v !== undefined && v !== null).map(String);
-            if (spec.style === 'form' && spec.explode) {
-                for (const v of items) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}=${__encodeReserved(v)}`);
-                    else
-                        params.append(key, v);
-                }
-            }
-            else {
-                // Delimited styles put the LITERAL delimiter on the wire; only the
-                // values are encoded. `%20` (not `+`) is the literal space delimiter.
-                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
-                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-            }
-        }
-        else if (typeof value === 'object') {
-            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-            for (const [subKey, subValue] of Object.entries(value)) {
-                if (subValue !== undefined && subValue !== null) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
-                    else
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                }
-            }
-        }
-        else if (spec.allowReserved) {
-            raw.push(`${key}=${__encodeReserved(String(value))}`);
-        }
-        else {
-            params.append(key, String(value));
-        }
-    }
-    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-    return qs ? `${url}?${qs}` : url;
-}
-
-async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
-    response: Response;
-    context: RequestContext;
-}> {
-    const { retry: callRetry, ...fetchInit } = init;
-    const retry: RetryConfig = { ...config.retry, ...callRetry };
-    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-    const headers: Record<string, string> = {
-        Accept: 'application/json',
-        ...extra,
-        ...(fetchInit.headers as Record<string, string> | undefined),
-    };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
-    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-    let payload: BodyInit | undefined;
-    if (context.body !== undefined) {
-        const value = context.body;
-        const isBinary = value instanceof Blob ||
-            value instanceof ArrayBuffer ||
-            ArrayBuffer.isView(value as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-        const isURLSearchParams = value instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-            payload = value as BodyInit;
-        }
-        else {
-            payload = JSON.stringify(value);
-            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-                context.headers['Content-Type'] = 'application/json';
-            }
-        }
-    }
-    const doFetch = config.fetch ?? fetch;
-    const maxAttempts = 1 + (retry.retries ?? 0);
-    const retryOn = retry.retryOn ?? __defaultRetryOn;
-    const signal = fetchInit.signal ?? undefined;
-    let attempt = 0;
-    while (true) {
-        attempt++;
-        if (signal?.aborted)
-            throw __abortError(signal);
-        let response: Response;
-        try {
-            response = await doFetch(context.url, {
-                ...fetchInit,
-                method: context.method,
-                headers: context.headers,
-                body: payload,
-            });
-        }
-        catch (error) {
-            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
-                await __sleep(__retryDelay(retry, attempt, null), signal);
-                continue;
-            }
-            throw error;
-        }
-        // Reverse order: the last-registered middleware wraps closest to the network (onion).
-        for (let i = middleware.length - 1; i >= 0; i--) {
-            const onResponse = middleware[i].onResponse;
-            if (onResponse) {
-                const replaced = await onResponse(response, context);
-                if (replaced)
-                    response = replaced;
-            }
-        }
-        if (!response.ok &&
-            attempt < maxAttempts &&
-            !signal?.aborted &&
-            (await retryOn({ attempt, request: context, response }))) {
-            const retryAfter = response.headers.get('retry-after');
-            // Drain the abandoned response body before the next attempt: an unread body
-            // keeps the connection checked out (and can stall the pool) under Node/undici
-            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-            await response.body?.cancel().catch(() => undefined);
-            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
-            continue;
-        }
-        return { response, context };
-    }
-}
-
-async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-    if (kind === 'void' || response.status === 204)
-        return undefined;
-    if (kind === 'stream')
-        return response.body;
-    if (kind === 'blob')
-        return response.blob();
-    if (kind === 'arrayBuffer')
-        return response.arrayBuffer();
-    if (kind === 'formData')
-        return response.formData();
-    if (kind === 'text')
-        return response.text();
-    if (kind === 'json')
-        return response.json();
-    // 'auto' — negotiate from the response's content type.
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json'))
-        return response.json();
-    if (contentType.startsWith('text/'))
-        return response.text();
-    return response.blob();
-}
-
-async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
-    const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, op, url, sendInit, body);
-    if (!response.ok) {
-        const errorBody = await readError(response);
-        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
-        // Thread the error through each middleware's onError in turn (each may replace it).
-        for (const mw of __middleware(config)) {
-            if (mw.onError)
-                error = await mw.onError(error as ApiError, context);
-        }
-        throw error;
-    }
-    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
-    return (await __parse(response, kind)) as T;
-}
-
-async function readError(response: Response): Promise<unknown> {
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json')) {
-        return response.json().catch(() => undefined);
-    }
-    return response.text().catch(() => undefined);
-}
-
-const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-
-const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-function __defaultRetryOn(ctx: RetryContext): boolean {
-    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
-        return false;
-    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-    if (retryAfter) {
-        const seconds = Number(retryAfter);
-        if (!Number.isNaN(seconds))
-            return seconds * 1000;
-        const when = Date.parse(retryAfter);
-        if (!Number.isNaN(when))
-            return Math.max(0, when - Date.now());
-    }
-    const base = retry.retryDelay ?? 1000;
-    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-    return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
-    return new Promise((resolve, reject) => {
-        if (signal?.aborted) {
-            reject(__abortError(signal));
-            return;
-        }
-        const onAbort = () => {
-            clearTimeout(timer);
-            reject(__abortError(signal as AbortSignal));
-        };
-        const timer = setTimeout(() => {
-            if (signal)
-                signal.removeEventListener('abort', onAbort);
-            resolve();
-        }, ms);
-        if (signal)
-            signal.addEventListener('abort', onAbort, { once: true });
-    });
-}
-
-function __abortError(signal: AbortSignal): globalThis.Error {
-    const reason = (signal as {
-        reason?: unknown;
-    }).reason;
-    if (reason instanceof Error)
-        return reason;
-    return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * Normalize an operation's header-parameter object into a plain string record,
- * dropping any `undefined` / `null` entries (optional headers the caller omitted)
- * and stringifying the rest. Mirrors __buildUrl's handling of query values.
- */
-function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
-    const out: Record<string, string> = {};
-    for (const [key, value] of Object.entries(values)) {
-        if (value !== undefined && value !== null)
-            out[key] = String(value);
-    }
-    return out;
-}
-
-/**
- * A credential value, or a (possibly async) function that returns one per request.
- */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/**
- * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
- * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
- * to the global slots.
- */
-export type AuthCredentials = {
-    bearer?: TokenProvider;
-    apiKey?: Record<string, TokenProvider>;
-};
-
-let __bearerToken: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
- * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
- * (possibly async) function resolved per request.
- */
-export function setBearer(token: TokenProvider | null): void {
-    __bearerToken = token;
-}
-
-let __apiKey_ApiKey: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
- * string or a (possibly async) function resolved per request.
- */
-export function setApiKey(key: TokenProvider | null): void {
-    __apiKey_ApiKey = key;
-}
-
-/**
- * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
- */
-async function __resolve(slot: TokenProvider | null): Promise<string | null> {
-    if (slot === null)
-        return null;
-    return typeof slot === "function" ? slot() : slot;
-}
-
-/**
- * Build the auth `headers` and `query` for an operation from the currently-set credentials.
- * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
- * can always override by passing their own `init.headers`.
- */
-async function __auth(schemes: string[], config: ClientConfig): Promise<{
-    headers: Record<string, string>;
-    query: Record<string, string>;
-}> {
-    const headers: Record<string, string> = {};
-    const query: Record<string, string> = {};
-    const cookies: string[] = [];
-    for (const scheme of schemes) {
-        switch (scheme) {
-            case "OAuth2": {
-                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
-                if (v !== null)
-                    headers["Authorization"] = `Bearer ${v}`;
-                break;
-            }
-            case "ApiKey": {
-                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
-                if (v !== null)
-                    headers["X-API-Key"] = v;
-                break;
-            }
-        }
-    }
-    if (cookies.length > 0)
-        headers["Cookie"] = cookies.join("; ");
-    return { headers, query };
-}
-
 export type ListMenuItemsResult = MenuItemList;
 
 export type ListMenuItemsParams = {
@@ -1062,64 +469,6 @@ export type ListMenuItemsVariables = {
     params?: ListMenuItemsParams;
 };
 
-/**
- * List all menu items
- *
- * Retrieve a collection of menu items with optional filtering and pagination.
- */
-export async function listMenuItems(params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-    return __request<MenuItemList>(__config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
-}
-
 export type CreateMenuItemResult = MenuItem;
 
 export type CreateMenuItemBody = FormData;
@@ -1128,16 +477,6 @@ export type CreateMenuItemVariables = {
     body: CreateMenuItemBody;
 };
 
-/**
- * Create menu item
- *
- * Create a new menu item.
- */
-export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<MenuItem>(__config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
 export type DeleteMenuItemResult = void;
 
 export type DeleteMenuItemVariables = {
@@ -1148,16 +487,6 @@ export type DeleteMenuItemVariables = {
     menuItemId: string;
 };
 
-/**
- * Delete a menu item
- *
- * Delete an existing menu item.
- */
-export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
 export type GetMenuItemPhotoResult = Blob | string;
 
 export type GetMenuItemPhotoParams = {
@@ -1176,20 +505,6 @@ export type GetMenuItemPhotoVariables = {
     params?: GetMenuItemPhotoParams;
 };
 
-/**
- * Retrieve a menu item photo
- *
- * Retrieve the product photo image for a specific menu item.
- */
-export async function getMenuItemPhoto(menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}): Promise<Blob | string> {
-    return __request<Blob | string>(__config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
-}
-
 export type ListOrdersResult = OrderList;
 
 export type ListOrdersParams = {
@@ -1247,95 +562,25 @@ export type ListOrdersVariables = {
     params?: ListOrdersParams;
 };
 
-/**
- * List all orders
- *
- * Retrieve a collection of orders with optional filtering and pagination.
- */
-export async function listOrders(params: {
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
     /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
      */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderList> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderList>(__config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-/**
- * Create order
- *
- * Create a new order.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
     /**
      * ID of the order to retrieve.
      * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
@@ -1344,22 +589,6 @@ export type GetOrderByIdVariables = {
     headers?: GetOrderByIdHeaders;
 };
 
-/**
- * Retrieve an order
- *
- * Retrieve a single order by its ID.
- */
-export async function getOrderById(orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
-}
-
 export type DeleteOrderResult = void;
 
 export type DeleteOrderVariables = {
@@ -1370,17 +599,6 @@ export type DeleteOrderVariables = {
     orderId: string;
 };
 
-/**
- * Delete an order
- *
- * Delete the order.
- * To keep the order history, the order should be canceled instead of deleted.
- */
-export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
 export type UpdateOrderResult = Order;
 
 export type UpdateOrderBody = {
@@ -1396,19 +614,6 @@ export type UpdateOrderVariables = {
     body?: UpdateOrderBody;
 };
 
-/**
- * Partially update an order
- *
- * Update an existing order status.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function updateOrder(orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
 export type ListOrderItemsResult = OrderItem[];
 
 export type ListOrderItemsParams = {
@@ -1436,13 +641,1006 @@ export type ListOrderItemsVariables = {
     params?: ListOrderItemsParams;
 };
 
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    listMenuItems: {
+        args: {
+            params?: ListMenuItemsParams;
+        };
+        result: ListMenuItemsResult;
+    };
+    createMenuItem: {
+        args: {
+            body: CreateMenuItemBody;
+        };
+        result: CreateMenuItemResult;
+    };
+    deleteMenuItem: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+        };
+        result: DeleteMenuItemResult;
+    };
+    getMenuItemPhoto: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+            params?: GetMenuItemPhotoParams;
+        };
+        result: GetMenuItemPhotoResult;
+    };
+    listOrders: {
+        args: {
+            params?: ListOrdersParams;
+        };
+        result: ListOrdersResult;
+    };
+    createOrder: {
+        args: {
+            body: CreateOrderBody;
+        };
+        result: CreateOrderResult;
+    };
+    getOrderById: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            headers?: GetOrderByIdHeaders;
+        };
+        result: GetOrderByIdResult;
+    };
+    deleteOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+        };
+        result: DeleteOrderResult;
+    };
+    updateOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            body?: UpdateOrderBody;
+        };
+        result: UpdateOrderResult;
+    };
+    listOrderItems: {
+        args: {
+            params?: ListOrderItemsParams;
+        };
+        result: ListOrderItemsResult;
+    };
+    getRevenue: {
+        args: {
+            params?: GetRevenueParams;
+        };
+        result: GetRevenueResult;
+    };
+    registerOAuth2Client: {
+        args: {
+            body: RegisterOAuth2ClientBody;
+        };
+        result: RegisterOAuth2ClientResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
+export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : NoRequiredKeys<Ops[K]['args']> extends true
+      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
+
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/** Resolve a credential: a literal passes through; a function is awaited per request. */
+async function resolveToken(provider: TokenProvider): Promise<string> {
+  return typeof provider === 'function' ? await provider() : provider;
+}
+
+/**
+ * Build the auth headers/query for one operation's `security` requirements from the
+ * instance credentials (`config.auth`) — capability module, wired into `createClient`.
+ * A scheme with no configured credential contributes nothing (the request is sent
+ * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
+ */
+async function resolveAuth(
+  security: readonly SecuritySpec[],
+  config: ClientConfig
+): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const headers: Record<string, string> = {};
+  const query: Record<string, string> = {};
+  const cookies: string[] = [];
+  for (const scheme of security) {
+    if (scheme.kind === 'apiKey') {
+      const provider = config.auth?.apiKey?.[scheme.scheme];
+      if (provider === undefined) continue;
+      const value = await resolveToken(provider);
+      if (scheme.in === 'header') headers[scheme.name] = value;
+      else if (scheme.in === 'query') query[scheme.name] = value;
+      else cookies.push(`${scheme.name}=${value}`);
+    } else if (scheme.kind === 'bearer') {
+      const provider = config.auth?.bearer;
+      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
+    } else {
+      const basic = config.auth?.basic;
+      if (basic !== undefined) {
+        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+      }
+    }
+  }
+  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
+  return { headers, query };
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+};
+
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
 /**
- * List all order items with menu item details
- *
- * Returns an array of order items for a specific order.
- * Use the `filter` parameter to filter by order ID.
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
  */
-export async function listOrderItems(params: {
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
+}
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe.redocly.com" });
+
+export const { configure, use } = client;
+export const setBearer = client.auth.bearer;
+export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
+export const listMenuItems = (params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
     /**
      * Filters the collection items using space-separated `field:value` pairs.
      *
@@ -1461,39 +1659,115 @@ export async function listOrderItems(params: {
      * - `status:placed createdAt:7d` - Combine multiple filters.
      */
     filter?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderItem[]>(__config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
     /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
      */
-    startDate?: string;
+    search?: string;
     /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
      */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-/**
- * Get revenue statistics
- *
- * Retrieve revenue statistics for a configurable date range.
- * Returns revenue, order counts, average order amount, and other useful statistics.
- */
-export async function getRevenue(params: {
+    limit?: number;
+} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
+export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
+export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
+export const getMenuItemPhoto = (menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
+export const listOrders = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
+export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
+export const getOrderById = (orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
+export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
+export const updateOrder = (orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
+export const listOrderItems = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
+export const getRevenue = (params: {
     /**
      * Start date for the revenue calculation period (ISO 8601 datetime format).
      * Defaults to 30 days ago if not provided.
@@ -1506,29 +1780,5 @@ export async function getRevenue(params: {
      * @format date
      */
     endDate?: string;
-} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
-    const __a = await __auth(["ApiKey"], __config);
-    return __request<RevenueStatistics>(__config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Create OAuth2 client
- *
- * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
- * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
- *   `redirectUris` must be provided (per RFC 7591 Section 2).
- * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
- * Returns the registered client information per RFC 7591, including:
- * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
- */
-export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-    return __request<OAuth2Client>(__config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
-}
+} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
+export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
diff --git a/tests/e2e/generate-client/examples/customization/redocly.yaml b/tests/e2e/generate-client/examples/customization/redocly.yaml
index 9a6959609b..67ec5e5518 100644
--- a/tests/e2e/generate-client/examples/customization/redocly.yaml
+++ b/tests/e2e/generate-client/examples/customization/redocly.yaml
@@ -8,4 +8,3 @@ apis:
     client:
       generators:
         - sdk
-      facade: functions
diff --git a/tests/e2e/generate-client/examples/customization/src/api/client.ts b/tests/e2e/generate-client/examples/customization/src/api/client.ts
index 804e48df94..1ad55ad78b 100644
--- a/tests/e2e/generate-client/examples/customization/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/customization/src/api/client.ts
@@ -412,599 +412,6 @@ export function isDessert(value: MenuItem): value is Dessert {
     return (value as Record<string, unknown>)["category"] === "dessert";
 }
 
-/**
- * Static metadata for every operation, keyed by operationId: the HTTP `method`
- * and the `path` template (with `{param}` placeholders intact). Minification-safe
- * — useful for building cache/query keys, tracing span names, and request logging
- * without re-deriving them at each call site.
- */
-export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
-    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
-    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
-    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
-    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
-    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
-    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
-} as const;
-
-/**
- * The operationId of any operation in this client.
- */
-export type OperationId = keyof typeof OPERATIONS;
-
-/**
- * Static metadata describing one operation: its HTTP method, path template, and tags.
- */
-export type OperationMetadata = {
-    readonly method: string;
-    readonly path: string;
-    readonly tags: readonly string[];
-};
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
-
-let BASE = "https://api.cafe.redocly.com";
-
-/** Identity of the operation a request belongs to. Stable across path interpolation. */
-export type OperationContext = {
-    id: OperationId;
-    path: OperationPath;
-    tags: OperationTag[];
-};
-
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
-export type RequestContext = {
-    url: string;
-    method: string;
-    headers: Record<string, string>;
-    body?: unknown;
-    /** The operation being called: its id (operationId), path template, and tags. */
-    operation: OperationContext;
-};
-
-/**
- * Configuration and extension hooks for a client. Supplied per-instance via
- * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
- * (functions facade).
- */
-export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
-    serverUrl?: string;
-    /** Extra headers merged into every request; a function is invoked per request. */
-    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
-    /** Transport used to issue requests. Defaults to the global `fetch`. */
-    fetch?: typeof fetch;
-    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    /** Observe — or replace, by returning a `Response` — the response before parsing. */
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    /**
-     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
-     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
-     */
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
-    /**
-     * Composable interceptors run around every request, alongside the single
-     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
-     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
-     * the last-registered middleware wraps closest to the network. Register more at runtime
-     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
-     */
-    middleware?: Middleware[];
-    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
-    retry?: RetryConfig;
-    /**
-     * Per-instance auth credentials. When set, they override the module-global
-     * `set*` helpers for requests made through this config (each scheme falls back
-     * to its global slot when omitted here). Only the schemes an operation declares
-     * in its `security` are ever sent.
-     */
-    auth?: AuthCredentials;
-};
-
-/**
- * A request interceptor; every field is optional, so a middleware can hook any subset of
- * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
- * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
- * failure into the error to throw, threaded through each middleware in turn.
- */
-export type Middleware = {
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/** Context handed to `retryOn` for the attempt that just failed. */
-export type RetryContext = {
-    /** 1-based number of the attempt that just failed. */
-    attempt: number;
-    /** The request that was attempted. */
-    request: RequestContext;
-    /** Present when the server returned a (non-ok) response. */
-    response?: Response;
-    /** Present when the transport threw (network error, DNS, connection reset). */
-    error?: unknown;
-};
-
-/** Retry policy; all fields optional with sensible defaults. */
-export type RetryConfig = {
-    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
-    retries?: number;
-    /** Base delay in milliseconds. Default 1000. */
-    retryDelay?: number;
-    /** Backoff shape. Default 'exponential'. */
-    retryStrategy?: RetryStrategy;
-    /** Apply full jitter over the computed delay. Default true. */
-    jitter?: boolean;
-    /**
-     * Decide whether to retry a failed attempt. Default: retry only idempotent
-     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
-     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
-     */
-    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
-};
-
-/**
- * How the response body is read. `'auto'` negotiates from the content type (the
- * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
- */
-export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
-
-/**
- * The trailing per-operation argument: standard `RequestInit` plus an optional
- * per-call retry override and a `parseAs` escape hatch.
- *
- * `parseAs` forces how the response body is read; overrides the inferred kind.
- * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
- * override — the static return type is unchanged.
- */
-export type RequestOptions = RequestInit & {
-    retry?: Partial<RetryConfig>;
-    parseAs?: ParseAs;
-};
-
-/**
- * Override the base URL used by every generated operation. Useful when the
- * runtime environment differs from the value declared in `servers[0].url`
- * (e.g. dev / staging / prod toggles in a single-page app).
- *
- * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ serverUrl })`.
- */
-export function setServerUrl(url: string): void {
-    BASE = url;
-}
-
-/** The global config used by the functions facade (see `configure`). */
-const __config: ClientConfig = {};
-
-/**
- * Merge `config` into the global configuration used by the functions facade —
- * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
- * hooks once for every free function. The service-class facade configures per
- * instance instead (`new Client(config)`).
- */
-export function configure(config: ClientConfig): void {
-    Object.assign(__config, config);
-}
-
-/**
- * Append interceptors to the functions facade's global middleware chain (see
- * `ClientConfig.middleware`). The service-class facade registers per instance via
- * `<Client>.use(...)` instead.
- */
-export function use(...middleware: Middleware[]): void {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    __config.middleware = [...(__config.middleware ?? []), ...middleware];
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function __middleware(config: ClientConfig): Middleware[] {
-    const single = config.onRequest || config.onResponse || config.onError
-        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-        : [];
-    return [...single, ...(config.middleware ?? [])];
-}
-
-export class ApiError extends Error {
-    public readonly url: string;
-    public readonly status: number;
-    public readonly statusText: string;
-    public readonly body: unknown;
-    constructor(url: string, status: number, statusText: string, body: unknown) {
-        super(`Request failed with status ${status}`);
-        this.name = 'ApiError';
-        this.url = url;
-        this.status = status;
-        this.statusText = statusText;
-        this.body = body;
-    }
-}
-
-type QueryPrimitive = string | number | boolean;
-
-type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
-
-/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
-type QueryStyle = {
-    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-    explode: boolean;
-    allowReserved?: boolean;
-};
-
-/**
- * Percent-encode `value` but leave the RFC-3986 reserved set
- * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
- */
-function __encodeReserved(value: string): string {
-    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
-}
-
-function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
-    if (!query)
-        return url;
-    const params = new URLSearchParams();
-    const raw: string[] = [];
-    for (const [key, value] of Object.entries(query)) {
-        if (value === undefined || value === null)
-            continue;
-        const spec = styles?.[key];
-        if (!spec) {
-            if (Array.isArray(value)) {
-                for (const v of value) {
-                    if (v !== undefined && v !== null)
-                        params.append(key, String(v));
-                }
-            }
-            else if (typeof value === 'object') {
-                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-                for (const [subKey, subValue] of Object.entries(value)) {
-                    if (subValue !== undefined && subValue !== null) {
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                    }
-                }
-            }
-            else {
-                params.append(key, String(value));
-            }
-            continue;
-        }
-        if (Array.isArray(value)) {
-            const items = value.filter((v) => v !== undefined && v !== null).map(String);
-            if (spec.style === 'form' && spec.explode) {
-                for (const v of items) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}=${__encodeReserved(v)}`);
-                    else
-                        params.append(key, v);
-                }
-            }
-            else {
-                // Delimited styles put the LITERAL delimiter on the wire; only the
-                // values are encoded. `%20` (not `+`) is the literal space delimiter.
-                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
-                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-            }
-        }
-        else if (typeof value === 'object') {
-            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-            for (const [subKey, subValue] of Object.entries(value)) {
-                if (subValue !== undefined && subValue !== null) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
-                    else
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                }
-            }
-        }
-        else if (spec.allowReserved) {
-            raw.push(`${key}=${__encodeReserved(String(value))}`);
-        }
-        else {
-            params.append(key, String(value));
-        }
-    }
-    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-    return qs ? `${url}?${qs}` : url;
-}
-
-async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
-    response: Response;
-    context: RequestContext;
-}> {
-    const { retry: callRetry, ...fetchInit } = init;
-    const retry: RetryConfig = { ...config.retry, ...callRetry };
-    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-    const headers: Record<string, string> = {
-        Accept: 'application/json',
-        ...extra,
-        ...(fetchInit.headers as Record<string, string> | undefined),
-    };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
-    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-    let payload: BodyInit | undefined;
-    if (context.body !== undefined) {
-        const value = context.body;
-        const isBinary = value instanceof Blob ||
-            value instanceof ArrayBuffer ||
-            ArrayBuffer.isView(value as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-        const isURLSearchParams = value instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-            payload = value as BodyInit;
-        }
-        else {
-            payload = JSON.stringify(value);
-            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-                context.headers['Content-Type'] = 'application/json';
-            }
-        }
-    }
-    const doFetch = config.fetch ?? fetch;
-    const maxAttempts = 1 + (retry.retries ?? 0);
-    const retryOn = retry.retryOn ?? __defaultRetryOn;
-    const signal = fetchInit.signal ?? undefined;
-    let attempt = 0;
-    while (true) {
-        attempt++;
-        if (signal?.aborted)
-            throw __abortError(signal);
-        let response: Response;
-        try {
-            response = await doFetch(context.url, {
-                ...fetchInit,
-                method: context.method,
-                headers: context.headers,
-                body: payload,
-            });
-        }
-        catch (error) {
-            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
-                await __sleep(__retryDelay(retry, attempt, null), signal);
-                continue;
-            }
-            throw error;
-        }
-        // Reverse order: the last-registered middleware wraps closest to the network (onion).
-        for (let i = middleware.length - 1; i >= 0; i--) {
-            const onResponse = middleware[i].onResponse;
-            if (onResponse) {
-                const replaced = await onResponse(response, context);
-                if (replaced)
-                    response = replaced;
-            }
-        }
-        if (!response.ok &&
-            attempt < maxAttempts &&
-            !signal?.aborted &&
-            (await retryOn({ attempt, request: context, response }))) {
-            const retryAfter = response.headers.get('retry-after');
-            // Drain the abandoned response body before the next attempt: an unread body
-            // keeps the connection checked out (and can stall the pool) under Node/undici
-            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-            await response.body?.cancel().catch(() => undefined);
-            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
-            continue;
-        }
-        return { response, context };
-    }
-}
-
-async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-    if (kind === 'void' || response.status === 204)
-        return undefined;
-    if (kind === 'stream')
-        return response.body;
-    if (kind === 'blob')
-        return response.blob();
-    if (kind === 'arrayBuffer')
-        return response.arrayBuffer();
-    if (kind === 'formData')
-        return response.formData();
-    if (kind === 'text')
-        return response.text();
-    if (kind === 'json')
-        return response.json();
-    // 'auto' — negotiate from the response's content type.
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json'))
-        return response.json();
-    if (contentType.startsWith('text/'))
-        return response.text();
-    return response.blob();
-}
-
-async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
-    const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, op, url, sendInit, body);
-    if (!response.ok) {
-        const errorBody = await readError(response);
-        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
-        // Thread the error through each middleware's onError in turn (each may replace it).
-        for (const mw of __middleware(config)) {
-            if (mw.onError)
-                error = await mw.onError(error as ApiError, context);
-        }
-        throw error;
-    }
-    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
-    return (await __parse(response, kind)) as T;
-}
-
-async function readError(response: Response): Promise<unknown> {
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json')) {
-        return response.json().catch(() => undefined);
-    }
-    return response.text().catch(() => undefined);
-}
-
-const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-
-const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-function __defaultRetryOn(ctx: RetryContext): boolean {
-    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
-        return false;
-    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-    if (retryAfter) {
-        const seconds = Number(retryAfter);
-        if (!Number.isNaN(seconds))
-            return seconds * 1000;
-        const when = Date.parse(retryAfter);
-        if (!Number.isNaN(when))
-            return Math.max(0, when - Date.now());
-    }
-    const base = retry.retryDelay ?? 1000;
-    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-    return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
-    return new Promise((resolve, reject) => {
-        if (signal?.aborted) {
-            reject(__abortError(signal));
-            return;
-        }
-        const onAbort = () => {
-            clearTimeout(timer);
-            reject(__abortError(signal as AbortSignal));
-        };
-        const timer = setTimeout(() => {
-            if (signal)
-                signal.removeEventListener('abort', onAbort);
-            resolve();
-        }, ms);
-        if (signal)
-            signal.addEventListener('abort', onAbort, { once: true });
-    });
-}
-
-function __abortError(signal: AbortSignal): globalThis.Error {
-    const reason = (signal as {
-        reason?: unknown;
-    }).reason;
-    if (reason instanceof Error)
-        return reason;
-    return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * Normalize an operation's header-parameter object into a plain string record,
- * dropping any `undefined` / `null` entries (optional headers the caller omitted)
- * and stringifying the rest. Mirrors __buildUrl's handling of query values.
- */
-function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
-    const out: Record<string, string> = {};
-    for (const [key, value] of Object.entries(values)) {
-        if (value !== undefined && value !== null)
-            out[key] = String(value);
-    }
-    return out;
-}
-
-/**
- * A credential value, or a (possibly async) function that returns one per request.
- */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/**
- * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
- * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
- * to the global slots.
- */
-export type AuthCredentials = {
-    bearer?: TokenProvider;
-    apiKey?: Record<string, TokenProvider>;
-};
-
-let __bearerToken: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
- * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
- * (possibly async) function resolved per request.
- */
-export function setBearer(token: TokenProvider | null): void {
-    __bearerToken = token;
-}
-
-let __apiKey_ApiKey: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
- * string or a (possibly async) function resolved per request.
- */
-export function setApiKey(key: TokenProvider | null): void {
-    __apiKey_ApiKey = key;
-}
-
-/**
- * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
- */
-async function __resolve(slot: TokenProvider | null): Promise<string | null> {
-    if (slot === null)
-        return null;
-    return typeof slot === "function" ? slot() : slot;
-}
-
-/**
- * Build the auth `headers` and `query` for an operation from the currently-set credentials.
- * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
- * can always override by passing their own `init.headers`.
- */
-async function __auth(schemes: string[], config: ClientConfig): Promise<{
-    headers: Record<string, string>;
-    query: Record<string, string>;
-}> {
-    const headers: Record<string, string> = {};
-    const query: Record<string, string> = {};
-    const cookies: string[] = [];
-    for (const scheme of schemes) {
-        switch (scheme) {
-            case "OAuth2": {
-                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
-                if (v !== null)
-                    headers["Authorization"] = `Bearer ${v}`;
-                break;
-            }
-            case "ApiKey": {
-                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
-                if (v !== null)
-                    headers["X-API-Key"] = v;
-                break;
-            }
-        }
-    }
-    if (cookies.length > 0)
-        headers["Cookie"] = cookies.join("; ");
-    return { headers, query };
-}
-
 export type ListMenuItemsResult = MenuItemList;
 
 export type ListMenuItemsParams = {
@@ -1062,64 +469,6 @@ export type ListMenuItemsVariables = {
     params?: ListMenuItemsParams;
 };
 
-/**
- * List all menu items
- *
- * Retrieve a collection of menu items with optional filtering and pagination.
- */
-export async function listMenuItems(params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-    return __request<MenuItemList>(__config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
-}
-
 export type CreateMenuItemResult = MenuItem;
 
 export type CreateMenuItemBody = FormData;
@@ -1128,16 +477,6 @@ export type CreateMenuItemVariables = {
     body: CreateMenuItemBody;
 };
 
-/**
- * Create menu item
- *
- * Create a new menu item.
- */
-export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<MenuItem>(__config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
 export type DeleteMenuItemResult = void;
 
 export type DeleteMenuItemVariables = {
@@ -1148,16 +487,6 @@ export type DeleteMenuItemVariables = {
     menuItemId: string;
 };
 
-/**
- * Delete a menu item
- *
- * Delete an existing menu item.
- */
-export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
 export type GetMenuItemPhotoResult = Blob | string;
 
 export type GetMenuItemPhotoParams = {
@@ -1176,20 +505,6 @@ export type GetMenuItemPhotoVariables = {
     params?: GetMenuItemPhotoParams;
 };
 
-/**
- * Retrieve a menu item photo
- *
- * Retrieve the product photo image for a specific menu item.
- */
-export async function getMenuItemPhoto(menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}): Promise<Blob | string> {
-    return __request<Blob | string>(__config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
-}
-
 export type ListOrdersResult = OrderList;
 
 export type ListOrdersParams = {
@@ -1247,95 +562,25 @@ export type ListOrdersVariables = {
     params?: ListOrdersParams;
 };
 
-/**
- * List all orders
- *
- * Retrieve a collection of orders with optional filtering and pagination.
- */
-export async function listOrders(params: {
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
     /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
      */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderList> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderList>(__config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-/**
- * Create order
- *
- * Create a new order.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
     /**
      * ID of the order to retrieve.
      * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
@@ -1344,22 +589,6 @@ export type GetOrderByIdVariables = {
     headers?: GetOrderByIdHeaders;
 };
 
-/**
- * Retrieve an order
- *
- * Retrieve a single order by its ID.
- */
-export async function getOrderById(orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
-}
-
 export type DeleteOrderResult = void;
 
 export type DeleteOrderVariables = {
@@ -1370,17 +599,6 @@ export type DeleteOrderVariables = {
     orderId: string;
 };
 
-/**
- * Delete an order
- *
- * Delete the order.
- * To keep the order history, the order should be canceled instead of deleted.
- */
-export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
 export type UpdateOrderResult = Order;
 
 export type UpdateOrderBody = {
@@ -1396,19 +614,6 @@ export type UpdateOrderVariables = {
     body?: UpdateOrderBody;
 };
 
-/**
- * Partially update an order
- *
- * Update an existing order status.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function updateOrder(orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
 export type ListOrderItemsResult = OrderItem[];
 
 export type ListOrderItemsParams = {
@@ -1436,13 +641,1006 @@ export type ListOrderItemsVariables = {
     params?: ListOrderItemsParams;
 };
 
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    listMenuItems: {
+        args: {
+            params?: ListMenuItemsParams;
+        };
+        result: ListMenuItemsResult;
+    };
+    createMenuItem: {
+        args: {
+            body: CreateMenuItemBody;
+        };
+        result: CreateMenuItemResult;
+    };
+    deleteMenuItem: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+        };
+        result: DeleteMenuItemResult;
+    };
+    getMenuItemPhoto: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+            params?: GetMenuItemPhotoParams;
+        };
+        result: GetMenuItemPhotoResult;
+    };
+    listOrders: {
+        args: {
+            params?: ListOrdersParams;
+        };
+        result: ListOrdersResult;
+    };
+    createOrder: {
+        args: {
+            body: CreateOrderBody;
+        };
+        result: CreateOrderResult;
+    };
+    getOrderById: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            headers?: GetOrderByIdHeaders;
+        };
+        result: GetOrderByIdResult;
+    };
+    deleteOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+        };
+        result: DeleteOrderResult;
+    };
+    updateOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            body?: UpdateOrderBody;
+        };
+        result: UpdateOrderResult;
+    };
+    listOrderItems: {
+        args: {
+            params?: ListOrderItemsParams;
+        };
+        result: ListOrderItemsResult;
+    };
+    getRevenue: {
+        args: {
+            params?: GetRevenueParams;
+        };
+        result: GetRevenueResult;
+    };
+    registerOAuth2Client: {
+        args: {
+            body: RegisterOAuth2ClientBody;
+        };
+        result: RegisterOAuth2ClientResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
+export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : NoRequiredKeys<Ops[K]['args']> extends true
+      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
+
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/** Resolve a credential: a literal passes through; a function is awaited per request. */
+async function resolveToken(provider: TokenProvider): Promise<string> {
+  return typeof provider === 'function' ? await provider() : provider;
+}
+
+/**
+ * Build the auth headers/query for one operation's `security` requirements from the
+ * instance credentials (`config.auth`) — capability module, wired into `createClient`.
+ * A scheme with no configured credential contributes nothing (the request is sent
+ * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
+ */
+async function resolveAuth(
+  security: readonly SecuritySpec[],
+  config: ClientConfig
+): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const headers: Record<string, string> = {};
+  const query: Record<string, string> = {};
+  const cookies: string[] = [];
+  for (const scheme of security) {
+    if (scheme.kind === 'apiKey') {
+      const provider = config.auth?.apiKey?.[scheme.scheme];
+      if (provider === undefined) continue;
+      const value = await resolveToken(provider);
+      if (scheme.in === 'header') headers[scheme.name] = value;
+      else if (scheme.in === 'query') query[scheme.name] = value;
+      else cookies.push(`${scheme.name}=${value}`);
+    } else if (scheme.kind === 'bearer') {
+      const provider = config.auth?.bearer;
+      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
+    } else {
+      const basic = config.auth?.basic;
+      if (basic !== undefined) {
+        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+      }
+    }
+  }
+  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
+  return { headers, query };
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+};
+
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
 /**
- * List all order items with menu item details
- *
- * Returns an array of order items for a specific order.
- * Use the `filter` parameter to filter by order ID.
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
  */
-export async function listOrderItems(params: {
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
+}
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe.redocly.com" });
+
+export const { configure, use } = client;
+export const setBearer = client.auth.bearer;
+export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
+export const listMenuItems = (params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
     /**
      * Filters the collection items using space-separated `field:value` pairs.
      *
@@ -1461,39 +1659,115 @@ export async function listOrderItems(params: {
      * - `status:placed createdAt:7d` - Combine multiple filters.
      */
     filter?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderItem[]>(__config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
     /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
      */
-    startDate?: string;
+    search?: string;
     /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
      */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-/**
- * Get revenue statistics
- *
- * Retrieve revenue statistics for a configurable date range.
- * Returns revenue, order counts, average order amount, and other useful statistics.
- */
-export async function getRevenue(params: {
+    limit?: number;
+} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
+export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
+export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
+export const getMenuItemPhoto = (menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
+export const listOrders = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
+export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
+export const getOrderById = (orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
+export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
+export const updateOrder = (orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
+export const listOrderItems = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
+export const getRevenue = (params: {
     /**
      * Start date for the revenue calculation period (ISO 8601 datetime format).
      * Defaults to 30 days ago if not provided.
@@ -1506,29 +1780,5 @@ export async function getRevenue(params: {
      * @format date
      */
     endDate?: string;
-} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
-    const __a = await __auth(["ApiKey"], __config);
-    return __request<RevenueStatistics>(__config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Create OAuth2 client
- *
- * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
- * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
- *   `redirectUris` must be provided (per RFC 7591 Section 2).
- * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
- * Returns the registered client information per RFC 7591, including:
- * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
- */
-export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-    return __request<OAuth2Client>(__config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
-}
+} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
+export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
diff --git a/tests/e2e/generate-client/examples/fetch-functions/README.md b/tests/e2e/generate-client/examples/fetch-functions/README.md
index 12f5e51c97..456892f49a 100644
--- a/tests/e2e/generate-client/examples/fetch-functions/README.md
+++ b/tests/e2e/generate-client/examples/fetch-functions/README.md
@@ -1,6 +1,6 @@
 # fetch-functions example
 
-Generated TypeScript client using the **functions facade** (`generators: ['sdk']`), consumed as free
+Generated TypeScript client (`generators: ['sdk']`), consumed as free
 functions (`configure()`, `listMenuItems()`), with `ApiError` handling.
 
 ## Run
diff --git a/tests/e2e/generate-client/examples/fetch-functions/redocly.yaml b/tests/e2e/generate-client/examples/fetch-functions/redocly.yaml
index 2256b1fef6..b611920264 100644
--- a/tests/e2e/generate-client/examples/fetch-functions/redocly.yaml
+++ b/tests/e2e/generate-client/examples/fetch-functions/redocly.yaml
@@ -8,4 +8,3 @@ apis:
     client:
       generators:
         - sdk
-      facade: functions
diff --git a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
index 804e48df94..1ad55ad78b 100644
--- a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
@@ -412,599 +412,6 @@ export function isDessert(value: MenuItem): value is Dessert {
     return (value as Record<string, unknown>)["category"] === "dessert";
 }
 
-/**
- * Static metadata for every operation, keyed by operationId: the HTTP `method`
- * and the `path` template (with `{param}` placeholders intact). Minification-safe
- * — useful for building cache/query keys, tracing span names, and request logging
- * without re-deriving them at each call site.
- */
-export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
-    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
-    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
-    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
-    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
-    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
-    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
-} as const;
-
-/**
- * The operationId of any operation in this client.
- */
-export type OperationId = keyof typeof OPERATIONS;
-
-/**
- * Static metadata describing one operation: its HTTP method, path template, and tags.
- */
-export type OperationMetadata = {
-    readonly method: string;
-    readonly path: string;
-    readonly tags: readonly string[];
-};
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
-
-let BASE = "https://api.cafe.redocly.com";
-
-/** Identity of the operation a request belongs to. Stable across path interpolation. */
-export type OperationContext = {
-    id: OperationId;
-    path: OperationPath;
-    tags: OperationTag[];
-};
-
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
-export type RequestContext = {
-    url: string;
-    method: string;
-    headers: Record<string, string>;
-    body?: unknown;
-    /** The operation being called: its id (operationId), path template, and tags. */
-    operation: OperationContext;
-};
-
-/**
- * Configuration and extension hooks for a client. Supplied per-instance via
- * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
- * (functions facade).
- */
-export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
-    serverUrl?: string;
-    /** Extra headers merged into every request; a function is invoked per request. */
-    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
-    /** Transport used to issue requests. Defaults to the global `fetch`. */
-    fetch?: typeof fetch;
-    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    /** Observe — or replace, by returning a `Response` — the response before parsing. */
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    /**
-     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
-     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
-     */
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
-    /**
-     * Composable interceptors run around every request, alongside the single
-     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
-     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
-     * the last-registered middleware wraps closest to the network. Register more at runtime
-     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
-     */
-    middleware?: Middleware[];
-    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
-    retry?: RetryConfig;
-    /**
-     * Per-instance auth credentials. When set, they override the module-global
-     * `set*` helpers for requests made through this config (each scheme falls back
-     * to its global slot when omitted here). Only the schemes an operation declares
-     * in its `security` are ever sent.
-     */
-    auth?: AuthCredentials;
-};
-
-/**
- * A request interceptor; every field is optional, so a middleware can hook any subset of
- * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
- * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
- * failure into the error to throw, threaded through each middleware in turn.
- */
-export type Middleware = {
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/** Context handed to `retryOn` for the attempt that just failed. */
-export type RetryContext = {
-    /** 1-based number of the attempt that just failed. */
-    attempt: number;
-    /** The request that was attempted. */
-    request: RequestContext;
-    /** Present when the server returned a (non-ok) response. */
-    response?: Response;
-    /** Present when the transport threw (network error, DNS, connection reset). */
-    error?: unknown;
-};
-
-/** Retry policy; all fields optional with sensible defaults. */
-export type RetryConfig = {
-    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
-    retries?: number;
-    /** Base delay in milliseconds. Default 1000. */
-    retryDelay?: number;
-    /** Backoff shape. Default 'exponential'. */
-    retryStrategy?: RetryStrategy;
-    /** Apply full jitter over the computed delay. Default true. */
-    jitter?: boolean;
-    /**
-     * Decide whether to retry a failed attempt. Default: retry only idempotent
-     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
-     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
-     */
-    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
-};
-
-/**
- * How the response body is read. `'auto'` negotiates from the content type (the
- * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
- */
-export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
-
-/**
- * The trailing per-operation argument: standard `RequestInit` plus an optional
- * per-call retry override and a `parseAs` escape hatch.
- *
- * `parseAs` forces how the response body is read; overrides the inferred kind.
- * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
- * override — the static return type is unchanged.
- */
-export type RequestOptions = RequestInit & {
-    retry?: Partial<RetryConfig>;
-    parseAs?: ParseAs;
-};
-
-/**
- * Override the base URL used by every generated operation. Useful when the
- * runtime environment differs from the value declared in `servers[0].url`
- * (e.g. dev / staging / prod toggles in a single-page app).
- *
- * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ serverUrl })`.
- */
-export function setServerUrl(url: string): void {
-    BASE = url;
-}
-
-/** The global config used by the functions facade (see `configure`). */
-const __config: ClientConfig = {};
-
-/**
- * Merge `config` into the global configuration used by the functions facade —
- * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
- * hooks once for every free function. The service-class facade configures per
- * instance instead (`new Client(config)`).
- */
-export function configure(config: ClientConfig): void {
-    Object.assign(__config, config);
-}
-
-/**
- * Append interceptors to the functions facade's global middleware chain (see
- * `ClientConfig.middleware`). The service-class facade registers per instance via
- * `<Client>.use(...)` instead.
- */
-export function use(...middleware: Middleware[]): void {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    __config.middleware = [...(__config.middleware ?? []), ...middleware];
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function __middleware(config: ClientConfig): Middleware[] {
-    const single = config.onRequest || config.onResponse || config.onError
-        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-        : [];
-    return [...single, ...(config.middleware ?? [])];
-}
-
-export class ApiError extends Error {
-    public readonly url: string;
-    public readonly status: number;
-    public readonly statusText: string;
-    public readonly body: unknown;
-    constructor(url: string, status: number, statusText: string, body: unknown) {
-        super(`Request failed with status ${status}`);
-        this.name = 'ApiError';
-        this.url = url;
-        this.status = status;
-        this.statusText = statusText;
-        this.body = body;
-    }
-}
-
-type QueryPrimitive = string | number | boolean;
-
-type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
-
-/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
-type QueryStyle = {
-    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-    explode: boolean;
-    allowReserved?: boolean;
-};
-
-/**
- * Percent-encode `value` but leave the RFC-3986 reserved set
- * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
- */
-function __encodeReserved(value: string): string {
-    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
-}
-
-function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
-    if (!query)
-        return url;
-    const params = new URLSearchParams();
-    const raw: string[] = [];
-    for (const [key, value] of Object.entries(query)) {
-        if (value === undefined || value === null)
-            continue;
-        const spec = styles?.[key];
-        if (!spec) {
-            if (Array.isArray(value)) {
-                for (const v of value) {
-                    if (v !== undefined && v !== null)
-                        params.append(key, String(v));
-                }
-            }
-            else if (typeof value === 'object') {
-                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-                for (const [subKey, subValue] of Object.entries(value)) {
-                    if (subValue !== undefined && subValue !== null) {
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                    }
-                }
-            }
-            else {
-                params.append(key, String(value));
-            }
-            continue;
-        }
-        if (Array.isArray(value)) {
-            const items = value.filter((v) => v !== undefined && v !== null).map(String);
-            if (spec.style === 'form' && spec.explode) {
-                for (const v of items) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}=${__encodeReserved(v)}`);
-                    else
-                        params.append(key, v);
-                }
-            }
-            else {
-                // Delimited styles put the LITERAL delimiter on the wire; only the
-                // values are encoded. `%20` (not `+`) is the literal space delimiter.
-                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
-                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-            }
-        }
-        else if (typeof value === 'object') {
-            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-            for (const [subKey, subValue] of Object.entries(value)) {
-                if (subValue !== undefined && subValue !== null) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
-                    else
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                }
-            }
-        }
-        else if (spec.allowReserved) {
-            raw.push(`${key}=${__encodeReserved(String(value))}`);
-        }
-        else {
-            params.append(key, String(value));
-        }
-    }
-    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-    return qs ? `${url}?${qs}` : url;
-}
-
-async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
-    response: Response;
-    context: RequestContext;
-}> {
-    const { retry: callRetry, ...fetchInit } = init;
-    const retry: RetryConfig = { ...config.retry, ...callRetry };
-    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-    const headers: Record<string, string> = {
-        Accept: 'application/json',
-        ...extra,
-        ...(fetchInit.headers as Record<string, string> | undefined),
-    };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
-    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-    let payload: BodyInit | undefined;
-    if (context.body !== undefined) {
-        const value = context.body;
-        const isBinary = value instanceof Blob ||
-            value instanceof ArrayBuffer ||
-            ArrayBuffer.isView(value as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-        const isURLSearchParams = value instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-            payload = value as BodyInit;
-        }
-        else {
-            payload = JSON.stringify(value);
-            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-                context.headers['Content-Type'] = 'application/json';
-            }
-        }
-    }
-    const doFetch = config.fetch ?? fetch;
-    const maxAttempts = 1 + (retry.retries ?? 0);
-    const retryOn = retry.retryOn ?? __defaultRetryOn;
-    const signal = fetchInit.signal ?? undefined;
-    let attempt = 0;
-    while (true) {
-        attempt++;
-        if (signal?.aborted)
-            throw __abortError(signal);
-        let response: Response;
-        try {
-            response = await doFetch(context.url, {
-                ...fetchInit,
-                method: context.method,
-                headers: context.headers,
-                body: payload,
-            });
-        }
-        catch (error) {
-            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
-                await __sleep(__retryDelay(retry, attempt, null), signal);
-                continue;
-            }
-            throw error;
-        }
-        // Reverse order: the last-registered middleware wraps closest to the network (onion).
-        for (let i = middleware.length - 1; i >= 0; i--) {
-            const onResponse = middleware[i].onResponse;
-            if (onResponse) {
-                const replaced = await onResponse(response, context);
-                if (replaced)
-                    response = replaced;
-            }
-        }
-        if (!response.ok &&
-            attempt < maxAttempts &&
-            !signal?.aborted &&
-            (await retryOn({ attempt, request: context, response }))) {
-            const retryAfter = response.headers.get('retry-after');
-            // Drain the abandoned response body before the next attempt: an unread body
-            // keeps the connection checked out (and can stall the pool) under Node/undici
-            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-            await response.body?.cancel().catch(() => undefined);
-            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
-            continue;
-        }
-        return { response, context };
-    }
-}
-
-async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-    if (kind === 'void' || response.status === 204)
-        return undefined;
-    if (kind === 'stream')
-        return response.body;
-    if (kind === 'blob')
-        return response.blob();
-    if (kind === 'arrayBuffer')
-        return response.arrayBuffer();
-    if (kind === 'formData')
-        return response.formData();
-    if (kind === 'text')
-        return response.text();
-    if (kind === 'json')
-        return response.json();
-    // 'auto' — negotiate from the response's content type.
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json'))
-        return response.json();
-    if (contentType.startsWith('text/'))
-        return response.text();
-    return response.blob();
-}
-
-async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
-    const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, op, url, sendInit, body);
-    if (!response.ok) {
-        const errorBody = await readError(response);
-        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
-        // Thread the error through each middleware's onError in turn (each may replace it).
-        for (const mw of __middleware(config)) {
-            if (mw.onError)
-                error = await mw.onError(error as ApiError, context);
-        }
-        throw error;
-    }
-    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
-    return (await __parse(response, kind)) as T;
-}
-
-async function readError(response: Response): Promise<unknown> {
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json')) {
-        return response.json().catch(() => undefined);
-    }
-    return response.text().catch(() => undefined);
-}
-
-const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-
-const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-function __defaultRetryOn(ctx: RetryContext): boolean {
-    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
-        return false;
-    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-    if (retryAfter) {
-        const seconds = Number(retryAfter);
-        if (!Number.isNaN(seconds))
-            return seconds * 1000;
-        const when = Date.parse(retryAfter);
-        if (!Number.isNaN(when))
-            return Math.max(0, when - Date.now());
-    }
-    const base = retry.retryDelay ?? 1000;
-    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-    return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
-    return new Promise((resolve, reject) => {
-        if (signal?.aborted) {
-            reject(__abortError(signal));
-            return;
-        }
-        const onAbort = () => {
-            clearTimeout(timer);
-            reject(__abortError(signal as AbortSignal));
-        };
-        const timer = setTimeout(() => {
-            if (signal)
-                signal.removeEventListener('abort', onAbort);
-            resolve();
-        }, ms);
-        if (signal)
-            signal.addEventListener('abort', onAbort, { once: true });
-    });
-}
-
-function __abortError(signal: AbortSignal): globalThis.Error {
-    const reason = (signal as {
-        reason?: unknown;
-    }).reason;
-    if (reason instanceof Error)
-        return reason;
-    return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * Normalize an operation's header-parameter object into a plain string record,
- * dropping any `undefined` / `null` entries (optional headers the caller omitted)
- * and stringifying the rest. Mirrors __buildUrl's handling of query values.
- */
-function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
-    const out: Record<string, string> = {};
-    for (const [key, value] of Object.entries(values)) {
-        if (value !== undefined && value !== null)
-            out[key] = String(value);
-    }
-    return out;
-}
-
-/**
- * A credential value, or a (possibly async) function that returns one per request.
- */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/**
- * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
- * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
- * to the global slots.
- */
-export type AuthCredentials = {
-    bearer?: TokenProvider;
-    apiKey?: Record<string, TokenProvider>;
-};
-
-let __bearerToken: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
- * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
- * (possibly async) function resolved per request.
- */
-export function setBearer(token: TokenProvider | null): void {
-    __bearerToken = token;
-}
-
-let __apiKey_ApiKey: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
- * string or a (possibly async) function resolved per request.
- */
-export function setApiKey(key: TokenProvider | null): void {
-    __apiKey_ApiKey = key;
-}
-
-/**
- * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
- */
-async function __resolve(slot: TokenProvider | null): Promise<string | null> {
-    if (slot === null)
-        return null;
-    return typeof slot === "function" ? slot() : slot;
-}
-
-/**
- * Build the auth `headers` and `query` for an operation from the currently-set credentials.
- * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
- * can always override by passing their own `init.headers`.
- */
-async function __auth(schemes: string[], config: ClientConfig): Promise<{
-    headers: Record<string, string>;
-    query: Record<string, string>;
-}> {
-    const headers: Record<string, string> = {};
-    const query: Record<string, string> = {};
-    const cookies: string[] = [];
-    for (const scheme of schemes) {
-        switch (scheme) {
-            case "OAuth2": {
-                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
-                if (v !== null)
-                    headers["Authorization"] = `Bearer ${v}`;
-                break;
-            }
-            case "ApiKey": {
-                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
-                if (v !== null)
-                    headers["X-API-Key"] = v;
-                break;
-            }
-        }
-    }
-    if (cookies.length > 0)
-        headers["Cookie"] = cookies.join("; ");
-    return { headers, query };
-}
-
 export type ListMenuItemsResult = MenuItemList;
 
 export type ListMenuItemsParams = {
@@ -1062,64 +469,6 @@ export type ListMenuItemsVariables = {
     params?: ListMenuItemsParams;
 };
 
-/**
- * List all menu items
- *
- * Retrieve a collection of menu items with optional filtering and pagination.
- */
-export async function listMenuItems(params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-    return __request<MenuItemList>(__config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
-}
-
 export type CreateMenuItemResult = MenuItem;
 
 export type CreateMenuItemBody = FormData;
@@ -1128,16 +477,6 @@ export type CreateMenuItemVariables = {
     body: CreateMenuItemBody;
 };
 
-/**
- * Create menu item
- *
- * Create a new menu item.
- */
-export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<MenuItem>(__config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
 export type DeleteMenuItemResult = void;
 
 export type DeleteMenuItemVariables = {
@@ -1148,16 +487,6 @@ export type DeleteMenuItemVariables = {
     menuItemId: string;
 };
 
-/**
- * Delete a menu item
- *
- * Delete an existing menu item.
- */
-export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
 export type GetMenuItemPhotoResult = Blob | string;
 
 export type GetMenuItemPhotoParams = {
@@ -1176,20 +505,6 @@ export type GetMenuItemPhotoVariables = {
     params?: GetMenuItemPhotoParams;
 };
 
-/**
- * Retrieve a menu item photo
- *
- * Retrieve the product photo image for a specific menu item.
- */
-export async function getMenuItemPhoto(menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}): Promise<Blob | string> {
-    return __request<Blob | string>(__config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
-}
-
 export type ListOrdersResult = OrderList;
 
 export type ListOrdersParams = {
@@ -1247,95 +562,25 @@ export type ListOrdersVariables = {
     params?: ListOrdersParams;
 };
 
-/**
- * List all orders
- *
- * Retrieve a collection of orders with optional filtering and pagination.
- */
-export async function listOrders(params: {
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
     /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
      */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderList> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderList>(__config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-/**
- * Create order
- *
- * Create a new order.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
     /**
      * ID of the order to retrieve.
      * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
@@ -1344,22 +589,6 @@ export type GetOrderByIdVariables = {
     headers?: GetOrderByIdHeaders;
 };
 
-/**
- * Retrieve an order
- *
- * Retrieve a single order by its ID.
- */
-export async function getOrderById(orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
-}
-
 export type DeleteOrderResult = void;
 
 export type DeleteOrderVariables = {
@@ -1370,17 +599,6 @@ export type DeleteOrderVariables = {
     orderId: string;
 };
 
-/**
- * Delete an order
- *
- * Delete the order.
- * To keep the order history, the order should be canceled instead of deleted.
- */
-export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
 export type UpdateOrderResult = Order;
 
 export type UpdateOrderBody = {
@@ -1396,19 +614,6 @@ export type UpdateOrderVariables = {
     body?: UpdateOrderBody;
 };
 
-/**
- * Partially update an order
- *
- * Update an existing order status.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function updateOrder(orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
 export type ListOrderItemsResult = OrderItem[];
 
 export type ListOrderItemsParams = {
@@ -1436,13 +641,1006 @@ export type ListOrderItemsVariables = {
     params?: ListOrderItemsParams;
 };
 
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    listMenuItems: {
+        args: {
+            params?: ListMenuItemsParams;
+        };
+        result: ListMenuItemsResult;
+    };
+    createMenuItem: {
+        args: {
+            body: CreateMenuItemBody;
+        };
+        result: CreateMenuItemResult;
+    };
+    deleteMenuItem: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+        };
+        result: DeleteMenuItemResult;
+    };
+    getMenuItemPhoto: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+            params?: GetMenuItemPhotoParams;
+        };
+        result: GetMenuItemPhotoResult;
+    };
+    listOrders: {
+        args: {
+            params?: ListOrdersParams;
+        };
+        result: ListOrdersResult;
+    };
+    createOrder: {
+        args: {
+            body: CreateOrderBody;
+        };
+        result: CreateOrderResult;
+    };
+    getOrderById: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            headers?: GetOrderByIdHeaders;
+        };
+        result: GetOrderByIdResult;
+    };
+    deleteOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+        };
+        result: DeleteOrderResult;
+    };
+    updateOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            body?: UpdateOrderBody;
+        };
+        result: UpdateOrderResult;
+    };
+    listOrderItems: {
+        args: {
+            params?: ListOrderItemsParams;
+        };
+        result: ListOrderItemsResult;
+    };
+    getRevenue: {
+        args: {
+            params?: GetRevenueParams;
+        };
+        result: GetRevenueResult;
+    };
+    registerOAuth2Client: {
+        args: {
+            body: RegisterOAuth2ClientBody;
+        };
+        result: RegisterOAuth2ClientResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
+export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : NoRequiredKeys<Ops[K]['args']> extends true
+      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
+
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/** Resolve a credential: a literal passes through; a function is awaited per request. */
+async function resolveToken(provider: TokenProvider): Promise<string> {
+  return typeof provider === 'function' ? await provider() : provider;
+}
+
+/**
+ * Build the auth headers/query for one operation's `security` requirements from the
+ * instance credentials (`config.auth`) — capability module, wired into `createClient`.
+ * A scheme with no configured credential contributes nothing (the request is sent
+ * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
+ */
+async function resolveAuth(
+  security: readonly SecuritySpec[],
+  config: ClientConfig
+): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const headers: Record<string, string> = {};
+  const query: Record<string, string> = {};
+  const cookies: string[] = [];
+  for (const scheme of security) {
+    if (scheme.kind === 'apiKey') {
+      const provider = config.auth?.apiKey?.[scheme.scheme];
+      if (provider === undefined) continue;
+      const value = await resolveToken(provider);
+      if (scheme.in === 'header') headers[scheme.name] = value;
+      else if (scheme.in === 'query') query[scheme.name] = value;
+      else cookies.push(`${scheme.name}=${value}`);
+    } else if (scheme.kind === 'bearer') {
+      const provider = config.auth?.bearer;
+      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
+    } else {
+      const basic = config.auth?.basic;
+      if (basic !== undefined) {
+        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+      }
+    }
+  }
+  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
+  return { headers, query };
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+};
+
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
 /**
- * List all order items with menu item details
- *
- * Returns an array of order items for a specific order.
- * Use the `filter` parameter to filter by order ID.
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
  */
-export async function listOrderItems(params: {
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
+}
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe.redocly.com" });
+
+export const { configure, use } = client;
+export const setBearer = client.auth.bearer;
+export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
+export const listMenuItems = (params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
     /**
      * Filters the collection items using space-separated `field:value` pairs.
      *
@@ -1461,39 +1659,115 @@ export async function listOrderItems(params: {
      * - `status:placed createdAt:7d` - Combine multiple filters.
      */
     filter?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderItem[]>(__config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
     /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
      */
-    startDate?: string;
+    search?: string;
     /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
      */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-/**
- * Get revenue statistics
- *
- * Retrieve revenue statistics for a configurable date range.
- * Returns revenue, order counts, average order amount, and other useful statistics.
- */
-export async function getRevenue(params: {
+    limit?: number;
+} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
+export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
+export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
+export const getMenuItemPhoto = (menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
+export const listOrders = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
+export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
+export const getOrderById = (orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
+export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
+export const updateOrder = (orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
+export const listOrderItems = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
+export const getRevenue = (params: {
     /**
      * Start date for the revenue calculation period (ISO 8601 datetime format).
      * Defaults to 30 days ago if not provided.
@@ -1506,29 +1780,5 @@ export async function getRevenue(params: {
      * @format date
      */
     endDate?: string;
-} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
-    const __a = await __auth(["ApiKey"], __config);
-    return __request<RevenueStatistics>(__config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Create OAuth2 client
- *
- * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
- * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
- *   `redirectUris` must be provided (per RFC 7591 Section 2).
- * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
- * Returns the registered client information per RFC 7591, including:
- * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
- */
-export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-    return __request<OAuth2Client>(__config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
-}
+} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
+export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
diff --git a/tests/e2e/generate-client/examples/fetch-functions/src/main.ts b/tests/e2e/generate-client/examples/fetch-functions/src/main.ts
index 7db9a08fb0..81dde239e4 100644
--- a/tests/e2e/generate-client/examples/fetch-functions/src/main.ts
+++ b/tests/e2e/generate-client/examples/fetch-functions/src/main.ts
@@ -6,7 +6,7 @@ const out = document.querySelector<HTMLPreElement>('#out')!;
 
 // Middleware composes cross-cutting concerns (tracing, auth refresh, logging, …).
 // `onRequest` runs in registration order, `onResponse` in reverse (onion); register as many as you
-// like with `use()` (the service-class facade uses `client.use()`). Here we observe the response.
+// like with `use()`. Here we observe the response.
 //
 // Heads-up: adding a *custom request header* in `onRequest` (e.g. `ctx.headers['X-Request-Id'] = …`)
 // makes the browser send a CORS preflight, so the target API must list that header in its
diff --git a/tests/e2e/generate-client/examples/mock/redocly.yaml b/tests/e2e/generate-client/examples/mock/redocly.yaml
index 37d0235a28..d8b154dff0 100644
--- a/tests/e2e/generate-client/examples/mock/redocly.yaml
+++ b/tests/e2e/generate-client/examples/mock/redocly.yaml
@@ -9,4 +9,3 @@ apis:
       generators:
         - sdk
         - mock
-      facade: functions
diff --git a/tests/e2e/generate-client/examples/mock/src/api/client.ts b/tests/e2e/generate-client/examples/mock/src/api/client.ts
index 804e48df94..1ad55ad78b 100644
--- a/tests/e2e/generate-client/examples/mock/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/mock/src/api/client.ts
@@ -412,599 +412,6 @@ export function isDessert(value: MenuItem): value is Dessert {
     return (value as Record<string, unknown>)["category"] === "dessert";
 }
 
-/**
- * Static metadata for every operation, keyed by operationId: the HTTP `method`
- * and the `path` template (with `{param}` placeholders intact). Minification-safe
- * — useful for building cache/query keys, tracing span names, and request logging
- * without re-deriving them at each call site.
- */
-export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
-    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
-    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
-    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
-    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
-    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
-    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
-} as const;
-
-/**
- * The operationId of any operation in this client.
- */
-export type OperationId = keyof typeof OPERATIONS;
-
-/**
- * Static metadata describing one operation: its HTTP method, path template, and tags.
- */
-export type OperationMetadata = {
-    readonly method: string;
-    readonly path: string;
-    readonly tags: readonly string[];
-};
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
-
-let BASE = "https://api.cafe.redocly.com";
-
-/** Identity of the operation a request belongs to. Stable across path interpolation. */
-export type OperationContext = {
-    id: OperationId;
-    path: OperationPath;
-    tags: OperationTag[];
-};
-
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
-export type RequestContext = {
-    url: string;
-    method: string;
-    headers: Record<string, string>;
-    body?: unknown;
-    /** The operation being called: its id (operationId), path template, and tags. */
-    operation: OperationContext;
-};
-
-/**
- * Configuration and extension hooks for a client. Supplied per-instance via
- * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
- * (functions facade).
- */
-export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
-    serverUrl?: string;
-    /** Extra headers merged into every request; a function is invoked per request. */
-    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
-    /** Transport used to issue requests. Defaults to the global `fetch`. */
-    fetch?: typeof fetch;
-    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    /** Observe — or replace, by returning a `Response` — the response before parsing. */
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    /**
-     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
-     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
-     */
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
-    /**
-     * Composable interceptors run around every request, alongside the single
-     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
-     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
-     * the last-registered middleware wraps closest to the network. Register more at runtime
-     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
-     */
-    middleware?: Middleware[];
-    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
-    retry?: RetryConfig;
-    /**
-     * Per-instance auth credentials. When set, they override the module-global
-     * `set*` helpers for requests made through this config (each scheme falls back
-     * to its global slot when omitted here). Only the schemes an operation declares
-     * in its `security` are ever sent.
-     */
-    auth?: AuthCredentials;
-};
-
-/**
- * A request interceptor; every field is optional, so a middleware can hook any subset of
- * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
- * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
- * failure into the error to throw, threaded through each middleware in turn.
- */
-export type Middleware = {
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/** Context handed to `retryOn` for the attempt that just failed. */
-export type RetryContext = {
-    /** 1-based number of the attempt that just failed. */
-    attempt: number;
-    /** The request that was attempted. */
-    request: RequestContext;
-    /** Present when the server returned a (non-ok) response. */
-    response?: Response;
-    /** Present when the transport threw (network error, DNS, connection reset). */
-    error?: unknown;
-};
-
-/** Retry policy; all fields optional with sensible defaults. */
-export type RetryConfig = {
-    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
-    retries?: number;
-    /** Base delay in milliseconds. Default 1000. */
-    retryDelay?: number;
-    /** Backoff shape. Default 'exponential'. */
-    retryStrategy?: RetryStrategy;
-    /** Apply full jitter over the computed delay. Default true. */
-    jitter?: boolean;
-    /**
-     * Decide whether to retry a failed attempt. Default: retry only idempotent
-     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
-     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
-     */
-    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
-};
-
-/**
- * How the response body is read. `'auto'` negotiates from the content type (the
- * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
- */
-export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
-
-/**
- * The trailing per-operation argument: standard `RequestInit` plus an optional
- * per-call retry override and a `parseAs` escape hatch.
- *
- * `parseAs` forces how the response body is read; overrides the inferred kind.
- * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
- * override — the static return type is unchanged.
- */
-export type RequestOptions = RequestInit & {
-    retry?: Partial<RetryConfig>;
-    parseAs?: ParseAs;
-};
-
-/**
- * Override the base URL used by every generated operation. Useful when the
- * runtime environment differs from the value declared in `servers[0].url`
- * (e.g. dev / staging / prod toggles in a single-page app).
- *
- * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ serverUrl })`.
- */
-export function setServerUrl(url: string): void {
-    BASE = url;
-}
-
-/** The global config used by the functions facade (see `configure`). */
-const __config: ClientConfig = {};
-
-/**
- * Merge `config` into the global configuration used by the functions facade —
- * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
- * hooks once for every free function. The service-class facade configures per
- * instance instead (`new Client(config)`).
- */
-export function configure(config: ClientConfig): void {
-    Object.assign(__config, config);
-}
-
-/**
- * Append interceptors to the functions facade's global middleware chain (see
- * `ClientConfig.middleware`). The service-class facade registers per instance via
- * `<Client>.use(...)` instead.
- */
-export function use(...middleware: Middleware[]): void {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    __config.middleware = [...(__config.middleware ?? []), ...middleware];
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function __middleware(config: ClientConfig): Middleware[] {
-    const single = config.onRequest || config.onResponse || config.onError
-        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-        : [];
-    return [...single, ...(config.middleware ?? [])];
-}
-
-export class ApiError extends Error {
-    public readonly url: string;
-    public readonly status: number;
-    public readonly statusText: string;
-    public readonly body: unknown;
-    constructor(url: string, status: number, statusText: string, body: unknown) {
-        super(`Request failed with status ${status}`);
-        this.name = 'ApiError';
-        this.url = url;
-        this.status = status;
-        this.statusText = statusText;
-        this.body = body;
-    }
-}
-
-type QueryPrimitive = string | number | boolean;
-
-type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
-
-/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
-type QueryStyle = {
-    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-    explode: boolean;
-    allowReserved?: boolean;
-};
-
-/**
- * Percent-encode `value` but leave the RFC-3986 reserved set
- * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
- */
-function __encodeReserved(value: string): string {
-    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
-}
-
-function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
-    if (!query)
-        return url;
-    const params = new URLSearchParams();
-    const raw: string[] = [];
-    for (const [key, value] of Object.entries(query)) {
-        if (value === undefined || value === null)
-            continue;
-        const spec = styles?.[key];
-        if (!spec) {
-            if (Array.isArray(value)) {
-                for (const v of value) {
-                    if (v !== undefined && v !== null)
-                        params.append(key, String(v));
-                }
-            }
-            else if (typeof value === 'object') {
-                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-                for (const [subKey, subValue] of Object.entries(value)) {
-                    if (subValue !== undefined && subValue !== null) {
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                    }
-                }
-            }
-            else {
-                params.append(key, String(value));
-            }
-            continue;
-        }
-        if (Array.isArray(value)) {
-            const items = value.filter((v) => v !== undefined && v !== null).map(String);
-            if (spec.style === 'form' && spec.explode) {
-                for (const v of items) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}=${__encodeReserved(v)}`);
-                    else
-                        params.append(key, v);
-                }
-            }
-            else {
-                // Delimited styles put the LITERAL delimiter on the wire; only the
-                // values are encoded. `%20` (not `+`) is the literal space delimiter.
-                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
-                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-            }
-        }
-        else if (typeof value === 'object') {
-            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-            for (const [subKey, subValue] of Object.entries(value)) {
-                if (subValue !== undefined && subValue !== null) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
-                    else
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                }
-            }
-        }
-        else if (spec.allowReserved) {
-            raw.push(`${key}=${__encodeReserved(String(value))}`);
-        }
-        else {
-            params.append(key, String(value));
-        }
-    }
-    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-    return qs ? `${url}?${qs}` : url;
-}
-
-async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
-    response: Response;
-    context: RequestContext;
-}> {
-    const { retry: callRetry, ...fetchInit } = init;
-    const retry: RetryConfig = { ...config.retry, ...callRetry };
-    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-    const headers: Record<string, string> = {
-        Accept: 'application/json',
-        ...extra,
-        ...(fetchInit.headers as Record<string, string> | undefined),
-    };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
-    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-    let payload: BodyInit | undefined;
-    if (context.body !== undefined) {
-        const value = context.body;
-        const isBinary = value instanceof Blob ||
-            value instanceof ArrayBuffer ||
-            ArrayBuffer.isView(value as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-        const isURLSearchParams = value instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-            payload = value as BodyInit;
-        }
-        else {
-            payload = JSON.stringify(value);
-            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-                context.headers['Content-Type'] = 'application/json';
-            }
-        }
-    }
-    const doFetch = config.fetch ?? fetch;
-    const maxAttempts = 1 + (retry.retries ?? 0);
-    const retryOn = retry.retryOn ?? __defaultRetryOn;
-    const signal = fetchInit.signal ?? undefined;
-    let attempt = 0;
-    while (true) {
-        attempt++;
-        if (signal?.aborted)
-            throw __abortError(signal);
-        let response: Response;
-        try {
-            response = await doFetch(context.url, {
-                ...fetchInit,
-                method: context.method,
-                headers: context.headers,
-                body: payload,
-            });
-        }
-        catch (error) {
-            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
-                await __sleep(__retryDelay(retry, attempt, null), signal);
-                continue;
-            }
-            throw error;
-        }
-        // Reverse order: the last-registered middleware wraps closest to the network (onion).
-        for (let i = middleware.length - 1; i >= 0; i--) {
-            const onResponse = middleware[i].onResponse;
-            if (onResponse) {
-                const replaced = await onResponse(response, context);
-                if (replaced)
-                    response = replaced;
-            }
-        }
-        if (!response.ok &&
-            attempt < maxAttempts &&
-            !signal?.aborted &&
-            (await retryOn({ attempt, request: context, response }))) {
-            const retryAfter = response.headers.get('retry-after');
-            // Drain the abandoned response body before the next attempt: an unread body
-            // keeps the connection checked out (and can stall the pool) under Node/undici
-            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-            await response.body?.cancel().catch(() => undefined);
-            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
-            continue;
-        }
-        return { response, context };
-    }
-}
-
-async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-    if (kind === 'void' || response.status === 204)
-        return undefined;
-    if (kind === 'stream')
-        return response.body;
-    if (kind === 'blob')
-        return response.blob();
-    if (kind === 'arrayBuffer')
-        return response.arrayBuffer();
-    if (kind === 'formData')
-        return response.formData();
-    if (kind === 'text')
-        return response.text();
-    if (kind === 'json')
-        return response.json();
-    // 'auto' — negotiate from the response's content type.
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json'))
-        return response.json();
-    if (contentType.startsWith('text/'))
-        return response.text();
-    return response.blob();
-}
-
-async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
-    const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, op, url, sendInit, body);
-    if (!response.ok) {
-        const errorBody = await readError(response);
-        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
-        // Thread the error through each middleware's onError in turn (each may replace it).
-        for (const mw of __middleware(config)) {
-            if (mw.onError)
-                error = await mw.onError(error as ApiError, context);
-        }
-        throw error;
-    }
-    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
-    return (await __parse(response, kind)) as T;
-}
-
-async function readError(response: Response): Promise<unknown> {
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json')) {
-        return response.json().catch(() => undefined);
-    }
-    return response.text().catch(() => undefined);
-}
-
-const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-
-const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-function __defaultRetryOn(ctx: RetryContext): boolean {
-    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
-        return false;
-    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-    if (retryAfter) {
-        const seconds = Number(retryAfter);
-        if (!Number.isNaN(seconds))
-            return seconds * 1000;
-        const when = Date.parse(retryAfter);
-        if (!Number.isNaN(when))
-            return Math.max(0, when - Date.now());
-    }
-    const base = retry.retryDelay ?? 1000;
-    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-    return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
-    return new Promise((resolve, reject) => {
-        if (signal?.aborted) {
-            reject(__abortError(signal));
-            return;
-        }
-        const onAbort = () => {
-            clearTimeout(timer);
-            reject(__abortError(signal as AbortSignal));
-        };
-        const timer = setTimeout(() => {
-            if (signal)
-                signal.removeEventListener('abort', onAbort);
-            resolve();
-        }, ms);
-        if (signal)
-            signal.addEventListener('abort', onAbort, { once: true });
-    });
-}
-
-function __abortError(signal: AbortSignal): globalThis.Error {
-    const reason = (signal as {
-        reason?: unknown;
-    }).reason;
-    if (reason instanceof Error)
-        return reason;
-    return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * Normalize an operation's header-parameter object into a plain string record,
- * dropping any `undefined` / `null` entries (optional headers the caller omitted)
- * and stringifying the rest. Mirrors __buildUrl's handling of query values.
- */
-function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
-    const out: Record<string, string> = {};
-    for (const [key, value] of Object.entries(values)) {
-        if (value !== undefined && value !== null)
-            out[key] = String(value);
-    }
-    return out;
-}
-
-/**
- * A credential value, or a (possibly async) function that returns one per request.
- */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/**
- * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
- * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
- * to the global slots.
- */
-export type AuthCredentials = {
-    bearer?: TokenProvider;
-    apiKey?: Record<string, TokenProvider>;
-};
-
-let __bearerToken: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
- * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
- * (possibly async) function resolved per request.
- */
-export function setBearer(token: TokenProvider | null): void {
-    __bearerToken = token;
-}
-
-let __apiKey_ApiKey: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
- * string or a (possibly async) function resolved per request.
- */
-export function setApiKey(key: TokenProvider | null): void {
-    __apiKey_ApiKey = key;
-}
-
-/**
- * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
- */
-async function __resolve(slot: TokenProvider | null): Promise<string | null> {
-    if (slot === null)
-        return null;
-    return typeof slot === "function" ? slot() : slot;
-}
-
-/**
- * Build the auth `headers` and `query` for an operation from the currently-set credentials.
- * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
- * can always override by passing their own `init.headers`.
- */
-async function __auth(schemes: string[], config: ClientConfig): Promise<{
-    headers: Record<string, string>;
-    query: Record<string, string>;
-}> {
-    const headers: Record<string, string> = {};
-    const query: Record<string, string> = {};
-    const cookies: string[] = [];
-    for (const scheme of schemes) {
-        switch (scheme) {
-            case "OAuth2": {
-                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
-                if (v !== null)
-                    headers["Authorization"] = `Bearer ${v}`;
-                break;
-            }
-            case "ApiKey": {
-                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
-                if (v !== null)
-                    headers["X-API-Key"] = v;
-                break;
-            }
-        }
-    }
-    if (cookies.length > 0)
-        headers["Cookie"] = cookies.join("; ");
-    return { headers, query };
-}
-
 export type ListMenuItemsResult = MenuItemList;
 
 export type ListMenuItemsParams = {
@@ -1062,64 +469,6 @@ export type ListMenuItemsVariables = {
     params?: ListMenuItemsParams;
 };
 
-/**
- * List all menu items
- *
- * Retrieve a collection of menu items with optional filtering and pagination.
- */
-export async function listMenuItems(params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-    return __request<MenuItemList>(__config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
-}
-
 export type CreateMenuItemResult = MenuItem;
 
 export type CreateMenuItemBody = FormData;
@@ -1128,16 +477,6 @@ export type CreateMenuItemVariables = {
     body: CreateMenuItemBody;
 };
 
-/**
- * Create menu item
- *
- * Create a new menu item.
- */
-export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<MenuItem>(__config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
 export type DeleteMenuItemResult = void;
 
 export type DeleteMenuItemVariables = {
@@ -1148,16 +487,6 @@ export type DeleteMenuItemVariables = {
     menuItemId: string;
 };
 
-/**
- * Delete a menu item
- *
- * Delete an existing menu item.
- */
-export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
 export type GetMenuItemPhotoResult = Blob | string;
 
 export type GetMenuItemPhotoParams = {
@@ -1176,20 +505,6 @@ export type GetMenuItemPhotoVariables = {
     params?: GetMenuItemPhotoParams;
 };
 
-/**
- * Retrieve a menu item photo
- *
- * Retrieve the product photo image for a specific menu item.
- */
-export async function getMenuItemPhoto(menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}): Promise<Blob | string> {
-    return __request<Blob | string>(__config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
-}
-
 export type ListOrdersResult = OrderList;
 
 export type ListOrdersParams = {
@@ -1247,95 +562,25 @@ export type ListOrdersVariables = {
     params?: ListOrdersParams;
 };
 
-/**
- * List all orders
- *
- * Retrieve a collection of orders with optional filtering and pagination.
- */
-export async function listOrders(params: {
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
     /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
      */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderList> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderList>(__config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-/**
- * Create order
- *
- * Create a new order.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
     /**
      * ID of the order to retrieve.
      * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
@@ -1344,22 +589,6 @@ export type GetOrderByIdVariables = {
     headers?: GetOrderByIdHeaders;
 };
 
-/**
- * Retrieve an order
- *
- * Retrieve a single order by its ID.
- */
-export async function getOrderById(orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
-}
-
 export type DeleteOrderResult = void;
 
 export type DeleteOrderVariables = {
@@ -1370,17 +599,6 @@ export type DeleteOrderVariables = {
     orderId: string;
 };
 
-/**
- * Delete an order
- *
- * Delete the order.
- * To keep the order history, the order should be canceled instead of deleted.
- */
-export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
 export type UpdateOrderResult = Order;
 
 export type UpdateOrderBody = {
@@ -1396,19 +614,6 @@ export type UpdateOrderVariables = {
     body?: UpdateOrderBody;
 };
 
-/**
- * Partially update an order
- *
- * Update an existing order status.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function updateOrder(orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
 export type ListOrderItemsResult = OrderItem[];
 
 export type ListOrderItemsParams = {
@@ -1436,13 +641,1006 @@ export type ListOrderItemsVariables = {
     params?: ListOrderItemsParams;
 };
 
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    listMenuItems: {
+        args: {
+            params?: ListMenuItemsParams;
+        };
+        result: ListMenuItemsResult;
+    };
+    createMenuItem: {
+        args: {
+            body: CreateMenuItemBody;
+        };
+        result: CreateMenuItemResult;
+    };
+    deleteMenuItem: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+        };
+        result: DeleteMenuItemResult;
+    };
+    getMenuItemPhoto: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+            params?: GetMenuItemPhotoParams;
+        };
+        result: GetMenuItemPhotoResult;
+    };
+    listOrders: {
+        args: {
+            params?: ListOrdersParams;
+        };
+        result: ListOrdersResult;
+    };
+    createOrder: {
+        args: {
+            body: CreateOrderBody;
+        };
+        result: CreateOrderResult;
+    };
+    getOrderById: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            headers?: GetOrderByIdHeaders;
+        };
+        result: GetOrderByIdResult;
+    };
+    deleteOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+        };
+        result: DeleteOrderResult;
+    };
+    updateOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            body?: UpdateOrderBody;
+        };
+        result: UpdateOrderResult;
+    };
+    listOrderItems: {
+        args: {
+            params?: ListOrderItemsParams;
+        };
+        result: ListOrderItemsResult;
+    };
+    getRevenue: {
+        args: {
+            params?: GetRevenueParams;
+        };
+        result: GetRevenueResult;
+    };
+    registerOAuth2Client: {
+        args: {
+            body: RegisterOAuth2ClientBody;
+        };
+        result: RegisterOAuth2ClientResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
+export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : NoRequiredKeys<Ops[K]['args']> extends true
+      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
+
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/** Resolve a credential: a literal passes through; a function is awaited per request. */
+async function resolveToken(provider: TokenProvider): Promise<string> {
+  return typeof provider === 'function' ? await provider() : provider;
+}
+
+/**
+ * Build the auth headers/query for one operation's `security` requirements from the
+ * instance credentials (`config.auth`) — capability module, wired into `createClient`.
+ * A scheme with no configured credential contributes nothing (the request is sent
+ * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
+ */
+async function resolveAuth(
+  security: readonly SecuritySpec[],
+  config: ClientConfig
+): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const headers: Record<string, string> = {};
+  const query: Record<string, string> = {};
+  const cookies: string[] = [];
+  for (const scheme of security) {
+    if (scheme.kind === 'apiKey') {
+      const provider = config.auth?.apiKey?.[scheme.scheme];
+      if (provider === undefined) continue;
+      const value = await resolveToken(provider);
+      if (scheme.in === 'header') headers[scheme.name] = value;
+      else if (scheme.in === 'query') query[scheme.name] = value;
+      else cookies.push(`${scheme.name}=${value}`);
+    } else if (scheme.kind === 'bearer') {
+      const provider = config.auth?.bearer;
+      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
+    } else {
+      const basic = config.auth?.basic;
+      if (basic !== undefined) {
+        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+      }
+    }
+  }
+  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
+  return { headers, query };
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+};
+
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
 /**
- * List all order items with menu item details
- *
- * Returns an array of order items for a specific order.
- * Use the `filter` parameter to filter by order ID.
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
  */
-export async function listOrderItems(params: {
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
+}
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe.redocly.com" });
+
+export const { configure, use } = client;
+export const setBearer = client.auth.bearer;
+export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
+export const listMenuItems = (params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
     /**
      * Filters the collection items using space-separated `field:value` pairs.
      *
@@ -1461,39 +1659,115 @@ export async function listOrderItems(params: {
      * - `status:placed createdAt:7d` - Combine multiple filters.
      */
     filter?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderItem[]>(__config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
     /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
      */
-    startDate?: string;
+    search?: string;
     /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
      */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-/**
- * Get revenue statistics
- *
- * Retrieve revenue statistics for a configurable date range.
- * Returns revenue, order counts, average order amount, and other useful statistics.
- */
-export async function getRevenue(params: {
+    limit?: number;
+} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
+export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
+export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
+export const getMenuItemPhoto = (menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
+export const listOrders = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
+export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
+export const getOrderById = (orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
+export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
+export const updateOrder = (orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
+export const listOrderItems = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
+export const getRevenue = (params: {
     /**
      * Start date for the revenue calculation period (ISO 8601 datetime format).
      * Defaults to 30 days ago if not provided.
@@ -1506,29 +1780,5 @@ export async function getRevenue(params: {
      * @format date
      */
     endDate?: string;
-} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
-    const __a = await __auth(["ApiKey"], __config);
-    return __request<RevenueStatistics>(__config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Create OAuth2 client
- *
- * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
- * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
- *   `redirectUris` must be provided (per RFC 7591 Section 2).
- * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
- * Returns the registered client information per RFC 7591, including:
- * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
- */
-export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-    return __request<OAuth2Client>(__config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
-}
+} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
+export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
diff --git a/tests/e2e/generate-client/examples/multi-instance/.gitignore b/tests/e2e/generate-client/examples/multi-instance/.gitignore
new file mode 100644
index 0000000000..f06235c460
--- /dev/null
+++ b/tests/e2e/generate-client/examples/multi-instance/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+dist
diff --git a/tests/e2e/generate-client/examples/multi-instance/README.md b/tests/e2e/generate-client/examples/multi-instance/README.md
new file mode 100644
index 0000000000..3d66f4b351
--- /dev/null
+++ b/tests/e2e/generate-client/examples/multi-instance/README.md
@@ -0,0 +1,22 @@
+# multi-instance example
+
+Per-tenant client instances from one generated module: `createClient` (from
+`@redocly/client-generator`) plus the generated `OPERATIONS` descriptors and
+`Ops`/`OperationId`/… types build one isolated instance per tenant — each with its own
+`serverUrl`, bearer token, and middleware.
+
+The generated module exports `createClient` in **both runtimes**, so the same pattern
+works with the default `inline` mode (import it from the generated file instead). This
+example uses `runtime: package` to also show the factory coming from the installed package.
+
+## Run
+
+```bash
+npm install
+npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
+npm run dev        # open the printed local URL
+```
+
+The app uses a canned `fetch` that echoes the tenant host and `Authorization` header, so the
+per-instance isolation is visible offline. The generated client under `src/api/` is committed
+and drift-checked against the generator in CI.
diff --git a/tests/e2e/generate-client/examples/multi-instance/index.html b/tests/e2e/generate-client/examples/multi-instance/index.html
new file mode 100644
index 0000000000..a2b31a21d0
--- /dev/null
+++ b/tests/e2e/generate-client/examples/multi-instance/index.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>Redocly client-generator — multi-instance example</title>
+  </head>
+  <body>
+    <pre id="out">Loading…</pre>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
diff --git a/tests/e2e/generate-client/examples/multi-instance/openapi.yaml b/tests/e2e/generate-client/examples/multi-instance/openapi.yaml
new file mode 100644
index 0000000000..2d4d468ce3
--- /dev/null
+++ b/tests/e2e/generate-client/examples/multi-instance/openapi.yaml
@@ -0,0 +1,81 @@
+openapi: 3.2.0
+info:
+  title: Projects API
+  description: Demo per-tenant projects API for the multi-instance example.
+  version: 1.0.0
+servers:
+  - url: https://acme.api.example.com
+    description: Default tenant — each client instance overrides `serverUrl`.
+tags:
+  - name: Projects
+    description: Project operations.
+security:
+  - BearerAuth: []
+paths:
+  /projects:
+    get:
+      tags:
+        - Projects
+      summary: List projects
+      operationId: listProjects
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ProjectList'
+    post:
+      tags:
+        - Projects
+      summary: Create a project
+      operationId: createProject
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ProjectRequest'
+      responses:
+        '201':
+          description: Project created.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Project'
+components:
+  securitySchemes:
+    BearerAuth:
+      type: http
+      scheme: bearer
+      description: Per-tenant access token.
+  schemas:
+    Project:
+      type: object
+      properties:
+        id:
+          description: Project ID.
+          type: string
+        name:
+          description: Project name.
+          type: string
+      required:
+        - id
+        - name
+    ProjectRequest:
+      type: object
+      properties:
+        name:
+          description: Project name.
+          type: string
+      required:
+        - name
+    ProjectList:
+      type: object
+      properties:
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/Project'
+      required:
+        - items
diff --git a/tests/e2e/generate-client/examples/multi-instance/package.json b/tests/e2e/generate-client/examples/multi-instance/package.json
new file mode 100644
index 0000000000..7a6f010319
--- /dev/null
+++ b/tests/e2e/generate-client/examples/multi-instance/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "@redocly-examples/multi-instance",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "generate": "redocly generate-client",
+    "dev": "vite",
+    "build": "vite build"
+  },
+  "dependencies": {
+    "@redocly/client-generator": "file:../../../../../packages/client-generator"
+  },
+  "devDependencies": {
+    "@redocly/cli": "latest",
+    "typescript": "^5.5.0",
+    "vite": "^5.4.0"
+  }
+}
diff --git a/tests/e2e/generate-client/examples/multi-instance/redocly.yaml b/tests/e2e/generate-client/examples/multi-instance/redocly.yaml
new file mode 100644
index 0000000000..eb1a5e90e7
--- /dev/null
+++ b/tests/e2e/generate-client/examples/multi-instance/redocly.yaml
@@ -0,0 +1,11 @@
+# redocly.yaml — drives `redocly generate-client` for this example.
+# `runtime: package` because multi-instance needs `createClient`, which the
+# package exports; the default `inline` mode keeps it module-local.
+apis:
+  multi-instance:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
+      runtime: package
diff --git a/tests/e2e/generate-client/examples/multi-instance/src/api/client.ts b/tests/e2e/generate-client/examples/multi-instance/src/api/client.ts
new file mode 100644
index 0000000000..f8975a77a9
--- /dev/null
+++ b/tests/e2e/generate-client/examples/multi-instance/src/api/client.ts
@@ -0,0 +1,86 @@
+// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Projects API (v1.0.0)
+ * Demo per-tenant projects API for the multi-instance example.
+ */
+
+import { createClient, type OperationDescriptor, type RequestOptions } from '@redocly/client-generator';
+
+export type Project = {
+    /**
+     * Project ID.
+     */
+    id: string;
+    /**
+     * Project name.
+     */
+    name: string;
+};
+
+export type ProjectRequest = {
+    /**
+     * Project name.
+     */
+    name: string;
+};
+
+export type ProjectList = {
+    items: Project[];
+};
+
+export type ListProjectsResult = ProjectList;
+
+export type CreateProjectResult = Project;
+
+export type CreateProjectBody = ProjectRequest;
+
+export type CreateProjectVariables = {
+    body: CreateProjectBody;
+};
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    listProjects: {
+        args: {};
+        result: ListProjectsResult;
+    };
+    createProject: {
+        args: {
+            body: CreateProjectBody;
+        };
+        result: CreateProjectResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listProjects: { id: "listProjects", method: "GET", path: "/projects", tags: ["Projects"], security: [{ scheme: "BearerAuth", kind: "bearer" }] },
+    createProject: { id: "createProject", method: "POST", path: "/projects", tags: ["Projects"], body: { contentType: "application/json" }, security: [{ scheme: "BearerAuth", kind: "bearer" }] }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://acme.api.example.com" });
+
+export const { configure, use } = client;
+export const setBearer = client.auth.bearer;
+export const listProjects = (init: RequestOptions = {}) => client.listProjects({}, init);
+export const createProject = (body: ProjectRequest, init: RequestOptions = {}) => client.createProject({ body }, init);
+
+export { ApiError, createClient } from '@redocly/client-generator';
+export type { ClientConfig, Middleware, RequestOptions } from '@redocly/client-generator';
diff --git a/tests/e2e/generate-client/examples/multi-instance/src/main.ts b/tests/e2e/generate-client/examples/multi-instance/src/main.ts
new file mode 100644
index 0000000000..e8f35e2fdf
--- /dev/null
+++ b/tests/e2e/generate-client/examples/multi-instance/src/main.ts
@@ -0,0 +1,77 @@
+// multi-instance — one generated module, many isolated client instances.
+//
+// The generated file exports the raw wiring — the `OPERATIONS` descriptors and the
+// `Ops`/`OperationId`/`OperationPath`/`OperationTag` types — alongside its default
+// `client`. With `runtime: package`, `createClient` is imported from
+// `@redocly/client-generator`, so an app can build one instance per tenant, each
+// with its own `serverUrl`, credentials, and middleware — nothing is module-global.
+//
+// (The generated module exports `createClient` in BOTH runtimes, so the same
+// pattern works with the default `inline` mode too — this example uses
+// `runtime: package` to also demonstrate importing the factory from the package.)
+import { createClient } from '@redocly/client-generator';
+
+import {
+  OPERATIONS,
+  type OperationId,
+  type OperationPath,
+  type OperationTag,
+  type Ops,
+} from './api/client.js';
+
+const out = document.querySelector<HTMLPreElement>('#out')!;
+const log: string[] = [];
+
+// A canned transport that echoes WHICH tenant was addressed and AS WHOM, so the
+// per-instance isolation is visible in the output (and the example runs offline).
+const canned = (async (url: string, init: RequestInit) => {
+  const { host, pathname } = new URL(url);
+  const headers = init.headers as Record<string, string>;
+  const tenant = host.split('.')[0];
+  log.push(`${init.method} ${host}${pathname} — ${headers['Authorization'] ?? 'anonymous'}`);
+  const project = { id: `prj_${tenant}_1`, name: `${tenant} website` };
+  return init.method === 'POST'
+    ? new Response(JSON.stringify({ ...project, ...JSON.parse(String(init.body)) }), {
+        status: 201,
+        headers: { 'content-type': 'application/json' },
+      })
+    : new Response(JSON.stringify({ items: [project] }), {
+        headers: { 'content-type': 'application/json' },
+      });
+}) as unknown as typeof fetch;
+
+// The per-tenant factory: same descriptors, isolated config. The type parameters
+// carry the generated literal unions into `ctx.operation` for middleware targeting.
+function tenantClient(tenant: string, token: string) {
+  const instance = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, {
+    serverUrl: `https://${tenant}.api.example.com`,
+    fetch: canned,
+  });
+  instance.auth.bearer(token); // per-instance credentials — no shared auth state
+  return instance;
+}
+
+const acme = tenantClient('acme', 'acme-token');
+const globex = tenantClient('globex', 'globex-token');
+
+// Middleware is per-instance too: only globex requests carry the tier header.
+globex.use({
+  onRequest: (ctx) => {
+    ctx.headers['X-Tenant-Tier'] = 'enterprise';
+  },
+});
+
+async function main() {
+  const [acmeProjects, globexProjects] = await Promise.all([
+    acme.listProjects(),
+    globex.listProjects(),
+  ]);
+  const created = await acme.createProject({ body: { name: 'Launch site' } });
+  out.textContent = [
+    ...log,
+    '',
+    JSON.stringify({ acmeProjects, globexProjects, created }, null, 2),
+  ].join('\n');
+}
+
+void main();
diff --git a/tests/e2e/generate-client/examples/multi-instance/tsconfig.json b/tests/e2e/generate-client/examples/multi-instance/tsconfig.json
new file mode 100644
index 0000000000..4bd6962d40
--- /dev/null
+++ b/tests/e2e/generate-client/examples/multi-instance/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../tsconfig.base.json",
+  "include": ["src"]
+}
diff --git a/tests/e2e/generate-client/examples/multi-instance/vite.config.ts b/tests/e2e/generate-client/examples/multi-instance/vite.config.ts
new file mode 100644
index 0000000000..c049f46e10
--- /dev/null
+++ b/tests/e2e/generate-client/examples/multi-instance/vite.config.ts
@@ -0,0 +1,3 @@
+import { defineConfig } from 'vite';
+
+export default defineConfig({});
diff --git a/tests/e2e/generate-client/examples/package-runtime/.gitignore b/tests/e2e/generate-client/examples/package-runtime/.gitignore
new file mode 100644
index 0000000000..f06235c460
--- /dev/null
+++ b/tests/e2e/generate-client/examples/package-runtime/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+dist
diff --git a/tests/e2e/generate-client/examples/package-runtime/README.md b/tests/e2e/generate-client/examples/package-runtime/README.md
new file mode 100644
index 0000000000..85dd09919b
--- /dev/null
+++ b/tests/e2e/generate-client/examples/package-runtime/README.md
@@ -0,0 +1,19 @@
+# package-runtime example
+
+Generated TypeScript client using **`runtime: package`**: the generated `src/api/client.ts`
+contains only this API's types and operation descriptors and imports the engine
+(`createClient`, `ApiError`, middleware, auth) from `@redocly/client-generator` — the example's
+one real dependency. Engine fixes arrive via `npm update @redocly/client-generator` with no
+regeneration; regenerate only when the API contract changes.
+
+## Run
+
+```bash
+npm install
+npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
+npm run dev        # open the printed local URL
+```
+
+The generated client under `src/api/` is committed and drift-checked against the generator in CI.
+The app code is the same as the inline examples — `configure()`, `use()` middleware, free
+functions, the `client` instance, `ApiError` — only the runtime's distribution differs.
diff --git a/tests/e2e/generate-client/examples/package-runtime/index.html b/tests/e2e/generate-client/examples/package-runtime/index.html
new file mode 100644
index 0000000000..2cc6be9a3b
--- /dev/null
+++ b/tests/e2e/generate-client/examples/package-runtime/index.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <title>Redocly client-generator — package-runtime example</title>
+  </head>
+  <body>
+    <pre id="out">Loading…</pre>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>
diff --git a/tests/e2e/generate-client/examples/service-class/openapi.yaml b/tests/e2e/generate-client/examples/package-runtime/openapi.yaml
similarity index 100%
rename from tests/e2e/generate-client/examples/service-class/openapi.yaml
rename to tests/e2e/generate-client/examples/package-runtime/openapi.yaml
diff --git a/tests/e2e/generate-client/examples/package-runtime/package.json b/tests/e2e/generate-client/examples/package-runtime/package.json
new file mode 100644
index 0000000000..b272b57139
--- /dev/null
+++ b/tests/e2e/generate-client/examples/package-runtime/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "@redocly-examples/package-runtime",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "generate": "redocly generate-client",
+    "dev": "vite",
+    "build": "vite build"
+  },
+  "dependencies": {
+    "@redocly/client-generator": "file:../../../../../packages/client-generator"
+  },
+  "devDependencies": {
+    "@redocly/cli": "latest",
+    "typescript": "^5.5.0",
+    "vite": "^5.4.0"
+  }
+}
diff --git a/tests/e2e/generate-client/examples/package-runtime/redocly.yaml b/tests/e2e/generate-client/examples/package-runtime/redocly.yaml
new file mode 100644
index 0000000000..e07f153912
--- /dev/null
+++ b/tests/e2e/generate-client/examples/package-runtime/redocly.yaml
@@ -0,0 +1,12 @@
+# redocly.yaml — drives `redocly generate-client` for this example.
+# `runtime: package` makes the generated client import the engine from
+# `@redocly/client-generator` instead of inlining it — runtime fixes arrive
+# via `npm update @redocly/client-generator`, no regeneration needed.
+apis:
+  package-runtime:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
+      runtime: package
diff --git a/tests/e2e/generate-client/examples/package-runtime/src/api/client.ts b/tests/e2e/generate-client/examples/package-runtime/src/api/client.ts
new file mode 100644
index 0000000000..1ee476a9e5
--- /dev/null
+++ b/tests/e2e/generate-client/examples/package-runtime/src/api/client.ts
@@ -0,0 +1,967 @@
+// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Redocly Cafe (v1.0.0)
+ * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
+ * Create API credentials and try it yourself in a realistic OpenAPI workflow.
+ * 
+ */
+
+import { createClient, type OperationDescriptor, type RequestOptions, type TokenProvider } from '@redocly/client-generator';
+
+export type Page = {
+    /**
+     * Use with the `after` query parameter to load the next page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    endCursor: string | null;
+    /**
+     * Use with the `before` query parameter to load the previous page of data.
+     * When `null`, there is no data.
+     * The cursor is opaque and internal structure is subject to change.
+     */
+    startCursor: string | null;
+    /**
+     * Indicates if there is a next page with items.
+     */
+    hasNextPage: boolean;
+    /**
+     * Indicates if there is a previous page with items.
+     */
+    hasPrevPage: boolean;
+    /**
+     * Value showing how many items are in the page limit.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit: number;
+    /**
+     * Count of items across all pages.
+     * @minimum 0
+     */
+    total: number;
+};
+
+export type MenuBaseItem = {
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt: string;
+    /**
+     * Menu item ID. Unique identifier prefixed with `prd_`.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    readonly id: string;
+    /**
+     * Entity name.
+     */
+    readonly object: "menuItem";
+    /**
+     * Menu item name.
+     * @minLength 1
+     * @maxLength 50
+     */
+    name: string;
+    /**
+     * Price in cents.
+     * @minimum 0
+     */
+    price: number;
+    /**
+     * Photo of the menu item. Must be a PNG image and less than 1MB.
+     * @format binary
+     */
+    photo?: Blob | null;
+    /**
+     * Photo URL of the menu item.
+     * @format uri
+     */
+    readonly photoUrl?: string;
+    photoTextDescription?: string | null;
+};
+
+export type Beverage = {
+    /**
+     * Menu item category.
+     */
+    category: "beverage";
+    /**
+     * Size of the beverage in milliliters.
+     * @exclusiveMinimum 0
+     */
+    volume: number;
+    /**
+     * Indicates if the beverage contains caffeine.
+     */
+    containsCaffeine: boolean;
+} & MenuBaseItem;
+
+export type Dessert = {
+    /**
+     * Menu item category.
+     */
+    category: "dessert";
+    /**
+     * Amount of calories.
+     * @exclusiveMinimum 0
+     */
+    calories: number;
+} & MenuBaseItem;
+
+export type MenuItem = Beverage | Dessert;
+
+export type MenuItemList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: MenuItem[];
+};
+
+export type Error = {
+    /**
+     * URI reference that identifies the problem type.
+     * @format uri-reference
+     */
+    type: string;
+    /**
+     * Short summary of the problem type.
+     */
+    title: string;
+    /**
+     * HTTP status code generated by the origin server for this occurrence of the problem.
+     * @minimum 100
+     * @exclusiveMaximum 600
+     * @format int32
+     */
+    status: number;
+    /**
+     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
+     * May be used to locate the root of this problem in the source code.
+     * @format uri-reference
+     */
+    instance?: string;
+    /**
+     * Additional error details.
+     */
+    details?: Record<string, unknown>;
+};
+
+/**
+ * Order status.
+ */
+export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
+
+export const OrderStatus = {
+    placed: "placed",
+    preparing: "preparing",
+    completed: "completed",
+    canceled: "canceled"
+} as const;
+
+export type Order = {
+    /**
+     * Order ID. Unique identifier prefixed with `ord_`.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     * @format ulid
+     */
+    readonly id?: string;
+    /**
+     * Entity name.
+     */
+    readonly object?: "order";
+    /**
+     * Name of the customer who placed the order.
+     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
+     * @minLength 1
+     * @maxLength 100
+     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
+     */
+    customerName: string;
+    readonly status?: OrderStatus;
+    /**
+     * Total order price in cents.
+     * @minimum 0
+     */
+    readonly totalPrice?: number;
+    /**
+     * Created date.
+     * @format date-time
+     */
+    readonly createdAt?: string;
+    /**
+     * Updated date.
+     * @format date-time
+     */
+    readonly updatedAt?: string;
+    /**
+     * List of items to include in the order.
+     * @minItems 1
+     */
+    orderItems: {
+        /**
+         * ID of the menu item to add to the order.
+         * @format ulid
+         */
+        menuItemId: string;
+        /**
+         * Quantity of the menu item.
+         * @minimum 1
+         */
+        quantity: number;
+        /**
+         * Discount amount in cents (absolute value).
+         * @minimum 0
+         */
+        discount?: number;
+        /**
+         * Optional comment for the order item (e.g., "No sugar").
+         * @maxLength 500
+         */
+        comment?: string;
+    }[];
+};
+
+export type OrderList = {
+    /**
+     * Entity name.
+     */
+    object: "list";
+    page: Page;
+    items: Order[];
+};
+
+export type OrderItem = {
+    /**
+     * ID of the menu item to add to the order.
+     */
+    menuItemId: string;
+    /**
+     * Menu item that is part of the order.
+     */
+    readonly menuItem?: MenuItem;
+    /**
+     * Quantity of the menu item.
+     * @minimum 1
+     */
+    quantity: number;
+    /**
+     * Discount amount in cents (absolute value).
+     * @minimum 0
+     */
+    discount?: number;
+    /**
+     * Optional comment for the order item (e.g., "No sugar").
+     * @maxLength 500
+     */
+    comment?: string;
+};
+
+/**
+ * Revenue statistics for a given date range.
+ */
+export type RevenueStatistics = {
+    /**
+     * Total revenue in cents from completed orders.
+     * @minimum 0
+     * @format float
+     */
+    revenue: number;
+    /**
+     * Average order amount in cents (calculated from completed orders only).
+     * @minimum 0
+     * @format float
+     */
+    averageOrderAmount: number;
+    /**
+     * Total number of orders (all statuses) in the date range.
+     * @minimum 0
+     */
+    totalOrders: number;
+    /**
+     * Number of placed orders.
+     * @minimum 0
+     */
+    placedOrders: number;
+    /**
+     * Number of preparing orders.
+     * @minimum 0
+     */
+    preparingOrders: number;
+    /**
+     * Number of completed orders.
+     * @minimum 0
+     */
+    completedOrders: number;
+    /**
+     * Number of canceled orders.
+     * @minimum 0
+     */
+    canceledOrders: number;
+    /**
+     * Start date of the revenue calculation period.
+     * @format date
+     */
+    startDate: string;
+    /**
+     * End date of the revenue calculation period.
+     * @format date
+     */
+    endDate: string;
+};
+
+export type RegisterClientObject = {
+    /**
+     * Client name.
+     */
+    name: string;
+    /**
+     * List of redirect URIs (optional, defaults to empty array).
+     */
+    redirectUris?: string[];
+    /**
+     * List of scopes.
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types.
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+/**
+ * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
+ */
+export type OAuth2Client = {
+    /**
+     * Client identifier issued by the authorization server.
+     */
+    clientId: string;
+    /**
+     * Client secret issued by the authorization server.
+     */
+    clientSecret: string;
+    /**
+     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
+     * @format int64
+     */
+    clientIdIssuedAt: number;
+    /**
+     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
+     * @format int64
+     */
+    clientSecretExpiresAt: number;
+    /**
+     * Client name (registered metadata).
+     */
+    name?: string;
+    /**
+     * List of redirect URIs (registered metadata).
+     */
+    redirectUris?: string[];
+    /**
+     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
+     * @format uri
+     */
+    registrationClientUri: string;
+    /**
+     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
+     */
+    registrationAccessToken: string;
+    /**
+     * List of scopes (registered metadata).
+     */
+    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
+    /**
+     * List of grant types (registered metadata).
+     */
+    grantTypes?: ("authorization_code" | "client_credentials")[];
+};
+
+export type OrderNotification = {
+    /**
+     * Unique order identifier.
+     */
+    orderId: string;
+    orderStatus: OrderStatus;
+    /**
+     * When the event occurred.
+     * @format date-time
+     */
+    timestamp: string;
+};
+
+/**
+ * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
+ */
+export function isBeverage(value: MenuItem): value is Beverage {
+    return (value as Record<string, unknown>)["category"] === "beverage";
+}
+
+/**
+ * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
+ */
+export function isDessert(value: MenuItem): value is Dessert {
+    return (value as Record<string, unknown>)["category"] === "dessert";
+}
+
+export type ListMenuItemsResult = MenuItemList;
+
+export type ListMenuItemsParams = {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+};
+
+export type ListMenuItemsVariables = {
+    params?: ListMenuItemsParams;
+};
+
+export type CreateMenuItemResult = MenuItem;
+
+export type CreateMenuItemBody = FormData;
+
+export type CreateMenuItemVariables = {
+    body: CreateMenuItemBody;
+};
+
+export type DeleteMenuItemResult = void;
+
+export type DeleteMenuItemVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+};
+
+export type GetMenuItemPhotoResult = Blob | string;
+
+export type GetMenuItemPhotoParams = {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+};
+
+export type GetMenuItemPhotoVariables = {
+    /**
+     * ID of the menu item to retrieve.
+     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    menuItemId: string;
+    params?: GetMenuItemPhotoParams;
+};
+
+export type ListOrdersResult = OrderList;
+
+export type ListOrdersParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+};
+
+export type ListOrdersVariables = {
+    params?: ListOrdersParams;
+};
+
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    headers?: GetOrderByIdHeaders;
+};
+
+export type DeleteOrderResult = void;
+
+export type DeleteOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+};
+
+export type UpdateOrderResult = Order;
+
+export type UpdateOrderBody = {
+    status: OrderStatus;
+};
+
+export type UpdateOrderVariables = {
+    /**
+     * ID of the order to retrieve.
+     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+     */
+    orderId: string;
+    body?: UpdateOrderBody;
+};
+
+export type ListOrderItemsResult = OrderItem[];
+
+export type ListOrderItemsParams = {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+};
+
+export type ListOrderItemsVariables = {
+    params?: ListOrderItemsParams;
+};
+
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    listMenuItems: {
+        args: {
+            params?: ListMenuItemsParams;
+        };
+        result: ListMenuItemsResult;
+    };
+    createMenuItem: {
+        args: {
+            body: CreateMenuItemBody;
+        };
+        result: CreateMenuItemResult;
+    };
+    deleteMenuItem: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+        };
+        result: DeleteMenuItemResult;
+    };
+    getMenuItemPhoto: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+            params?: GetMenuItemPhotoParams;
+        };
+        result: GetMenuItemPhotoResult;
+    };
+    listOrders: {
+        args: {
+            params?: ListOrdersParams;
+        };
+        result: ListOrdersResult;
+    };
+    createOrder: {
+        args: {
+            body: CreateOrderBody;
+        };
+        result: CreateOrderResult;
+    };
+    getOrderById: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            headers?: GetOrderByIdHeaders;
+        };
+        result: GetOrderByIdResult;
+    };
+    deleteOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+        };
+        result: DeleteOrderResult;
+    };
+    updateOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            body?: UpdateOrderBody;
+        };
+        result: UpdateOrderResult;
+    };
+    listOrderItems: {
+        args: {
+            params?: ListOrderItemsParams;
+        };
+        result: ListOrderItemsResult;
+    };
+    getRevenue: {
+        args: {
+            params?: GetRevenueParams;
+        };
+        result: GetRevenueResult;
+    };
+    registerOAuth2Client: {
+        args: {
+            body: RegisterOAuth2ClientBody;
+        };
+        result: RegisterOAuth2ClientResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe.redocly.com" });
+
+export const { configure, use } = client;
+export const setBearer = client.auth.bearer;
+export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
+export const listMenuItems = (params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
+export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
+export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
+export const getMenuItemPhoto = (menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
+export const listOrders = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
+export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
+export const getOrderById = (orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
+export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
+export const updateOrder = (orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
+export const listOrderItems = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
+export const getRevenue = (params: {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
+export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
+
+export { ApiError, createClient } from '@redocly/client-generator';
+export type { ClientConfig, Middleware, RequestOptions } from '@redocly/client-generator';
diff --git a/tests/e2e/generate-client/examples/package-runtime/src/main.ts b/tests/e2e/generate-client/examples/package-runtime/src/main.ts
new file mode 100644
index 0000000000..0d074681f0
--- /dev/null
+++ b/tests/e2e/generate-client/examples/package-runtime/src/main.ts
@@ -0,0 +1,48 @@
+// package-runtime example — same app code as the inline examples, different distribution.
+//
+// This client was generated with `runtime: package`: instead of embedding the engine
+// (fetch, retries, middleware, auth) in `src/api/client.ts`, the generated file contains
+// only THIS API's types and operation descriptors and imports the engine from
+// `@redocly/client-generator`. Engine fixes and improvements arrive with
+// `npm update @redocly/client-generator` — regenerate only when the API contract changes.
+import { ApiError, client, configure, listMenuItems, use } from './api/client.js';
+
+configure({ serverUrl: 'https://api.cafe.redocly.com' });
+
+const out = document.querySelector<HTMLPreElement>('#out')!;
+
+// Middleware runs inside the packaged engine but sees the generated OPERATIONS metadata:
+// `ctx.operation.id` is the spec operationId, stable across engine updates.
+const trace: string[] = [];
+use({
+  onRequest: (ctx) => {
+    trace.push(`→ ${ctx.operation.id} — ${ctx.method} ${ctx.url}`);
+  },
+  onResponse: (response, ctx) => {
+    document.title = `cafe — ${ctx.operation.id} ${response.status}`;
+  },
+});
+
+async function main() {
+  try {
+    // A typed call through a generated free function…
+    const menu = await listMenuItems({ limit: 3 });
+    // …and one through the generated `client` instance (the same runtime underneath).
+    const [first] = menu.items;
+    const photo = first
+      ? await client.getMenuItemPhoto({ menuItemId: first.id, params: { photoSize: 'thumbnail' } })
+      : undefined;
+    const photoLine =
+      photo instanceof Blob
+        ? `${first?.name} thumbnail: ${photo.type}, ${photo.size} bytes`
+        : photo;
+    out.textContent = [...trace, '', photoLine, '', JSON.stringify(menu.items, null, 2)].join('\n');
+  } catch (error) {
+    out.textContent =
+      error instanceof ApiError
+        ? `ApiError ${error.status}: ${error.statusText}`
+        : `Unexpected error: ${String(error)}`;
+  }
+}
+
+void main();
diff --git a/tests/e2e/generate-client/examples/package-runtime/tsconfig.json b/tests/e2e/generate-client/examples/package-runtime/tsconfig.json
new file mode 100644
index 0000000000..4bd6962d40
--- /dev/null
+++ b/tests/e2e/generate-client/examples/package-runtime/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../tsconfig.base.json",
+  "include": ["src"]
+}
diff --git a/tests/e2e/generate-client/examples/package-runtime/vite.config.ts b/tests/e2e/generate-client/examples/package-runtime/vite.config.ts
new file mode 100644
index 0000000000..c049f46e10
--- /dev/null
+++ b/tests/e2e/generate-client/examples/package-runtime/vite.config.ts
@@ -0,0 +1,3 @@
+import { defineConfig } from 'vite';
+
+export default defineConfig({});
diff --git a/tests/e2e/generate-client/examples/programmatic/generate.ts b/tests/e2e/generate-client/examples/programmatic/generate.ts
index 412533fdef..9b46228176 100644
--- a/tests/e2e/generate-client/examples/programmatic/generate.ts
+++ b/tests/e2e/generate-client/examples/programmatic/generate.ts
@@ -10,8 +10,7 @@ const here = dirname(fileURLToPath(import.meta.url));
 const result = await generateClient({
   api: join(here, 'openapi.yaml'),
   output: process.env.OUT ?? join(here, 'src/api/client.ts'),
-  outputMode: 'single', // 'single' | 'split' | 'tags' | 'tags-split'
-  facade: 'functions', // 'functions' | 'service-class'
+  outputMode: 'single', // 'single' | 'split'
   argsStyle: 'flat', // 'flat' | 'grouped'
   errorMode: 'throw', // 'throw' | 'result'
   generators: ['sdk'], // add 'zod' | 'tanstack-query' | 'transformers'
diff --git a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
index 804e48df94..1ad55ad78b 100644
--- a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
@@ -412,599 +412,6 @@ export function isDessert(value: MenuItem): value is Dessert {
     return (value as Record<string, unknown>)["category"] === "dessert";
 }
 
-/**
- * Static metadata for every operation, keyed by operationId: the HTTP `method`
- * and the `path` template (with `{param}` placeholders intact). Minification-safe
- * — useful for building cache/query keys, tracing span names, and request logging
- * without re-deriving them at each call site.
- */
-export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
-    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
-    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
-    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
-    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
-    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
-    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
-} as const;
-
-/**
- * The operationId of any operation in this client.
- */
-export type OperationId = keyof typeof OPERATIONS;
-
-/**
- * Static metadata describing one operation: its HTTP method, path template, and tags.
- */
-export type OperationMetadata = {
-    readonly method: string;
-    readonly path: string;
-    readonly tags: readonly string[];
-};
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
-
-let BASE = "https://api.cafe.redocly.com";
-
-/** Identity of the operation a request belongs to. Stable across path interpolation. */
-export type OperationContext = {
-    id: OperationId;
-    path: OperationPath;
-    tags: OperationTag[];
-};
-
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
-export type RequestContext = {
-    url: string;
-    method: string;
-    headers: Record<string, string>;
-    body?: unknown;
-    /** The operation being called: its id (operationId), path template, and tags. */
-    operation: OperationContext;
-};
-
-/**
- * Configuration and extension hooks for a client. Supplied per-instance via
- * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
- * (functions facade).
- */
-export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
-    serverUrl?: string;
-    /** Extra headers merged into every request; a function is invoked per request. */
-    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
-    /** Transport used to issue requests. Defaults to the global `fetch`. */
-    fetch?: typeof fetch;
-    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    /** Observe — or replace, by returning a `Response` — the response before parsing. */
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    /**
-     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
-     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
-     */
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
-    /**
-     * Composable interceptors run around every request, alongside the single
-     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
-     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
-     * the last-registered middleware wraps closest to the network. Register more at runtime
-     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
-     */
-    middleware?: Middleware[];
-    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
-    retry?: RetryConfig;
-    /**
-     * Per-instance auth credentials. When set, they override the module-global
-     * `set*` helpers for requests made through this config (each scheme falls back
-     * to its global slot when omitted here). Only the schemes an operation declares
-     * in its `security` are ever sent.
-     */
-    auth?: AuthCredentials;
-};
-
-/**
- * A request interceptor; every field is optional, so a middleware can hook any subset of
- * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
- * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
- * failure into the error to throw, threaded through each middleware in turn.
- */
-export type Middleware = {
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/** Context handed to `retryOn` for the attempt that just failed. */
-export type RetryContext = {
-    /** 1-based number of the attempt that just failed. */
-    attempt: number;
-    /** The request that was attempted. */
-    request: RequestContext;
-    /** Present when the server returned a (non-ok) response. */
-    response?: Response;
-    /** Present when the transport threw (network error, DNS, connection reset). */
-    error?: unknown;
-};
-
-/** Retry policy; all fields optional with sensible defaults. */
-export type RetryConfig = {
-    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
-    retries?: number;
-    /** Base delay in milliseconds. Default 1000. */
-    retryDelay?: number;
-    /** Backoff shape. Default 'exponential'. */
-    retryStrategy?: RetryStrategy;
-    /** Apply full jitter over the computed delay. Default true. */
-    jitter?: boolean;
-    /**
-     * Decide whether to retry a failed attempt. Default: retry only idempotent
-     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
-     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
-     */
-    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
-};
-
-/**
- * How the response body is read. `'auto'` negotiates from the content type (the
- * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
- */
-export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
-
-/**
- * The trailing per-operation argument: standard `RequestInit` plus an optional
- * per-call retry override and a `parseAs` escape hatch.
- *
- * `parseAs` forces how the response body is read; overrides the inferred kind.
- * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
- * override — the static return type is unchanged.
- */
-export type RequestOptions = RequestInit & {
-    retry?: Partial<RetryConfig>;
-    parseAs?: ParseAs;
-};
-
-/**
- * Override the base URL used by every generated operation. Useful when the
- * runtime environment differs from the value declared in `servers[0].url`
- * (e.g. dev / staging / prod toggles in a single-page app).
- *
- * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ serverUrl })`.
- */
-export function setServerUrl(url: string): void {
-    BASE = url;
-}
-
-/** The global config used by the functions facade (see `configure`). */
-const __config: ClientConfig = {};
-
-/**
- * Merge `config` into the global configuration used by the functions facade —
- * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
- * hooks once for every free function. The service-class facade configures per
- * instance instead (`new Client(config)`).
- */
-export function configure(config: ClientConfig): void {
-    Object.assign(__config, config);
-}
-
-/**
- * Append interceptors to the functions facade's global middleware chain (see
- * `ClientConfig.middleware`). The service-class facade registers per instance via
- * `<Client>.use(...)` instead.
- */
-export function use(...middleware: Middleware[]): void {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    __config.middleware = [...(__config.middleware ?? []), ...middleware];
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function __middleware(config: ClientConfig): Middleware[] {
-    const single = config.onRequest || config.onResponse || config.onError
-        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-        : [];
-    return [...single, ...(config.middleware ?? [])];
-}
-
-export class ApiError extends Error {
-    public readonly url: string;
-    public readonly status: number;
-    public readonly statusText: string;
-    public readonly body: unknown;
-    constructor(url: string, status: number, statusText: string, body: unknown) {
-        super(`Request failed with status ${status}`);
-        this.name = 'ApiError';
-        this.url = url;
-        this.status = status;
-        this.statusText = statusText;
-        this.body = body;
-    }
-}
-
-type QueryPrimitive = string | number | boolean;
-
-type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
-
-/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
-type QueryStyle = {
-    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-    explode: boolean;
-    allowReserved?: boolean;
-};
-
-/**
- * Percent-encode `value` but leave the RFC-3986 reserved set
- * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
- */
-function __encodeReserved(value: string): string {
-    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
-}
-
-function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
-    if (!query)
-        return url;
-    const params = new URLSearchParams();
-    const raw: string[] = [];
-    for (const [key, value] of Object.entries(query)) {
-        if (value === undefined || value === null)
-            continue;
-        const spec = styles?.[key];
-        if (!spec) {
-            if (Array.isArray(value)) {
-                for (const v of value) {
-                    if (v !== undefined && v !== null)
-                        params.append(key, String(v));
-                }
-            }
-            else if (typeof value === 'object') {
-                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-                for (const [subKey, subValue] of Object.entries(value)) {
-                    if (subValue !== undefined && subValue !== null) {
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                    }
-                }
-            }
-            else {
-                params.append(key, String(value));
-            }
-            continue;
-        }
-        if (Array.isArray(value)) {
-            const items = value.filter((v) => v !== undefined && v !== null).map(String);
-            if (spec.style === 'form' && spec.explode) {
-                for (const v of items) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}=${__encodeReserved(v)}`);
-                    else
-                        params.append(key, v);
-                }
-            }
-            else {
-                // Delimited styles put the LITERAL delimiter on the wire; only the
-                // values are encoded. `%20` (not `+`) is the literal space delimiter.
-                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
-                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-            }
-        }
-        else if (typeof value === 'object') {
-            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-            for (const [subKey, subValue] of Object.entries(value)) {
-                if (subValue !== undefined && subValue !== null) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
-                    else
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                }
-            }
-        }
-        else if (spec.allowReserved) {
-            raw.push(`${key}=${__encodeReserved(String(value))}`);
-        }
-        else {
-            params.append(key, String(value));
-        }
-    }
-    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-    return qs ? `${url}?${qs}` : url;
-}
-
-async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
-    response: Response;
-    context: RequestContext;
-}> {
-    const { retry: callRetry, ...fetchInit } = init;
-    const retry: RetryConfig = { ...config.retry, ...callRetry };
-    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-    const headers: Record<string, string> = {
-        Accept: 'application/json',
-        ...extra,
-        ...(fetchInit.headers as Record<string, string> | undefined),
-    };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
-    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-    let payload: BodyInit | undefined;
-    if (context.body !== undefined) {
-        const value = context.body;
-        const isBinary = value instanceof Blob ||
-            value instanceof ArrayBuffer ||
-            ArrayBuffer.isView(value as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-        const isURLSearchParams = value instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-            payload = value as BodyInit;
-        }
-        else {
-            payload = JSON.stringify(value);
-            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-                context.headers['Content-Type'] = 'application/json';
-            }
-        }
-    }
-    const doFetch = config.fetch ?? fetch;
-    const maxAttempts = 1 + (retry.retries ?? 0);
-    const retryOn = retry.retryOn ?? __defaultRetryOn;
-    const signal = fetchInit.signal ?? undefined;
-    let attempt = 0;
-    while (true) {
-        attempt++;
-        if (signal?.aborted)
-            throw __abortError(signal);
-        let response: Response;
-        try {
-            response = await doFetch(context.url, {
-                ...fetchInit,
-                method: context.method,
-                headers: context.headers,
-                body: payload,
-            });
-        }
-        catch (error) {
-            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
-                await __sleep(__retryDelay(retry, attempt, null), signal);
-                continue;
-            }
-            throw error;
-        }
-        // Reverse order: the last-registered middleware wraps closest to the network (onion).
-        for (let i = middleware.length - 1; i >= 0; i--) {
-            const onResponse = middleware[i].onResponse;
-            if (onResponse) {
-                const replaced = await onResponse(response, context);
-                if (replaced)
-                    response = replaced;
-            }
-        }
-        if (!response.ok &&
-            attempt < maxAttempts &&
-            !signal?.aborted &&
-            (await retryOn({ attempt, request: context, response }))) {
-            const retryAfter = response.headers.get('retry-after');
-            // Drain the abandoned response body before the next attempt: an unread body
-            // keeps the connection checked out (and can stall the pool) under Node/undici
-            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-            await response.body?.cancel().catch(() => undefined);
-            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
-            continue;
-        }
-        return { response, context };
-    }
-}
-
-async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-    if (kind === 'void' || response.status === 204)
-        return undefined;
-    if (kind === 'stream')
-        return response.body;
-    if (kind === 'blob')
-        return response.blob();
-    if (kind === 'arrayBuffer')
-        return response.arrayBuffer();
-    if (kind === 'formData')
-        return response.formData();
-    if (kind === 'text')
-        return response.text();
-    if (kind === 'json')
-        return response.json();
-    // 'auto' — negotiate from the response's content type.
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json'))
-        return response.json();
-    if (contentType.startsWith('text/'))
-        return response.text();
-    return response.blob();
-}
-
-async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
-    const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, op, url, sendInit, body);
-    if (!response.ok) {
-        const errorBody = await readError(response);
-        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
-        // Thread the error through each middleware's onError in turn (each may replace it).
-        for (const mw of __middleware(config)) {
-            if (mw.onError)
-                error = await mw.onError(error as ApiError, context);
-        }
-        throw error;
-    }
-    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
-    return (await __parse(response, kind)) as T;
-}
-
-async function readError(response: Response): Promise<unknown> {
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json')) {
-        return response.json().catch(() => undefined);
-    }
-    return response.text().catch(() => undefined);
-}
-
-const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-
-const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-function __defaultRetryOn(ctx: RetryContext): boolean {
-    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
-        return false;
-    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-    if (retryAfter) {
-        const seconds = Number(retryAfter);
-        if (!Number.isNaN(seconds))
-            return seconds * 1000;
-        const when = Date.parse(retryAfter);
-        if (!Number.isNaN(when))
-            return Math.max(0, when - Date.now());
-    }
-    const base = retry.retryDelay ?? 1000;
-    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-    return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
-    return new Promise((resolve, reject) => {
-        if (signal?.aborted) {
-            reject(__abortError(signal));
-            return;
-        }
-        const onAbort = () => {
-            clearTimeout(timer);
-            reject(__abortError(signal as AbortSignal));
-        };
-        const timer = setTimeout(() => {
-            if (signal)
-                signal.removeEventListener('abort', onAbort);
-            resolve();
-        }, ms);
-        if (signal)
-            signal.addEventListener('abort', onAbort, { once: true });
-    });
-}
-
-function __abortError(signal: AbortSignal): globalThis.Error {
-    const reason = (signal as {
-        reason?: unknown;
-    }).reason;
-    if (reason instanceof Error)
-        return reason;
-    return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * Normalize an operation's header-parameter object into a plain string record,
- * dropping any `undefined` / `null` entries (optional headers the caller omitted)
- * and stringifying the rest. Mirrors __buildUrl's handling of query values.
- */
-function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
-    const out: Record<string, string> = {};
-    for (const [key, value] of Object.entries(values)) {
-        if (value !== undefined && value !== null)
-            out[key] = String(value);
-    }
-    return out;
-}
-
-/**
- * A credential value, or a (possibly async) function that returns one per request.
- */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/**
- * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
- * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
- * to the global slots.
- */
-export type AuthCredentials = {
-    bearer?: TokenProvider;
-    apiKey?: Record<string, TokenProvider>;
-};
-
-let __bearerToken: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
- * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
- * (possibly async) function resolved per request.
- */
-export function setBearer(token: TokenProvider | null): void {
-    __bearerToken = token;
-}
-
-let __apiKey_ApiKey: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
- * string or a (possibly async) function resolved per request.
- */
-export function setApiKey(key: TokenProvider | null): void {
-    __apiKey_ApiKey = key;
-}
-
-/**
- * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
- */
-async function __resolve(slot: TokenProvider | null): Promise<string | null> {
-    if (slot === null)
-        return null;
-    return typeof slot === "function" ? slot() : slot;
-}
-
-/**
- * Build the auth `headers` and `query` for an operation from the currently-set credentials.
- * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
- * can always override by passing their own `init.headers`.
- */
-async function __auth(schemes: string[], config: ClientConfig): Promise<{
-    headers: Record<string, string>;
-    query: Record<string, string>;
-}> {
-    const headers: Record<string, string> = {};
-    const query: Record<string, string> = {};
-    const cookies: string[] = [];
-    for (const scheme of schemes) {
-        switch (scheme) {
-            case "OAuth2": {
-                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
-                if (v !== null)
-                    headers["Authorization"] = `Bearer ${v}`;
-                break;
-            }
-            case "ApiKey": {
-                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
-                if (v !== null)
-                    headers["X-API-Key"] = v;
-                break;
-            }
-        }
-    }
-    if (cookies.length > 0)
-        headers["Cookie"] = cookies.join("; ");
-    return { headers, query };
-}
-
 export type ListMenuItemsResult = MenuItemList;
 
 export type ListMenuItemsParams = {
@@ -1062,64 +469,6 @@ export type ListMenuItemsVariables = {
     params?: ListMenuItemsParams;
 };
 
-/**
- * List all menu items
- *
- * Retrieve a collection of menu items with optional filtering and pagination.
- */
-export async function listMenuItems(params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-    return __request<MenuItemList>(__config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
-}
-
 export type CreateMenuItemResult = MenuItem;
 
 export type CreateMenuItemBody = FormData;
@@ -1128,16 +477,6 @@ export type CreateMenuItemVariables = {
     body: CreateMenuItemBody;
 };
 
-/**
- * Create menu item
- *
- * Create a new menu item.
- */
-export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<MenuItem>(__config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
 export type DeleteMenuItemResult = void;
 
 export type DeleteMenuItemVariables = {
@@ -1148,16 +487,6 @@ export type DeleteMenuItemVariables = {
     menuItemId: string;
 };
 
-/**
- * Delete a menu item
- *
- * Delete an existing menu item.
- */
-export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
 export type GetMenuItemPhotoResult = Blob | string;
 
 export type GetMenuItemPhotoParams = {
@@ -1176,20 +505,6 @@ export type GetMenuItemPhotoVariables = {
     params?: GetMenuItemPhotoParams;
 };
 
-/**
- * Retrieve a menu item photo
- *
- * Retrieve the product photo image for a specific menu item.
- */
-export async function getMenuItemPhoto(menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}): Promise<Blob | string> {
-    return __request<Blob | string>(__config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
-}
-
 export type ListOrdersResult = OrderList;
 
 export type ListOrdersParams = {
@@ -1247,95 +562,25 @@ export type ListOrdersVariables = {
     params?: ListOrdersParams;
 };
 
-/**
- * List all orders
- *
- * Retrieve a collection of orders with optional filtering and pagination.
- */
-export async function listOrders(params: {
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
     /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
      */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderList> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderList>(__config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-/**
- * Create order
- *
- * Create a new order.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
     /**
      * ID of the order to retrieve.
      * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
@@ -1344,22 +589,6 @@ export type GetOrderByIdVariables = {
     headers?: GetOrderByIdHeaders;
 };
 
-/**
- * Retrieve an order
- *
- * Retrieve a single order by its ID.
- */
-export async function getOrderById(orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
-}
-
 export type DeleteOrderResult = void;
 
 export type DeleteOrderVariables = {
@@ -1370,17 +599,6 @@ export type DeleteOrderVariables = {
     orderId: string;
 };
 
-/**
- * Delete an order
- *
- * Delete the order.
- * To keep the order history, the order should be canceled instead of deleted.
- */
-export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
 export type UpdateOrderResult = Order;
 
 export type UpdateOrderBody = {
@@ -1396,19 +614,6 @@ export type UpdateOrderVariables = {
     body?: UpdateOrderBody;
 };
 
-/**
- * Partially update an order
- *
- * Update an existing order status.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function updateOrder(orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
 export type ListOrderItemsResult = OrderItem[];
 
 export type ListOrderItemsParams = {
@@ -1436,13 +641,1006 @@ export type ListOrderItemsVariables = {
     params?: ListOrderItemsParams;
 };
 
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    listMenuItems: {
+        args: {
+            params?: ListMenuItemsParams;
+        };
+        result: ListMenuItemsResult;
+    };
+    createMenuItem: {
+        args: {
+            body: CreateMenuItemBody;
+        };
+        result: CreateMenuItemResult;
+    };
+    deleteMenuItem: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+        };
+        result: DeleteMenuItemResult;
+    };
+    getMenuItemPhoto: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+            params?: GetMenuItemPhotoParams;
+        };
+        result: GetMenuItemPhotoResult;
+    };
+    listOrders: {
+        args: {
+            params?: ListOrdersParams;
+        };
+        result: ListOrdersResult;
+    };
+    createOrder: {
+        args: {
+            body: CreateOrderBody;
+        };
+        result: CreateOrderResult;
+    };
+    getOrderById: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            headers?: GetOrderByIdHeaders;
+        };
+        result: GetOrderByIdResult;
+    };
+    deleteOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+        };
+        result: DeleteOrderResult;
+    };
+    updateOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            body?: UpdateOrderBody;
+        };
+        result: UpdateOrderResult;
+    };
+    listOrderItems: {
+        args: {
+            params?: ListOrderItemsParams;
+        };
+        result: ListOrderItemsResult;
+    };
+    getRevenue: {
+        args: {
+            params?: GetRevenueParams;
+        };
+        result: GetRevenueResult;
+    };
+    registerOAuth2Client: {
+        args: {
+            body: RegisterOAuth2ClientBody;
+        };
+        result: RegisterOAuth2ClientResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
+export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : NoRequiredKeys<Ops[K]['args']> extends true
+      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
+
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/** Resolve a credential: a literal passes through; a function is awaited per request. */
+async function resolveToken(provider: TokenProvider): Promise<string> {
+  return typeof provider === 'function' ? await provider() : provider;
+}
+
+/**
+ * Build the auth headers/query for one operation's `security` requirements from the
+ * instance credentials (`config.auth`) — capability module, wired into `createClient`.
+ * A scheme with no configured credential contributes nothing (the request is sent
+ * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
+ */
+async function resolveAuth(
+  security: readonly SecuritySpec[],
+  config: ClientConfig
+): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const headers: Record<string, string> = {};
+  const query: Record<string, string> = {};
+  const cookies: string[] = [];
+  for (const scheme of security) {
+    if (scheme.kind === 'apiKey') {
+      const provider = config.auth?.apiKey?.[scheme.scheme];
+      if (provider === undefined) continue;
+      const value = await resolveToken(provider);
+      if (scheme.in === 'header') headers[scheme.name] = value;
+      else if (scheme.in === 'query') query[scheme.name] = value;
+      else cookies.push(`${scheme.name}=${value}`);
+    } else if (scheme.kind === 'bearer') {
+      const provider = config.auth?.bearer;
+      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
+    } else {
+      const basic = config.auth?.basic;
+      if (basic !== undefined) {
+        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+      }
+    }
+  }
+  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
+  return { headers, query };
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+};
+
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
 /**
- * List all order items with menu item details
- *
- * Returns an array of order items for a specific order.
- * Use the `filter` parameter to filter by order ID.
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
  */
-export async function listOrderItems(params: {
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
+}
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe.redocly.com" });
+
+export const { configure, use } = client;
+export const setBearer = client.auth.bearer;
+export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
+export const listMenuItems = (params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
     /**
      * Filters the collection items using space-separated `field:value` pairs.
      *
@@ -1461,39 +1659,115 @@ export async function listOrderItems(params: {
      * - `status:placed createdAt:7d` - Combine multiple filters.
      */
     filter?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderItem[]>(__config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
     /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
      */
-    startDate?: string;
+    search?: string;
     /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
      */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-/**
- * Get revenue statistics
- *
- * Retrieve revenue statistics for a configurable date range.
- * Returns revenue, order counts, average order amount, and other useful statistics.
- */
-export async function getRevenue(params: {
+    limit?: number;
+} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
+export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
+export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
+export const getMenuItemPhoto = (menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
+export const listOrders = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
+export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
+export const getOrderById = (orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
+export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
+export const updateOrder = (orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
+export const listOrderItems = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
+export const getRevenue = (params: {
     /**
      * Start date for the revenue calculation period (ISO 8601 datetime format).
      * Defaults to 30 days ago if not provided.
@@ -1506,29 +1780,5 @@ export async function getRevenue(params: {
      * @format date
      */
     endDate?: string;
-} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
-    const __a = await __auth(["ApiKey"], __config);
-    return __request<RevenueStatistics>(__config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Create OAuth2 client
- *
- * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
- * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
- *   `redirectUris` must be provided (per RFC 7591 Section 2).
- * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
- * Returns the registered client information per RFC 7591, including:
- * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
- */
-export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-    return __request<OAuth2Client>(__config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
-}
+} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
+export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
diff --git a/tests/e2e/generate-client/examples/service-class/README.md b/tests/e2e/generate-client/examples/service-class/README.md
deleted file mode 100644
index d9149b74b9..0000000000
--- a/tests/e2e/generate-client/examples/service-class/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# service-class example
-
-Generated TypeScript client using the **service-class facade** (`generators: ['sdk']`). Operations are
-methods on a `Client` configured per instance (`new Client({ serverUrl })`).
-
-## Run
-
-```bash
-npm install
-npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
-npm run dev        # open the printed local URL
-```
-
-The generated client under `src/api/` is committed and drift-checked against the generator in CI.
diff --git a/tests/e2e/generate-client/examples/service-class/package-lock.json b/tests/e2e/generate-client/examples/service-class/package-lock.json
deleted file mode 100644
index 5e911b1f1e..0000000000
--- a/tests/e2e/generate-client/examples/service-class/package-lock.json
+++ /dev/null
@@ -1,3504 +0,0 @@
-{
-  "name": "@redocly-examples/service-class",
-  "version": "0.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@redocly-examples/service-class",
-      "version": "0.0.0",
-      "devDependencies": {
-        "@redocly/cli": "2.31.4-local-06-22",
-        "typescript": "^5.5.0",
-        "vite": "^5.4.0"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/code-frame/-/code-frame-7.29.7.tgz",
-      "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.29.7",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.1.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
-      "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/runtime": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/runtime/-/runtime-7.29.7.tgz",
-      "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@emotion/is-prop-valid": {
-      "version": "1.4.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@emotion/is-prop-valid/-/is-prop-valid-1.4.0.tgz",
-      "integrity": "sha512-QgD4fyscGcbbKwJmqNvUMSE02OsHUa+lAWKdEUIJKgqe5IwRSKd7+KhibEWdaKwgjLj0DRSHA9biAIqGBk05lw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@emotion/memoize": "^0.9.0"
-      }
-    },
-    "node_modules/@emotion/memoize": {
-      "version": "0.9.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@emotion/memoize/-/memoize-0.9.0.tgz",
-      "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@exodus/schemasafe": {
-      "version": "1.3.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@exodus/schemasafe/-/schemasafe-1.3.0.tgz",
-      "integrity": "sha512-5Aap/GaRupgNx/feGBwLLTVv8OQFfv3pq2lPRzPg9R+IOBnDgghTGW7l7EuVXOvg5cc/xSAlRW8rBrjIC3Nvqw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@faker-js/faker": {
-      "version": "7.6.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@faker-js/faker/-/faker-7.6.0.tgz",
-      "integrity": "sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.0.0",
-        "npm": ">=6.0.0"
-      }
-    },
-    "node_modules/@humanwhocodes/momoa": {
-      "version": "2.0.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@humanwhocodes/momoa/-/momoa-2.0.4.tgz",
-      "integrity": "sha512-RE815I4arJFtt+FVeU1Tgp9/Xvecacji8w/V6XtXsWWH/wz/eNkNbhb+ny/+PlVZjV0rxQpRSQKNKE3lcktHEA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@noble/hashes": {
-      "version": "1.8.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@noble/hashes/-/hashes-1.8.0.tgz",
-      "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^14.21.3 || >=16"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/@nodable/entities": {
-      "version": "2.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@nodable/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-9uGyhaQavEUMC8AIddIjau4NsnsXhou+j5sBAGojCM1oxmQpVKTWR/9JxABD6UAv12vpIms55fPZKFQEhG6uBg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/nodable"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/@opentelemetry/api": {
-      "version": "1.9.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/api/-/api-1.9.1.tgz",
-      "integrity": "sha512-gLyJlPHPZYdAk1JENA9LeHejZe1Ti77/pTeFm/nMXmQH/HFZlcS/O2XJB+L8fkbrNSqhdtlvjBVjxwUYanNH5Q==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@opentelemetry/api-logs": {
-      "version": "0.214.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/api-logs/-/api-logs-0.214.0.tgz",
-      "integrity": "sha512-40lSJeqYO8Uz2Yj7u94/SJWE/wONa7rmMKjI1ZcIjgf3MHNHv1OZUCrCETGuaRF62d5pQD1wKIW+L4lmSMTzZA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@opentelemetry/context-async-hooks": {
-      "version": "2.6.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/context-async-hooks/-/context-async-hooks-2.6.1.tgz",
-      "integrity": "sha512-XHzhwRNkBpeP8Fs/qjGrAf9r9PRv67wkJQ/7ZPaBQQ68DYlTBBx5MF9LvPx7mhuXcDessKK2b+DcxqwpgkcivQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.0.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/core": {
-      "version": "2.6.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/core/-/core-2.6.1.tgz",
-      "integrity": "sha512-8xHSGWpJP9wBxgBpnqGL0R3PbdWQndL1Qp50qrg71+B28zK5OQmUgcDKLJgzyAAV38t4tOyLMGDD60LneR5W8g==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/semantic-conventions": "^1.29.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.0.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/exporter-trace-otlp-http": {
-      "version": "0.214.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.214.0.tgz",
-      "integrity": "sha512-kIN8nTBMgV2hXzV/a20BCFilPZdAIMYYJGSgfMMRm/Xa+07y5hRDS2Vm12A/z8Cdu3Sq++ZvJfElokX2rkgGgw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/core": "2.6.1",
-        "@opentelemetry/otlp-exporter-base": "0.214.0",
-        "@opentelemetry/otlp-transformer": "0.214.0",
-        "@opentelemetry/resources": "2.6.1",
-        "@opentelemetry/sdk-trace-base": "2.6.1"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      }
-    },
-    "node_modules/@opentelemetry/otlp-exporter-base": {
-      "version": "0.214.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.214.0.tgz",
-      "integrity": "sha512-u1Gdv0/E9wP+apqWf7Wv2npXmgJtxsW2XL0TEv9FZloTZRuMBKmu8cYVXwS4Hm3q/f/3FuCnPTgiwYvIqRSpRg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/core": "2.6.1",
-        "@opentelemetry/otlp-transformer": "0.214.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      }
-    },
-    "node_modules/@opentelemetry/otlp-transformer": {
-      "version": "0.214.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/otlp-transformer/-/otlp-transformer-0.214.0.tgz",
-      "integrity": "sha512-DSaYcuBRh6uozfsWN3R8HsN0yDhCuWP7tOFdkUOVaWD1KVJg8m4qiLUsg/tNhTLS9HUYUcwNpwL2eroLtsZZ/w==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/api-logs": "0.214.0",
-        "@opentelemetry/core": "2.6.1",
-        "@opentelemetry/resources": "2.6.1",
-        "@opentelemetry/sdk-logs": "0.214.0",
-        "@opentelemetry/sdk-metrics": "2.6.1",
-        "@opentelemetry/sdk-trace-base": "2.6.1",
-        "protobufjs": "^7.0.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      }
-    },
-    "node_modules/@opentelemetry/resources": {
-      "version": "2.6.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/resources/-/resources-2.6.1.tgz",
-      "integrity": "sha512-lID/vxSuKWXM55XhAKNoYXu9Cutoq5hFdkbTdI/zDKQktXzcWBVhNsOkiZFTMU9UtEWuGRNe0HUgmsFldIdxVA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/core": "2.6.1",
-        "@opentelemetry/semantic-conventions": "^1.29.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.3.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/sdk-logs": {
-      "version": "0.214.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/sdk-logs/-/sdk-logs-0.214.0.tgz",
-      "integrity": "sha512-zf6acnScjhsaBUU22zXZ/sLWim1dfhUAbGXdMmHmNG3LfBnQ3DKsOCITb2IZwoUsNNMTogqFKBnlIPPftUgGwA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/api-logs": "0.214.0",
-        "@opentelemetry/core": "2.6.1",
-        "@opentelemetry/resources": "2.6.1",
-        "@opentelemetry/semantic-conventions": "^1.29.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.4.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/sdk-metrics": {
-      "version": "2.6.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/sdk-metrics/-/sdk-metrics-2.6.1.tgz",
-      "integrity": "sha512-9t9hJHX15meBy2NmTJxL+NJfXmnausR2xUDvE19XQce0Qi/GBtDGamU8nS1RMbdgDmhgpm3VaOu2+fiS/SfTpQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/core": "2.6.1",
-        "@opentelemetry/resources": "2.6.1"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.9.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/sdk-trace-base": {
-      "version": "2.6.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.6.1.tgz",
-      "integrity": "sha512-r86ut4T1e8vNwB35CqCcKd45yzqH6/6Wzvpk2/cZB8PsPLlZFTvrh8yfOS3CYZYcUmAx4hHTZJ8AO8Dj8nrdhw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/core": "2.6.1",
-        "@opentelemetry/resources": "2.6.1",
-        "@opentelemetry/semantic-conventions": "^1.29.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.3.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/sdk-trace-node": {
-      "version": "2.6.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/sdk-trace-node/-/sdk-trace-node-2.6.1.tgz",
-      "integrity": "sha512-Hh2i4FwHWRFhnO2Q/p6svMxy8MPsNCG0uuzUY3glqm0rwM0nQvbTO1dXSp9OqQoTKXcQzaz9q1f65fsurmOhNw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/context-async-hooks": "2.6.1",
-        "@opentelemetry/core": "2.6.1",
-        "@opentelemetry/sdk-trace-base": "2.6.1"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.0.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/semantic-conventions": {
-      "version": "1.40.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/semantic-conventions/-/semantic-conventions-1.40.0.tgz",
-      "integrity": "sha512-cifvXDhcqMwwTlTK04GBNeIe7yyo28Mfby85QXFe1Yk8nmi36Ab/5UQwptOx84SsoGNRg+EVSjwzfSZMy6pmlw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/@protobufjs/aspromise": {
-      "version": "1.1.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
-      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/base64": {
-      "version": "1.1.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/base64/-/base64-1.1.2.tgz",
-      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/codegen": {
-      "version": "2.0.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/codegen/-/codegen-2.0.5.tgz",
-      "integrity": "sha512-zgXFLzW3Ap33e6d0Wlj4MGIm6Ce8O89n/apUaGNB/jx+hw+ruWEp7EwGUshdLKVRCxZW12fp9r40E1mQrf/34g==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/eventemitter": {
-      "version": "1.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/eventemitter/-/eventemitter-1.1.1.tgz",
-      "integrity": "sha512-vW1GmwMZNnL+gMRaovlh9yZX74kc+TTU3FObkkurpMaRtBfLP3ldjS9KQWlwZgraRE0+dheEEoAxdzcJQ8eXZg==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/fetch": {
-      "version": "1.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/fetch/-/fetch-1.1.1.tgz",
-      "integrity": "sha512-GpptLrs57adMSuHi3VNj0mAF8dwh36LMaYF6XyJ6JMWlVsc+t42tm1HSEDmOs3A8fC9yyeisgLhsTVQokOZ0zw==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@protobufjs/aspromise": "^1.1.1"
-      }
-    },
-    "node_modules/@protobufjs/float": {
-      "version": "1.0.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/float/-/float-1.0.2.tgz",
-      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/path": {
-      "version": "1.1.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/path/-/path-1.1.2.tgz",
-      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/pool": {
-      "version": "1.1.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/pool/-/pool-1.1.0.tgz",
-      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/utf8": {
-      "version": "1.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/utf8/-/utf8-1.1.1.tgz",
-      "integrity": "sha512-oOAWABowe8EAbMyWKM0tYDKi8Yaox52D+HWZhAIJqQXbqe0xI/GV7FhLWqlEKreMkfDjshR5FKgi3mnle0h6Eg==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@redocly/ajv": {
-      "version": "8.18.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/ajv/-/ajv-8.18.3.tgz",
-      "integrity": "sha512-l42u0of3hY98sN2A+M4qTX1O/KrpgGH32Hu9kP2GtHyD5Dfqq86PKFLe5dwaD8DEnNmlOlll2BAmeEtf0DaySg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "fast-uri": "^3.0.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@redocly/cli": {
-      "version": "2.31.4-local-06-22",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/cli/-/cli-2.31.4-local-06-22.tgz",
-      "integrity": "sha512-VZrw8d0vCWNll6ZWnG7Iwp5yeuesWRUb8WCc+KFNnQxpxeJZ4WwPvOyMlb+wOeC5wHWNDwhHRteOaflA+yT6Dg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@opentelemetry/exporter-trace-otlp-http": "0.214.0",
-        "@opentelemetry/resources": "2.6.1",
-        "@opentelemetry/sdk-trace-node": "2.6.1",
-        "@opentelemetry/semantic-conventions": "1.40.0",
-        "@redocly/cli-otel": "0.3.1",
-        "@redocly/openapi-core": "2.31.4",
-        "@redocly/openapi-typescript": "0.1.0-local-local",
-        "@redocly/respect-core": "2.31.4",
-        "ajv": "npm:@redocly/ajv@8.18.1",
-        "ajv-formats": "^3.0.1",
-        "colorette": "^1.2.0",
-        "cookie": "^0.7.2",
-        "dotenv": "16.4.7",
-        "glob": "^13.0.5",
-        "handlebars": "^4.7.9",
-        "https-proxy-agent": "^7.0.5",
-        "mobx": "^6.0.4",
-        "picomatch": "^4.0.4",
-        "pluralize": "^8.0.0",
-        "react": "^17.0.0 || ^18.2.0 || ^19.2.1",
-        "react-dom": "^17.0.0 || ^18.2.0 || ^19.2.1",
-        "redoc": "2.5.1",
-        "semver": "^7.5.2",
-        "set-cookie-parser": "^2.3.5",
-        "simple-websocket": "^9.0.0",
-        "styled-components": "6.4.1",
-        "typescript": "6.0.2",
-        "ulid": "^3.0.1",
-        "undici": "6.24.0",
-        "yargs": "17.0.1"
-      },
-      "bin": {
-        "openapi": "bin/cli.js",
-        "redocly": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
-        "npm": ">=10"
-      }
-    },
-    "node_modules/@redocly/cli-otel": {
-      "version": "0.3.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/cli-otel/-/cli-otel-0.3.1.tgz",
-      "integrity": "sha512-TbC4bK2zLtU/O9I2pszHPP0rtJOvFhQmEwQ/FHxERPu71fgKG8POUDP2jSiGmsXE7NdGSHBKqnf+y9Acn2jq5g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ulid": "^2.3.0"
-      }
-    },
-    "node_modules/@redocly/cli-otel/node_modules/ulid": {
-      "version": "2.4.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ulid/-/ulid-2.4.0.tgz",
-      "integrity": "sha512-fIRiVTJNcSRmXKPZtGzFQv9WRrZ3M9eoptl/teFJvjOzmpU+/K/JH6HZ8deBfb5vMEpicJcLn7JmvdknlMq7Zg==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "ulid": "bin/cli.js"
-      }
-    },
-    "node_modules/@redocly/cli/node_modules/typescript": {
-      "version": "6.0.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/typescript/-/typescript-6.0.2.tgz",
-      "integrity": "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
-    "node_modules/@redocly/config": {
-      "version": "0.49.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/config/-/config-0.49.0.tgz",
-      "integrity": "sha512-OI/rpEffX3fKUuy+OuBHPRspRI/S30b9aiqxfZLMpSWZzDncEGPxSEP1O2LrBVshnDX4hLjVjLvCZ4YT85+1rw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "json-schema-to-ts": "2.7.2"
-      }
-    },
-    "node_modules/@redocly/openapi-core": {
-      "version": "2.31.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/openapi-core/-/openapi-core-2.31.4.tgz",
-      "integrity": "sha512-ne2e5NduK9MHnu42LoPXgfKhyCFG5Mc2Cwh3wNfLdoieYvhKtl37rW7p4p+GDMEJmlI9t6fagQbGPAKic2+3Pw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@redocly/ajv": "^8.18.1",
-        "@redocly/config": "^0.49.0",
-        "ajv": "npm:@redocly/ajv@8.18.1",
-        "ajv-formats": "^3.0.1",
-        "colorette": "^1.2.0",
-        "js-levenshtein": "^1.1.6",
-        "js-yaml": "^4.1.0",
-        "picomatch": "^4.0.4",
-        "pluralize": "^8.0.0",
-        "yaml-ast-parser": "0.0.43"
-      },
-      "engines": {
-        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
-        "npm": ">=10"
-      }
-    },
-    "node_modules/@redocly/openapi-typescript": {
-      "version": "0.1.0-local-local",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/openapi-typescript/-/openapi-typescript-0.1.0-local-local.tgz",
-      "integrity": "sha512-BJRV89BoYdEyECFGRB8t2dzWnOGNe1/oQ7DZoC662kv4NRJhxz5qw3exl24+M+1WCpGdRtPps5GIy+vPqauJUA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@redocly/openapi-core": "2.31.4"
-      },
-      "engines": {
-        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
-        "npm": ">=10"
-      },
-      "peerDependencies": {
-        "typescript": ">=5.5.0"
-      }
-    },
-    "node_modules/@redocly/respect-core": {
-      "version": "2.31.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/respect-core/-/respect-core-2.31.4.tgz",
-      "integrity": "sha512-ezdsZap+vmwkv94Gf7a5j+SVcxGDRWm78hxKh7Xb4XNYUxHfAqmC0eDpEfkiJU61LP7tOQeZcckxdFCIVEqI8w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@faker-js/faker": "^7.6.0",
-        "@noble/hashes": "^1.8.0",
-        "@redocly/ajv": "^8.18.1",
-        "@redocly/openapi-core": "2.31.4",
-        "ajv": "npm:@redocly/ajv@8.18.1",
-        "better-ajv-errors": "^2.0.3",
-        "colorette": "^2.0.20",
-        "json-pointer": "^0.6.2",
-        "jsonpath-rfc9535": "1.3.0",
-        "openapi-sampler": "^1.7.1",
-        "outdent": "^0.8.0",
-        "picomatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
-        "npm": ">=10"
-      }
-    },
-    "node_modules/@redocly/respect-core/node_modules/colorette": {
-      "version": "2.0.20",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/colorette/-/colorette-2.0.20.tgz",
-      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.62.2.tgz",
-      "integrity": "sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.62.2.tgz",
-      "integrity": "sha512-BaH7BllCACHoH1LguOU56UItGfUWjujlO65kS9LAodViaN4bwIKd7oeW/ZHJ/4ljr/7MIiENnNy3HJ0zXv8Zkw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.62.2.tgz",
-      "integrity": "sha512-v39RCCvj4He82I9sFmk+M1VZ0PLM9sfsLVikjfx2hYBNALhrrOR2D3JjQA6AhlaSOgcR+RzrKY7e1+bT6SUO/A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.62.2.tgz",
-      "integrity": "sha512-yl0y2vq3S3lHeuXhEdss6TWfKW8vkujImO12tn4ZkG/4oghr09LvdYm2RElVjokTQiUvDUGXLGsYeLqUMCKpGA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.62.2.tgz",
-      "integrity": "sha512-tT4pvt4qXD+vEoezupCWi+a1F0vvDiksiHc+PxRlYTOH1I6/X4id9jPxTP+Fg+545euaFT1jJVs4CEdHZAU1vw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.62.2.tgz",
-      "integrity": "sha512-6nU5F2wCW+qvCBhTn1pdIU3bzsIoF7EUwsCDRxilWGprQR6yd508YnH9+OKFCwpfS8pjZqDUmnCAr7exax0XCg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.62.2.tgz",
-      "integrity": "sha512-n1GJHPOvpIfhi3TmrCeh6S6URt9BFCt0KQE3qvexyGCTAKpR4Lg+eWvNZEqu7epxwus/8ElT3hacYEucm49SZg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.62.2.tgz",
-      "integrity": "sha512-JqgflS8wEB+UXV/vS1RpRbifGBeN4D5lz8D8oOFbFZw4vedvdOgCFAjfBmIMdW3yL10XpQQ0Ambepw6MXrhOnA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.62.2.tgz",
-      "integrity": "sha512-wnFJkogWvN4jm/hQRF2UBaeUmk20j5+DmHvoyWii2b8HJDyvz1MF2OU/6ynXt2KR63rbZLWkFpoytpdc/yBuSA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.62.2.tgz",
-      "integrity": "sha512-HVu2bp0zhvJ8xHEV9+UUs7S90VadmBSY3LcIMvozbPo4AuMGDWlz3ymHLHZPX4hR67TKTt8Qp5PJ5RBg/i+RMQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-loong64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.62.2.tgz",
-      "integrity": "sha512-mQqqAV8QaoSgr9I2fKDLY2BAVvmKjWoGiu/cSYQonsLvtqwEn1E4QYfnCOcp5zoEqNhsDYin1s6jx/VJmrxlZg==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-loong64-musl": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.62.2.tgz",
-      "integrity": "sha512-IxKLoxCQ2IWi6bT2akyDUBGsOImDKB+sPp4EsTmwFQ/fMwpCKm8uLSSgP/Kx/QYUgKis6SEZ5/Nlhup0DIA0PQ==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.62.2.tgz",
-      "integrity": "sha512-Mk5ha2RQSgyFfmYYLkBpPnUk8D8FriBxesO1u9O75X0mHgXL1UQcH5Itl2lurWL2tj0RxV9b9tJgipac0hRY9A==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-ppc64-musl": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.62.2.tgz",
-      "integrity": "sha512-CjvEnqJL/0/TQ3TXX3OPIJ/kmBellrWd4heXUmHeJlTnmwjKpSJzoehLaL6Xk0ZnMHBu9dZuFADNOrtjF4v+2w==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.62.2.tgz",
-      "integrity": "sha512-1SiZbzwdkaDURsew/tSOrooKiYy7EQGT6m8ufavAi9NEyQb/6VuIxFXAL1fqa4iZe3g4NbNk4P7J32z2tw5Mgg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.62.2.tgz",
-      "integrity": "sha512-nQts12zJ3NQRoE6uYljOH89v7szzLDvG2JD/vsX+vGXU8w/At1GowTZ5/7qeFQ8m7L55rpR8Okugnuo5bgjy2Q==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.62.2.tgz",
-      "integrity": "sha512-E9/ll019jhPIJgpzfZoIkBGhcz+kKNgVWYRY0zr9srBdPPFVpvOKW8VaJKUbeK+eZXyQF9ltME+Kk6affeaPgg==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.62.2.tgz",
-      "integrity": "sha512-5BqxR/pshjey51iliyzTD5Xi3EN0aLmQ2lZ3lvefVV9c82BvrLo2/6OT55iifpWBufs6kdwWbuOKS841DrmK9A==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.62.2.tgz",
-      "integrity": "sha512-uNN83XxQrRAh/w0/pmAfibcwyb6YWt4gP+dpnQKPVJshAloQ785ii8CT8ZCIxkGg9opVsvAlGhFitSm6D1Jjpg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-openbsd-x64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.62.2.tgz",
-      "integrity": "sha512-srjEIxSH3LRnJN6THczDHWQplqEMFiAJrTab0msUryh9kwNpkICf3Ea6q6MN/2cZwRFUNx5w+h6Hpi4QuHS6Zg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-openharmony-arm64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.62.2.tgz",
-      "integrity": "sha512-8hOJnxgbyObnCm5AlRA3A931xX19xq80RjVTKgJOvEKWqJruP/Uf12IbAOaDjjEXYRewwHLfmF0YRIdK3OwKWA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openharmony"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.62.2.tgz",
-      "integrity": "sha512-mmF4AY1i0hG/bLWUctUq59gtmgaSIRa3cu/A3JFRp/sCNEme2bgDEiDS22P9FbnJB8NJNF4jPJiSP5RHQpUTDg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.62.2.tgz",
-      "integrity": "sha512-DZgkknc6jhHrk46V25vbAM0zZkyP0nSDkJB8/dRkLTxv470dOmWDqGoEJl/9A0dFfS7yE3REOwNDxpHwSLSt0Q==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-x64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.62.2.tgz",
-      "integrity": "sha512-T6xr6ucWSFto+VGajA8YH26LdpHRuP4YLHEKAtCWvJDOlnmWcDZVCI2Jmjr+IFHDlt2zRaTAKE4tfjTaWLgJBg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.62.2.tgz",
-      "integrity": "sha512-BfzEnDJOt9T8M989/lA37EcJgat01wLRnoi5dQf3QzOH7jzpqTAzdDbVfRljVr5r+jzKqpbHeyOfAaXxAd0PAA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@types/estree": {
-      "version": "1.0.9",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/estree/-/estree-1.0.9.tgz",
-      "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.15",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/node": {
-      "version": "26.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/node/-/node-26.0.0.tgz",
-      "integrity": "sha512-vf2YFi1iY9lHGwNJMs01biZFbKJkrZR1T6/MlzjhJLPdntOHLhTrDSnSVcdtvjihi4VQNlrFRIxLsDBlQpAipA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~8.3.0"
-      }
-    },
-    "node_modules/@types/trusted-types": {
-      "version": "2.0.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/trusted-types/-/trusted-types-2.0.7.tgz",
-      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true
-    },
-    "node_modules/agent-base": {
-      "version": "7.1.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/agent-base/-/agent-base-7.1.4.tgz",
-      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/ajv": {
-      "name": "@redocly/ajv",
-      "version": "8.18.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/ajv/-/ajv-8.18.1.tgz",
-      "integrity": "sha512-Ifm/pP/tul1qmAecpbVxCBluVE32rKfjf8gYXH4xI2gCv9mRWFhJMHzkPDM4TXlxwPQYIFegymlsy8lXz7optA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "fast-uri": "^3.0.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-formats": {
-      "version": "3.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ajv-formats/-/ajv-formats-3.0.1.tgz",
-      "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/anynum": {
-      "version": "1.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/anynum/-/anynum-1.0.1.tgz",
-      "integrity": "sha512-N6//FLET/tXYNM/F6ABca1oH6fWB+KlTt909Le28WMDBk8oaT4vY17DCrwg2MvmuqUKt3Ni4N5dGJ/EoBgcO6A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true,
-      "license": "Python-2.0"
-    },
-    "node_modules/balanced-match": {
-      "version": "4.0.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/balanced-match/-/balanced-match-4.0.4.tgz",
-      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "18 || 20 || >=22"
-      }
-    },
-    "node_modules/better-ajv-errors": {
-      "version": "2.0.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/better-ajv-errors/-/better-ajv-errors-2.0.3.tgz",
-      "integrity": "sha512-t1vxUP+vYKsaYi/BbKo2K98nEAZmfi4sjwvmRT8aOPDzPJeAtLurfoIDazVkLILxO4K+Sw4YrLYnBQ46l6pePg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@humanwhocodes/momoa": "^2.0.4",
-        "chalk": "^4.1.2",
-        "jsonpointer": "^5.0.1",
-        "leven": "^3.1.0 < 4"
-      },
-      "engines": {
-        "node": ">= 18.20.6"
-      },
-      "peerDependencies": {
-        "ajv": "4.11.8 - 8"
-      }
-    },
-    "node_modules/brace-expansion": {
-      "version": "5.0.6",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/brace-expansion/-/brace-expansion-5.0.6.tgz",
-      "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^4.0.2"
-      },
-      "engines": {
-        "node": "18 || 20 || >=22"
-      }
-    },
-    "node_modules/call-me-maybe": {
-      "version": "1.0.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/call-me-maybe/-/call-me-maybe-1.0.2.tgz",
-      "integrity": "sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/camelize": {
-      "version": "1.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/camelize/-/camelize-1.0.1.tgz",
-      "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/classnames": {
-      "version": "2.5.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/classnames/-/classnames-2.5.1.tgz",
-      "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "node_modules/clsx": {
-      "version": "2.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/clsx/-/clsx-2.1.1.tgz",
-      "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/colorette": {
-      "version": "1.4.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/colorette/-/colorette-1.4.0.tgz",
-      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/cookie": {
-      "version": "0.7.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/cookie/-/cookie-0.7.2.tgz",
-      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/core-js": {
-      "version": "3.49.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/core-js/-/core-js-3.49.0.tgz",
-      "integrity": "sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "peer": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/css-color-keywords": {
-      "version": "1.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
-      "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/css-to-react-native": {
-      "version": "3.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/css-to-react-native/-/css-to-react-native-3.2.0.tgz",
-      "integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "camelize": "^1.0.0",
-        "css-color-keywords": "^1.0.0",
-        "postcss-value-parser": "^4.0.2"
-      }
-    },
-    "node_modules/csstype": {
-      "version": "3.2.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/csstype/-/csstype-3.2.3.tgz",
-      "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/debug": {
-      "version": "4.4.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/debug/-/debug-4.4.3.tgz",
-      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.3"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/decko": {
-      "version": "1.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/decko/-/decko-1.2.0.tgz",
-      "integrity": "sha512-m8FnyHXV1QX+S1cl+KPFDIl6NMkxtKsy6+U/aYyjrOqWMuwAwYWu7ePqrsUHtDR5Y8Yk2pi/KIDSgF+vT4cPOQ==",
-      "dev": true
-    },
-    "node_modules/dompurify": {
-      "version": "3.4.11",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/dompurify/-/dompurify-3.4.11.tgz",
-      "integrity": "sha512-zhlUV12GsaRzMsf9q5M254YhA4+VuF0fG+QFqu6aYpoGlKtz+w8//jBcGVYBgQkR5GHjUomejY84AV+/uPbWdw==",
-      "dev": true,
-      "license": "(MPL-2.0 OR Apache-2.0)",
-      "optionalDependencies": {
-        "@types/trusted-types": "^2.0.7"
-      }
-    },
-    "node_modules/dotenv": {
-      "version": "16.4.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/dotenv/-/dotenv-16.4.7.tgz",
-      "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://dotenvx.com"
-      }
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/es6-promise": {
-      "version": "3.3.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/es6-promise/-/es6-promise-3.3.1.tgz",
-      "integrity": "sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/esbuild": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/esbuild/-/esbuild-0.21.5.tgz",
-      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.21.5",
-        "@esbuild/android-arm": "0.21.5",
-        "@esbuild/android-arm64": "0.21.5",
-        "@esbuild/android-x64": "0.21.5",
-        "@esbuild/darwin-arm64": "0.21.5",
-        "@esbuild/darwin-x64": "0.21.5",
-        "@esbuild/freebsd-arm64": "0.21.5",
-        "@esbuild/freebsd-x64": "0.21.5",
-        "@esbuild/linux-arm": "0.21.5",
-        "@esbuild/linux-arm64": "0.21.5",
-        "@esbuild/linux-ia32": "0.21.5",
-        "@esbuild/linux-loong64": "0.21.5",
-        "@esbuild/linux-mips64el": "0.21.5",
-        "@esbuild/linux-ppc64": "0.21.5",
-        "@esbuild/linux-riscv64": "0.21.5",
-        "@esbuild/linux-s390x": "0.21.5",
-        "@esbuild/linux-x64": "0.21.5",
-        "@esbuild/netbsd-x64": "0.21.5",
-        "@esbuild/openbsd-x64": "0.21.5",
-        "@esbuild/sunos-x64": "0.21.5",
-        "@esbuild/win32-arm64": "0.21.5",
-        "@esbuild/win32-ia32": "0.21.5",
-        "@esbuild/win32-x64": "0.21.5"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/escalade/-/escalade-3.2.0.tgz",
-      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eventemitter3": {
-      "version": "5.0.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/eventemitter3/-/eventemitter3-5.0.4.tgz",
-      "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/fast-safe-stringify": {
-      "version": "2.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
-      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/fast-uri": {
-      "version": "3.1.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-uri/-/fast-uri-3.1.2.tgz",
-      "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fastify"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/fastify"
-        }
-      ],
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/fast-xml-builder": {
-      "version": "1.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-xml-builder/-/fast-xml-builder-1.2.0.tgz",
-      "integrity": "sha512-00aAWieqff+ZJhsXA4g1g7M8k+7AYoMUUHF+/zFb5U6Uv/P0Vl4QZo84/IcufzYalLuEj9928bXN9PbbFzMF0Q==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "path-expression-matcher": "^1.5.0",
-        "xml-naming": "^0.1.0"
-      }
-    },
-    "node_modules/fast-xml-parser": {
-      "version": "5.9.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-xml-parser/-/fast-xml-parser-5.9.3.tgz",
-      "integrity": "sha512-brCNCeScma/kqa54J4PIDriSSSLssRkuYaUCpvHJulGc3HGI/xxKUCTDcYkAdqJsyb//ydpbxecjC3hB9+tb/g==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "@nodable/entities": "^2.2.0",
-        "fast-xml-builder": "^1.2.0",
-        "is-unsafe": "^1.0.1",
-        "path-expression-matcher": "^1.5.0",
-        "strnum": "^2.4.1",
-        "xml-naming": "^0.1.0"
-      },
-      "bin": {
-        "fxparser": "src/cli/cli.js"
-      }
-    },
-    "node_modules/foreach": {
-      "version": "2.0.6",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/foreach/-/foreach-2.0.6.tgz",
-      "integrity": "sha512-k6GAGDyqLe9JaebCsFCoudPPWfihKu8pylYXRlqP1J7ms39iPoTtk2fviNglIeQEwdh0bQeKJ01ZPyuyQvKzwg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/glob": {
-      "version": "13.0.6",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/glob/-/glob-13.0.6.tgz",
-      "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "minimatch": "^10.2.2",
-        "minipass": "^7.1.3",
-        "path-scurry": "^2.0.2"
-      },
-      "engines": {
-        "node": "18 || 20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/handlebars": {
-      "version": "4.7.9",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/handlebars/-/handlebars-4.7.9.tgz",
-      "integrity": "sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minimist": "^1.2.5",
-        "neo-async": "^2.6.2",
-        "source-map": "^0.6.1",
-        "wordwrap": "^1.0.0"
-      },
-      "bin": {
-        "handlebars": "bin/handlebars"
-      },
-      "engines": {
-        "node": ">=0.4.7"
-      },
-      "optionalDependencies": {
-        "uglify-js": "^3.1.4"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/http2-client": {
-      "version": "1.3.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/http2-client/-/http2-client-1.3.5.tgz",
-      "integrity": "sha512-EC2utToWl4RKfs5zd36Mxq7nzHHBuomZboI0yYL6Y0RmBgT7Sgkq4rQ0ezFTYoIsSs7Tm9SJe+o2FcAg6GBhGA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "7.0.6",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-unsafe": {
-      "version": "1.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/is-unsafe/-/is-unsafe-1.0.1.tgz",
-      "integrity": "sha512-CLK2+VdgERgD96EYm5lUQssZYlRg2tkZnbsxZoacmSiRxiFJ4Nk4SzjCl+Ur+v3kXIY9dTIdb3IH22y1mZ56LA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/js-levenshtein": {
-      "version": "1.1.6",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
-      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/js-yaml": {
-      "version": "4.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/js-yaml/-/js-yaml-4.2.0.tgz",
-      "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/puzrin"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/nodeca"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/json-pointer": {
-      "version": "0.6.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/json-pointer/-/json-pointer-0.6.2.tgz",
-      "integrity": "sha512-vLWcKbOaXlO+jvRy4qNd+TI1QUPZzfJj1tpJ3vAXDych5XJf93ftpUKe5pKCrzyIIwgBJcOcCVRUfqQP25afBw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "foreach": "^2.0.4"
-      }
-    },
-    "node_modules/json-schema-to-ts": {
-      "version": "2.7.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/json-schema-to-ts/-/json-schema-to-ts-2.7.2.tgz",
-      "integrity": "sha512-R1JfqKqbBR4qE8UyBR56Ms30LL62/nlhoz+1UkfI/VE7p54Awu919FZ6ZUPG8zIa3XB65usPJgr1ONVncUGSaQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.18.3",
-        "@types/json-schema": "^7.0.9",
-        "ts-algebra": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jsonpath-rfc9535": {
-      "version": "1.3.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/jsonpath-rfc9535/-/jsonpath-rfc9535-1.3.0.tgz",
-      "integrity": "sha512-3jFHya7oZ45aDxIIdx+/zQARahHXxFSMWBkcBUldfXpLS9VCXDJyTKt35kQfEXLqh0K3Ixw/9xFnvcDStaxh7Q==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=20"
-      }
-    },
-    "node_modules/jsonpointer": {
-      "version": "5.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/jsonpointer/-/jsonpointer-5.0.1.tgz",
-      "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/leven": {
-      "version": "3.1.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/long": {
-      "version": "5.3.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/long/-/long-5.3.2.tgz",
-      "integrity": "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "11.5.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/lru-cache/-/lru-cache-11.5.1.tgz",
-      "integrity": "sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "engines": {
-        "node": "20 || >=22"
-      }
-    },
-    "node_modules/lunr": {
-      "version": "2.3.9",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/lunr/-/lunr-2.3.9.tgz",
-      "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/mark.js": {
-      "version": "8.11.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/mark.js/-/mark.js-8.11.1.tgz",
-      "integrity": "sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/marked": {
-      "version": "4.3.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/marked/-/marked-4.3.0.tgz",
-      "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "marked": "bin/marked.js"
-      },
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "10.2.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/minimatch/-/minimatch-10.2.5.tgz",
-      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "brace-expansion": "^5.0.5"
-      },
-      "engines": {
-        "node": "18 || 20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/minipass": {
-      "version": "7.1.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/minipass/-/minipass-7.1.3.tgz",
-      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
-    "node_modules/mobx": {
-      "version": "6.16.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/mobx/-/mobx-6.16.1.tgz",
-      "integrity": "sha512-syNcDdX3KT+Jq3je6eGjBhuc24Z68td2VG0zNFqRswaE433D9SNH5VRy/xrGbJsUixfppLLccXhAW9JSf6n+SQ==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mobx"
-      }
-    },
-    "node_modules/mobx-react": {
-      "version": "9.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/mobx-react/-/mobx-react-9.2.0.tgz",
-      "integrity": "sha512-dkGWCx+S0/1mfiuFfHRH8D9cplmwhxOV5CkXMp38u6rQGG2Pv3FWYztS0M7ncR6TyPRQKaTG/pnitInoYE9Vrw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mobx-react-lite": "^4.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mobx"
-      },
-      "peerDependencies": {
-        "mobx": "^6.9.0",
-        "react": "^16.8.0 || ^17 || ^18 || ^19"
-      },
-      "peerDependenciesMeta": {
-        "react-dom": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/mobx-react-lite": {
-      "version": "4.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/mobx-react-lite/-/mobx-react-lite-4.1.1.tgz",
-      "integrity": "sha512-iUxiMpsvNraCKXU+yPotsOncNNmyeS2B5DKL+TL6Tar/xm+wwNJAubJmtRSeAoYawdZqwv8Z/+5nPRHeQxTiXg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "use-sync-external-store": "^1.4.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mobx"
-      },
-      "peerDependencies": {
-        "mobx": "^6.9.0",
-        "react": "^16.8.0 || ^17 || ^18 || ^19"
-      },
-      "peerDependenciesMeta": {
-        "react-dom": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.15",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/nanoid/-/nanoid-3.3.15.tgz",
-      "integrity": "sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/node-fetch": {
-      "version": "2.7.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/node-fetch/-/node-fetch-2.7.0.tgz",
-      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/node-fetch-h2": {
-      "version": "2.3.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/node-fetch-h2/-/node-fetch-h2-2.3.0.tgz",
-      "integrity": "sha512-ofRW94Ab0T4AOh5Fk8t0h8OBWrmjb0SSB20xh1H8YnPV9EJ+f5AMoYSUQ2zgJ4Iq2HAK0I2l5/Nequ8YzFS3Hg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "http2-client": "^1.2.5"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      }
-    },
-    "node_modules/node-readfiles": {
-      "version": "0.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/node-readfiles/-/node-readfiles-0.2.0.tgz",
-      "integrity": "sha512-SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "es6-promise": "^3.2.1"
-      }
-    },
-    "node_modules/oas-kit-common": {
-      "version": "1.0.8",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/oas-kit-common/-/oas-kit-common-1.0.8.tgz",
-      "integrity": "sha512-pJTS2+T0oGIwgjGpw7sIRU8RQMcUoKCDWFLdBqKB2BNmGpbBMH2sdqAaOXUg8OzonZHU0L7vfJu1mJFEiYDWOQ==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "fast-safe-stringify": "^2.0.7"
-      }
-    },
-    "node_modules/oas-linter": {
-      "version": "3.2.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/oas-linter/-/oas-linter-3.2.2.tgz",
-      "integrity": "sha512-KEGjPDVoU5K6swgo9hJVA/qYGlwfbFx+Kg2QB/kd7rzV5N8N5Mg6PlsoCMohVnQmo+pzJap/F610qTodKzecGQ==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@exodus/schemasafe": "^1.0.0-rc.2",
-        "should": "^13.2.1",
-        "yaml": "^1.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
-      }
-    },
-    "node_modules/oas-resolver": {
-      "version": "2.5.6",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/oas-resolver/-/oas-resolver-2.5.6.tgz",
-      "integrity": "sha512-Yx5PWQNZomfEhPPOphFbZKi9W93CocQj18NlD2Pa4GWZzdZpSJvYwoiuurRI7m3SpcChrnO08hkuQDL3FGsVFQ==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "node-fetch-h2": "^2.3.0",
-        "oas-kit-common": "^1.0.8",
-        "reftools": "^1.1.9",
-        "yaml": "^1.10.0",
-        "yargs": "^17.0.1"
-      },
-      "bin": {
-        "resolve": "resolve.js"
-      },
-      "funding": {
-        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
-      }
-    },
-    "node_modules/oas-schema-walker": {
-      "version": "1.1.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/oas-schema-walker/-/oas-schema-walker-1.1.5.tgz",
-      "integrity": "sha512-2yucenq1a9YPmeNExoUa9Qwrt9RFkjqaMAA1X+U7sbb0AqBeTIdMHky9SQQ6iN94bO5NW0W4TRYXerG+BdAvAQ==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "funding": {
-        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
-      }
-    },
-    "node_modules/oas-validator": {
-      "version": "5.0.8",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/oas-validator/-/oas-validator-5.0.8.tgz",
-      "integrity": "sha512-cu20/HE5N5HKqVygs3dt94eYJfBi0TsZvPVXDhbXQHiEityDN+RROTleefoKRKKJ9dFAF2JBkDHgvWj0sjKGmw==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "call-me-maybe": "^1.0.1",
-        "oas-kit-common": "^1.0.8",
-        "oas-linter": "^3.2.2",
-        "oas-resolver": "^2.5.6",
-        "oas-schema-walker": "^1.1.5",
-        "reftools": "^1.1.9",
-        "should": "^13.2.1",
-        "yaml": "^1.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
-      }
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/openapi-sampler": {
-      "version": "1.7.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/openapi-sampler/-/openapi-sampler-1.7.4.tgz",
-      "integrity": "sha512-CKS/rd5ucPCuEDbJnjGDXZTsuGWcmv53aCmQx7soZlPEONUGN4af0/dY5+THRFZraSEjeA78nlfzdFswC/N5SA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/json-schema": "^7.0.7",
-        "fast-xml-parser": "^5.5.1",
-        "json-pointer": "0.6.2"
-      }
-    },
-    "node_modules/outdent": {
-      "version": "0.8.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/outdent/-/outdent-0.8.0.tgz",
-      "integrity": "sha512-KiOAIsdpUTcAXuykya5fnVVT+/5uS0Q1mrkRHcF89tpieSmY33O/tmc54CqwA+bfhbtEfZUNLHaPUiB9X3jt1A==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/path-browserify": {
-      "version": "1.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/path-browserify/-/path-browserify-1.0.1.tgz",
-      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/path-expression-matcher": {
-      "version": "1.6.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/path-expression-matcher/-/path-expression-matcher-1.6.1.tgz",
-      "integrity": "sha512-h7bxdzhHk8Knyc4Tj+jMaa7fEEoUJy7p1qtbVgkYg1Uhpe5Np5VuGXCRZnkZvU+Q42M1vStt0ifa3ueykRJPmQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/path-scurry": {
-      "version": "2.0.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/path-scurry/-/path-scurry-2.0.2.tgz",
-      "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "lru-cache": "^11.0.0",
-        "minipass": "^7.1.2"
-      },
-      "engines": {
-        "node": "18 || 20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/perfect-scrollbar": {
-      "version": "1.5.6",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/perfect-scrollbar/-/perfect-scrollbar-1.5.6.tgz",
-      "integrity": "sha512-rixgxw3SxyJbCaSpo1n35A/fwI1r2rdwMKOTCg/AcG+xOEyZcE8UHVjpZMFCVImzsFoCZeJTT+M/rdEIQYO2nw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/picocolors": {
-      "version": "1.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/picomatch": {
-      "version": "4.0.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/picomatch/-/picomatch-4.0.4.tgz",
-      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pluralize": {
-      "version": "8.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/pluralize/-/pluralize-8.0.0.tgz",
-      "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/polished": {
-      "version": "4.3.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/polished/-/polished-4.3.1.tgz",
-      "integrity": "sha512-OBatVyC/N7SCW/FaDHrSd+vn0o5cS855TOmYi4OkdWUMSJCET/xip//ch8xGUvtr3i44X9LVyWwQlRMTN3pwSA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.17.8"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/postcss": {
-      "version": "8.5.15",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/postcss/-/postcss-8.5.15.tgz",
-      "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "nanoid": "^3.3.12",
-        "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/prismjs": {
-      "version": "1.30.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/prismjs/-/prismjs-1.30.0.tgz",
-      "integrity": "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "node_modules/protobufjs": {
-      "version": "7.6.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/protobufjs/-/protobufjs-7.6.4.tgz",
-      "integrity": "sha512-RJJPTTpvFfHcWLkIa2JFWK4XvtSzS0yEWDmunqHXli1h3JlkbcQZXDZdcWxv+JK3Xsl5/UFDPZ0iGm7DAengYw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@protobufjs/aspromise": "^1.1.2",
-        "@protobufjs/base64": "^1.1.2",
-        "@protobufjs/codegen": "^2.0.5",
-        "@protobufjs/eventemitter": "^1.1.1",
-        "@protobufjs/fetch": "^1.1.1",
-        "@protobufjs/float": "^1.0.2",
-        "@protobufjs/path": "^1.1.2",
-        "@protobufjs/pool": "^1.1.0",
-        "@protobufjs/utf8": "^1.1.1",
-        "@types/node": ">=13.7.0",
-        "long": "^5.3.2"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/react": {
-      "version": "19.2.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/react/-/react-19.2.7.tgz",
-      "integrity": "sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-dom": {
-      "version": "19.2.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/react-dom/-/react-dom-19.2.7.tgz",
-      "integrity": "sha512-t0BRVXvbiE/o20Hfw669rLbMCDWtYZLvmJigy2f0MxsXF+71pxhR3xOkspmsO8h3ZlNzyibAmtCa3l4lYKk6gQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "scheduler": "^0.27.0"
-      },
-      "peerDependencies": {
-        "react": "^19.2.7"
-      }
-    },
-    "node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/react-tabs": {
-      "version": "6.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/react-tabs/-/react-tabs-6.1.1.tgz",
-      "integrity": "sha512-CPiuKoMFf89B7QlbFfdBD9XmUWiE3qudQputMVZB8GQvPJZRX/gqjDaDWOPDwGinEfpJKEuBCkGt83Tt4efeyA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "clsx": "^2.0.0",
-        "prop-types": "^15.5.0"
-      },
-      "peerDependencies": {
-        "react": "^18.0.0 || ^19.0.0"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/redoc": {
-      "version": "2.5.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/redoc/-/redoc-2.5.1.tgz",
-      "integrity": "sha512-LmqA+4A3CmhTllGG197F0arUpmChukAj9klfSdxNRemT9Hr07xXr7OGKu4PHzBs359sgrJ+4JwmOlM7nxLPGMg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@redocly/openapi-core": "^1.4.0",
-        "classnames": "^2.3.2",
-        "decko": "^1.2.0",
-        "dompurify": "^3.2.4",
-        "eventemitter3": "^5.0.1",
-        "json-pointer": "^0.6.2",
-        "lunr": "^2.3.9",
-        "mark.js": "^8.11.1",
-        "marked": "^4.3.0",
-        "mobx-react": "9.2.0",
-        "openapi-sampler": "^1.5.0",
-        "path-browserify": "^1.0.1",
-        "perfect-scrollbar": "^1.5.5",
-        "polished": "^4.2.2",
-        "prismjs": "^1.29.0",
-        "prop-types": "^15.8.1",
-        "react-tabs": "^6.0.2",
-        "slugify": "~1.4.7",
-        "stickyfill": "^1.1.1",
-        "swagger2openapi": "^7.0.8",
-        "url-template": "^2.0.8"
-      },
-      "engines": {
-        "node": ">=6.9",
-        "npm": ">=3.0.0"
-      },
-      "peerDependencies": {
-        "core-js": "^3.1.4",
-        "mobx": "^6.0.4",
-        "react": "^16.8.4 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "react-dom": "^16.8.4 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "styled-components": "^4.1.1 || ^5.1.1 || ^6.0.5"
-      }
-    },
-    "node_modules/redoc/node_modules/@redocly/ajv": {
-      "version": "8.11.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/ajv/-/ajv-8.11.2.tgz",
-      "integrity": "sha512-io1JpnwtIcvojV7QKDUSIuMN/ikdOUd1ReEnUnMKGfDVridQZ31J0MmIuqwuRjWDZfmvr+Q0MqCcfHM2gTivOg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js-replace": "^1.0.1"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/redoc/node_modules/@redocly/config": {
-      "version": "0.22.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/config/-/config-0.22.0.tgz",
-      "integrity": "sha512-gAy93Ddo01Z3bHuVdPWfCwzgfaYgMdaZPcfL7JZ7hWJoK9V0lXDbigTWkhiPFAaLWzbOJ+kbUQG1+XwIm0KRGQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/redoc/node_modules/@redocly/openapi-core": {
-      "version": "1.34.15",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/openapi-core/-/openapi-core-1.34.15.tgz",
-      "integrity": "sha512-HAwCnNyKcs5XGQqms+9t7OdAPM/5TDstmhF+0i7tdCFato2QKuYIlyWETwkXd8c5zbltr1oB+6y9NTeQLr2d6Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@redocly/ajv": "8.11.2",
-        "@redocly/config": "0.22.0",
-        "colorette": "1.4.0",
-        "https-proxy-agent": "7.0.6",
-        "js-levenshtein": "1.1.6",
-        "js-yaml": "4.1.1",
-        "minimatch": "5.1.9",
-        "pluralize": "8.0.0",
-        "yaml-ast-parser": "0.0.43"
-      },
-      "engines": {
-        "node": ">=18.17.0",
-        "npm": ">=9.5.0"
-      }
-    },
-    "node_modules/redoc/node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/redoc/node_modules/brace-expansion": {
-      "version": "2.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/brace-expansion/-/brace-expansion-2.1.1.tgz",
-      "integrity": "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/redoc/node_modules/js-yaml": {
-      "version": "4.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/js-yaml/-/js-yaml-4.1.1.tgz",
-      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/redoc/node_modules/minimatch": {
-      "version": "5.1.9",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/minimatch/-/minimatch-5.1.9.tgz",
-      "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/reftools": {
-      "version": "1.1.9",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/reftools/-/reftools-1.1.9.tgz",
-      "integrity": "sha512-OVede/NQE13xBQ+ob5CKd5KyeJYU2YInb1bmV4nRoOfquZPkAkxuOXicSe1PvqIuZZ4kD13sPKBbR7UFDmli6w==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "funding": {
-        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rollup": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/rollup/-/rollup-4.62.2.tgz",
-      "integrity": "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "1.0.9"
-      },
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=18.0.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.62.2",
-        "@rollup/rollup-android-arm64": "4.62.2",
-        "@rollup/rollup-darwin-arm64": "4.62.2",
-        "@rollup/rollup-darwin-x64": "4.62.2",
-        "@rollup/rollup-freebsd-arm64": "4.62.2",
-        "@rollup/rollup-freebsd-x64": "4.62.2",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.62.2",
-        "@rollup/rollup-linux-arm-musleabihf": "4.62.2",
-        "@rollup/rollup-linux-arm64-gnu": "4.62.2",
-        "@rollup/rollup-linux-arm64-musl": "4.62.2",
-        "@rollup/rollup-linux-loong64-gnu": "4.62.2",
-        "@rollup/rollup-linux-loong64-musl": "4.62.2",
-        "@rollup/rollup-linux-ppc64-gnu": "4.62.2",
-        "@rollup/rollup-linux-ppc64-musl": "4.62.2",
-        "@rollup/rollup-linux-riscv64-gnu": "4.62.2",
-        "@rollup/rollup-linux-riscv64-musl": "4.62.2",
-        "@rollup/rollup-linux-s390x-gnu": "4.62.2",
-        "@rollup/rollup-linux-x64-gnu": "4.62.2",
-        "@rollup/rollup-linux-x64-musl": "4.62.2",
-        "@rollup/rollup-openbsd-x64": "4.62.2",
-        "@rollup/rollup-openharmony-arm64": "4.62.2",
-        "@rollup/rollup-win32-arm64-msvc": "4.62.2",
-        "@rollup/rollup-win32-ia32-msvc": "4.62.2",
-        "@rollup/rollup-win32-x64-gnu": "4.62.2",
-        "@rollup/rollup-win32-x64-msvc": "4.62.2",
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/scheduler": {
-      "version": "0.27.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/scheduler/-/scheduler-0.27.0.tgz",
-      "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/semver": {
-      "version": "7.8.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/semver/-/semver-7.8.5.tgz",
-      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/set-cookie-parser": {
-      "version": "2.7.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz",
-      "integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/should": {
-      "version": "13.2.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/should/-/should-13.2.3.tgz",
-      "integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "should-equal": "^2.0.0",
-        "should-format": "^3.0.3",
-        "should-type": "^1.4.0",
-        "should-type-adaptors": "^1.0.1",
-        "should-util": "^1.0.0"
-      }
-    },
-    "node_modules/should-equal": {
-      "version": "2.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/should-equal/-/should-equal-2.0.0.tgz",
-      "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "should-type": "^1.4.0"
-      }
-    },
-    "node_modules/should-format": {
-      "version": "3.0.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/should-format/-/should-format-3.0.3.tgz",
-      "integrity": "sha512-hZ58adtulAk0gKtua7QxevgUaXTTXxIi8t41L3zo9AHvjXO1/7sdLECuHeIN2SRtYXpNkmhoUP2pdeWgricQ+Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "should-type": "^1.3.0",
-        "should-type-adaptors": "^1.0.1"
-      }
-    },
-    "node_modules/should-type": {
-      "version": "1.4.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/should-type/-/should-type-1.4.0.tgz",
-      "integrity": "sha512-MdAsTu3n25yDbIe1NeN69G4n6mUnJGtSJHygX3+oN0ZbO3DTiATnf7XnYJdGT42JCXurTb1JI0qOBR65shvhPQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/should-type-adaptors": {
-      "version": "1.1.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz",
-      "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "should-type": "^1.3.0",
-        "should-util": "^1.0.0"
-      }
-    },
-    "node_modules/should-util": {
-      "version": "1.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/should-util/-/should-util-1.0.1.tgz",
-      "integrity": "sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/simple-websocket": {
-      "version": "9.1.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/simple-websocket/-/simple-websocket-9.1.0.tgz",
-      "integrity": "sha512-8MJPnjRN6A8UCp1I+H/dSFyjwJhp6wta4hsVRhjf8w9qBHRzxYt14RaOcjvQnhD1N4yKOddEjflwMnQM4VtXjQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^4.3.1",
-        "queue-microtask": "^1.2.2",
-        "randombytes": "^2.1.0",
-        "readable-stream": "^3.6.0",
-        "ws": "^7.4.2"
-      }
-    },
-    "node_modules/slugify": {
-      "version": "1.4.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/slugify/-/slugify-1.4.7.tgz",
-      "integrity": "sha512-tf+h5W1IrjNm/9rKKj0JU2MDMruiopx0jjVA5zCdBtcGjfp0+c5rHw/zADLC3IeKlGHtVbHtpfzvYA0OYT+HKg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.2.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/stickyfill": {
-      "version": "1.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/stickyfill/-/stickyfill-1.1.1.tgz",
-      "integrity": "sha512-GCp7vHAfpao+Qh/3Flh9DXEJ/qSi0KJwJw6zYlZOtRYXWUIpMM6mC2rIep/dK8RQqwW0KxGJIllmjPIBOGN8AA==",
-      "dev": true
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strnum": {
-      "version": "2.4.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/strnum/-/strnum-2.4.1.tgz",
-      "integrity": "sha512-M9eUSMT2dCB2cTNPG7UYj6KuK7RJR2SN2+yCV/fTW3xzTCS6EaGZ5pSMgDIjB7r8zSfTGk+dvvn9rTjpVS9Mwg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "anynum": "^1.0.1"
-      }
-    },
-    "node_modules/styled-components": {
-      "version": "6.4.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/styled-components/-/styled-components-6.4.1.tgz",
-      "integrity": "sha512-ADu2dF53esUzzM4I0ewxhxFtsDd6v4V6dNkg3vG0iFKhnt06sJneTZnRvujAosZwW0XD58IKgGMQoqri4wHRqg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@emotion/is-prop-valid": "1.4.0",
-        "css-to-react-native": "3.2.0",
-        "csstype": "3.2.3",
-        "stylis": "4.3.6"
-      },
-      "engines": {
-        "node": ">= 16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/styled-components"
-      },
-      "peerDependencies": {
-        "css-to-react-native": ">= 3.2.0",
-        "react": ">= 16.8.0",
-        "react-dom": ">= 16.8.0",
-        "react-native": ">= 0.68.0"
-      },
-      "peerDependenciesMeta": {
-        "css-to-react-native": {
-          "optional": true
-        },
-        "react-dom": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/stylis": {
-      "version": "4.3.6",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/stylis/-/stylis-4.3.6.tgz",
-      "integrity": "sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/swagger2openapi": {
-      "version": "7.0.8",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/swagger2openapi/-/swagger2openapi-7.0.8.tgz",
-      "integrity": "sha512-upi/0ZGkYgEcLeGieoz8gT74oWHA0E7JivX7aN9mAf+Tc7BQoRBvnIGHoPDw+f9TXTW4s6kGYCZJtauP6OYp7g==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "call-me-maybe": "^1.0.1",
-        "node-fetch": "^2.6.1",
-        "node-fetch-h2": "^2.3.0",
-        "node-readfiles": "^0.2.0",
-        "oas-kit-common": "^1.0.8",
-        "oas-resolver": "^2.5.6",
-        "oas-schema-walker": "^1.1.5",
-        "oas-validator": "^5.0.8",
-        "reftools": "^1.1.9",
-        "yaml": "^1.10.0",
-        "yargs": "^17.0.1"
-      },
-      "bin": {
-        "boast": "boast.js",
-        "oas-validate": "oas-validate.js",
-        "swagger2openapi": "swagger2openapi.js"
-      },
-      "funding": {
-        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/ts-algebra": {
-      "version": "1.2.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ts-algebra/-/ts-algebra-1.2.2.tgz",
-      "integrity": "sha512-kloPhf1hq3JbCPOTYoOWDKxebWjNb2o/LKnNfkWhxVVisFFmMJPPdJeGoGmM+iRLyoXAR61e08Pb+vUXINg8aA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/typescript": {
-      "version": "5.9.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
-    "node_modules/uglify-js": {
-      "version": "3.19.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/uglify-js/-/uglify-js-3.19.3.tgz",
-      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "optional": true,
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/ulid": {
-      "version": "3.0.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ulid/-/ulid-3.0.2.tgz",
-      "integrity": "sha512-yu26mwteFYzBAot7KVMqFGCVpsF6g8wXfJzQUHvu1no3+rRRSFcSV2nKeYvNPLD2J4b08jYBDhHUjeH0ygIl9w==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "ulid": "dist/cli.js"
-      }
-    },
-    "node_modules/undici": {
-      "version": "6.24.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/undici/-/undici-6.24.0.tgz",
-      "integrity": "sha512-lVLNosgqo5EkGqh5XUDhGfsMSoO8K0BAN0TyJLvwNRSl4xWGZlCVYsAIpa/OpA3TvmnM01GWcoKmc3ZWo5wKKA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18.17"
-      }
-    },
-    "node_modules/undici-types": {
-      "version": "8.3.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/undici-types/-/undici-types-8.3.0.tgz",
-      "integrity": "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/uri-js-replace": {
-      "version": "1.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/uri-js-replace/-/uri-js-replace-1.0.1.tgz",
-      "integrity": "sha512-W+C9NWNLFOoBI2QWDp4UT9pv65r2w5Cx+3sTYFvtMdDBxkKt1syCqsUdSFAChbEe1uK5TfS04wt/nGwmaeIQ0g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/url-template": {
-      "version": "2.0.8",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/url-template/-/url-template-2.0.8.tgz",
-      "integrity": "sha512-XdVKMF4SJ0nP/O7XIPB0JwAEuT9lDIYnNsK8yGVe43y0AWoKeJNdv3ZNWh7ksJ6KqQFjOO6ox/VEitLnaVNufw==",
-      "dev": true,
-      "license": "BSD"
-    },
-    "node_modules/use-sync-external-store": {
-      "version": "1.6.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
-      "integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/vite": {
-      "version": "5.4.21",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/vite/-/vite-5.4.21.tgz",
-      "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "esbuild": "^0.21.3",
-        "postcss": "^8.4.43",
-        "rollup": "^4.20.0"
-      },
-      "bin": {
-        "vite": "bin/vite.js"
-      },
-      "engines": {
-        "node": "^18.0.0 || >=20.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/vitejs/vite?sponsor=1"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
-      },
-      "peerDependencies": {
-        "@types/node": "^18.0.0 || >=20.0.0",
-        "less": "*",
-        "lightningcss": "^1.21.0",
-        "sass": "*",
-        "sass-embedded": "*",
-        "stylus": "*",
-        "sugarss": "*",
-        "terser": "^5.4.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "less": {
-          "optional": true
-        },
-        "lightningcss": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "sass-embedded": {
-          "optional": true
-        },
-        "stylus": {
-          "optional": true
-        },
-        "sugarss": {
-          "optional": true
-        },
-        "terser": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "dev": true,
-      "license": "BSD-2-Clause"
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
-    "node_modules/wordwrap": {
-      "version": "1.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/ws": {
-      "version": "7.5.11",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ws/-/ws-7.5.11.tgz",
-      "integrity": "sha512-zS54Oen9bITtp7kp2XM3AydrCIq1D+HwJOuH+c+e4LfpL/lotP5osijd+UoMnxwAam1GN8R4KtLAyIrIcBNpiA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/xml-naming": {
-      "version": "0.1.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/xml-naming/-/xml-naming-0.1.0.tgz",
-      "integrity": "sha512-k8KO9hrMyNk6tUWqUfkTEZbezRRpONVOzUTnc97VnCvyj6Tf9lyUR9EDAIeiVLv56jsMcoXEwjW8Kv5yPY52lw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=16.0.0"
-      }
-    },
-    "node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yaml": {
-      "version": "1.10.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/yaml/-/yaml-1.10.3.tgz",
-      "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/yaml-ast-parser": {
-      "version": "0.0.43",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz",
-      "integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
-    "node_modules/yargs": {
-      "version": "17.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/yargs/-/yargs-17.0.1.tgz",
-      "integrity": "sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=10"
-      }
-    }
-  }
-}
diff --git a/tests/e2e/generate-client/examples/service-class/redocly.yaml b/tests/e2e/generate-client/examples/service-class/redocly.yaml
deleted file mode 100644
index 92dd612e64..0000000000
--- a/tests/e2e/generate-client/examples/service-class/redocly.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-# redocly.yaml — drives `redocly generate-client` for this example.
-# The client is generated for the api that declares a `client` block
-# (run `redocly generate-client` with no args to build every such api).
-apis:
-  service-class:
-    root: ./openapi.yaml
-    clientOutput: ./src/api/client.ts
-    client:
-      generators:
-        - sdk
-      facade: service-class
diff --git a/tests/e2e/generate-client/examples/service-class/src/api/client.ts b/tests/e2e/generate-client/examples/service-class/src/api/client.ts
deleted file mode 100644
index 2948988c6e..0000000000
--- a/tests/e2e/generate-client/examples/service-class/src/api/client.ts
+++ /dev/null
@@ -1,1533 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Redocly Cafe (v1.0.0)
- * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
- * Create API credentials and try it yourself in a realistic OpenAPI workflow.
- * 
- */
-
-export type Page = {
-    /**
-     * Use with the `after` query parameter to load the next page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    endCursor: string | null;
-    /**
-     * Use with the `before` query parameter to load the previous page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    startCursor: string | null;
-    /**
-     * Indicates if there is a next page with items.
-     */
-    hasNextPage: boolean;
-    /**
-     * Indicates if there is a previous page with items.
-     */
-    hasPrevPage: boolean;
-    /**
-     * Value showing how many items are in the page limit.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit: number;
-    /**
-     * Count of items across all pages.
-     * @minimum 0
-     */
-    total: number;
-};
-
-export type MenuBaseItem = {
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt: string;
-    /**
-     * Menu item ID. Unique identifier prefixed with `prd_`.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    readonly id: string;
-    /**
-     * Entity name.
-     */
-    readonly object: "menuItem";
-    /**
-     * Menu item name.
-     * @minLength 1
-     * @maxLength 50
-     */
-    name: string;
-    /**
-     * Price in cents.
-     * @minimum 0
-     */
-    price: number;
-    /**
-     * Photo of the menu item. Must be a PNG image and less than 1MB.
-     * @format binary
-     */
-    photo?: Blob | null;
-    /**
-     * Photo URL of the menu item.
-     * @format uri
-     */
-    readonly photoUrl?: string;
-    photoTextDescription?: string | null;
-};
-
-export type Beverage = {
-    /**
-     * Menu item category.
-     */
-    category: "beverage";
-    /**
-     * Size of the beverage in milliliters.
-     * @exclusiveMinimum 0
-     */
-    volume: number;
-    /**
-     * Indicates if the beverage contains caffeine.
-     */
-    containsCaffeine: boolean;
-} & MenuBaseItem;
-
-export type Dessert = {
-    /**
-     * Menu item category.
-     */
-    category: "dessert";
-    /**
-     * Amount of calories.
-     * @exclusiveMinimum 0
-     */
-    calories: number;
-} & MenuBaseItem;
-
-export type MenuItem = Beverage | Dessert;
-
-export type MenuItemList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: MenuItem[];
-};
-
-export type Error = {
-    /**
-     * URI reference that identifies the problem type.
-     * @format uri-reference
-     */
-    type: string;
-    /**
-     * Short summary of the problem type.
-     */
-    title: string;
-    /**
-     * HTTP status code generated by the origin server for this occurrence of the problem.
-     * @minimum 100
-     * @exclusiveMaximum 600
-     * @format int32
-     */
-    status: number;
-    /**
-     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-     * May be used to locate the root of this problem in the source code.
-     * @format uri-reference
-     */
-    instance?: string;
-    /**
-     * Additional error details.
-     */
-    details?: Record<string, unknown>;
-};
-
-/**
- * Order status.
- */
-export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
-
-export const OrderStatus = {
-    placed: "placed",
-    preparing: "preparing",
-    completed: "completed",
-    canceled: "canceled"
-} as const;
-
-export type Order = {
-    /**
-     * Order ID. Unique identifier prefixed with `ord_`.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     * @format ulid
-     */
-    readonly id?: string;
-    /**
-     * Entity name.
-     */
-    readonly object?: "order";
-    /**
-     * Name of the customer who placed the order.
-     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-     * @minLength 1
-     * @maxLength 100
-     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-     */
-    customerName: string;
-    readonly status?: OrderStatus;
-    /**
-     * Total order price in cents.
-     * @minimum 0
-     */
-    readonly totalPrice?: number;
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt?: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt?: string;
-    /**
-     * List of items to include in the order.
-     * @minItems 1
-     */
-    orderItems: {
-        /**
-         * ID of the menu item to add to the order.
-         * @format ulid
-         */
-        menuItemId: string;
-        /**
-         * Quantity of the menu item.
-         * @minimum 1
-         */
-        quantity: number;
-        /**
-         * Discount amount in cents (absolute value).
-         * @minimum 0
-         */
-        discount?: number;
-        /**
-         * Optional comment for the order item (e.g., "No sugar").
-         * @maxLength 500
-         */
-        comment?: string;
-    }[];
-};
-
-export type OrderList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: Order[];
-};
-
-export type OrderItem = {
-    /**
-     * ID of the menu item to add to the order.
-     */
-    menuItemId: string;
-    /**
-     * Menu item that is part of the order.
-     */
-    readonly menuItem?: MenuItem;
-    /**
-     * Quantity of the menu item.
-     * @minimum 1
-     */
-    quantity: number;
-    /**
-     * Discount amount in cents (absolute value).
-     * @minimum 0
-     */
-    discount?: number;
-    /**
-     * Optional comment for the order item (e.g., "No sugar").
-     * @maxLength 500
-     */
-    comment?: string;
-};
-
-/**
- * Revenue statistics for a given date range.
- */
-export type RevenueStatistics = {
-    /**
-     * Total revenue in cents from completed orders.
-     * @minimum 0
-     * @format float
-     */
-    revenue: number;
-    /**
-     * Average order amount in cents (calculated from completed orders only).
-     * @minimum 0
-     * @format float
-     */
-    averageOrderAmount: number;
-    /**
-     * Total number of orders (all statuses) in the date range.
-     * @minimum 0
-     */
-    totalOrders: number;
-    /**
-     * Number of placed orders.
-     * @minimum 0
-     */
-    placedOrders: number;
-    /**
-     * Number of preparing orders.
-     * @minimum 0
-     */
-    preparingOrders: number;
-    /**
-     * Number of completed orders.
-     * @minimum 0
-     */
-    completedOrders: number;
-    /**
-     * Number of canceled orders.
-     * @minimum 0
-     */
-    canceledOrders: number;
-    /**
-     * Start date of the revenue calculation period.
-     * @format date
-     */
-    startDate: string;
-    /**
-     * End date of the revenue calculation period.
-     * @format date
-     */
-    endDate: string;
-};
-
-export type RegisterClientObject = {
-    /**
-     * Client name.
-     */
-    name: string;
-    /**
-     * List of redirect URIs (optional, defaults to empty array).
-     */
-    redirectUris?: string[];
-    /**
-     * List of scopes.
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types.
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-/**
- * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
- */
-export type OAuth2Client = {
-    /**
-     * Client identifier issued by the authorization server.
-     */
-    clientId: string;
-    /**
-     * Client secret issued by the authorization server.
-     */
-    clientSecret: string;
-    /**
-     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-     * @format int64
-     */
-    clientIdIssuedAt: number;
-    /**
-     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-     * @format int64
-     */
-    clientSecretExpiresAt: number;
-    /**
-     * Client name (registered metadata).
-     */
-    name?: string;
-    /**
-     * List of redirect URIs (registered metadata).
-     */
-    redirectUris?: string[];
-    /**
-     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
-     * @format uri
-     */
-    registrationClientUri: string;
-    /**
-     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-     */
-    registrationAccessToken: string;
-    /**
-     * List of scopes (registered metadata).
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types (registered metadata).
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-export type OrderNotification = {
-    /**
-     * Unique order identifier.
-     */
-    orderId: string;
-    orderStatus: OrderStatus;
-    /**
-     * When the event occurred.
-     * @format date-time
-     */
-    timestamp: string;
-};
-
-/**
- * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
- */
-export function isBeverage(value: MenuItem): value is Beverage {
-    return (value as Record<string, unknown>)["category"] === "beverage";
-}
-
-/**
- * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
- */
-export function isDessert(value: MenuItem): value is Dessert {
-    return (value as Record<string, unknown>)["category"] === "dessert";
-}
-
-/**
- * Static metadata for every operation, keyed by operationId: the HTTP `method`
- * and the `path` template (with `{param}` placeholders intact). Minification-safe
- * — useful for building cache/query keys, tracing span names, and request logging
- * without re-deriving them at each call site.
- */
-export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
-    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
-    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
-    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
-    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
-    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
-    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
-} as const;
-
-/**
- * The operationId of any operation in this client.
- */
-export type OperationId = keyof typeof OPERATIONS;
-
-/**
- * Static metadata describing one operation: its HTTP method, path template, and tags.
- */
-export type OperationMetadata = {
-    readonly method: string;
-    readonly path: string;
-    readonly tags: readonly string[];
-};
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
-
-let BASE = "https://api.cafe.redocly.com";
-
-/** Identity of the operation a request belongs to. Stable across path interpolation. */
-export type OperationContext = {
-    id: OperationId;
-    path: OperationPath;
-    tags: OperationTag[];
-};
-
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
-export type RequestContext = {
-    url: string;
-    method: string;
-    headers: Record<string, string>;
-    body?: unknown;
-    /** The operation being called: its id (operationId), path template, and tags. */
-    operation: OperationContext;
-};
-
-/**
- * Configuration and extension hooks for a client. Supplied per-instance via
- * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
- * (functions facade).
- */
-export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
-    serverUrl?: string;
-    /** Extra headers merged into every request; a function is invoked per request. */
-    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
-    /** Transport used to issue requests. Defaults to the global `fetch`. */
-    fetch?: typeof fetch;
-    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    /** Observe — or replace, by returning a `Response` — the response before parsing. */
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    /**
-     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
-     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
-     */
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
-    /**
-     * Composable interceptors run around every request, alongside the single
-     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
-     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
-     * the last-registered middleware wraps closest to the network. Register more at runtime
-     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
-     */
-    middleware?: Middleware[];
-    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
-    retry?: RetryConfig;
-    /**
-     * Per-instance auth credentials. When set, they override the module-global
-     * `set*` helpers for requests made through this config (each scheme falls back
-     * to its global slot when omitted here). Only the schemes an operation declares
-     * in its `security` are ever sent.
-     */
-    auth?: AuthCredentials;
-};
-
-/**
- * A request interceptor; every field is optional, so a middleware can hook any subset of
- * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
- * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
- * failure into the error to throw, threaded through each middleware in turn.
- */
-export type Middleware = {
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/** Context handed to `retryOn` for the attempt that just failed. */
-export type RetryContext = {
-    /** 1-based number of the attempt that just failed. */
-    attempt: number;
-    /** The request that was attempted. */
-    request: RequestContext;
-    /** Present when the server returned a (non-ok) response. */
-    response?: Response;
-    /** Present when the transport threw (network error, DNS, connection reset). */
-    error?: unknown;
-};
-
-/** Retry policy; all fields optional with sensible defaults. */
-export type RetryConfig = {
-    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
-    retries?: number;
-    /** Base delay in milliseconds. Default 1000. */
-    retryDelay?: number;
-    /** Backoff shape. Default 'exponential'. */
-    retryStrategy?: RetryStrategy;
-    /** Apply full jitter over the computed delay. Default true. */
-    jitter?: boolean;
-    /**
-     * Decide whether to retry a failed attempt. Default: retry only idempotent
-     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
-     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
-     */
-    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
-};
-
-/**
- * How the response body is read. `'auto'` negotiates from the content type (the
- * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
- */
-export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
-
-/**
- * The trailing per-operation argument: standard `RequestInit` plus an optional
- * per-call retry override and a `parseAs` escape hatch.
- *
- * `parseAs` forces how the response body is read; overrides the inferred kind.
- * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
- * override — the static return type is unchanged.
- */
-export type RequestOptions = RequestInit & {
-    retry?: Partial<RetryConfig>;
-    parseAs?: ParseAs;
-};
-
-/**
- * Override the base URL used by every generated operation. Useful when the
- * runtime environment differs from the value declared in `servers[0].url`
- * (e.g. dev / staging / prod toggles in a single-page app).
- *
- * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ serverUrl })`.
- */
-export function setServerUrl(url: string): void {
-    BASE = url;
-}
-
-/** The global config used by the functions facade (see `configure`). */
-const __config: ClientConfig = {};
-
-/**
- * Merge `config` into the global configuration used by the functions facade —
- * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
- * hooks once for every free function. The service-class facade configures per
- * instance instead (`new Client(config)`).
- */
-export function configure(config: ClientConfig): void {
-    Object.assign(__config, config);
-}
-
-/**
- * Append interceptors to the functions facade's global middleware chain (see
- * `ClientConfig.middleware`). The service-class facade registers per instance via
- * `<Client>.use(...)` instead.
- */
-export function use(...middleware: Middleware[]): void {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    __config.middleware = [...(__config.middleware ?? []), ...middleware];
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function __middleware(config: ClientConfig): Middleware[] {
-    const single = config.onRequest || config.onResponse || config.onError
-        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-        : [];
-    return [...single, ...(config.middleware ?? [])];
-}
-
-export class ApiError extends Error {
-    public readonly url: string;
-    public readonly status: number;
-    public readonly statusText: string;
-    public readonly body: unknown;
-    constructor(url: string, status: number, statusText: string, body: unknown) {
-        super(`Request failed with status ${status}`);
-        this.name = 'ApiError';
-        this.url = url;
-        this.status = status;
-        this.statusText = statusText;
-        this.body = body;
-    }
-}
-
-type QueryPrimitive = string | number | boolean;
-
-type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
-
-/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
-type QueryStyle = {
-    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-    explode: boolean;
-    allowReserved?: boolean;
-};
-
-/**
- * Percent-encode `value` but leave the RFC-3986 reserved set
- * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
- */
-function __encodeReserved(value: string): string {
-    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
-}
-
-function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
-    if (!query)
-        return url;
-    const params = new URLSearchParams();
-    const raw: string[] = [];
-    for (const [key, value] of Object.entries(query)) {
-        if (value === undefined || value === null)
-            continue;
-        const spec = styles?.[key];
-        if (!spec) {
-            if (Array.isArray(value)) {
-                for (const v of value) {
-                    if (v !== undefined && v !== null)
-                        params.append(key, String(v));
-                }
-            }
-            else if (typeof value === 'object') {
-                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-                for (const [subKey, subValue] of Object.entries(value)) {
-                    if (subValue !== undefined && subValue !== null) {
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                    }
-                }
-            }
-            else {
-                params.append(key, String(value));
-            }
-            continue;
-        }
-        if (Array.isArray(value)) {
-            const items = value.filter((v) => v !== undefined && v !== null).map(String);
-            if (spec.style === 'form' && spec.explode) {
-                for (const v of items) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}=${__encodeReserved(v)}`);
-                    else
-                        params.append(key, v);
-                }
-            }
-            else {
-                // Delimited styles put the LITERAL delimiter on the wire; only the
-                // values are encoded. `%20` (not `+`) is the literal space delimiter.
-                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
-                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-            }
-        }
-        else if (typeof value === 'object') {
-            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-            for (const [subKey, subValue] of Object.entries(value)) {
-                if (subValue !== undefined && subValue !== null) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
-                    else
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                }
-            }
-        }
-        else if (spec.allowReserved) {
-            raw.push(`${key}=${__encodeReserved(String(value))}`);
-        }
-        else {
-            params.append(key, String(value));
-        }
-    }
-    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-    return qs ? `${url}?${qs}` : url;
-}
-
-async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
-    response: Response;
-    context: RequestContext;
-}> {
-    const { retry: callRetry, ...fetchInit } = init;
-    const retry: RetryConfig = { ...config.retry, ...callRetry };
-    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-    const headers: Record<string, string> = {
-        Accept: 'application/json',
-        ...extra,
-        ...(fetchInit.headers as Record<string, string> | undefined),
-    };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
-    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-    let payload: BodyInit | undefined;
-    if (context.body !== undefined) {
-        const value = context.body;
-        const isBinary = value instanceof Blob ||
-            value instanceof ArrayBuffer ||
-            ArrayBuffer.isView(value as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-        const isURLSearchParams = value instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-            payload = value as BodyInit;
-        }
-        else {
-            payload = JSON.stringify(value);
-            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-                context.headers['Content-Type'] = 'application/json';
-            }
-        }
-    }
-    const doFetch = config.fetch ?? fetch;
-    const maxAttempts = 1 + (retry.retries ?? 0);
-    const retryOn = retry.retryOn ?? __defaultRetryOn;
-    const signal = fetchInit.signal ?? undefined;
-    let attempt = 0;
-    while (true) {
-        attempt++;
-        if (signal?.aborted)
-            throw __abortError(signal);
-        let response: Response;
-        try {
-            response = await doFetch(context.url, {
-                ...fetchInit,
-                method: context.method,
-                headers: context.headers,
-                body: payload,
-            });
-        }
-        catch (error) {
-            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
-                await __sleep(__retryDelay(retry, attempt, null), signal);
-                continue;
-            }
-            throw error;
-        }
-        // Reverse order: the last-registered middleware wraps closest to the network (onion).
-        for (let i = middleware.length - 1; i >= 0; i--) {
-            const onResponse = middleware[i].onResponse;
-            if (onResponse) {
-                const replaced = await onResponse(response, context);
-                if (replaced)
-                    response = replaced;
-            }
-        }
-        if (!response.ok &&
-            attempt < maxAttempts &&
-            !signal?.aborted &&
-            (await retryOn({ attempt, request: context, response }))) {
-            const retryAfter = response.headers.get('retry-after');
-            // Drain the abandoned response body before the next attempt: an unread body
-            // keeps the connection checked out (and can stall the pool) under Node/undici
-            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-            await response.body?.cancel().catch(() => undefined);
-            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
-            continue;
-        }
-        return { response, context };
-    }
-}
-
-async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-    if (kind === 'void' || response.status === 204)
-        return undefined;
-    if (kind === 'stream')
-        return response.body;
-    if (kind === 'blob')
-        return response.blob();
-    if (kind === 'arrayBuffer')
-        return response.arrayBuffer();
-    if (kind === 'formData')
-        return response.formData();
-    if (kind === 'text')
-        return response.text();
-    if (kind === 'json')
-        return response.json();
-    // 'auto' — negotiate from the response's content type.
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json'))
-        return response.json();
-    if (contentType.startsWith('text/'))
-        return response.text();
-    return response.blob();
-}
-
-async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
-    const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, op, url, sendInit, body);
-    if (!response.ok) {
-        const errorBody = await readError(response);
-        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
-        // Thread the error through each middleware's onError in turn (each may replace it).
-        for (const mw of __middleware(config)) {
-            if (mw.onError)
-                error = await mw.onError(error as ApiError, context);
-        }
-        throw error;
-    }
-    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
-    return (await __parse(response, kind)) as T;
-}
-
-async function readError(response: Response): Promise<unknown> {
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json')) {
-        return response.json().catch(() => undefined);
-    }
-    return response.text().catch(() => undefined);
-}
-
-const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-
-const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-function __defaultRetryOn(ctx: RetryContext): boolean {
-    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
-        return false;
-    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-    if (retryAfter) {
-        const seconds = Number(retryAfter);
-        if (!Number.isNaN(seconds))
-            return seconds * 1000;
-        const when = Date.parse(retryAfter);
-        if (!Number.isNaN(when))
-            return Math.max(0, when - Date.now());
-    }
-    const base = retry.retryDelay ?? 1000;
-    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-    return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
-    return new Promise((resolve, reject) => {
-        if (signal?.aborted) {
-            reject(__abortError(signal));
-            return;
-        }
-        const onAbort = () => {
-            clearTimeout(timer);
-            reject(__abortError(signal as AbortSignal));
-        };
-        const timer = setTimeout(() => {
-            if (signal)
-                signal.removeEventListener('abort', onAbort);
-            resolve();
-        }, ms);
-        if (signal)
-            signal.addEventListener('abort', onAbort, { once: true });
-    });
-}
-
-function __abortError(signal: AbortSignal): globalThis.Error {
-    const reason = (signal as {
-        reason?: unknown;
-    }).reason;
-    if (reason instanceof Error)
-        return reason;
-    return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * Normalize an operation's header-parameter object into a plain string record,
- * dropping any `undefined` / `null` entries (optional headers the caller omitted)
- * and stringifying the rest. Mirrors __buildUrl's handling of query values.
- */
-function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
-    const out: Record<string, string> = {};
-    for (const [key, value] of Object.entries(values)) {
-        if (value !== undefined && value !== null)
-            out[key] = String(value);
-    }
-    return out;
-}
-
-/**
- * A credential value, or a (possibly async) function that returns one per request.
- */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/**
- * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
- * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
- * to the global slots.
- */
-export type AuthCredentials = {
-    bearer?: TokenProvider;
-    apiKey?: Record<string, TokenProvider>;
-};
-
-let __bearerToken: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
- * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
- * (possibly async) function resolved per request.
- */
-export function setBearer(token: TokenProvider | null): void {
-    __bearerToken = token;
-}
-
-let __apiKey_ApiKey: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
- * string or a (possibly async) function resolved per request.
- */
-export function setApiKey(key: TokenProvider | null): void {
-    __apiKey_ApiKey = key;
-}
-
-/**
- * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
- */
-async function __resolve(slot: TokenProvider | null): Promise<string | null> {
-    if (slot === null)
-        return null;
-    return typeof slot === "function" ? slot() : slot;
-}
-
-/**
- * Build the auth `headers` and `query` for an operation from the currently-set credentials.
- * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
- * can always override by passing their own `init.headers`.
- */
-async function __auth(schemes: string[], config: ClientConfig): Promise<{
-    headers: Record<string, string>;
-    query: Record<string, string>;
-}> {
-    const headers: Record<string, string> = {};
-    const query: Record<string, string> = {};
-    const cookies: string[] = [];
-    for (const scheme of schemes) {
-        switch (scheme) {
-            case "OAuth2": {
-                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
-                if (v !== null)
-                    headers["Authorization"] = `Bearer ${v}`;
-                break;
-            }
-            case "ApiKey": {
-                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
-                if (v !== null)
-                    headers["X-API-Key"] = v;
-                break;
-            }
-        }
-    }
-    if (cookies.length > 0)
-        headers["Cookie"] = cookies.join("; ");
-    return { headers, query };
-}
-
-export type ListMenuItemsResult = MenuItemList;
-
-export type ListMenuItemsParams = {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-};
-
-export type ListMenuItemsVariables = {
-    params?: ListMenuItemsParams;
-};
-
-export type CreateMenuItemResult = MenuItem;
-
-export type CreateMenuItemBody = FormData;
-
-export type CreateMenuItemVariables = {
-    body: CreateMenuItemBody;
-};
-
-export type DeleteMenuItemResult = void;
-
-export type DeleteMenuItemVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-};
-
-export type GetMenuItemPhotoResult = Blob | string;
-
-export type GetMenuItemPhotoParams = {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-};
-
-export type GetMenuItemPhotoVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-    params?: GetMenuItemPhotoParams;
-};
-
-export type ListOrdersResult = OrderList;
-
-export type ListOrdersParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-};
-
-export type ListOrdersVariables = {
-    params?: ListOrdersParams;
-};
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    headers?: GetOrderByIdHeaders;
-};
-
-export type DeleteOrderResult = void;
-
-export type DeleteOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-};
-
-export type UpdateOrderResult = Order;
-
-export type UpdateOrderBody = {
-    status: OrderStatus;
-};
-
-export type UpdateOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    body?: UpdateOrderBody;
-};
-
-export type ListOrderItemsResult = OrderItem[];
-
-export type ListOrderItemsParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-};
-
-export type ListOrderItemsVariables = {
-    params?: ListOrderItemsParams;
-};
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-export class Client {
-    constructor(private readonly config: ClientConfig = {}) { }
-    /**
-     * Register interceptors on this instance (see `ClientConfig.middleware`). Returns `this`.
-     */
-    use(...middleware: Middleware[]): this {
-        this.config.middleware = [...this.config.middleware ?? [], ...middleware];
-        return this;
-    }
-    /**
-     * List all menu items
-     *
-     * Retrieve a collection of menu items with optional filtering and pagination.
-     */
-    async listMenuItems(params: {
-        /**
-         * Use the `endCursor` as a value for the `after` parameter to get the next page.
-         */
-        after?: string;
-        /**
-         * Use the `startCursor` as a value for the `before` parameter to get the next page.
-         */
-        before?: string;
-        /**
-         * To sort by id in descending order use `-id`.
-         * To sort by id in ascending order use `id`.
-         */
-        sort?: string;
-        /**
-         * Filters the collection items using space-separated `field:value` pairs.
-         *
-         * **Format:** `field1:value1 field2:value2`
-         *
-         * **Supported operators:**
-         * - `field:value` - Exact match
-         * - `field:value1,value2` - Match any of the comma-separated values (OR)
-         * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-         *
-         * **Examples:**
-         * - `status:placed` - Filter by single status.
-         * - `status:placed,completed` - Filter by multiple statuses.
-         * - `createdAt:30d` - Filter orders created in the last 30 days.
-         * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-         * - `status:placed createdAt:7d` - Combine multiple filters.
-         */
-        filter?: string;
-        /**
-         * Performs a case-insensitive text search across relevant fields in the collection.
-         *
-         * **Fields searched depend on the endpoint:**
-         * - **Menu items:** `name`, `photoTextDescription`
-         * - **Orders:** `customerName`, `id`
-         *
-         * Returns items where any of the searchable fields contain the search term as a substring.
-         */
-        search?: string;
-        /**
-         * Use to return a number of results per page.
-         * If there is more data, use in combination with `after` to page through the data.
-         * @minimum 1
-         * @maximum 100
-         */
-        limit?: number;
-    } = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-        return __request<MenuItemList>(this.config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(this.config, `/menu`, params), { method: "GET", ...init });
-    }
-    /**
-     * Create menu item
-     *
-     * Create a new menu item.
-     */
-    async createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
-        const __a = await __auth(["OAuth2"], this.config);
-        return __request<MenuItem>(this.config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(this.config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-    }
-    /**
-     * Delete a menu item
-     *
-     * Delete an existing menu item.
-     */
-    async deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
-        const __a = await __auth(["OAuth2"], this.config);
-        return __request<void>(this.config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(this.config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-    }
-    /**
-     * Retrieve a menu item photo
-     *
-     * Retrieve the product photo image for a specific menu item.
-     */
-    async getMenuItemPhoto(menuItemId: string, params: {
-        /**
-         * Photo size to retrieve.
-         */
-        photoSize?: "thumbnail" | "medium" | "large";
-    } = {}, init: RequestOptions = {}): Promise<Blob | string> {
-        return __request<Blob | string>(this.config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(this.config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
-    }
-    /**
-     * List all orders
-     *
-     * Retrieve a collection of orders with optional filtering and pagination.
-     */
-    async listOrders(params: {
-        /**
-         * Filters the collection items using space-separated `field:value` pairs.
-         *
-         * **Format:** `field1:value1 field2:value2`
-         *
-         * **Supported operators:**
-         * - `field:value` - Exact match
-         * - `field:value1,value2` - Match any of the comma-separated values (OR)
-         * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-         *
-         * **Examples:**
-         * - `status:placed` - Filter by single status.
-         * - `status:placed,completed` - Filter by multiple statuses.
-         * - `createdAt:30d` - Filter orders created in the last 30 days.
-         * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-         * - `status:placed createdAt:7d` - Combine multiple filters.
-         */
-        filter?: string;
-        /**
-         * To sort by id in descending order use `-id`.
-         * To sort by id in ascending order use `id`.
-         */
-        sort?: string;
-        /**
-         * Use to return a number of results per page.
-         * If there is more data, use in combination with `after` to page through the data.
-         * @minimum 1
-         * @maximum 100
-         */
-        limit?: number;
-        /**
-         * Use the `endCursor` as a value for the `after` parameter to get the next page.
-         */
-        after?: string;
-        /**
-         * Use the `startCursor` as a value for the `before` parameter to get the next page.
-         */
-        before?: string;
-        /**
-         * Performs a case-insensitive text search across relevant fields in the collection.
-         *
-         * **Fields searched depend on the endpoint:**
-         * - **Menu items:** `name`, `photoTextDescription`
-         * - **Orders:** `customerName`, `id`
-         *
-         * Returns items where any of the searchable fields contain the search term as a substring.
-         */
-        search?: string;
-    } = {}, init: RequestOptions = {}): Promise<OrderList> {
-        const __a = await __auth(["OAuth2"], this.config);
-        return __request<OrderList>(this.config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(this.config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-    }
-    /**
-     * Create order
-     *
-     * Create a new order.
-     * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
-     */
-    async createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
-        const __a = await __auth(["OAuth2"], this.config);
-        return __request<Order>(this.config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(this.config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-    }
-    /**
-     * Retrieve an order
-     *
-     * Retrieve a single order by its ID.
-     */
-    async getOrderById(orderId: string, headers: {
-        /**
-         * Optional client-supplied correlation ID, echoed in logs and traces.
-         * @format uuid
-         */
-        "X-Request-Id"?: string;
-    } = {}, init: RequestOptions = {}): Promise<Order> {
-        const __a = await __auth(["OAuth2"], this.config);
-        return __request<Order>(this.config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(this.config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
-    }
-    /**
-     * Delete an order
-     *
-     * Delete the order.
-     * To keep the order history, the order should be canceled instead of deleted.
-     */
-    async deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
-        const __a = await __auth(["OAuth2"], this.config);
-        return __request<void>(this.config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(this.config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-    }
-    /**
-     * Partially update an order
-     *
-     * Update an existing order status.
-     * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
-     */
-    async updateOrder(orderId: string, body?: {
-        status: OrderStatus;
-    }, init: RequestOptions = {}): Promise<Order> {
-        const __a = await __auth(["OAuth2"], this.config);
-        return __request<Order>(this.config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(this.config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-    }
-    /**
-     * List all order items with menu item details
-     *
-     * Returns an array of order items for a specific order.
-     * Use the `filter` parameter to filter by order ID.
-     */
-    async listOrderItems(params: {
-        /**
-         * Filters the collection items using space-separated `field:value` pairs.
-         *
-         * **Format:** `field1:value1 field2:value2`
-         *
-         * **Supported operators:**
-         * - `field:value` - Exact match
-         * - `field:value1,value2` - Match any of the comma-separated values (OR)
-         * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-         *
-         * **Examples:**
-         * - `status:placed` - Filter by single status.
-         * - `status:placed,completed` - Filter by multiple statuses.
-         * - `createdAt:30d` - Filter orders created in the last 30 days.
-         * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-         * - `status:placed createdAt:7d` - Combine multiple filters.
-         */
-        filter?: string;
-    } = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
-        const __a = await __auth(["OAuth2"], this.config);
-        return __request<OrderItem[]>(this.config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(this.config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-    }
-    /**
-     * Get revenue statistics
-     *
-     * Retrieve revenue statistics for a configurable date range.
-     * Returns revenue, order counts, average order amount, and other useful statistics.
-     */
-    async getRevenue(params: {
-        /**
-         * Start date for the revenue calculation period (ISO 8601 datetime format).
-         * Defaults to 30 days ago if not provided.
-         * @format date
-         */
-        startDate?: string;
-        /**
-         * End date for the revenue calculation period (ISO 8601 datetime format).
-         * Defaults to current time if not provided.
-         * @format date
-         */
-        endDate?: string;
-    } = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
-        const __a = await __auth(["ApiKey"], this.config);
-        return __request<RevenueStatistics>(this.config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(this.config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-    }
-    /**
-     * Create OAuth2 client
-     *
-     * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
-     * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
-     *   `redirectUris` must be provided (per RFC 7591 Section 2).
-     * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
-     * Returns the registered client information per RFC 7591, including:
-     * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
-     */
-    async registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-        return __request<OAuth2Client>(this.config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(this.config, `/oauth2/register`), { method: "POST", ...init }, body);
-    }
-}
diff --git a/tests/e2e/generate-client/examples/service-class/src/main.ts b/tests/e2e/generate-client/examples/service-class/src/main.ts
deleted file mode 100644
index a2532e0357..0000000000
--- a/tests/e2e/generate-client/examples/service-class/src/main.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Client, ApiError } from './api/client.js';
-
-const client = new Client({ serverUrl: 'https://api.cafe.redocly.com' });
-
-const out = document.querySelector<HTMLPreElement>('#out')!;
-
-async function main() {
-  try {
-    const items = await client.listMenuItems();
-    out.textContent = JSON.stringify(items, null, 2);
-  } catch (error) {
-    out.textContent =
-      error instanceof ApiError
-        ? `ApiError ${error.status}: ${error.statusText}`
-        : `Unexpected error: ${String(error)}`;
-  }
-}
-
-void main();
diff --git a/tests/e2e/generate-client/examples/sse-streaming/.gitignore b/tests/e2e/generate-client/examples/sse-streaming/.gitignore
new file mode 100644
index 0000000000..f06235c460
--- /dev/null
+++ b/tests/e2e/generate-client/examples/sse-streaming/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+dist
diff --git a/tests/e2e/generate-client/examples/sse-streaming/README.md b/tests/e2e/generate-client/examples/sse-streaming/README.md
new file mode 100644
index 0000000000..02cda6deb3
--- /dev/null
+++ b/tests/e2e/generate-client/examples/sse-streaming/README.md
@@ -0,0 +1,18 @@
+# sse-streaming example
+
+A `text/event-stream` operation consumed as a typed async generator: `for await` over
+`streamOrderEvents()` yields `ServerSentEvent<OrderEvent>` with `ev.data` typed from the
+spec's `itemSchema`. Shows auto-reconnect resuming via `Last-Event-ID` (tuned with
+`reconnectDelay`; opt out with `reconnect: false`) and a clean abort via `AbortController`.
+
+## Run
+
+```bash
+npm install
+npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
+npm run dev        # open the printed local URL
+```
+
+The app uses a canned SSE `fetch` so it runs offline and the reconnect is deterministic:
+connection 1 drops mid-stream, connection 2 resumes from the last event id. The generated
+client under `src/api/` is committed and drift-checked against the generator in CI.
diff --git a/tests/e2e/generate-client/examples/service-class/index.html b/tests/e2e/generate-client/examples/sse-streaming/index.html
similarity index 76%
rename from tests/e2e/generate-client/examples/service-class/index.html
rename to tests/e2e/generate-client/examples/sse-streaming/index.html
index 1640e37378..008f3c9cc0 100644
--- a/tests/e2e/generate-client/examples/service-class/index.html
+++ b/tests/e2e/generate-client/examples/sse-streaming/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <title>Redocly client-generator — service-class example</title>
+    <title>Redocly client-generator — sse-streaming example</title>
   </head>
   <body>
     <pre id="out">Loading…</pre>
diff --git a/tests/e2e/generate-client/examples/sse-streaming/openapi.yaml b/tests/e2e/generate-client/examples/sse-streaming/openapi.yaml
new file mode 100644
index 0000000000..2a9a604e2a
--- /dev/null
+++ b/tests/e2e/generate-client/examples/sse-streaming/openapi.yaml
@@ -0,0 +1,58 @@
+openapi: 3.2.0
+info:
+  title: Cafe Order Events
+  description: Demo event-stream API for the sse-streaming example.
+  version: 1.0.0
+servers:
+  - url: https://events.cafe.example.com
+tags:
+  - name: Events
+    description: Live event streams.
+paths:
+  /order-events:
+    get:
+      tags:
+        - Events
+      summary: Stream order status changes
+      operationId: streamOrderEvents
+      responses:
+        '200':
+          description: A stream of order status changes.
+          content:
+            text/event-stream:
+              itemSchema:
+                $ref: '#/components/schemas/OrderEvent'
+  /kitchen-ticker:
+    get:
+      tags:
+        - Events
+      summary: Stream the kitchen ticker
+      operationId: streamKitchenTicker
+      responses:
+        '200':
+          description: A long-lived stream of raw ticker lines.
+          content:
+            text/event-stream: {}
+components:
+  schemas:
+    OrderEvent:
+      type: object
+      properties:
+        orderId:
+          description: Order ID.
+          type: string
+        status:
+          description: New order status.
+          type: string
+          enum:
+            - placed
+            - preparing
+            - ready
+            - completed
+        seq:
+          description: Monotonic event sequence number.
+          type: integer
+      required:
+        - orderId
+        - status
+        - seq
diff --git a/tests/e2e/generate-client/examples/service-class/package.json b/tests/e2e/generate-client/examples/sse-streaming/package.json
similarity index 86%
rename from tests/e2e/generate-client/examples/service-class/package.json
rename to tests/e2e/generate-client/examples/sse-streaming/package.json
index 57bf21c8fb..dd122ec5e0 100644
--- a/tests/e2e/generate-client/examples/service-class/package.json
+++ b/tests/e2e/generate-client/examples/sse-streaming/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@redocly-examples/service-class",
+  "name": "@redocly-examples/sse-streaming",
   "private": true,
   "version": "0.0.0",
   "type": "module",
diff --git a/tests/e2e/generate-client/examples/sse-streaming/redocly.yaml b/tests/e2e/generate-client/examples/sse-streaming/redocly.yaml
new file mode 100644
index 0000000000..29ff096d03
--- /dev/null
+++ b/tests/e2e/generate-client/examples/sse-streaming/redocly.yaml
@@ -0,0 +1,8 @@
+# redocly.yaml — drives `redocly generate-client` for this example.
+apis:
+  sse-streaming:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
diff --git a/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts b/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
new file mode 100644
index 0000000000..b04bc76547
--- /dev/null
+++ b/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
@@ -0,0 +1,980 @@
+// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Cafe Order Events (v1.0.0)
+ * Demo event-stream API for the sse-streaming example.
+ */
+
+export type OrderEvent = {
+    /**
+     * Order ID.
+     */
+    orderId: string;
+    /**
+     * New order status.
+     */
+    status: "placed" | "preparing" | "ready" | "completed";
+    /**
+     * Monotonic event sequence number.
+     */
+    seq: number;
+};
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    streamOrderEvents: {
+        args: {};
+        result: OrderEvent;
+        kind: "sse";
+    };
+    streamKitchenTicker: {
+        args: {};
+        result: string;
+        kind: "sse";
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    streamOrderEvents: { id: "streamOrderEvents", method: "GET", path: "/order-events", tags: ["Events"], responseKind: "sse", sseDataKind: "json" },
+    streamKitchenTicker: { id: "streamKitchenTicker", method: "GET", path: "/kitchen-ticker", tags: ["Events"], responseKind: "sse", sseDataKind: "text" }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
+export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : NoRequiredKeys<Ops[K]['args']> extends true
+      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
+
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * Consume a `text/event-stream` operation as typed events (capability module — wired
+ * into `createClient`). Auto-reconnects on dropped connections, resuming from the last
+ * seen event id via `Last-Event-ID` (backoff: the server's `retry:` value, then
+ * `reconnectDelay`, then 1s — exponential with jitter, capped at 30s). A clean stream
+ * end flushes a trailing frame and finishes; `break`/abort end the iterator cleanly.
+ */
+async function* sse<T>(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: SseOptions,
+  dataKind: 'json' | 'text' = 'text'
+): AsyncGenerator<ServerSentEvent<T>> {
+  const { reconnect = true, reconnectDelay, ...rest } = init;
+  const signal = rest.signal ?? undefined;
+  const headers: Record<string, string> = {
+    Accept: 'text/event-stream',
+    ...(rest.headers as Record<string, string> | undefined),
+  };
+  let lastEventId: string | undefined;
+  let serverRetry: number | undefined;
+  let failures = 0;
+  while (true) {
+    if (signal?.aborted) return;
+    const sendHeaders =
+      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
+    try {
+      const { response } = await send(
+        config,
+        op,
+        url,
+        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },
+        undefined,
+        false,
+        {}
+      );
+      if (!response.ok) {
+        const errorBody = await readError(response);
+        throw new ApiError(url, response.status, response.statusText, errorBody);
+      }
+      failures = 0;
+      const body = response.body;
+      if (!body) return;
+      const reader = body.getReader();
+      const decoder = new TextDecoder();
+      let buffer = '';
+      try {
+        while (true) {
+          const { done, value } = await reader.read();
+          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });
+          let index: number;
+          while ((index = buffer.search(/\r\n\r\n|\n\n|\r\r/)) !== -1) {
+            const raw = buffer.slice(0, index);
+            buffer = buffer.slice(
+              index + buffer.slice(index).match(/^(\r\n\r\n|\n\n|\r\r)/)![0].length
+            );
+            const event = parseSseFrame(raw, dataKind);
+            if (event) {
+              if (event.id !== undefined) lastEventId = event.id;
+              if (event.retry !== undefined) serverRetry = event.retry;
+              yield event as ServerSentEvent<T>;
+            }
+          }
+          if (done) {
+            // Stream closed cleanly. Flush a final event that arrived without a trailing
+            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.
+            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;
+            if (event) {
+              if (event.id !== undefined) lastEventId = event.id;
+              if (event.retry !== undefined) serverRetry = event.retry;
+              yield event as ServerSentEvent<T>;
+            }
+            return;
+          }
+          // Bound memory: a server that never sends a frame delimiter would otherwise
+          // grow `buffer` without limit. 1 MiB is far above any real SSE frame.
+          if (buffer.length > 1048576) {
+            throw new Error('SSE frame exceeded 1048576 characters without a delimiter');
+          }
+        }
+      } finally {
+        await reader.cancel().catch(() => undefined);
+      }
+    } catch (error) {
+      if (signal?.aborted) return;
+      // A non-OK HTTP response is a definitive error (4xx/5xx), not a transient drop —
+      // surface it instead of reconnecting in a loop.
+      if (error instanceof ApiError) throw error;
+      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream
+      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.
+      if (!reconnect) throw error;
+    }
+    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.
+    failures++;
+    const base = serverRetry ?? reconnectDelay ?? 1000;
+    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);
+    try {
+      await sleep(Math.random() * delay, signal);
+    } catch {
+      return; // sleep rejects only on abort — end the iterator cleanly
+    }
+  }
+}
+
+/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */
+function parseSseFrame(
+  raw: string,
+  dataKind: 'json' | 'text'
+): ServerSentEvent<unknown> | undefined {
+  let event: string | undefined;
+  const dataLines: string[] = [];
+  let id: string | undefined;
+  let retry: number | undefined;
+  let sawField = false;
+  for (const line of raw.split(/\r\n|\n|\r/)) {
+    if (line === '' || line.startsWith(':')) continue;
+    const colon = line.indexOf(':');
+    const field = colon === -1 ? line : line.slice(0, colon);
+    let val = colon === -1 ? '' : line.slice(colon + 1);
+    if (val.startsWith(' ')) val = val.slice(1);
+    sawField = true;
+    if (field === 'event') event = val;
+    else if (field === 'data') dataLines.push(val);
+    else if (field === 'id') id = val;
+    else if (field === 'retry') {
+      const n = Number(val);
+      if (!Number.isNaN(n)) retry = n;
+    }
+  }
+  if (!sawField) return undefined;
+  const dataText = dataLines.join('\n');
+  const data = dataKind === 'json' && dataText !== '' ? JSON.parse(dataText) : dataText;
+  return { event, data, id, retry };
+}
+
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+};
+
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
+/**
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
+ */
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, { sse });
+}
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://events.cafe.example.com" });
+
+export const { configure, use } = client;
+export const streamOrderEvents = (init: SseOptions = {}) => client.streamOrderEvents({}, init);
+export const streamKitchenTicker = (init: SseOptions = {}) => client.streamKitchenTicker({}, init);
diff --git a/tests/e2e/generate-client/examples/sse-streaming/src/main.ts b/tests/e2e/generate-client/examples/sse-streaming/src/main.ts
new file mode 100644
index 0000000000..721b54d317
--- /dev/null
+++ b/tests/e2e/generate-client/examples/sse-streaming/src/main.ts
@@ -0,0 +1,76 @@
+// sse-streaming — a `text/event-stream` operation is a typed async generator.
+//
+// `for await (const ev of streamOrderEvents())` yields `ServerSentEvent<OrderEvent>`:
+// `ev.data` is the spec's item schema (`ev.id`/`ev.event`/`ev.retry` are the SSE fields).
+// A DROPPED connection auto-reconnects, resuming via `Last-Event-ID` (backoff: the
+// server's `retry:` value, then `reconnectDelay`, then 1s); a CLEAN stream end finishes
+// the loop. Pass `reconnect: false` to surface drops as errors instead, and an
+// AbortSignal (or `break`) to end the iterator cleanly — no AbortError escapes.
+import {
+  streamKitchenTicker,
+  streamOrderEvents,
+  configure,
+  type OrderEvent,
+} from './api/client.js';
+
+const out = document.querySelector<HTMLPreElement>('#out')!;
+const log: string[] = [];
+
+// A canned SSE transport so the example runs offline and the reconnect is
+// deterministic: connection 1 drops after two events; connection 2 resumes
+// from `Last-Event-ID` and then ends cleanly.
+const encoder = new TextEncoder();
+const frame = (seq: number, status: OrderEvent['status']) =>
+  `id: ${seq}\ndata: ${JSON.stringify({ orderId: `ord_${seq}`, status, seq })}\n\n`;
+const sseBody = (frames: string[], end: 'close' | 'drop' | AbortSignal | null | undefined) =>
+  new ReadableStream<Uint8Array>({
+    start(controller) {
+      for (const f of frames) controller.enqueue(encoder.encode(f));
+      if (end === 'close') controller.close();
+      else if (end === 'drop') controller.error(new Error('connection reset'));
+      // Otherwise hold the stream open until the caller aborts.
+      else end?.addEventListener('abort', () => controller.error(end.reason), { once: true });
+    },
+  });
+
+let connections = 0;
+const canned = (async (url: string, init: RequestInit) => {
+  const { pathname } = new URL(url);
+  const headers = init.headers as Record<string, string>;
+  let body: ReadableStream<Uint8Array>;
+  if (pathname === '/order-events') {
+    connections++;
+    log.push(`connection ${connections} (Last-Event-ID: ${headers['Last-Event-ID'] ?? 'none'})`);
+    body =
+      connections === 1
+        ? sseBody([frame(1, 'placed'), frame(2, 'preparing')], 'drop')
+        : sseBody([frame(3, 'ready'), frame(4, 'completed')], 'close');
+  } else {
+    body = sseBody(['data: espresso up\n\n', 'data: two flat whites\n\n'], init.signal);
+  }
+  return new Response(body, { headers: { 'content-type': 'text/event-stream' } });
+}) as unknown as typeof fetch;
+
+configure({ serverUrl: 'https://events.cafe.example.com', fetch: canned });
+
+async function main() {
+  // 1. Typed events across an auto-reconnect. `reconnectDelay` keeps the demo snappy
+  //    (the real default backs off from 1s, honoring a server `retry:` hint).
+  for await (const ev of streamOrderEvents({ reconnectDelay: 50 })) {
+    log.push(`  #${ev.id} order ${ev.data.orderId} → ${ev.data.status}`);
+  }
+  log.push('order stream ended cleanly (a clean end never reconnects)');
+
+  // 2. Abort a held-open stream: the `for await` loop just ends — no AbortError.
+  //    `reconnect: false` would instead surface a drop as a thrown error.
+  const controller = new AbortController();
+  for await (const ev of streamKitchenTicker({ signal: controller.signal })) {
+    log.push(`  ticker: ${ev.data}`);
+    if (ev.data === 'two flat whites') controller.abort();
+  }
+  log.push('ticker aborted — the iterator completed cleanly');
+
+  out.textContent = log.join('\n');
+}
+
+void main();
diff --git a/tests/e2e/generate-client/examples/sse-streaming/tsconfig.json b/tests/e2e/generate-client/examples/sse-streaming/tsconfig.json
new file mode 100644
index 0000000000..4bd6962d40
--- /dev/null
+++ b/tests/e2e/generate-client/examples/sse-streaming/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../tsconfig.base.json",
+  "include": ["src"]
+}
diff --git a/tests/e2e/generate-client/examples/sse-streaming/vite.config.ts b/tests/e2e/generate-client/examples/sse-streaming/vite.config.ts
new file mode 100644
index 0000000000..c049f46e10
--- /dev/null
+++ b/tests/e2e/generate-client/examples/sse-streaming/vite.config.ts
@@ -0,0 +1,3 @@
+import { defineConfig } from 'vite';
+
+export default defineConfig({});
diff --git a/tests/e2e/generate-client/examples/tanstack-query/redocly.yaml b/tests/e2e/generate-client/examples/tanstack-query/redocly.yaml
index 34503a0950..fa97995191 100644
--- a/tests/e2e/generate-client/examples/tanstack-query/redocly.yaml
+++ b/tests/e2e/generate-client/examples/tanstack-query/redocly.yaml
@@ -9,4 +9,3 @@ apis:
       generators:
         - sdk
         - tanstack-query
-      facade: functions
diff --git a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
index 804e48df94..1ad55ad78b 100644
--- a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
@@ -412,599 +412,6 @@ export function isDessert(value: MenuItem): value is Dessert {
     return (value as Record<string, unknown>)["category"] === "dessert";
 }
 
-/**
- * Static metadata for every operation, keyed by operationId: the HTTP `method`
- * and the `path` template (with `{param}` placeholders intact). Minification-safe
- * — useful for building cache/query keys, tracing span names, and request logging
- * without re-deriving them at each call site.
- */
-export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
-    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
-    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
-    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
-    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
-    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
-    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
-} as const;
-
-/**
- * The operationId of any operation in this client.
- */
-export type OperationId = keyof typeof OPERATIONS;
-
-/**
- * Static metadata describing one operation: its HTTP method, path template, and tags.
- */
-export type OperationMetadata = {
-    readonly method: string;
-    readonly path: string;
-    readonly tags: readonly string[];
-};
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
-
-let BASE = "https://api.cafe.redocly.com";
-
-/** Identity of the operation a request belongs to. Stable across path interpolation. */
-export type OperationContext = {
-    id: OperationId;
-    path: OperationPath;
-    tags: OperationTag[];
-};
-
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
-export type RequestContext = {
-    url: string;
-    method: string;
-    headers: Record<string, string>;
-    body?: unknown;
-    /** The operation being called: its id (operationId), path template, and tags. */
-    operation: OperationContext;
-};
-
-/**
- * Configuration and extension hooks for a client. Supplied per-instance via
- * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
- * (functions facade).
- */
-export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
-    serverUrl?: string;
-    /** Extra headers merged into every request; a function is invoked per request. */
-    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
-    /** Transport used to issue requests. Defaults to the global `fetch`. */
-    fetch?: typeof fetch;
-    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    /** Observe — or replace, by returning a `Response` — the response before parsing. */
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    /**
-     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
-     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
-     */
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
-    /**
-     * Composable interceptors run around every request, alongside the single
-     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
-     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
-     * the last-registered middleware wraps closest to the network. Register more at runtime
-     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
-     */
-    middleware?: Middleware[];
-    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
-    retry?: RetryConfig;
-    /**
-     * Per-instance auth credentials. When set, they override the module-global
-     * `set*` helpers for requests made through this config (each scheme falls back
-     * to its global slot when omitted here). Only the schemes an operation declares
-     * in its `security` are ever sent.
-     */
-    auth?: AuthCredentials;
-};
-
-/**
- * A request interceptor; every field is optional, so a middleware can hook any subset of
- * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
- * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
- * failure into the error to throw, threaded through each middleware in turn.
- */
-export type Middleware = {
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/** Context handed to `retryOn` for the attempt that just failed. */
-export type RetryContext = {
-    /** 1-based number of the attempt that just failed. */
-    attempt: number;
-    /** The request that was attempted. */
-    request: RequestContext;
-    /** Present when the server returned a (non-ok) response. */
-    response?: Response;
-    /** Present when the transport threw (network error, DNS, connection reset). */
-    error?: unknown;
-};
-
-/** Retry policy; all fields optional with sensible defaults. */
-export type RetryConfig = {
-    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
-    retries?: number;
-    /** Base delay in milliseconds. Default 1000. */
-    retryDelay?: number;
-    /** Backoff shape. Default 'exponential'. */
-    retryStrategy?: RetryStrategy;
-    /** Apply full jitter over the computed delay. Default true. */
-    jitter?: boolean;
-    /**
-     * Decide whether to retry a failed attempt. Default: retry only idempotent
-     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
-     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
-     */
-    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
-};
-
-/**
- * How the response body is read. `'auto'` negotiates from the content type (the
- * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
- */
-export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
-
-/**
- * The trailing per-operation argument: standard `RequestInit` plus an optional
- * per-call retry override and a `parseAs` escape hatch.
- *
- * `parseAs` forces how the response body is read; overrides the inferred kind.
- * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
- * override — the static return type is unchanged.
- */
-export type RequestOptions = RequestInit & {
-    retry?: Partial<RetryConfig>;
-    parseAs?: ParseAs;
-};
-
-/**
- * Override the base URL used by every generated operation. Useful when the
- * runtime environment differs from the value declared in `servers[0].url`
- * (e.g. dev / staging / prod toggles in a single-page app).
- *
- * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ serverUrl })`.
- */
-export function setServerUrl(url: string): void {
-    BASE = url;
-}
-
-/** The global config used by the functions facade (see `configure`). */
-const __config: ClientConfig = {};
-
-/**
- * Merge `config` into the global configuration used by the functions facade —
- * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
- * hooks once for every free function. The service-class facade configures per
- * instance instead (`new Client(config)`).
- */
-export function configure(config: ClientConfig): void {
-    Object.assign(__config, config);
-}
-
-/**
- * Append interceptors to the functions facade's global middleware chain (see
- * `ClientConfig.middleware`). The service-class facade registers per instance via
- * `<Client>.use(...)` instead.
- */
-export function use(...middleware: Middleware[]): void {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    __config.middleware = [...(__config.middleware ?? []), ...middleware];
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function __middleware(config: ClientConfig): Middleware[] {
-    const single = config.onRequest || config.onResponse || config.onError
-        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-        : [];
-    return [...single, ...(config.middleware ?? [])];
-}
-
-export class ApiError extends Error {
-    public readonly url: string;
-    public readonly status: number;
-    public readonly statusText: string;
-    public readonly body: unknown;
-    constructor(url: string, status: number, statusText: string, body: unknown) {
-        super(`Request failed with status ${status}`);
-        this.name = 'ApiError';
-        this.url = url;
-        this.status = status;
-        this.statusText = statusText;
-        this.body = body;
-    }
-}
-
-type QueryPrimitive = string | number | boolean;
-
-type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
-
-/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
-type QueryStyle = {
-    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-    explode: boolean;
-    allowReserved?: boolean;
-};
-
-/**
- * Percent-encode `value` but leave the RFC-3986 reserved set
- * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
- */
-function __encodeReserved(value: string): string {
-    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
-}
-
-function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
-    if (!query)
-        return url;
-    const params = new URLSearchParams();
-    const raw: string[] = [];
-    for (const [key, value] of Object.entries(query)) {
-        if (value === undefined || value === null)
-            continue;
-        const spec = styles?.[key];
-        if (!spec) {
-            if (Array.isArray(value)) {
-                for (const v of value) {
-                    if (v !== undefined && v !== null)
-                        params.append(key, String(v));
-                }
-            }
-            else if (typeof value === 'object') {
-                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-                for (const [subKey, subValue] of Object.entries(value)) {
-                    if (subValue !== undefined && subValue !== null) {
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                    }
-                }
-            }
-            else {
-                params.append(key, String(value));
-            }
-            continue;
-        }
-        if (Array.isArray(value)) {
-            const items = value.filter((v) => v !== undefined && v !== null).map(String);
-            if (spec.style === 'form' && spec.explode) {
-                for (const v of items) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}=${__encodeReserved(v)}`);
-                    else
-                        params.append(key, v);
-                }
-            }
-            else {
-                // Delimited styles put the LITERAL delimiter on the wire; only the
-                // values are encoded. `%20` (not `+`) is the literal space delimiter.
-                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
-                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-            }
-        }
-        else if (typeof value === 'object') {
-            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-            for (const [subKey, subValue] of Object.entries(value)) {
-                if (subValue !== undefined && subValue !== null) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
-                    else
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                }
-            }
-        }
-        else if (spec.allowReserved) {
-            raw.push(`${key}=${__encodeReserved(String(value))}`);
-        }
-        else {
-            params.append(key, String(value));
-        }
-    }
-    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-    return qs ? `${url}?${qs}` : url;
-}
-
-async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
-    response: Response;
-    context: RequestContext;
-}> {
-    const { retry: callRetry, ...fetchInit } = init;
-    const retry: RetryConfig = { ...config.retry, ...callRetry };
-    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-    const headers: Record<string, string> = {
-        Accept: 'application/json',
-        ...extra,
-        ...(fetchInit.headers as Record<string, string> | undefined),
-    };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
-    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-    let payload: BodyInit | undefined;
-    if (context.body !== undefined) {
-        const value = context.body;
-        const isBinary = value instanceof Blob ||
-            value instanceof ArrayBuffer ||
-            ArrayBuffer.isView(value as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-        const isURLSearchParams = value instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-            payload = value as BodyInit;
-        }
-        else {
-            payload = JSON.stringify(value);
-            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-                context.headers['Content-Type'] = 'application/json';
-            }
-        }
-    }
-    const doFetch = config.fetch ?? fetch;
-    const maxAttempts = 1 + (retry.retries ?? 0);
-    const retryOn = retry.retryOn ?? __defaultRetryOn;
-    const signal = fetchInit.signal ?? undefined;
-    let attempt = 0;
-    while (true) {
-        attempt++;
-        if (signal?.aborted)
-            throw __abortError(signal);
-        let response: Response;
-        try {
-            response = await doFetch(context.url, {
-                ...fetchInit,
-                method: context.method,
-                headers: context.headers,
-                body: payload,
-            });
-        }
-        catch (error) {
-            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
-                await __sleep(__retryDelay(retry, attempt, null), signal);
-                continue;
-            }
-            throw error;
-        }
-        // Reverse order: the last-registered middleware wraps closest to the network (onion).
-        for (let i = middleware.length - 1; i >= 0; i--) {
-            const onResponse = middleware[i].onResponse;
-            if (onResponse) {
-                const replaced = await onResponse(response, context);
-                if (replaced)
-                    response = replaced;
-            }
-        }
-        if (!response.ok &&
-            attempt < maxAttempts &&
-            !signal?.aborted &&
-            (await retryOn({ attempt, request: context, response }))) {
-            const retryAfter = response.headers.get('retry-after');
-            // Drain the abandoned response body before the next attempt: an unread body
-            // keeps the connection checked out (and can stall the pool) under Node/undici
-            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-            await response.body?.cancel().catch(() => undefined);
-            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
-            continue;
-        }
-        return { response, context };
-    }
-}
-
-async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-    if (kind === 'void' || response.status === 204)
-        return undefined;
-    if (kind === 'stream')
-        return response.body;
-    if (kind === 'blob')
-        return response.blob();
-    if (kind === 'arrayBuffer')
-        return response.arrayBuffer();
-    if (kind === 'formData')
-        return response.formData();
-    if (kind === 'text')
-        return response.text();
-    if (kind === 'json')
-        return response.json();
-    // 'auto' — negotiate from the response's content type.
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json'))
-        return response.json();
-    if (contentType.startsWith('text/'))
-        return response.text();
-    return response.blob();
-}
-
-async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
-    const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, op, url, sendInit, body);
-    if (!response.ok) {
-        const errorBody = await readError(response);
-        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
-        // Thread the error through each middleware's onError in turn (each may replace it).
-        for (const mw of __middleware(config)) {
-            if (mw.onError)
-                error = await mw.onError(error as ApiError, context);
-        }
-        throw error;
-    }
-    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
-    return (await __parse(response, kind)) as T;
-}
-
-async function readError(response: Response): Promise<unknown> {
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json')) {
-        return response.json().catch(() => undefined);
-    }
-    return response.text().catch(() => undefined);
-}
-
-const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-
-const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-function __defaultRetryOn(ctx: RetryContext): boolean {
-    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
-        return false;
-    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-    if (retryAfter) {
-        const seconds = Number(retryAfter);
-        if (!Number.isNaN(seconds))
-            return seconds * 1000;
-        const when = Date.parse(retryAfter);
-        if (!Number.isNaN(when))
-            return Math.max(0, when - Date.now());
-    }
-    const base = retry.retryDelay ?? 1000;
-    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-    return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
-    return new Promise((resolve, reject) => {
-        if (signal?.aborted) {
-            reject(__abortError(signal));
-            return;
-        }
-        const onAbort = () => {
-            clearTimeout(timer);
-            reject(__abortError(signal as AbortSignal));
-        };
-        const timer = setTimeout(() => {
-            if (signal)
-                signal.removeEventListener('abort', onAbort);
-            resolve();
-        }, ms);
-        if (signal)
-            signal.addEventListener('abort', onAbort, { once: true });
-    });
-}
-
-function __abortError(signal: AbortSignal): globalThis.Error {
-    const reason = (signal as {
-        reason?: unknown;
-    }).reason;
-    if (reason instanceof Error)
-        return reason;
-    return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * Normalize an operation's header-parameter object into a plain string record,
- * dropping any `undefined` / `null` entries (optional headers the caller omitted)
- * and stringifying the rest. Mirrors __buildUrl's handling of query values.
- */
-function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
-    const out: Record<string, string> = {};
-    for (const [key, value] of Object.entries(values)) {
-        if (value !== undefined && value !== null)
-            out[key] = String(value);
-    }
-    return out;
-}
-
-/**
- * A credential value, or a (possibly async) function that returns one per request.
- */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/**
- * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
- * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
- * to the global slots.
- */
-export type AuthCredentials = {
-    bearer?: TokenProvider;
-    apiKey?: Record<string, TokenProvider>;
-};
-
-let __bearerToken: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
- * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
- * (possibly async) function resolved per request.
- */
-export function setBearer(token: TokenProvider | null): void {
-    __bearerToken = token;
-}
-
-let __apiKey_ApiKey: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
- * string or a (possibly async) function resolved per request.
- */
-export function setApiKey(key: TokenProvider | null): void {
-    __apiKey_ApiKey = key;
-}
-
-/**
- * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
- */
-async function __resolve(slot: TokenProvider | null): Promise<string | null> {
-    if (slot === null)
-        return null;
-    return typeof slot === "function" ? slot() : slot;
-}
-
-/**
- * Build the auth `headers` and `query` for an operation from the currently-set credentials.
- * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
- * can always override by passing their own `init.headers`.
- */
-async function __auth(schemes: string[], config: ClientConfig): Promise<{
-    headers: Record<string, string>;
-    query: Record<string, string>;
-}> {
-    const headers: Record<string, string> = {};
-    const query: Record<string, string> = {};
-    const cookies: string[] = [];
-    for (const scheme of schemes) {
-        switch (scheme) {
-            case "OAuth2": {
-                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
-                if (v !== null)
-                    headers["Authorization"] = `Bearer ${v}`;
-                break;
-            }
-            case "ApiKey": {
-                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
-                if (v !== null)
-                    headers["X-API-Key"] = v;
-                break;
-            }
-        }
-    }
-    if (cookies.length > 0)
-        headers["Cookie"] = cookies.join("; ");
-    return { headers, query };
-}
-
 export type ListMenuItemsResult = MenuItemList;
 
 export type ListMenuItemsParams = {
@@ -1062,64 +469,6 @@ export type ListMenuItemsVariables = {
     params?: ListMenuItemsParams;
 };
 
-/**
- * List all menu items
- *
- * Retrieve a collection of menu items with optional filtering and pagination.
- */
-export async function listMenuItems(params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-    return __request<MenuItemList>(__config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
-}
-
 export type CreateMenuItemResult = MenuItem;
 
 export type CreateMenuItemBody = FormData;
@@ -1128,16 +477,6 @@ export type CreateMenuItemVariables = {
     body: CreateMenuItemBody;
 };
 
-/**
- * Create menu item
- *
- * Create a new menu item.
- */
-export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<MenuItem>(__config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
 export type DeleteMenuItemResult = void;
 
 export type DeleteMenuItemVariables = {
@@ -1148,16 +487,6 @@ export type DeleteMenuItemVariables = {
     menuItemId: string;
 };
 
-/**
- * Delete a menu item
- *
- * Delete an existing menu item.
- */
-export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
 export type GetMenuItemPhotoResult = Blob | string;
 
 export type GetMenuItemPhotoParams = {
@@ -1176,20 +505,6 @@ export type GetMenuItemPhotoVariables = {
     params?: GetMenuItemPhotoParams;
 };
 
-/**
- * Retrieve a menu item photo
- *
- * Retrieve the product photo image for a specific menu item.
- */
-export async function getMenuItemPhoto(menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}): Promise<Blob | string> {
-    return __request<Blob | string>(__config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
-}
-
 export type ListOrdersResult = OrderList;
 
 export type ListOrdersParams = {
@@ -1247,95 +562,25 @@ export type ListOrdersVariables = {
     params?: ListOrdersParams;
 };
 
-/**
- * List all orders
- *
- * Retrieve a collection of orders with optional filtering and pagination.
- */
-export async function listOrders(params: {
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
     /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
      */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderList> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderList>(__config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-/**
- * Create order
- *
- * Create a new order.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
     /**
      * ID of the order to retrieve.
      * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
@@ -1344,22 +589,6 @@ export type GetOrderByIdVariables = {
     headers?: GetOrderByIdHeaders;
 };
 
-/**
- * Retrieve an order
- *
- * Retrieve a single order by its ID.
- */
-export async function getOrderById(orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
-}
-
 export type DeleteOrderResult = void;
 
 export type DeleteOrderVariables = {
@@ -1370,17 +599,6 @@ export type DeleteOrderVariables = {
     orderId: string;
 };
 
-/**
- * Delete an order
- *
- * Delete the order.
- * To keep the order history, the order should be canceled instead of deleted.
- */
-export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
 export type UpdateOrderResult = Order;
 
 export type UpdateOrderBody = {
@@ -1396,19 +614,6 @@ export type UpdateOrderVariables = {
     body?: UpdateOrderBody;
 };
 
-/**
- * Partially update an order
- *
- * Update an existing order status.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function updateOrder(orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
 export type ListOrderItemsResult = OrderItem[];
 
 export type ListOrderItemsParams = {
@@ -1436,13 +641,1006 @@ export type ListOrderItemsVariables = {
     params?: ListOrderItemsParams;
 };
 
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    listMenuItems: {
+        args: {
+            params?: ListMenuItemsParams;
+        };
+        result: ListMenuItemsResult;
+    };
+    createMenuItem: {
+        args: {
+            body: CreateMenuItemBody;
+        };
+        result: CreateMenuItemResult;
+    };
+    deleteMenuItem: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+        };
+        result: DeleteMenuItemResult;
+    };
+    getMenuItemPhoto: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+            params?: GetMenuItemPhotoParams;
+        };
+        result: GetMenuItemPhotoResult;
+    };
+    listOrders: {
+        args: {
+            params?: ListOrdersParams;
+        };
+        result: ListOrdersResult;
+    };
+    createOrder: {
+        args: {
+            body: CreateOrderBody;
+        };
+        result: CreateOrderResult;
+    };
+    getOrderById: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            headers?: GetOrderByIdHeaders;
+        };
+        result: GetOrderByIdResult;
+    };
+    deleteOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+        };
+        result: DeleteOrderResult;
+    };
+    updateOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            body?: UpdateOrderBody;
+        };
+        result: UpdateOrderResult;
+    };
+    listOrderItems: {
+        args: {
+            params?: ListOrderItemsParams;
+        };
+        result: ListOrderItemsResult;
+    };
+    getRevenue: {
+        args: {
+            params?: GetRevenueParams;
+        };
+        result: GetRevenueResult;
+    };
+    registerOAuth2Client: {
+        args: {
+            body: RegisterOAuth2ClientBody;
+        };
+        result: RegisterOAuth2ClientResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
+export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : NoRequiredKeys<Ops[K]['args']> extends true
+      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
+
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/** Resolve a credential: a literal passes through; a function is awaited per request. */
+async function resolveToken(provider: TokenProvider): Promise<string> {
+  return typeof provider === 'function' ? await provider() : provider;
+}
+
+/**
+ * Build the auth headers/query for one operation's `security` requirements from the
+ * instance credentials (`config.auth`) — capability module, wired into `createClient`.
+ * A scheme with no configured credential contributes nothing (the request is sent
+ * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
+ */
+async function resolveAuth(
+  security: readonly SecuritySpec[],
+  config: ClientConfig
+): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const headers: Record<string, string> = {};
+  const query: Record<string, string> = {};
+  const cookies: string[] = [];
+  for (const scheme of security) {
+    if (scheme.kind === 'apiKey') {
+      const provider = config.auth?.apiKey?.[scheme.scheme];
+      if (provider === undefined) continue;
+      const value = await resolveToken(provider);
+      if (scheme.in === 'header') headers[scheme.name] = value;
+      else if (scheme.in === 'query') query[scheme.name] = value;
+      else cookies.push(`${scheme.name}=${value}`);
+    } else if (scheme.kind === 'bearer') {
+      const provider = config.auth?.bearer;
+      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
+    } else {
+      const basic = config.auth?.basic;
+      if (basic !== undefined) {
+        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+      }
+    }
+  }
+  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
+  return { headers, query };
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+};
+
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
 /**
- * List all order items with menu item details
- *
- * Returns an array of order items for a specific order.
- * Use the `filter` parameter to filter by order ID.
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
  */
-export async function listOrderItems(params: {
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
+}
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe.redocly.com" });
+
+export const { configure, use } = client;
+export const setBearer = client.auth.bearer;
+export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
+export const listMenuItems = (params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
     /**
      * Filters the collection items using space-separated `field:value` pairs.
      *
@@ -1461,39 +1659,115 @@ export async function listOrderItems(params: {
      * - `status:placed createdAt:7d` - Combine multiple filters.
      */
     filter?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderItem[]>(__config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
     /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
      */
-    startDate?: string;
+    search?: string;
     /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
      */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-/**
- * Get revenue statistics
- *
- * Retrieve revenue statistics for a configurable date range.
- * Returns revenue, order counts, average order amount, and other useful statistics.
- */
-export async function getRevenue(params: {
+    limit?: number;
+} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
+export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
+export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
+export const getMenuItemPhoto = (menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
+export const listOrders = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
+export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
+export const getOrderById = (orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
+export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
+export const updateOrder = (orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
+export const listOrderItems = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
+export const getRevenue = (params: {
     /**
      * Start date for the revenue calculation period (ISO 8601 datetime format).
      * Defaults to 30 days ago if not provided.
@@ -1506,29 +1780,5 @@ export async function getRevenue(params: {
      * @format date
      */
     endDate?: string;
-} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
-    const __a = await __auth(["ApiKey"], __config);
-    return __request<RevenueStatistics>(__config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Create OAuth2 client
- *
- * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
- * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
- *   `redirectUris` must be provided (per RFC 7591 Section 2).
- * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
- * Returns the registered client information per RFC 7591, including:
- * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
- */
-export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-    return __request<OAuth2Client>(__config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
-}
+} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
+export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
diff --git a/tests/e2e/generate-client/examples/vendored-edge/.gitignore b/tests/e2e/generate-client/examples/vendored-edge/.gitignore
new file mode 100644
index 0000000000..3c3629e647
--- /dev/null
+++ b/tests/e2e/generate-client/examples/vendored-edge/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/tests/e2e/generate-client/examples/vendored-edge/README.md b/tests/e2e/generate-client/examples/vendored-edge/README.md
new file mode 100644
index 0000000000..a084c6c5c1
--- /dev/null
+++ b/tests/e2e/generate-client/examples/vendored-edge/README.md
@@ -0,0 +1,18 @@
+# vendored-edge example
+
+The self-contained story taken to its end: the client was generated **once** and the single
+output file copied into this directory. `src/api/client.ts` imports nothing, so the same file
+runs on Cloudflare Workers, Deno Deploy, Bun, or any runtime with web-standard `fetch` —
+no npm install, no node_modules at runtime. `worker.ts` is an edge-style handler
+(`export default { fetch }`) that proxies the cafe API through the vendored client.
+
+## Use
+
+```bash
+npm install         # typescript only — and only to type-check
+npm run typecheck
+```
+
+To re-vendor after a spec change, run `redocly generate-client` wherever the CLI is available
+and copy the new `client.ts` over. The `redocly.yaml` here records how the file was produced;
+the repo's CI uses it to drift-check the vendored copy against the generator.
diff --git a/tests/e2e/generate-client/examples/vendored-edge/openapi.yaml b/tests/e2e/generate-client/examples/vendored-edge/openapi.yaml
new file mode 100644
index 0000000000..66d1b5d8f4
--- /dev/null
+++ b/tests/e2e/generate-client/examples/vendored-edge/openapi.yaml
@@ -0,0 +1,97 @@
+openapi: 3.2.0
+info:
+  title: Cafe Menu Upstream
+  description: The upstream API the vendored-edge worker proxies.
+  version: 1.0.0
+servers:
+  - url: https://api.cafe.redocly.com
+    description: Live demo server.
+tags:
+  - name: Products
+    description: Menu operations.
+paths:
+  /menu:
+    get:
+      tags:
+        - Products
+      summary: List all menu items
+      operationId: listMenuItems
+      security: []
+      parameters:
+        - name: search
+          in: query
+          required: false
+          description: Case-insensitive substring match on item names.
+          schema:
+            type: string
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItemList'
+  /menu-item-images/{menuItemId}:
+    get:
+      tags:
+        - Products
+      summary: Retrieve a menu item photo
+      operationId: getMenuItemPhoto
+      security: []
+      parameters:
+        - name: menuItemId
+          in: path
+          required: true
+          description: ID of the menu item.
+          schema:
+            type: string
+        - name: photoSize
+          in: query
+          required: false
+          description: Photo size to retrieve.
+          schema:
+            type: string
+            enum:
+              - thumbnail
+              - medium
+              - large
+            default: medium
+      responses:
+        '200':
+          description: Menu item photo.
+          content:
+            image/png:
+              schema:
+                type: string
+                format: binary
+            text/plain:
+              schema:
+                description: Alternative image text.
+                type: string
+components:
+  schemas:
+    MenuItem:
+      type: object
+      properties:
+        id:
+          description: Menu item ID.
+          type: string
+        name:
+          description: Menu item name.
+          type: string
+        price:
+          description: Price in cents.
+          type: integer
+      required:
+        - id
+        - name
+        - price
+    MenuItemList:
+      type: object
+      properties:
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/MenuItem'
+      required:
+        - items
diff --git a/tests/e2e/generate-client/examples/vendored-edge/package.json b/tests/e2e/generate-client/examples/vendored-edge/package.json
new file mode 100644
index 0000000000..cac5795aa5
--- /dev/null
+++ b/tests/e2e/generate-client/examples/vendored-edge/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@redocly-examples/vendored-edge",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "typecheck": "tsc --noEmit"
+  },
+  "devDependencies": {
+    "typescript": "^5.5.0"
+  }
+}
diff --git a/tests/e2e/generate-client/examples/vendored-edge/redocly.yaml b/tests/e2e/generate-client/examples/vendored-edge/redocly.yaml
new file mode 100644
index 0000000000..7bf35132be
--- /dev/null
+++ b/tests/e2e/generate-client/examples/vendored-edge/redocly.yaml
@@ -0,0 +1,10 @@
+# redocly.yaml — how the vendored src/api/client.ts was produced (and how the
+# repo's CI drift-checks it). The deployed worker does NOT need this file or the
+# CLI: the client is generated once, then the single output file is copied in.
+apis:
+  vendored-edge:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
diff --git a/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts b/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
new file mode 100644
index 0000000000..70f461a814
--- /dev/null
+++ b/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
@@ -0,0 +1,894 @@
+// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Cafe Menu Upstream (v1.0.0)
+ * The upstream API the vendored-edge worker proxies.
+ */
+
+export type MenuItem = {
+    /**
+     * Menu item ID.
+     */
+    id: string;
+    /**
+     * Menu item name.
+     */
+    name: string;
+    /**
+     * Price in cents.
+     */
+    price: number;
+};
+
+export type MenuItemList = {
+    items: MenuItem[];
+};
+
+export type ListMenuItemsResult = MenuItemList;
+
+export type ListMenuItemsParams = {
+    /**
+     * Case-insensitive substring match on item names.
+     */
+    search?: string;
+};
+
+export type ListMenuItemsVariables = {
+    params?: ListMenuItemsParams;
+};
+
+export type GetMenuItemPhotoResult = Blob | string;
+
+export type GetMenuItemPhotoParams = {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+};
+
+export type GetMenuItemPhotoVariables = {
+    /**
+     * ID of the menu item.
+     */
+    menuItemId: string;
+    params?: GetMenuItemPhotoParams;
+};
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    listMenuItems: {
+        args: {
+            params?: ListMenuItemsParams;
+        };
+        result: ListMenuItemsResult;
+    };
+    getMenuItemPhoto: {
+        args: {
+            /**
+             * ID of the menu item.
+             */
+            menuItemId: string;
+            params?: GetMenuItemPhotoParams;
+        };
+        result: GetMenuItemPhotoResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "search", in: "query" }] },
+    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
+export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : NoRequiredKeys<Ops[K]['args']> extends true
+      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
+
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+};
+
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
+/**
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
+ */
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, {});
+}
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe.redocly.com" });
+
+export const { configure, use } = client;
+export const listMenuItems = (params: {
+    /**
+     * Case-insensitive substring match on item names.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
+export const getMenuItemPhoto = (menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
diff --git a/tests/e2e/generate-client/examples/vendored-edge/tsconfig.json b/tests/e2e/generate-client/examples/vendored-edge/tsconfig.json
new file mode 100644
index 0000000000..c517a7d7eb
--- /dev/null
+++ b/tests/e2e/generate-client/examples/vendored-edge/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../tsconfig.base.json",
+  "include": ["worker.ts", "src"]
+}
diff --git a/tests/e2e/generate-client/examples/vendored-edge/worker.ts b/tests/e2e/generate-client/examples/vendored-edge/worker.ts
new file mode 100644
index 0000000000..d395a7868a
--- /dev/null
+++ b/tests/e2e/generate-client/examples/vendored-edge/worker.ts
@@ -0,0 +1,38 @@
+// vendored-edge — the generated client as a VENDORED artifact.
+//
+// `src/api/client.ts` was generated once and copied in. It imports nothing, so
+// the same file runs anywhere web-standard `fetch` exists — Cloudflare Workers,
+// Deno Deploy, Bun, a browser — with no package.json dependencies and no
+// node_modules at runtime. This is an edge-style handler (the
+// `export default { fetch }` shape) proxying the upstream cafe API through the
+// vendored client; `typescript` is the only dev tool here, and only to type-check.
+import { ApiError, client } from './src/api/client.js';
+
+export default {
+  async fetch(request: Request): Promise<Response> {
+    const url = new URL(request.url);
+    try {
+      if (url.pathname === '/menu') {
+        const menu = await client.listMenuItems({
+          params: { search: url.searchParams.get('search') ?? undefined },
+        });
+        return Response.json(menu.items);
+      }
+      const photo = url.pathname.match(/^\/photo\/(?<menuItemId>[^/]+)$/);
+      if (photo?.groups) {
+        const image = await client.getMenuItemPhoto({
+          menuItemId: photo.groups.menuItemId,
+          params: { photoSize: 'thumbnail' },
+        });
+        return image instanceof Blob
+          ? new Response(image, { headers: { 'content-type': image.type } })
+          : new Response(image);
+      }
+      return new Response('Not found', { status: 404 });
+    } catch (error) {
+      // The upstream's error body passes through with its status; anything else is a 502.
+      if (error instanceof ApiError) return Response.json(error.body, { status: error.status });
+      return new Response('Upstream unavailable', { status: 502 });
+    }
+  },
+};
diff --git a/tests/e2e/generate-client/examples/zero-install-quickstart/.gitignore b/tests/e2e/generate-client/examples/zero-install-quickstart/.gitignore
new file mode 100644
index 0000000000..3c3629e647
--- /dev/null
+++ b/tests/e2e/generate-client/examples/zero-install-quickstart/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/tests/e2e/generate-client/examples/zero-install-quickstart/README.md b/tests/e2e/generate-client/examples/zero-install-quickstart/README.md
new file mode 100644
index 0000000000..1ce46cf84c
--- /dev/null
+++ b/tests/e2e/generate-client/examples/zero-install-quickstart/README.md
@@ -0,0 +1,15 @@
+# zero-install-quickstart example
+
+The first-touch loop: `redocly generate-client` → import → call. The generated
+`src/api/client.ts` is one self-contained file with **zero runtime dependencies** —
+nothing to install, nothing to keep in sync with a client library.
+
+## Run
+
+```bash
+npm install        # dev tooling only (the CLI + tsx); the client itself needs nothing
+npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
+npm start          # calls the live cafe demo API and prints the menu
+```
+
+The generated client under `src/api/` is committed and drift-checked against the generator in CI.
diff --git a/tests/e2e/generate-client/examples/zero-install-quickstart/openapi.yaml b/tests/e2e/generate-client/examples/zero-install-quickstart/openapi.yaml
new file mode 100644
index 0000000000..671443f1d8
--- /dev/null
+++ b/tests/e2e/generate-client/examples/zero-install-quickstart/openapi.yaml
@@ -0,0 +1,148 @@
+openapi: 3.2.0
+info:
+  title: Cafe Menu Quickstart
+  description: A tiny slice of the Redocly Cafe demo API — just enough for a first call.
+  version: 1.0.0
+servers:
+  - url: https://api.cafe.redocly.com
+    description: Live demo server.
+tags:
+  - name: Products
+    description: Menu operations.
+  - name: Authorization
+    description: Demo credentials.
+paths:
+  /menu:
+    get:
+      tags:
+        - Products
+      summary: List all menu items
+      operationId: listMenuItems
+      security: []
+      parameters:
+        - name: search
+          in: query
+          required: false
+          description: Case-insensitive substring match on item names.
+          schema:
+            type: string
+        - name: limit
+          in: query
+          required: false
+          description: Number of results per page.
+          schema:
+            type: integer
+            minimum: 1
+            maximum: 100
+            default: 10
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItemList'
+  /menu-item-images/{menuItemId}:
+    get:
+      tags:
+        - Products
+      summary: Retrieve a menu item photo
+      operationId: getMenuItemPhoto
+      security: []
+      parameters:
+        - name: menuItemId
+          in: path
+          required: true
+          description: ID of the menu item.
+          schema:
+            type: string
+        - name: photoSize
+          in: query
+          required: false
+          description: Photo size to retrieve.
+          schema:
+            type: string
+            enum:
+              - thumbnail
+              - medium
+              - large
+            default: medium
+      responses:
+        '200':
+          description: Menu item photo.
+          content:
+            image/png:
+              schema:
+                type: string
+                format: binary
+            text/plain:
+              schema:
+                description: Alternative image text.
+                type: string
+  /oauth2/register:
+    post:
+      tags:
+        - Authorization
+      summary: Create OAuth2 client
+      operationId: registerOAuth2Client
+      security: []
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/RegisterClientRequest'
+      responses:
+        '201':
+          description: OAuth2 client registered.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/OAuth2Client'
+components:
+  schemas:
+    MenuItem:
+      type: object
+      properties:
+        id:
+          description: Menu item ID.
+          type: string
+        name:
+          description: Menu item name.
+          type: string
+        price:
+          description: Price in cents.
+          type: integer
+      required:
+        - id
+        - name
+        - price
+    MenuItemList:
+      type: object
+      properties:
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/MenuItem'
+      required:
+        - items
+    RegisterClientRequest:
+      type: object
+      properties:
+        name:
+          description: Client name.
+          type: string
+      required:
+        - name
+    OAuth2Client:
+      type: object
+      properties:
+        clientId:
+          description: Client identifier issued by the authorization server.
+          type: string
+        clientSecret:
+          description: Client secret issued by the authorization server.
+          type: string
+      required:
+        - clientId
+        - clientSecret
diff --git a/tests/e2e/generate-client/examples/zero-install-quickstart/package.json b/tests/e2e/generate-client/examples/zero-install-quickstart/package.json
new file mode 100644
index 0000000000..53c7930021
--- /dev/null
+++ b/tests/e2e/generate-client/examples/zero-install-quickstart/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "@redocly-examples/zero-install-quickstart",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "generate": "redocly generate-client",
+    "start": "tsx src/main.ts"
+  },
+  "devDependencies": {
+    "@redocly/cli": "latest",
+    "tsx": "^4.0.0",
+    "typescript": "^5.5.0"
+  }
+}
diff --git a/tests/e2e/generate-client/examples/zero-install-quickstart/redocly.yaml b/tests/e2e/generate-client/examples/zero-install-quickstart/redocly.yaml
new file mode 100644
index 0000000000..be28cd8da3
--- /dev/null
+++ b/tests/e2e/generate-client/examples/zero-install-quickstart/redocly.yaml
@@ -0,0 +1,8 @@
+# redocly.yaml — drives `redocly generate-client` for this example.
+apis:
+  zero-install-quickstart:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
diff --git a/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts b/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
new file mode 100644
index 0000000000..f28759fd6f
--- /dev/null
+++ b/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
@@ -0,0 +1,940 @@
+// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Cafe Menu Quickstart (v1.0.0)
+ * A tiny slice of the Redocly Cafe demo API — just enough for a first call.
+ */
+
+export type MenuItem = {
+    /**
+     * Menu item ID.
+     */
+    id: string;
+    /**
+     * Menu item name.
+     */
+    name: string;
+    /**
+     * Price in cents.
+     */
+    price: number;
+};
+
+export type MenuItemList = {
+    items: MenuItem[];
+};
+
+export type RegisterClientRequest = {
+    /**
+     * Client name.
+     */
+    name: string;
+};
+
+export type OAuth2Client = {
+    /**
+     * Client identifier issued by the authorization server.
+     */
+    clientId: string;
+    /**
+     * Client secret issued by the authorization server.
+     */
+    clientSecret: string;
+};
+
+export type ListMenuItemsResult = MenuItemList;
+
+export type ListMenuItemsParams = {
+    /**
+     * Case-insensitive substring match on item names.
+     */
+    search?: string;
+    /**
+     * Number of results per page.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+};
+
+export type ListMenuItemsVariables = {
+    params?: ListMenuItemsParams;
+};
+
+export type GetMenuItemPhotoResult = Blob | string;
+
+export type GetMenuItemPhotoParams = {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+};
+
+export type GetMenuItemPhotoVariables = {
+    /**
+     * ID of the menu item.
+     */
+    menuItemId: string;
+    params?: GetMenuItemPhotoParams;
+};
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientRequest;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    listMenuItems: {
+        args: {
+            params?: ListMenuItemsParams;
+        };
+        result: ListMenuItemsResult;
+    };
+    getMenuItemPhoto: {
+        args: {
+            /**
+             * ID of the menu item.
+             */
+            menuItemId: string;
+            params?: GetMenuItemPhotoParams;
+        };
+        result: GetMenuItemPhotoResult;
+    };
+    registerOAuth2Client: {
+        args: {
+            body: RegisterOAuth2ClientBody;
+        };
+        result: RegisterOAuth2ClientResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "search", in: "query" }, { name: "limit", in: "query" }] },
+    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
+    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
+export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : NoRequiredKeys<Ops[K]['args']> extends true
+      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
+
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+};
+
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
+/**
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
+ */
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, {});
+}
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe.redocly.com" });
+
+export const { configure, use } = client;
+export const listMenuItems = (params: {
+    /**
+     * Case-insensitive substring match on item names.
+     */
+    search?: string;
+    /**
+     * Number of results per page.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
+export const getMenuItemPhoto = (menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
+export const registerOAuth2Client = (body: RegisterClientRequest, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
diff --git a/tests/e2e/generate-client/examples/zero-install-quickstart/src/main.ts b/tests/e2e/generate-client/examples/zero-install-quickstart/src/main.ts
new file mode 100644
index 0000000000..54eb670ea4
--- /dev/null
+++ b/tests/e2e/generate-client/examples/zero-install-quickstart/src/main.ts
@@ -0,0 +1,19 @@
+// zero-install-quickstart — the whole loop: generate → import → call.
+//
+// `redocly generate-client` turned openapi.yaml into ONE self-contained file
+// (src/api/client.ts) with zero runtime dependencies — there is no client
+// library to install or keep in sync. Import the generated functions and call.
+import { getMenuItemPhoto, listMenuItems } from './api/client.js';
+
+const menu = await listMenuItems({ limit: 3 });
+for (const item of menu.items) {
+  console.log(`${item.name} — $${(item.price / 100).toFixed(2)}`);
+}
+
+const [first] = menu.items;
+if (first) {
+  const photo = await getMenuItemPhoto(first.id, { photoSize: 'thumbnail' });
+  console.log(
+    photo instanceof Blob ? `${first.name} photo: ${photo.type}, ${photo.size} bytes` : photo
+  );
+}
diff --git a/tests/e2e/generate-client/examples/zero-install-quickstart/tsconfig.json b/tests/e2e/generate-client/examples/zero-install-quickstart/tsconfig.json
new file mode 100644
index 0000000000..4bd6962d40
--- /dev/null
+++ b/tests/e2e/generate-client/examples/zero-install-quickstart/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../tsconfig.base.json",
+  "include": ["src"]
+}
diff --git a/tests/e2e/generate-client/examples/zod/redocly.yaml b/tests/e2e/generate-client/examples/zod/redocly.yaml
index c545911f40..fcc2d58b8f 100644
--- a/tests/e2e/generate-client/examples/zod/redocly.yaml
+++ b/tests/e2e/generate-client/examples/zod/redocly.yaml
@@ -9,4 +9,3 @@ apis:
       generators:
         - sdk
         - zod
-      facade: functions
diff --git a/tests/e2e/generate-client/examples/zod/src/api/client.ts b/tests/e2e/generate-client/examples/zod/src/api/client.ts
index 804e48df94..1ad55ad78b 100644
--- a/tests/e2e/generate-client/examples/zod/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/zod/src/api/client.ts
@@ -412,599 +412,6 @@ export function isDessert(value: MenuItem): value is Dessert {
     return (value as Record<string, unknown>)["category"] === "dessert";
 }
 
-/**
- * Static metadata for every operation, keyed by operationId: the HTTP `method`
- * and the `path` template (with `{param}` placeholders intact). Minification-safe
- * — useful for building cache/query keys, tracing span names, and request logging
- * without re-deriving them at each call site.
- */
-export const OPERATIONS = {
-    listMenuItems: { method: "GET", path: "/menu", tags: ["Products"] },
-    createMenuItem: { method: "POST", path: "/menu", tags: ["Products"] },
-    deleteMenuItem: { method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"] },
-    getMenuItemPhoto: { method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"] },
-    listOrders: { method: "GET", path: "/orders", tags: ["Orders"] },
-    createOrder: { method: "POST", path: "/orders", tags: ["Orders"] },
-    getOrderById: { method: "GET", path: "/orders/{orderId}", tags: ["Orders"] },
-    deleteOrder: { method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"] },
-    updateOrder: { method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"] },
-    listOrderItems: { method: "GET", path: "/order-items", tags: ["Orders"] },
-    getRevenue: { method: "GET", path: "/revenue", tags: ["Statistics"] },
-    registerOAuth2Client: { method: "POST", path: "/oauth2/register", tags: ["Authorization"] }
-} as const;
-
-/**
- * The operationId of any operation in this client.
- */
-export type OperationId = keyof typeof OPERATIONS;
-
-/**
- * Static metadata describing one operation: its HTTP method, path template, and tags.
- */
-export type OperationMetadata = {
-    readonly method: string;
-    readonly path: string;
-    readonly tags: readonly string[];
-};
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
-
-let BASE = "https://api.cafe.redocly.com";
-
-/** Identity of the operation a request belongs to. Stable across path interpolation. */
-export type OperationContext = {
-    id: OperationId;
-    path: OperationPath;
-    tags: OperationTag[];
-};
-
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
-export type RequestContext = {
-    url: string;
-    method: string;
-    headers: Record<string, string>;
-    body?: unknown;
-    /** The operation being called: its id (operationId), path template, and tags. */
-    operation: OperationContext;
-};
-
-/**
- * Configuration and extension hooks for a client. Supplied per-instance via
- * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
- * (functions facade).
- */
-export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
-    serverUrl?: string;
-    /** Extra headers merged into every request; a function is invoked per request. */
-    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
-    /** Transport used to issue requests. Defaults to the global `fetch`. */
-    fetch?: typeof fetch;
-    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    /** Observe — or replace, by returning a `Response` — the response before parsing. */
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    /**
-     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
-     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
-     */
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
-    /**
-     * Composable interceptors run around every request, alongside the single
-     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
-     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
-     * the last-registered middleware wraps closest to the network. Register more at runtime
-     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
-     */
-    middleware?: Middleware[];
-    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
-    retry?: RetryConfig;
-    /**
-     * Per-instance auth credentials. When set, they override the module-global
-     * `set*` helpers for requests made through this config (each scheme falls back
-     * to its global slot when omitted here). Only the schemes an operation declares
-     * in its `security` are ever sent.
-     */
-    auth?: AuthCredentials;
-};
-
-/**
- * A request interceptor; every field is optional, so a middleware can hook any subset of
- * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
- * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
- * failure into the error to throw, threaded through each middleware in turn.
- */
-export type Middleware = {
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/** Context handed to `retryOn` for the attempt that just failed. */
-export type RetryContext = {
-    /** 1-based number of the attempt that just failed. */
-    attempt: number;
-    /** The request that was attempted. */
-    request: RequestContext;
-    /** Present when the server returned a (non-ok) response. */
-    response?: Response;
-    /** Present when the transport threw (network error, DNS, connection reset). */
-    error?: unknown;
-};
-
-/** Retry policy; all fields optional with sensible defaults. */
-export type RetryConfig = {
-    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
-    retries?: number;
-    /** Base delay in milliseconds. Default 1000. */
-    retryDelay?: number;
-    /** Backoff shape. Default 'exponential'. */
-    retryStrategy?: RetryStrategy;
-    /** Apply full jitter over the computed delay. Default true. */
-    jitter?: boolean;
-    /**
-     * Decide whether to retry a failed attempt. Default: retry only idempotent
-     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
-     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
-     */
-    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
-};
-
-/**
- * How the response body is read. `'auto'` negotiates from the content type (the
- * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
- */
-export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
-
-/**
- * The trailing per-operation argument: standard `RequestInit` plus an optional
- * per-call retry override and a `parseAs` escape hatch.
- *
- * `parseAs` forces how the response body is read; overrides the inferred kind.
- * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
- * override — the static return type is unchanged.
- */
-export type RequestOptions = RequestInit & {
-    retry?: Partial<RetryConfig>;
-    parseAs?: ParseAs;
-};
-
-/**
- * Override the base URL used by every generated operation. Useful when the
- * runtime environment differs from the value declared in `servers[0].url`
- * (e.g. dev / staging / prod toggles in a single-page app).
- *
- * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ serverUrl })`.
- */
-export function setServerUrl(url: string): void {
-    BASE = url;
-}
-
-/** The global config used by the functions facade (see `configure`). */
-const __config: ClientConfig = {};
-
-/**
- * Merge `config` into the global configuration used by the functions facade —
- * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
- * hooks once for every free function. The service-class facade configures per
- * instance instead (`new Client(config)`).
- */
-export function configure(config: ClientConfig): void {
-    Object.assign(__config, config);
-}
-
-/**
- * Append interceptors to the functions facade's global middleware chain (see
- * `ClientConfig.middleware`). The service-class facade registers per instance via
- * `<Client>.use(...)` instead.
- */
-export function use(...middleware: Middleware[]): void {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    __config.middleware = [...(__config.middleware ?? []), ...middleware];
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function __middleware(config: ClientConfig): Middleware[] {
-    const single = config.onRequest || config.onResponse || config.onError
-        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-        : [];
-    return [...single, ...(config.middleware ?? [])];
-}
-
-export class ApiError extends Error {
-    public readonly url: string;
-    public readonly status: number;
-    public readonly statusText: string;
-    public readonly body: unknown;
-    constructor(url: string, status: number, statusText: string, body: unknown) {
-        super(`Request failed with status ${status}`);
-        this.name = 'ApiError';
-        this.url = url;
-        this.status = status;
-        this.statusText = statusText;
-        this.body = body;
-    }
-}
-
-type QueryPrimitive = string | number | boolean;
-
-type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
-
-/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
-type QueryStyle = {
-    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-    explode: boolean;
-    allowReserved?: boolean;
-};
-
-/**
- * Percent-encode `value` but leave the RFC-3986 reserved set
- * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
- */
-function __encodeReserved(value: string): string {
-    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
-}
-
-function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
-    if (!query)
-        return url;
-    const params = new URLSearchParams();
-    const raw: string[] = [];
-    for (const [key, value] of Object.entries(query)) {
-        if (value === undefined || value === null)
-            continue;
-        const spec = styles?.[key];
-        if (!spec) {
-            if (Array.isArray(value)) {
-                for (const v of value) {
-                    if (v !== undefined && v !== null)
-                        params.append(key, String(v));
-                }
-            }
-            else if (typeof value === 'object') {
-                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-                for (const [subKey, subValue] of Object.entries(value)) {
-                    if (subValue !== undefined && subValue !== null) {
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                    }
-                }
-            }
-            else {
-                params.append(key, String(value));
-            }
-            continue;
-        }
-        if (Array.isArray(value)) {
-            const items = value.filter((v) => v !== undefined && v !== null).map(String);
-            if (spec.style === 'form' && spec.explode) {
-                for (const v of items) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}=${__encodeReserved(v)}`);
-                    else
-                        params.append(key, v);
-                }
-            }
-            else {
-                // Delimited styles put the LITERAL delimiter on the wire; only the
-                // values are encoded. `%20` (not `+`) is the literal space delimiter.
-                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
-                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-            }
-        }
-        else if (typeof value === 'object') {
-            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-            for (const [subKey, subValue] of Object.entries(value)) {
-                if (subValue !== undefined && subValue !== null) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
-                    else
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                }
-            }
-        }
-        else if (spec.allowReserved) {
-            raw.push(`${key}=${__encodeReserved(String(value))}`);
-        }
-        else {
-            params.append(key, String(value));
-        }
-    }
-    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-    return qs ? `${url}?${qs}` : url;
-}
-
-async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
-    response: Response;
-    context: RequestContext;
-}> {
-    const { retry: callRetry, ...fetchInit } = init;
-    const retry: RetryConfig = { ...config.retry, ...callRetry };
-    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-    const headers: Record<string, string> = {
-        Accept: 'application/json',
-        ...extra,
-        ...(fetchInit.headers as Record<string, string> | undefined),
-    };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
-    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-    let payload: BodyInit | undefined;
-    if (context.body !== undefined) {
-        const value = context.body;
-        const isBinary = value instanceof Blob ||
-            value instanceof ArrayBuffer ||
-            ArrayBuffer.isView(value as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-        const isURLSearchParams = value instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-            payload = value as BodyInit;
-        }
-        else {
-            payload = JSON.stringify(value);
-            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-                context.headers['Content-Type'] = 'application/json';
-            }
-        }
-    }
-    const doFetch = config.fetch ?? fetch;
-    const maxAttempts = 1 + (retry.retries ?? 0);
-    const retryOn = retry.retryOn ?? __defaultRetryOn;
-    const signal = fetchInit.signal ?? undefined;
-    let attempt = 0;
-    while (true) {
-        attempt++;
-        if (signal?.aborted)
-            throw __abortError(signal);
-        let response: Response;
-        try {
-            response = await doFetch(context.url, {
-                ...fetchInit,
-                method: context.method,
-                headers: context.headers,
-                body: payload,
-            });
-        }
-        catch (error) {
-            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
-                await __sleep(__retryDelay(retry, attempt, null), signal);
-                continue;
-            }
-            throw error;
-        }
-        // Reverse order: the last-registered middleware wraps closest to the network (onion).
-        for (let i = middleware.length - 1; i >= 0; i--) {
-            const onResponse = middleware[i].onResponse;
-            if (onResponse) {
-                const replaced = await onResponse(response, context);
-                if (replaced)
-                    response = replaced;
-            }
-        }
-        if (!response.ok &&
-            attempt < maxAttempts &&
-            !signal?.aborted &&
-            (await retryOn({ attempt, request: context, response }))) {
-            const retryAfter = response.headers.get('retry-after');
-            // Drain the abandoned response body before the next attempt: an unread body
-            // keeps the connection checked out (and can stall the pool) under Node/undici
-            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-            await response.body?.cancel().catch(() => undefined);
-            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
-            continue;
-        }
-        return { response, context };
-    }
-}
-
-async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-    if (kind === 'void' || response.status === 204)
-        return undefined;
-    if (kind === 'stream')
-        return response.body;
-    if (kind === 'blob')
-        return response.blob();
-    if (kind === 'arrayBuffer')
-        return response.arrayBuffer();
-    if (kind === 'formData')
-        return response.formData();
-    if (kind === 'text')
-        return response.text();
-    if (kind === 'json')
-        return response.json();
-    // 'auto' — negotiate from the response's content type.
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json'))
-        return response.json();
-    if (contentType.startsWith('text/'))
-        return response.text();
-    return response.blob();
-}
-
-async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
-    const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, op, url, sendInit, body);
-    if (!response.ok) {
-        const errorBody = await readError(response);
-        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
-        // Thread the error through each middleware's onError in turn (each may replace it).
-        for (const mw of __middleware(config)) {
-            if (mw.onError)
-                error = await mw.onError(error as ApiError, context);
-        }
-        throw error;
-    }
-    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
-    return (await __parse(response, kind)) as T;
-}
-
-async function readError(response: Response): Promise<unknown> {
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json')) {
-        return response.json().catch(() => undefined);
-    }
-    return response.text().catch(() => undefined);
-}
-
-const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-
-const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-function __defaultRetryOn(ctx: RetryContext): boolean {
-    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
-        return false;
-    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-    if (retryAfter) {
-        const seconds = Number(retryAfter);
-        if (!Number.isNaN(seconds))
-            return seconds * 1000;
-        const when = Date.parse(retryAfter);
-        if (!Number.isNaN(when))
-            return Math.max(0, when - Date.now());
-    }
-    const base = retry.retryDelay ?? 1000;
-    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-    return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
-    return new Promise((resolve, reject) => {
-        if (signal?.aborted) {
-            reject(__abortError(signal));
-            return;
-        }
-        const onAbort = () => {
-            clearTimeout(timer);
-            reject(__abortError(signal as AbortSignal));
-        };
-        const timer = setTimeout(() => {
-            if (signal)
-                signal.removeEventListener('abort', onAbort);
-            resolve();
-        }, ms);
-        if (signal)
-            signal.addEventListener('abort', onAbort, { once: true });
-    });
-}
-
-function __abortError(signal: AbortSignal): globalThis.Error {
-    const reason = (signal as {
-        reason?: unknown;
-    }).reason;
-    if (reason instanceof Error)
-        return reason;
-    return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * Normalize an operation's header-parameter object into a plain string record,
- * dropping any `undefined` / `null` entries (optional headers the caller omitted)
- * and stringifying the rest. Mirrors __buildUrl's handling of query values.
- */
-function __headers(values: Record<string, string | number | boolean | null | undefined>): Record<string, string> {
-    const out: Record<string, string> = {};
-    for (const [key, value] of Object.entries(values)) {
-        if (value !== undefined && value !== null)
-            out[key] = String(value);
-    }
-    return out;
-}
-
-/**
- * A credential value, or a (possibly async) function that returns one per request.
- */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/**
- * Per-instance credentials for `ClientConfig.auth`. Each field overrides its module-global
- * `set*` helper for this config (`apiKey` is keyed by scheme name); omitted fields fall back
- * to the global slots.
- */
-export type AuthCredentials = {
-    bearer?: TokenProvider;
-    apiKey?: Record<string, TokenProvider>;
-};
-
-let __bearerToken: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the bearer credential sent as `Authorization: Bearer <token>`
- * on every operation that accepts bearer / OAuth2 / OpenID Connect auth. Accepts a string or a
- * (possibly async) function resolved per request.
- */
-export function setBearer(token: TokenProvider | null): void {
-    __bearerToken = token;
-}
-
-let __apiKey_ApiKey: TokenProvider | null = null;
-
-/**
- * Set (or clear, with `null`) the credential for the `ApiKey` API-key scheme. Accepts a
- * string or a (possibly async) function resolved per request.
- */
-export function setApiKey(key: TokenProvider | null): void {
-    __apiKey_ApiKey = key;
-}
-
-/**
- * Resolve a credential slot to a string (awaiting an async token function), or `null` when unset.
- */
-async function __resolve(slot: TokenProvider | null): Promise<string | null> {
-    if (slot === null)
-        return null;
-    return typeof slot === "function" ? slot() : slot;
-}
-
-/**
- * Build the auth `headers` and `query` for an operation from the currently-set credentials.
- * Only the schemes the operation accepts are consulted; unset slots contribute nothing. Callers
- * can always override by passing their own `init.headers`.
- */
-async function __auth(schemes: string[], config: ClientConfig): Promise<{
-    headers: Record<string, string>;
-    query: Record<string, string>;
-}> {
-    const headers: Record<string, string> = {};
-    const query: Record<string, string> = {};
-    const cookies: string[] = [];
-    for (const scheme of schemes) {
-        switch (scheme) {
-            case "OAuth2": {
-                const v = await __resolve(config.auth?.bearer ?? __bearerToken);
-                if (v !== null)
-                    headers["Authorization"] = `Bearer ${v}`;
-                break;
-            }
-            case "ApiKey": {
-                const v = await __resolve(config.auth?.apiKey?.["ApiKey"] ?? __apiKey_ApiKey);
-                if (v !== null)
-                    headers["X-API-Key"] = v;
-                break;
-            }
-        }
-    }
-    if (cookies.length > 0)
-        headers["Cookie"] = cookies.join("; ");
-    return { headers, query };
-}
-
 export type ListMenuItemsResult = MenuItemList;
 
 export type ListMenuItemsParams = {
@@ -1062,64 +469,6 @@ export type ListMenuItemsVariables = {
     params?: ListMenuItemsParams;
 };
 
-/**
- * List all menu items
- *
- * Retrieve a collection of menu items with optional filtering and pagination.
- */
-export async function listMenuItems(params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}): Promise<MenuItemList> {
-    return __request<MenuItemList>(__config, { id: "listMenuItems", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`, params), { method: "GET", ...init });
-}
-
 export type CreateMenuItemResult = MenuItem;
 
 export type CreateMenuItemBody = FormData;
@@ -1128,16 +477,6 @@ export type CreateMenuItemVariables = {
     body: CreateMenuItemBody;
 };
 
-/**
- * Create menu item
- *
- * Create a new menu item.
- */
-export async function createMenuItem(body: FormData, init: RequestOptions = {}): Promise<MenuItem> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<MenuItem>(__config, { id: "createMenuItem", path: "/menu", tags: ["Products"] }, __buildUrl(__config, `/menu`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
 export type DeleteMenuItemResult = void;
 
 export type DeleteMenuItemVariables = {
@@ -1148,16 +487,6 @@ export type DeleteMenuItemVariables = {
     menuItemId: string;
 };
 
-/**
- * Delete a menu item
- *
- * Delete an existing menu item.
- */
-export async function deleteMenuItem(menuItemId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, { id: "deleteMenuItem", path: "/menu/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu/${encodeURIComponent(String(menuItemId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
 export type GetMenuItemPhotoResult = Blob | string;
 
 export type GetMenuItemPhotoParams = {
@@ -1176,20 +505,6 @@ export type GetMenuItemPhotoVariables = {
     params?: GetMenuItemPhotoParams;
 };
 
-/**
- * Retrieve a menu item photo
- *
- * Retrieve the product photo image for a specific menu item.
- */
-export async function getMenuItemPhoto(menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}): Promise<Blob | string> {
-    return __request<Blob | string>(__config, { id: "getMenuItemPhoto", path: "/menu-item-images/{menuItemId}", tags: ["Products"] }, __buildUrl(__config, `/menu-item-images/${encodeURIComponent(String(menuItemId))}`, params), { method: "GET", ...init }, undefined, "blob");
-}
-
 export type ListOrdersResult = OrderList;
 
 export type ListOrdersParams = {
@@ -1247,95 +562,25 @@ export type ListOrdersVariables = {
     params?: ListOrdersParams;
 };
 
-/**
- * List all orders
- *
- * Retrieve a collection of orders with optional filtering and pagination.
- */
-export async function listOrders(params: {
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+export type GetOrderByIdResult = Order;
+
+export type GetOrderByIdHeaders = {
     /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
      */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderList> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderList>(__config, { id: "listOrders", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-/**
- * Create order
- *
- * Create a new order.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function createOrder(body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "createOrder", path: "/orders", tags: ["Orders"] }, __buildUrl(__config, `/orders`), { method: "POST", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
+    "X-Request-Id"?: string;
+};
+
+export type GetOrderByIdVariables = {
     /**
      * ID of the order to retrieve.
      * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
@@ -1344,22 +589,6 @@ export type GetOrderByIdVariables = {
     headers?: GetOrderByIdHeaders;
 };
 
-/**
- * Retrieve an order
- *
- * Retrieve a single order by its ID.
- */
-export async function getOrderById(orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "getOrderById", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "GET", ...init, headers: { ...__a.headers, ...__headers(headers), ...init.headers as Record<string, string> | undefined } });
-}
-
 export type DeleteOrderResult = void;
 
 export type DeleteOrderVariables = {
@@ -1370,17 +599,6 @@ export type DeleteOrderVariables = {
     orderId: string;
 };
 
-/**
- * Delete an order
- *
- * Delete the order.
- * To keep the order history, the order should be canceled instead of deleted.
- */
-export async function deleteOrder(orderId: string, init: RequestOptions = {}): Promise<void> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<void>(__config, { id: "deleteOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "DELETE", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, undefined, "void");
-}
-
 export type UpdateOrderResult = Order;
 
 export type UpdateOrderBody = {
@@ -1396,19 +614,6 @@ export type UpdateOrderVariables = {
     body?: UpdateOrderBody;
 };
 
-/**
- * Partially update an order
- *
- * Update an existing order status.
- * Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
- */
-export async function updateOrder(orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}): Promise<Order> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<Order>(__config, { id: "updateOrder", path: "/orders/{orderId}", tags: ["Orders"] }, __buildUrl(__config, `/orders/${encodeURIComponent(String(orderId))}`), { method: "PATCH", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } }, body);
-}
-
 export type ListOrderItemsResult = OrderItem[];
 
 export type ListOrderItemsParams = {
@@ -1436,13 +641,1006 @@ export type ListOrderItemsVariables = {
     params?: ListOrderItemsParams;
 };
 
+export type GetRevenueResult = RevenueStatistics;
+
+export type GetRevenueParams = {
+    /**
+     * Start date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to 30 days ago if not provided.
+     * @format date
+     */
+    startDate?: string;
+    /**
+     * End date for the revenue calculation period (ISO 8601 datetime format).
+     * Defaults to current time if not provided.
+     * @format date
+     */
+    endDate?: string;
+};
+
+export type GetRevenueVariables = {
+    params?: GetRevenueParams;
+};
+
+export type RegisterOAuth2ClientResult = OAuth2Client;
+
+export type RegisterOAuth2ClientBody = RegisterClientObject;
+
+export type RegisterOAuth2ClientVariables = {
+    body: RegisterOAuth2ClientBody;
+};
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    listMenuItems: {
+        args: {
+            params?: ListMenuItemsParams;
+        };
+        result: ListMenuItemsResult;
+    };
+    createMenuItem: {
+        args: {
+            body: CreateMenuItemBody;
+        };
+        result: CreateMenuItemResult;
+    };
+    deleteMenuItem: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+        };
+        result: DeleteMenuItemResult;
+    };
+    getMenuItemPhoto: {
+        args: {
+            /**
+             * ID of the menu item to retrieve.
+             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            menuItemId: string;
+            params?: GetMenuItemPhotoParams;
+        };
+        result: GetMenuItemPhotoResult;
+    };
+    listOrders: {
+        args: {
+            params?: ListOrdersParams;
+        };
+        result: ListOrdersResult;
+    };
+    createOrder: {
+        args: {
+            body: CreateOrderBody;
+        };
+        result: CreateOrderResult;
+    };
+    getOrderById: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            headers?: GetOrderByIdHeaders;
+        };
+        result: GetOrderByIdResult;
+    };
+    deleteOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+        };
+        result: DeleteOrderResult;
+    };
+    updateOrder: {
+        args: {
+            /**
+             * ID of the order to retrieve.
+             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
+             */
+            orderId: string;
+            body?: UpdateOrderBody;
+        };
+        result: UpdateOrderResult;
+    };
+    listOrderItems: {
+        args: {
+            params?: ListOrderItemsParams;
+        };
+        result: ListOrderItemsResult;
+    };
+    getRevenue: {
+        args: {
+            params?: GetRevenueParams;
+        };
+        result: GetRevenueResult;
+    };
+    registerOAuth2Client: {
+        args: {
+            body: RegisterOAuth2ClientBody;
+        };
+        result: RegisterOAuth2ClientResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
+export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : NoRequiredKeys<Ops[K]['args']> extends true
+      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
+
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/** Resolve a credential: a literal passes through; a function is awaited per request. */
+async function resolveToken(provider: TokenProvider): Promise<string> {
+  return typeof provider === 'function' ? await provider() : provider;
+}
+
+/**
+ * Build the auth headers/query for one operation's `security` requirements from the
+ * instance credentials (`config.auth`) — capability module, wired into `createClient`.
+ * A scheme with no configured credential contributes nothing (the request is sent
+ * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
+ */
+async function resolveAuth(
+  security: readonly SecuritySpec[],
+  config: ClientConfig
+): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const headers: Record<string, string> = {};
+  const query: Record<string, string> = {};
+  const cookies: string[] = [];
+  for (const scheme of security) {
+    if (scheme.kind === 'apiKey') {
+      const provider = config.auth?.apiKey?.[scheme.scheme];
+      if (provider === undefined) continue;
+      const value = await resolveToken(provider);
+      if (scheme.in === 'header') headers[scheme.name] = value;
+      else if (scheme.in === 'query') query[scheme.name] = value;
+      else cookies.push(`${scheme.name}=${value}`);
+    } else if (scheme.kind === 'bearer') {
+      const provider = config.auth?.bearer;
+      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
+    } else {
+      const basic = config.auth?.basic;
+      if (basic !== undefined) {
+        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+      }
+    }
+  }
+  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
+  return { headers, query };
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+};
+
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
 /**
- * List all order items with menu item details
- *
- * Returns an array of order items for a specific order.
- * Use the `filter` parameter to filter by order ID.
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
  */
-export async function listOrderItems(params: {
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
+}
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe.redocly.com" });
+
+export const { configure, use } = client;
+export const setBearer = client.auth.bearer;
+export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
+export const listMenuItems = (params: {
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
     /**
      * Filters the collection items using space-separated `field:value` pairs.
      *
@@ -1461,39 +1659,115 @@ export async function listOrderItems(params: {
      * - `status:placed createdAt:7d` - Combine multiple filters.
      */
     filter?: string;
-} = {}, init: RequestOptions = {}): Promise<OrderItem[]> {
-    const __a = await __auth(["OAuth2"], __config);
-    return __request<OrderItem[]>(__config, { id: "listOrderItems", path: "/order-items", tags: ["Orders"] }, __buildUrl(__config, `/order-items`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
     /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
      */
-    startDate?: string;
+    search?: string;
     /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
      */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-/**
- * Get revenue statistics
- *
- * Retrieve revenue statistics for a configurable date range.
- * Returns revenue, order counts, average order amount, and other useful statistics.
- */
-export async function getRevenue(params: {
+    limit?: number;
+} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
+export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
+export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
+export const getMenuItemPhoto = (menuItemId: string, params: {
+    /**
+     * Photo size to retrieve.
+     */
+    photoSize?: "thumbnail" | "medium" | "large";
+} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
+export const listOrders = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+    /**
+     * To sort by id in descending order use `-id`.
+     * To sort by id in ascending order use `id`.
+     */
+    sort?: string;
+    /**
+     * Use to return a number of results per page.
+     * If there is more data, use in combination with `after` to page through the data.
+     * @minimum 1
+     * @maximum 100
+     */
+    limit?: number;
+    /**
+     * Use the `endCursor` as a value for the `after` parameter to get the next page.
+     */
+    after?: string;
+    /**
+     * Use the `startCursor` as a value for the `before` parameter to get the next page.
+     */
+    before?: string;
+    /**
+     * Performs a case-insensitive text search across relevant fields in the collection.
+     *
+     * **Fields searched depend on the endpoint:**
+     * - **Menu items:** `name`, `photoTextDescription`
+     * - **Orders:** `customerName`, `id`
+     *
+     * Returns items where any of the searchable fields contain the search term as a substring.
+     */
+    search?: string;
+} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
+export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
+export const getOrderById = (orderId: string, headers: {
+    /**
+     * Optional client-supplied correlation ID, echoed in logs and traces.
+     * @format uuid
+     */
+    "X-Request-Id"?: string;
+} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
+export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
+export const updateOrder = (orderId: string, body?: {
+    status: OrderStatus;
+}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
+export const listOrderItems = (params: {
+    /**
+     * Filters the collection items using space-separated `field:value` pairs.
+     *
+     * **Format:** `field1:value1 field2:value2`
+     *
+     * **Supported operators:**
+     * - `field:value` - Exact match
+     * - `field:value1,value2` - Match any of the comma-separated values (OR)
+     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
+     *
+     * **Examples:**
+     * - `status:placed` - Filter by single status.
+     * - `status:placed,completed` - Filter by multiple statuses.
+     * - `createdAt:30d` - Filter orders created in the last 30 days.
+     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
+     * - `status:placed createdAt:7d` - Combine multiple filters.
+     */
+    filter?: string;
+} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
+export const getRevenue = (params: {
     /**
      * Start date for the revenue calculation period (ISO 8601 datetime format).
      * Defaults to 30 days ago if not provided.
@@ -1506,29 +1780,5 @@ export async function getRevenue(params: {
      * @format date
      */
     endDate?: string;
-} = {}, init: RequestOptions = {}): Promise<RevenueStatistics> {
-    const __a = await __auth(["ApiKey"], __config);
-    return __request<RevenueStatistics>(__config, { id: "getRevenue", path: "/revenue", tags: ["Statistics"] }, __buildUrl(__config, `/revenue`, params), { method: "GET", ...init, headers: { ...__a.headers, ...init.headers as Record<string, string> | undefined } });
-}
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Create OAuth2 client
- *
- * Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
- * - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type,
- *   `redirectUris` must be provided (per RFC 7591 Section 2).
- * - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
- * Returns the registered client information per RFC 7591, including:
- * - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
- */
-export async function registerOAuth2Client(body: RegisterClientObject, init: RequestOptions = {}): Promise<OAuth2Client> {
-    return __request<OAuth2Client>(__config, { id: "registerOAuth2Client", path: "/oauth2/register", tags: ["Authorization"] }, __buildUrl(__config, `/oauth2/register`), { method: "POST", ...init }, body);
-}
+} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
+export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
diff --git a/tests/e2e/generate-client/extension.test.ts b/tests/e2e/generate-client/extension.test.ts
index 222b27d361..7e4cfd3901 100644
--- a/tests/e2e/generate-client/extension.test.ts
+++ b/tests/e2e/generate-client/extension.test.ts
@@ -1,6 +1,6 @@
 /**
  * Behavioral e2e for the extension contract (D3). Rather than a live server, we
- * inject a fake `fetch` via `configure()` / `new Client(config)` and capture what
+ * inject a fake `fetch` via `configure()` / `createClient(…, config)` and capture what
  * the generated runtime actually produced — proving that `serverUrl`, `config.headers`,
  * `onRequest`, transport-swap, and per-instance config observably take effect.
  */
@@ -41,7 +41,7 @@ function runConsumer(dir: string, script: string): unknown {
   return JSON.parse(result.stdout.trim());
 }
 
-describe('extension contract — functions facade (configure)', () => {
+describe('extension contract — flat surface (configure)', () => {
   let dir = '';
   beforeAll(() => {
     dir = mkdtempSync(join(tmpdir(), 'ext-fn-'));
@@ -109,11 +109,13 @@ describe('extension contract — functions facade (configure)', () => {
   }, 60_000);
 });
 
-describe('extension contract — service-class facade (per-instance config)', () => {
+describe('extension contract — per-instance config (createClient)', () => {
   let dir = '';
   beforeAll(() => {
-    dir = mkdtempSync(join(tmpdir(), 'ext-sc-'));
-    generate(dir, ['--facade', 'service-class', '--name', 'PetClient']);
+    // The temp dir lives INSIDE the repo so the consumer's import of
+    // `@redocly/client-generator` resolves through the workspace node_modules symlink.
+    dir = mkdtempSync(join(__dirname, '.tmp-ext-instance-'));
+    generate(dir, ['--runtime', 'package']);
   }, 60_000);
   afterAll(() => {
     if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
@@ -123,7 +125,8 @@ describe('extension contract — service-class facade (per-instance config)', ()
     const calls = runConsumer(
       dir,
       outdent`
-        import { PetClient } from './client.ts';
+        import { createClient } from '@redocly/client-generator';
+        import { OPERATIONS, type Ops } from './client.ts';
 
         const calls: Array<{ tag: string; url: string; tenant: string }> = [];
         const make = (tag: string) =>
@@ -133,8 +136,8 @@ describe('extension contract — service-class facade (per-instance config)', ()
             return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
           }) as unknown as typeof fetch;
 
-        const a = new PetClient({ serverUrl: 'https://a.example', headers: { 'X-Tenant': 'A' }, fetch: make('a') });
-        const b = new PetClient({ serverUrl: 'https://b.example', headers: { 'X-Tenant': 'B' }, fetch: make('b') });
+        const a = createClient<Ops>(OPERATIONS, { serverUrl: 'https://a.example', headers: { 'X-Tenant': 'A' }, fetch: make('a') });
+        const b = createClient<Ops>(OPERATIONS, { serverUrl: 'https://b.example', headers: { 'X-Tenant': 'B' }, fetch: make('b') });
 
         await a.listPets();
         await b.listPets();
@@ -147,14 +150,14 @@ describe('extension contract — service-class facade (per-instance config)', ()
     expect(calls[1]).toEqual({ tag: 'b', url: 'https://b.example/pets', tenant: 'B' });
   }, 60_000);
 
-  test('an instance with no config falls back to the spec-derived BASE', () => {
+  test('the generated module instance keeps the spec-derived serverUrl unless overridden', () => {
     const seen = runConsumer(
       dir,
       outdent`
-        import { PetClient } from './client.ts';
+        import { client } from './client.ts';
 
         let captured = '';
-        const client = new PetClient({
+        client.configure({
           fetch: (async (url: string) => {
             captured = String(url);
             return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } });
@@ -165,7 +168,7 @@ describe('extension contract — service-class facade (per-instance config)', ()
       `
     ) as { captured: string };
 
-    // No serverUrl in config → falls back to the inlined BASE from base.yaml.
+    // configure() only swapped the transport → the baked serverUrl from base.yaml stays.
     expect(seen.captured).toBe('http://localhost:3102/pets');
   }, 60_000);
 });
diff --git a/tests/e2e/generate-client/fixtures/package-runtime.yaml b/tests/e2e/generate-client/fixtures/package-runtime.yaml
new file mode 100644
index 0000000000..a5e5605b19
--- /dev/null
+++ b/tests/e2e/generate-client/fixtures/package-runtime.yaml
@@ -0,0 +1,82 @@
+openapi: 3.1.0
+info:
+  title: Package Runtime API
+  version: 1.0.0
+servers:
+  - url: http://localhost:3123
+paths:
+  /orders/{order-id}:
+    get:
+      operationId: getOrder
+      security:
+        - bearerAuth: []
+      parameters:
+        - name: order-id
+          in: path
+          required: true
+          schema: { type: string }
+        - name: expand
+          in: query
+          schema: { type: string }
+      responses:
+        '200':
+          description: The order.
+          content:
+            application/json:
+              schema: { $ref: '#/components/schemas/Order' }
+  /orders:
+    post:
+      operationId: createOrder
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema: { $ref: '#/components/schemas/NewOrder' }
+      responses:
+        '201':
+          description: Created.
+          content:
+            application/json:
+              schema: { $ref: '#/components/schemas/Order' }
+  /configure-op:
+    get:
+      # Collides with the client's reserved `configure` member — the operation is renamed.
+      operationId: configure
+      responses:
+        '200':
+          description: Status.
+          content:
+            application/json:
+              schema: { type: string }
+  /events:
+    get:
+      operationId: streamEvents
+      responses:
+        '200':
+          description: Order events.
+          content:
+            text/event-stream:
+              schema: { $ref: '#/components/schemas/OrderEvent' }
+components:
+  securitySchemes:
+    bearerAuth:
+      type: http
+      scheme: bearer
+  schemas:
+    Order:
+      type: object
+      required: [id, status]
+      properties:
+        id: { type: string }
+        status: { type: string }
+    NewOrder:
+      type: object
+      required: [status]
+      properties:
+        status: { type: string }
+    OrderEvent:
+      type: object
+      required: [seq]
+      properties:
+        seq: { type: integer }
+        text: { type: string }
diff --git a/tests/e2e/generate-client/generator-contract.test.ts b/tests/e2e/generate-client/generator-contract.test.ts
index 566af44b26..b1eb1ed4b7 100644
--- a/tests/e2e/generate-client/generator-contract.test.ts
+++ b/tests/e2e/generate-client/generator-contract.test.ts
@@ -38,22 +38,6 @@ describe('generate-client generator compatibility contract', () => {
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
-  it('rejects tanstack-query with the service-class facade', () => {
-    const dir = mkdtempSync(join(tmpdir(), 'ots-contract-'));
-    const { status, out } = run([
-      cafe,
-      '--output',
-      join(dir, 'c.ts'),
-      '--generators',
-      'sdk,tanstack-query',
-      '--facade',
-      'service-class',
-    ]);
-    expect(status).not.toBe(0);
-    expect(out).toMatch(/does not support --facade "service-class"/);
-    rmSync(dir, { recursive: true, force: true });
-  }, 60_000);
-
   it('rejects tanstack-query with result error mode', () => {
     const dir = mkdtempSync(join(tmpdir(), 'ots-contract-'));
     const { status, out } = run([
@@ -92,7 +76,7 @@ describe('generate-client generator compatibility contract', () => {
     const { status, out } = run([cafe, '--output', outFile, '--generators', ',']);
     expect(status, out).toBe(0);
     expect(existsSync(outFile)).toBe(true);
-    expect(readFileSync(outFile, 'utf-8')).toContain('export async function');
+    expect(readFileSync(outFile, 'utf-8')).toContain('export const client = createClient<Ops,');
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
diff --git a/tests/e2e/generate-client/identifier-injection.test.ts b/tests/e2e/generate-client/identifier-injection.test.ts
index cdd627637c..f26ee8f172 100644
--- a/tests/e2e/generate-client/identifier-injection.test.ts
+++ b/tests/e2e/generate-client/identifier-injection.test.ts
@@ -75,8 +75,9 @@ describe('generate-client identifier / comment injection', () => {
     expect(src).not.toMatch(/\*\/\s*;globalThis/);
     // No payload survives as a top-level statement (only inside identifiers/comments).
     expect(src).not.toMatch(/^\s*globalThis\.PWNED/m);
-    // The function name became a single valid identifier (no parens/spaces/semicolons).
-    expect(src).toMatch(/export async function [A-Za-z_$][A-Za-z0-9_$]*\(/);
+    // The operation name became a single valid identifier (no parens/spaces/semicolons)
+    // in the flat call sugar.
+    expect(src).toMatch(/export const [A-Za-z_$][A-Za-z0-9_$]* = \([^)]*\) => client\./);
 
     // Strongest proof: the whole file type-checks. Injected statements would not.
     const tsc = spawnSync(
diff --git a/tests/e2e/generate-client/middleware.test.ts b/tests/e2e/generate-client/middleware.test.ts
index 46624dd178..342e6f323d 100644
--- a/tests/e2e/generate-client/middleware.test.ts
+++ b/tests/e2e/generate-client/middleware.test.ts
@@ -2,7 +2,7 @@
  * Behavioral e2e for composable middleware/interceptors. Like `extension.test.ts`, we
  * inject a fake `fetch` and exercise the generated runtime in a real consumer, proving
  * that `use()` registers middleware, `onRequest` runs in order, `onResponse` runs in
- * reverse (onion), `onError` chains, and the service-class facade has its own `use()`.
+ * reverse (onion), `onError` chains, and configured middleware precedes `use()`.
  */
 import { spawnSync } from 'node:child_process';
 import { existsSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
@@ -45,7 +45,7 @@ function runConsumer(dir: string, script: string): unknown {
 
 const OK = `new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } })`;
 
-describe('middleware — functions facade (use)', () => {
+describe('middleware — flat surface (use)', () => {
   let dir = '';
   beforeAll(() => {
     dir = mkdtempSync(join(tmpdir(), 'mw-fn-'));
@@ -250,26 +250,26 @@ describe('middleware — result error mode', () => {
   }, 60_000);
 });
 
-describe('middleware — service-class facade (use + constructor)', () => {
+describe('middleware — configured chain precedes use()', () => {
   let dir = '';
   beforeAll(() => {
-    dir = mkdtempSync(join(tmpdir(), 'mw-sc-'));
-    generate(dir, ['--facade', 'service-class', '--name', 'PetClient']);
+    dir = mkdtempSync(join(tmpdir(), 'mw-cfg-'));
+    generate(dir);
   }, 60_000);
   afterAll(() => {
     if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
   });
 
-  test('constructor middleware runs before instance .use() middleware', () => {
+  test('configure({ middleware }) runs before later use() middleware', () => {
     const captured = runConsumer(
       dir,
       outdent`
-        import { PetClient } from './client.ts';
+        import { client } from './client.ts';
 
         const order: string[] = [];
-        const client = new PetClient({
+        client.configure({
           fetch: (async () => ${OK}) as unknown as typeof fetch,
-          middleware: [{ onRequest: () => { order.push('ctor'); } }],
+          middleware: [{ onRequest: () => { order.push('configured'); } }],
         });
         client.use({ onRequest: () => { order.push('use'); } });
         await client.listPets();
@@ -277,6 +277,6 @@ describe('middleware — service-class facade (use + constructor)', () => {
       `
     ) as { order: string[] };
 
-    expect(captured.order).toEqual(['ctor', 'use']);
+    expect(captured.order).toEqual(['configured', 'use']);
   }, 60_000);
 });
diff --git a/tests/e2e/generate-client/multipart.test.ts b/tests/e2e/generate-client/multipart.test.ts
index 094e602027..7430582775 100644
--- a/tests/e2e/generate-client/multipart.test.ts
+++ b/tests/e2e/generate-client/multipart.test.ts
@@ -1,7 +1,8 @@
 /**
  * Behavioral e2e for typed multipart bodies (#5): the generated client takes a typed object
- * and serializes it to `FormData` via `__toFormData` — binary→Blob, arrays→repeated fields,
- * objects→JSON parts. We inject a fake `fetch` and inspect the FormData it actually sent.
+ * and serializes it to `FormData` via the runtime's multipart capability — binary→Blob,
+ * arrays→repeated fields, objects→JSON parts. We inject a fake `fetch` and inspect the
+ * FormData it actually sent.
  */
 import { spawnSync } from 'node:child_process';
 import { existsSync, mkdtempSync, readdirSync, rmSync, statSync, writeFileSync } from 'node:fs';
@@ -132,7 +133,7 @@ describe('generate-client typed multipart body (#5)', () => {
           }) as unknown as typeof fetch,
         });
         // A multipart op must expose the plain body object to onRequest (not pre-built FormData);
-        // mutating it has to be reflected in the FormData that __send serializes afterwards.
+        // mutating it has to be reflected in the FormData the runtime serializes afterwards.
         use({ onRequest: (ctx) => { (ctx.body as { orgId: string }).orgId = 'mutated'; } });
 
         const file = new Blob(['hi'], { type: 'text/plain' });
@@ -151,8 +152,8 @@ describe('generate-client typed multipart body (#5)', () => {
     expect(result.orgId).toBe('mutated');
   }, 60_000);
 
-  it('compiles in multi-file output (multipart serialization lives in the shared runtime)', () => {
-    dir = mkdtempSync(join(tmpdir(), 'ots-multipart-tags-'));
+  it('compiles in split output (multipart serialization lives in the embedded runtime)', () => {
+    dir = mkdtempSync(join(tmpdir(), 'ots-multipart-split-'));
     writeFileSync(join(dir, 'api.yaml'), SPEC, 'utf-8');
     const gen = spawnSync(
       'node',
@@ -163,7 +164,7 @@ describe('generate-client typed multipart body (#5)', () => {
         '--output',
         join(dir, 'client.ts'),
         '--output-mode',
-        'tags',
+        'split',
       ],
       { encoding: 'utf-8', cwd: repoRoot }
     );
diff --git a/tests/e2e/generate-client/name-collision.test.ts b/tests/e2e/generate-client/name-collision.test.ts
index 141efc3fd9..fe96bce707 100644
--- a/tests/e2e/generate-client/name-collision.test.ts
+++ b/tests/e2e/generate-client/name-collision.test.ts
@@ -1,9 +1,10 @@
 // Regression: an operation whose `<Op>Result` alias name collides with an existing schema
 // name (operation `search` → the `SearchResult` schema it returns) must NOT emit the
 // self-referential `export type SearchResult = SearchResult;`. That alias is circular and, in
-// multi-file output, conflicts with the imported schema (TS2440) and duplicates the barrel
-// re-export (TS2308). `base.yaml` carries this shape (`operationId: search` → `$ref SearchResult`,
-// plus a `SearchResult` component). We generate the service-class/tags layout and strict-`tsc` it.
+// split output, conflicts with the schema imported from the schemas module (TS2440) and
+// duplicates the `export *` re-export (TS2308). `base.yaml` carries this shape
+// (`operationId: search` → `$ref SearchResult`, plus a `SearchResult` component). We generate
+// the split two-file layout and strict-`tsc` it.
 import { spawnSync } from 'node:child_process';
 import { mkdtempSync, readdirSync, readFileSync, rmSync, statSync } from 'node:fs';
 import { tmpdir } from 'node:os';
@@ -28,24 +29,12 @@ function collectTsFiles(dir: string): string[] {
 }
 
 describe('generate-client operation/schema name collision', () => {
-  it('does not emit a self-referential *Result alias; strict tsc passes over the tree', () => {
+  it('does not emit a self-referential *Result alias; strict tsc passes over the split set', () => {
     const dir = mkdtempSync(join(tmpdir(), 'ots-collision-'));
     const entry = join(dir, 'client.ts');
     const res = spawnSync(
       'node',
-      [
-        cli,
-        'generate-client',
-        fixture,
-        '--output',
-        entry,
-        '--facade',
-        'service-class',
-        '--output-mode',
-        'tags',
-        '--args-style',
-        'grouped',
-      ],
+      [cli, 'generate-client', fixture, '--output', entry, '--output-mode', 'split'],
       { encoding: 'utf-8', cwd: repoRoot }
     );
     expect(res.status, res.stderr).toBe(0);
@@ -59,11 +48,11 @@ describe('generate-client operation/schema name collision', () => {
       );
     }
     // Non-self-referential variant: `GetStatusResult` exists as a schema, so the op's
-    // `<Op>Result` alias must be suppressed — exactly one declaration across the tree.
+    // `<Op>Result` alias must be suppressed — exactly one declaration across the set.
     const declarations = allSource.join('\n').match(/export type GetStatusResult\b/g) ?? [];
     expect(declarations).toHaveLength(1);
 
-    // Strict tsc over the whole tree (bundler resolution handles the `.js` ESM imports).
+    // Strict tsc over the whole set (bundler resolution handles the `.js` ESM imports).
     const tsc = spawnSync(
       tscBin,
       [
diff --git a/tests/e2e/generate-client/operation-types.test.ts b/tests/e2e/generate-client/operation-types.test.ts
index b2d6c7efab..0b1f8cfc80 100644
--- a/tests/e2e/generate-client/operation-types.test.ts
+++ b/tests/e2e/generate-client/operation-types.test.ts
@@ -2,6 +2,10 @@
  * Proves the generated client types `ctx.operation.{id,path,tags}` as literal unions: a valid
  * comparison compiles, a misspelled operationId/tag does NOT. The whole point of the feature is
  * compile-time typo-catching, so it gets a dedicated strict-`tsc` check.
+ *
+ * Mechanism: the wiring instantiates `createClient<Ops, OperationId, OperationPath, …>`, so a
+ * `use()` callback's ctx is contextually narrowed. The exported `RequestContext` TYPE keeps its
+ * string defaults (spec-independent middleware stays assignable — asserted below).
  */
 import { spawnSync } from 'node:child_process';
 import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
@@ -61,13 +65,14 @@ describe('typed ctx.operation rejects typos at compile time', () => {
     if (dir) rmSync(dir, { recursive: true, force: true });
   });
 
-  test('a valid operationId/path comparison compiles', () => {
+  test('a valid operationId/path comparison compiles; base-typed middleware stays accepted', () => {
     expect(
       typechecks(
         dir,
         outdent`
           import { use, type RequestContext } from './client.ts';
-          use({ onRequest: (ctx: RequestContext) => { if (ctx.operation.id === 'listPets' || ctx.operation.path === '/pets') {} } });
+          use({ onRequest: (ctx) => { if (ctx.operation.id === 'listPets' || ctx.operation.path === '/pets') {} } });
+          use({ onRequest: (ctx: RequestContext) => { ctx.headers['X-Op'] = ctx.operation.id; } });
         `
       )
     ).toBe(true);
@@ -78,8 +83,8 @@ describe('typed ctx.operation rejects typos at compile time', () => {
       typechecks(
         dir,
         outdent`
-          import { use, type RequestContext } from './client.ts';
-          use({ onRequest: (ctx: RequestContext) => { if (ctx.operation.id === 'listPetss') {} } });
+          import { use } from './client.ts';
+          use({ onRequest: (ctx) => { if (ctx.operation.id === 'listPetss') {} } });
         `
       )
     ).toBe(false);
diff --git a/tests/e2e/generate-client/package-mode.test.ts b/tests/e2e/generate-client/package-mode.test.ts
new file mode 100644
index 0000000000..a69e080262
--- /dev/null
+++ b/tests/e2e/generate-client/package-mode.test.ts
@@ -0,0 +1,249 @@
+import { spawn, spawnSync, type ChildProcess } from 'node:child_process';
+import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+
+// The `runtime: package` output: instead of inlining the runtime, the generated
+// client imports `createClient` from `@redocly/client-generator` (resolved through
+// the workspace's own node_modules symlink — the spec's symlinked-consumer setup).
+// The programmatic tests below exercise the API of the BUILT package; the CLI test
+// exercises the `--runtime` flag wired in stage ③a.
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const generatorLib = join(repoRoot, 'packages/client-generator/lib/index.js');
+const cliEntryPoint = join(repoRoot, 'packages/cli/lib/index.js');
+const fixture = join(__dirname, 'fixtures/package-runtime.yaml');
+const consumerDir = join(__dirname, 'package-runtime-consumer');
+const generatedFile = join(consumerDir, 'api.ts');
+const serverScript = join(consumerDir, 'server.ts');
+const indexScript = join(consumerDir, 'index.ts');
+
+const SERVER_PORT = 3123;
+const SERVER_BASE = `http://127.0.0.1:${SERVER_PORT}`;
+
+type GenerateClient = (options: Record<string, unknown>) => Promise<unknown>;
+
+async function loadGenerateClient(): Promise<GenerateClient> {
+  const mod = (await import(pathToFileURL(generatorLib).href)) as {
+    generateClient: GenerateClient;
+  };
+  return mod.generateClient;
+}
+
+async function waitForServerReady(timeoutMs: number): Promise<void> {
+  const deadline = Date.now() + timeoutMs;
+  let lastError: unknown;
+  while (Date.now() < deadline) {
+    try {
+      const response = await fetch(`${SERVER_BASE}/__test__/ready`);
+      if (response.ok) return;
+      lastError = `readiness probe returned HTTP ${response.status}`;
+    } catch (error) {
+      lastError = error;
+    }
+    await new Promise((r) => setTimeout(r, 100));
+  }
+  throw new Error(
+    `package-runtime server did not become ready within ${timeoutMs}ms: ${
+      lastError instanceof Error ? lastError.message : String(lastError)
+    }`
+  );
+}
+
+function killServer(server: ChildProcess): Promise<void> {
+  return new Promise((resolveFn) => {
+    if (!server.pid || server.exitCode !== null) {
+      resolveFn();
+      return;
+    }
+    const onExit = (): void => resolveFn();
+    server.once('exit', onExit);
+    server.kill('SIGTERM');
+    setTimeout(() => {
+      server.removeListener('exit', onExit);
+      if (server.exitCode === null) {
+        server.kill('SIGKILL');
+      }
+      resolveFn();
+    }, 2_000);
+  });
+}
+
+describe('generate-client package-runtime consumer', () => {
+  let serverProcess: ChildProcess | undefined;
+
+  beforeAll(async () => {
+    // api.ts is regenerated by this suite but must stay COMMITTED: the consumer's
+    // index.ts imports it, and the repo-root `tsc --noEmit` typechecks tests/ on a
+    // fresh checkout before any e2e run could produce it.
+    if (existsSync(generatedFile)) {
+      rmSync(generatedFile, { force: true });
+    }
+
+    serverProcess = spawn('npx', ['tsx', serverScript], {
+      cwd: consumerDir,
+      env: { ...process.env, PKG_SERVER_PORT: String(SERVER_PORT) },
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+
+    serverProcess.stderr?.on('data', (chunk: Buffer) => {
+      process.stderr.write(`[package-runtime-server stderr] ${chunk.toString()}`);
+    });
+
+    await waitForServerReady(15_000);
+  }, 30_000);
+
+  afterAll(async () => {
+    if (serverProcess) {
+      await killServer(serverProcess);
+    }
+  });
+
+  test('end-to-end: generate package-mode client, type-check, run, assert wire behavior', async () => {
+    const generateClient = await loadGenerateClient();
+    await generateClient({ api: fixture, output: generatedFile, runtime: 'package' });
+
+    expect(existsSync(generatedFile)).toBe(true);
+    const generated = readFileSync(generatedFile, 'utf-8');
+    // Imports the runtime instead of inlining it.
+    expect(generated).toContain("from '@redocly/client-generator'");
+    expect(generated).not.toContain('__send');
+    expect(generated).not.toContain('let BASE');
+    // The skew guard and the wire-name descriptor for the non-identifier path param.
+    expect(generated).toContain('as const satisfies Record<string, OperationDescriptor>;');
+    expect(generated).toContain('{ name: "order-id", in: "path" }');
+    // The colliding operationId is renamed; its descriptor id stays the spec id.
+    expect(generated).toContain('configure_2: { id: "configure"');
+
+    // Type gate: the consumer (incl. the generated file) compiles strict against the
+    // BUILT package types — this is the `satisfies` version-skew guard in action.
+    const typecheckResult = spawnSync('npx', ['tsc', '--noEmit', '-p', consumerDir], {
+      encoding: 'utf-8',
+      cwd: repoRoot,
+    });
+    expect(
+      typecheckResult.status,
+      `tsc --noEmit failed:\nstdout:\n${typecheckResult.stdout}\nstderr:\n${typecheckResult.stderr}`
+    ).toBe(0);
+
+    const runResult = spawnSync('npx', ['tsx', indexScript], {
+      encoding: 'utf-8',
+      cwd: consumerDir,
+    });
+    expect(
+      runResult.status,
+      `consumer stdout:\n${runResult.stdout}\nstderr:\n${runResult.stderr}`
+    ).toBe(0);
+    const parsed = JSON.parse(runResult.stdout.trim()) as {
+      order: { id: string; status: string };
+      grouped: { id: string };
+      created: { id: string; status: string };
+      collided: string;
+      events: Array<{ seq: number; text?: string }>;
+      middlewareIds: string[];
+    };
+    expect(parsed.order).toEqual({ id: 'o-1', status: 'open' });
+    expect(parsed.grouped.id).toBe('o-2');
+    expect(parsed.created).toEqual({ id: 'created-1', status: 'open' });
+    expect(parsed.collided).toBe('ok');
+    expect(parsed.events).toEqual([
+      { seq: 1, text: 'a' },
+      { seq: 2, text: 'b' },
+    ]);
+    // Middleware targets the SPEC operationId — including the renamed `configure` op.
+    expect(parsed.middlewareIds).toEqual([
+      'getOrder',
+      'getOrder',
+      'createOrder',
+      'configure',
+      'streamEvents',
+    ]);
+
+    const logResponse = await fetch(`${SERVER_BASE}/__test__/log`);
+    const log = (await logResponse.json()) as Array<{
+      method: string;
+      url: string;
+      auth: string | null;
+    }>;
+    // Wire-name path substitution + query serialization + injected bearer.
+    expect(log).toContainEqual({
+      method: 'GET',
+      url: '/orders/o-1?expand=items',
+      auth: 'Bearer test-token',
+    });
+    expect(log).toContainEqual({ method: 'GET', url: '/orders/o-2', auth: 'Bearer test-token' });
+    // Unsecured operations carry no credential.
+    expect(log).toContainEqual({ method: 'POST', url: '/orders', auth: null });
+    expect(log).toContainEqual({ method: 'GET', url: '/configure-op', auth: null });
+    expect(log).toContainEqual({ method: 'GET', url: '/events', auth: null });
+  }, 60_000);
+
+  test('package mode composes with split output and the tanstack-query generator', async () => {
+    const generateClient = await loadGenerateClient();
+    const tmpDir = mkdtempSync(join(tmpdir(), 'ots-package-combos-'));
+    try {
+      // split: the entry re-exports a sibling schemas module, both in package mode.
+      const splitEntry = join(tmpDir, 'api.ts');
+      await generateClient({
+        api: fixture,
+        output: splitEntry,
+        runtime: 'package',
+        outputMode: 'split',
+      });
+      expect(existsSync(splitEntry)).toBe(true);
+      expect(readFileSync(splitEntry, 'utf-8')).toContain("from '@redocly/client-generator'");
+      const splitSchemas = join(tmpDir, 'api.schemas.ts');
+      expect(existsSync(splitSchemas)).toBe(true);
+      expect(readFileSync(splitSchemas, 'utf-8')).toContain('export type Order =');
+
+      // tanstack-query + package: the client plus the tanstack wrapper module.
+      const tanstackDir = join(tmpDir, 'tanstack');
+      const tanstackEntry = join(tanstackDir, 'api.ts');
+      await generateClient({
+        api: fixture,
+        output: tanstackEntry,
+        runtime: 'package',
+        generators: ['sdk', 'tanstack-query'],
+        queryFramework: 'react',
+      });
+      expect(existsSync(tanstackEntry)).toBe(true);
+      expect(readFileSync(tanstackEntry, 'utf-8')).toContain("from '@redocly/client-generator'");
+      const tanstackWrapper = join(tanstackDir, 'api.tanstack.ts');
+      expect(existsSync(tanstackWrapper)).toBe(true);
+      expect(readFileSync(tanstackWrapper, 'utf-8')).toContain('queryOptions');
+    } finally {
+      rmSync(tmpDir, { recursive: true, force: true });
+    }
+  }, 30_000);
+
+  test('CLI --runtime package emits a runtime import', () => {
+    const tmpDir = mkdtempSync(join(tmpdir(), 'ots-cli-runtime-'));
+    const output = join(tmpDir, 'cli.ts');
+    const result = spawnSync(
+      'node',
+      [cliEntryPoint, 'generate-client', fixture, '--output', output, '--runtime', 'package'],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(result.status, `generate-client stderr:\n${result.stderr}`).toBe(0);
+    const generated = readFileSync(output, 'utf-8');
+    expect(generated).toContain("from '@redocly/client-generator'");
+    expect(generated).not.toContain('__send');
+    rmSync(tmpDir, { recursive: true, force: true });
+  }, 30_000);
+
+  test('CLI --runtime rejects an unknown value', () => {
+    const tmpDir = mkdtempSync(join(tmpdir(), 'ots-cli-runtime-bogus-'));
+    const output = join(tmpDir, 'cli.ts');
+    const result = spawnSync(
+      'node',
+      [cliEntryPoint, 'generate-client', fixture, '--output', output, '--runtime', 'bogus'],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(result.status).not.toBe(0);
+    expect(result.stderr).toContain('Invalid values');
+    expect(existsSync(output)).toBe(false);
+    rmSync(tmpDir, { recursive: true, force: true });
+  }, 30_000);
+});
diff --git a/tests/e2e/generate-client/package-runtime-consumer/api.ts b/tests/e2e/generate-client/package-runtime-consumer/api.ts
new file mode 100644
index 0000000000..3fa5a67bc2
--- /dev/null
+++ b/tests/e2e/generate-client/package-runtime-consumer/api.ts
@@ -0,0 +1,102 @@
+// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Package Runtime API (v1.0.0)
+ */
+
+import { createClient, type OperationDescriptor, type RequestOptions, type SseOptions } from '@redocly/client-generator';
+
+export type Order = {
+    id: string;
+    status: string;
+};
+
+export type NewOrder = {
+    status: string;
+};
+
+export type OrderEvent = {
+    seq: number;
+    text?: string;
+};
+
+export type GetOrderResult = Order;
+
+export type GetOrderParams = {
+    expand?: string;
+};
+
+export type GetOrderVariables = {
+    "order-id": string;
+    params?: GetOrderParams;
+};
+
+export type CreateOrderResult = Order;
+
+export type CreateOrderBody = NewOrder;
+
+export type CreateOrderVariables = {
+    body: CreateOrderBody;
+};
+
+export type ConfigureResult = string;
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    getOrder: {
+        args: {
+            "order-id": string;
+            params?: GetOrderParams;
+        };
+        result: GetOrderResult;
+    };
+    createOrder: {
+        args: {
+            body: CreateOrderBody;
+        };
+        result: CreateOrderResult;
+    };
+    configure_2: {
+        args: {};
+        result: ConfigureResult;
+    };
+    streamEvents: {
+        args: {};
+        result: OrderEvent;
+        kind: "sse";
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    getOrder: { id: "getOrder", method: "GET", path: "/orders/{order-id}", params: [{ name: "order-id", in: "path" }, { name: "expand", in: "query" }], security: [{ scheme: "bearerAuth", kind: "bearer" }] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", body: { contentType: "application/json" } },
+    configure_2: { id: "configure", method: "GET", path: "/configure-op" },
+    streamEvents: { id: "streamEvents", method: "GET", path: "/events", responseKind: "sse", sseDataKind: "json" }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS, { serverUrl: "http://localhost:3123" });
+
+export const { configure, use } = client;
+export const setBearer = client.auth.bearer;
+export const getOrder = (order_id: string, params: {
+    expand?: string;
+} = {}, init: RequestOptions = {}) => client.getOrder({ "order-id": order_id, params }, init);
+export const createOrder = (body: NewOrder, init: RequestOptions = {}) => client.createOrder({ body }, init);
+export const configure_2 = (init: RequestOptions = {}) => client.configure_2({}, init);
+export const streamEvents = (init: SseOptions = {}) => client.streamEvents({}, init);
+
+export { ApiError, createClient } from '@redocly/client-generator';
+export type { ClientConfig, Middleware, RequestOptions, ServerSentEvent, SseOptions } from '@redocly/client-generator';
diff --git a/tests/e2e/generate-client/package-runtime-consumer/index.ts b/tests/e2e/generate-client/package-runtime-consumer/index.ts
new file mode 100644
index 0000000000..68ec914434
--- /dev/null
+++ b/tests/e2e/generate-client/package-runtime-consumer/index.ts
@@ -0,0 +1,42 @@
+import { client, configure_2, createOrder, getOrder, setBearer, streamEvents, use } from './api.js';
+
+async function main(): Promise<void> {
+  const middlewareIds: string[] = [];
+  use({
+    onRequest: (ctx) => {
+      middlewareIds.push(ctx.operation.id);
+    },
+  });
+  setBearer('test-token');
+
+  // Flat sugar: positional path value forwarded under the wire name `order-id`.
+  const order = await getOrder('o-1', { expand: 'items' });
+  // Grouped instance call: the caller uses the wire-name key directly.
+  const grouped = await client.getOrder({ 'order-id': 'o-2' });
+  const created = await createOrder({ status: 'open' });
+  // The op whose id collides with the reserved `configure` member — renamed sugar,
+  // while middleware still sees the SPEC operationId.
+  const collided = await configure_2();
+
+  const events: Array<{ seq: number; text?: string }> = [];
+  for await (const event of streamEvents()) {
+    events.push({ seq: event.data.seq, text: event.data.text });
+  }
+
+  // Compile-time checks: the generated types flow through the package runtime.
+  const _orderId: string = order.id;
+  const _createdStatus: string = created.status;
+  const _collided: string = collided;
+  void _orderId;
+  void _createdStatus;
+  void _collided;
+
+  process.stdout.write(
+    JSON.stringify({ order, grouped, created, collided, events, middlewareIds }) + '\n'
+  );
+}
+
+main().catch((error) => {
+  process.stderr.write(`UNHANDLED: ${error instanceof Error ? error.message : String(error)}\n`);
+  process.exit(1);
+});
diff --git a/tests/e2e/generate-client/package-runtime-consumer/package.json b/tests/e2e/generate-client/package-runtime-consumer/package.json
new file mode 100644
index 0000000000..378af31b08
--- /dev/null
+++ b/tests/e2e/generate-client/package-runtime-consumer/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "package-runtime-consumer",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module"
+}
diff --git a/tests/e2e/generate-client/package-runtime-consumer/server.ts b/tests/e2e/generate-client/package-runtime-consumer/server.ts
new file mode 100644
index 0000000000..b78d59442e
--- /dev/null
+++ b/tests/e2e/generate-client/package-runtime-consumer/server.ts
@@ -0,0 +1,78 @@
+import * as http from 'node:http';
+
+// A hand-written server for the package-runtime consumer: echoes enough request
+// detail (auth header, URL) for the test to assert the runtime's routing, and
+// serves a short SSE stream that ends cleanly.
+
+type LogEntry = { method: string; url: string; auth: string | null };
+
+const PORT = Number.parseInt(process.env.PKG_SERVER_PORT ?? '3123', 10);
+
+const requestLog: LogEntry[] = [];
+
+async function readBody(req: http.IncomingMessage): Promise<string> {
+  const chunks: Buffer[] = [];
+  for await (const chunk of req) chunks.push(chunk as Buffer);
+  return Buffer.concat(chunks).toString('utf-8');
+}
+
+const server = http.createServer(async (req, res) => {
+  const method = req.method ?? 'GET';
+  const url = req.url ?? '';
+  const { pathname } = new URL(url, 'http://localhost');
+
+  if (pathname === '/__test__/ready') {
+    res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' });
+    res.end('ready');
+    return;
+  }
+  if (pathname === '/__test__/log') {
+    res.writeHead(200, { 'Content-Type': 'application/json; charset=utf-8' });
+    res.end(JSON.stringify(requestLog));
+    return;
+  }
+
+  const auth = typeof req.headers.authorization === 'string' ? req.headers.authorization : null;
+  requestLog.push({ method, url, auth });
+
+  if (method === 'GET' && pathname.startsWith('/orders/')) {
+    const id = decodeURIComponent(pathname.slice('/orders/'.length));
+    res.writeHead(200, { 'Content-Type': 'application/json; charset=utf-8' });
+    res.end(JSON.stringify({ id, status: 'open' }));
+    return;
+  }
+  if (method === 'POST' && pathname === '/orders') {
+    const body = JSON.parse(await readBody(req)) as { status: string };
+    res.writeHead(201, { 'Content-Type': 'application/json; charset=utf-8' });
+    res.end(JSON.stringify({ id: 'created-1', status: body.status }));
+    return;
+  }
+  if (method === 'GET' && pathname === '/configure-op') {
+    res.writeHead(200, { 'Content-Type': 'application/json; charset=utf-8' });
+    res.end(JSON.stringify('ok'));
+    return;
+  }
+  if (method === 'GET' && pathname === '/events') {
+    res.writeHead(200, {
+      'Content-Type': 'text/event-stream',
+      'Cache-Control': 'no-cache',
+      Connection: 'keep-alive',
+    });
+    res.write('id: 1\ndata: {"seq":1,"text":"a"}\n\n');
+    res.write('id: 2\ndata: {"seq":2,"text":"b"}\n\n');
+    res.end(); // clean close — the client finishes without reconnecting
+    return;
+  }
+
+  res.writeHead(404, { 'Content-Type': 'application/json; charset=utf-8' });
+  res.end(JSON.stringify({ title: 'not found' }));
+});
+
+// The test process keeps a pooled connection from its readiness probe and fetches
+// the log only after generate + tsc + the consumer run (~10s). Outlive that gap so
+// the pooled socket is not reset mid-reuse.
+server.keepAliveTimeout = 60_000;
+
+server.listen(PORT, () => {
+  process.stdout.write(`package-runtime server listening on ${PORT}\n`);
+});
diff --git a/tests/e2e/generate-client/package-runtime-consumer/tsconfig.json b/tests/e2e/generate-client/package-runtime-consumer/tsconfig.json
new file mode 100644
index 0000000000..9e758c589a
--- /dev/null
+++ b/tests/e2e/generate-client/package-runtime-consumer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "target": "es2022",
+    "lib": ["ES2022", "DOM", "DOM.AsyncIterable"],
+    "strict": true,
+    "noUnusedLocals": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "types": ["node"]
+  },
+  "include": ["./**/*.ts"]
+}
diff --git a/tests/e2e/generate-client/parse-as.test.ts b/tests/e2e/generate-client/parse-as.test.ts
index 8315c11bec..253ccca4a9 100644
--- a/tests/e2e/generate-client/parse-as.test.ts
+++ b/tests/e2e/generate-client/parse-as.test.ts
@@ -7,9 +7,9 @@
 // that proves the option is accepted by the generated operation signatures.
 //
 // No mock-server behavioral assertion here: `parseAs` is a pure runtime branch in
-// `__parse` (covered by the client-generator unit suite) and the cafe-consumer
-// harness already exercises the default decoding path. Strict-tsc + string +
-// type-usage assertions are sufficient and keep this test process-light.
+// the runtime's `parse` (covered by the client-generator unit suite) and the
+// cafe-consumer harness already exercises the default decoding path. Strict-tsc +
+// string + type-usage assertions are sufficient and keep this test process-light.
 import { spawnSync } from 'node:child_process';
 import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
@@ -36,11 +36,11 @@ describe('generate-client parseAs', () => {
 
     // The public `ParseAs` type and the option on `RequestOptions`.
     expect(generated).toContain(
-      "export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';"
+      "export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';"
     );
     expect(generated).toMatch(/parseAs\?: ParseAs/);
 
-    // `__parse` gained the streaming / arrayBuffer / formData branches.
+    // The runtime's `parse` covers the streaming / arrayBuffer / formData branches.
     expect(generated).toContain('return response.body;');
     expect(generated).toContain('return response.arrayBuffer();');
     expect(generated).toContain('return response.formData();');
diff --git a/tests/e2e/generate-client/path-param-idents.test.ts b/tests/e2e/generate-client/path-param-idents.test.ts
index 1be68cfd71..6b48d66825 100644
--- a/tests/e2e/generate-client/path-param-idents.test.ts
+++ b/tests/e2e/generate-client/path-param-idents.test.ts
@@ -2,9 +2,9 @@
  * Behavioral e2e for non-identifier path parameters. OpenAPI allows parameter
  * names that are not valid JS identifiers (`widget-id`), start with a digit
  * (`2fa`), or collide with reserved words (`new`). The generator must sanitize
- * each into a safe local argument name and use that same name in the URL
- * substitution — otherwise the emitted client either fails to compile or encodes
- * a literal string instead of the argument value.
+ * each into a safe sugar argument name while routing the value back under the
+ * WIRE name (the descriptor's `ParamSpec.name`) — otherwise the emitted client
+ * either fails to compile or substitutes nothing into the URL template.
  *
  * This generates a client from such a spec, type-checks it under strict mode
  * (proving it compiles), then runs it through a fake `fetch` (proving the URL is
@@ -104,15 +104,18 @@ describe('non-identifier path parameters', () => {
     if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
   });
 
-  test('emits safe argument names and matching URL substitutions', () => {
+  test('emits safe argument names routed back under the wire name', () => {
     const client = readFileSync(join(dir, 'client.ts'), 'utf-8');
-    // `widget-id` → `widget_id`; the URL uses the same identifier, not a literal.
-    expect(client).toContain('widget_id: string');
-    expect(client).toContain('${encodeURIComponent(String(widget_id))}');
-    expect(client).not.toContain('"widget-id": string');
-    // reserved word `new` → `_new`.
-    expect(client).toContain('_new: string');
-    expect(client).toContain('${encodeURIComponent(String(_new))}');
+    // `widget-id` → safe `widget_id` argument, routed under the quoted wire key.
+    expect(client).toContain(
+      'export const getWidget = (widget_id: string, init: RequestOptions = {}) => client.getWidget({ "widget-id": widget_id }, init);'
+    );
+    // The descriptor keeps the WIRE name for URL substitution.
+    expect(client).toContain('params: [{ name: "widget-id", in: "path" }]');
+    // reserved word `new` → `_new` argument, routed under the `new` key.
+    expect(client).toContain(
+      'export const getItem = (_new: string, init: RequestOptions = {}) => client.getItem({ new: _new }, init);'
+    );
   });
 
   test('the generated client type-checks under strict mode', () => {
diff --git a/tests/e2e/generate-client/per-instance-auth.test.ts b/tests/e2e/generate-client/per-instance-auth.test.ts
index 707a6228c9..24a3da97e1 100644
--- a/tests/e2e/generate-client/per-instance-auth.test.ts
+++ b/tests/e2e/generate-client/per-instance-auth.test.ts
@@ -1,11 +1,10 @@
-// Behavioral proof of per-instance auth (the service-class facade's reason to exist):
-// two instances of the SAME generated client carry different `config.auth` and send
-// different credentials — without touching the module-global setters. A no-auth
-// instance sends nothing. We capture the wire `Authorization` header via an injected
-// `config.fetch`, so no mock server is needed.
+// Behavioral proof of per-instance auth: two `createClient` instances built over the
+// SAME generated descriptors carry different `config.auth` and send different
+// credentials — without touching the generated module's own client instance or its
+// setter sugar. A no-auth instance sends nothing. We capture the wire `Authorization`
+// header via an injected `config.fetch`, so no mock server is needed.
 import { spawnSync } from 'node:child_process';
 import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
-import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { outdent } from 'outdent';
@@ -32,7 +31,8 @@ const SPEC = outdent`
 `;
 
 const DRIVER = outdent`
-  import { Client } from './client.js';
+  import { createClient } from '@redocly/client-generator';
+  import { OPERATIONS, type Ops } from './client.js';
 
   const calls: (string | null)[] = [];
   const fakeFetch = (async (_url: string, init?: RequestInit) => {
@@ -42,8 +42,11 @@ const DRIVER = outdent`
   }) as unknown as typeof fetch;
 
   async function main() {
-    const authed = new Client({ fetch: fakeFetch, auth: { basic: { username: 'alice', password: 'pw' } } });
-    const anon = new Client({ fetch: fakeFetch });
+    const authed = createClient<Ops>(OPERATIONS, {
+      fetch: fakeFetch,
+      auth: { basic: { username: 'alice', password: 'pw' } },
+    });
+    const anon = createClient<Ops>(OPERATIONS, { fetch: fakeFetch });
     await authed.getThing();
     await anon.getThing();
     console.log(JSON.stringify(calls));
@@ -51,9 +54,11 @@ const DRIVER = outdent`
   void main();
 `;
 
-describe('per-instance auth (service-class config.auth)', () => {
+describe('per-instance auth (createClient config.auth)', () => {
   it('two instances send different credentials; a no-auth instance sends none', () => {
-    const dir = mkdtempSync(join(tmpdir(), 'ots-perinstance-'));
+    // The temp dir lives INSIDE the repo so the driver's import of
+    // `@redocly/client-generator` resolves through the workspace node_modules symlink.
+    const dir = mkdtempSync(join(__dirname, '.tmp-perinstance-'));
     try {
       writeFileSync(join(dir, 'openapi.yaml'), SPEC, 'utf-8');
       // Mark the temp dir as ESM so tsx imports the generated `./client.js` and the
@@ -67,8 +72,8 @@ describe('per-instance auth (service-class config.auth)', () => {
           join(dir, 'openapi.yaml'),
           '--output',
           join(dir, 'client.ts'),
-          '--facade',
-          'service-class',
+          '--runtime',
+          'package',
         ],
         { encoding: 'utf-8', cwd: repoRoot }
       );
@@ -81,7 +86,7 @@ describe('per-instance auth (service-class config.auth)', () => {
       const calls = JSON.parse(run.stdout.trim()) as (string | null)[];
       const expected = 'Basic ' + Buffer.from('alice:pw').toString('base64');
       expect(calls[0]).toBe(expected); // the authed instance sent its own basic credential
-      expect(calls[1]).toBeNull(); // the no-auth instance sent nothing (no global was set)
+      expect(calls[1]).toBeNull(); // the no-auth instance sent nothing (no shared state)
     } finally {
       rmSync(dir, { recursive: true, force: true });
     }
diff --git a/tests/e2e/generate-client/query-styles.test.ts b/tests/e2e/generate-client/query-styles.test.ts
index 21b3ff2813..e35f64ea69 100644
--- a/tests/e2e/generate-client/query-styles.test.ts
+++ b/tests/e2e/generate-client/query-styles.test.ts
@@ -1,13 +1,13 @@
 // Query-parameter serialization styles (P3.8). Generates a client from a spec
-// declaring non-default query styles, strict-`tsc`s it (the `styles` object
-// literal + 4th-arg `__buildUrl` call must type-check), asserts the emitted
-// source, and proves the WIRE FORMAT behaviorally.
+// declaring non-default query styles, strict-`tsc`s it (the descriptor `params`
+// hints must satisfy `ParamSpec`), asserts the emitted source, and proves the
+// WIRE FORMAT behaviorally.
 //
 // Behavioral approach: rather than stand up a mock server, we import the
 // generated client and stub `config.fetch` (via `configure`) to capture the
 // request URL, then assert it directly. This is the lightest harness that
-// proves `__buildUrl`'s output (literal delimiters + allowReserved on the
-// wire), which is the whole point of the feature.
+// proves the runtime's `buildUrl` output (literal delimiters + allowReserved
+// on the wire), which is the whole point of the feature.
 import { spawnSync } from 'node:child_process';
 import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
@@ -40,17 +40,19 @@ describe('generate-client query serialization styles', () => {
     if (dir) rmSync(dir, { recursive: true, force: true });
   });
 
-  it('emits the styles literal for non-default params and none for the default param', () => {
-    // Styled array params carry their explicit style/explode.
-    expect(generated).toContain('"tags": { style: "pipeDelimited", explode: false }');
-    expect(generated).toContain('"q": { style: "spaceDelimited", explode: false }');
-    expect(generated).toContain('"ids": { style: "form", explode: false }');
+  it('emits style hints on the descriptor params, and none for the default param', () => {
+    // Styled array params carry their explicit style/explode on the descriptor.
+    expect(generated).toContain(
+      '{ name: "tags", in: "query", style: "pipeDelimited", explode: false }'
+    );
+    expect(generated).toContain(
+      '{ name: "q", in: "query", style: "spaceDelimited", explode: false }'
+    );
+    expect(generated).toContain('{ name: "ids", in: "query", style: "form", explode: false }');
     // allowReserved param keeps the default form+explode but flags allowReserved.
-    expect(generated).toContain('"filter": { style: "form", explode: true, allowReserved: true }');
-    // The default param `limit` gets NO styles entry.
-    expect(generated).not.toContain('"limit":');
-    // The styles literal is passed as the 4th arg to __buildUrl.
-    expect(generated).toMatch(/__buildUrl\(__config, `\/search`, params, \{/);
+    expect(generated).toContain('{ name: "filter", in: "query", allowReserved: true }');
+    // The default param `limit` carries NO style hints.
+    expect(generated).toContain('{ name: "limit", in: "query" }');
   });
 
   it('strict-tsc type-checks the generated client', () => {
diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
index 9460b3926a..d6c5709e44 100644
--- a/tests/e2e/generate-client/redocly-config.test.ts
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -40,7 +40,6 @@ describe('generate-client redocly.yaml config', () => {
         '    clientOutput: ./src/cafe.ts',
         '    client:',
         '      generators: [sdk]',
-        '      facade: service-class',
         '  lintOnly:', // no `client` block -> skipped by the fan-out
         '    root: ./openapi.yaml',
       ].join('\n') + '\n'
@@ -49,7 +48,9 @@ describe('generate-client redocly.yaml config', () => {
     expect(res.status, res.stderr).toBe(0);
     expect(existsSync(join(dir, 'src/cafe.ts'))).toBe(true);
     expect(existsSync(join(dir, 'lintOnly.client.ts'))).toBe(false);
-    expect(readFileSync(join(dir, 'src/cafe.ts'), 'utf-8')).toContain('export class Client');
+    expect(readFileSync(join(dir, 'src/cafe.ts'), 'utf-8')).toContain(
+      'export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS,'
+    );
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
@@ -78,12 +79,14 @@ describe('generate-client redocly.yaml config', () => {
         '    clientOutput: ./out.ts',
         '    client:',
         '      generators: [sdk]',
-        '      facade: service-class',
+        '      serverUrl: https://per-api.example.com',
       ].join('\n') + '\n'
     );
     const res = run(dir, ['cafe']);
     expect(res.status, res.stderr).toBe(0);
-    expect(readFileSync(join(dir, 'out.ts'), 'utf-8')).toContain('export class Client');
+    expect(readFileSync(join(dir, 'out.ts'), 'utf-8')).toContain(
+      'serverUrl: "https://per-api.example.com"'
+    );
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
@@ -92,7 +95,7 @@ describe('generate-client redocly.yaml config', () => {
       [
         'client:',
         '  generators: [sdk]',
-        '  facade: service-class',
+        '  serverUrl: https://top-level.example.com',
         'apis:',
         '  cafe:',
         '    root: ./openapi.yaml',
@@ -101,8 +104,10 @@ describe('generate-client redocly.yaml config', () => {
     );
     const res = run(dir, ['cafe']);
     expect(res.status, res.stderr).toBe(0);
-    // service-class came from the top-level client block (the api declares none).
-    expect(readFileSync(join(dir, 'out.ts'), 'utf-8')).toContain('export class Client');
+    // serverUrl came from the top-level client block (the api declares none).
+    expect(readFileSync(join(dir, 'out.ts'), 'utf-8')).toContain(
+      'serverUrl: "https://top-level.example.com"'
+    );
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
@@ -111,19 +116,19 @@ describe('generate-client redocly.yaml config', () => {
       [
         'client:',
         '  generators: [sdk]',
-        '  facade: functions',
+        '  serverUrl: https://top-level.example.com',
         'apis:',
         '  cafe:',
         '    root: ./openapi.yaml',
         '    client:',
-        '      facade: service-class', // must NOT apply to a path invocation
+        '      serverUrl: https://per-api.example.com', // must NOT apply to a path invocation
       ].join('\n') + '\n'
     );
     const res = run(dir, ['./openapi.yaml', '--output', './out.ts']);
     expect(res.status, res.stderr).toBe(0);
     const out = readFileSync(join(dir, 'out.ts'), 'utf-8');
-    expect(out).toContain('export async function listMenuItems'); // functions facade (top-level)
-    expect(out).not.toContain('export class Client'); // per-api service-class ignored
+    expect(out).toContain('serverUrl: "https://top-level.example.com"'); // top-level applied
+    expect(out).not.toContain('https://per-api.example.com'); // per-api block ignored
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
@@ -135,17 +140,38 @@ describe('generate-client redocly.yaml config', () => {
         '    root: ./openapi.yaml',
         '    clientOutput: ./out.ts',
         '    client:',
-        '      facade: service-class',
+        '      generators: [sdk]',
+        '      serverUrl: https://per-api.example.com',
       ].join('\n') + '\n'
     );
-    const res = run(dir, ['cafe', '--facade', 'functions']);
+    const res = run(dir, ['cafe', '--server-url', 'https://flag.example.com']);
     expect(res.status, res.stderr).toBe(0);
     expect(readFileSync(join(dir, 'out.ts'), 'utf-8')).toContain(
-      'export async function listMenuItems'
+      'serverUrl: "https://flag.example.com"'
     );
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
+  it('warns on a removed `facade` key (config struct rule) but still generates', () => {
+    const dir = project(
+      [
+        'apis:',
+        '  cafe:',
+        '    root: ./openapi.yaml',
+        '    clientOutput: ./out.ts',
+        '    client:',
+        '      generators: [sdk]',
+        '      facade: service-class', // removed option -> property-not-expected warning
+      ].join('\n') + '\n'
+    );
+    const res = run(dir, ['cafe']);
+    expect(res.status, res.stderr).toBe(0);
+    expect(res.stdout + res.stderr).toContain('Property `facade` is not expected here.');
+    expect(res.stderr).toContain('Your config has 1 warning');
+    expect(existsSync(join(dir, 'out.ts'))).toBe(true);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
   it('rejects --output in fan-out mode', () => {
     const dir = project(
       [
@@ -217,6 +243,26 @@ describe('generate-client redocly.yaml config', () => {
     }
   }, 60_000);
 
+  it('a `client.runtime: package` config block reaches the writer', () => {
+    const dir = project(
+      [
+        'apis:',
+        '  cafe:',
+        '    root: ./openapi.yaml',
+        '    clientOutput: ./out.ts',
+        '    client:',
+        '      generators: [sdk]',
+        '      runtime: package',
+      ].join('\n') + '\n'
+    );
+    const res = run(dir, ['cafe']);
+    expect(res.status, res.stderr).toBe(0);
+    const out = readFileSync(join(dir, 'out.ts'), 'utf-8');
+    expect(out).toContain("from '@redocly/client-generator'");
+    expect(out).not.toContain('__send');
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
   it('resolves a relative clientOutput against the redocly.yaml dir (via --config)', () => {
     const dir = project(
       [
diff --git a/tests/e2e/generate-client/service-class.test.ts b/tests/e2e/generate-client/service-class.test.ts
deleted file mode 100644
index 167b338049..0000000000
--- a/tests/e2e/generate-client/service-class.test.ts
+++ /dev/null
@@ -1,296 +0,0 @@
-/**
- * E2E for `--facade service-class`: the emitted class-shaped client must compile
- * under strict `tsc` with `--noUnusedLocals` (proving the hoisted aliases, method
- * signatures, and runtime references are all sound), across every output mode.
- *
- * Uses cafe.yaml because it exercises auth, header params, named types, and
- * discriminated-union guards — the same surface the functions facade is tested on.
- */
-import { spawnSync } from 'node:child_process';
-import { existsSync, mkdtempSync, readFileSync, readdirSync, rmSync, statSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
-const fixture = join(__dirname, 'fixtures/cafe.yaml');
-
-const TSC_ARGS = [
-  '--noEmit',
-  '--strict',
-  '--noUnusedLocals',
-  '--target',
-  'ES2020',
-  '--module',
-  'esnext',
-  '--moduleResolution',
-  'bundler',
-  '--lib',
-  'ES2020,DOM',
-];
-
-function collectTsFiles(dir: string): string[] {
-  const out: string[] = [];
-  for (const entry of readdirSync(dir)) {
-    const full = join(dir, entry);
-    if (statSync(full).isDirectory()) out.push(...collectTsFiles(full));
-    else if (entry.endsWith('.ts')) out.push(full);
-  }
-  return out;
-}
-
-describe('generate-client end-to-end (--facade service-class, --output-mode single)', () => {
-  let workDir = '';
-  let entry = '';
-
-  beforeAll(() => {
-    workDir = mkdtempSync(join(tmpdir(), 'sc-single-client-'));
-    entry = join(workDir, 'client.ts');
-  });
-
-  afterAll(() => {
-    if (workDir && existsSync(workDir)) rmSync(workDir, { recursive: true, force: true });
-  });
-
-  test('emits one named Client class with the operations as methods', () => {
-    const result = spawnSync(
-      'node',
-      [
-        cliEntry,
-        'generate-client',
-        fixture,
-        '--output',
-        entry,
-        '--facade',
-        'service-class',
-        '--name',
-        'CafeClient',
-      ],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(result.status, `generate-client stderr:\n${result.stderr}`).toBe(0);
-    expect(existsSync(entry)).toBe(true);
-
-    const src = readFileSync(entry, 'utf-8');
-    expect(src).toContain('export class CafeClient {');
-    expect(src).not.toContain('export async function');
-    // Methods live inside the class, bodies still call the shared runtime.
-    expect(src).toMatch(/\basync \w+\(/);
-    expect(src).toMatch(/return __request<[^>]*>\(this\.config,/);
-    // Operation aliases are hoisted to module level, ahead of the class.
-    expect(src).toMatch(/export type \w+Result/);
-    expect(src.search(/export type \w+Result/)).toBeLessThan(
-      src.indexOf('export class CafeClient {')
-    );
-  }, 90_000);
-
-  test('the class-shaped client type-checks under strict mode with no unused locals', () => {
-    expect(existsSync(entry), 'generation test must run first').toBe(true);
-    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
-    const tsc = spawnSync(tscBin, [...TSC_ARGS, ...collectTsFiles(workDir)], {
-      encoding: 'utf-8',
-      cwd: workDir,
-    });
-    expect(tsc.status, `tsc errors:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
-  }, 90_000);
-});
-
-describe('generate-client end-to-end (--facade service-class, --output-mode split)', () => {
-  let workDir = '';
-  let entry = '';
-
-  beforeAll(() => {
-    workDir = mkdtempSync(join(tmpdir(), 'sc-split-client-'));
-    entry = join(workDir, 'client.ts');
-  });
-
-  afterAll(() => {
-    if (workDir && existsSync(workDir)) rmSync(workDir, { recursive: true, force: true });
-  });
-
-  test('places the Client class in the entry beside the shared http + schemas modules', () => {
-    const result = spawnSync(
-      'node',
-      [
-        cliEntry,
-        'generate-client',
-        fixture,
-        '--output',
-        entry,
-        '--facade',
-        'service-class',
-        '--output-mode',
-        'split',
-      ],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(result.status, `generate-client stderr:\n${result.stderr}`).toBe(0);
-    expect(existsSync(join(workDir, 'client.http.ts'))).toBe(true);
-    expect(existsSync(join(workDir, 'client.schemas.ts'))).toBe(true);
-
-    const src = readFileSync(entry, 'utf-8');
-    // Default class name (no --name) is `Client`; it lives in the entry and imports
-    // the shared runtime/types from the sibling modules.
-    expect(src).toContain('export class Client {');
-    expect(src).toContain('from "./client.http.js"');
-    expect(src).toContain("export * from './client.schemas.js';");
-  }, 90_000);
-
-  test('the split class-shaped set type-checks under strict mode with no unused locals', () => {
-    expect(existsSync(entry), 'generation test must run first').toBe(true);
-    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
-    const tsc = spawnSync(tscBin, [...TSC_ARGS, ...collectTsFiles(workDir)], {
-      encoding: 'utf-8',
-      cwd: workDir,
-    });
-    expect(tsc.status, `tsc errors:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
-  }, 90_000);
-});
-
-describe('generate-client end-to-end (--facade service-class, --output-mode tags)', () => {
-  let workDir = '';
-  let entry = '';
-
-  beforeAll(() => {
-    workDir = mkdtempSync(join(tmpdir(), 'sc-tags-client-'));
-    entry = join(workDir, 'client.ts');
-  });
-
-  afterAll(() => {
-    if (workDir && existsSync(workDir)) rmSync(workDir, { recursive: true, force: true });
-  });
-
-  test('emits one service class per tag and re-exports them from the barrel', () => {
-    const result = spawnSync(
-      'node',
-      [
-        cliEntry,
-        'generate-client',
-        fixture,
-        '--output',
-        entry,
-        '--facade',
-        'service-class',
-        '--output-mode',
-        'tags',
-      ],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(result.status, `generate-client stderr:\n${result.stderr}`).toBe(0);
-
-    expect(readFileSync(join(workDir, 'Products.ts'), 'utf-8')).toContain(
-      'export class ProductsService {'
-    );
-    expect(readFileSync(join(workDir, 'Orders.ts'), 'utf-8')).toContain(
-      'export class OrdersService {'
-    );
-    const entrySrc = readFileSync(entry, 'utf-8');
-    expect(entrySrc).toContain("export * from './Products.js';");
-    expect(entrySrc).toContain("export * from './Orders.js';");
-
-    // The OPERATIONS metadata map is facade-independent: it lives once in the
-    // shared schemas module (not per-tag) and is re-exported from the barrel.
-    const schemasSrc = readFileSync(join(workDir, 'client.schemas.ts'), 'utf-8');
-    expect(schemasSrc).toContain('export const OPERATIONS = {');
-    expect(entrySrc).toContain("export * from './client.schemas.js';");
-    expect(readFileSync(join(workDir, 'Products.ts'), 'utf-8')).not.toContain(
-      'export const OPERATIONS'
-    );
-  }, 90_000);
-
-  test('the tags class-shaped set type-checks under strict mode with no unused locals', () => {
-    expect(existsSync(entry), 'generation test must run first').toBe(true);
-    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
-    const tsc = spawnSync(tscBin, [...TSC_ARGS, ...collectTsFiles(workDir)], {
-      encoding: 'utf-8',
-      cwd: workDir,
-    });
-    expect(tsc.status, `tsc errors:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
-  }, 90_000);
-});
-
-describe('generate-client end-to-end (--facade service-class, --output-mode tags-split)', () => {
-  let workDir = '';
-  let entry = '';
-
-  beforeAll(() => {
-    workDir = mkdtempSync(join(tmpdir(), 'sc-tags-split-client-'));
-    entry = join(workDir, 'client.ts');
-  });
-
-  afterAll(() => {
-    if (workDir && existsSync(workDir)) rmSync(workDir, { recursive: true, force: true });
-  });
-
-  test('emits one service class per tag folder, importing the shared modules via ../', () => {
-    const result = spawnSync(
-      'node',
-      [
-        cliEntry,
-        'generate-client',
-        fixture,
-        '--output',
-        entry,
-        '--facade',
-        'service-class',
-        '--output-mode',
-        'tags-split',
-      ],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(result.status, `generate-client stderr:\n${result.stderr}`).toBe(0);
-
-    const productsFile = join(workDir, 'Products', 'client.ts');
-    expect(existsSync(productsFile)).toBe(true);
-    const productsSrc = readFileSync(productsFile, 'utf-8');
-    expect(productsSrc).toContain('export class ProductsService {');
-    expect(productsSrc).toContain('from "../client.http.js"');
-    expect(readFileSync(entry, 'utf-8')).toContain("export * from './Products/client.js';");
-  }, 90_000);
-
-  test('the tags-split class-shaped tree type-checks under strict mode with no unused locals', () => {
-    expect(existsSync(entry), 'generation test must run first').toBe(true);
-    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
-    const tsc = spawnSync(tscBin, [...TSC_ARGS, ...collectTsFiles(workDir)], {
-      encoding: 'utf-8',
-      cwd: workDir,
-    });
-    expect(tsc.status, `tsc errors:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
-  }, 90_000);
-});
-
-describe('generate-client end-to-end — shared runtime across facades', () => {
-  test('the emitted http (core) module is byte-identical for functions and service-class', () => {
-    const fnDir = mkdtempSync(join(tmpdir(), 'fn-core-'));
-    const scDir = mkdtempSync(join(tmpdir(), 'sc-core-'));
-    try {
-      const gen = (dir: string, facade: string) =>
-        spawnSync(
-          'node',
-          [
-            cliEntry,
-            'generate-client',
-            fixture,
-            '--output',
-            join(dir, 'client.ts'),
-            '--output-mode',
-            'split',
-            '--facade',
-            facade,
-          ],
-          { encoding: 'utf-8', cwd: repoRoot }
-        );
-      expect(gen(fnDir, 'functions').status).toBe(0);
-      expect(gen(scDir, 'service-class').status).toBe(0);
-
-      const fnHttp = readFileSync(join(fnDir, 'client.http.ts'), 'utf-8');
-      const scHttp = readFileSync(join(scDir, 'client.http.ts'), 'utf-8');
-      expect(scHttp).toBe(fnHttp);
-    } finally {
-      rmSync(fnDir, { recursive: true, force: true });
-      rmSync(scDir, { recursive: true, force: true });
-    }
-  }, 90_000);
-});
diff --git a/tests/e2e/generate-client/setup.test.ts b/tests/e2e/generate-client/setup.test.ts
index 8095a99215..fb37284d0e 100644
--- a/tests/e2e/generate-client/setup.test.ts
+++ b/tests/e2e/generate-client/setup.test.ts
@@ -1,8 +1,8 @@
 /**
- * Behavioral e2e for `--setup`: a publisher setup module baked into the single-file client.
+ * Behavioral e2e for `--setup`: a publisher setup module baked into the generated client.
  * Generates a client with `--setup`, then drives the baked runtime in a real consumer to prove
  * the defaults apply with no consumer `configure`/`use`, that a consumer can still override, and
- * that combining `--setup` with a multi-file output mode fails fast.
+ * that the baked setup also applies in the split two-file layout.
  */
 import { spawnSync } from 'node:child_process';
 import { existsSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
@@ -119,33 +119,3 @@ describe('--setup bakes publisher defaults into the single-file client', () => {
     }
   }, 60_000);
 });
-
-describe('--setup with the service-class facade', () => {
-  let dir = '';
-  beforeAll(() => {
-    dir = mkdtempSync(join(tmpdir(), 'setup-sc-'));
-    const r = generate(dir, ['--facade', 'service-class', '--name', 'PetClient']);
-    if (r.status !== 0) throw new Error(`generate failed:\n${r.stderr}`);
-  }, 60_000);
-  afterAll(() => {
-    if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
-  });
-
-  test('new Client() with no args picks up the baked defaults; a passed config overrides', () => {
-    const captured = runConsumer(
-      dir,
-      outdent`
-        import { PetClient } from './client.ts';
-        const fetchSpy = (sink: { url: string; header: string }) => (async (u: string, init: RequestInit) => { sink.url = u; sink.header = (init.headers as Record<string,string>)['X-Baked']; return new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } }); }) as unknown as typeof fetch;
-        const baked = { url: '', header: '' };
-        await new PetClient({ fetch: fetchSpy(baked) }).listPets();
-        const overridden = { url: '', header: '' };
-        await new PetClient({ serverUrl: 'https://override.example.com', fetch: fetchSpy(overridden) }).listPets();
-        console.log(JSON.stringify({ baked, overridden }));
-      `
-    ) as { baked: { url: string; header: string }; overridden: { url: string } };
-    expect(new URL(captured.baked.url).origin).toBe('https://baked.example.com');
-    expect(captured.baked.header).toBe('yes');
-    expect(new URL(captured.overridden.url).origin).toBe('https://override.example.com');
-  }, 60_000);
-});
diff --git a/tests/e2e/generate-client/spec-versions.test.ts b/tests/e2e/generate-client/spec-versions.test.ts
index 5c23347a9b..8c757b2474 100644
--- a/tests/e2e/generate-client/spec-versions.test.ts
+++ b/tests/e2e/generate-client/spec-versions.test.ts
@@ -46,15 +46,15 @@ function generateAndTypecheck(fixture: string): { generated: string } {
 describe('generate-client spec versions', () => {
   it('generates a type-checking client from a Swagger 2.0 document', () => {
     const { generated } = generateAndTypecheck('swagger2.yaml');
-    expect(generated).toContain('export async function getPet');
-    expect(generated).toContain('export async function createPet');
+    expect(generated).toContain('export const getPet = (');
+    expect(generated).toContain('export const createPet = (');
     expect(generated).toContain('export type Pet');
-    expect(generated).toContain('let BASE = "https://api.example.com/v2"');
+    expect(generated).toContain('serverUrl: "https://api.example.com/v2"');
   }, 60_000);
 
   it('generates a type-checking client from an OpenAPI 3.2 document', () => {
     const { generated } = generateAndTypecheck('oas3.2.yaml');
-    expect(generated).toContain('export async function getThing');
+    expect(generated).toContain('export const getThing = (');
     expect(generated).toContain('export type Thing');
     // 3.1/3.2 nullable enum renders as a nullable union.
     expect(generated).toMatch(/status\?:\s*\("active" \| "archived"\) \| null;/);
@@ -62,6 +62,6 @@ describe('generate-client spec versions', () => {
 
   it('synthesizes operation names from method+path when operationId is omitted', () => {
     const { generated } = generateAndTypecheck('no-operationid.yaml');
-    expect(generated).toContain('export async function getGiftcardsCardId');
+    expect(generated).toContain('export const getGiftcardsCardId = (');
   }, 60_000);
 });
diff --git a/tests/e2e/generate-client/split.test.ts b/tests/e2e/generate-client/split.test.ts
index 943d58d31a..284c50fe63 100644
--- a/tests/e2e/generate-client/split.test.ts
+++ b/tests/e2e/generate-client/split.test.ts
@@ -1,10 +1,10 @@
 /**
- * E2E for `--output-mode split`: the generated multi-file set must compile under
+ * E2E for `--output-mode split`: the generated two-file set must compile under
  * strict `tsc` with `--noUnusedLocals`, which proves both that cross-file imports
  * resolve and that each file imports exactly what it uses (no over-importing).
  *
- * Uses cafe.yaml because it exercises the full http module (bearer + apiKey auth,
- * header params) and the schemas module (named types + discriminated-union guards).
+ * Uses cafe.yaml because it exercises the embedded runtime broadly (bearer + apiKey
+ * auth, header params) and the schemas module (named types + discriminated-union guards).
  */
 import { spawnSync } from 'node:child_process';
 import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs';
@@ -20,13 +20,11 @@ const fixture = join(__dirname, 'fixtures/cafe.yaml');
 describe('generate-client end-to-end (--output-mode split)', () => {
   let workDir = '';
   let entry = '';
-  let httpFile = '';
   let schemasFile = '';
 
   beforeAll(() => {
     workDir = mkdtempSync(join(tmpdir(), 'split-client-'));
     entry = join(workDir, 'client.ts');
-    httpFile = join(workDir, 'client.http.ts');
     schemasFile = join(workDir, 'client.schemas.ts');
   });
 
@@ -36,7 +34,7 @@ describe('generate-client end-to-end (--output-mode split)', () => {
     }
   });
 
-  test('writes three sibling files derived from --output', () => {
+  test('writes two sibling files derived from --output', () => {
     const result = spawnSync(
       'node',
       [cliEntry, 'generate-client', fixture, '--output', entry, '--output-mode', 'split'],
@@ -44,23 +42,30 @@ describe('generate-client end-to-end (--output-mode split)', () => {
     );
     expect(result.status, `generate-client stderr:\n${result.stderr}`).toBe(0);
     expect(existsSync(entry)).toBe(true);
-    expect(existsSync(httpFile)).toBe(true);
     expect(existsSync(schemasFile)).toBe(true);
+    // Split is exactly two files: no `.http.ts` module anymore.
+    expect(existsSync(join(workDir, 'client.http.ts'))).toBe(false);
 
     const entrySrc = readFileSync(entry, 'utf-8');
-    // The entry imports helpers/types and re-exports the public surface.
-    expect(entrySrc).toContain('from "./client.http.js"');
-    expect(entrySrc).toContain('import type {');
+    // The entry embeds the runtime, holds the descriptor wiring, imports schema
+    // types, and re-exports the schemas module as the public type surface.
+    expect(entrySrc).toContain('// ─── Embedded runtime');
+    expect(entrySrc).toContain("from './client.schemas.js'");
     expect(entrySrc).toContain("export * from './client.schemas.js';");
+    expect(entrySrc).toContain('as const satisfies Record<string, OperationDescriptor>');
+    expect(entrySrc).toContain(
+      'export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS,'
+    );
+    expect(entrySrc).toContain('export const { configure, use } = client;');
+    expect(entrySrc).toContain('export const setBearer = client.auth.bearer;');
 
-    // The http module holds the runtime + auth; schemas holds the model types.
-    const httpSrc = readFileSync(httpFile, 'utf-8');
-    expect(httpSrc).toContain('export async function __request<T>(');
-    expect(httpSrc).toContain('export function setBearer(');
-    expect(readFileSync(schemasFile, 'utf-8')).toContain('export type ');
+    // Schemas holds the model types and the discriminated-union guards.
+    const schemasSrc = readFileSync(schemasFile, 'utf-8');
+    expect(schemasSrc).toContain('export type ');
+    expect(schemasSrc).toContain('export function isBeverage(');
   }, 90_000);
 
-  test('the multi-file set type-checks under strict mode with no unused imports', () => {
+  test('the two-file set type-checks under strict mode with no unused imports', () => {
     expect(existsSync(entry), 'generation test must run first').toBe(true);
 
     const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
@@ -79,7 +84,6 @@ describe('generate-client end-to-end (--output-mode split)', () => {
         '--lib',
         'ES2020,DOM',
         entry,
-        httpFile,
         schemasFile,
       ],
       { encoding: 'utf-8', cwd: workDir }
diff --git a/tests/e2e/generate-client/sse-consumer/api.ts b/tests/e2e/generate-client/sse-consumer/api.ts
index 67d6fb7dd7..313ac84c31 100644
--- a/tests/e2e/generate-client/sse-consumer/api.ts
+++ b/tests/e2e/generate-client/sse-consumer/api.ts
@@ -14,655 +14,975 @@ export type Message = {
     seq: number;
 };
 
+export type GetHealthResult = Health;
+
 /**
- * Static metadata for every operation, keyed by operationId: the HTTP `method`
- * and the `path` template (with `{param}` placeholders intact). Minification-safe
- * — useful for building cache/query keys, tracing span names, and request logging
- * without re-deriving them at each call site.
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
  */
-export const OPERATIONS = {
-    getHealth: { method: "GET", path: "/health", tags: ["Health"] },
-    streamMessages: { method: "GET", path: "/messages", tags: ["Messages"] },
-    streamAbort: { method: "GET", path: "/abort-messages", tags: ["Messages"] },
-    streamTicks: { method: "GET", path: "/ticks", tags: ["Ticks"] }
-} as const;
+export type Ops = {
+    getHealth: {
+        args: {};
+        result: GetHealthResult;
+    };
+    streamMessages: {
+        args: {};
+        result: Message;
+        kind: "sse";
+    };
+    streamAbort: {
+        args: {};
+        result: Message;
+        kind: "sse";
+    };
+    streamTicks: {
+        args: {};
+        result: string;
+        kind: "sse";
+    };
+};
 
 /**
- * The operationId of any operation in this client.
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
  */
+export const OPERATIONS = {
+    getHealth: { id: "getHealth", method: "GET", path: "/health", tags: ["Health"] },
+    streamMessages: { id: "streamMessages", method: "GET", path: "/messages", tags: ["Messages"], responseKind: "sse", sseDataKind: "json" },
+    streamAbort: { id: "streamAbort", method: "GET", path: "/abort-messages", tags: ["Messages"], responseKind: "sse", sseDataKind: "json" },
+    streamTicks: { id: "streamTicks", method: "GET", path: "/ticks", tags: ["Ticks"], responseKind: "sse", sseDataKind: "text" }
+} as const satisfies Record<string, OperationDescriptor>;
+
 export type OperationId = keyof typeof OPERATIONS;
 
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
 /**
- * Static metadata describing one operation: its HTTP method, path template, and tags.
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
  */
-export type OperationMetadata = {
-    readonly method: string;
-    readonly path: string;
-    readonly tags: readonly string[];
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
 };
 
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+};
 
-export type OperationTag = (typeof OPERATIONS)[OperationId]["tags"][number];
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
 
-let BASE = "http://localhost:3104";
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
 
-/** Identity of the operation a request belongs to. Stable across path interpolation. */
-export type OperationContext = {
-    id: OperationId;
-    path: OperationPath;
-    tags: OperationTag[];
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
 };
 
-/** The mutable request context handed to `onRequest` (mutate `url`/`method`/`headers`/`body`). */
-export type RequestContext = {
-    url: string;
-    method: string;
-    headers: Record<string, string>;
-    body?: unknown;
-    /** The operation being called: its id (operationId), path template, and tags. */
-    operation: OperationContext;
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
 };
 
-/**
- * Configuration and extension hooks for a client. Supplied per-instance via
- * `new <Client>(config)` (service-class facade) or globally via `configure(config)`
- * (functions facade).
- */
-export type ClientConfig = {
-    /** Base URL for this client; overrides the inlined default and `setServerUrl()`. */
-    serverUrl?: string;
-    /** Extra headers merged into every request; a function is invoked per request. */
-    headers?: Record<string, string> | (() => Record<string, string> | Promise<Record<string, string>>);
-    /** Transport used to issue requests. Defaults to the global `fetch`. */
-    fetch?: typeof fetch;
-    /** Mutate the request (`url` / `method` / `headers`) before it is sent. */
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    /** Observe — or replace, by returning a `Response` — the response before parsing. */
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    /**
-     * Map a failed request's `ApiError` into a custom error to throw instead (throw mode only).
-     * Synchronous, kept so for backward compatibility; `Middleware.onError` additionally allows async.
-     */
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error;
-    /**
-     * Composable interceptors run around every request, alongside the single
-     * `onRequest`/`onResponse`/`onError` hooks above (which act as one implicit, first
-     * middleware). `onRequest` runs in array order; `onResponse` in reverse — an onion, so
-     * the last-registered middleware wraps closest to the network. Register more at runtime
-     * with `use()` (functions facade) or `<Client>.use()` (service-class facade).
-     */
-    middleware?: Middleware[];
-    /** Retry policy for transient failures. Omitted ⇒ no retries (`retries` defaults to 0). */
-    retry?: RetryConfig;
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
 };
 
 /**
- * A request interceptor; every field is optional, so a middleware can hook any subset of
- * the lifecycle. `onRequest` may mutate the request `ctx` (`url`/`method`/`headers`);
- * `onResponse` may return a replacement `Response`; `onError` (throw mode only) maps the
- * failure into the error to throw, threaded through each middleware in turn.
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
  */
-export type Middleware = {
-    onRequest?: (ctx: RequestContext) => void | Promise<void>;
-    onResponse?: (response: Response, ctx: RequestContext) => Response | void | Promise<Response | void>;
-    // `globalThis.Error` (not bare `Error`) so a spec schema named `Error` can't shadow it.
-    onError?: (error: ApiError, ctx: RequestContext) => globalThis.Error | Promise<globalThis.Error>;
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
 };
 
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
 
-/** Context handed to `retryOn` for the attempt that just failed. */
-export type RetryContext = {
-    /** 1-based number of the attempt that just failed. */
-    attempt: number;
-    /** The request that was attempted. */
-    request: RequestContext;
-    /** Present when the server returned a (non-ok) response. */
-    response?: Response;
-    /** Present when the transport threw (network error, DNS, connection reset). */
-    error?: unknown;
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
 };
 
-/** Retry policy; all fields optional with sensible defaults. */
-export type RetryConfig = {
-    /** Number of *extra* attempts after the first. Default 0 (opt-in). */
-    retries?: number;
-    /** Base delay in milliseconds. Default 1000. */
-    retryDelay?: number;
-    /** Backoff shape. Default 'exponential'. */
-    retryStrategy?: RetryStrategy;
-    /** Apply full jitter over the computed delay. Default true. */
-    jitter?: boolean;
-    /**
-     * Decide whether to retry a failed attempt. Default: retry only idempotent
-     * methods (GET/HEAD/PUT/DELETE/OPTIONS) on a network error or a transient
-     * status (408, 429, 500, 502, 503, 504). Override to widen/narrow.
-     */
-    retryOn?: (ctx: RetryContext) => boolean | Promise<boolean>;
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
+export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
 };
 
 /**
- * How the response body is read. `'auto'` negotiates from the content type (the
- * generated default); `'stream'` returns the raw `ReadableStream` (`response.body`).
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
  */
-export type ParseAs = 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream' | 'auto';
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : NoRequiredKeys<Ops[K]['args']> extends true
+      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
 
 /**
- * The trailing per-operation argument: standard `RequestInit` plus an optional
- * per-call retry override and a `parseAs` escape hatch.
- *
- * `parseAs` forces how the response body is read; overrides the inferred kind.
- * `'stream'` returns the raw `ReadableStream` (`response.body`). This is a runtime
- * override — the static return type is unchanged.
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
  */
-export type RequestOptions = RequestInit & {
-    retry?: Partial<RetryConfig>;
-    parseAs?: ParseAs;
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
 };
 
 /**
- * Override the base URL used by every generated operation. Useful when the
- * runtime environment differs from the value declared in `servers[0].url`
- * (e.g. dev / staging / prod toggles in a single-page app).
- *
- * Mutates a module-scoped binding shared by the functions facade. For multiple
- * bases at once, use the service-class facade with `new Client({ serverUrl })`.
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
  */
-export function setServerUrl(url: string): void {
-    BASE = url;
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
 }
 
-/** The global config used by the functions facade (see `configure`). */
-const __config: ClientConfig = {};
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
 
 /**
- * Merge `config` into the global configuration used by the functions facade —
- * set a custom `fetch`, default `headers`, or `onRequest`/`onResponse`/`onError`
- * hooks once for every free function. The service-class facade configures per
- * instance instead (`new Client(config)`).
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
  */
-export function configure(config: ClientConfig): void {
-    Object.assign(__config, config);
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
 }
 
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
 /**
- * Append interceptors to the functions facade's global middleware chain (see
- * `ClientConfig.middleware`). The service-class facade registers per instance via
- * `<Client>.use(...)` instead.
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
  */
-export function use(...middleware: Middleware[]): void {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    __config.middleware = [...(__config.middleware ?? []), ...middleware];
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
 }
 
 /**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
  */
-function __middleware(config: ClientConfig): Middleware[] {
-    const single = config.onRequest || config.onResponse || config.onError
-        ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-        : [];
-    return [...single, ...(config.middleware ?? [])];
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
 }
 
-export class ApiError extends Error {
-    public readonly url: string;
-    public readonly status: number;
-    public readonly statusText: string;
-    public readonly body: unknown;
-    constructor(url: string, status: number, statusText: string, body: unknown) {
-        super(`Request failed with status ${status}`);
-        this.name = 'ApiError';
-        this.url = url;
-        this.status = status;
-        this.statusText = statusText;
-        this.body = body;
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
     }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
 }
 
-type QueryPrimitive = string | number | boolean;
-
-type QueryValue = QueryPrimitive | null | undefined | Array<QueryPrimitive> | Record<string, unknown>;
-
-/** Per-key OpenAPI query serialization spec; absent ⇒ the defaults (`form`, `explode: true`). */
-type QueryStyle = {
-    style: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-    explode: boolean;
-    allowReserved?: boolean;
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
 /**
- * Percent-encode `value` but leave the RFC-3986 reserved set
- * (`:/?#[]@!$&'()*+,;=`) un-escaped, for query params declaring `allowReserved`.
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
  */
-function __encodeReserved(value: string): string {
-    return encodeURIComponent(value).replace(/%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g, (match) => decodeURIComponent(match));
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
 }
 
-function __buildUrl(config: ClientConfig, path: string, query?: Record<string, QueryValue>, styles?: Record<string, QueryStyle>): string {
-    const url = (config.serverUrl ?? BASE).replace(/\/+$/, '') + path;
-    if (!query)
-        return url;
-    const params = new URLSearchParams();
-    const raw: string[] = [];
-    for (const [key, value] of Object.entries(query)) {
-        if (value === undefined || value === null)
-            continue;
-        const spec = styles?.[key];
-        if (!spec) {
-            if (Array.isArray(value)) {
-                for (const v of value) {
-                    if (v !== undefined && v !== null)
-                        params.append(key, String(v));
-                }
-            }
-            else if (typeof value === 'object') {
-                // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-                for (const [subKey, subValue] of Object.entries(value)) {
-                    if (subValue !== undefined && subValue !== null) {
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                    }
-                }
-            }
-            else {
-                params.append(key, String(value));
-            }
-            continue;
-        }
-        if (Array.isArray(value)) {
-            const items = value.filter((v) => v !== undefined && v !== null).map(String);
-            if (spec.style === 'form' && spec.explode) {
-                for (const v of items) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}=${__encodeReserved(v)}`);
-                    else
-                        params.append(key, v);
-                }
-            }
-            else {
-                // Delimited styles put the LITERAL delimiter on the wire; only the
-                // values are encoded. `%20` (not `+`) is the literal space delimiter.
-                const delim = spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-                const enc = spec.allowReserved ? __encodeReserved : encodeURIComponent;
-                raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-            }
-        }
-        else if (typeof value === 'object') {
-            // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-            for (const [subKey, subValue] of Object.entries(value)) {
-                if (subValue !== undefined && subValue !== null) {
-                    if (spec.allowReserved)
-                        raw.push(`${key}[${subKey}]=${__encodeReserved(String(subValue))}`);
-                    else
-                        params.append(`${key}[${subKey}]`, String(subValue));
-                }
-            }
-        }
-        else if (spec.allowReserved) {
-            raw.push(`${key}=${__encodeReserved(String(value))}`);
-        }
-        else {
-            params.append(key, String(value));
-        }
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
     }
-    const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-    return qs ? `${url}?${qs}` : url;
-}
-
-async function __send(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown): Promise<{
-    response: Response;
-    context: RequestContext;
-}> {
-    const { retry: callRetry, ...fetchInit } = init;
-    const retry: RetryConfig = { ...config.retry, ...callRetry };
-    const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-    const headers: Record<string, string> = {
-        Accept: 'application/json',
-        ...extra,
-        ...(fetchInit.headers as Record<string, string> | undefined),
-    };
-    const context: RequestContext = { url, method: fetchInit.method ?? 'GET', headers, body, operation: op };
-    const middleware = __middleware(config);
-    for (const mw of middleware)
-        if (mw.onRequest)
-            await mw.onRequest(context);
-    // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-    let payload: BodyInit | undefined;
-    if (context.body !== undefined) {
-        const value = context.body;
-        const isBinary = value instanceof Blob ||
-            value instanceof ArrayBuffer ||
-            ArrayBuffer.isView(value as ArrayBufferView);
-        const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-        const isURLSearchParams = value instanceof URLSearchParams;
-        if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-            payload = value as BodyInit;
-        }
-        else {
-            payload = JSON.stringify(value);
-            if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-                context.headers['Content-Type'] = 'application/json';
-            }
-        }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
     }
-    const doFetch = config.fetch ?? fetch;
-    const maxAttempts = 1 + (retry.retries ?? 0);
-    const retryOn = retry.retryOn ?? __defaultRetryOn;
-    const signal = fetchInit.signal ?? undefined;
-    let attempt = 0;
-    while (true) {
-        attempt++;
-        if (signal?.aborted)
-            throw __abortError(signal);
-        let response: Response;
-        try {
-            response = await doFetch(context.url, {
-                ...fetchInit,
-                method: context.method,
-                headers: context.headers,
-                body: payload,
-            });
-        }
-        catch (error) {
-            if (attempt < maxAttempts && !signal?.aborted && (await retryOn({ attempt, request: context, error }))) {
-                await __sleep(__retryDelay(retry, attempt, null), signal);
-                continue;
-            }
-            throw error;
-        }
-        // Reverse order: the last-registered middleware wraps closest to the network (onion).
-        for (let i = middleware.length - 1; i >= 0; i--) {
-            const onResponse = middleware[i].onResponse;
-            if (onResponse) {
-                const replaced = await onResponse(response, context);
-                if (replaced)
-                    response = replaced;
-            }
-        }
-        if (!response.ok &&
-            attempt < maxAttempts &&
-            !signal?.aborted &&
-            (await retryOn({ attempt, request: context, response }))) {
-            const retryAfter = response.headers.get('retry-after');
-            // Drain the abandoned response body before the next attempt: an unread body
-            // keeps the connection checked out (and can stall the pool) under Node/undici
-            // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-            await response.body?.cancel().catch(() => undefined);
-            await __sleep(__retryDelay(retry, attempt, retryAfter), signal);
-            continue;
-        }
-        return { response, context };
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
     }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
 }
 
-async function __parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-    if (kind === 'void' || response.status === 204)
-        return undefined;
-    if (kind === 'stream')
-        return response.body;
-    if (kind === 'blob')
-        return response.blob();
-    if (kind === 'arrayBuffer')
-        return response.arrayBuffer();
-    if (kind === 'formData')
-        return response.formData();
-    if (kind === 'text')
-        return response.text();
-    if (kind === 'json')
-        return response.json();
-    // 'auto' — negotiate from the response's content type.
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json'))
-        return response.json();
-    if (contentType.startsWith('text/'))
-        return response.text();
-    return response.blob();
-}
-
-async function __request<T>(config: ClientConfig, op: OperationContext, url: string, init: RequestOptions, body?: unknown, responseKind: 'json' | 'blob' | 'text' | 'void' = 'json'): Promise<T> {
-    const { parseAs, ...sendInit } = init;
-    const { response, context } = await __send(config, op, url, sendInit, body);
-    if (!response.ok) {
+/**
+ * Consume a `text/event-stream` operation as typed events (capability module — wired
+ * into `createClient`). Auto-reconnects on dropped connections, resuming from the last
+ * seen event id via `Last-Event-ID` (backoff: the server's `retry:` value, then
+ * `reconnectDelay`, then 1s — exponential with jitter, capped at 30s). A clean stream
+ * end flushes a trailing frame and finishes; `break`/abort end the iterator cleanly.
+ */
+async function* sse<T>(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: SseOptions,
+  dataKind: 'json' | 'text' = 'text'
+): AsyncGenerator<ServerSentEvent<T>> {
+  const { reconnect = true, reconnectDelay, ...rest } = init;
+  const signal = rest.signal ?? undefined;
+  const headers: Record<string, string> = {
+    Accept: 'text/event-stream',
+    ...(rest.headers as Record<string, string> | undefined),
+  };
+  let lastEventId: string | undefined;
+  let serverRetry: number | undefined;
+  let failures = 0;
+  while (true) {
+    if (signal?.aborted) return;
+    const sendHeaders =
+      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
+    try {
+      const { response } = await send(
+        config,
+        op,
+        url,
+        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },
+        undefined,
+        false,
+        {}
+      );
+      if (!response.ok) {
         const errorBody = await readError(response);
-        let error: globalThis.Error = new ApiError(context.url, response.status, response.statusText, errorBody);
-        // Thread the error through each middleware's onError in turn (each may replace it).
-        for (const mw of __middleware(config)) {
-            if (mw.onError)
-                error = await mw.onError(error as ApiError, context);
+        throw new ApiError(url, response.status, response.statusText, errorBody);
+      }
+      failures = 0;
+      const body = response.body;
+      if (!body) return;
+      const reader = body.getReader();
+      const decoder = new TextDecoder();
+      let buffer = '';
+      try {
+        while (true) {
+          const { done, value } = await reader.read();
+          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });
+          let index: number;
+          while ((index = buffer.search(/\r\n\r\n|\n\n|\r\r/)) !== -1) {
+            const raw = buffer.slice(0, index);
+            buffer = buffer.slice(
+              index + buffer.slice(index).match(/^(\r\n\r\n|\n\n|\r\r)/)![0].length
+            );
+            const event = parseSseFrame(raw, dataKind);
+            if (event) {
+              if (event.id !== undefined) lastEventId = event.id;
+              if (event.retry !== undefined) serverRetry = event.retry;
+              yield event as ServerSentEvent<T>;
+            }
+          }
+          if (done) {
+            // Stream closed cleanly. Flush a final event that arrived without a trailing
+            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.
+            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;
+            if (event) {
+              if (event.id !== undefined) lastEventId = event.id;
+              if (event.retry !== undefined) serverRetry = event.retry;
+              yield event as ServerSentEvent<T>;
+            }
+            return;
+          }
+          // Bound memory: a server that never sends a frame delimiter would otherwise
+          // grow `buffer` without limit. 1 MiB is far above any real SSE frame.
+          if (buffer.length > 1048576) {
+            throw new Error('SSE frame exceeded 1048576 characters without a delimiter');
+          }
         }
-        throw error;
+      } finally {
+        await reader.cancel().catch(() => undefined);
+      }
+    } catch (error) {
+      if (signal?.aborted) return;
+      // A non-OK HTTP response is a definitive error (4xx/5xx), not a transient drop —
+      // surface it instead of reconnecting in a loop.
+      if (error instanceof ApiError) throw error;
+      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream
+      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.
+      if (!reconnect) throw error;
+    }
+    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.
+    failures++;
+    const base = serverRetry ?? reconnectDelay ?? 1000;
+    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);
+    try {
+      await sleep(Math.random() * delay, signal);
+    } catch {
+      return; // sleep rejects only on abort — end the iterator cleanly
     }
-    const kind = parseAs ?? (responseKind === 'json' ? 'auto' : responseKind);
-    return (await __parse(response, kind)) as T;
+  }
 }
 
-async function readError(response: Response): Promise<unknown> {
-    const contentType = response.headers.get('content-type') ?? '';
-    if (contentType.toLowerCase().includes('json')) {
-        return response.json().catch(() => undefined);
+/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */
+function parseSseFrame(
+  raw: string,
+  dataKind: 'json' | 'text'
+): ServerSentEvent<unknown> | undefined {
+  let event: string | undefined;
+  const dataLines: string[] = [];
+  let id: string | undefined;
+  let retry: number | undefined;
+  let sawField = false;
+  for (const line of raw.split(/\r\n|\n|\r/)) {
+    if (line === '' || line.startsWith(':')) continue;
+    const colon = line.indexOf(':');
+    const field = colon === -1 ? line : line.slice(0, colon);
+    let val = colon === -1 ? '' : line.slice(colon + 1);
+    if (val.startsWith(' ')) val = val.slice(1);
+    sawField = true;
+    if (field === 'event') event = val;
+    else if (field === 'data') dataLines.push(val);
+    else if (field === 'id') id = val;
+    else if (field === 'retry') {
+      const n = Number(val);
+      if (!Number.isNaN(n)) retry = n;
     }
-    return response.text().catch(() => undefined);
+  }
+  if (!sawField) return undefined;
+  const dataText = dataLines.join('\n');
+  const data = dataKind === 'json' && dataText !== '' ? JSON.parse(dataText) : dataText;
+  return { event, data, id, retry };
 }
 
-const __IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-
-const __TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+};
 
-function __defaultRetryOn(ctx: RetryContext): boolean {
-    if (!__IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase()))
-        return false;
-    return ctx.response === undefined || __TRANSIENT_STATUS.has(ctx.response.status);
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
 }
 
-function __retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-    if (retryAfter) {
-        const seconds = Number(retryAfter);
-        if (!Number.isNaN(seconds))
-            return seconds * 1000;
-        const when = Date.parse(retryAfter);
-        if (!Number.isNaN(when))
-            return Math.max(0, when - Date.now());
-    }
-    const base = retry.retryDelay ?? 1000;
-    const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-    return retry.jitter === false ? raw : Math.random() * raw;
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
 }
 
-function __sleep(ms: number, signal?: AbortSignal): Promise<void> {
-    return new Promise((resolve, reject) => {
-        if (signal?.aborted) {
-            reject(__abortError(signal));
-            return;
-        }
-        const onAbort = () => {
-            clearTimeout(timer);
-            reject(__abortError(signal as AbortSignal));
-        };
-        const timer = setTimeout(() => {
-            if (signal)
-                signal.removeEventListener('abort', onAbort);
-            resolve();
-        }, ms);
-        if (signal)
-            signal.addEventListener('abort', onAbort, { once: true });
-    });
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
 }
 
-function __abortError(signal: AbortSignal): globalThis.Error {
-    const reason = (signal as {
-        reason?: unknown;
-    }).reason;
-    if (reason instanceof Error)
-        return reason;
-    return new DOMException('The operation was aborted.', 'AbortError');
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
 }
 
-/** A single decoded Server-Sent Event. `data` is the parsed payload (`T`). */
-export type ServerSentEvent<T> = {
-    event?: string;
-    data: T;
-    id?: string;
-    retry?: number;
-};
-
-/** Per-call options for an SSE stream. `reconnect` defaults to true (auto-reconnect). */
-export type SseOptions = RequestInit & {
-    /** Opt out of automatic reconnection; the iterator then ends/throws on the first stream end/error. */
-    reconnect?: boolean;
-    /** Override the base reconnect backoff in ms. The server's `retry:` value still takes precedence. */
-    reconnectDelay?: number;
-};
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
 
-async function* __sse<T>(config: ClientConfig, op: OperationContext, url: string, init: SseOptions, dataKind: 'json' | 'text' = 'text'): AsyncGenerator<ServerSentEvent<T>> {
-    const { reconnect = true, reconnectDelay, ...rest } = init;
-    const signal = rest.signal ?? undefined;
-    const headers: Record<string, string> = {
-        Accept: 'text/event-stream',
-        ...(rest.headers as Record<string, string> | undefined),
-    };
-    let lastEventId: string | undefined;
-    let serverRetry: number | undefined;
-    let failures = 0;
-    while (true) {
-        if (signal?.aborted)
-            return;
-        const sendHeaders = lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
-        try {
-            const { response } = await __send(config, op, url, { ...rest, method: rest.method ?? 'GET', headers: sendHeaders });
-            if (!response.ok) {
-                const errorBody = await readError(response);
-                throw new ApiError(url, response.status, response.statusText, errorBody);
-            }
-            failures = 0;
-            const body = response.body;
-            if (!body)
-                return;
-            const reader = body.getReader();
-            const decoder = new TextDecoder();
-            let buffer = '';
-            try {
-                while (true) {
-                    const { done, value } = await reader.read();
-                    buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });
-                    let index: number;
-                    while ((index = buffer.search(/\r\n\r\n|\n\n|\r\r/)) !== -1) {
-                        const raw = buffer.slice(0, index);
-                        buffer = buffer.slice(index + buffer.slice(index).match(/^(\r\n\r\n|\n\n|\r\r)/)![0].length);
-                        const event = __parseSseFrame(raw, dataKind);
-                        if (event) {
-                            if (event.id !== undefined)
-                                lastEventId = event.id;
-                            if (event.retry !== undefined)
-                                serverRetry = event.retry;
-                            yield event as ServerSentEvent<T>;
-                        }
-                    }
-                    if (done) {
-                        // Stream closed cleanly. Flush a final event that arrived without a trailing
-                        // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.
-                        const event = buffer.length > 0 ? __parseSseFrame(buffer, dataKind) : undefined;
-                        if (event) {
-                            if (event.id !== undefined)
-                                lastEventId = event.id;
-                            if (event.retry !== undefined)
-                                serverRetry = event.retry;
-                            yield event as ServerSentEvent<T>;
-                        }
-                        return;
-                    }
-                    // Bound memory: a server that never sends a frame delimiter would otherwise
-                    // grow `buffer` without limit. 1 MiB is far above any real SSE frame.
-                    if (buffer.length > 1048576) {
-                        throw new Error('SSE frame exceeded 1048576 characters without a delimiter');
-                    }
-                }
-            }
-            finally {
-                await reader.cancel().catch(() => undefined);
-            }
-        }
-        catch (error) {
-            if (signal?.aborted)
-                return;
-            // A non-OK HTTP response is a definitive error (4xx/5xx), not a transient drop —
-            // surface it instead of reconnecting in a loop.
-            if (error instanceof ApiError)
-                throw error;
-            // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream
-            // read error, is a dropped connection: fall through to backoff/reconnect when enabled.
-            if (!reconnect)
-                throw error;
-        }
-        if (!reconnect || signal?.aborted)
-            return;
-        failures++;
-        const base = serverRetry ?? reconnectDelay ?? 1000;
-        const delay = Math.min(base * Math.pow(2, failures - 1), 30000);
-        try {
-            await __sleep(Math.random() * delay, signal);
-        }
-        catch (error) {
-            if (signal?.aborted)
-                return;
-            throw error;
-        }
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
     }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
 }
 
-/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */
-function __parseSseFrame(raw: string, dataKind: 'json' | 'text'): ServerSentEvent<unknown> | undefined {
-    let event: string | undefined;
-    const dataLines: string[] = [];
-    let id: string | undefined;
-    let retry: number | undefined;
-    let sawField = false;
-    for (const line of raw.split(/\r\n|\n|\r/)) {
-        if (line === '' || line.startsWith(':'))
-            continue;
-        const colon = line.indexOf(':');
-        const field = colon === -1 ? line : line.slice(0, colon);
-        let val = colon === -1 ? '' : line.slice(colon + 1);
-        if (val.startsWith(' '))
-            val = val.slice(1);
-        sawField = true;
-        if (field === 'event')
-            event = val;
-        else if (field === 'data')
-            dataLines.push(val);
-        else if (field === 'id')
-            id = val;
-        else if (field === 'retry') {
-            const n = Number(val);
-            if (!Number.isNaN(n))
-                retry = n;
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
         }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
     }
-    if (!sawField)
-        return undefined;
-    const dataText = dataLines.join('\n');
-    const data = dataKind === 'json' && dataText !== '' ? JSON.parse(dataText) : dataText;
-    return { event, data, id, retry };
-}
-
-export type GetHealthResult = Health;
-
-export async function getHealth(init: RequestOptions = {}): Promise<Health> {
-    return __request<Health>(__config, { id: "getHealth", path: "/health", tags: ["Health"] }, __buildUrl(__config, `/health`), { method: "GET", ...init });
-}
-
-async function* streamMessages(init: SseOptions = {}): AsyncGenerator<ServerSentEvent<Message>> {
-    yield* __sse<Message>(__config, { id: "streamMessages", path: "/messages", tags: ["Messages"] }, __buildUrl(__config, `/messages`), { method: "GET", ...init }, "json");
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
 }
 
-async function* streamAbort(init: SseOptions = {}): AsyncGenerator<ServerSentEvent<Message>> {
-    yield* __sse<Message>(__config, { id: "streamAbort", path: "/abort-messages", tags: ["Messages"] }, __buildUrl(__config, `/abort-messages`), { method: "GET", ...init }, "json");
+/**
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
+ */
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, { sse });
 }
 
-async function* streamTicks(init: SseOptions = {}): AsyncGenerator<ServerSentEvent<string>> {
-    yield* __sse<string>(__config, { id: "streamTicks", path: "/ticks", tags: ["Ticks"] }, __buildUrl(__config, `/ticks`), { method: "GET", ...init }, "text");
-}
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "http://localhost:3104" });
 
-export const sse = { streamMessages, streamAbort, streamTicks };
+export const { configure, use } = client;
+export const getHealth = (init: RequestOptions = {}) => client.getHealth({}, init);
+export const streamMessages = (init: SseOptions = {}) => client.streamMessages({}, init);
+export const streamAbort = (init: SseOptions = {}) => client.streamAbort({}, init);
+export const streamTicks = (init: SseOptions = {}) => client.streamTicks({}, init);
diff --git a/tests/e2e/generate-client/sse-consumer/index-abort.ts b/tests/e2e/generate-client/sse-consumer/index-abort.ts
index 66fb22058d..f3f69e20f1 100644
--- a/tests/e2e/generate-client/sse-consumer/index-abort.ts
+++ b/tests/e2e/generate-client/sse-consumer/index-abort.ts
@@ -1,4 +1,4 @@
-import { configure, sse } from './api.js';
+import { configure, streamAbort } from './api.js';
 
 const serverUrl = process.argv[2] ?? process.env.SSE_BASE_URL ?? 'http://127.0.0.1:3104';
 
@@ -12,7 +12,7 @@ async function main(): Promise<void> {
   let error: string | null = null;
 
   try {
-    for await (const ev of sse.streamAbort({ signal: controller.signal })) {
+    for await (const ev of streamAbort({ signal: controller.signal })) {
       void ev;
       received++;
       // Abort mid-stream, after the first event, while the server holds open.
diff --git a/tests/e2e/generate-client/sse-consumer/index-connect-retry.ts b/tests/e2e/generate-client/sse-consumer/index-connect-retry.ts
index df7fe70cac..9e4542f47b 100644
--- a/tests/e2e/generate-client/sse-consumer/index-connect-retry.ts
+++ b/tests/e2e/generate-client/sse-consumer/index-connect-retry.ts
@@ -1,9 +1,9 @@
-import { configure, sse } from './api.js';
+import { configure, streamMessages } from './api.js';
 
 // No real server: inject a `fetch` that fails the first attempt with a transport-style
 // error (as if the connection were refused/reset while opening the request), then
-// succeeds. With the fix, __sse must treat a __send failure as a dropped connection and
-// reconnect — not rethrow on the first error.
+// succeeds. The runtime's sse generator must treat a send failure as a dropped
+// connection and reconnect — not rethrow on the first error.
 let calls = 0;
 configure({
   fetch: (async () => {
@@ -22,7 +22,7 @@ configure({
 async function main(): Promise<void> {
   const events: string[] = [];
   // Tiny reconnect backoff so the test doesn't wait on the 1s default.
-  for await (const ev of sse.streamMessages({ reconnectDelay: 1 })) {
+  for await (const ev of streamMessages({ reconnectDelay: 1 })) {
     events.push(ev.data.text);
   }
   process.stdout.write(JSON.stringify({ calls, events, finished: true }) + '\n');
diff --git a/tests/e2e/generate-client/sse-consumer/index-finite.ts b/tests/e2e/generate-client/sse-consumer/index-finite.ts
index c6cdb21028..eb635ec5d3 100644
--- a/tests/e2e/generate-client/sse-consumer/index-finite.ts
+++ b/tests/e2e/generate-client/sse-consumer/index-finite.ts
@@ -1,4 +1,4 @@
-import { configure, sse } from './api.js';
+import { configure, streamMessages } from './api.js';
 
 const serverUrl = process.argv[2] ?? process.env.SSE_BASE_URL ?? 'http://127.0.0.1:3104';
 
@@ -11,7 +11,7 @@ async function main(): Promise<void> {
   configure({ serverUrl });
 
   const collected: Array<{ text: string; id: string | undefined }> = [];
-  for await (const ev of sse.streamMessages()) {
+  for await (const ev of streamMessages()) {
     collected.push({ text: ev.data.text, id: ev.id });
   }
 
diff --git a/tests/e2e/generate-client/sse-consumer/index.ts b/tests/e2e/generate-client/sse-consumer/index.ts
index fc12544f0e..bf515d5658 100644
--- a/tests/e2e/generate-client/sse-consumer/index.ts
+++ b/tests/e2e/generate-client/sse-consumer/index.ts
@@ -1,4 +1,4 @@
-import { configure, sse } from './api.js';
+import { configure, streamMessages } from './api.js';
 
 const serverUrl = process.argv[2] ?? process.env.SSE_BASE_URL ?? 'http://127.0.0.1:3104';
 
@@ -11,7 +11,7 @@ async function main(): Promise<void> {
   // client resumes with `Last-Event-ID: 2` and receives `c`. `ev.data` is the
   // typed `Message`, so `ev.data.text` is statically a string.
   const collected: Collected[] = [];
-  for await (const ev of sse.streamMessages()) {
+  for await (const ev of streamMessages()) {
     collected.push({ text: ev.data.text, id: ev.id });
     if (collected.length >= 3) break;
   }
diff --git a/tests/e2e/generate-client/sse.runtime.test.ts b/tests/e2e/generate-client/sse.runtime.test.ts
index 2f08701d14..74637d7c4e 100644
--- a/tests/e2e/generate-client/sse.runtime.test.ts
+++ b/tests/e2e/generate-client/sse.runtime.test.ts
@@ -165,7 +165,7 @@ describe('generate-client SSE consumer (reconnect + abort)', () => {
       finished: boolean;
     };
 
-    // The first __send threw (simulated connection failure); the iterator reconnected
+    // The first send attempt threw (simulated connection failure); the iterator reconnected
     // and the second attempt streamed the event, then finished.
     expect(parsed.calls).toBe(2);
     expect(parsed.events).toEqual(['a']);
diff --git a/tests/e2e/generate-client/sse.test.ts b/tests/e2e/generate-client/sse.test.ts
index 514f331d41..62a36fdc4d 100644
--- a/tests/e2e/generate-client/sse.test.ts
+++ b/tests/e2e/generate-client/sse.test.ts
@@ -1,8 +1,9 @@
-// e2e for SSE (`text/event-stream`) operations: the typed `sse.*` async-iterator
-// surface. We assert on the generated source (string checks) and strict-tsc the
-// output (single-file, plus the whole tags-split dir) — the same lightweight
-// harness used by error-mode.test.ts. The behavioral reconnect/abort path is
-// covered separately by the sse-consumer harness in sse.runtime.test.ts.
+// e2e for SSE (`text/event-stream`) operations: the typed flat async-iterator
+// surface (`for await (const ev of streamMessages())`). We assert on the generated
+// source (string checks) and strict-tsc the output (single-file, plus the split
+// two-file set) — the same lightweight harness used by error-mode.test.ts. The
+// behavioral reconnect/abort path is covered separately by the sse-consumer
+// harness in sse.runtime.test.ts.
 import { spawnSync } from 'node:child_process';
 import {
   existsSync,
@@ -49,7 +50,7 @@ function collectTsFiles(dir: string): string[] {
 const fixture = join(__dirname, 'fixtures', 'sse.yaml');
 
 describe('generate-client SSE', () => {
-  it('single-file, functions facade: __sse generator + sse aggregate + typed events, strict tsc passes', () => {
+  it('single-file: embedded sse capability + flat typed stream sugar, strict tsc passes', () => {
     const dir = mkdtempSync(join(tmpdir(), 'ots-sse-single-'));
     const out = join(dir, 'client.ts');
     const res = spawnSync('node', [cli, 'generate-client', fixture, '--output', out], {
@@ -60,23 +61,33 @@ describe('generate-client SSE', () => {
     expect(existsSync(out)).toBe(true);
 
     const generated = readFileSync(out, 'utf-8');
-    expect(generated).toContain('async function* __sse');
-    expect(generated).toContain('export const sse = {');
-    expect(generated).toContain('streamMessages');
-    expect(generated).toContain('AsyncGenerator<ServerSentEvent<Message>>');
-    // The typeless stream falls back to a `string` event payload + the 'text' data kind.
-    expect(generated).toContain('__sse<string>');
-    expect(generated).toContain(', "text")');
+    // The embedded runtime carries the sse capability generator.
+    expect(generated).toContain('async function* sse<T>(');
+    // Stream operations are typed `kind: "sse"` in Ops and marked in the descriptors.
+    expect(generated).toContain('kind: "sse";');
+    expect(generated).toContain('responseKind: "sse"');
+    // JSON payloads decode as json; the typeless stream falls back to text/string.
+    expect(generated).toContain(
+      'streamMessages: { id: "streamMessages", method: "GET", path: "/messages", tags: ["Messages"], responseKind: "sse", sseDataKind: "json" }'
+    );
+    expect(generated).toContain(
+      'streamTicks: { id: "streamTicks", method: "GET", path: "/ticks", tags: ["Ticks"], responseKind: "sse", sseDataKind: "text" }'
+    );
+    expect(generated).toMatch(/streamTicks: \{\s*args: \{\};\s*result: string;\s*kind: "sse";/);
+    // Flat call sugar: an SSE op is a top-level export returning the async generator.
+    expect(generated).toContain(
+      'export const streamMessages = (init: SseOptions = {}) => client.streamMessages({}, init);'
+    );
 
     // A type-usage snippet proving `ServerSentEvent<Message>.data.text` is typed
     // and that `SseOptions` (reconnect/reconnectDelay) is accepted.
     writeFileSync(
       join(dir, 'usage.ts'),
       [
-        `import { sse, configure } from './client.js';`,
+        `import { streamMessages, configure } from './client.js';`,
         `async function check() {`,
-        `  for await (const ev of sse.streamMessages()) { const t: string = ev.data.text; void t; const id: string | undefined = ev.id; void id; }`,
-        `  const it = sse.streamMessages({ reconnect: false, reconnectDelay: 500 });`,
+        `  for await (const ev of streamMessages()) { const t: string = ev.data.text; void t; const id: string | undefined = ev.id; void id; }`,
+        `  const it = streamMessages({ reconnect: false, reconnectDelay: 500 });`,
         `  void it;`,
         `}`,
         `void check; void configure;`,
@@ -95,47 +106,23 @@ describe('generate-client SSE', () => {
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
-  it('single-file, service-class facade: sse namespace bound on the class, strict tsc passes', () => {
-    const dir = mkdtempSync(join(tmpdir(), 'ots-sse-sc-'));
-    const out = join(dir, 'client.ts');
-    const res = spawnSync(
-      'node',
-      [cli, 'generate-client', fixture, '--output', out, '--facade', 'service-class'],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(res.status, res.stderr).toBe(0);
-    expect(existsSync(out)).toBe(true);
-
-    const generated = readFileSync(out, 'utf-8');
-    expect(generated).toContain('readonly sse = {');
-    expect(generated).toContain('streamMessages: this.streamMessages.bind(this)');
-
-    writeFileSync(
-      join(dir, 'tsconfig.json'),
-      JSON.stringify({ ...TSCONFIG, include: ['client.ts'] }),
-      'utf-8'
-    );
-    const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
-    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
-    rmSync(dir, { recursive: true, force: true });
-  }, 60_000);
-
-  it('tags-split, functions facade: the entry barrel merges per-tag sse fragments, strict tsc passes over the dir', () => {
+  it('split: SSE ops live in the entry beside the embedded runtime, strict tsc passes over both files', () => {
     const dir = mkdtempSync(join(tmpdir(), 'ots-sse-split-'));
     const entry = join(dir, 'client.ts');
     const res = spawnSync(
       'node',
-      [cli, 'generate-client', fixture, '--output', entry, '--output-mode', 'tags-split'],
+      [cli, 'generate-client', fixture, '--output', entry, '--output-mode', 'split'],
       { encoding: 'utf-8', cwd: repoRoot }
     );
     expect(res.status, res.stderr).toBe(0);
     expect(existsSync(entry)).toBe(true);
 
-    // The entry barrel merges each per-tag SSE fragment into the public `sse`.
     const entrySrc = readFileSync(entry, 'utf-8');
-    expect(entrySrc).toContain('export const sse = { ...__sse_');
+    expect(entrySrc).toContain('async function* sse<T>(');
+    expect(entrySrc).toContain('export const streamMessages = (init: SseOptions = {})');
 
     const files = collectTsFiles(dir);
+    expect(files.map((f) => f.split('/').pop()).sort()).toEqual(['client.schemas.ts', 'client.ts']);
     const tsc = spawnSync(
       tscBin,
       [
diff --git a/tests/e2e/generate-client/tags-split.test.ts b/tests/e2e/generate-client/tags-split.test.ts
deleted file mode 100644
index 2c3b8e97b0..0000000000
--- a/tests/e2e/generate-client/tags-split.test.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * E2E for `--output-mode tags-split`: a folder per OpenAPI tag with shared
- * http + schemas at the root. The whole generated tree must compile under strict
- * `tsc` with `--noUnusedLocals` (proves the `../` imports back to the shared
- * modules resolve and that each per-tag file imports exactly what it uses).
- */
-import { spawnSync } from 'node:child_process';
-import { existsSync, mkdtempSync, readdirSync, readFileSync, rmSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
-const fixture = join(__dirname, 'fixtures/cafe.yaml');
-
-function collectTsFiles(dir: string): string[] {
-  return readdirSync(dir, { withFileTypes: true }).flatMap((entry) => {
-    const full = join(dir, entry.name);
-    if (entry.isDirectory()) return collectTsFiles(full);
-    return entry.name.endsWith('.ts') ? [full] : [];
-  });
-}
-
-describe('generate-client end-to-end (--output-mode tags-split)', () => {
-  let workDir = '';
-  let entry = '';
-
-  beforeAll(() => {
-    workDir = mkdtempSync(join(tmpdir(), 'tags-split-client-'));
-    entry = join(workDir, 'client.ts');
-  });
-
-  afterAll(() => {
-    if (workDir && existsSync(workDir)) {
-      rmSync(workDir, { recursive: true, force: true });
-    }
-  });
-
-  test('writes a folder per tag with shared modules at the root', () => {
-    const result = spawnSync(
-      'node',
-      [cliEntry, 'generate-client', fixture, '--output', entry, '--output-mode', 'tags-split'],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(result.status, `generate-client stderr:\n${result.stderr}`).toBe(0);
-
-    expect(existsSync(join(workDir, 'client.http.ts'))).toBe(true);
-    expect(existsSync(join(workDir, 'client.schemas.ts'))).toBe(true);
-    expect(existsSync(join(workDir, 'Products/client.ts'))).toBe(true);
-    expect(existsSync(join(workDir, 'Orders/client.ts'))).toBe(true);
-
-    expect(readFileSync(join(workDir, 'Products/client.ts'), 'utf-8')).toContain(
-      'from "../client.http.js"'
-    );
-    expect(readFileSync(entry, 'utf-8')).toContain("export * from './Products/client.js';");
-  }, 90_000);
-
-  test('the whole generated tree type-checks under strict mode with no unused imports', () => {
-    expect(existsSync(entry), 'generation test must run first').toBe(true);
-
-    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
-    const tsc = spawnSync(
-      tscBin,
-      [
-        '--noEmit',
-        '--strict',
-        '--noUnusedLocals',
-        '--target',
-        'ES2020',
-        '--module',
-        'esnext',
-        '--moduleResolution',
-        'bundler',
-        '--lib',
-        'ES2020,DOM',
-        ...collectTsFiles(workDir),
-      ],
-      { encoding: 'utf-8', cwd: workDir }
-    );
-    expect(tsc.status, `tsc errors:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
-  }, 90_000);
-});
diff --git a/tests/e2e/generate-client/tags.test.ts b/tests/e2e/generate-client/tags.test.ts
deleted file mode 100644
index 8225b0422a..0000000000
--- a/tests/e2e/generate-client/tags.test.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * E2E for `--output-mode tags`: shared http + schemas, one endpoints file per
- * OpenAPI tag, and a barrel entry. The whole generated set must compile under
- * strict `tsc` with `--noUnusedLocals` (proves cross-file imports resolve and
- * each per-tag file imports exactly what it uses).
- */
-import { spawnSync } from 'node:child_process';
-import { existsSync, mkdtempSync, readdirSync, readFileSync, rmSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
-const fixture = join(__dirname, 'fixtures/cafe.yaml');
-
-describe('generate-client end-to-end (--output-mode tags)', () => {
-  let workDir = '';
-  let entry = '';
-
-  beforeAll(() => {
-    workDir = mkdtempSync(join(tmpdir(), 'tags-client-'));
-    entry = join(workDir, 'client.ts');
-  });
-
-  afterAll(() => {
-    if (workDir && existsSync(workDir)) {
-      rmSync(workDir, { recursive: true, force: true });
-    }
-  });
-
-  test('writes shared files, one file per tag, and the barrel entry', () => {
-    const result = spawnSync(
-      'node',
-      [cliEntry, 'generate-client', fixture, '--output', entry, '--output-mode', 'tags'],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(result.status, `generate-client stderr:\n${result.stderr}`).toBe(0);
-
-    for (const name of [
-      'client.ts',
-      'client.http.ts',
-      'client.schemas.ts',
-      'Products.ts',
-      'Orders.ts',
-    ]) {
-      expect(existsSync(join(workDir, name)), `expected ${name}`).toBe(true);
-    }
-
-    // Products operations live in Products.ts (first-tag assignment), not the barrel.
-    expect(readFileSync(join(workDir, 'Products.ts'), 'utf-8')).toContain(
-      'export async function listMenuItems('
-    );
-    const entrySrc = readFileSync(entry, 'utf-8');
-    expect(entrySrc).toContain("export * from './Products.js';");
-    expect(entrySrc).toContain("export * from './Orders.js';");
-  }, 90_000);
-
-  test('the whole generated set type-checks under strict mode with no unused imports', () => {
-    expect(existsSync(entry), 'generation test must run first').toBe(true);
-
-    const tsFiles = readdirSync(workDir)
-      .filter((name) => name.endsWith('.ts'))
-      .map((name) => join(workDir, name));
-
-    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
-    const tsc = spawnSync(
-      tscBin,
-      [
-        '--noEmit',
-        '--strict',
-        '--noUnusedLocals',
-        '--target',
-        'ES2020',
-        '--module',
-        'esnext',
-        '--moduleResolution',
-        'bundler',
-        '--lib',
-        'ES2020,DOM',
-        ...tsFiles,
-      ],
-      { encoding: 'utf-8', cwd: workDir }
-    );
-    expect(tsc.status, `tsc errors:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
-  }, 90_000);
-});
diff --git a/tests/e2e/generate-client/tanstack-query.test.ts b/tests/e2e/generate-client/tanstack-query.test.ts
index 01d8bf9436..569e9fafea 100644
--- a/tests/e2e/generate-client/tanstack-query.test.ts
+++ b/tests/e2e/generate-client/tanstack-query.test.ts
@@ -12,6 +12,9 @@ const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
 // devDependency); map it explicitly so tsc resolves the generated module's
 // `import { queryOptions } from "@tanstack/react-query"` from the temp dir.
 const tanstackPath = join(repoRoot, 'node_modules/@tanstack/react-query');
+// The package-runtime case resolves the sdk's `@redocly/client-generator` import against the
+// BUILT package types (the temp project lives outside the workspace, so no node_modules walk).
+const generatorTypes = join(repoRoot, 'packages/client-generator/lib/index.d.ts');
 
 describe('generate-client tanstack-query generator', () => {
   it('emits a *.tanstack.ts module that strict-tsc-checks against real @tanstack/react-query and composes with the sdk', () => {
@@ -97,6 +100,91 @@ describe('generate-client tanstack-query generator', () => {
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
+  it('--runtime package: the tanstack wrapper composes with the package-runtime sdk and strict-tsc-checks', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-tanstack-pkg-'));
+    const out = join(dir, 'client.ts');
+    const tanstackOut = join(dir, 'client.tanstack.ts');
+
+    const res = spawnSync(
+      'node',
+      [
+        cli,
+        'generate-client',
+        join(__dirname, 'fixtures', 'base.yaml'),
+        '--output',
+        out,
+        '--runtime',
+        'package',
+        '--generators',
+        'sdk,tanstack-query',
+        '--query-framework',
+        'react',
+      ],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(res.status, res.stderr).toBe(0);
+
+    // The sdk entry imports the runtime instead of embedding it; the wrapper is unchanged
+    // in shape — it consumes the same free functions + <Op>Variables surface.
+    const sdkSource = readFileSync(out, 'utf-8');
+    expect(sdkSource).toContain("from '@redocly/client-generator'");
+    expect(sdkSource).not.toContain('__send');
+    const source = readFileSync(tanstackOut, 'utf-8');
+    expect(source).toContain('import { queryOptions } from "@tanstack/react-query"');
+    expect(source).toContain('export const getPetByIdOptions');
+    expect(source).toContain('export const createPetMutation');
+
+    // Same composition consumer as the inline case — the runtime choice must be
+    // invisible to wrapper consumers.
+    writeFileSync(
+      join(dir, 'check.ts'),
+      [
+        "import { useMutation, useQuery } from '@tanstack/react-query';",
+        "import { createPetMutation, getPetByIdOptions, listPetsOptions } from './client.tanstack.js';",
+        'export function useGetPet(id: number) {',
+        '  return useQuery(getPetByIdOptions({ id }));',
+        '}',
+        'export function useListPets() {',
+        "  return useQuery(listPetsOptions({ params: { filter: { name: 'rex' } } }));",
+        '}',
+        'export function useCreatePet() {',
+        '  return useMutation(createPetMutation());',
+        '}',
+        '',
+      ].join('\n'),
+      'utf-8'
+    );
+
+    // strict-tsc gate: the wrapper + the package-runtime sdk (resolved against the BUILT
+    // @redocly/client-generator types) + the composition consumer, all in one project.
+    writeFileSync(
+      join(dir, 'tsconfig.json'),
+      JSON.stringify({
+        compilerOptions: {
+          module: 'nodenext',
+          moduleResolution: 'nodenext',
+          target: 'es2022',
+          lib: ['ES2022', 'DOM'],
+          strict: true,
+          noEmit: true,
+          skipLibCheck: true,
+          types: [],
+          paths: {
+            '@tanstack/react-query': [tanstackPath],
+            '@redocly/client-generator': [generatorTypes],
+          },
+        },
+        include: ['client.ts', 'client.tanstack.ts', 'check.ts'],
+      }),
+      'utf-8'
+    );
+
+    const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
+    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
   it('--query-framework vue swaps only the import specifier to @tanstack/vue-query', () => {
     const dir = mkdtempSync(join(tmpdir(), 'ots-tanstack-vue-'));
     const out = join(dir, 'client.ts');
diff --git a/vitest.config.ts b/vitest.config.ts
index fdbbb0ccd4..0d82089d44 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -25,6 +25,13 @@ const configExtension: { [key: string]: ViteUserConfig } = {
           functions: 84,
           statements: 80,
           branches: 73,
+          // The hand-written client runtime is held to 100% (aggregate 100% ⇒ every file 100%).
+          'packages/client-generator/src/runtime/**/*.ts': {
+            lines: 100,
+            functions: 100,
+            statements: 100,
+            branches: 100,
+          },
         },
       },
     },

From 273c7a7f810464bb7704cf0a37efd61e4a880b71 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 6 Jul 2026 16:00:38 +0300
Subject: [PATCH 069/134] docs: wrap overlong line in the generated-client
 guide (markdownlint MD013)

---
 docs/@v2/guides/use-generated-client.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/@v2/guides/use-generated-client.md b/docs/@v2/guides/use-generated-client.md
index 1e0f40b67e..73577fc3dc 100644
--- a/docs/@v2/guides/use-generated-client.md
+++ b/docs/@v2/guides/use-generated-client.md
@@ -120,7 +120,8 @@ use({
 });
 ```
 
-`onRequest` runs in registration order; `onResponse` runs in reverse (onion). `onRequest` may mutate `ctx` (`url`/`method`/`headers`/`body` — body edits are serialized and sent); `onResponse` may return a replacement `Response`. `onError` (throw mode only) is threaded through each middleware. `ctx.operation`'s fields are typed as the spec's **literal unions** (`OperationId`/`OperationPath`/`OperationTag`), so `ctx.operation.id === '…'` and `ctx.operation.tags.includes('…')` autocomplete — and a misspelled operation id fails compilation instead of silently never matching. A single call's header instead goes in that operation's trailing `init` argument. Per-request headers merge lowest → highest: injected auth credentials → typed header parameters → the caller's `init.headers` — the caller always wins.
+`onRequest` runs in registration order; `onResponse` runs in reverse (onion). `onRequest` may mutate `ctx` (`url`/`method`/`headers`/`body` — body edits are serialized and sent); `onResponse` may return a replacement `Response`. `onError` (throw mode only) is threaded through each middleware. `ctx.operation`'s fields are typed as the spec's **literal unions** (`OperationId`/`OperationPath`/`OperationTag`), so `ctx.operation.id === '…'` and `ctx.operation.tags.includes('…')` autocomplete — and a misspelled operation id fails compilation instead of silently never matching. A single call's header instead goes in that operation's trailing `init` argument.
+Per-request headers merge lowest → highest: injected auth credentials → typed header parameters → the caller's `init.headers` — the caller always wins.
 
 `use()` **appends** to the middleware chain (it composes with any already-registered or baked-in middleware). `configure({ middleware: [...] })` **replaces** the whole chain — use it to reset, but prefer `use()` to add to existing (including [publisher-baked](#publisher-defaults)) middleware.
 

From 303bd1c3a09c58fdb9fa2c068048929c9a8c0eda Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 6 Jul 2026 16:13:58 +0300
Subject: [PATCH 070/134] fix: align @redocly/client-generator's openapi-core
 dependency with the workspace version

The stale 2.35.1 pin made npm nest a registry copy of openapi-core under the
package after main's 2.37.0 release bump, splitting the Config/Source type
identity (TS2322 '#private' mismatch) in the CLI typecheck.
---
 package-lock.json                      | 82 +-------------------------
 packages/client-generator/package.json |  2 +-
 2 files changed, 2 insertions(+), 82 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e86c2498fd..02a449540a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9913,7 +9913,7 @@
       "version": "0.0.0",
       "license": "MIT",
       "dependencies": {
-        "@redocly/openapi-core": "2.35.1"
+        "@redocly/openapi-core": "2.37.0"
       },
       "devDependencies": {
         "typescript": "6.0.2"
@@ -9926,86 +9926,6 @@
         "typescript": ">=5.5.0"
       }
     },
-    "packages/client-generator/node_modules/@redocly/config": {
-      "version": "0.49.1",
-      "resolved": "https://registry.npmjs.org/@redocly/config/-/config-0.49.1.tgz",
-      "integrity": "sha512-Eid8/bDcsf2bpTJ2qZhULflf6Y/TtoUFZt0+a5XZzjZj0uA8L8EQiY/nEdBd6lZQlZsnu8/cAUhTyBebnLi0gA==",
-      "license": "MIT",
-      "dependencies": {
-        "json-schema-to-ts": "2.7.2"
-      }
-    },
-    "packages/client-generator/node_modules/@redocly/openapi-core": {
-      "version": "2.35.1",
-      "resolved": "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-2.35.1.tgz",
-      "integrity": "sha512-kS75z/8YaC66WpTI4PGgeoz7E5VjAb6hjbPfKTMnnkHXQGqRh7+dqNs7VsGgD0olkWoTqyRl1ZHFMYxccdj1wA==",
-      "license": "MIT",
-      "dependencies": {
-        "@redocly/ajv": "^8.18.1",
-        "@redocly/config": "^0.49.0",
-        "ajv": "npm:@redocly/ajv@8.18.1",
-        "ajv-formats": "^3.0.1",
-        "colorette": "^1.2.0",
-        "js-levenshtein": "^1.1.6",
-        "js-yaml": "^4.2.0",
-        "picomatch": "^4.0.4",
-        "pluralize": "^8.0.0",
-        "yaml-ast-parser": "0.0.43"
-      },
-      "engines": {
-        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
-        "npm": ">=10"
-      }
-    },
-    "packages/client-generator/node_modules/ajv": {
-      "name": "@redocly/ajv",
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.18.1.tgz",
-      "integrity": "sha512-Ifm/pP/tul1qmAecpbVxCBluVE32rKfjf8gYXH4xI2gCv9mRWFhJMHzkPDM4TXlxwPQYIFegymlsy8lXz7optA==",
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "fast-uri": "^3.0.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "packages/client-generator/node_modules/json-schema-to-ts": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/json-schema-to-ts/-/json-schema-to-ts-2.7.2.tgz",
-      "integrity": "sha512-R1JfqKqbBR4qE8UyBR56Ms30LL62/nlhoz+1UkfI/VE7p54Awu919FZ6ZUPG8zIa3XB65usPJgr1ONVncUGSaQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.18.3",
-        "@types/json-schema": "^7.0.9",
-        "ts-algebra": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "packages/client-generator/node_modules/picomatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz",
-      "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "packages/client-generator/node_modules/ts-algebra": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/ts-algebra/-/ts-algebra-1.2.2.tgz",
-      "integrity": "sha512-kloPhf1hq3JbCPOTYoOWDKxebWjNb2o/LKnNfkWhxVVisFFmMJPPdJeGoGmM+iRLyoXAR61e08Pb+vUXINg8aA==",
-      "license": "MIT"
-    },
     "packages/core": {
       "name": "@redocly/openapi-core",
       "version": "2.37.0",
diff --git a/packages/client-generator/package.json b/packages/client-generator/package.json
index 6c8654c21a..ba679b13be 100644
--- a/packages/client-generator/package.json
+++ b/packages/client-generator/package.json
@@ -40,7 +40,7 @@
     "Roman Marshevskyi <roman.marshevskyy@redocly.com> (https://redocly.com/)"
   ],
   "dependencies": {
-    "@redocly/openapi-core": "2.35.1"
+    "@redocly/openapi-core": "2.37.0"
   },
   "peerDependencies": {
     "typescript": ">=5.5.0"

From 93d7ee1531e94923d01dee3c1f915ae2c7350984 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 6 Jul 2026 16:42:03 +0300
Subject: [PATCH 071/134] fix(generate-client): restrict serverUrl to
 http(s)/root-relative; reject URL setup upfront
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- isValidServerUrl now accepts only http:/https: absolute URLs or root-relative
  paths (and rejects protocol-relative //host) — the value is inlined as the
  generated client's default fetch base, so javascript:/file: schemes must not
  pass validation.
- A URL-ish `setup` specifier is rejected upfront (CLI config resolution AND
  the programmatic generateClient), instead of failing later as an unreadable
  local file path — setup is a local module whose code is baked into the client.
---
 .oxfmtrc.json                                 |  2 +-
 packages/cli/src/commands/generate-client.ts  | 27 ++++++++++++------
 .../src/__tests__/index.test.ts               | 16 +++++++++++
 packages/client-generator/src/index.ts        |  9 ++++++
 .../generate-client/redocly-config.test.ts    | 28 +++++++++++++++++++
 5 files changed, 73 insertions(+), 9 deletions(-)

diff --git a/.oxfmtrc.json b/.oxfmtrc.json
index 269466ad4e..80a9599d96 100644
--- a/.oxfmtrc.json
+++ b/.oxfmtrc.json
@@ -5,12 +5,12 @@
   "experimentalSortPackageJson": false,
   "ignorePatterns": [
     "coverage/",
-    "tests/e2e/generate-client/examples/*/src/api/",
     "lib/",
     "output/",
     "packages/respect-core/src/modules/runtime-expressions/abnf-parser.js",
     "packages/core/src/rules/common/__tests__/fixtures/invalid-yaml.yaml",
     "tests/performance/api-definitions/",
+    "tests/e2e/generate-client/examples/*/src/api/",
     "tests/e2e/generate-client/*-consumer/api.ts",
     "tests/smoke/**/*.yaml",
     "snapshot*.txt",
diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index b1e93aee11..336417fd88 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -31,10 +31,19 @@ type ClientConfig = Partial<OpenApiTsConfig>;
 /** A single client to generate: which API to read, where to write it, and its per-API `client` block. */
 type Job = { name: string; api: string; clientOutput?: string; perApiClient: ClientConfig };
 
-/** Resolve a `client` block's relative `setup` path against the config dir (URLs/absolute left as-is). */
+/** A URL-ish specifier (`https://…`, `file:…`, `javascript:…`) — two+ letter scheme, so Windows drive paths (`C:\\…`) don't match. */
+const URL_SCHEME = /^[a-z][a-z0-9+.-]+:/i;
+
+/** Resolve a `client` block's relative `setup` path against the config dir. Setup is a LOCAL module — URLs are rejected upfront (they would otherwise fail as an unreadable file at generation time). */
 function resolveSetup(client: ClientConfig, configDir: string): ClientConfig {
   const { setup } = client;
-  if (typeof setup === 'string' && !isAbsolute(setup) && !/^https?:\/\//i.test(setup)) {
+  if (typeof setup !== 'string') return client;
+  if (URL_SCHEME.test(setup)) {
+    throw new HandledError(
+      `\n❌  \`client.setup\` must be a local file path — remote setup modules are not supported.\n   Got: ${setup}\n`
+    );
+  }
+  if (!isAbsolute(setup)) {
     return { ...client, setup: resolvePath(configDir, setup) };
   }
   return client;
@@ -46,15 +55,17 @@ function fileNameFor(name: string): string {
 }
 
 /**
- * A valid inlined server URL is an absolute URL (`https://api.example.com`) or a root-relative
- * path (`/v1`, which OpenAPI allows for `servers[].url`). A bare hostname (`api.example.com`) is
- * rejected — `new URL(value, base)` would treat it as a path and it would concatenate wrongly.
+ * A valid inlined server URL is an absolute **http(s)** URL (`https://api.example.com`) or a
+ * root-relative path (`/v1`, which OpenAPI allows for `servers[].url`). A bare hostname
+ * (`api.example.com`) is rejected — `new URL(value, base)` would treat it as a path and it
+ * would concatenate wrongly. Non-http(s) schemes (`javascript:`, `file:`) and protocol-relative
+ * `//host` values are rejected too: the value is inlined as the client's default fetch base.
  */
 function isValidServerUrl(value: string): boolean {
-  if (value.startsWith('/')) return true;
+  if (value.startsWith('/')) return !value.startsWith('//'); // root-relative, not protocol-relative
   try {
-    new URL(value); // no base — only an absolute URL with a scheme parses
-    return true;
+    const url = new URL(value); // no base — only an absolute URL with a scheme parses
+    return url.protocol === 'http:' || url.protocol === 'https:';
   } catch {
     return false;
   }
diff --git a/packages/client-generator/src/__tests__/index.test.ts b/packages/client-generator/src/__tests__/index.test.ts
index 441257f74e..a9f0f80b22 100644
--- a/packages/client-generator/src/__tests__/index.test.ts
+++ b/packages/client-generator/src/__tests__/index.test.ts
@@ -17,6 +17,22 @@ function model(): ApiModel {
   };
 }
 
+describe('generateClient setup validation', () => {
+  it('rejects a URL setup specifier upfront (local file paths only)', async () => {
+    const { generateClient } = await import('../index.js');
+    for (const url of ['https://cdn.example.com/setup.ts', 'file:///tmp/setup.ts']) {
+      await expect(
+        generateClient({ api: 'unused.yaml', output: '/tmp/never.ts', setup: url })
+      ).rejects.toThrow(/local file path/);
+    }
+    // A Windows-style drive path must NOT be mistaken for a URL scheme (it fails
+    // later on file reading, not on the scheme guard).
+    await expect(
+      generateClient({ api: 'unused.yaml', output: '/tmp/never.ts', setup: 'C:\\team\\setup.ts' })
+    ).rejects.not.toThrow(/local file path/);
+  });
+});
+
 describe('collectGeneratedFiles', () => {
   it('runs the given generators and concatenates their files', () => {
     const files = collectGeneratedFiles(model(), {
diff --git a/packages/client-generator/src/index.ts b/packages/client-generator/src/index.ts
index 25b7b46cb6..8ae3c77773 100644
--- a/packages/client-generator/src/index.ts
+++ b/packages/client-generator/src/index.ts
@@ -3,6 +3,7 @@ import { dirname, resolve } from 'node:path';
 
 import type { EmitOptions } from './emitters/client.js';
 import { bakeSetup } from './emitters/setup-bake.js';
+import { NotSupportedError } from './errors.js';
 import { builtinGenerators, validateGenerators } from './generators/index.js';
 import { resolveGenerators } from './generators/resolve.js';
 import type { GeneratorDescriptor } from './generators/types.js';
@@ -98,6 +99,14 @@ export function collectGeneratedFiles(
 export async function generateClient(
   options: GenerateClientOptions
 ): Promise<GenerateClientResult> {
+  // Setup is a LOCAL module (its code is baked into the generated client) — reject
+  // URL-ish specifiers upfront, before any spec loading, instead of failing later as
+  // an unreadable file path. Two+ letter scheme, so Windows drive paths don't match.
+  if (options.setup && /^[a-z][a-z0-9+.-]+:/i.test(options.setup)) {
+    throw new NotSupportedError(
+      `setup must be a local file path — remote setup modules are not supported (got: ${options.setup})`
+    );
+  }
   const outputPath = resolve(options.output);
   const { document, version } = await loadSpec(options.api, options.config);
   const normalized =
diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
index d6c5709e44..2b934189f9 100644
--- a/tests/e2e/generate-client/redocly-config.test.ts
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -241,6 +241,34 @@ describe('generate-client redocly.yaml config', () => {
       expect(res.status, res.stderr).toBe(0);
       rmSync(dir, { recursive: true, force: true });
     }
+
+    // Non-http(s) schemes and protocol-relative hosts are rejected too — the value is
+    // inlined as the client's default fetch base.
+    for (const hostile of ['javascript:alert(1)', 'file:///etc/passwd', '//evil.example.com']) {
+      const dir = withServerUrl(`"${hostile}"`);
+      const res = run(dir, ['cafe']);
+      expect(res.status, `expected rejection for ${hostile}`).not.toBe(0);
+      expect(res.stderr).toContain('--server-url must be an absolute URL');
+      rmSync(dir, { recursive: true, force: true });
+    }
+  }, 60_000);
+
+  it('rejects a URL `client.setup` upfront (setup is a local module baked into the client)', () => {
+    const dir = project(
+      [
+        'apis:',
+        '  cafe:',
+        '    root: ./openapi.yaml',
+        '    clientOutput: ./out.ts',
+        '    client:',
+        '      generators: [sdk]',
+        '      setup: https://cdn.example.com/setup.ts',
+      ].join('\n') + '\n'
+    );
+    const res = run(dir, ['cafe']);
+    expect(res.status).not.toBe(0);
+    expect(res.stderr).toContain('must be a local file path');
+    rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
   it('a `client.runtime: package` config block reaches the writer', () => {

From b4727094f10aa952db40af828d7ecf117a927d30 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Wed, 8 Jul 2026 12:03:00 +0300
Subject: [PATCH 072/134] =?UTF-8?q?feat(client-generator):=20auto-paginati?=
 =?UTF-8?q?on=20=E2=80=94=20declared,=20statically=20verified=20.pages()/.?=
 =?UTF-8?q?items()=20iterators?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Paginated operations keep their one-shot call and gain typed async iterators,
in both runtimes. Declaration is config-first: a 'client.pagination' convention
rule in redocly.yaml (+ per-operation overrides and exclude), or the equivalent
x-pagination operation extension; precedence per-op > extension > convention.
The convention is applied only where it structurally fits (advance param exists
with the right type; JSON pointers resolve in the success-response schema, with
'items' landing on an array) — an explicit rule that doesn't fit fails
generation with a per-operation error. No heuristics.

Styles: cursor (nextCursor pointer; repeat-cursor guard), offset (advance by
page item count), page (increment). Item types are computed statically from the
response schema. Iteration is error-mode-agnostic: a failed page throws
ApiError even on result-mode clients, whose .pages() yields raw pages. The
runtime module is embedded inline only when an operation paginates; package
mode ships improvements via npm update.

Also: generateClient rejects output paths with a literal 'undefined'/'null'
segment (interpolation-bug guard). Examples: 'pagination' (native iterators)
and 'custom-pagination' (hand-written typed helper for shapes the styles don't
cover, e.g. body cursors). Docs, config schema, ADR-0018, e2e (live-server
cursor/offset, resume, abort, package-mode arm).
---
 .changeset/client-generator.md                |    1 +
 docs/@v2/commands/generate-client.md          |    2 +
 docs/@v2/configuration/reference/client.md    |   42 +-
 docs/@v2/guides/use-generated-client.md       |   63 +
 packages/client-generator/README.md           |   42 +-
 ...17-runtime-module-and-descriptor-client.md |    3 +-
 .../docs/adr/0018-auto-pagination.md          |   33 +
 packages/client-generator/docs/adr/README.md  |    1 +
 .../scripts/generate-runtime-sources.mjs      |    1 +
 .../scripts/regenerate-examples.mjs           |    2 +
 .../scripts/typecheck-examples.mjs            |    2 +
 .../src/__tests__/index.test.ts               |   67 +
 packages/client-generator/src/config.ts       |    5 +
 .../__snapshots__/package-client.test.ts.snap | 1470 ++++++++++++++++-
 .../src/emitters/__tests__/descriptor.test.ts |  128 ++
 .../emitters/__tests__/inline-runtime.test.ts |   25 +-
 .../emitters/__tests__/package-client.test.ts |  113 ++
 .../src/emitters/__tests__/pagination.test.ts |  588 +++++++
 .../client-generator/src/emitters/client.ts   |    7 +
 .../src/emitters/descriptor.ts                |   57 +-
 .../src/emitters/inline-runtime.ts            |    5 +
 .../src/emitters/operations.ts                |    3 +
 .../src/emitters/package-client.ts            |   35 +-
 .../src/emitters/pagination.ts                |  297 ++++
 .../src/emitters/runtime-sources.ts           |    6 +-
 packages/client-generator/src/index.ts        |   13 +
 .../__tests__/build.test.ts                   |   32 +
 .../src/intermediate-representation/build.ts  |    4 +
 .../src/intermediate-representation/model.ts  |    5 +
 .../runtime/__tests__/create-client.test.ts   |  156 +-
 .../src/runtime/__tests__/index.test.ts       |   40 +-
 .../src/runtime/__tests__/paginate.test.ts    |  228 +++
 .../src/runtime/__tests__/types.test.ts       |   92 +-
 .../src/runtime/create-client.ts              |   68 +-
 .../client-generator/src/runtime/index.ts     |    4 +-
 .../client-generator/src/runtime/paginate.ts  |  104 ++
 .../client-generator/src/runtime/types.ts     |   65 +-
 packages/client-generator/src/types.ts        |   10 +
 .../__snapshots__/redocly-yaml.test.ts.snap   |   64 +
 packages/core/src/types/redocly-yaml.ts       |   29 +
 .../e2e/generate-client/base-consumer/api.ts  |  130 +-
 .../e2e/generate-client/cafe-consumer/api.ts  |  130 +-
 tests/e2e/generate-client/cafe.snapshot.ts    |  130 +-
 tests/e2e/generate-client/examples.test.ts    |    2 +
 tests/e2e/generate-client/examples/README.md  |    2 +
 .../examples/baked-setup/src/api/client.ts    |  130 +-
 .../src/api/client.ts                         |  130 +-
 .../custom-generator/src/api/client.ts        |  130 +-
 .../examples/custom-pagination/.gitignore     |    1 +
 .../examples/custom-pagination/README.md      |   18 +
 .../examples/custom-pagination/openapi.yaml   |   59 +
 .../examples/custom-pagination/package.json   |   15 +
 .../examples/custom-pagination/redocly.yaml   |   13 +
 .../custom-pagination/src/api/client.ts       |  971 +++++++++++
 .../examples/custom-pagination/src/main.ts    |   43 +
 .../examples/custom-pagination/tsconfig.json  |    4 +
 .../examples/customization/src/api/client.ts  |  130 +-
 .../fetch-functions/src/api/client.ts         |  130 +-
 .../examples/mock/src/api/client.ts           |  130 +-
 .../examples/pagination/.gitignore            |    1 +
 .../examples/pagination/README.md             |   16 +
 .../examples/pagination/openapi.yaml          |   69 +
 .../examples/pagination/package.json          |   15 +
 .../examples/pagination/redocly.yaml          |   19 +
 .../examples/pagination/src/api/client.ts     | 1092 ++++++++++++
 .../examples/pagination/src/main.ts           |   45 +
 .../examples/pagination/tsconfig.json         |    4 +
 .../examples/programmatic/src/api/client.ts   |  130 +-
 .../examples/sse-streaming/src/api/client.ts  |  130 +-
 .../examples/tanstack-query/src/api/client.ts |  130 +-
 .../examples/vendored-edge/src/api/client.ts  |  130 +-
 .../zero-install-quickstart/src/api/client.ts |  130 +-
 .../examples/zod/src/api/client.ts            |  130 +-
 .../generate-client/fixtures/pagination.yaml  |   98 ++
 .../pagination-consumer/api-offset.ts         | 1177 +++++++++++++
 .../pagination-consumer/api-package.ts        |  180 ++
 .../pagination-consumer/api.ts                | 1132 +++++++++++++
 .../pagination-consumer/index-abort.ts        |   32 +
 .../pagination-consumer/index-offset.ts       |   28 +
 .../pagination-consumer/index-package.ts      |   18 +
 .../pagination-consumer/index.ts              |   39 +
 .../pagination-consumer/package.json          |    6 +
 .../pagination-consumer/server.ts             |   96 ++
 .../pagination-consumer/tsconfig.json         |   17 +
 tests/e2e/generate-client/pagination.test.ts  |  291 ++++
 .../generate-client/redocly-config.test.ts    |   81 +
 tests/e2e/generate-client/sse-consumer/api.ts |  130 +-
 87 files changed, 11442 insertions(+), 134 deletions(-)
 create mode 100644 packages/client-generator/docs/adr/0018-auto-pagination.md
 create mode 100644 packages/client-generator/src/emitters/__tests__/pagination.test.ts
 create mode 100644 packages/client-generator/src/emitters/pagination.ts
 create mode 100644 packages/client-generator/src/runtime/__tests__/paginate.test.ts
 create mode 100644 packages/client-generator/src/runtime/paginate.ts
 create mode 100644 tests/e2e/generate-client/examples/custom-pagination/.gitignore
 create mode 100644 tests/e2e/generate-client/examples/custom-pagination/README.md
 create mode 100644 tests/e2e/generate-client/examples/custom-pagination/openapi.yaml
 create mode 100644 tests/e2e/generate-client/examples/custom-pagination/package.json
 create mode 100644 tests/e2e/generate-client/examples/custom-pagination/redocly.yaml
 create mode 100644 tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
 create mode 100644 tests/e2e/generate-client/examples/custom-pagination/src/main.ts
 create mode 100644 tests/e2e/generate-client/examples/custom-pagination/tsconfig.json
 create mode 100644 tests/e2e/generate-client/examples/pagination/.gitignore
 create mode 100644 tests/e2e/generate-client/examples/pagination/README.md
 create mode 100644 tests/e2e/generate-client/examples/pagination/openapi.yaml
 create mode 100644 tests/e2e/generate-client/examples/pagination/package.json
 create mode 100644 tests/e2e/generate-client/examples/pagination/redocly.yaml
 create mode 100644 tests/e2e/generate-client/examples/pagination/src/api/client.ts
 create mode 100644 tests/e2e/generate-client/examples/pagination/src/main.ts
 create mode 100644 tests/e2e/generate-client/examples/pagination/tsconfig.json
 create mode 100644 tests/e2e/generate-client/fixtures/pagination.yaml
 create mode 100644 tests/e2e/generate-client/pagination-consumer/api-offset.ts
 create mode 100644 tests/e2e/generate-client/pagination-consumer/api-package.ts
 create mode 100644 tests/e2e/generate-client/pagination-consumer/api.ts
 create mode 100644 tests/e2e/generate-client/pagination-consumer/index-abort.ts
 create mode 100644 tests/e2e/generate-client/pagination-consumer/index-offset.ts
 create mode 100644 tests/e2e/generate-client/pagination-consumer/index-package.ts
 create mode 100644 tests/e2e/generate-client/pagination-consumer/index.ts
 create mode 100644 tests/e2e/generate-client/pagination-consumer/package.json
 create mode 100644 tests/e2e/generate-client/pagination-consumer/server.ts
 create mode 100644 tests/e2e/generate-client/pagination-consumer/tsconfig.json
 create mode 100644 tests/e2e/generate-client/pagination.test.ts

diff --git a/.changeset/client-generator.md b/.changeset/client-generator.md
index 0890835fbf..a47301d1cd 100644
--- a/.changeset/client-generator.md
+++ b/.changeset/client-generator.md
@@ -12,5 +12,6 @@ Generated clients are typed operation descriptors (`OPERATIONS … satisfies Rec
 - `--output-mode`: `single` (default) or `split` (the entry file plus a `<name>.schemas.ts` sibling). Both modes work with both runtimes.
 - Middleware sees the operation's identity as literal unions — `ctx.operation.{id,path,tags}` (`OperationId`/`OperationPath`/`OperationTag`, all exported) — so targeting requests by operationId/tags gets autocomplete and compile-time typo-checking.
 - Auth follows the spec's `securitySchemes` with per-instance credentials (`client.auth.{bearer,basic,apiKey}` / `ClientConfig.auth`) and generated `setBearer`/`setBasicAuth`/`setApiKey*` sugar bound to the default instance.
+- Auto-pagination, declared rather than guessed: a `client.pagination` block in `redocly.yaml` (a convention rule + per-operation overrides + `exclude`) or the spec's `x-pagination` operation extension gives paginated operations typed `.pages()`/`.items()` async iterators (`cursor`, `offset`, and `page` styles) next to the unchanged one-shot call, with item types resolved from the response schema at generate time. The convention applies only to operations it structurally fits (verified against declared query params and the success-response schema); an explicit rule that doesn't fit fails generation with a per-operation error. Works in both runtimes — inline output embeds the pagination module only when an operation paginates.
 - A `--setup` flag bakes a publisher-authored `defineClientSetup({ config, middleware })` module into the generated client (both runtimes and output modes), so a published SDK ships its request/response defaults built in — layered between the spec's defaults and the app's `configure()`. The package exports the runtime contract types + `defineClientSetup` from its main entry.
 - Companion generators from the same spec via `--generators`: `zod`, `tanstack-query` (React/Vue/Svelte/Solid), `swr`, `transformers`, `mock` (MSW, baked or faker), plus an experimental `defineGenerator` plugin API — each emits its own file and adds no dependency to the client.
diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index c4680f6abb..1b1ab046cd 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -52,6 +52,8 @@ With **no argument**, a client is generated for every api that declares a `clien
 
 Instead of passing flags every time, keep the settings in `redocly.yaml` under a top-level `client` block and per-API `apis.<name>.client` / `clientOutput`. Settings resolve **top-level `client` → per-API `client` → CLI flags**. See [`client` configuration](../configuration/reference/client.md) for the full reference.
 
+Auto-pagination has **no CLI flag**: it's declared as structured configuration — [`client.pagination`](../configuration/reference/client.md#pagination) in `redocly.yaml`, or the equivalent `x-pagination` operation extension in the spec — and paginated operations gain typed `.pages()`/`.items()` async iterators. See [Pagination in the usage guide](../guides/use-generated-client.md#pagination).
+
 ## Output modes
 
 `--output-mode` controls how the client is split across files:
diff --git a/docs/@v2/configuration/reference/client.md b/docs/@v2/configuration/reference/client.md
index 5ee4a39a8e..94a5d7adad 100644
--- a/docs/@v2/configuration/reference/client.md
+++ b/docs/@v2/configuration/reference/client.md
@@ -26,13 +26,53 @@ redocly generate-client --config ./config/redocly.yaml
 
 ## Options
 
-The same fields are accepted at the top level (shared defaults) and under `apis.<name>.client` (per-API overrides): `generators`, `argsStyle`, `serverUrl`, `outputMode` (`single` or `split`), `runtime`, `enumStyle`, `errorMode`, `dateType`, `queryFramework`, `mockData`, `mockSeed`, and `setup`. Each mirrors the matching CLI flag — see the [command options](../../commands/generate-client.md#options) for what every field does.
+The same fields are accepted at the top level (shared defaults) and under `apis.<name>.client` (per-API overrides): `generators`, `argsStyle`, `serverUrl`, `outputMode` (`single` or `split`), `runtime`, `enumStyle`, `errorMode`, `dateType`, `queryFramework`, `mockData`, `mockSeed`, `setup`, and [`pagination`](#pagination). Each of the scalar fields mirrors the matching CLI flag — see the [command options](../../commands/generate-client.md#options) for what every field does; `pagination` is config-only (no flag).
 
 The input and output are **not** part of a `client` block:
 
 - **input** — `apis.<name>.root` (or a path/alias passed on the command line).
 - **output** — `apis.<name>.clientOutput`; when omitted it defaults to `<name>.client.ts` in the `redocly.yaml` directory. `--output` overrides it (single-API invocations only).
 
+## Pagination
+
+`pagination` declares how the API paginates, so paginated operations gain typed `.pages()`/`.items()` async iterators (see [Pagination in the usage guide](../../guides/use-generated-client.md#pagination)). The block is an optional **convention rule** (the rule fields below, applied to every operation it structurally fits when `style` is set) plus per-operation `operations` overrides and an `exclude` list:
+
+```yaml
+client:
+  pagination:
+    style: cursor
+    cursorParam: cursor
+    nextCursor: /nextCursor
+    items: /orders
+    exclude:
+      - listOrderEvents
+    operations:
+      listMenuItems:
+        style: page
+        offsetParam: page
+        items: /data
+```
+
+Rule fields — the same set is accepted at the `pagination` level (the convention) and in each `operations` entry:
+
+| Field         | Type                             | Description                                                                                                                   |
+| ------------- | -------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `style`       | `'cursor' \| 'offset' \| 'page'` | How the iterator advances: follow a response cursor, advance an offset by each page's item count, or increment a page number. |
+| `cursorParam` | `string`                         | `cursor` style: the query parameter that receives the cursor. Required for `cursor`.                                          |
+| `nextCursor`  | `string`                         | `cursor` style: JSON pointer (RFC 6901, starts with `/`) to the next cursor in the response. Required for `cursor`.           |
+| `offsetParam` | `string`                         | `offset`/`page` styles: the query parameter the iterator advances. Required for `offset` and `page`.                          |
+| `limitParam`  | `string`                         | Optional page-size query parameter (any style); recorded for tooling — the iterator never sets it.                            |
+| `items`       | `string`                         | JSON pointer to the page's item array in the response. Always required.                                                       |
+
+And the two container fields:
+
+| Field        | Type                      | Description                                                                                |
+| ------------ | ------------------------- | ------------------------------------------------------------------------------------------ |
+| `exclude`    | `string[]`                | operationIds no source may paginate (wins over overrides, extensions, and the convention). |
+| `operations` | map of operationId → rule | Per-operation rules; each entry beats the spec's `x-pagination` and the convention.        |
+
+The style-conditional requirements and the structural fit (the advance param must be a declared query parameter of the right type; the pointers must resolve in the JSON success-response schema, `items` landing on an array) are verified at generate time: a convention that doesn't fit skips the operation, while an explicit rule that doesn't fit fails generation. The `x-pagination` operation extension in the spec takes the same rule fields; per operation, precedence is `operations[id]` > `x-pagination` > the convention.
+
 ## Precedence
 
 Settings resolve **top-level `client` → per-API `client` → CLI flags** (later wins). A plain file-path invocation ignores `apis:` and uses only the top-level `client`.
diff --git a/docs/@v2/guides/use-generated-client.md b/docs/@v2/guides/use-generated-client.md
index 73577fc3dc..20a24dbad9 100644
--- a/docs/@v2/guides/use-generated-client.md
+++ b/docs/@v2/guides/use-generated-client.md
@@ -261,6 +261,69 @@ for await (const ev of streamMessages()) {
 
 The stream **auto-reconnects** on a dropped connection, resuming from the last event id via `Last-Event-ID` (backoff honors the server's `retry:`, then `reconnectDelay`, then 1s; capped at 30s). Tune per call with `{ reconnect: false }` or `{ reconnectDelay: 500 }`. `break`ing the loop or aborting an `AbortSignal` ends it cleanly (no throw). SSE always throws `ApiError` on a non-2xx initial response, regardless of `--error-mode`.
 
+## Pagination
+
+Pagination is **declared, never guessed**: describe how your API paginates in `redocly.yaml` under [`client.pagination`](../configuration/reference/client.md#pagination) (or per operation with the `x-pagination` extension in the spec — same fields), and each paginated operation keeps its one-shot call while gaining two async iterators — `.pages(args?, init?)` yielding full pages and `.items(args?, init?)` yielding individual items, typed statically from the response schema. There is no CLI flag.
+
+```yaml
+client:
+  pagination: # convention: applied to every operation it structurally fits
+    style: cursor
+    cursorParam: cursor # query param that receives the cursor
+    nextCursor: /nextCursor # JSON pointer to the next cursor in the response
+    items: /orders # JSON pointer to the page's item array
+    exclude:
+      - listOrderEvents # never paginate this operation
+    operations: # per-operation overrides (beat x-pagination and the convention)
+      listMenuItems:
+        style: page
+        offsetParam: page
+        items: /data
+```
+
+The convention rule is **statically verified** at generate time: it applies only to operations it structurally fits — the advance param must be a declared query parameter of the right type (string for `cursor`, numeric for `offset`/`page`) and the JSON pointers must resolve in the operation's JSON success-response schema, with `items` landing on an array. An operation the convention doesn't fit is simply not paginated; an **explicit** rule (an `operations` entry or an `x-pagination` extension) that doesn't fit **fails generation** with a per-operation error, so a wrong declaration can't silently produce a broken iterator. Per operation, precedence is `operations[id]` > `x-pagination` > the convention.
+
+Three styles are supported: `cursor` (send the response's `nextCursor` back in `cursorParam`; stops when it's absent, `null`, or empty — and throws if the server returns the same cursor twice in a row), `offset` (advance `offsetParam` by each page's item count), and `page` (increment `offsetParam` by 1) — `offset`/`page` stop on an empty page. `limitParam` is optional metadata for any style: the iterator never sets it, so pass your page size in `params` yourself.
+
+```ts
+import { client } from './client.ts';
+
+for await (const order of client.listOrders.items({ params: { limit: 20 } })) {
+  console.log(order.id); // `order` is `Order` — resolved from the response schema at generate time
+}
+
+for await (const page of client.listOrders.pages()) {
+  console.log(page.orders.length); // each full page, last one included
+}
+```
+
+The flat free functions keep both iterators, with one asymmetry to note: the flat function itself takes **positional** arguments, but its `.pages`/`.items` always take the **grouped** shape (they are the client method's iterators):
+
+```ts
+import { listOrders } from './client.ts';
+
+const firstPage = await listOrders({ limit: 20 }); // flat one-shot: positional params
+for await (const order of listOrders.items({ params: { limit: 20 } })) {
+  // iterators: grouped args
+}
+```
+
+**Resume** by passing the advance param in the initial args — iteration starts from there instead of the beginning; **abort** by passing an `AbortSignal`, forwarded to every page request:
+
+```ts
+const controller = new AbortController();
+for await (const page of client.listOrders.pages(
+  { params: { cursor: 'c2' } }, // start from a saved cursor (or offset/page number)
+  { signal: controller.signal }
+)) {
+  // …
+}
+```
+
+Iteration is **error-mode-agnostic**: a failed page always aborts iteration by throwing `ApiError`, even on an `--error-mode result` client — where `.pages()` yields **raw** pages (not `{ data, error, response }` envelopes; only the one-shot call keeps the envelope) and the throw-mode-only `onError` middleware hook is not invoked. Both runtimes paginate identically; the `inline` runtime embeds the pagination module only when some operation paginates, and `package` clients receive pagination improvements via `npm update`.
+
+For shapes the built-in styles don't cover — for example a cursor that travels in the request body or a header — page with a small hand-written helper over the generated call, which stays fully typed end to end (see the [`custom-pagination` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/custom-pagination)).
+
 ## Custom generators
 
 The built-in generators cover common targets. For anything else derived from the same description (validators in another library, a permissions map, a house-style SDK), write a **custom generator**: it reads the same spec-agnostic model the built-ins consume, so its output never drifts from the spec.
diff --git a/packages/client-generator/README.md b/packages/client-generator/README.md
index a4bcb11215..bcb558f6f1 100644
--- a/packages/client-generator/README.md
+++ b/packages/client-generator/README.md
@@ -37,6 +37,7 @@ The rest of this README covers using the package **programmatically**.
   - a minification-safe `OPERATIONS` metadata map
 - **Auth** — Basic / Bearer / apiKey (header, query, cookie) setters from `securitySchemes`, async token providers, and per-instance credentials via `ClientConfig.auth`
 - **Server-Sent Events** — `text/event-stream` operations as typed async iterators with auto-reconnect; payloads typed from OpenAPI 3.2 `itemSchema`
+- **Auto-pagination** — declared via the `pagination` option (a statically verified convention rule + per-operation overrides) or the spec's `x-pagination` extension (`cursor`/`offset`/`page` styles); paginated operations keep their one-shot call and gain `.pages()`/`.items()` async iterators, item types resolved from the response schema at generate time
 - **Generators** (`generators`) — `sdk` (default), `zod`, `tanstack-query` (React/Vue/Svelte/Solid), `swr`, `transformers`, `mock` (MSW handlers + baked or `faker` data), and a [custom-generator plugin API](#custom-generators)
 - **Hardened** — document-derived names coerced to safe unique identifiers, comment text escaped, and a bounded SSE reader
 
@@ -59,7 +60,7 @@ const result = await generateClient({
   dateType: 'string', // 'string' | 'Date' (pair 'Date' with the 'transformers' generator)
   enumStyle: 'const-object', // 'const-object' | 'union'
   generators: ['sdk'], // see "Generators" below
-  // serverUrl, queryFramework, mockData, mockSeed, customGenerators are also accepted
+  // serverUrl, queryFramework, mockData, mockSeed, pagination, customGenerators are also accepted
 });
 
 console.log(`Wrote ${result.files.length} file(s), ${result.bytes} bytes.`);
@@ -432,6 +433,45 @@ The stream **auto-reconnects** on a dropped connection, resuming via the `Last-E
 Tune or opt out per call (`{ reconnect: false }` / `{ reconnectDelay: 500 }`), and `break` or pass an `AbortSignal` to stop early — both end the iterator cleanly (no throw).
 SSE operations always throw `ApiError` on an initial non-2xx and never return the `result`-mode shape.
 
+## Auto-pagination
+
+Pagination is **declared, never guessed** — in the `pagination` option (or `redocly.yaml` `client.pagination`; the spec's `x-pagination` operation extension takes the same fields).
+A convention rule applies to every operation it **structurally fits** (the advance param is a declared query parameter of the right type; the JSON pointers resolve in the JSON success-response schema, `items` landing on an array); an explicit rule (an `operations` override or `x-pagination`) that doesn't fit fails generation.
+Precedence per operation: `operations[id]` > `x-pagination` > convention; `exclude` wins over all.
+
+```ts
+await generateClient({
+  api: './openapi.yaml',
+  output: './src/api/client.ts',
+  pagination: {
+    style: 'cursor', // 'cursor' | 'offset' | 'page'
+    cursorParam: 'cursor', // the query param that receives the cursor
+    nextCursor: '/nextCursor', // JSON pointer to the next cursor in the response
+    items: '/orders', // JSON pointer to the page's item array
+  },
+});
+```
+
+Each paginated operation keeps its one-shot call and gains `.pages(args?, init?)` / `.items(args?, init?)` async iterators (the flat function too — note its iterators take the **grouped** args shape while the function itself stays positional).
+Item types are resolved from the response schema at generate time — no runtime reflection:
+
+```ts
+import { client, listOrders } from './client.ts';
+
+for await (const order of client.listOrders.items({ params: { limit: 20 } })) {
+  console.log(order.id); // `order` is typed `Order`
+}
+
+await listOrders({ limit: 20 }); // flat one-shot: positional
+for await (const page of listOrders.pages({ params: { cursor: 'c2' } })) {
+  // resume from a saved cursor; pass `{ signal }` as `init` to abort mid-iteration
+}
+```
+
+`cursor` style stops when `nextCursor` is absent/`null`/empty (and throws if the cursor doesn't advance); `offset`/`page` styles stop on an empty page.
+Iteration is error-mode-agnostic: a failed page throws `ApiError` even on `errorMode: 'result'` clients, where `.pages()` yields raw pages (not `{ data, error, response }` envelopes).
+Inline output embeds the pagination module only when some operation paginates; `runtime: 'package'` clients receive pagination improvements via `npm update`.
+
 ## Examples
 
 Runnable examples live in [`examples/`](./examples): `zero-install-quickstart`, `fetch-functions`, `configure-and-middleware`, `customization`, `baked-setup`, `sse-streaming`, `zod`, `tanstack-query`, `mock`, `custom-generator`, `programmatic`, `vendored-edge`, `package-runtime` (`runtime: 'package'` — engine fixes via `npm update`), and `multi-instance` (per-tenant `createClient` instances over one generated module).
diff --git a/packages/client-generator/docs/adr/0017-runtime-module-and-descriptor-client.md b/packages/client-generator/docs/adr/0017-runtime-module-and-descriptor-client.md
index f5c25668d2..b6ec1e5cda 100644
--- a/packages/client-generator/docs/adr/0017-runtime-module-and-descriptor-client.md
+++ b/packages/client-generator/docs/adr/0017-runtime-module-and-descriptor-client.md
@@ -24,7 +24,8 @@ Nothing is published (the package sits at `0.0.0`), so reshaping the output is f
 3. **`runtime: inline` stays the default; `runtime: package` is the opt-in.** Inline preserves ADR-0002's headline — a self-contained, zero-dependency file — via a build-time snapshot: `npm run compile` regenerates `emitters/runtime-sources.ts` from the real `src/runtime/` sources, and `emitters/inline-runtime.ts` embeds them in import-graph order, whole modules only, stripped of module syntax. One source of truth; the inline copy cannot drift. Package mode replaces the embedded block with `import { createClient, … } from '@redocly/client-generator'`, so runtime fixes reach the app via `npm update` with zero regeneration; regeneration then tracks only spec changes.
 4. **Capability-seam assembly.** The send core never statically imports the optional modules (`multipart`, `auth`, `sse`, `setup`); they plug in through a `Capabilities` object wired at `createClient` time. The package barrel wires the full set; the inline assembler wires — and embeds — only what the spec needs, so exclusion can never break the core, `noUnusedLocals` holds, and both modes execute identical code paths.
 5. **The `satisfies` clause is the version-skew guard.** No bespoke contract versioning: plain npm semver, with the generated `satisfies Record<string, OperationDescriptor>` failing the consumer's **build** on an incompatible generated/runtime pair (package mode's only new failure axis). Accepted caveat: plain-JS consumers who never typecheck lose the guard.
-6. **Facade and surface collapse.** Every generated module always exports both call styles — the `client` instance (grouped-args methods) and free-function one-liners (`--args-style` shapes only the sugar) — so `--facade` and `--name` are removed (no generated class to name). `--output-mode` reduces to `single` | `split` (entry + `<stem>.schemas.ts`; endpoints are one-liners now, so per-tag splitting lost its point). `setServerUrl` is removed (`configure({ serverUrl })` covers it). SSE operations become flat async-generator methods driven by `kind: 'sse'` in `Ops` — the `sse.*` namespace is gone. Auth is per-instance only: the runtime's `resolveAuth` capability reads `ClientConfig.auth`, `client.auth.{bearer,basic,apiKey}` mutates it, and the generated `setBearer`/`setBasicAuth`/`setApiKey*` setters are sugar bound to the default instance — the module-global credential slots are gone.
+6. **Facade and surface collapse.** Every generated module always exports both call styles — the `client` instance (grouped-args methods) and free-function one-liners (`--args-style` shapes only the sugar) — so `--facade` and `--name` are removed (no generated class to name). `--output-mode` reduces to `single` | `split` (entry + `<stem>.schemas.ts`; endpoints are one-liners now, so per-tag splitting lost its point). `setServerUrl` is removed (`configure({ serverUrl })` covers it). SSE operations become flat async-generator methods driven by `kind: 'sse'` in `Ops` — the `sse.*` namespace is gone.
+   Auth is per-instance only: the runtime's `resolveAuth` capability reads `ClientConfig.auth`, `client.auth.{bearer,basic,apiKey}` mutates it, and the generated `setBearer`/`setBasicAuth`/`setApiKey*` setters are sugar bound to the default instance — the module-global credential slots are gone.
 7. **Semantics carried over, not redesigned.** Error mode stays a generate-time knob ([ADR-0005](./0005-error-mode-terminals.md)): the generator writes `Result<…>` into `Ops` **and** bakes `errorMode: 'result'` into the `createClient` config; the runtime's `execute` branches on that flag, and `configure()` ignores `errorMode` (flipping it at runtime would desync the static types). Config layers lowest→highest as spec defaults → baked publisher setup (`mergeSetup`) → the app's `configure()`; `use()` appends, `configure({ middleware })` replaces. Middleware's `ctx.operation` keeps its literal-union typing (`OperationId`/`OperationPath`/`OperationTag`), now threaded through `createClient`'s type parameters.
 
 ## Consequences
diff --git a/packages/client-generator/docs/adr/0018-auto-pagination.md b/packages/client-generator/docs/adr/0018-auto-pagination.md
new file mode 100644
index 0000000000..6f43c9a20b
--- /dev/null
+++ b/packages/client-generator/docs/adr/0018-auto-pagination.md
@@ -0,0 +1,33 @@
+# ADR 0018: Auto-pagination as declared, statically verified configuration
+
+- Status: Accepted
+- Date: 2026-07-08
+
+## Context
+
+Iterating a paginated list endpoint by hand is boilerplate every consumer rewrites: call, extract the items, read the cursor (or bump the offset), loop, and get the stop condition right. Generators in the ecosystem attack this two ways, and both have a failure mode we refuse:
+
+1. **Heuristics** — sniff parameter names (`cursor`, `page`, `offset`, `next…`) and response shapes, and paginate whatever looks paginated. Cross-API naming variance makes this wrong silently: a lookalike param produces an iterator that loops forever or skips data, and nothing tells the user the guess happened.
+2. **Vendor extensions only** — require annotating every operation in the spec. Correct but tedious for the common case where one convention covers the whole API, and unavailable when the spec isn't yours to edit.
+
+Additional forces: the descriptor contract is frozen ([ADR-0017](./0017-runtime-module-and-descriptor-client.md) — additions must be optional); the send core assembles optional behavior through the capability seam, and non-paginated output must stay byte-identical; SSE already set a precedent that iterator-shaped surfaces bypass the error-mode terminals ([ADR-0005](./0005-error-mode-terminals.md), [ADR-0006](./0006-sse-namespace.md)); and the generator owns a resolved response-schema IR ([ADR-0003](./0003-spec-agnostic-ir.md)), so item types can be computed at generate time instead of guessed at runtime.
+
+## Decision
+
+**Pagination is declared, then statically verified against the spec — never guessed.**
+
+1. **Config-first declaration with a verified convention.** The `pagination` option (`redocly.yaml` `client.pagination`) carries one convention rule (`style: cursor | offset | page`, the style's advance param, `nextCursor`/`items` JSON pointers, optional `limitParam`) plus `operations` per-op overrides and an `exclude` list; the `x-pagination` operation extension takes the same rule fields inline in the spec. Precedence per operation: `operations[id]` > `x-pagination` > convention, with `exclude` killing all sources.
+   The convention applies only to operations it **structurally fits** — the advance param is a declared query parameter whose schema accepts what the runtime sends (string-ish for `cursor`, numeric for `offset`/`page`), and the pointers resolve over the JSON success-response schema with `items` landing on an array. A convention misfit silently skips the operation; an **explicit** rule that doesn't fit — and a malformed rule from any source — fails generation with per-operation errors aggregated into one throw. No name sniffing, no shape guessing.
+2. **Item typing is static, from the IR.** `emitters/pagination.ts` resolves the `items` pointer against the success-response `SchemaModel` (value-shape walking, `ref`s resolved through the model's named schemas) and writes the element type into the operation's `Ops` entry as `item`. `.items()` yields that type with zero runtime reflection; the same resolution is what verification rides on, so a type that emits is a pointer that resolves.
+3. **Capability-seam placement.** The runtime logic is one module, `runtime/paginate.ts` (`pages`/`items` generators + RFC 6901 `resolvePointer`), wired through `Capabilities.paginate` exactly like SSE: the send core never statically imports it, inline output embeds it only when some descriptor paginates, and an unwired capability throws descriptively. The descriptor gains an optional `pagination` field (normalized: `style`, `param`, `nextCursor?`, `limitParam?`, `items`) — optional, so the frozen contract holds and non-paginated package-mode output stays byte-identical; `runtime: package` clients pick up pagination fixes via `npm update`.
+4. **Method-attached surface, not a namespace.** A paginated operation keeps its one-shot call and gains `.pages(args?, init?)` / `.items(args?, init?)` via `Object.assign` on the bound method; the flat free function preserves them the same way. ADR-0017 already collapsed the `sse.*` namespace into flat methods — reintroducing a `paginated.*` namespace would fork the surface again, and a standalone helper (`paginate(client.listX, …)`) loses the per-operation static typing the `Ops` entry provides. Accepted asymmetry: the flat function stays positional while its attached iterators take the grouped args shape (they are the client method's iterators, and iterator args must round-trip into per-page calls).
+5. **Iteration is error-mode-agnostic** (the SSE precedent). On a result-mode client each page's envelope is unwrapped before it reaches the iterator: `.pages()` yields raw pages (an optional `page` field in the Ops entry carries that type), and a failed page aborts iteration by throwing `ApiError` in both modes — a mid-stream `{ data, error }` page would force every consumer to branch inside the loop and re-derive the page type. The throw-mode-only `onError` middleware hook is not invoked. The one-shot call keeps its mode's shape untouched.
+6. **Styles v1: `cursor`, `offset`, `page`; `Link` header deferred.** Cursor stops on an absent/`null`/empty next cursor and guards against non-advancing and non-scalar cursors (infinite-loop protection); offset advances by each page's item count, page by 1, both stopping on an empty page. Resume is free (the caller's own advance-param value seeds iteration); `init` is forwarded to every page call, so `AbortSignal` works. RFC 8288 `Link`-header pagination needs header (not body) extraction and URL-driven (not param-driven) advancement — a different descriptor shape, deferred until demanded rather than speculatively generalized.
+
+## Consequences
+
+- Paginated operations get `for await` ergonomics with statically typed items, in both runtimes, from one declaration — and a wrong declaration is a generate-time error naming the operation and the reason, not a runtime surprise.
+- Zero false positives by construction: no operation paginates unless a rule was declared for it and the spec structurally supports it. The trade: users must write the declaration — nothing is inferred, even for obviously paginated APIs.
+- Verification quality is bounded by spec quality: an undeclared query param or an untyped response schema blocks the convention from fitting (explicitly declaring it surfaces the reason as an error).
+- The descriptor and `OpsShape` grow optional fields only (`pagination`, `item`, `page`), so existing generated/runtime pairs stay compatible and non-paginated output is unchanged.
+- v1 strictness accepted: pointer walking over unions/intersections bails (the rule won't fit), and `Link`-header APIs aren't served yet; both can be added by extending the same rule schema and pointer walker.
diff --git a/packages/client-generator/docs/adr/README.md b/packages/client-generator/docs/adr/README.md
index b536ea9685..ab19ac6fdb 100644
--- a/packages/client-generator/docs/adr/README.md
+++ b/packages/client-generator/docs/adr/README.md
@@ -28,6 +28,7 @@ ARCHITECTURE.md says _what is_; these ADRs say _why_.
 | [0015](./0015-publisher-setup-bake-in.md)              | Publisher setup bake-in via `--setup`                             | Accepted                |
 | [0016](./0016-msw-generator-vs-mock-server.md)         | In-process MSW mocks coexist with the out-of-process mock server  | Accepted                |
 | [0017](./0017-runtime-module-and-descriptor-client.md) | Hand-written runtime module + descriptor-driven generated clients | Accepted                |
+| [0018](./0018-auto-pagination.md)                      | Auto-pagination as declared, statically verified configuration    | Accepted                |
 
 ## Template
 
diff --git a/packages/client-generator/scripts/generate-runtime-sources.mjs b/packages/client-generator/scripts/generate-runtime-sources.mjs
index df02d125fd..7f6ca0259c 100644
--- a/packages/client-generator/scripts/generate-runtime-sources.mjs
+++ b/packages/client-generator/scripts/generate-runtime-sources.mjs
@@ -18,6 +18,7 @@ const MODULES = [
   'send',
   'sse',
   'create-client',
+  'paginate',
 ];
 
 const pkgRoot = join(dirname(fileURLToPath(import.meta.url)), '..');
diff --git a/packages/client-generator/scripts/regenerate-examples.mjs b/packages/client-generator/scripts/regenerate-examples.mjs
index e4e32ab700..1e0bf4f22f 100644
--- a/packages/client-generator/scripts/regenerate-examples.mjs
+++ b/packages/client-generator/scripts/regenerate-examples.mjs
@@ -25,6 +25,8 @@ const examples = [
   'multi-instance',
   'sse-streaming',
   'vendored-edge',
+  'pagination',
+  'custom-pagination',
 ];
 
 for (const name of examples) {
diff --git a/packages/client-generator/scripts/typecheck-examples.mjs b/packages/client-generator/scripts/typecheck-examples.mjs
index 49475e3cd6..15066fabbb 100644
--- a/packages/client-generator/scripts/typecheck-examples.mjs
+++ b/packages/client-generator/scripts/typecheck-examples.mjs
@@ -25,6 +25,8 @@ const examples = [
   'multi-instance',
   'sse-streaming',
   'vendored-edge',
+  'pagination',
+  'custom-pagination',
 ];
 
 let failed = false;
diff --git a/packages/client-generator/src/__tests__/index.test.ts b/packages/client-generator/src/__tests__/index.test.ts
index a9f0f80b22..e515172bf3 100644
--- a/packages/client-generator/src/__tests__/index.test.ts
+++ b/packages/client-generator/src/__tests__/index.test.ts
@@ -17,6 +17,21 @@ function model(): ApiModel {
   };
 }
 
+describe('generateClient output validation', () => {
+  it("rejects output paths with a literal 'undefined' or 'null' segment (interpolation-bug telltale)", async () => {
+    const { generateClient } = await import('../index.js');
+    for (const output of ['undefined/api.ts', 'out/null/api.ts', 'undefined']) {
+      await expect(generateClient({ api: 'unused.yaml', output })).rejects.toThrow(
+        /looks like an interpolation bug/
+      );
+    }
+    // A file merely NAMED undefined.* is legitimate — only exact segments are rejected.
+    await expect(
+      generateClient({ api: 'unused.yaml', output: 'out/undefined.ts' })
+    ).rejects.not.toThrow(/interpolation/);
+  });
+});
+
 describe('generateClient setup validation', () => {
   it('rejects a URL setup specifier upfront (local file paths only)', async () => {
     const { generateClient } = await import('../index.js');
@@ -154,6 +169,58 @@ describe('generateClient — end-to-end orchestration', () => {
     expect(throwContents).toContain('result: PingResult;');
   });
 
+  it('passes the pagination config through to the emitter', async () => {
+    const api = join(workDir, 'paginated.yaml');
+    await writeFile(
+      api,
+      outdent`
+        openapi: 3.0.3
+        info:
+          title: Cafe
+          version: 1.0.0
+        paths:
+          /orders:
+            get:
+              operationId: listOrders
+              parameters:
+                - { name: cursor, in: query, schema: { type: string } }
+              responses:
+                '200':
+                  description: OK
+                  content:
+                    application/json:
+                      schema:
+                        type: object
+                        properties:
+                          orders:
+                            type: array
+                            items: { type: string }
+                          nextCursor: { type: string }
+      `,
+      'utf-8'
+    );
+
+    const output = join(workDir, 'paginated.ts');
+    await generateClient({
+      api,
+      output,
+      pagination: {
+        style: 'cursor',
+        cursorParam: 'cursor',
+        nextCursor: '/nextCursor',
+        items: '/orders',
+      },
+    });
+    const contents = await readFile(output, 'utf-8');
+    expect(contents).toContain(
+      'pagination: { style: "cursor", param: "cursor", nextCursor: "/nextCursor", items: "/orders" }'
+    );
+    expect(contents).toContain('item: string;');
+    expect(contents).toContain(
+      '{ pages: client.listOrders.pages, items: client.listOrders.items });'
+    );
+  });
+
   it('normalizes a Swagger 2.0 document before generating', async () => {
     const api = join(workDir, 'swagger2.yaml');
     await writeFile(
diff --git a/packages/client-generator/src/config.ts b/packages/client-generator/src/config.ts
index a0420080cb..d186f83a05 100644
--- a/packages/client-generator/src/config.ts
+++ b/packages/client-generator/src/config.ts
@@ -1,5 +1,6 @@
 import type { ArgsStyle } from './emitters/client.js';
 // packages/client-generator/src/config.ts
+import type { PaginationConfig } from './emitters/pagination.js';
 import type { CustomGenerator } from './generators/types.js';
 import type { OutputMode } from './writers/types.js';
 
@@ -57,4 +58,8 @@ export type Config = {
   setup?: string;
   /** Runtime distribution: 'inline' (default, self-contained) | 'package' (imports @redocly/client-generator). */
   runtime?: 'inline' | 'package';
+  /** Auto-pagination rules (convention + per-operation overrides + `exclude`), resolved
+   * together with each operation's `x-pagination` extension. Explicit rules that don't
+   * fit their operation fail generation. */
+  pagination?: PaginationConfig;
 };
diff --git a/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap b/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
index d5801b8933..81be79afee 100644
--- a/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
+++ b/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
@@ -90,6 +90,22 @@ export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
 
+/**
+ * How to auto-iterate a paginated operation (drives its \`.pages()\`/\`.items()\` members).
+ * \`nextCursor\` and \`items\` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (\`cursor\`) or number (\`offset\`/\`page\`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
 /** The frozen data contract between generated code and the runtime: one operation's wire shape. */
 export type OperationDescriptor = {
   id: string;
@@ -103,6 +119,7 @@ export type OperationDescriptor = {
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
   security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
 };
 
 /** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
@@ -229,8 +246,16 @@ export type Result<TData, TError> =
   | { data: TData; error: undefined; response: Response }
   | { data: undefined; error: TError; response: Response };
 
-/** The generated \`Ops\` type's shape: per-operation args/result (and \`kind: 'sse'\` for streams). */
-export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+/**
+ * The generated \`Ops\` type's shape: per-operation args/result, plus \`kind: 'sse'\` for
+ * streams and, for paginated operations, \`item\` (the page's element type) and — on
+ * result-mode clients only — \`page\` (the RAW page type \`.pages()\` yields, since
+ * iteration unwraps the \`Result\` envelope the one-shot \`result\` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
 
 /** The always-present client members (assigned after the operation loop — they win collisions). */
 export type ClientCore<Op extends OperationContext = OperationContext> = {
@@ -252,6 +277,35 @@ export type ClientCore<Op extends OperationContext = OperationContext> = {
 // oxlint-disable-next-line typescript/no-empty-object-type
 type NoRequiredKeys<A> = {} extends A ? true : false;
 
+/**
+ * The page type \`.pages()\` yields: the RAW page declared by \`page\` (the generator
+ * writes it only on result-mode paginated entries, whose \`result\` is the envelope),
+ * or the method's own \`result\` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares \`item\` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; \`unknown\` otherwise (identity under \`&\`).
+ * Iteration is error-mode-agnostic: \`.pages()\`/\`.items()\` yield raw pages/items, and a
+ * failed page aborts iteration by throwing \`ApiError\`, even on result-mode clients; the
+ * \`onError\` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
 /** The typed instance client: one bound method per operation plus the core members. */
 export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
   [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
@@ -264,9 +318,10 @@ export type Client<Ops extends OpsShape, Op extends OperationContext = Operation
           args: Ops[K]['args'],
           init?: SseOptions
         ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : NoRequiredKeys<Ops[K]['args']> extends true
-      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
 } & ClientCore<Op>;
 
 /** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
@@ -799,6 +854,20 @@ type Capabilities = SendCapabilities & {
     init: SseOptions,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
 };
 
 /** The grouped args wire shape: path params by name plus the \`params\`/\`body\`/\`headers\` slots. */
@@ -936,6 +1005,39 @@ async function execute(
   return parse(response, readKind);
 }
 
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(\`Pagination capability not wired: cannot iterate operation "\${op.id}"\`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the \`{ data, error, response }\` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as \`ApiError\` (iteration is
+ * error-mode-agnostic; the throw-mode-only \`onError\` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
 /**
  * Build a typed instance client over operation descriptors: one real bound method per
  * operation (attached by a construction-time loop — no Proxy), plus the core members
@@ -975,8 +1077,24 @@ function createClientCore<
         })();
       };
     } else {
-      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain \`.pages\`/\`.items\`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (\`errorMode\` is fixed at construction — \`configure()\`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the \`onError\` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
     }
   }
 
@@ -1116,3 +1234,1343 @@ export { ApiError, createClient } from '@redocly/client-generator';
 export type { ClientConfig, Middleware, RequestOptions, ServerSentEvent, SseOptions } from '@redocly/client-generator';
 "
 `;
+
+exports[`emitClientSingleFile — pagination > matches the golden output for a paginated inline client 1`] = `
+"// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run \`redocly generate-client\` to update.
+
+/**
+ * T (v1.0.0)
+ */
+
+export type Order = {};
+
+export type Problem = {};
+
+export type Pet = {};
+
+export type OrderEvent = {};
+
+export type OrderPage = {
+    orders: Order[];
+    nextCursor?: string;
+};
+
+export type ListOrdersResult = OrderPage;
+
+export type ListOrdersParams = {
+    cursor?: string;
+    limit?: string;
+};
+
+export type ListOrdersVariables = {
+    params?: ListOrdersParams;
+};
+
+export type GetOrderResult = Order;
+
+export type GetOrderParams = {
+    expand?: string;
+};
+
+export type GetOrderVariables = {
+    orderId: string;
+    params?: GetOrderParams;
+};
+
+/**
+ * Per-operation \`args\`/\`result\` shapes (plus \`kind: 'sse'\` for event streams) — the
+ * type-level companion of \`OPERATIONS\` that gives \`createClient<Ops>\` its typed methods.
+ */
+export type Ops = {
+    listOrders: {
+        args: {
+            params?: ListOrdersParams;
+        };
+        result: ListOrdersResult;
+        item: Order;
+    };
+    getOrder: {
+        args: {
+            orderId: string;
+            params?: GetOrderParams;
+        };
+        result: GetOrderResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", params: [{ name: "cursor", in: "query" }, { name: "limit", in: "query" }], pagination: { style: "cursor", param: "cursor", nextCursor: "/nextCursor", items: "/orders" } },
+    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "expand", in: "query" }] }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — \`@redocly/client-generator\`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits \`OPERATIONS\` literals typed
+ * \`satisfies Record<string, OperationDescriptor>\` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (\`scheme\` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/**
+ * How to auto-iterate a paginated operation (drives its \`.pages()\`/\`.items()\` members).
+ * \`nextCursor\` and \`items\` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (\`cursor\`) or number (\`offset\`/\`page\`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** \`multipart: true\` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to \`'json'\` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (\`ctx.operation\`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (\`OperationId\`/\`OperationPath\`/\`OperationTag\`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (\`runtime-contract.ts\`, the runtime internals) working
+ * with the base shape. \`tags\` stays mutable (\`Tag[]\`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom \`retryOn\`: exactly one of \`response\`/\`error\` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real \`ApiError\` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // \`globalThis.Error\` so a spec schema named \`Error\` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (\`'throw'\` when omitted); \`configure()\` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call \`parseAs\` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard \`RequestInit\` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of \`data\`/\`error\` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/**
+ * The generated \`Ops\` type's shape: per-operation args/result, plus \`kind: 'sse'\` for
+ * streams and, for paginated operations, \`item\` (the page's element type) and — on
+ * result-mode clients only — \`page\` (the RAW page type \`.pages()\` yields, since
+ * iteration unwraps the \`Result\` envelope the one-shot \`result\` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note \`middleware\` REPLACES the chain (use \`use()\` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: \`{}\` has no required members, so
+ * \`{} extends A\` is true exactly when every member of \`A\` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/**
+ * The page type \`.pages()\` yields: the RAW page declared by \`page\` (the generator
+ * writes it only on result-mode paginated entries, whose \`result\` is the envelope),
+ * or the method's own \`result\` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares \`item\` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; \`unknown\` otherwise (identity under \`&\`).
+ * Iteration is error-mode-agnostic: \`.pages()\`/\`.items()\` yield raw pages/items, and a
+ * failed page aborts iteration by throwing \`ApiError\`, even on result-mode clients; the
+ * \`onError\` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(\`Request failed with status \${status}\`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// \`globalThis.Error\` (not bare \`Error\`) so a spec schema named \`Error\` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (\`style: 'form'\`, \`explode: true\`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for \`allowReserved: true\` params —
+ * \`filter=a/b\` survives instead of \`filter=a%2Fb\`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute \`{name}\` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\\{([^{}]+)\\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(\`Missing path parameter "\${name}"\`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: \`serverUrl\` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI \`style\`/\`explode\`/\`allowReserved\` (from \`styles\`);
+ * without a spec, arrays repeat the key (\`form\`+\`explode\`), objects serialize as
+ * \`deepObject\` brackets, and \`null\`/\`undefined\` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not \`/\\/+$/\` — an anchored \`+\` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use \`deepObject\` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(\`\${key}[\${subKey}]\`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(\`\${key}=\${encodeReserved(v)}\`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. \`%20\` (not \`+\`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(\`\${encodeURIComponent(key)}=\${items.map(enc).join(delim)}\`);
+      }
+    } else if (Object(value) === value) {
+      // \`deepObject\` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(\`\${key}[\${subKey}]=\${encodeReserved(String(subValue))}\`);
+          else params.append(\`\${key}[\${subKey}]\`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(\`\${key}=\${encodeReserved(String(value))}\`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? \`\${url}?\${qs}\` : url;
+}
+
+/**
+ * Read the response body per \`kind\`. \`'auto'\` negotiates from the content type
+ * (JSON, then \`text/*\`, then Blob); \`'void'\` and \`204\` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom \`retryOn\` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a \`Retry-After\` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over \`retryDelay\`, with full jitter
+ * unless \`jitter === false\`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after \`ms\`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/** Resolve a credential: a literal passes through; a function is awaited per request. */
+async function resolveToken(provider: TokenProvider): Promise<string> {
+  return typeof provider === 'function' ? await provider() : provider;
+}
+
+/**
+ * Build the auth headers/query for one operation's \`security\` requirements from the
+ * instance credentials (\`config.auth\`) — capability module, wired into \`createClient\`.
+ * A scheme with no configured credential contributes nothing (the request is sent
+ * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * Cookie-borne apiKeys fold into a single \`Cookie\` header joined with \`; \`.
+ */
+async function resolveAuth(
+  security: readonly SecuritySpec[],
+  config: ClientConfig
+): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const headers: Record<string, string> = {};
+  const query: Record<string, string> = {};
+  const cookies: string[] = [];
+  for (const scheme of security) {
+    if (scheme.kind === 'apiKey') {
+      const provider = config.auth?.apiKey?.[scheme.scheme];
+      if (provider === undefined) continue;
+      const value = await resolveToken(provider);
+      if (scheme.in === 'header') headers[scheme.name] = value;
+      else if (scheme.in === 'query') query[scheme.name] = value;
+      else cookies.push(\`\${scheme.name}=\${value}\`);
+    } else if (scheme.kind === 'bearer') {
+      const provider = config.auth?.bearer;
+      if (provider !== undefined) headers.Authorization = \`Bearer \${await resolveToken(provider)}\`;
+    } else {
+      const basic = config.auth?.basic;
+      if (basic !== undefined) {
+        headers.Authorization = \`Basic \${btoa(\`\${basic.username}:\${basic.password}\`)}\`;
+      }
+    }
+  }
+  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
+  return { headers, query };
+}
+
+/**
+ * Auto-pagination (capability module — wired into \`createClient\`, dispatched by the
+ * method's \`.pages()\`/\`.items()\`): walk an operation's pages by advancing the descriptor's
+ * \`param\` query parameter, per its \`style\`. The caller's args are never mutated — each
+ * request gets a fresh \`params\` clone — and \`init\` is forwarded to every call.
+ *
+ * Iteration is error-mode-agnostic: \`call\` always resolves to the RAW page (on a
+ * result-mode client the attachment unwraps the envelope first), so a failed page
+ * aborts iteration by throwing \`ApiError\`, even on result-mode clients; the \`onError\`
+ * middleware hook (throw-mode-only) is not invoked.
+ */
+
+/**
+ * Resolve an RFC 6901 JSON pointer (\`~1\` → \`/\`, \`~0\` → \`~\`) against a value.
+ * The empty pointer is the whole document; anything else must start with \`/\`.
+ * Returns \`undefined\` on any miss (bad token, absent key, non-object step) — never throws.
+ */
+function resolvePointer(value: unknown, pointer: string): unknown {
+  if (pointer === '') return value;
+  if (!pointer.startsWith('/')) return undefined;
+  let current = value;
+  for (const token of pointer.slice(1).split('/')) {
+    const key = token.replaceAll('~1', '/').replaceAll('~0', '~');
+    if (Array.isArray(current)) {
+      if (!/^(0|[1-9]\\d*)$/.test(key)) return undefined;
+      current = current[Number(key)];
+    } else if (Object(current) === current && key in (current as object)) {
+      current = (current as Record<string, unknown>)[key];
+    } else {
+      return undefined;
+    }
+  }
+  return current;
+}
+
+/**
+ * Iterate an operation's full page results. Every page is yielded before the stop
+ * condition is evaluated, so the last page always arrives. Cursor style resumes from a
+ * caller-provided \`params[spec.param]\`, stops when \`nextCursor\` resolves to
+ * \`undefined\`/\`null\`/\`''\`, and throws if the next cursor is not a string or number, or
+ * if the same cursor comes back twice in a row (infinite-loop guards). Offset/page
+ * styles advance by item count / by one and stop when
+ * the \`items\` pointer misses or the array is empty.
+ */
+async function* pages<TPage>(
+  call: (args?: OperationArgs, init?: RequestOptions) => Promise<TPage>,
+  spec: PaginationSpec,
+  args: OperationArgs = {},
+  init?: RequestOptions
+): AsyncGenerator<TPage> {
+  if (spec.style === 'cursor') {
+    let cursor: unknown = args.params?.[spec.param];
+    while (true) {
+      const params = { ...args.params };
+      if (cursor !== undefined) params[spec.param] = cursor as QueryValue;
+      const page = await call({ ...args, params }, init);
+      yield page;
+      const next = resolvePointer(page, spec.nextCursor!);
+      if (next === undefined || next === null || next === '') return;
+      if (typeof next !== 'string' && typeof next !== 'number') {
+        // A fresh non-scalar cursor never compares equal, so without this guard a lying
+        // server would slip past the did-not-advance check into an infinite loop.
+        throw new Error(\`Pagination cursor at \${spec.nextCursor} is not a string or number\`);
+      }
+      if (next === cursor) {
+        throw new Error('Pagination did not advance: operation returned the same cursor twice');
+      }
+      cursor = next;
+    }
+  } else {
+    let position =
+      (args.params?.[spec.param] as number | undefined) ?? (spec.style === 'page' ? 1 : 0);
+    while (true) {
+      const page = await call(
+        { ...args, params: { ...args.params, [spec.param]: position } },
+        init
+      );
+      yield page;
+      const pageItems = resolvePointer(page, spec.items);
+      if (!Array.isArray(pageItems) || pageItems.length === 0) return;
+      position += spec.style === 'page' ? 1 : pageItems.length;
+    }
+  }
+}
+
+/**
+ * Iterate the operation's individual items: each page's \`items\` pointer, flattened.
+ * A cursor-style page whose pointer misses yields nothing but pagination continues;
+ * for offset/page styles a miss has already stopped \`pages\`.
+ */
+async function* items<TItem>(
+  call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  spec: PaginationSpec,
+  args?: OperationArgs,
+  init?: RequestOptions
+): AsyncGenerator<TItem> {
+  for await (const page of pages(call, spec, args, init)) {
+    const pageItems = resolvePointer(page, spec.items);
+    if (Array.isArray(pageItems)) yield* pageItems as TItem[];
+  }
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * \`createClient\` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single \`onRequest\`/\`onResponse\`/
+ * \`onError\` config hooks as one implicit first middleware, then \`config.middleware\`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * \`onRequest\` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, \`Retry-After\`, abandoned-body drain), and the reverse
+ * \`onResponse\` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * The optional behaviors \`createClientCore\` can dispatch to but never statically
+ * imports. The package's public \`createClient\` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
+};
+
+/** The grouped args wire shape: path params by name plus the \`params\`/\`body\`/\`headers\` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call \`parseAs\` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (\`form\` + \`explode: true\`, encoded),
+ * and always fully resolved — so \`explode: false\` or \`allowReserved\` alone (no \`style\`)
+ * are honored, and an omitted \`explode\` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller \`init.headers\` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(\`Pagination capability not wired: cannot iterate operation "\${op.id}"\`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the \`{ data, error, response }\` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as \`ApiError\` (iteration is
+ * error-mode-agnostic; the throw-mode-only \`onError\` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (\`configure\`/\`use\`/\`auth\`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // \`ClientConfig<Narrow>\` is not assignable to \`ClientConfig\` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so \`use()\` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(\`SSE capability not wired: cannot stream operation "\${op.id}"\`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain \`.pages\`/\`.items\`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (\`errorMode\` is fixed at construction — \`configure()\`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the \`onError\` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // \`errorMode\` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from \`Client<Ops>\`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided \`middleware\` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
+/**
+ * The client factory: \`createClientCore\` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same \`OPERATIONS\`/\`Ops\`. The trailing string params carry the wiring's literal
+ * unions (\`OperationId\`/\`OperationPath\`/\`OperationTag\`) into \`ctx.operation\`.
+ */
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth, paginate: { pages, items } });
+}
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.example.com" });
+
+export const { configure, use } = client;
+export const listOrders = Object.assign((params: {
+    cursor?: string;
+    limit?: string;
+} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init), { pages: client.listOrders.pages, items: client.listOrders.items });
+export const getOrder = (orderId: string, params: {
+    expand?: string;
+} = {}, init: RequestOptions = {}) => client.getOrder({ orderId, params }, init);
+"
+`;
+
+exports[`emitClientSingleFile — pagination > matches the golden output for a paginated package client 1`] = `
+"// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run \`redocly generate-client\` to update.
+
+/**
+ * T (v1.0.0)
+ */
+
+import { createClient, type OperationDescriptor, type RequestOptions } from '@redocly/client-generator';
+
+export type Order = {};
+
+export type Problem = {};
+
+export type Pet = {};
+
+export type OrderEvent = {};
+
+export type OrderPage = {
+    orders: Order[];
+    nextCursor?: string;
+};
+
+export type ListOrdersResult = OrderPage;
+
+export type ListOrdersParams = {
+    cursor?: string;
+    limit?: string;
+};
+
+export type ListOrdersVariables = {
+    params?: ListOrdersParams;
+};
+
+export type GetOrderResult = Order;
+
+export type GetOrderParams = {
+    expand?: string;
+};
+
+export type GetOrderVariables = {
+    orderId: string;
+    params?: GetOrderParams;
+};
+
+/**
+ * Per-operation \`args\`/\`result\` shapes (plus \`kind: 'sse'\` for event streams) — the
+ * type-level companion of \`OPERATIONS\` that gives \`createClient<Ops>\` its typed methods.
+ */
+export type Ops = {
+    listOrders: {
+        args: {
+            params?: ListOrdersParams;
+        };
+        result: ListOrdersResult;
+        item: Order;
+    };
+    getOrder: {
+        args: {
+            orderId: string;
+            params?: GetOrderParams;
+        };
+        result: GetOrderResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", params: [{ name: "cursor", in: "query" }, { name: "limit", in: "query" }], pagination: { style: "cursor", param: "cursor", nextCursor: "/nextCursor", items: "/orders" } },
+    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "expand", in: "query" }] }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.example.com" });
+
+export const { configure, use } = client;
+export const listOrders = Object.assign((params: {
+    cursor?: string;
+    limit?: string;
+} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init), { pages: client.listOrders.pages, items: client.listOrders.items });
+export const getOrder = (orderId: string, params: {
+    expand?: string;
+} = {}, init: RequestOptions = {}) => client.getOrder({ orderId, params }, init);
+
+export { ApiError, createClient } from '@redocly/client-generator';
+export type { ClientConfig, Middleware, RequestOptions } from '@redocly/client-generator';
+"
+`;
+
+exports[`emitClientSingleFile — pagination > matches the golden output for a result-mode paginated package client 1`] = `
+"// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run \`redocly generate-client\` to update.
+
+/**
+ * T (v1.0.0)
+ */
+
+import { createClient, type OperationDescriptor, type RequestOptions, type Result } from '@redocly/client-generator';
+
+export type Order = {};
+
+export type Problem = {};
+
+export type Pet = {};
+
+export type OrderEvent = {};
+
+export type OrderPage = {
+    orders: Order[];
+    nextCursor?: string;
+};
+
+export type ListOrdersResult = OrderPage;
+
+export type ListOrdersParams = {
+    cursor?: string;
+    limit?: string;
+};
+
+export type ListOrdersVariables = {
+    params?: ListOrdersParams;
+};
+
+export type GetOrderResult = Order;
+
+export type GetOrderError = Problem;
+
+export type GetOrderParams = {
+    expand?: string;
+};
+
+export type GetOrderVariables = {
+    orderId: string;
+    params?: GetOrderParams;
+};
+
+/**
+ * Per-operation \`args\`/\`result\` shapes (plus \`kind: 'sse'\` for event streams) — the
+ * type-level companion of \`OPERATIONS\` that gives \`createClient<Ops>\` its typed methods.
+ */
+export type Ops = {
+    listOrders: {
+        args: {
+            params?: ListOrdersParams;
+        };
+        result: Result<ListOrdersResult, unknown>;
+        item: Order;
+        page: ListOrdersResult;
+    };
+    getOrder: {
+        args: {
+            orderId: string;
+            params?: GetOrderParams;
+        };
+        result: Result<GetOrderResult, GetOrderError>;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", params: [{ name: "cursor", in: "query" }, { name: "limit", in: "query" }], pagination: { style: "cursor", param: "cursor", nextCursor: "/nextCursor", items: "/orders" } },
+    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "expand", in: "query" }] }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.example.com", errorMode: "result" });
+
+export const { configure, use } = client;
+export const listOrders = Object.assign((params: {
+    cursor?: string;
+    limit?: string;
+} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init), { pages: client.listOrders.pages, items: client.listOrders.items });
+export const getOrder = (orderId: string, params: {
+    expand?: string;
+} = {}, init: RequestOptions = {}) => client.getOrder({ orderId, params }, init);
+
+export { ApiError, createClient } from '@redocly/client-generator';
+export type { ClientConfig, Middleware, RequestOptions, Result } from '@redocly/client-generator';
+"
+`;
diff --git a/packages/client-generator/src/emitters/__tests__/descriptor.test.ts b/packages/client-generator/src/emitters/__tests__/descriptor.test.ts
index 6e18d9a86f..1e95b969c0 100644
--- a/packages/client-generator/src/emitters/__tests__/descriptor.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/descriptor.test.ts
@@ -10,6 +10,7 @@ import {
   packageIdents,
 } from '../descriptor.js';
 import type { EmitContext } from '../operations.js';
+import type { ModelPagination } from '../pagination.js';
 import { printStatements } from '../ts.js';
 import { apiModel, operation, param } from './fixtures.js';
 
@@ -306,6 +307,40 @@ describe('descriptorStatements', () => {
     expect(out).toContain('export type OperationPath');
     expect(out).not.toContain('OperationTag');
   });
+
+  it('emits the resolved pagination spec with stable key order, only on resolved ops', () => {
+    const model = modelWith([
+      op('listOrders', {
+        path: '/orders',
+        queryParams: [param('cursor', 'query')],
+        successResponses: [JSON_OK],
+      }),
+      op('ping', { path: '/ping', successResponses: [JSON_OK] }),
+    ]);
+    const pagination: ModelPagination = new Map([
+      [
+        'listOrders',
+        {
+          spec: {
+            style: 'cursor',
+            param: 'cursor',
+            limitParam: 'limit',
+            nextCursor: '/nextCursor',
+            items: '/orders',
+          },
+          itemSchema: { kind: 'ref', name: 'Order' },
+        },
+      ],
+    ]);
+    const out = printStatements(
+      descriptorStatements(model, packageIdents(model), 'string', pagination)
+    );
+    expect(out).toContain(
+      'pagination: { style: "cursor", param: "cursor", limitParam: "limit", nextCursor: "/nextCursor", items: "/orders" }'
+    );
+    // Non-paginated entries carry no pagination field.
+    expect(out).toContain('ping: { id: "ping", method: "GET", path: "/ping" }');
+  });
 });
 
 describe('opsInterfaceStatements', () => {
@@ -469,4 +504,97 @@ describe('opsInterfaceStatements', () => {
     );
     expect(out).not.toContain('Result<');
   });
+
+  it('adds an item member (the page element type) only to paginated operations', () => {
+    const listOrders = op('listOrders', {
+      path: '/orders',
+      queryParams: [param('cursor', 'query')],
+      successResponses: [
+        {
+          contentType: 'application/json',
+          schema: { kind: 'ref', name: 'OrderPage' },
+          status: 200,
+        },
+      ],
+    });
+    const pagination: ModelPagination = new Map([
+      [
+        'listOrders',
+        {
+          spec: { style: 'cursor', param: 'cursor', nextCursor: '/nextCursor', items: '/orders' },
+          itemSchema: { kind: 'ref', name: 'Order' },
+        },
+      ],
+    ]);
+    const out = emitOps(modelWith([listOrders, getOrder]), { pagination });
+    expect(out).toMatch(
+      /listOrders: \{\n {8}args: \{\n {12}params\?: ListOrdersParams;\n {8}\};\n {8}result: ListOrdersResult;\n {8}item: Order;\n {4}\};/
+    );
+    // The non-paginated sibling stays untouched.
+    expect(out).toMatch(
+      /getOrder: \{\n {8}args: \{\n {12}orderId: string;\n {8}\};\n {8}result: GetOrderResult;\n {4}\};/
+    );
+  });
+
+  it('adds a page member (the RAW page type) to paginated operations in result mode only', () => {
+    const listOrders = op('listOrders', {
+      path: '/orders',
+      queryParams: [param('cursor', 'query')],
+      successResponses: [
+        {
+          contentType: 'application/json',
+          schema: { kind: 'ref', name: 'OrderPage' },
+          status: 200,
+        },
+      ],
+    });
+    const pagination: ModelPagination = new Map([
+      [
+        'listOrders',
+        {
+          spec: { style: 'cursor', param: 'cursor', nextCursor: '/nextCursor', items: '/orders' },
+          itemSchema: { kind: 'ref', name: 'Order' },
+        },
+      ],
+    ]);
+    // Result mode: `result` is the envelope, so `page` carries the raw page for `.pages()`.
+    const out = emitOps(modelWith([listOrders]), { pagination, errorMode: 'result' });
+    expect(out).toMatch(
+      /listOrders: \{\n {8}args: \{\n {12}params\?: ListOrdersParams;\n {8}\};\n {8}result: Result<ListOrdersResult, unknown>;\n {8}item: Order;\n {8}page: ListOrdersResult;\n {4}\};/
+    );
+    // Throw mode emits no page member — `result` already IS the raw page.
+    expect(emitOps(modelWith([listOrders]), { pagination })).not.toContain('page:');
+    // The page member reuses the suppression-aware alias reference: a colliding
+    // `<Op>Result` alias inlines the raw response type instead.
+    const suppressed = emitOps(modelWith([listOrders]), {
+      pagination,
+      errorMode: 'result',
+      schemaNames: new Set(['ListOrdersResult']),
+    });
+    expect(suppressed).toContain('result: Result<OrderPage, unknown>;');
+    expect(suppressed).toContain('page: OrderPage;');
+  });
+
+  it('types item with the shared dateType handling', () => {
+    const listOrders = op('listOrders', {
+      path: '/orders',
+      queryParams: [param('page', 'query')],
+      successResponses: [JSON_OK],
+    });
+    const pagination: ModelPagination = new Map([
+      [
+        'listOrders',
+        {
+          spec: { style: 'page', param: 'page', items: '/orders' },
+          itemSchema: {
+            kind: 'scalar',
+            scalar: 'string',
+            metadata: { format: 'date-time' },
+          },
+        },
+      ],
+    ]);
+    const out = emitOps(modelWith([listOrders]), { pagination, dateType: 'Date' });
+    expect(out).toContain('item: Date;');
+  });
 });
diff --git a/packages/client-generator/src/emitters/__tests__/inline-runtime.test.ts b/packages/client-generator/src/emitters/__tests__/inline-runtime.test.ts
index d5385e3792..2963d9c3a1 100644
--- a/packages/client-generator/src/emitters/__tests__/inline-runtime.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/inline-runtime.test.ts
@@ -1,8 +1,8 @@
 import { assembleInlineRuntime } from '../inline-runtime.js';
 import { ts } from '../ts.js';
 
-const NONE = { multipart: false, auth: false, sse: false, setup: false };
-const ALL = { multipart: true, auth: true, sse: true, setup: true };
+const NONE = { multipart: false, auth: false, sse: false, setup: false, paginate: false };
+const ALL = { multipart: true, auth: true, sse: true, setup: true, paginate: true };
 
 /** Positions of `markers` in `text`; asserts each is present and they appear in order. */
 function expectOrder(text: string, markers: string[]): void {
@@ -56,6 +56,8 @@ describe('assembleInlineRuntime', () => {
       expect(out).not.toContain('resolveToken');
       expect(out).not.toContain('async function* sse');
       expect(out).not.toContain('mergeSetup');
+      expect(out).not.toContain('function resolvePointer');
+      expect(out).not.toContain('async function* pages');
     });
 
     it('contains no import statements or package references', () => {
@@ -89,7 +91,7 @@ describe('assembleInlineRuntime', () => {
     it('wires all capabilities into the factory', () => {
       expect(out).toContain('serializeMultipart: toFormData');
       expect(out).toContain(
-        'createClientCore<Ops, Id, Path, Tag>(operations, config, { serializeMultipart: toFormData, resolveAuth, sse })'
+        'createClientCore<Ops, Id, Path, Tag>(operations, config, { serializeMultipart: toFormData, resolveAuth, sse, paginate: { pages, items } })'
       );
     });
 
@@ -100,6 +102,8 @@ describe('assembleInlineRuntime', () => {
       expect(out).not.toContain('export async function resolveAuth');
       expect(out).toContain('async function* sse');
       expect(out).not.toContain('export async function* sse');
+      expect(out).toContain('async function* pages');
+      expect(out).not.toContain('export async function* pages');
       expect(out).toContain('export function mergeSetup');
     });
 
@@ -109,6 +113,7 @@ describe('assembleInlineRuntime', () => {
         'function toFormData',
         'async function resolveAuth',
         'export function mergeSetup',
+        'function resolvePointer',
         'async function send',
         'async function* sse',
         'function createClientCore',
@@ -158,6 +163,20 @@ describe('assembleInlineRuntime', () => {
       expect(out).not.toContain('resolveToken');
       expect(out).not.toContain('parseSseFrame');
     });
+
+    it('paginate', () => {
+      const out = assembleInlineRuntime({ ...NONE, paginate: true });
+      expect(out).toContain('function resolvePointer');
+      expect(out).toContain('async function* pages');
+      expect(out).toContain('async function* items');
+      expect(out).toContain(
+        'createClientCore<Ops, Id, Path, Tag>(operations, config, { paginate: { pages, items } })'
+      );
+      expect(out).not.toContain('toFormData');
+      expect(out).not.toContain('resolveToken');
+      expect(out).not.toContain('parseSseFrame');
+      expect(out).not.toContain('mergeSetup');
+    });
   });
 
   describe('embedded type surface', () => {
diff --git a/packages/client-generator/src/emitters/__tests__/package-client.test.ts b/packages/client-generator/src/emitters/__tests__/package-client.test.ts
index cb12818d6c..b2207528eb 100644
--- a/packages/client-generator/src/emitters/__tests__/package-client.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/package-client.test.ts
@@ -52,6 +52,29 @@ const streamEvents = operation({
   ],
 });
 const configureOp = operation({ name: 'configure', path: '/configure-op' });
+const listOrders = operation({
+  name: 'listOrders',
+  path: '/orders',
+  queryParams: [param('cursor', 'query'), param('limit', 'query')],
+  successResponses: [response({ schema: { kind: 'ref', name: 'OrderPage' } })],
+});
+const CURSOR_RULE = {
+  style: 'cursor' as const,
+  cursorParam: 'cursor',
+  nextCursor: '/nextCursor',
+  items: '/orders',
+};
+const ORDER_PAGE = namedSchema('OrderPage', {
+  kind: 'object',
+  properties: [
+    {
+      name: 'orders',
+      schema: { kind: 'array', items: { kind: 'ref', name: 'Order' } },
+      required: true,
+    },
+    { name: 'nextCursor', schema: SCALAR, required: false },
+  ],
+});
 
 const SCHEMAS = [
   namedSchema('Order', { kind: 'object', properties: [] }),
@@ -447,3 +470,93 @@ describe('emitClientSingleFile (embed arm)', () => {
     ).toMatchSnapshot();
   });
 });
+
+describe('emitClientSingleFile — pagination', () => {
+  const PAGINATED = modelWith([listOrders, getOrder], { schemas: [...SCHEMAS, ORDER_PAGE] });
+  const config = { operations: { listOrders: CURSOR_RULE } };
+
+  it('threads a config rule into the descriptor and the Ops item member (package arm)', () => {
+    const out = emit(PAGINATED, { pagination: config });
+    expect(out).toContain(
+      'pagination: { style: "cursor", param: "cursor", nextCursor: "/nextCursor", items: "/orders" }'
+    );
+    expect(out).toMatch(
+      /listOrders: \{\n\s+args: \{\n\s+params\?: ListOrdersParams;\n\s+\};\n\s+result: ListOrdersResult;\n\s+item: Order;\n\s+\};/
+    );
+  });
+
+  it('resolves the x-pagination extension without any config', () => {
+    const model = modelWith([{ ...listOrders, paginationExtension: CURSOR_RULE }, getOrder], {
+      schemas: [...SCHEMAS, ORDER_PAGE],
+    });
+    const out = emit(model);
+    expect(out).toContain('item: Order;');
+    expect(out).toContain('pagination: { style: "cursor", param: "cursor",');
+  });
+
+  it('wraps the flat sugar in Object.assign, preserving .pages/.items', () => {
+    const out = emit(PAGINATED, { pagination: config });
+    expect(out).toContain('export const listOrders = Object.assign((params: {');
+    expect(out).toContain(
+      '} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init), { pages: client.listOrders.pages, items: client.listOrders.items });'
+    );
+    // Non-paginated siblings keep the plain arrow.
+    expect(out).toContain('export const getOrder = (orderId: string, params: {');
+    expect(out).not.toContain('Object.assign((orderId');
+  });
+
+  it('grouped argsStyle needs no wrapper — properties ride along on the destructure', () => {
+    const out = emit(PAGINATED, { pagination: config, argsStyle: 'grouped' });
+    expect(out).toContain('export const { listOrders, getOrder } = client;');
+    expect(out).not.toContain('Object.assign');
+  });
+
+  it('embeds the paginate capability in inline mode only when a descriptor paginates', () => {
+    // A security-free model, so paginate is the ONLY capability in the factory wiring.
+    const model = modelWith([listOrders], { schemas: [SCHEMAS[0], ORDER_PAGE] });
+    const paginated = emitClientSingleFile(model, { pagination: config });
+    expect(paginated).toContain('async function* pages');
+    expect(paginated).toContain(
+      'createClientCore<Ops, Id, Path, Tag>(operations, config, { paginate: { pages, items } })'
+    );
+    const plain = emitClientSingleFile(model);
+    expect(plain).not.toContain('async function* pages');
+    expect(plain).toContain('createClientCore<Ops, Id, Path, Tag>(operations, config, {})');
+  });
+
+  it('throws one aggregated error for explicit rules that do not fit', () => {
+    const model = modelWith(
+      [
+        { ...listOrders, paginationExtension: { ...CURSOR_RULE, cursorParam: 'after' } },
+        {
+          ...listOrders,
+          name: 'listRefunds',
+          path: '/refunds',
+          paginationExtension: { ...CURSOR_RULE, items: '/refunds' },
+        },
+      ],
+      { schemas: [...SCHEMAS, ORDER_PAGE] }
+    );
+    expect(() => emitClientSingleFile(model)).toThrow(
+      'Invalid pagination configuration:\n' +
+        '  - Pagination for operation "listOrders" (x-pagination): ' +
+        'query parameter "after" is not declared on the operation\n' +
+        '  - Pagination for operation "listRefunds" (x-pagination): ' +
+        'the "items" pointer "/refunds" does not resolve in the success response schema'
+    );
+  });
+
+  it('matches the golden output for a paginated inline client', () => {
+    expect(emitClientSingleFile(PAGINATED, { pagination: config })).toMatchSnapshot();
+  });
+
+  it('matches the golden output for a paginated package client', () => {
+    expect(emit(PAGINATED, { pagination: config })).toMatchSnapshot();
+  });
+
+  it('matches the golden output for a result-mode paginated package client', () => {
+    // Result mode: the Ops entry gains `page` (the raw page `.pages()` yields) next to
+    // the envelope-wrapped `result`.
+    expect(emit(PAGINATED, { pagination: config, errorMode: 'result' })).toMatchSnapshot();
+  });
+});
diff --git a/packages/client-generator/src/emitters/__tests__/pagination.test.ts b/packages/client-generator/src/emitters/__tests__/pagination.test.ts
new file mode 100644
index 0000000000..d613573f92
--- /dev/null
+++ b/packages/client-generator/src/emitters/__tests__/pagination.test.ts
@@ -0,0 +1,588 @@
+import type {
+  ApiModel,
+  OperationModel,
+  SchemaModel,
+} from '../../intermediate-representation/model.js';
+import {
+  type PaginationRule,
+  resolveModelPagination,
+  resolveOperationPagination,
+  resolveSchemaPointer,
+} from '../pagination.js';
+import { apiModel, namedSchema, operation, param, response, SCALAR } from './fixtures.js';
+
+const ORDER: SchemaModel = {
+  kind: 'object',
+  properties: [{ name: 'id', schema: SCALAR, required: true }],
+};
+const ORDER_LIST: SchemaModel = { kind: 'array', items: { kind: 'ref', name: 'Order' } };
+/** A cursor page: `{ orders: Order[]; nextCursor?: string }`. */
+const ORDER_PAGE: SchemaModel = {
+  kind: 'object',
+  properties: [
+    { name: 'orders', schema: ORDER_LIST, required: true },
+    { name: 'nextCursor', schema: SCALAR, required: false },
+  ],
+};
+
+function modelWith(ops: OperationModel[], extra: Partial<ApiModel> = {}): ApiModel {
+  return apiModel({
+    services: [{ name: 'Default', operations: ops }],
+    schemas: [namedSchema('Order', ORDER), namedSchema('OrderPage', ORDER_PAGE)],
+    ...extra,
+  });
+}
+
+/** `GET /orders` returning an `OrderPage` ref, with the standard advance/limit params. */
+function listOrders(extra: Partial<OperationModel> = {}): OperationModel {
+  return operation({
+    name: 'listOrders',
+    path: '/orders',
+    queryParams: [
+      param('cursor', 'query'),
+      param('offset', 'query', false, { kind: 'scalar', scalar: 'integer' }),
+      param('page', 'query', false, { kind: 'scalar', scalar: 'number' }),
+      param('limit', 'query'),
+    ],
+    successResponses: [response({ schema: { kind: 'ref', name: 'OrderPage' } })],
+    ...extra,
+  });
+}
+
+const CURSOR_RULE: PaginationRule = {
+  style: 'cursor',
+  cursorParam: 'cursor',
+  nextCursor: '/nextCursor',
+  items: '/orders',
+};
+const OFFSET_RULE: PaginationRule = { style: 'offset', offsetParam: 'offset', items: '/orders' };
+const PAGE_RULE: PaginationRule = { style: 'page', offsetParam: 'page', items: '/orders' };
+
+describe('resolveSchemaPointer', () => {
+  const model = modelWith([]);
+
+  it('returns the (dereferenced) schema itself for the empty pointer', () => {
+    expect(resolveSchemaPointer({ kind: 'ref', name: 'Order' }, '', model)).toBe(ORDER);
+  });
+
+  it('returns undefined for a pointer that does not start with "/"', () => {
+    expect(resolveSchemaPointer(ORDER_PAGE, 'orders', model)).toBeUndefined();
+  });
+
+  it('walks object properties by name, resolving refs at each step', () => {
+    const root: SchemaModel = {
+      kind: 'object',
+      properties: [{ name: 'data', schema: { kind: 'ref', name: 'OrderPage' }, required: true }],
+    };
+    expect(resolveSchemaPointer(root, '/data/orders', model)).toBe(ORDER_LIST);
+  });
+
+  it('returns undefined for a missing property', () => {
+    expect(resolveSchemaPointer(ORDER_PAGE, '/missing', model)).toBeUndefined();
+  });
+
+  it('steps into a record value for any token', () => {
+    const root: SchemaModel = { kind: 'record', value: { kind: 'ref', name: 'Order' } };
+    expect(resolveSchemaPointer(root, '/anything', model)).toBe(ORDER);
+  });
+
+  it('steps into array items only for a numeric token', () => {
+    expect(resolveSchemaPointer(ORDER_LIST, '/0', model)).toBe(ORDER);
+    expect(resolveSchemaPointer(ORDER_LIST, '/12', model)).toBe(ORDER);
+    expect(resolveSchemaPointer(ORDER_LIST, '/first', model)).toBeUndefined();
+    expect(resolveSchemaPointer(ORDER_LIST, '/01', model)).toBeUndefined();
+  });
+
+  it('bails on unions and intersections (v1 is strict)', () => {
+    const union: SchemaModel = { kind: 'union', members: [ORDER_PAGE, { kind: 'null' }] };
+    expect(resolveSchemaPointer(union, '/orders', model)).toBeUndefined();
+    const intersection: SchemaModel = { kind: 'intersection', members: [ORDER_PAGE] };
+    expect(resolveSchemaPointer(intersection, '/orders', model)).toBeUndefined();
+  });
+
+  it('bails when a step lands on a scalar', () => {
+    expect(resolveSchemaPointer(ORDER_PAGE, '/nextCursor/deeper', model)).toBeUndefined();
+  });
+
+  it('follows a ref chain through the named schemas', () => {
+    const chained = modelWith([], {
+      schemas: [
+        namedSchema('A', { kind: 'ref', name: 'B' }),
+        namedSchema('B', ORDER_PAGE),
+        namedSchema('Order', ORDER),
+      ],
+    });
+    expect(resolveSchemaPointer({ kind: 'ref', name: 'A' }, '/orders', chained)).toBe(ORDER_LIST);
+  });
+
+  it('returns undefined for a ref cycle', () => {
+    const cyclic = modelWith([], {
+      schemas: [
+        namedSchema('A', { kind: 'ref', name: 'B' }),
+        namedSchema('B', { kind: 'ref', name: 'A' }),
+      ],
+    });
+    expect(resolveSchemaPointer({ kind: 'ref', name: 'A' }, '/x', cyclic)).toBeUndefined();
+  });
+
+  it('returns undefined for an unknown ref, at the root and mid-walk', () => {
+    expect(resolveSchemaPointer({ kind: 'ref', name: 'Ghost' }, '/x', model)).toBeUndefined();
+    const root: SchemaModel = {
+      kind: 'object',
+      properties: [{ name: 'data', schema: { kind: 'ref', name: 'Ghost' }, required: true }],
+    };
+    expect(resolveSchemaPointer(root, '/data/x', model)).toBeUndefined();
+  });
+
+  it('unescapes ~1 and ~0 tokens per RFC 6901', () => {
+    const root: SchemaModel = {
+      kind: 'object',
+      properties: [{ name: 'a/b~c', schema: ORDER_LIST, required: true }],
+    };
+    expect(resolveSchemaPointer(root, '/a~1b~0c', model)).toBe(ORDER_LIST);
+  });
+});
+
+describe('resolveOperationPagination — sources and precedence', () => {
+  it('resolves nothing when no source declares pagination', () => {
+    expect(resolveOperationPagination(listOrders(), modelWith([listOrders()]), undefined)).toEqual(
+      {}
+    );
+    expect(resolveOperationPagination(listOrders(), modelWith([listOrders()]), {})).toEqual({});
+  });
+
+  it('applies a per-operation config rule', () => {
+    const result = resolveOperationPagination(listOrders(), modelWith([listOrders()]), {
+      operations: { listOrders: CURSOR_RULE },
+    });
+    expect(result.error).toBeUndefined();
+    expect(result.spec).toEqual({
+      style: 'cursor',
+      param: 'cursor',
+      nextCursor: '/nextCursor',
+      items: '/orders',
+    });
+    expect(result.itemSchema).toEqual({ kind: 'ref', name: 'Order' });
+  });
+
+  it('applies the x-pagination extension when no per-op rule exists', () => {
+    const op = listOrders({ paginationExtension: OFFSET_RULE });
+    const result = resolveOperationPagination(op, modelWith([op]), undefined);
+    expect(result.spec).toEqual({ style: 'offset', param: 'offset', items: '/orders' });
+  });
+
+  it('applies the convention rule when config.style is set', () => {
+    const result = resolveOperationPagination(listOrders(), modelWith([listOrders()]), {
+      ...PAGE_RULE,
+      exclude: ['otherOp'],
+    });
+    expect(result.spec).toEqual({ style: 'page', param: 'page', items: '/orders' });
+  });
+
+  it('per-op config beats the extension, which beats the convention', () => {
+    const op = listOrders({ paginationExtension: OFFSET_RULE });
+    const model = modelWith([op]);
+    const perOpWins = resolveOperationPagination(op, model, {
+      ...PAGE_RULE,
+      operations: { listOrders: CURSOR_RULE },
+    });
+    expect(perOpWins.spec?.style).toBe('cursor');
+    const extensionWins = resolveOperationPagination(op, model, { ...PAGE_RULE });
+    expect(extensionWins.spec?.style).toBe('offset');
+  });
+
+  it('exclude kills every source for the operation', () => {
+    const op = listOrders({ paginationExtension: OFFSET_RULE });
+    const result = resolveOperationPagination(op, modelWith([op]), {
+      ...PAGE_RULE,
+      exclude: ['listOrders'],
+      operations: { listOrders: CURSOR_RULE },
+    });
+    expect(result).toEqual({});
+  });
+
+  it('carries limitParam into the spec when set', () => {
+    const result = resolveOperationPagination(listOrders(), modelWith([listOrders()]), {
+      operations: { listOrders: { ...OFFSET_RULE, limitParam: 'limit' } },
+    });
+    expect(result.spec).toEqual({
+      style: 'offset',
+      param: 'offset',
+      limitParam: 'limit',
+      items: '/orders',
+    });
+  });
+});
+
+describe('resolveOperationPagination — rule-shape validation (any source)', () => {
+  const model = () => modelWith([listOrders()]);
+
+  it.each([
+    ['a non-object rule', 'nonsense', 'the rule must be an object'],
+    [
+      'an unknown style',
+      { ...CURSOR_RULE, style: 'link' },
+      '"style" must be one of "cursor" | "offset" | "page" (got "link")',
+    ],
+    [
+      'a missing style',
+      { items: '/orders' },
+      '"style" must be one of "cursor" | "offset" | "page" (got undefined)',
+    ],
+    [
+      'missing items',
+      { style: 'cursor', cursorParam: 'cursor', nextCursor: '/nextCursor' },
+      '"items" must be a JSON pointer starting with "/"',
+    ],
+    [
+      'an items pointer without the leading slash',
+      { ...OFFSET_RULE, items: 'orders' },
+      '"items" must be a JSON pointer starting with "/"',
+    ],
+    [
+      'cursor style without cursorParam',
+      { style: 'cursor', nextCursor: '/nextCursor', items: '/orders' },
+      'cursor style requires a "cursorParam" query parameter name',
+    ],
+    [
+      'cursor style without nextCursor',
+      { style: 'cursor', cursorParam: 'cursor', items: '/orders' },
+      'cursor style requires a "nextCursor" JSON pointer starting with "/"',
+    ],
+    [
+      'a nextCursor pointer without the leading slash',
+      { ...CURSOR_RULE, nextCursor: 'nextCursor' },
+      'cursor style requires a "nextCursor" JSON pointer starting with "/"',
+    ],
+    [
+      'offset style without offsetParam',
+      { style: 'offset', items: '/orders' },
+      'offset style requires an "offsetParam" query parameter name',
+    ],
+    [
+      'page style with an empty offsetParam',
+      { style: 'page', offsetParam: '', items: '/orders' },
+      'page style requires an "offsetParam" query parameter name',
+    ],
+    [
+      'a non-string limitParam',
+      { ...OFFSET_RULE, limitParam: 25 },
+      '"limitParam" must be a query parameter name',
+    ],
+  ])('rejects %s from the extension with the x-pagination source', (_case, rule, problem) => {
+    const op = listOrders({ paginationExtension: rule });
+    const { spec, error } = resolveOperationPagination(op, model(), undefined);
+    expect(spec).toBeUndefined();
+    expect(error).toBe(`Pagination for operation "listOrders" (x-pagination): ${problem}`);
+  });
+
+  it('names the per-operation config source in shape errors', () => {
+    const { error } = resolveOperationPagination(listOrders(), model(), {
+      operations: { listOrders: { style: 'offset', items: '/orders' } as PaginationRule },
+    });
+    expect(error).toBe(
+      'Pagination for operation "listOrders" (pagination.operations["listOrders"]): ' +
+        'offset style requires an "offsetParam" query parameter name'
+    );
+  });
+
+  it('rejects a malformed convention too — a config bug, never silence', () => {
+    const { error } = resolveOperationPagination(listOrders(), model(), {
+      style: 'cursor',
+      items: '/orders',
+    });
+    expect(error).toBe(
+      'Pagination for operation "listOrders" (pagination convention): ' +
+        'cursor style requires a "cursorParam" query parameter name'
+    );
+  });
+});
+
+describe('resolveOperationPagination — fit verification', () => {
+  it.each([
+    [
+      'an advance param missing from the query params',
+      { ...CURSOR_RULE, cursorParam: 'after' },
+      'query parameter "after" is not declared on the operation',
+    ],
+    [
+      'an unresolvable items pointer',
+      { ...OFFSET_RULE, items: '/results' },
+      'the "items" pointer "/results" does not resolve in the success response schema',
+    ],
+    [
+      'an items pointer landing on a non-array',
+      { ...OFFSET_RULE, items: '/nextCursor' },
+      'the "items" pointer "/nextCursor" must point at an array (got scalar)',
+    ],
+    [
+      'an unresolvable nextCursor pointer',
+      { ...CURSOR_RULE, nextCursor: '/meta/next' },
+      'the "nextCursor" pointer "/meta/next" does not resolve in the success response schema',
+    ],
+  ])('explicit source: %s is an error', (_case, rule, problem) => {
+    const op = listOrders({ paginationExtension: rule });
+    const { spec, error } = resolveOperationPagination(op, modelWith([op]), undefined);
+    expect(spec).toBeUndefined();
+    expect(error).toBe(`Pagination for operation "listOrders" (x-pagination): ${problem}`);
+  });
+
+  it('convention that does not fit resolves to nothing, silently', () => {
+    const model = modelWith([listOrders()]);
+    for (const rule of [
+      { ...CURSOR_RULE, cursorParam: 'after' },
+      { ...OFFSET_RULE, items: '/results' },
+      { ...OFFSET_RULE, items: '/nextCursor' },
+      { ...CURSOR_RULE, nextCursor: '/meta/next' },
+    ]) {
+      expect(resolveOperationPagination(listOrders(), model, rule)).toEqual({});
+    }
+  });
+
+  it('requires a JSON success response', () => {
+    const op = listOrders({
+      paginationExtension: OFFSET_RULE,
+      successResponses: [response({ contentType: 'text/plain' })],
+    });
+    const { error } = resolveOperationPagination(op, modelWith([op]), undefined);
+    expect(error).toBe(
+      'Pagination for operation "listOrders" (x-pagination): ' +
+        'the operation has no JSON success response'
+    );
+    const conventionOnly = listOrders({
+      successResponses: [response({ contentType: 'text/plain' })],
+    });
+    expect(
+      resolveOperationPagination(conventionOnly, modelWith([conventionOnly]), { ...OFFSET_RULE })
+    ).toEqual({});
+  });
+
+  it('never paginates a Server-Sent Events operation (explicit source errors)', () => {
+    const sseOp = listOrders({
+      paginationExtension: OFFSET_RULE,
+      successResponses: [response({ contentType: 'text/event-stream' })],
+    });
+    const { error } = resolveOperationPagination(sseOp, modelWith([sseOp]), undefined);
+    expect(error).toBe(
+      'Pagination for operation "listOrders" (x-pagination): ' +
+        'the operation is a Server-Sent Events stream'
+    );
+    const conventionOnly = listOrders({
+      successResponses: [response({ contentType: 'text/event-stream' })],
+    });
+    expect(
+      resolveOperationPagination(conventionOnly, modelWith([conventionOnly]), OFFSET_RULE)
+    ).toEqual({});
+  });
+
+  it('resolves pointers over the JSON success response even when another response comes first', () => {
+    const op = listOrders({
+      paginationExtension: CURSOR_RULE,
+      successResponses: [
+        response({ contentType: 'text/plain' }),
+        response({ schema: { kind: 'ref', name: 'OrderPage' }, status: 200 }),
+      ],
+    });
+    const result = resolveOperationPagination(op, modelWith([op]), undefined);
+    expect(result.spec?.style).toBe('cursor');
+    expect(result.itemSchema).toEqual({ kind: 'ref', name: 'Order' });
+  });
+
+  describe('advance param schema fit', () => {
+    /** `listOrders` whose single query param carries the given schema. */
+    const withParamSchema = (name: string, schema: SchemaModel, rule: unknown): OperationModel =>
+      listOrders({ paginationExtension: rule, queryParams: [param(name, 'query', false, schema)] });
+
+    it.each<[string, PaginationRule, string, SchemaModel, string]>([
+      [
+        'a numeric cursor param',
+        CURSOR_RULE,
+        'cursor',
+        { kind: 'scalar', scalar: 'integer' },
+        'the "cursorParam" query parameter "cursor" must accept a string (got integer)',
+      ],
+      [
+        'an object cursor param',
+        CURSOR_RULE,
+        'cursor',
+        ORDER,
+        'the "cursorParam" query parameter "cursor" must accept a string (got object)',
+      ],
+      [
+        'a string offset param',
+        OFFSET_RULE,
+        'offset',
+        SCALAR,
+        'the "offsetParam" query parameter "offset" must accept a number (got string)',
+      ],
+      [
+        'a boolean offset param',
+        OFFSET_RULE,
+        'offset',
+        { kind: 'scalar', scalar: 'boolean' },
+        'the "offsetParam" query parameter "offset" must accept a number (got boolean)',
+      ],
+      [
+        'a numeric-enum page param (numbers must be plain scalars)',
+        PAGE_RULE,
+        'page',
+        { kind: 'enum', values: [1, 2], scalar: 'integer' },
+        'the "offsetParam" query parameter "page" must accept a number (got integer)',
+      ],
+      [
+        'an object page param',
+        PAGE_RULE,
+        'page',
+        ORDER,
+        'the "offsetParam" query parameter "page" must accept a number (got object)',
+      ],
+      [
+        'an unresolvable-ref offset param',
+        OFFSET_RULE,
+        'offset',
+        { kind: 'ref', name: 'Ghost' },
+        'the "offsetParam" query parameter "offset" must accept a number (got an unresolvable ref)',
+      ],
+    ])('explicit source: %s is an error', (_case, rule, name, schema, problem) => {
+      const op = withParamSchema(name, schema, rule);
+      const { spec, error } = resolveOperationPagination(op, modelWith([op]), undefined);
+      expect(spec).toBeUndefined();
+      expect(error).toBe(`Pagination for operation "listOrders" (x-pagination): ${problem}`);
+    });
+
+    it('convention with a misfitting advance param resolves to nothing, silently', () => {
+      for (const [rule, name, schema] of [
+        [CURSOR_RULE, 'cursor', { kind: 'scalar', scalar: 'integer' }],
+        [OFFSET_RULE, 'offset', SCALAR],
+        [PAGE_RULE, 'page', ORDER],
+      ] as Array<[PaginationRule, string, SchemaModel]>) {
+        const op = listOrders({ queryParams: [param(name, 'query', false, schema)] });
+        expect(resolveOperationPagination(op, modelWith([op]), rule)).toEqual({});
+      }
+    });
+
+    it('resolves the advance param schema through refs (string cursor, integer offset)', () => {
+      const schemas = [
+        namedSchema('Order', ORDER),
+        namedSchema('OrderPage', ORDER_PAGE),
+        namedSchema('Cursor', SCALAR),
+        namedSchema('Offset', { kind: 'scalar', scalar: 'integer' }),
+      ];
+      const cursorOp = withParamSchema('cursor', { kind: 'ref', name: 'Cursor' }, CURSOR_RULE);
+      expect(
+        resolveOperationPagination(cursorOp, modelWith([cursorOp], { schemas }), undefined).spec
+          ?.style
+      ).toBe('cursor');
+      const offsetOp = withParamSchema('offset', { kind: 'ref', name: 'Offset' }, OFFSET_RULE);
+      expect(
+        resolveOperationPagination(offsetOp, modelWith([offsetOp], { schemas }), undefined).spec
+          ?.style
+      ).toBe('offset');
+    });
+
+    it('tolerates a nullable string union on the cursor param (same predicate as nextCursor)', () => {
+      const op = withParamSchema(
+        'cursor',
+        { kind: 'union', members: [SCALAR, { kind: 'null' }] },
+        CURSOR_RULE
+      );
+      const result = resolveOperationPagination(op, modelWith([op]), undefined);
+      expect(result.error).toBeUndefined();
+      expect(result.spec?.param).toBe('cursor');
+    });
+  });
+
+  describe('nextCursor string-ish check', () => {
+    function cursorWith(nextCursorSchema: SchemaModel): {
+      op: OperationModel;
+      model: ApiModel;
+    } {
+      const page: SchemaModel = {
+        kind: 'object',
+        properties: [
+          { name: 'orders', schema: ORDER_LIST, required: true },
+          { name: 'nextCursor', schema: nextCursorSchema, required: false },
+        ],
+      };
+      const op = listOrders({
+        paginationExtension: CURSOR_RULE,
+        successResponses: [response({ schema: page })],
+      });
+      return { op, model: modelWith([op]) };
+    }
+
+    it.each<[string, SchemaModel]>([
+      ['a string scalar', SCALAR],
+      ['a string enum', { kind: 'enum', values: ['a', 'b'], scalar: 'string' }],
+      ['a string literal', { kind: 'literal', value: 'next' }],
+      ['a nullable string union', { kind: 'union', members: [SCALAR, { kind: 'null' }] }],
+      [
+        'a nullable string union through a ref',
+        { kind: 'union', members: [{ kind: 'ref', name: 'Cursor' }, { kind: 'null' }] },
+      ],
+    ])('accepts %s', (_label, schema) => {
+      const { op } = cursorWith(schema);
+      const model = modelWith([op], {
+        schemas: [namedSchema('Order', ORDER), namedSchema('Cursor', SCALAR)],
+      });
+      const result = resolveOperationPagination(op, model, undefined);
+      expect(result.error).toBeUndefined();
+      expect(result.spec?.nextCursor).toBe('/nextCursor');
+    });
+
+    it.each<[string, SchemaModel]>([
+      ['a number scalar', { kind: 'scalar', scalar: 'number' }],
+      ['a numeric enum', { kind: 'enum', values: [1, 2], scalar: 'number' }],
+      ['a numeric literal', { kind: 'literal', value: 7 }],
+      ['an object', ORDER],
+      ['a union with a non-string member', { kind: 'union', members: [SCALAR, ORDER] }],
+      [
+        'a union nesting another union',
+        { kind: 'union', members: [{ kind: 'union', members: [SCALAR] }, { kind: 'null' }] },
+      ],
+      [
+        'a union whose member ref is unresolvable',
+        { kind: 'union', members: [{ kind: 'ref', name: 'Ghost' }, { kind: 'null' }] },
+      ],
+    ])('rejects %s', (_label, schema) => {
+      const { op, model } = cursorWith(schema);
+      const { error } = resolveOperationPagination(op, model, undefined);
+      expect(error).toContain('the "nextCursor" pointer "/nextCursor" must point at a string');
+    });
+  });
+});
+
+describe('resolveModelPagination', () => {
+  it('maps only the operations that resolve, keyed by operation name', () => {
+    const paginated = listOrders({ paginationExtension: CURSOR_RULE });
+    const plain = operation({ name: 'getOrder', path: '/orders/{id}' });
+    const map = resolveModelPagination(modelWith([paginated, plain]), undefined);
+    expect([...map.keys()]).toEqual(['listOrders']);
+    expect(map.get('listOrders')).toEqual({
+      spec: { style: 'cursor', param: 'cursor', nextCursor: '/nextCursor', items: '/orders' },
+      itemSchema: { kind: 'ref', name: 'Order' },
+    });
+  });
+
+  it('aggregates every error into one throw, listing each operation', () => {
+    const bad1 = listOrders({
+      name: 'listOrders',
+      paginationExtension: { ...CURSOR_RULE, cursorParam: 'after' },
+    });
+    const bad2 = listOrders({
+      name: 'listRefunds',
+      paginationExtension: { style: 'nope' },
+    });
+    expect(() => resolveModelPagination(modelWith([bad1, bad2]), undefined)).toThrow(
+      'Invalid pagination configuration:\n' +
+        '  - Pagination for operation "listOrders" (x-pagination): ' +
+        'query parameter "after" is not declared on the operation\n' +
+        '  - Pagination for operation "listRefunds" (x-pagination): ' +
+        '"style" must be one of "cursor" | "offset" | "page" (got "nope")'
+    );
+  });
+
+  it('returns an empty map for a model with no pagination anywhere', () => {
+    expect(resolveModelPagination(modelWith([listOrders()]), undefined).size).toBe(0);
+  });
+});
diff --git a/packages/client-generator/src/emitters/client.ts b/packages/client-generator/src/emitters/client.ts
index 5a63a00a81..e9b8c6d063 100644
--- a/packages/client-generator/src/emitters/client.ts
+++ b/packages/client-generator/src/emitters/client.ts
@@ -1,5 +1,6 @@
 import type { ApiModel } from '../intermediate-representation/model.js';
 import type { ArgsStyle } from './operations.js';
+import type { PaginationConfig } from './pagination.js';
 import { splitLines } from './support.js';
 import { escapeJsDoc } from './ts.js';
 import type { DateType, EnumStyle } from './types.js';
@@ -60,6 +61,12 @@ export type EmitOptions = {
   setup?: string;
   /** Runtime distribution: 'inline' (default, self-contained) | 'package' (imports @redocly/client-generator). */
   runtime?: 'inline' | 'package';
+  /**
+   * Auto-pagination rules (a convention rule + per-operation overrides + `exclude`),
+   * resolved together with each operation's `x-pagination` extension. Verified
+   * statically: an explicit rule that doesn't fit its operation fails generation.
+   */
+  pagination?: PaginationConfig;
 };
 
 /**
diff --git a/packages/client-generator/src/emitters/descriptor.ts b/packages/client-generator/src/emitters/descriptor.ts
index 8e47b1b407..77d8d88b42 100644
--- a/packages/client-generator/src/emitters/descriptor.ts
+++ b/packages/client-generator/src/emitters/descriptor.ts
@@ -16,10 +16,11 @@ import { variablesTypeLiteral } from './operation-aliases.js';
 import { operationSignature } from './operation-signature.js';
 import { computeResponse, errorTypeNodes, isTypedMultipart } from './operation-types.js';
 import type { EmitContext } from './operations.js';
+import type { ModelPagination } from './pagination.js';
 import { isSseOp, sseDataKind, sseEventType } from './sse.js';
 import { pascalCase } from './support.js';
 import { jsdoc, parseStatements, ts } from './ts.js';
-import type { DateType } from './types.js';
+import { type DateType, schemaToTypeNode } from './types.js';
 
 const { factory } = ts;
 
@@ -84,7 +85,12 @@ export function literalExpr(value: unknown): ts.Expression {
 }
 
 /** One operation's OperationDescriptor as plain data (only non-default fields present). */
-function descriptorValue(op: OperationModel, schemes: SecuritySchemeModel[], dateType: DateType) {
+function descriptorValue(
+  op: OperationModel,
+  schemes: SecuritySchemeModel[],
+  dateType: DateType,
+  pagination?: ModelPagination
+) {
   const params = [...op.pathParams, ...op.queryParams, ...op.headerParams].map((p) => ({
     name: p.name,
     in: p.in,
@@ -125,6 +131,8 @@ function descriptorValue(op: OperationModel, schemes: SecuritySchemeModel[], dat
     ...(responseKind !== 'json' ? { responseKind } : {}),
     ...(sse ? { sseDataKind: sseDataKind(op) } : {}),
     ...(security.length > 0 ? { security } : {}),
+    // The resolved spec is already normalized with stable key order (see pagination.ts).
+    ...(pagination?.has(op.name) ? { pagination: pagination.get(op.name)!.spec } : {}),
   };
 }
 
@@ -132,14 +140,15 @@ function descriptorValue(op: OperationModel, schemes: SecuritySchemeModel[], dat
 export function descriptorStatements(
   model: ApiModel,
   idents: Map<string, string>,
-  dateType: DateType
+  dateType: DateType,
+  pagination?: ModelPagination
 ): ts.Statement[] {
   const ops = allOperations(model.services);
   if (ops.length === 0) return [];
   const entries = ops.map((op) =>
     factory.createPropertyAssignment(
       idents.get(op.name)!,
-      literalExpr(descriptorValue(op, model.securitySchemes, dateType))
+      literalExpr(descriptorValue(op, model.securitySchemes, dateType, pagination))
     )
   );
   const operations = jsdoc(
@@ -227,6 +236,27 @@ function opsMember(op: OperationModel, ident: string, ctx: EmitContext): ts.Prop
     factory.createPropertySignature(undefined, 'args', undefined, args),
     factory.createPropertySignature(undefined, 'result', undefined, resultType(op, ctx)),
   ];
+  // Paginated operations declare the page's element type — it drives the runtime's
+  // `.pages()`/`.items()` members on the method (`Client<Ops>` keys off `item`).
+  const paginated = ctx.pagination?.get(op.name);
+  if (paginated) {
+    members.push(
+      factory.createPropertySignature(
+        undefined,
+        'item',
+        undefined,
+        schemaToTypeNode(paginated.itemSchema, ctx.dateType)
+      )
+    );
+    // Result mode wraps `result` in the envelope, but iteration unwraps it — `page`
+    // carries the RAW page type `.pages()` yields. Throw mode emits no `page` member
+    // (`Client<Ops>`'s pages-generator falls back to `result`, already the raw page).
+    if (ctx.errorMode === 'result') {
+      members.push(
+        factory.createPropertySignature(undefined, 'page', undefined, rawResultRef(op, ctx))
+      );
+    }
+  }
   if (isSseOp(op)) {
     members.push(
       factory.createPropertySignature(
@@ -245,16 +275,23 @@ function opsMember(op: OperationModel, ident: string, ctx: EmitContext): ts.Prop
   );
 }
 
-/** The `result` slot: SSE event payload, or the response type — `Result`-wrapped in result mode. */
-function resultType(op: OperationModel, ctx: EmitContext): ts.TypeNode {
-  if (isSseOp(op)) return sseEventType(op, ctx.dateType);
+/**
+ * The raw success-response reference — the same suppression rule as
+ * renderOperationParts: the emitted `<Op>Result` alias, or the inline response type
+ * when that name collides with a schema.
+ */
+function rawResultRef(op: OperationModel, ctx: EmitContext): ts.TypeNode {
   const { responseType } = computeResponse(op.successResponses, ctx.dateType);
-  // Same suppression rule as renderOperationParts: reference the emitted `<Op>Result`
-  // alias, or inline the response type when that name collides with a schema.
   const resultName = `${pascalCase(op.name)}Result`;
-  const resultRef = ctx.schemaNames.has(resultName)
+  return ctx.schemaNames.has(resultName)
     ? responseType
     : factory.createTypeReferenceNode(resultName);
+}
+
+/** The `result` slot: SSE event payload, or the response type — `Result`-wrapped in result mode. */
+function resultType(op: OperationModel, ctx: EmitContext): ts.TypeNode {
+  if (isSseOp(op)) return sseEventType(op, ctx.dateType);
+  const resultRef = rawResultRef(op, ctx);
   if (ctx.errorMode !== 'result') return resultRef;
   return factory.createTypeReferenceNode('Result', [resultRef, errorTypeArg(op, ctx)]);
 }
diff --git a/packages/client-generator/src/emitters/inline-runtime.ts b/packages/client-generator/src/emitters/inline-runtime.ts
index 36e5548a64..6ac919a54d 100644
--- a/packages/client-generator/src/emitters/inline-runtime.ts
+++ b/packages/client-generator/src/emitters/inline-runtime.ts
@@ -13,6 +13,7 @@ export type InlineRuntimeNeeds = {
   auth: boolean;
   sse: boolean;
   setup: boolean;
+  paginate: boolean;
 };
 
 const HEADER =
@@ -36,6 +37,9 @@ export function assembleInlineRuntime(needs: InlineRuntimeNeeds): string {
   if (needs.multipart) modules.push('multipart.ts');
   if (needs.auth) modules.push('auth.ts');
   if (needs.setup) modules.push('setup.ts');
+  // paginate.ts has only type imports (types.ts + create-client.ts's OperationArgs),
+  // so it can sit anywhere; keep it with the other capability modules, before send.ts.
+  if (needs.paginate) modules.push('paginate.ts');
   modules.push('send.ts');
   if (needs.sse) modules.push('sse.ts');
   modules.push('create-client.ts');
@@ -78,6 +82,7 @@ function clientFactory(needs: InlineRuntimeNeeds): string {
     ...(needs.multipart ? ['serializeMultipart: toFormData'] : []),
     ...(needs.auth ? ['resolveAuth'] : []),
     ...(needs.sse ? ['sse'] : []),
+    ...(needs.paginate ? ['paginate: { pages, items }'] : []),
   ];
   const wired = caps.length > 0 ? `{ ${caps.join(', ')} }` : '{}';
   return `/**
diff --git a/packages/client-generator/src/emitters/operations.ts b/packages/client-generator/src/emitters/operations.ts
index 2c867114c3..8f92506ac1 100644
--- a/packages/client-generator/src/emitters/operations.ts
+++ b/packages/client-generator/src/emitters/operations.ts
@@ -1,5 +1,6 @@
 import type { OperationModel, ParamModel } from '../intermediate-representation/model.js';
 import { bodyTypeNode, renderParamsObjectArg, simpleParam } from './operation-types.js';
+import type { ModelPagination } from './pagination.js';
 import { isSseOp } from './sse.js';
 import { ts } from './ts.js';
 import { type DateType, schemaToTypeNode } from './types.js';
@@ -34,6 +35,8 @@ export type EmitContext = {
   queryAuthKeys: Set<string>;
   /** Names of every exported schema, used for `<Op>*` alias collision suppression. */
   schemaNames: Set<string>;
+  /** Resolved auto-pagination per operation name (absent ⇒ nothing paginates). */
+  pagination?: ModelPagination;
 };
 
 /**
diff --git a/packages/client-generator/src/emitters/package-client.ts b/packages/client-generator/src/emitters/package-client.ts
index a930600be3..9e6e8a4885 100644
--- a/packages/client-generator/src/emitters/package-client.ts
+++ b/packages/client-generator/src/emitters/package-client.ts
@@ -24,6 +24,7 @@ import { renderOperationAliases, sseAliases } from './operation-aliases.js';
 import { operationSignature } from './operation-signature.js';
 import { computeResponse, errorTypeNodes, isTypedMultipart } from './operation-types.js';
 import { type EmitContext, renderArgList } from './operations.js';
+import { resolveModelPagination } from './pagination.js';
 import { isSseOp } from './sse.js';
 import { pascalCase } from './support.js';
 import {
@@ -80,6 +81,9 @@ function emitClient(
   const embed = options.runtime !== 'package';
   const ops = allOperations(model.services);
   const idents = packageIdents(model);
+  // Resolved (and VERIFIED) up front: an explicit rule that doesn't fit throws here,
+  // before any statement is built — one aggregated error for the whole model.
+  const pagination = resolveModelPagination(model, options.pagination);
   const ctx: EmitContext = {
     argsStyle: options.argsStyle ?? 'flat',
     errorMode: options.errorMode ?? 'throw',
@@ -88,6 +92,7 @@ function emitClient(
       model.securitySchemes.filter((s) => s.kind === 'apiKeyQuery').map((s) => s.key)
     ),
     schemaNames: new Set(model.schemas.map((s) => s.name)),
+    pagination,
   };
   const flat = ctx.argsStyle === 'flat';
   const hasSse = ops.some(isSseOp);
@@ -100,7 +105,7 @@ function emitClient(
     ops.length > 0
       ? [
           ...opsInterfaceStatements(model, idents, ctx),
-          ...descriptorStatements(model, idents, ctx.dateType),
+          ...descriptorStatements(model, idents, ctx.dateType, pagination),
         ]
       : // A spec with no operations still gets the uniform wiring shape.
         parseStatements(
@@ -116,6 +121,7 @@ function emitClient(
         auth: model.securitySchemes.length > 0 || ops.some((op) => op.security.length > 0),
         sse: hasSse,
         setup: !!options.setup,
+        paginate: pagination.size > 0,
       })
     : importLine(options, ctx, {
         hasFlatSse: hasSse && flat,
@@ -317,6 +323,8 @@ function sugarStatements(
  * method. Path values are keyed by the WIRE name (the runtime routes
  * `args[param.name]`); a path param literally named `params`/`body`/`headers` would
  * collide with the slot keys — a spec-acknowledged runtime-contract limitation.
+ * A paginated operation's arrow is wrapped in `Object.assign(…, { pages, items })`
+ * so the flat sugar preserves the method-attached iterators.
  */
 function flatSugarStatement(op: OperationModel, ident: string, ctx: EmitContext): ts.Statement {
   const { pathParams } = operationSignature(op);
@@ -344,7 +352,30 @@ function flatSugarStatement(op: OperationModel, ident: string, ctx: EmitContext)
     undefined,
     [factory.createObjectLiteralExpression(props, false), factory.createIdentifier('init')]
   );
-  return exportConstStatement(ident, arrow(params, call));
+  const fn = arrow(params, call);
+  if (!ctx.pagination?.has(op.name)) return exportConstStatement(ident, fn);
+  const methodMember = (name: string) =>
+    factory.createPropertyAssignment(
+      name,
+      factory.createPropertyAccessExpression(
+        factory.createPropertyAccessExpression(factory.createIdentifier('client'), ident),
+        name
+      )
+    );
+  return exportConstStatement(
+    ident,
+    factory.createCallExpression(
+      factory.createPropertyAccessExpression(factory.createIdentifier('Object'), 'assign'),
+      undefined,
+      [
+        fn,
+        factory.createObjectLiteralExpression(
+          [methodMember('pages'), methodMember('items')],
+          false
+        ),
+      ]
+    )
+  );
 }
 
 /** Public type surface re-exported for single-import DX (plus the `ApiError` class). */
diff --git a/packages/client-generator/src/emitters/pagination.ts b/packages/client-generator/src/emitters/pagination.ts
new file mode 100644
index 0000000000..b36070f9d6
--- /dev/null
+++ b/packages/client-generator/src/emitters/pagination.ts
@@ -0,0 +1,297 @@
+// Auto-pagination resolution: turns config rules and `x-pagination` extensions into the
+// normalized descriptor `PaginationSpec`, statically VERIFYING each rule fits its
+// operation (the advance param is a declared query param whose schema fits the style —
+// string-ish for `cursor`, a numeric scalar for `offset`/`page`; the JSON pointers
+// resolve over the success response schema). A convention rule that doesn't fit silently skips the
+// operation; an explicit rule (per-op config or extension) that doesn't fit — and a
+// malformed rule from ANY source — is a generate-time error. No heuristics, ever.
+
+import { isPlainObject } from '@redocly/openapi-core';
+
+import type {
+  ApiModel,
+  OperationModel,
+  SchemaModel,
+} from '../intermediate-representation/model.js';
+import type { PaginationSpec } from '../runtime/types.js';
+import { allOperations } from '../writers/util.js';
+import { isSseOp } from './sse.js';
+
+/** The pagination styles the generated runtime can drive. */
+export type PaginationStyle = 'cursor' | 'offset' | 'page';
+
+/**
+ * One user-facing pagination rule — the shared shape of the `x-pagination` operation
+ * extension and every `pagination` config rule. `nextCursor` and `items` are RFC 6901
+ * JSON pointers (starting with `/`) into the operation's success response.
+ */
+export type PaginationRule = {
+  /** `cursor` follows a response cursor; `offset`/`page` increment a numeric param. */
+  style: PaginationStyle;
+  /** Cursor style: the request query param that receives the cursor. */
+  cursorParam?: string;
+  /** Cursor style: JSON pointer to the next cursor in the response. */
+  nextCursor?: string;
+  /** Offset/page styles: the request query param the iterator advances. */
+  offsetParam?: string;
+  /** Optional page-size query param (any style; recorded for tooling). */
+  limitParam?: string;
+  /** JSON pointer to the page's item array in the response. */
+  items: string;
+};
+
+/**
+ * The `pagination` config block: an optional convention rule (the top-level rule
+ * fields, applied to every operation it structurally fits when `style` is set), plus
+ * per-operation overrides and exclusions. Precedence per operation:
+ * `operations[id]` > the spec's `x-pagination` extension > the convention rule.
+ */
+export type PaginationConfig = Partial<PaginationRule> & {
+  /** operationIds no source may paginate. */
+  exclude?: string[];
+  /** Per-operation rules, keyed by operationId (beat `x-pagination` and the convention). */
+  operations?: Record<string, PaginationRule>;
+};
+
+/** One operation's resolution: the normalized spec + item element schema, or an error. */
+export type ResolvedPagination = {
+  spec?: PaginationSpec;
+  itemSchema?: SchemaModel;
+  error?: string;
+};
+
+/** Every paginated operation's spec + item schema, keyed by operation name. */
+export type ModelPagination = Map<string, { spec: PaginationSpec; itemSchema: SchemaModel }>;
+
+/**
+ * Resolve one operation's pagination across the three sources (per-op config >
+ * `x-pagination` > convention); `config.exclude` kills all of them. Returns the
+ * normalized spec + the item element schema, `{}` when the operation doesn't paginate
+ * (no source, or a convention that doesn't fit), or an `error` for a malformed rule
+ * (any source) and for an explicit rule that doesn't fit the operation.
+ */
+export function resolveOperationPagination(
+  op: OperationModel,
+  model: ApiModel,
+  config: PaginationConfig | undefined
+): ResolvedPagination {
+  if (config?.exclude?.includes(op.name)) return {};
+  const perOp = config?.operations?.[op.name];
+  if (perOp !== undefined) {
+    return applyRule(op, model, perOp, `pagination.operations["${op.name}"]`, true);
+  }
+  if (op.paginationExtension !== undefined) {
+    return applyRule(op, model, op.paginationExtension, 'x-pagination', true);
+  }
+  if (config?.style !== undefined) {
+    const { exclude: _exclude, operations: _operations, ...convention } = config;
+    return applyRule(op, model, convention, 'pagination convention', false);
+  }
+  return {};
+}
+
+/**
+ * Resolve pagination for every operation of the model. Errors (malformed rules,
+ * explicit rules that don't fit) are aggregated into ONE throw listing every
+ * failing operation, so a generate run reports the whole problem set at once.
+ */
+export function resolveModelPagination(
+  model: ApiModel,
+  config: PaginationConfig | undefined
+): ModelPagination {
+  const resolved: ModelPagination = new Map();
+  const errors: string[] = [];
+  for (const op of allOperations(model.services)) {
+    const result = resolveOperationPagination(op, model, config);
+    if (result.error !== undefined) errors.push(result.error);
+    else if (result.spec !== undefined) {
+      resolved.set(op.name, { spec: result.spec, itemSchema: result.itemSchema! });
+    }
+  }
+  if (errors.length > 0) {
+    throw new Error(['Invalid pagination configuration:', ...errors].join('\n  - '));
+  }
+  return resolved;
+}
+
+/** Validate the rule's shape and fit, then normalize it into a descriptor spec. */
+function applyRule(
+  op: OperationModel,
+  model: ApiModel,
+  rule: unknown,
+  source: string,
+  explicit: boolean
+): ResolvedPagination {
+  const label = `Pagination for operation "${op.name}" (${source})`;
+  // Shape problems are errors from EVERY source — a malformed convention is a config bug.
+  const shapeProblem = ruleShapeProblem(rule);
+  if (shapeProblem !== undefined) return { error: `${label}: ${shapeProblem}` };
+  const valid = rule as PaginationRule;
+  // Fit problems: explicit declarations fail generation; a convention silently skips.
+  const misfit = (problem: string): ResolvedPagination =>
+    explicit ? { error: `${label}: ${problem}` } : {};
+
+  if (isSseOp(op)) return misfit('the operation is a Server-Sent Events stream');
+  const paramField = valid.style === 'cursor' ? 'cursorParam' : 'offsetParam';
+  const param = valid.style === 'cursor' ? valid.cursorParam! : valid.offsetParam!;
+  const advance = op.queryParams.find((p) => p.name === param);
+  if (!advance) {
+    return misfit(`query parameter "${param}" is not declared on the operation`);
+  }
+  // The advance param must accept what the runtime sends: the response's cursor
+  // (string-ish, same predicate as nextCursor) or the incremented number.
+  const advanceSchema = deref(advance.schema, model);
+  const advanceFits =
+    advanceSchema !== undefined &&
+    (valid.style === 'cursor'
+      ? isStringish(advanceSchema, model)
+      : advanceSchema.kind === 'scalar' &&
+        (advanceSchema.scalar === 'number' || advanceSchema.scalar === 'integer'));
+  if (!advanceFits) {
+    const expected = valid.style === 'cursor' ? 'a string' : 'a number';
+    return misfit(
+      `the "${paramField}" query parameter "${param}" must accept ${expected} (got ${describeSchema(advanceSchema)})`
+    );
+  }
+  // The page the pointers address is the operation's primary JSON success response —
+  // the same response `computeResponse` types (JSON preferred over other content types).
+  const page = op.successResponses.find((r) => r.contentType.toLowerCase().includes('json'));
+  if (!page) return misfit('the operation has no JSON success response');
+  const itemsTarget = resolveSchemaPointer(page.schema, valid.items, model);
+  if (itemsTarget === undefined) {
+    return misfit(
+      `the "items" pointer "${valid.items}" does not resolve in the success response schema`
+    );
+  }
+  if (itemsTarget.kind !== 'array') {
+    return misfit(
+      `the "items" pointer "${valid.items}" must point at an array (got ${itemsTarget.kind})`
+    );
+  }
+  if (valid.style === 'cursor') {
+    const cursorTarget = resolveSchemaPointer(page.schema, valid.nextCursor!, model);
+    if (cursorTarget === undefined) {
+      return misfit(
+        `the "nextCursor" pointer "${valid.nextCursor}" does not resolve in the success response schema`
+      );
+    }
+    if (!isStringish(cursorTarget, model)) {
+      return misfit(
+        `the "nextCursor" pointer "${valid.nextCursor}" must point at a string (got ${cursorTarget.kind})`
+      );
+    }
+  }
+  return {
+    spec: {
+      style: valid.style,
+      param,
+      ...(valid.limitParam !== undefined ? { limitParam: valid.limitParam } : {}),
+      ...(valid.style === 'cursor' ? { nextCursor: valid.nextCursor! } : {}),
+      items: valid.items,
+    },
+    itemSchema: itemsTarget.items,
+  };
+}
+
+/**
+ * The rule's structural problem, or `undefined` when it is a well-formed
+ * `PaginationRule`. Works over `unknown` — the extension is arbitrary spec data and
+ * config arrives from YAML, so both are checked field-by-field.
+ */
+function ruleShapeProblem(rule: unknown): string | undefined {
+  if (!isPlainObject(rule)) return 'the rule must be an object';
+  const { style, cursorParam, nextCursor, offsetParam, limitParam, items } = rule;
+  if (style !== 'cursor' && style !== 'offset' && style !== 'page') {
+    return `"style" must be one of "cursor" | "offset" | "page" (got ${JSON.stringify(style)})`;
+  }
+  if (typeof items !== 'string' || !items.startsWith('/')) {
+    return '"items" must be a JSON pointer starting with "/"';
+  }
+  if (style === 'cursor') {
+    if (typeof cursorParam !== 'string' || cursorParam === '') {
+      return 'cursor style requires a "cursorParam" query parameter name';
+    }
+    if (typeof nextCursor !== 'string' || !nextCursor.startsWith('/')) {
+      return 'cursor style requires a "nextCursor" JSON pointer starting with "/"';
+    }
+  } else if (typeof offsetParam !== 'string' || offsetParam === '') {
+    return `${style} style requires an "offsetParam" query parameter name`;
+  }
+  if (limitParam !== undefined && typeof limitParam !== 'string') {
+    return '"limitParam" must be a query parameter name';
+  }
+  return undefined;
+}
+
+/**
+ * Resolve an RFC 6901 JSON pointer (`~1` → `/`, `~0` → `~`) over a schema, walking the
+ * VALUE shape it describes: object property steps by name, record values for any token,
+ * array items for numeric tokens, with `ref` steps resolved through the model's named
+ * schemas (cycle-guarded). Unions and intersections bail (v1 is strict). Returns
+ * `undefined` on any miss — the caller decides whether that is an error.
+ */
+export function resolveSchemaPointer(
+  schema: SchemaModel,
+  pointer: string,
+  model: ApiModel
+): SchemaModel | undefined {
+  let current = deref(schema, model);
+  if (current === undefined || (pointer !== '' && !pointer.startsWith('/'))) return undefined;
+  if (pointer === '') return current;
+  for (const token of pointer.slice(1).split('/')) {
+    const key = token.replaceAll('~1', '/').replaceAll('~0', '~');
+    let next: SchemaModel | undefined;
+    if (current.kind === 'object') {
+      next = current.properties.find((p) => p.name === key)?.schema;
+    } else if (current.kind === 'record') {
+      next = current.value;
+    } else if (current.kind === 'array' && /^(0|[1-9]\d*)$/.test(key)) {
+      next = current.items;
+    }
+    if (next === undefined) return undefined;
+    current = deref(next, model);
+    if (current === undefined) return undefined;
+  }
+  return current;
+}
+
+/** A (dereferenced) schema named for a fit-error message; scalars/enums by their scalar. */
+function describeSchema(schema: SchemaModel | undefined): string {
+  if (schema === undefined) return 'an unresolvable ref';
+  return schema.kind === 'scalar' || schema.kind === 'enum' ? schema.scalar : schema.kind;
+}
+
+/** Follow a `ref` chain through the model's named schemas; `undefined` on a miss or cycle. */
+function deref(schema: SchemaModel, model: ApiModel): SchemaModel | undefined {
+  const seen = new Set<string>();
+  let current = schema;
+  while (current.kind === 'ref') {
+    const { name } = current;
+    if (seen.has(name)) return undefined;
+    seen.add(name);
+    const named = model.schemas.find((s) => s.name === name);
+    if (named === undefined) return undefined;
+    current = named.schema;
+  }
+  return current;
+}
+
+/**
+ * Whether a (dereferenced) schema is string-ish per the cursor contract: a string
+ * scalar, an enum of strings, or a literal string — nullable ok (a union whose members
+ * are `null` or string-ish leaves; nested unions stay out, v1 is strict).
+ */
+function isStringish(schema: SchemaModel, model: ApiModel): boolean {
+  if (schema.kind === 'scalar' || schema.kind === 'enum') return schema.scalar === 'string';
+  if (schema.kind === 'literal') return typeof schema.value === 'string';
+  if (schema.kind === 'union') {
+    return schema.members.every((member) => {
+      const resolved = deref(member, model);
+      return (
+        resolved !== undefined &&
+        (resolved.kind === 'null' || (resolved.kind !== 'union' && isStringish(resolved, model)))
+      );
+    });
+  }
+  return false;
+}
diff --git a/packages/client-generator/src/emitters/runtime-sources.ts b/packages/client-generator/src/emitters/runtime-sources.ts
index 46ac612f94..a5048a265c 100644
--- a/packages/client-generator/src/emitters/runtime-sources.ts
+++ b/packages/client-generator/src/emitters/runtime-sources.ts
@@ -1,7 +1,7 @@
 // GENERATED by scripts/generate-runtime-sources.mjs — do not edit. Regenerated on install (`prepare`) and on commit (lint-staged); manually: `npm run prepare -w @redocly/client-generator`.
 export const RUNTIME_SOURCES = {
   'types.ts':
-    "/**\n * The public type surface of the client runtime — `@redocly/client-generator`'s\n * app-facing runtime module. Pure types, no runtime code (excluded from coverage).\n * The generator emits `OPERATIONS` literals typed\n * `satisfies Record<string, OperationDescriptor>` against this module, so an\n * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).\n */\n\n/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */\nexport type ParamSpec = {\n  name: string;\n  in: 'path' | 'query' | 'header';\n  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';\n  explode?: boolean;\n  allowReserved?: boolean;\n};\n\n/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */\nexport type SecuritySpec =\n  | { scheme: string; kind: 'bearer' | 'basic' }\n  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };\n\n/** The frozen data contract between generated code and the runtime: one operation's wire shape. */\nexport type OperationDescriptor = {\n  id: string;\n  method: string;\n  path: string;\n  tags?: readonly string[];\n  params?: readonly ParamSpec[];\n  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */\n  body?: { contentType: string; multipart?: boolean };\n  /** Defaults to `'json'` (content-type negotiation on parse). */\n  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';\n  sseDataKind?: 'json' | 'text';\n  security?: readonly SecuritySpec[];\n};\n\n/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */\nexport type QueryValue =\n  | string\n  | number\n  | boolean\n  | null\n  | undefined\n  | Array<string | number | boolean | null | undefined>\n  | Record<string, unknown>;\n\n/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */\nexport type TokenProvider = string | (() => string | Promise<string>);\n\n/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */\nexport type AuthCredentials = {\n  bearer?: TokenProvider;\n  basic?: { username: string; password: string };\n  apiKey?: Record<string, TokenProvider>;\n};\n\n/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */\nexport type RetryStrategy = 'fixed' | 'exponential';\n\n/**\n * The operation's identity, exposed to middleware for targeting (`ctx.operation`).\n * Generated clients instantiate the type parameters with the spec's literal unions\n * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a\n * middleware comparison fails to compile; the string defaults keep every\n * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working\n * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types\n * (byte-locked to generated output) remain assignable through middleware callbacks.\n */\nexport type OperationContext<\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n> = { id: Id; path: Path; tags: Tag[] };\n\n/** The mutable request context threaded through the middleware chain. */\nexport type RequestContext<Op extends OperationContext = OperationContext> = {\n  url: string;\n  method: string;\n  headers: Record<string, string>;\n  body?: unknown;\n  operation: Op;\n};\n\n/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */\nexport type RetryContext<Op extends OperationContext = OperationContext> = {\n  attempt: number;\n  request: RequestContext<Op>;\n  response?: Response;\n  error?: unknown;\n};\n\n/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */\nexport type RetryConfig<Op extends OperationContext = OperationContext> = {\n  retries?: number;\n  retryDelay?: number;\n  retryStrategy?: RetryStrategy;\n  jitter?: boolean;\n  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;\n};\n\n/**\n * Structural stand-in for the runtime's ApiError so this module stays import-free\n * (pure types); the real `ApiError` class is assignable to it.\n */\nexport type ApiErrorLike = globalThis.Error & {\n  url: string;\n  status: number;\n  statusText: string;\n  body: unknown;\n};\n\n/** One interceptor: any subset of the three hooks. */\nexport type Middleware<Op extends OperationContext = OperationContext> = {\n  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;\n  onResponse?: (\n    response: Response,\n    ctx: RequestContext<Op>\n  ) => Response | void | Promise<Response | void>;\n  /** Throw mode only: may map/replace the error. */\n  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.\n  onError?: (\n    error: ApiErrorLike,\n    ctx: RequestContext<Op>\n  ) => globalThis.Error | Promise<globalThis.Error>;\n};\n\n/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */\nexport type ClientConfig<Op extends OperationContext = OperationContext> = {\n  serverUrl?: string;\n  fetch?: typeof fetch;\n  headers?:\n    | Record<string, string>\n    | (() => Record<string, string> | Promise<Record<string, string>>);\n  retry?: RetryConfig<Op>;\n  middleware?: Middleware<Op>[];\n  auth?: AuthCredentials;\n  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */\n  errorMode?: 'throw' | 'result';\n  onRequest?: Middleware<Op>['onRequest'];\n  onResponse?: Middleware<Op>['onResponse'];\n  onError?: Middleware<Op>['onError'];\n};\n\n/** Response readers for the per-call `parseAs` override. */\nexport type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';\n\n/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */\nexport type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };\n\n/** Per-call options for an SSE stream; reconnect defaults to true. */\nexport type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };\n\n/** A single decoded Server-Sent Event with its payload typed from the spec. */\nexport type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };\n\n/** Result-mode return shape: exactly one of `data`/`error` is set. */\nexport type Result<TData, TError> =\n  | { data: TData; error: undefined; response: Response }\n  | { data: undefined; error: TError; response: Response };\n\n/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */\nexport type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;\n\n/** The always-present client members (assigned after the operation loop — they win collisions). */\nexport type ClientCore<Op extends OperationContext = OperationContext> = {\n  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */\n  configure(config: ClientConfig<Op>): void;\n  /** Append interceptors (composes with baked/publisher middleware). */\n  use(...middleware: Middleware<Op>[]): void;\n  auth: {\n    bearer(token: TokenProvider): void;\n    basic(username: string, password: string): void;\n    apiKey(scheme: string, value: TokenProvider): void;\n  };\n};\n\n/**\n * The standard TypeScript optionality probe: `{}` has no required members, so\n * `{} extends A` is true exactly when every member of `A` is optional.\n */\n// oxlint-disable-next-line typescript/no-empty-object-type\ntype NoRequiredKeys<A> = {} extends A ? true : false;\n\n/** The typed instance client: one bound method per operation plus the core members. */\nexport type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {\n  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }\n    ? NoRequiredKeys<Ops[K]['args']> extends true\n      ? (\n          args?: Ops[K]['args'],\n          init?: SseOptions\n        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>\n      : (\n          args: Ops[K]['args'],\n          init?: SseOptions\n        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>\n    : NoRequiredKeys<Ops[K]['args']> extends true\n      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>\n      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;\n} & ClientCore<Op>;\n",
+    "/**\n * The public type surface of the client runtime — `@redocly/client-generator`'s\n * app-facing runtime module. Pure types, no runtime code (excluded from coverage).\n * The generator emits `OPERATIONS` literals typed\n * `satisfies Record<string, OperationDescriptor>` against this module, so an\n * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).\n */\n\n/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */\nexport type ParamSpec = {\n  name: string;\n  in: 'path' | 'query' | 'header';\n  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';\n  explode?: boolean;\n  allowReserved?: boolean;\n};\n\n/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */\nexport type SecuritySpec =\n  | { scheme: string; kind: 'bearer' | 'basic' }\n  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };\n\n/**\n * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).\n * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.\n */\nexport type PaginationSpec = {\n  style: 'cursor' | 'offset' | 'page';\n  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */\n  param: string;\n  /** Optional page-size query param (recorded for tooling; never set by the runtime). */\n  limitParam?: string;\n  /** Cursor style only: pointer to the next cursor in the page. */\n  nextCursor?: string;\n  /** Pointer to the page's item array. */\n  items: string;\n};\n\n/** The frozen data contract between generated code and the runtime: one operation's wire shape. */\nexport type OperationDescriptor = {\n  id: string;\n  method: string;\n  path: string;\n  tags?: readonly string[];\n  params?: readonly ParamSpec[];\n  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */\n  body?: { contentType: string; multipart?: boolean };\n  /** Defaults to `'json'` (content-type negotiation on parse). */\n  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';\n  sseDataKind?: 'json' | 'text';\n  security?: readonly SecuritySpec[];\n  pagination?: PaginationSpec;\n};\n\n/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */\nexport type QueryValue =\n  | string\n  | number\n  | boolean\n  | null\n  | undefined\n  | Array<string | number | boolean | null | undefined>\n  | Record<string, unknown>;\n\n/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */\nexport type TokenProvider = string | (() => string | Promise<string>);\n\n/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */\nexport type AuthCredentials = {\n  bearer?: TokenProvider;\n  basic?: { username: string; password: string };\n  apiKey?: Record<string, TokenProvider>;\n};\n\n/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */\nexport type RetryStrategy = 'fixed' | 'exponential';\n\n/**\n * The operation's identity, exposed to middleware for targeting (`ctx.operation`).\n * Generated clients instantiate the type parameters with the spec's literal unions\n * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a\n * middleware comparison fails to compile; the string defaults keep every\n * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working\n * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types\n * (byte-locked to generated output) remain assignable through middleware callbacks.\n */\nexport type OperationContext<\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n> = { id: Id; path: Path; tags: Tag[] };\n\n/** The mutable request context threaded through the middleware chain. */\nexport type RequestContext<Op extends OperationContext = OperationContext> = {\n  url: string;\n  method: string;\n  headers: Record<string, string>;\n  body?: unknown;\n  operation: Op;\n};\n\n/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */\nexport type RetryContext<Op extends OperationContext = OperationContext> = {\n  attempt: number;\n  request: RequestContext<Op>;\n  response?: Response;\n  error?: unknown;\n};\n\n/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */\nexport type RetryConfig<Op extends OperationContext = OperationContext> = {\n  retries?: number;\n  retryDelay?: number;\n  retryStrategy?: RetryStrategy;\n  jitter?: boolean;\n  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;\n};\n\n/**\n * Structural stand-in for the runtime's ApiError so this module stays import-free\n * (pure types); the real `ApiError` class is assignable to it.\n */\nexport type ApiErrorLike = globalThis.Error & {\n  url: string;\n  status: number;\n  statusText: string;\n  body: unknown;\n};\n\n/** One interceptor: any subset of the three hooks. */\nexport type Middleware<Op extends OperationContext = OperationContext> = {\n  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;\n  onResponse?: (\n    response: Response,\n    ctx: RequestContext<Op>\n  ) => Response | void | Promise<Response | void>;\n  /** Throw mode only: may map/replace the error. */\n  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.\n  onError?: (\n    error: ApiErrorLike,\n    ctx: RequestContext<Op>\n  ) => globalThis.Error | Promise<globalThis.Error>;\n};\n\n/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */\nexport type ClientConfig<Op extends OperationContext = OperationContext> = {\n  serverUrl?: string;\n  fetch?: typeof fetch;\n  headers?:\n    | Record<string, string>\n    | (() => Record<string, string> | Promise<Record<string, string>>);\n  retry?: RetryConfig<Op>;\n  middleware?: Middleware<Op>[];\n  auth?: AuthCredentials;\n  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */\n  errorMode?: 'throw' | 'result';\n  onRequest?: Middleware<Op>['onRequest'];\n  onResponse?: Middleware<Op>['onResponse'];\n  onError?: Middleware<Op>['onError'];\n};\n\n/** Response readers for the per-call `parseAs` override. */\nexport type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';\n\n/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */\nexport type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };\n\n/** Per-call options for an SSE stream; reconnect defaults to true. */\nexport type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };\n\n/** A single decoded Server-Sent Event with its payload typed from the spec. */\nexport type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };\n\n/** Result-mode return shape: exactly one of `data`/`error` is set. */\nexport type Result<TData, TError> =\n  | { data: TData; error: undefined; response: Response }\n  | { data: undefined; error: TError; response: Response };\n\n/**\n * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for\n * streams and, for paginated operations, `item` (the page's element type) and — on\n * result-mode clients only — `page` (the RAW page type `.pages()` yields, since\n * iteration unwraps the `Result` envelope the one-shot `result` carries).\n */\nexport type OpsShape = Record<\n  string,\n  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }\n>;\n\n/** The always-present client members (assigned after the operation loop — they win collisions). */\nexport type ClientCore<Op extends OperationContext = OperationContext> = {\n  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */\n  configure(config: ClientConfig<Op>): void;\n  /** Append interceptors (composes with baked/publisher middleware). */\n  use(...middleware: Middleware<Op>[]): void;\n  auth: {\n    bearer(token: TokenProvider): void;\n    basic(username: string, password: string): void;\n    apiKey(scheme: string, value: TokenProvider): void;\n  };\n};\n\n/**\n * The standard TypeScript optionality probe: `{}` has no required members, so\n * `{} extends A` is true exactly when every member of `A` is optional.\n */\n// oxlint-disable-next-line typescript/no-empty-object-type\ntype NoRequiredKeys<A> = {} extends A ? true : false;\n\n/**\n * The page type `.pages()` yields: the RAW page declared by `page` (the generator\n * writes it only on result-mode paginated entries, whose `result` is the envelope),\n * or the method's own `result` (throw mode — already the raw page).\n */\ntype PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }\n  ? Entry['page']\n  : Entry['result'];\n\n/**\n * The auto-pagination members intersected onto a paginated method — present exactly when\n * the Ops entry declares `item` (the generator writes it only for paginated operations).\n * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).\n * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a\n * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the\n * `onError` middleware hook (throw-mode-only) is not invoked.\n */\ntype Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry\n  ? NoRequiredKeys<Entry['args']> extends true\n    ? {\n        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;\n        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;\n      }\n    : {\n        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;\n        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;\n      }\n  : unknown;\n\n/** The typed instance client: one bound method per operation plus the core members. */\nexport type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {\n  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }\n    ? NoRequiredKeys<Ops[K]['args']> extends true\n      ? (\n          args?: Ops[K]['args'],\n          init?: SseOptions\n        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>\n      : (\n          args: Ops[K]['args'],\n          init?: SseOptions\n        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>\n    : (NoRequiredKeys<Ops[K]['args']> extends true\n        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>\n        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &\n        Paginated<Ops[K]>;\n} & ClientCore<Op>;\n",
   'errors.ts':
     "/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */\nexport class ApiError extends Error {\n  public readonly url: string;\n  public readonly status: number;\n  public readonly statusText: string;\n  public readonly body: unknown;\n  constructor(url: string, status: number, statusText: string, body: unknown) {\n    super(`Request failed with status ${status}`);\n    this.name = 'ApiError';\n    this.url = url;\n    this.status = status;\n    this.statusText = statusText;\n    this.body = body;\n  }\n}\n\n/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */\n// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it\n// when this module is embedded alongside generated types (inline mode).\nexport function abortError(signal: AbortSignal): globalThis.Error {\n  const reason = (signal as { reason?: unknown }).reason;\n  if (reason instanceof Error) return reason;\n  return new DOMException('The operation was aborted.', 'AbortError');\n}\n",
   'url.ts':
@@ -21,7 +21,9 @@ export const RUNTIME_SOURCES = {
   'sse.ts':
     "import { ApiError } from './errors.js';\nimport { readError } from './parse.js';\nimport { sleep } from './retry.js';\nimport { send } from './send.js';\nimport type { ClientConfig, OperationContext, ServerSentEvent, SseOptions } from './types.js';\n\n/**\n * Consume a `text/event-stream` operation as typed events (capability module — wired\n * into `createClient`). Auto-reconnects on dropped connections, resuming from the last\n * seen event id via `Last-Event-ID` (backoff: the server's `retry:` value, then\n * `reconnectDelay`, then 1s — exponential with jitter, capped at 30s). A clean stream\n * end flushes a trailing frame and finishes; `break`/abort end the iterator cleanly.\n */\nexport async function* sse<T>(\n  config: ClientConfig,\n  op: OperationContext,\n  url: string,\n  init: SseOptions,\n  dataKind: 'json' | 'text' = 'text'\n): AsyncGenerator<ServerSentEvent<T>> {\n  const { reconnect = true, reconnectDelay, ...rest } = init;\n  const signal = rest.signal ?? undefined;\n  const headers: Record<string, string> = {\n    Accept: 'text/event-stream',\n    ...(rest.headers as Record<string, string> | undefined),\n  };\n  let lastEventId: string | undefined;\n  let serverRetry: number | undefined;\n  let failures = 0;\n  while (true) {\n    if (signal?.aborted) return;\n    const sendHeaders =\n      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };\n    try {\n      const { response } = await send(\n        config,\n        op,\n        url,\n        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },\n        undefined,\n        false,\n        {}\n      );\n      if (!response.ok) {\n        const errorBody = await readError(response);\n        throw new ApiError(url, response.status, response.statusText, errorBody);\n      }\n      failures = 0;\n      const body = response.body;\n      if (!body) return;\n      const reader = body.getReader();\n      const decoder = new TextDecoder();\n      let buffer = '';\n      try {\n        while (true) {\n          const { done, value } = await reader.read();\n          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });\n          let index: number;\n          while ((index = buffer.search(/\\r\\n\\r\\n|\\n\\n|\\r\\r/)) !== -1) {\n            const raw = buffer.slice(0, index);\n            buffer = buffer.slice(\n              index + buffer.slice(index).match(/^(\\r\\n\\r\\n|\\n\\n|\\r\\r)/)![0].length\n            );\n            const event = parseSseFrame(raw, dataKind);\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n          }\n          if (done) {\n            // Stream closed cleanly. Flush a final event that arrived without a trailing\n            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.\n            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n            return;\n          }\n          // Bound memory: a server that never sends a frame delimiter would otherwise\n          // grow `buffer` without limit. 1 MiB is far above any real SSE frame.\n          if (buffer.length > 1048576) {\n            throw new Error('SSE frame exceeded 1048576 characters without a delimiter');\n          }\n        }\n      } finally {\n        await reader.cancel().catch(() => undefined);\n      }\n    } catch (error) {\n      if (signal?.aborted) return;\n      // A non-OK HTTP response is a definitive error (4xx/5xx), not a transient drop —\n      // surface it instead of reconnecting in a loop.\n      if (error instanceof ApiError) throw error;\n      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream\n      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.\n      if (!reconnect) throw error;\n    }\n    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.\n    failures++;\n    const base = serverRetry ?? reconnectDelay ?? 1000;\n    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);\n    try {\n      await sleep(Math.random() * delay, signal);\n    } catch {\n      return; // sleep rejects only on abort — end the iterator cleanly\n    }\n  }\n}\n\n/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */\nexport function parseSseFrame(\n  raw: string,\n  dataKind: 'json' | 'text'\n): ServerSentEvent<unknown> | undefined {\n  let event: string | undefined;\n  const dataLines: string[] = [];\n  let id: string | undefined;\n  let retry: number | undefined;\n  let sawField = false;\n  for (const line of raw.split(/\\r\\n|\\n|\\r/)) {\n    if (line === '' || line.startsWith(':')) continue;\n    const colon = line.indexOf(':');\n    const field = colon === -1 ? line : line.slice(0, colon);\n    let val = colon === -1 ? '' : line.slice(colon + 1);\n    if (val.startsWith(' ')) val = val.slice(1);\n    sawField = true;\n    if (field === 'event') event = val;\n    else if (field === 'data') dataLines.push(val);\n    else if (field === 'id') id = val;\n    else if (field === 'retry') {\n      const n = Number(val);\n      if (!Number.isNaN(n)) retry = n;\n    }\n  }\n  if (!sawField) return undefined;\n  const dataText = dataLines.join('\\n');\n  const data = dataKind === 'json' && dataText !== '' ? JSON.parse(dataText) : dataText;\n  return { event, data, id, retry };\n}\n",
   'create-client.ts':
-    "import { ApiError } from './errors.js';\nimport { parse, readError } from './parse.js';\nimport { middlewareChain, send, type SendCapabilities } from './send.js';\nimport type {\n  ApiErrorLike,\n  Client,\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  OperationDescriptor,\n  OpsShape,\n  ParseAs,\n  QueryValue,\n  RequestOptions,\n  SecuritySpec,\n  ServerSentEvent,\n  SseOptions,\n  TokenProvider,\n} from './types.js';\nimport { buildUrl, substitutePath, type QueryStyle } from './url.js';\n\n/**\n * The optional behaviors `createClientCore` can dispatch to but never statically\n * imports. The package's public `createClient` wires the full set; the future\n * inline-mode assembler wires only the capabilities a spec needs.\n */\nexport type Capabilities = SendCapabilities & {\n  resolveAuth?: (\n    security: readonly SecuritySpec[],\n    config: ClientConfig\n  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;\n  sse?: (\n    config: ClientConfig,\n    op: OperationContext,\n    url: string,\n    init: SseOptions,\n    dataKind: 'json' | 'text'\n  ) => AsyncGenerator<ServerSentEvent<unknown>>;\n};\n\n/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */\ntype OperationArgs = {\n  params?: Record<string, QueryValue>;\n  body?: unknown;\n  headers?: Record<string, unknown>;\n} & Record<string, unknown>;\n\n/** The response reader implied by the descriptor (before any per-call `parseAs` override). */\nfunction kindFor(op: OperationDescriptor): ParseAs | 'void' {\n  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {\n    return op.responseKind;\n  }\n  return 'auto';\n}\n\n/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */\nfunction splitArgs(op: OperationDescriptor, args: OperationArgs) {\n  const path: Record<string, unknown> = {};\n  for (const param of op.params ?? []) {\n    if (param.in === 'path') path[param.name] = args[param.name];\n  }\n  return { path, query: args.params, body: args.body, headers: args.headers };\n}\n\n/**\n * The query-serialization hints for the descriptor's query params. A spec is built only\n * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),\n * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)\n * are honored, and an omitted `explode` keeps the exploded default.\n */\nfunction queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {\n  let styles: Record<string, QueryStyle> | undefined;\n  for (const param of op.params ?? []) {\n    if (param.in !== 'query') continue;\n    const deviates =\n      (param.style !== undefined && param.style !== 'form') ||\n      param.explode === false ||\n      param.allowReserved === true;\n    if (!deviates) continue;\n    styles ??= {};\n    styles[param.name] = {\n      style: param.style ?? 'form',\n      explode: param.explode ?? true,\n      allowReserved: param.allowReserved,\n    };\n  }\n  return styles;\n}\n\n/** Stringify caller-supplied extra headers, skipping empty entries. */\nfunction stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {\n  const out: Record<string, string> = {};\n  for (const [key, value] of Object.entries(headers ?? {})) {\n    if (value !== undefined && value !== null) out[key] = String(value);\n  }\n  return out;\n}\n\n/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */\nasync function prepareRequest(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions | SseOptions,\n  caps: Capabilities\n): Promise<{ url: string; init: RequestOptions; body: unknown }> {\n  const { path, query, body, headers } = splitArgs(op, args);\n  const authed =\n    op.security?.length && caps.resolveAuth\n      ? await caps.resolveAuth(op.security, config)\n      : { headers: {}, query: {} };\n  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };\n  const url = buildUrl(\n    config.serverUrl ?? '',\n    substitutePath(op.path, path),\n    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,\n    queryStyles(op)\n  );\n  const mergedInit: RequestOptions = {\n    ...init,\n    method: op.method.toUpperCase(),\n    // Precedence, lowest → highest (later spreads win): injected auth → explicit\n    // header params → caller `init.headers` — the caller always overrides both.\n    headers: {\n      ...authed.headers,\n      ...stringHeaders(headers),\n      ...(init.headers as Record<string, string> | undefined),\n    },\n  };\n  return { url, init: mergedInit, body };\n}\n\n/** One non-SSE call: send, then branch on the configured error mode. */\nasync function execute(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions,\n  caps: Capabilities\n): Promise<unknown> {\n  const prepared = await prepareRequest(config, op, args, init, caps);\n  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n  const { parseAs, ...sendInit } = prepared.init;\n  const { response, context } = await send(\n    config,\n    opCtx,\n    prepared.url,\n    sendInit,\n    prepared.body,\n    op.body?.multipart === true,\n    caps\n  );\n  const readKind = parseAs ?? kindFor(op);\n  if (config.errorMode === 'result') {\n    if (!response.ok) {\n      return { data: undefined, error: await readError(response), response };\n    }\n    return { data: await parse(response, readKind), error: undefined, response };\n  }\n  if (!response.ok) {\n    let error: globalThis.Error = new ApiError(\n      context.url,\n      response.status,\n      response.statusText,\n      await readError(response)\n    );\n    // Thread the error through each middleware's onError in turn (each may replace it).\n    for (const mw of middlewareChain(config)) {\n      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);\n    }\n    throw error;\n  }\n  return parse(response, readKind);\n}\n\n/**\n * Build a typed instance client over operation descriptors: one real bound method per\n * operation (attached by a construction-time loop — no Proxy), plus the core members\n * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name\n * collision with an operation. All behavior dispatches through the capability seam.\n */\nexport function createClientCore<\n  Ops extends OpsShape,\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n>(\n  operations: Record<string, OperationDescriptor>,\n  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},\n  caps: Capabilities = {}\n): Client<Ops, OperationContext<Id, Path, Tag>> {\n  // The literal-union narrowing is a compile-time DX contract only; internally the\n  // runtime works with the base (string-typed) context. One cast at this boundary —\n  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx\n  // params are contravariant).\n  const given = initial as ClientConfig;\n  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.\n  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };\n  const client = {} as Record<string, unknown>;\n\n  for (const [name, op] of Object.entries(operations)) {\n    if (op.responseKind === 'sse') {\n      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {\n        if (!caps.sse) {\n          throw new Error(`SSE capability not wired: cannot stream operation \"${op.id}\"`);\n        }\n        const stream = caps.sse;\n        return (async function* () {\n          const prepared = await prepareRequest(config, op, args, init, caps);\n          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');\n        })();\n      };\n    } else {\n      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>\n        execute(config, op, args, init, caps);\n    }\n  }\n\n  // Core members are assigned AFTER the operation loop — they win over colliding op names.\n  client.configure = (next: ClientConfig): void => {\n    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at\n    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.\n    const { errorMode: _fixed, ...rest } = next;\n    Object.assign(config, rest);\n  };\n  client.use = (...middleware: Middleware[]): void => {\n    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.\n    config.middleware = [...(config.middleware ?? []), ...middleware];\n  };\n  client.auth = {\n    bearer(token: TokenProvider): void {\n      config.auth = { ...config.auth, bearer: token };\n    },\n    basic(username: string, password: string): void {\n      config.auth = { ...config.auth, basic: { username, password } };\n    },\n    apiKey(scheme: string, value: TokenProvider): void {\n      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };\n    },\n  };\n\n  return client as Client<Ops, OperationContext<Id, Path, Tag>>;\n}\n",
+    "import { ApiError } from './errors.js';\nimport { parse, readError } from './parse.js';\nimport { middlewareChain, send, type SendCapabilities } from './send.js';\nimport type {\n  ApiErrorLike,\n  Client,\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  OperationDescriptor,\n  OpsShape,\n  PaginationSpec,\n  ParseAs,\n  QueryValue,\n  RequestOptions,\n  SecuritySpec,\n  ServerSentEvent,\n  SseOptions,\n  TokenProvider,\n} from './types.js';\nimport { buildUrl, substitutePath, type QueryStyle } from './url.js';\n\n/**\n * The optional behaviors `createClientCore` can dispatch to but never statically\n * imports. The package's public `createClient` wires the full set; the future\n * inline-mode assembler wires only the capabilities a spec needs.\n */\nexport type Capabilities = SendCapabilities & {\n  resolveAuth?: (\n    security: readonly SecuritySpec[],\n    config: ClientConfig\n  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;\n  sse?: (\n    config: ClientConfig,\n    op: OperationContext,\n    url: string,\n    init: SseOptions,\n    dataKind: 'json' | 'text'\n  ) => AsyncGenerator<ServerSentEvent<unknown>>;\n  paginate?: {\n    pages: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n    items: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n  };\n};\n\n/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */\nexport type OperationArgs = {\n  params?: Record<string, QueryValue>;\n  body?: unknown;\n  headers?: Record<string, unknown>;\n} & Record<string, unknown>;\n\n/** The response reader implied by the descriptor (before any per-call `parseAs` override). */\nfunction kindFor(op: OperationDescriptor): ParseAs | 'void' {\n  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {\n    return op.responseKind;\n  }\n  return 'auto';\n}\n\n/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */\nfunction splitArgs(op: OperationDescriptor, args: OperationArgs) {\n  const path: Record<string, unknown> = {};\n  for (const param of op.params ?? []) {\n    if (param.in === 'path') path[param.name] = args[param.name];\n  }\n  return { path, query: args.params, body: args.body, headers: args.headers };\n}\n\n/**\n * The query-serialization hints for the descriptor's query params. A spec is built only\n * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),\n * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)\n * are honored, and an omitted `explode` keeps the exploded default.\n */\nfunction queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {\n  let styles: Record<string, QueryStyle> | undefined;\n  for (const param of op.params ?? []) {\n    if (param.in !== 'query') continue;\n    const deviates =\n      (param.style !== undefined && param.style !== 'form') ||\n      param.explode === false ||\n      param.allowReserved === true;\n    if (!deviates) continue;\n    styles ??= {};\n    styles[param.name] = {\n      style: param.style ?? 'form',\n      explode: param.explode ?? true,\n      allowReserved: param.allowReserved,\n    };\n  }\n  return styles;\n}\n\n/** Stringify caller-supplied extra headers, skipping empty entries. */\nfunction stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {\n  const out: Record<string, string> = {};\n  for (const [key, value] of Object.entries(headers ?? {})) {\n    if (value !== undefined && value !== null) out[key] = String(value);\n  }\n  return out;\n}\n\n/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */\nasync function prepareRequest(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions | SseOptions,\n  caps: Capabilities\n): Promise<{ url: string; init: RequestOptions; body: unknown }> {\n  const { path, query, body, headers } = splitArgs(op, args);\n  const authed =\n    op.security?.length && caps.resolveAuth\n      ? await caps.resolveAuth(op.security, config)\n      : { headers: {}, query: {} };\n  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };\n  const url = buildUrl(\n    config.serverUrl ?? '',\n    substitutePath(op.path, path),\n    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,\n    queryStyles(op)\n  );\n  const mergedInit: RequestOptions = {\n    ...init,\n    method: op.method.toUpperCase(),\n    // Precedence, lowest → highest (later spreads win): injected auth → explicit\n    // header params → caller `init.headers` — the caller always overrides both.\n    headers: {\n      ...authed.headers,\n      ...stringHeaders(headers),\n      ...(init.headers as Record<string, string> | undefined),\n    },\n  };\n  return { url, init: mergedInit, body };\n}\n\n/** One non-SSE call: send, then branch on the configured error mode. */\nasync function execute(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions,\n  caps: Capabilities\n): Promise<unknown> {\n  const prepared = await prepareRequest(config, op, args, init, caps);\n  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n  const { parseAs, ...sendInit } = prepared.init;\n  const { response, context } = await send(\n    config,\n    opCtx,\n    prepared.url,\n    sendInit,\n    prepared.body,\n    op.body?.multipart === true,\n    caps\n  );\n  const readKind = parseAs ?? kindFor(op);\n  if (config.errorMode === 'result') {\n    if (!response.ok) {\n      return { data: undefined, error: await readError(response), response };\n    }\n    return { data: await parse(response, readKind), error: undefined, response };\n  }\n  if (!response.ok) {\n    let error: globalThis.Error = new ApiError(\n      context.url,\n      response.status,\n      response.statusText,\n      await readError(response)\n    );\n    // Thread the error through each middleware's onError in turn (each may replace it).\n    for (const mw of middlewareChain(config)) {\n      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);\n    }\n    throw error;\n  }\n  return parse(response, readKind);\n}\n\n/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */\nfunction paginateCapability(caps: Capabilities, op: OperationDescriptor) {\n  if (!caps.paginate) {\n    throw new Error(`Pagination capability not wired: cannot iterate operation \"${op.id}\"`);\n  }\n  return caps.paginate;\n}\n\n/**\n * The per-page call the iterators drive: the method itself in throw mode; in result\n * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page\n * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is\n * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).\n */\nfunction pageCall(\n  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  config: ClientConfig\n) {\n  if (config.errorMode !== 'result') return method;\n  return async (args?: OperationArgs, init?: RequestOptions) => {\n    const envelope = (await method(args, init)) as {\n      data: unknown;\n      error: unknown;\n      response: Response;\n    };\n    if (envelope.data === undefined) {\n      const { response } = envelope;\n      throw new ApiError(response.url, response.status, response.statusText, envelope.error);\n    }\n    return envelope.data;\n  };\n}\n\n/**\n * Build a typed instance client over operation descriptors: one real bound method per\n * operation (attached by a construction-time loop — no Proxy), plus the core members\n * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name\n * collision with an operation. All behavior dispatches through the capability seam.\n */\nexport function createClientCore<\n  Ops extends OpsShape,\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n>(\n  operations: Record<string, OperationDescriptor>,\n  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},\n  caps: Capabilities = {}\n): Client<Ops, OperationContext<Id, Path, Tag>> {\n  // The literal-union narrowing is a compile-time DX contract only; internally the\n  // runtime works with the base (string-typed) context. One cast at this boundary —\n  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx\n  // params are contravariant).\n  const given = initial as ClientConfig;\n  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.\n  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };\n  const client = {} as Record<string, unknown>;\n\n  for (const [name, op] of Object.entries(operations)) {\n    if (op.responseKind === 'sse') {\n      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {\n        if (!caps.sse) {\n          throw new Error(`SSE capability not wired: cannot stream operation \"${op.id}\"`);\n        }\n        const stream = caps.sse;\n        return (async function* () {\n          const prepared = await prepareRequest(config, op, args, init, caps);\n          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');\n        })();\n      };\n    } else {\n      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>\n        execute(config, op, args, init, caps);\n      const spec = op.pagination;\n      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching\n      // through the capability seam (like SSE: absent capability throws descriptively).\n      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on\n      // a result-mode client (`errorMode` is fixed at construction — `configure()`\n      // ignores it) each page's envelope is unwrapped before it reaches the capability.\n      // A failed page aborts iteration by throwing ApiError, even on result-mode\n      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.\n      client[name] = spec\n        ? Object.assign(method, {\n            pages: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),\n            items: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),\n          })\n        : method;\n    }\n  }\n\n  // Core members are assigned AFTER the operation loop — they win over colliding op names.\n  client.configure = (next: ClientConfig): void => {\n    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at\n    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.\n    const { errorMode: _fixed, ...rest } = next;\n    Object.assign(config, rest);\n  };\n  client.use = (...middleware: Middleware[]): void => {\n    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.\n    config.middleware = [...(config.middleware ?? []), ...middleware];\n  };\n  client.auth = {\n    bearer(token: TokenProvider): void {\n      config.auth = { ...config.auth, bearer: token };\n    },\n    basic(username: string, password: string): void {\n      config.auth = { ...config.auth, basic: { username, password } };\n    },\n    apiKey(scheme: string, value: TokenProvider): void {\n      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };\n    },\n  };\n\n  return client as Client<Ops, OperationContext<Id, Path, Tag>>;\n}\n",
+  'paginate.ts':
+    "import type { OperationArgs } from './create-client.js';\nimport type { PaginationSpec, QueryValue, RequestOptions } from './types.js';\n\n/**\n * Auto-pagination (capability module — wired into `createClient`, dispatched by the\n * method's `.pages()`/`.items()`): walk an operation's pages by advancing the descriptor's\n * `param` query parameter, per its `style`. The caller's args are never mutated — each\n * request gets a fresh `params` clone — and `init` is forwarded to every call.\n *\n * Iteration is error-mode-agnostic: `call` always resolves to the RAW page (on a\n * result-mode client the attachment unwraps the envelope first), so a failed page\n * aborts iteration by throwing `ApiError`, even on result-mode clients; the `onError`\n * middleware hook (throw-mode-only) is not invoked.\n */\n\n/**\n * Resolve an RFC 6901 JSON pointer (`~1` → `/`, `~0` → `~`) against a value.\n * The empty pointer is the whole document; anything else must start with `/`.\n * Returns `undefined` on any miss (bad token, absent key, non-object step) — never throws.\n */\nexport function resolvePointer(value: unknown, pointer: string): unknown {\n  if (pointer === '') return value;\n  if (!pointer.startsWith('/')) return undefined;\n  let current = value;\n  for (const token of pointer.slice(1).split('/')) {\n    const key = token.replaceAll('~1', '/').replaceAll('~0', '~');\n    if (Array.isArray(current)) {\n      if (!/^(0|[1-9]\\d*)$/.test(key)) return undefined;\n      current = current[Number(key)];\n    } else if (Object(current) === current && key in (current as object)) {\n      current = (current as Record<string, unknown>)[key];\n    } else {\n      return undefined;\n    }\n  }\n  return current;\n}\n\n/**\n * Iterate an operation's full page results. Every page is yielded before the stop\n * condition is evaluated, so the last page always arrives. Cursor style resumes from a\n * caller-provided `params[spec.param]`, stops when `nextCursor` resolves to\n * `undefined`/`null`/`''`, and throws if the next cursor is not a string or number, or\n * if the same cursor comes back twice in a row (infinite-loop guards). Offset/page\n * styles advance by item count / by one and stop when\n * the `items` pointer misses or the array is empty.\n */\nexport async function* pages<TPage>(\n  call: (args?: OperationArgs, init?: RequestOptions) => Promise<TPage>,\n  spec: PaginationSpec,\n  args: OperationArgs = {},\n  init?: RequestOptions\n): AsyncGenerator<TPage> {\n  if (spec.style === 'cursor') {\n    let cursor: unknown = args.params?.[spec.param];\n    while (true) {\n      const params = { ...args.params };\n      if (cursor !== undefined) params[spec.param] = cursor as QueryValue;\n      const page = await call({ ...args, params }, init);\n      yield page;\n      const next = resolvePointer(page, spec.nextCursor!);\n      if (next === undefined || next === null || next === '') return;\n      if (typeof next !== 'string' && typeof next !== 'number') {\n        // A fresh non-scalar cursor never compares equal, so without this guard a lying\n        // server would slip past the did-not-advance check into an infinite loop.\n        throw new Error(`Pagination cursor at ${spec.nextCursor} is not a string or number`);\n      }\n      if (next === cursor) {\n        throw new Error('Pagination did not advance: operation returned the same cursor twice');\n      }\n      cursor = next;\n    }\n  } else {\n    let position =\n      (args.params?.[spec.param] as number | undefined) ?? (spec.style === 'page' ? 1 : 0);\n    while (true) {\n      const page = await call(\n        { ...args, params: { ...args.params, [spec.param]: position } },\n        init\n      );\n      yield page;\n      const pageItems = resolvePointer(page, spec.items);\n      if (!Array.isArray(pageItems) || pageItems.length === 0) return;\n      position += spec.style === 'page' ? 1 : pageItems.length;\n    }\n  }\n}\n\n/**\n * Iterate the operation's individual items: each page's `items` pointer, flattened.\n * A cursor-style page whose pointer misses yields nothing but pagination continues;\n * for offset/page styles a miss has already stopped `pages`.\n */\nexport async function* items<TItem>(\n  call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  spec: PaginationSpec,\n  args?: OperationArgs,\n  init?: RequestOptions\n): AsyncGenerator<TItem> {\n  for await (const page of pages(call, spec, args, init)) {\n    const pageItems = resolvePointer(page, spec.items);\n    if (Array.isArray(pageItems)) yield* pageItems as TItem[];\n  }\n}\n",
 } as const;
 
 export type RuntimeModuleName = keyof typeof RUNTIME_SOURCES;
diff --git a/packages/client-generator/src/index.ts b/packages/client-generator/src/index.ts
index 8ae3c77773..18b36202ca 100644
--- a/packages/client-generator/src/index.ts
+++ b/packages/client-generator/src/index.ts
@@ -50,6 +50,8 @@ export type {
   TokenProvider,
 } from './runtime/index.js';
 export type { Config } from './config.js';
+// The user-facing pagination rule shapes (`Config.pagination` / `x-pagination`).
+export type { PaginationConfig, PaginationRule, PaginationStyle } from './emitters/pagination.js';
 export type { GenerateClientOptions, GenerateClientResult, LoadResult } from './types.js';
 export { mergeConfig } from './config-file.js';
 // The custom-generator plugin API + codegen toolkit + IR types (also re-exports the shared
@@ -99,6 +101,16 @@ export function collectGeneratedFiles(
 export async function generateClient(
   options: GenerateClientOptions
 ): Promise<GenerateClientResult> {
+  // A path segment that is literally "undefined"/"null" is the telltale of an
+  // interpolation bug in the caller (`\`${dir}/client.ts\`` with `dir` unset) — reject
+  // it instead of silently creating an `undefined/` directory.
+  if (
+    options.output.split(/[\\/]/).some((segment) => segment === 'undefined' || segment === 'null')
+  ) {
+    throw new Error(
+      `output path "${options.output}" contains a literal "undefined" or "null" segment — this looks like an interpolation bug in the caller`
+    );
+  }
   // Setup is a LOCAL module (its code is baked into the generated client) — reject
   // URL-ish specifiers upfront, before any spec loading, instead of failing later as
   // an unreadable file path. Two+ letter scheme, so Windows drive paths don't match.
@@ -150,6 +162,7 @@ export async function generateClient(
       mockSeed: options.mockSeed,
       setup: setupBlock,
       runtime: options.runtime,
+      pagination: options.pagination,
     },
     generators: selected,
     registry,
diff --git a/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts b/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
index 93ae5694cd..3f9f1dc301 100644
--- a/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
+++ b/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
@@ -235,6 +235,38 @@ describe('buildOperation — tags', () => {
   });
 });
 
+describe('buildOperation — x-pagination extension', () => {
+  it('captures the x-pagination value verbatim, without validation', () => {
+    const extension = { style: 'cursor', cursorParam: 'cursor', bogus: 42 };
+    const op = buildOpOnly({
+      paths: {
+        '/orders': {
+          get: { operationId: 'listOrders', 'x-pagination': extension, responses: {} },
+        } as never,
+      },
+    });
+    expect(op.paginationExtension).toBe(extension);
+  });
+
+  it('captures a non-object x-pagination value too (validated by the emitter, not the IR)', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/orders': {
+          get: { operationId: 'listOrders', 'x-pagination': 'nonsense', responses: {} },
+        } as never,
+      },
+    });
+    expect(op.paginationExtension).toBe('nonsense');
+  });
+
+  it('leaves paginationExtension absent when the operation declares none', () => {
+    const op = buildOpOnly({
+      paths: { '/orders': { get: { operationId: 'listOrders', responses: {} } } as never },
+    });
+    expect('paginationExtension' in op).toBe(false);
+  });
+});
+
 describe('buildOperation — param paths', () => {
   it('splits parameters by their `in` location', () => {
     const op = buildOpOnly({
diff --git a/packages/client-generator/src/intermediate-representation/build.ts b/packages/client-generator/src/intermediate-representation/build.ts
index e40f7fe4e9..ce5e9eefc3 100644
--- a/packages/client-generator/src/intermediate-representation/build.ts
+++ b/packages/client-generator/src/intermediate-representation/build.ts
@@ -498,6 +498,9 @@ function buildOperation(
   const errorResponses = buildErrorResponses(operation, path, doc);
   const security = resolveOperationSecurity(operation, doc, injectable);
 
+  // Extensions aren't in the @redocly operation type — read loosely, like `deprecated`.
+  const paginationExtension = (operation as unknown as Record<string, unknown>)['x-pagination'];
+
   return {
     name,
     method,
@@ -512,6 +515,7 @@ function buildOperation(
     errorResponses,
     security,
     tags: Array.isArray(operation.tags) ? operation.tags.filter((t) => typeof t === 'string') : [],
+    ...(paginationExtension !== undefined ? { paginationExtension } : {}),
   };
 }
 
diff --git a/packages/client-generator/src/intermediate-representation/model.ts b/packages/client-generator/src/intermediate-representation/model.ts
index 0073d4ec76..64308bf818 100644
--- a/packages/client-generator/src/intermediate-representation/model.ts
+++ b/packages/client-generator/src/intermediate-representation/model.ts
@@ -205,6 +205,11 @@ export type OperationModel = {
    * applicable scheme exists.
    */
   security: string[];
+  /**
+   * The operation's `x-pagination` extension value, captured VERBATIM (spec
+   * extensions are untyped). Validated by the pagination emitter, not the IR.
+   */
+  paginationExtension?: unknown;
 };
 
 export type ServiceModel = {
diff --git a/packages/client-generator/src/runtime/__tests__/create-client.test.ts b/packages/client-generator/src/runtime/__tests__/create-client.test.ts
index 67be7fa8d8..84bc21e6f4 100644
--- a/packages/client-generator/src/runtime/__tests__/create-client.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/create-client.test.ts
@@ -1,4 +1,6 @@
 import { createClientCore } from '../create-client.js';
+import { ApiError } from '../errors.js';
+import { items as paginateItems, pages as paginatePages } from '../paginate.js';
 import type { OperationDescriptor } from '../types.js';
 
 const OPS = {
@@ -49,7 +51,23 @@ const OPS = {
     ],
   },
   streamPlain: { id: 'streamPlain', method: 'GET', path: '/plain-events', responseKind: 'sse' },
-  configure: { id: 'configure', method: 'GET', path: '/configure-op' }, // collision: core must win
+  listOrders: {
+    id: 'listOrders',
+    method: 'GET',
+    path: '/orders',
+    params: [
+      { name: 'cursor', in: 'query' },
+      { name: 'limit', in: 'query' },
+    ],
+    pagination: { style: 'cursor', param: 'cursor', nextCursor: '/nextCursor', items: '/orders' },
+  },
+  configure: {
+    id: 'configure',
+    method: 'GET',
+    path: '/configure-op',
+    // Paginated AND colliding with a core member — the core member must still win.
+    pagination: { style: 'page', param: 'page', items: '/rows' },
+  },
 } satisfies Record<string, OperationDescriptor>;
 
 interface Ops {
@@ -63,8 +81,13 @@ interface Ops {
   secured: { args: Record<string, never>; result: string };
   stream: { args: Record<string, never>; result: { n: number }; kind: 'sse' };
   streamPlain: { args: Record<string, never>; result: string; kind: 'sse' };
+  listOrders: {
+    args: { params?: { cursor?: string; limit?: number } };
+    result: { orders: Array<{ id: string }>; nextCursor?: string };
+    item: { id: string };
+  };
   configure: { args: Record<string, never>; result: string };
-  [k: string]: { args: object; result: unknown; kind?: 'sse' };
+  [k: string]: { args: object; result: unknown; kind?: 'sse'; item?: unknown };
 }
 
 const jsonOk = (body: unknown) =>
@@ -256,6 +279,135 @@ describe('createClientCore', () => {
     expect(() => noCap.stream({})).toThrow(/capability/i);
   });
 
+  it('paginated ops gain .pages/.items dispatching to the capability; others get neither', async () => {
+    const seen: unknown[] = [];
+    const paginate = {
+      pages: async function* (
+        call: (args?: object, init?: object) => Promise<unknown>,
+        spec: unknown,
+        args?: object,
+        init?: object
+      ): AsyncGenerator<unknown> {
+        seen.push(['pages', spec, args, init]);
+        yield await call(args, init); // the method passed in performs the real request
+      },
+      items: async function* (
+        _call: unknown,
+        spec: { style: string },
+        args?: object,
+        init?: object
+      ): AsyncGenerator<unknown> {
+        seen.push(['items', spec.style, args, init]);
+        yield { id: 'o9' };
+      },
+    };
+    const { calls, fetchImpl } = spy([jsonOk({ orders: [{ id: 'o1' }] })]);
+    const client = createClientCore<Ops>(
+      OPS,
+      { serverUrl: 'https://x', fetch: fetchImpl },
+      { paginate: paginate as never }
+    );
+
+    expect(typeof client.listOrders.pages).toBe('function');
+    expect(typeof client.listOrders.items).toBe('function');
+    expect((client.getOrder as unknown as Record<string, unknown>).pages).toBeUndefined();
+    expect((client.getOrder as unknown as Record<string, unknown>).items).toBeUndefined();
+
+    const args = { params: { limit: 2 } };
+    const init = { headers: { 'X-Trace': '1' } };
+    const yielded = [];
+    for await (const page of client.listOrders.pages(args, init)) yielded.push(page);
+    expect(yielded).toEqual([{ orders: [{ id: 'o1' }] }]);
+    expect(calls[0].url).toBe('https://x/orders?limit=2');
+    expect(seen[0]).toEqual(['pages', OPS.listOrders.pagination, args, init]);
+
+    for await (const item of client.listOrders.items()) expect(item).toEqual({ id: 'o9' });
+    expect(seen[1]).toEqual(['items', 'cursor', undefined, undefined]); // bare call: no args/init
+  });
+
+  it('result mode: .pages/.items iterate RAW pages (the envelope is unwrapped before the pointers)', async () => {
+    const page1 = { orders: [{ id: 'o1' }, { id: 'o2' }], nextCursor: 'c2' };
+    const page2 = { orders: [{ id: 'o3' }] };
+    const { calls, fetchImpl } = spy([
+      jsonOk(page1),
+      jsonOk(page2),
+      jsonOk(page1),
+      jsonOk(page2),
+      jsonOk(page2),
+    ]);
+    const client = createClientCore<Ops>(
+      OPS,
+      { serverUrl: 'https://x', fetch: fetchImpl, errorMode: 'result' },
+      { paginate: { pages: paginatePages, items: paginateItems } }
+    );
+
+    const pages = [];
+    for await (const page of client.listOrders.pages()) pages.push(page);
+    expect(pages).toEqual([page1, page2]); // raw pages, never { data, error, response }
+    expect(calls.map((c) => c.url)).toEqual(['https://x/orders', 'https://x/orders?cursor=c2']);
+
+    const items = [];
+    for await (const item of client.listOrders.items()) items.push(item);
+    expect(items).toEqual([{ id: 'o1' }, { id: 'o2' }, { id: 'o3' }]);
+
+    // The one-shot call keeps the result-mode envelope.
+    const envelope = (await client.listOrders()) as unknown as { data: unknown };
+    expect(envelope.data).toEqual(page2);
+  });
+
+  it('result mode: a failed page aborts iteration by throwing ApiError; onError is not invoked', async () => {
+    const { fetchImpl } = spy([
+      jsonOk({ orders: [{ id: 'o1' }], nextCursor: 'c2' }),
+      new Response('{"title":"boom"}', {
+        status: 500,
+        statusText: 'Server Error',
+        headers: { 'content-type': 'application/json' },
+      }),
+    ]);
+    const client = createClientCore<Ops>(
+      OPS,
+      { serverUrl: 'https://x', fetch: fetchImpl, errorMode: 'result' },
+      { paginate: { pages: paginatePages, items: paginateItems } }
+    );
+    let hookCalled = false;
+    client.use({
+      onError: (error) => {
+        hookCalled = true;
+        return error;
+      },
+    });
+
+    const seen: unknown[] = [];
+    const error = await (async () => {
+      for await (const item of client.listOrders.items()) seen.push(item);
+    })().catch((e: unknown) => e);
+    expect(seen).toEqual([{ id: 'o1' }]); // pages before the failure still arrive
+    expect(error).toBeInstanceOf(ApiError);
+    expect(error).toMatchObject({
+      status: 500,
+      statusText: 'Server Error',
+      body: { title: 'boom' }, // the envelope's decoded error rides along
+    });
+    expect(hookCalled).toBe(false); // the onError middleware hook is throw-mode-only
+  });
+
+  it('unwired paginate capability: .pages/.items throw a descriptive error synchronously', async () => {
+    const { fetchImpl } = spy([jsonOk({ orders: [] })]);
+    const noCap = createClientCore<Ops>(OPS, { serverUrl: 'https://x', fetch: fetchImpl });
+    expect(() => noCap.listOrders.pages()).toThrow(
+      'Pagination capability not wired: cannot iterate operation "listOrders"'
+    );
+    expect(() => noCap.listOrders.items()).toThrow(/capability/i);
+    // The plain one-shot call still works without the capability.
+    expect(await noCap.listOrders()).toEqual({ orders: [] });
+  });
+
+  it('a paginated op colliding with a core member still loses to the core', () => {
+    const client = createClientCore<Ops>(OPS, {});
+    expect(() => client.configure({ serverUrl: 'https://x' })).not.toThrow();
+    expect((client.configure as unknown as Record<string, unknown>).pages).toBeUndefined();
+  });
+
   it('core members win over a colliding operation name; configure merges; use appends without mutating caller arrays', async () => {
     const mine: never[] = [];
     const client = createClientCore<Ops>(OPS, { middleware: mine });
diff --git a/packages/client-generator/src/runtime/__tests__/index.test.ts b/packages/client-generator/src/runtime/__tests__/index.test.ts
index e751cc4b56..0966b76f42 100644
--- a/packages/client-generator/src/runtime/__tests__/index.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/index.test.ts
@@ -21,13 +21,25 @@ const OPS = {
     responseKind: 'sse',
     sseDataKind: 'json',
   },
+  listOrders: {
+    id: 'listOrders',
+    method: 'GET',
+    path: '/orders',
+    params: [{ name: 'cursor', in: 'query' }],
+    pagination: { style: 'cursor', param: 'cursor', nextCursor: '/nextCursor', items: '/orders' },
+  },
 } satisfies Record<string, OperationDescriptor>;
 
 interface Ops {
   upload: { args: { body: { file: string } }; result: unknown };
   secured: { args: Record<string, never>; result: unknown };
   stream: { args: Record<string, never>; result: { n: number }; kind: 'sse' };
-  [k: string]: { args: object; result: unknown; kind?: 'sse' };
+  listOrders: {
+    args: { params?: { cursor?: string } };
+    result: { orders: Array<{ id: string }>; nextCursor?: string };
+    item: { id: string };
+  };
+  [k: string]: { args: object; result: unknown; kind?: 'sse'; item?: unknown };
 }
 
 describe('public surface', () => {
@@ -58,6 +70,32 @@ describe('public surface', () => {
     expect(events).toEqual([{ n: 1 }]);
   });
 
+  it('createClient wires the paginate capability: .items walks cursor pages end-to-end', async () => {
+    const pagesByCursor: Record<string, unknown> = {
+      first: { orders: [{ id: 'o1' }, { id: 'o2' }], nextCursor: 'c2' },
+      c2: { orders: [{ id: 'o3' }] },
+    };
+    const urls: string[] = [];
+    const fetchImpl = (async (url: string) => {
+      urls.push(url);
+      const cursor = new URL(url).searchParams.get('cursor') ?? 'first';
+      return new Response(JSON.stringify(pagesByCursor[cursor]), {
+        status: 200,
+        headers: { 'content-type': 'application/json' },
+      });
+    }) as unknown as typeof fetch;
+    const client = createClient<Ops>(OPS, { serverUrl: 'https://x', fetch: fetchImpl });
+
+    const ids: string[] = [];
+    for await (const order of client.listOrders.items()) ids.push(order.id);
+    expect(ids).toEqual(['o1', 'o2', 'o3']);
+    expect(urls).toEqual(['https://x/orders', 'https://x/orders?cursor=c2']);
+
+    const pageSizes: number[] = [];
+    for await (const page of client.listOrders.pages()) pageSizes.push(page.orders.length);
+    expect(pageSizes).toEqual([2, 1]);
+  });
+
   it('mergeSetup: config wins per-field; middleware composes setup-first', () => {
     const setup = {
       config: { serverUrl: 'https://baked', retry: { retries: 3 } },
diff --git a/packages/client-generator/src/runtime/__tests__/paginate.test.ts b/packages/client-generator/src/runtime/__tests__/paginate.test.ts
new file mode 100644
index 0000000000..5166010e2f
--- /dev/null
+++ b/packages/client-generator/src/runtime/__tests__/paginate.test.ts
@@ -0,0 +1,228 @@
+import { items, pages, resolvePointer } from '../paginate.js';
+import type { PaginationSpec, RequestOptions } from '../types.js';
+
+const CURSOR: PaginationSpec = {
+  style: 'cursor',
+  param: 'cursor',
+  nextCursor: '/nextCursor',
+  items: '/orders',
+};
+const OFFSET: PaginationSpec = { style: 'offset', param: 'offset', items: '/orders' };
+const PAGE: PaginationSpec = { style: 'page', param: 'page', items: '/orders' };
+
+/** A fetch-free call stub: replies from `data` by call index, recording every args/init. */
+function stub(data: unknown[]) {
+  const calls: Array<{ args?: Record<string, unknown>; init?: RequestOptions }> = [];
+  const call = async (args?: Record<string, unknown>, init?: RequestOptions) => {
+    calls.push({ args, init });
+    return data[calls.length - 1];
+  };
+  const sentParams = (name: string) =>
+    calls.map((c) => (c.args?.params as Record<string, unknown> | undefined)?.[name]);
+  return { calls, call, sentParams };
+}
+
+async function collect<T>(gen: AsyncGenerator<T>): Promise<T[]> {
+  const out: T[] = [];
+  for await (const value of gen) out.push(value);
+  return out;
+}
+
+describe('resolvePointer', () => {
+  const doc = {
+    'menu/items': { 'size~tall': 'latte' },
+    orders: [{ id: 'o1' }, { id: 'o2' }],
+  };
+
+  it('walks objects and arrays, unescaping ~1 then ~0', () => {
+    expect(resolvePointer(doc, '/menu~1items/size~0tall')).toBe('latte');
+    expect(resolvePointer(doc, '/orders/1/id')).toBe('o2');
+  });
+
+  it('returns the whole document for the empty pointer', () => {
+    expect(resolvePointer(doc, '')).toBe(doc);
+  });
+
+  it('requires a leading slash', () => {
+    expect(resolvePointer(doc, 'orders')).toBeUndefined();
+  });
+
+  it('returns undefined on any miss instead of throwing', () => {
+    expect(resolvePointer(doc, '/missing')).toBeUndefined();
+    expect(resolvePointer(doc, '/orders/9/id')).toBeUndefined();
+    // Array tokens must be canonical indices: no leading zeros, no '-', no words.
+    expect(resolvePointer(doc, '/orders/01')).toBeUndefined();
+    expect(resolvePointer(doc, '/orders/-')).toBeUndefined();
+    expect(resolvePointer(doc, '/orders/first')).toBeUndefined();
+  });
+
+  it('returns undefined when traversing into a non-object', () => {
+    expect(resolvePointer('espresso', '/length')).toBeUndefined();
+    expect(resolvePointer(null, '/orders')).toBeUndefined();
+    expect(resolvePointer({ total: 42 }, '/total/amount')).toBeUndefined();
+  });
+});
+
+describe('pages — cursor style', () => {
+  it('follows nextCursor across pages and always yields the last page', async () => {
+    const data = [
+      { orders: [{ id: 'o1' }, { id: 'o2' }], nextCursor: 'c2' },
+      { orders: [{ id: 'o3' }], nextCursor: 'c3' },
+      { orders: [{ id: 'o4' }] }, // no nextCursor — final page, still yielded
+    ];
+    const { call, sentParams } = stub(data);
+    expect(await collect(pages(call, CURSOR))).toEqual(data);
+    expect(sentParams('cursor')).toEqual([undefined, 'c2', 'c3']);
+  });
+
+  it.each([null, ''])('stops when the next cursor resolves to %j', async (last) => {
+    const data = [
+      { orders: [{ id: 'o1' }], nextCursor: 'c2' },
+      { orders: [{ id: 'o2' }], nextCursor: last },
+    ];
+    const { call, calls } = stub(data);
+    expect(await collect(pages(call, CURSOR))).toEqual(data);
+    expect(calls).toHaveLength(2);
+  });
+
+  it('resumes from a caller-provided cursor, preserving other params', async () => {
+    const data = [{ orders: [{ id: 'o3' }] }];
+    const { call, calls } = stub(data);
+    await collect(pages(call, CURSOR, { params: { cursor: 'c2', limit: 5 } }));
+    expect(calls[0].args?.params).toEqual({ cursor: 'c2', limit: 5 });
+  });
+
+  it('advances through numeric cursors end-to-end', async () => {
+    const data = [
+      { orders: [{ id: 'o1' }], nextCursor: 2 },
+      { orders: [{ id: 'o2' }], nextCursor: 3 },
+      { orders: [{ id: 'o3' }] },
+    ];
+    const { call, sentParams } = stub(data);
+    expect(await collect(pages(call, CURSOR))).toEqual(data);
+    expect(sentParams('cursor')).toEqual([undefined, 2, 3]);
+  });
+
+  it('throws when the next cursor is neither a string nor a number (hostile server)', async () => {
+    // A fresh object every page would never compare equal — without this guard the
+    // did-not-advance check could not catch the infinite loop.
+    const data = [{ orders: [{ id: 'o1' }], nextCursor: { token: 'c2' } }];
+    const { call } = stub(data);
+    await expect(collect(pages(call, CURSOR))).rejects.toThrow(
+      'Pagination cursor at /nextCursor is not a string or number'
+    );
+  });
+
+  it('throws when the operation returns the same cursor twice in a row', async () => {
+    const data = [
+      { orders: [{ id: 'o1' }], nextCursor: 'c2' },
+      { orders: [{ id: 'o1' }], nextCursor: 'c2' },
+    ];
+    const { call } = stub(data);
+    await expect(collect(pages(call, CURSOR))).rejects.toThrow(
+      'Pagination did not advance: operation returned the same cursor twice'
+    );
+  });
+
+  it('never mutates the caller args; each request gets a fresh params clone', async () => {
+    const data = [{ orders: [{ id: 'o1' }], nextCursor: 'c2' }, { orders: [] }];
+    const args = { params: { limit: 2 }, headers: { 'X-Trace': '1' } };
+    const snapshot = structuredClone(args);
+    const { call, calls } = stub(data);
+    await collect(pages(call, CURSOR, args));
+    expect(args).toEqual(snapshot);
+    expect(calls[0].args?.params).not.toBe(args.params);
+    expect(calls[1].args?.params).not.toBe(calls[0].args?.params);
+  });
+
+  it('forwards the same init (incl. AbortSignal) to every call', async () => {
+    const data = [{ orders: [], nextCursor: 'c2' }, { orders: [] }];
+    const init: RequestOptions = { signal: new AbortController().signal };
+    const { call, calls } = stub(data);
+    await collect(pages(call, CURSOR, {}, init));
+    expect(calls).toHaveLength(2);
+    for (const c of calls) expect(c.init).toBe(init);
+  });
+});
+
+describe('pages — offset style', () => {
+  it('starts at 0 and advances by each page item count; an empty page stops after being yielded', async () => {
+    const data = [
+      { orders: ['a', 'b'] },
+      { orders: ['c', 'd'] },
+      { orders: ['e'] },
+      { orders: [] },
+    ];
+    const { call, sentParams } = stub(data);
+    expect(await collect(pages(call, OFFSET))).toEqual(data);
+    expect(sentParams('offset')).toEqual([0, 2, 4, 5]);
+  });
+
+  it('starts at the caller offset when provided', async () => {
+    const data = [{ orders: ['k'] }, { orders: [] }];
+    const { call, sentParams } = stub(data);
+    await collect(pages(call, OFFSET, { params: { offset: 10 } }));
+    expect(sentParams('offset')).toEqual([10, 11]);
+  });
+
+  it('stops when the items pointer misses', async () => {
+    const data = [{ total: 0 }];
+    const { call, calls } = stub(data);
+    expect(await collect(pages(call, OFFSET))).toEqual(data);
+    expect(calls).toHaveLength(1);
+  });
+});
+
+describe('pages — page style', () => {
+  it('starts at 1 and increments by 1 until an empty page', async () => {
+    const data = [{ orders: ['a', 'b'] }, { orders: ['c'] }, { orders: [] }];
+    const { call, sentParams } = stub(data);
+    expect(await collect(pages(call, PAGE))).toEqual(data);
+    expect(sentParams('page')).toEqual([1, 2, 3]);
+  });
+
+  it('starts at the caller page number when provided', async () => {
+    const data = [{ orders: ['x'] }, { orders: [] }];
+    const { call, sentParams } = stub(data);
+    await collect(pages(call, PAGE, { params: { page: 5 } }));
+    expect(sentParams('page')).toEqual([5, 6]);
+  });
+});
+
+describe('items', () => {
+  it('flattens each page through the items pointer', async () => {
+    const data = [
+      { orders: [{ id: 'o1' }, { id: 'o2' }], nextCursor: 'c2' },
+      { orders: [{ id: 'o3' }] },
+    ];
+    const { call } = stub(data);
+    expect(await collect(items(call, CURSOR))).toEqual([{ id: 'o1' }, { id: 'o2' }, { id: 'o3' }]);
+  });
+
+  it('cursor style: a page whose items pointer misses yields nothing but pagination continues', async () => {
+    const data = [
+      { orders: [{ id: 'o1' }], nextCursor: 'c2' },
+      { nextCursor: 'c3' }, // no items array — skipped, cursor keeps advancing
+      { orders: [{ id: 'o2' }] },
+    ];
+    const { call, calls } = stub(data);
+    expect(await collect(items(call, CURSOR))).toEqual([{ id: 'o1' }, { id: 'o2' }]);
+    expect(calls).toHaveLength(3);
+  });
+
+  it('offset style: a missing items pointer stops the iteration', async () => {
+    const data = [{ orders: ['a'] }, { note: 'sold out' }];
+    const { call, calls } = stub(data);
+    expect(await collect(items(call, OFFSET))).toEqual(['a']);
+    expect(calls).toHaveLength(2);
+  });
+
+  it('forwards args and init to the underlying pages', async () => {
+    const data = [{ orders: ['a'] }, { orders: [] }];
+    const init: RequestOptions = { headers: { 'X-Trace': '1' } };
+    const { call, calls, sentParams } = stub(data);
+    await collect(items(call, PAGE, { params: { limit: 1 } }, init));
+    expect(sentParams('limit')).toEqual([1, 1]);
+    for (const c of calls) expect(c.init).toBe(init);
+  });
+});
diff --git a/packages/client-generator/src/runtime/__tests__/types.test.ts b/packages/client-generator/src/runtime/__tests__/types.test.ts
index 63f6a0a3e3..c8fca9dd64 100644
--- a/packages/client-generator/src/runtime/__tests__/types.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/types.test.ts
@@ -15,7 +15,13 @@ interface TestOps {
   requiredArgs: { args: { orderId: string }; result: { id: string } };
   optionalArgs: { args: { params?: { limit?: number } }; result: string[] };
   streaming: { args: Record<string, never>; result: { text: string }; kind: 'sse' };
-  [key: string]: { args: object; result: unknown; kind?: 'sse' };
+  listOrders: {
+    args: { params?: { cursor?: string; limit?: number } };
+    result: { orders: Array<{ id: string }>; nextCursor?: string };
+    item: { id: string };
+  };
+  listCafeOrders: { args: { cafeId: string }; result: { orders: string[] }; item: string };
+  [key: string]: { args: object; result: unknown; kind?: 'sse'; item?: unknown };
 }
 
 describe('Client<Ops> mapped type', () => {
@@ -52,6 +58,90 @@ describe('Client<Ops> mapped type', () => {
     void _typeOnly;
   });
 
+  it('paginated entries (with `item`) gain typed .pages/.items; other ops expose neither', () => {
+    // Runtime stub with .pages/.items present so property access does not throw.
+    const paginated = Object.assign(() => {}, { pages: () => {}, items: () => {} });
+    const client = {
+      auth: {},
+      listOrders: paginated,
+      listCafeOrders: paginated,
+    } as unknown as Client<TestOps>;
+
+    // The one-shot method is unchanged; .pages yields the result, .items the item type.
+    expectTypeOf(client.listOrders).toBeCallableWith({ params: { cursor: 'c2' } });
+    expectTypeOf(client.listOrders.pages).returns.toEqualTypeOf<
+      AsyncGenerator<{ orders: Array<{ id: string }>; nextCursor?: string }>
+    >();
+    expectTypeOf(client.listOrders.items).returns.toEqualTypeOf<AsyncGenerator<{ id: string }>>();
+
+    // Args optionality mirrors the method's own: all-optional → callable bare.
+    expectTypeOf(client.listOrders.pages).toBeCallableWith();
+    expectTypeOf(client.listOrders.items).toBeCallableWith(
+      { params: { limit: 5 } },
+      { parseAs: 'json' }
+    );
+    expectTypeOf(client.listCafeOrders.items).toBeCallableWith({ cafeId: 'c1' });
+    expectTypeOf(client.listCafeOrders.items).returns.toEqualTypeOf<AsyncGenerator<string>>();
+
+    const _typeOnly = (): void => {
+      // @ts-expect-error non-paginated operations have no .pages
+      void client.requiredArgs.pages;
+      // @ts-expect-error non-paginated operations have no .items
+      void client.optionalArgs.items;
+      // @ts-expect-error required args cannot be omitted on .items either
+      void client.listCafeOrders.items();
+    };
+    void _typeOnly;
+  });
+
+  it('result-mode paginated entries (with `page`) yield RAW pages; the method keeps the envelope', () => {
+    type OrderPage = { orders: Array<{ id: string }>; nextCursor?: string };
+    interface ResultOps {
+      listOrders: {
+        args: { params?: { cursor?: string } };
+        result: Result<OrderPage, { title: string }>;
+        item: { id: string };
+        page: OrderPage;
+      };
+      [key: string]: {
+        args: object;
+        result: unknown;
+        kind?: 'sse';
+        item?: unknown;
+        page?: unknown;
+      };
+    }
+    const client = {
+      auth: {},
+      listOrders: Object.assign(() => {}, { pages: () => {}, items: () => {} }),
+    } as unknown as Client<ResultOps>;
+
+    // The one-shot call still returns the Result envelope…
+    expectTypeOf(client.listOrders).returns.resolves.toEqualTypeOf<
+      Result<OrderPage, { title: string }>
+    >();
+    // …while .pages() yields the RAW page type and .items() the item type.
+    expectTypeOf(client.listOrders.pages).returns.toEqualTypeOf<AsyncGenerator<OrderPage>>();
+    expectTypeOf(client.listOrders.items).returns.toEqualTypeOf<AsyncGenerator<{ id: string }>>();
+  });
+
+  it('paginated descriptor literals satisfy OperationDescriptor', () => {
+    const op = {
+      id: 'listOrders',
+      method: 'GET',
+      path: '/orders',
+      params: [{ name: 'cursor', in: 'query' }],
+      pagination: {
+        style: 'cursor',
+        param: 'cursor',
+        limitParam: 'limit',
+        nextCursor: '/nextCursor',
+        items: '/orders',
+      },
+    } as const satisfies OperationDescriptor;
+    expect(op.pagination.style).toBe('cursor');
+  });
+
   it('descriptor literals satisfy OperationDescriptor', () => {
     const op = {
       id: 'getOrder',
diff --git a/packages/client-generator/src/runtime/create-client.ts b/packages/client-generator/src/runtime/create-client.ts
index 0b9e171155..ecb821aef2 100644
--- a/packages/client-generator/src/runtime/create-client.ts
+++ b/packages/client-generator/src/runtime/create-client.ts
@@ -9,6 +9,7 @@ import type {
   OperationContext,
   OperationDescriptor,
   OpsShape,
+  PaginationSpec,
   ParseAs,
   QueryValue,
   RequestOptions,
@@ -36,10 +37,24 @@ export type Capabilities = SendCapabilities & {
     init: SseOptions,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
 };
 
 /** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
-type OperationArgs = {
+export type OperationArgs = {
   params?: Record<string, QueryValue>;
   body?: unknown;
   headers?: Record<string, unknown>;
@@ -173,6 +188,39 @@ async function execute(
   return parse(response, readKind);
 }
 
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
 /**
  * Build a typed instance client over operation descriptors: one real bound method per
  * operation (attached by a construction-time loop — no Proxy), plus the core members
@@ -212,8 +260,24 @@ export function createClientCore<
         })();
       };
     } else {
-      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
     }
   }
 
diff --git a/packages/client-generator/src/runtime/index.ts b/packages/client-generator/src/runtime/index.ts
index 1991ab968c..465d02af20 100644
--- a/packages/client-generator/src/runtime/index.ts
+++ b/packages/client-generator/src/runtime/index.ts
@@ -1,6 +1,7 @@
 import { resolveAuth } from './auth.js';
 import { createClientCore } from './create-client.js';
 import { toFormData } from './multipart.js';
+import { items, pages } from './paginate.js';
 import { sse } from './sse.js';
 import type {
   Client,
@@ -12,7 +13,7 @@ import type {
 
 /**
  * The public client factory for package-mode generated clients: `createClientCore`
- * with the full capability set wired (multipart, auth, SSE). The capability seam
+ * with the full capability set wired (multipart, auth, SSE, pagination). The capability seam
  * itself stays internal — the future inline assembler wires only what a spec needs.
  * The trailing string params carry the generated literal unions
  * (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation` for
@@ -31,6 +32,7 @@ export function createClient<
     serializeMultipart: toFormData,
     resolveAuth,
     sse,
+    paginate: { pages, items },
   });
 }
 
diff --git a/packages/client-generator/src/runtime/paginate.ts b/packages/client-generator/src/runtime/paginate.ts
new file mode 100644
index 0000000000..9edff7f9b5
--- /dev/null
+++ b/packages/client-generator/src/runtime/paginate.ts
@@ -0,0 +1,104 @@
+import type { OperationArgs } from './create-client.js';
+import type { PaginationSpec, QueryValue, RequestOptions } from './types.js';
+
+/**
+ * Auto-pagination (capability module — wired into `createClient`, dispatched by the
+ * method's `.pages()`/`.items()`): walk an operation's pages by advancing the descriptor's
+ * `param` query parameter, per its `style`. The caller's args are never mutated — each
+ * request gets a fresh `params` clone — and `init` is forwarded to every call.
+ *
+ * Iteration is error-mode-agnostic: `call` always resolves to the RAW page (on a
+ * result-mode client the attachment unwraps the envelope first), so a failed page
+ * aborts iteration by throwing `ApiError`, even on result-mode clients; the `onError`
+ * middleware hook (throw-mode-only) is not invoked.
+ */
+
+/**
+ * Resolve an RFC 6901 JSON pointer (`~1` → `/`, `~0` → `~`) against a value.
+ * The empty pointer is the whole document; anything else must start with `/`.
+ * Returns `undefined` on any miss (bad token, absent key, non-object step) — never throws.
+ */
+export function resolvePointer(value: unknown, pointer: string): unknown {
+  if (pointer === '') return value;
+  if (!pointer.startsWith('/')) return undefined;
+  let current = value;
+  for (const token of pointer.slice(1).split('/')) {
+    const key = token.replaceAll('~1', '/').replaceAll('~0', '~');
+    if (Array.isArray(current)) {
+      if (!/^(0|[1-9]\d*)$/.test(key)) return undefined;
+      current = current[Number(key)];
+    } else if (Object(current) === current && key in (current as object)) {
+      current = (current as Record<string, unknown>)[key];
+    } else {
+      return undefined;
+    }
+  }
+  return current;
+}
+
+/**
+ * Iterate an operation's full page results. Every page is yielded before the stop
+ * condition is evaluated, so the last page always arrives. Cursor style resumes from a
+ * caller-provided `params[spec.param]`, stops when `nextCursor` resolves to
+ * `undefined`/`null`/`''`, and throws if the next cursor is not a string or number, or
+ * if the same cursor comes back twice in a row (infinite-loop guards). Offset/page
+ * styles advance by item count / by one and stop when
+ * the `items` pointer misses or the array is empty.
+ */
+export async function* pages<TPage>(
+  call: (args?: OperationArgs, init?: RequestOptions) => Promise<TPage>,
+  spec: PaginationSpec,
+  args: OperationArgs = {},
+  init?: RequestOptions
+): AsyncGenerator<TPage> {
+  if (spec.style === 'cursor') {
+    let cursor: unknown = args.params?.[spec.param];
+    while (true) {
+      const params = { ...args.params };
+      if (cursor !== undefined) params[spec.param] = cursor as QueryValue;
+      const page = await call({ ...args, params }, init);
+      yield page;
+      const next = resolvePointer(page, spec.nextCursor!);
+      if (next === undefined || next === null || next === '') return;
+      if (typeof next !== 'string' && typeof next !== 'number') {
+        // A fresh non-scalar cursor never compares equal, so without this guard a lying
+        // server would slip past the did-not-advance check into an infinite loop.
+        throw new Error(`Pagination cursor at ${spec.nextCursor} is not a string or number`);
+      }
+      if (next === cursor) {
+        throw new Error('Pagination did not advance: operation returned the same cursor twice');
+      }
+      cursor = next;
+    }
+  } else {
+    let position =
+      (args.params?.[spec.param] as number | undefined) ?? (spec.style === 'page' ? 1 : 0);
+    while (true) {
+      const page = await call(
+        { ...args, params: { ...args.params, [spec.param]: position } },
+        init
+      );
+      yield page;
+      const pageItems = resolvePointer(page, spec.items);
+      if (!Array.isArray(pageItems) || pageItems.length === 0) return;
+      position += spec.style === 'page' ? 1 : pageItems.length;
+    }
+  }
+}
+
+/**
+ * Iterate the operation's individual items: each page's `items` pointer, flattened.
+ * A cursor-style page whose pointer misses yields nothing but pagination continues;
+ * for offset/page styles a miss has already stopped `pages`.
+ */
+export async function* items<TItem>(
+  call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  spec: PaginationSpec,
+  args?: OperationArgs,
+  init?: RequestOptions
+): AsyncGenerator<TItem> {
+  for await (const page of pages(call, spec, args, init)) {
+    const pageItems = resolvePointer(page, spec.items);
+    if (Array.isArray(pageItems)) yield* pageItems as TItem[];
+  }
+}
diff --git a/packages/client-generator/src/runtime/types.ts b/packages/client-generator/src/runtime/types.ts
index db495b6f0c..3e40b0e325 100644
--- a/packages/client-generator/src/runtime/types.ts
+++ b/packages/client-generator/src/runtime/types.ts
@@ -20,6 +20,22 @@ export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
 
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
 /** The frozen data contract between generated code and the runtime: one operation's wire shape. */
 export type OperationDescriptor = {
   id: string;
@@ -33,6 +49,7 @@ export type OperationDescriptor = {
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
   security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
 };
 
 /** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
@@ -159,8 +176,16 @@ export type Result<TData, TError> =
   | { data: TData; error: undefined; response: Response }
   | { data: undefined; error: TError; response: Response };
 
-/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
-export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
 
 /** The always-present client members (assigned after the operation loop — they win collisions). */
 export type ClientCore<Op extends OperationContext = OperationContext> = {
@@ -182,6 +207,35 @@ export type ClientCore<Op extends OperationContext = OperationContext> = {
 // oxlint-disable-next-line typescript/no-empty-object-type
 type NoRequiredKeys<A> = {} extends A ? true : false;
 
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
 /** The typed instance client: one bound method per operation plus the core members. */
 export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
   [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
@@ -194,7 +248,8 @@ export type Client<Ops extends OpsShape, Op extends OperationContext = Operation
           args: Ops[K]['args'],
           init?: SseOptions
         ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : NoRequiredKeys<Ops[K]['args']> extends true
-      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
 } & ClientCore<Op>;
diff --git a/packages/client-generator/src/types.ts b/packages/client-generator/src/types.ts
index 3601f18224..af8831ac38 100644
--- a/packages/client-generator/src/types.ts
+++ b/packages/client-generator/src/types.ts
@@ -1,6 +1,7 @@
 import type { Config as RedoclyConfig, Oas3Definition, detectSpec } from '@redocly/openapi-core';
 
 import type { ArgsStyle } from './emitters/client.js';
+import type { PaginationConfig } from './emitters/pagination.js';
 import type { CustomGenerator } from './generators/types.js';
 import type { OutputMode } from './writers/types.js';
 
@@ -91,6 +92,15 @@ export type GenerateClientOptions = {
   setup?: string;
   /** Runtime distribution: 'inline' (default, self-contained) | 'package' (imports @redocly/client-generator). */
   runtime?: 'inline' | 'package';
+  /**
+   * Auto-pagination rules: a convention rule (applied to every operation it
+   * structurally fits), per-operation overrides, and `exclude`d operationIds —
+   * resolved together with each operation's `x-pagination` extension (per-op config >
+   * extension > convention). Paginated operations gain typed `.pages()`/`.items()`
+   * iterators. Verified statically: an explicit rule that doesn't fit its operation
+   * fails generation.
+   */
+  pagination?: PaginationConfig;
 };
 
 export type GenerateClientResult = {
diff --git a/packages/core/src/__tests__/__snapshots__/redocly-yaml.test.ts.snap b/packages/core/src/__tests__/__snapshots__/redocly-yaml.test.ts.snap
index aba2442e2f..51dd543b14 100644
--- a/packages/core/src/__tests__/__snapshots__/redocly-yaml.test.ts.snap
+++ b/packages/core/src/__tests__/__snapshots__/redocly-yaml.test.ts.snap
@@ -258,6 +258,7 @@ exports[`createConfigTypes > matches snapshot for the default config schema 1`]
           "split",
         ],
       },
+      "pagination": "ClientPagination",
       "queryFramework": {
         "enum": [
           "react",
@@ -280,6 +281,69 @@ exports[`createConfigTypes > matches snapshot for the default config schema 1`]
       },
     },
   },
+  "ClientPagination": {
+    "properties": {
+      "cursorParam": {
+        "type": "string",
+      },
+      "exclude": {
+        "items": {
+          "type": "string",
+        },
+        "type": "array",
+      },
+      "items": {
+        "type": "string",
+      },
+      "limitParam": {
+        "type": "string",
+      },
+      "nextCursor": {
+        "type": "string",
+      },
+      "offsetParam": {
+        "type": "string",
+      },
+      "operations": {
+        "additionalProperties": [Function],
+        "name": "ClientPaginationRuleMap",
+        "properties": {},
+      },
+      "style": {
+        "enum": [
+          "cursor",
+          "offset",
+          "page",
+        ],
+      },
+    },
+  },
+  "ClientPaginationRule": {
+    "properties": {
+      "cursorParam": {
+        "type": "string",
+      },
+      "items": {
+        "type": "string",
+      },
+      "limitParam": {
+        "type": "string",
+      },
+      "nextCursor": {
+        "type": "string",
+      },
+      "offsetParam": {
+        "type": "string",
+      },
+      "style": {
+        "enum": [
+          "cursor",
+          "offset",
+          "page",
+        ],
+      },
+    },
+  },
   "ConfigApis": {
     "additionalProperties": "ConfigApisProperties",
     "description": "The \`apis\` configuration section is used when a project contains multiple API descriptions to set up different rules and settings for individual APIs. It allows defining specific configurations for each API, which must be identified by a unique name.",
diff --git a/packages/core/src/types/redocly-yaml.ts b/packages/core/src/types/redocly-yaml.ts
index 186fb41b78..931b3b208a 100644
--- a/packages/core/src/types/redocly-yaml.ts
+++ b/packages/core/src/types/redocly-yaml.ts
@@ -367,6 +367,33 @@ const Client: NodeType = {
     mockData: { enum: ['baked', 'faker'] },
     mockSeed: { type: 'number' },
     setup: { type: 'string' },
+    pagination: 'ClientPagination',
+  },
+};
+
+// One pagination rule — the shared field set of the `client.pagination` convention block
+// and each `operations` override. Every field is optional here: the style-conditional
+// requirements (`cursor` needs `cursorParam` + `nextCursor`; `offset`/`page` need
+// `offsetParam`; `items` always) are enforced by the generator with richer messages, so
+// this type only gates key names and value types.
+const ClientPaginationRule: NodeType = {
+  properties: {
+    style: { enum: ['cursor', 'offset', 'page'] },
+    cursorParam: { type: 'string' },
+    nextCursor: { type: 'string' },
+    offsetParam: { type: 'string' },
+    limitParam: { type: 'string' },
+    items: { type: 'string' },
+  },
+};
+
+// `client.pagination`: an optional convention rule (the rule fields, applied to every
+// operation it structurally fits), plus per-operation overrides and exclusions.
+const ClientPagination: NodeType = {
+  properties: {
+    ...ClientPaginationRule.properties,
+    exclude: { type: 'array', items: { type: 'string' } },
+    operations: mapOf('ClientPaginationRule'),
   },
 };
 
@@ -767,6 +794,8 @@ const CoreConfigTypes: Record<string, NodeType> = {
   ConfigGovernance,
   ConfigHTTP,
   Client,
+  ClientPagination,
+  ClientPaginationRule,
   Where,
   BuiltinRule,
   CustomRule,
diff --git a/tests/e2e/generate-client/base-consumer/api.ts b/tests/e2e/generate-client/base-consumer/api.ts
index d7f8573f29..7ee7bc1bb9 100644
--- a/tests/e2e/generate-client/base-consumer/api.ts
+++ b/tests/e2e/generate-client/base-consumer/api.ts
@@ -232,6 +232,22 @@ export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
 
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
 /** The frozen data contract between generated code and the runtime: one operation's wire shape. */
 export type OperationDescriptor = {
   id: string;
@@ -245,6 +261,7 @@ export type OperationDescriptor = {
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
   security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
 };
 
 /** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
@@ -371,8 +388,16 @@ export type Result<TData, TError> =
   | { data: TData; error: undefined; response: Response }
   | { data: undefined; error: TError; response: Response };
 
-/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
-export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
 
 /** The always-present client members (assigned after the operation loop — they win collisions). */
 export type ClientCore<Op extends OperationContext = OperationContext> = {
@@ -394,6 +419,35 @@ export type ClientCore<Op extends OperationContext = OperationContext> = {
 // oxlint-disable-next-line typescript/no-empty-object-type
 type NoRequiredKeys<A> = {} extends A ? true : false;
 
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
 /** The typed instance client: one bound method per operation plus the core members. */
 export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
   [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
@@ -406,9 +460,10 @@ export type Client<Ops extends OpsShape, Op extends OperationContext = Operation
           args: Ops[K]['args'],
           init?: SseOptions
         ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : NoRequiredKeys<Ops[K]['args']> extends true
-      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
 } & ClientCore<Op>;
 
 /** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
@@ -764,6 +819,20 @@ type Capabilities = SendCapabilities & {
     init: SseOptions,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
 };
 
 /** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
@@ -901,6 +970,39 @@ async function execute(
   return parse(response, readKind);
 }
 
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
 /**
  * Build a typed instance client over operation descriptors: one real bound method per
  * operation (attached by a construction-time loop — no Proxy), plus the core members
@@ -940,8 +1042,24 @@ function createClientCore<
         })();
       };
     } else {
-      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
     }
   }
 
diff --git a/tests/e2e/generate-client/cafe-consumer/api.ts b/tests/e2e/generate-client/cafe-consumer/api.ts
index e30ede388a..458f2664fc 100644
--- a/tests/e2e/generate-client/cafe-consumer/api.ts
+++ b/tests/e2e/generate-client/cafe-consumer/api.ts
@@ -824,6 +824,22 @@ export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
 
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
 /** The frozen data contract between generated code and the runtime: one operation's wire shape. */
 export type OperationDescriptor = {
   id: string;
@@ -837,6 +853,7 @@ export type OperationDescriptor = {
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
   security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
 };
 
 /** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
@@ -963,8 +980,16 @@ export type Result<TData, TError> =
   | { data: TData; error: undefined; response: Response }
   | { data: undefined; error: TError; response: Response };
 
-/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
-export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
 
 /** The always-present client members (assigned after the operation loop — they win collisions). */
 export type ClientCore<Op extends OperationContext = OperationContext> = {
@@ -986,6 +1011,35 @@ export type ClientCore<Op extends OperationContext = OperationContext> = {
 // oxlint-disable-next-line typescript/no-empty-object-type
 type NoRequiredKeys<A> = {} extends A ? true : false;
 
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
 /** The typed instance client: one bound method per operation plus the core members. */
 export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
   [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
@@ -998,9 +1052,10 @@ export type Client<Ops extends OpsShape, Op extends OperationContext = Operation
           args: Ops[K]['args'],
           init?: SseOptions
         ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : NoRequiredKeys<Ops[K]['args']> extends true
-      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
 } & ClientCore<Op>;
 
 /** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
@@ -1397,6 +1452,20 @@ type Capabilities = SendCapabilities & {
     init: SseOptions,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
 };
 
 /** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
@@ -1534,6 +1603,39 @@ async function execute(
   return parse(response, readKind);
 }
 
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
 /**
  * Build a typed instance client over operation descriptors: one real bound method per
  * operation (attached by a construction-time loop — no Proxy), plus the core members
@@ -1573,8 +1675,24 @@ function createClientCore<
         })();
       };
     } else {
-      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
     }
   }
 
diff --git a/tests/e2e/generate-client/cafe.snapshot.ts b/tests/e2e/generate-client/cafe.snapshot.ts
index 1ad55ad78b..53829f9444 100644
--- a/tests/e2e/generate-client/cafe.snapshot.ts
+++ b/tests/e2e/generate-client/cafe.snapshot.ts
@@ -824,6 +824,22 @@ export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
 
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
 /** The frozen data contract between generated code and the runtime: one operation's wire shape. */
 export type OperationDescriptor = {
   id: string;
@@ -837,6 +853,7 @@ export type OperationDescriptor = {
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
   security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
 };
 
 /** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
@@ -963,8 +980,16 @@ export type Result<TData, TError> =
   | { data: TData; error: undefined; response: Response }
   | { data: undefined; error: TError; response: Response };
 
-/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
-export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
 
 /** The always-present client members (assigned after the operation loop — they win collisions). */
 export type ClientCore<Op extends OperationContext = OperationContext> = {
@@ -986,6 +1011,35 @@ export type ClientCore<Op extends OperationContext = OperationContext> = {
 // oxlint-disable-next-line typescript/no-empty-object-type
 type NoRequiredKeys<A> = {} extends A ? true : false;
 
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
 /** The typed instance client: one bound method per operation plus the core members. */
 export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
   [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
@@ -998,9 +1052,10 @@ export type Client<Ops extends OpsShape, Op extends OperationContext = Operation
           args: Ops[K]['args'],
           init?: SseOptions
         ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : NoRequiredKeys<Ops[K]['args']> extends true
-      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
 } & ClientCore<Op>;
 
 /** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
@@ -1397,6 +1452,20 @@ type Capabilities = SendCapabilities & {
     init: SseOptions,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
 };
 
 /** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
@@ -1534,6 +1603,39 @@ async function execute(
   return parse(response, readKind);
 }
 
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
 /**
  * Build a typed instance client over operation descriptors: one real bound method per
  * operation (attached by a construction-time loop — no Proxy), plus the core members
@@ -1573,8 +1675,24 @@ function createClientCore<
         })();
       };
     } else {
-      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
     }
   }
 
diff --git a/tests/e2e/generate-client/examples.test.ts b/tests/e2e/generate-client/examples.test.ts
index 37f24553c3..42abfacb26 100644
--- a/tests/e2e/generate-client/examples.test.ts
+++ b/tests/e2e/generate-client/examples.test.ts
@@ -24,6 +24,8 @@ const EXAMPLES = [
   'multi-instance',
   'sse-streaming',
   'vendored-edge',
+  'pagination',
+  'custom-pagination',
 ];
 
 /**
diff --git a/tests/e2e/generate-client/examples/README.md b/tests/e2e/generate-client/examples/README.md
index c362f129c2..2748e396c3 100644
--- a/tests/e2e/generate-client/examples/README.md
+++ b/tests/e2e/generate-client/examples/README.md
@@ -21,6 +21,8 @@ the `generateClient(...)` API.
 | [multi-instance](./multi-instance)                     | CLI · `sdk`, package runtime  | per-tenant instances via `createClient(OPERATIONS)` — works in both runtimes; this example uses `runtime: package`                        |
 | [sse-streaming](./sse-streaming)                       | CLI · `sdk`                   | typed `for await` over SSE, auto-reconnect via `Last-Event-ID` (`reconnectDelay`/`reconnect: false`), clean abort                         |
 | [vendored-edge](./vendored-edge)                       | CLI · `sdk`                   | the generated file copied into a no-npm edge worker (`export default { fetch }`); `typescript` is the only dev tool                       |
+| [pagination](./pagination)                             | CLI · `sdk`                   | auto-pagination from a `client.pagination` convention: `for await` over `.items()`/`.pages()` next to the unchanged one-shot call         |
+| [custom-pagination](./custom-pagination)               | CLI · `sdk`                   | hand-written paging over the typed client for shapes the built-in styles don't cover (body cursors)                                       |
 
 ## Run one
 
diff --git a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
index 1603af2ecc..bcbcf63f21 100644
--- a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
@@ -824,6 +824,22 @@ export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
 
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
 /** The frozen data contract between generated code and the runtime: one operation's wire shape. */
 export type OperationDescriptor = {
   id: string;
@@ -837,6 +853,7 @@ export type OperationDescriptor = {
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
   security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
 };
 
 /** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
@@ -963,8 +980,16 @@ export type Result<TData, TError> =
   | { data: TData; error: undefined; response: Response }
   | { data: undefined; error: TError; response: Response };
 
-/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
-export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
 
 /** The always-present client members (assigned after the operation loop — they win collisions). */
 export type ClientCore<Op extends OperationContext = OperationContext> = {
@@ -986,6 +1011,35 @@ export type ClientCore<Op extends OperationContext = OperationContext> = {
 // oxlint-disable-next-line typescript/no-empty-object-type
 type NoRequiredKeys<A> = {} extends A ? true : false;
 
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
 /** The typed instance client: one bound method per operation plus the core members. */
 export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
   [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
@@ -998,9 +1052,10 @@ export type Client<Ops extends OpsShape, Op extends OperationContext = Operation
           args: Ops[K]['args'],
           init?: SseOptions
         ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : NoRequiredKeys<Ops[K]['args']> extends true
-      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
 } & ClientCore<Op>;
 
 /** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
@@ -1413,6 +1468,20 @@ type Capabilities = SendCapabilities & {
     init: SseOptions,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
 };
 
 /** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
@@ -1550,6 +1619,39 @@ async function execute(
   return parse(response, readKind);
 }
 
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
 /**
  * Build a typed instance client over operation descriptors: one real bound method per
  * operation (attached by a construction-time loop — no Proxy), plus the core members
@@ -1589,8 +1691,24 @@ function createClientCore<
         })();
       };
     } else {
-      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
     }
   }
 
diff --git a/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts b/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
index 68315fc686..4fb364f02a 100644
--- a/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
@@ -177,6 +177,22 @@ export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
 
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
 /** The frozen data contract between generated code and the runtime: one operation's wire shape. */
 export type OperationDescriptor = {
   id: string;
@@ -190,6 +206,7 @@ export type OperationDescriptor = {
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
   security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
 };
 
 /** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
@@ -316,8 +333,16 @@ export type Result<TData, TError> =
   | { data: TData; error: undefined; response: Response }
   | { data: undefined; error: TError; response: Response };
 
-/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
-export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
 
 /** The always-present client members (assigned after the operation loop — they win collisions). */
 export type ClientCore<Op extends OperationContext = OperationContext> = {
@@ -339,6 +364,35 @@ export type ClientCore<Op extends OperationContext = OperationContext> = {
 // oxlint-disable-next-line typescript/no-empty-object-type
 type NoRequiredKeys<A> = {} extends A ? true : false;
 
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
 /** The typed instance client: one bound method per operation plus the core members. */
 export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
   [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
@@ -351,9 +405,10 @@ export type Client<Ops extends OpsShape, Op extends OperationContext = Operation
           args: Ops[K]['args'],
           init?: SseOptions
         ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : NoRequiredKeys<Ops[K]['args']> extends true
-      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
 } & ClientCore<Op>;
 
 /** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
@@ -750,6 +805,20 @@ type Capabilities = SendCapabilities & {
     init: SseOptions,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
 };
 
 /** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
@@ -887,6 +956,39 @@ async function execute(
   return parse(response, readKind);
 }
 
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
 /**
  * Build a typed instance client over operation descriptors: one real bound method per
  * operation (attached by a construction-time loop — no Proxy), plus the core members
@@ -926,8 +1028,24 @@ function createClientCore<
         })();
       };
     } else {
-      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
     }
   }
 
diff --git a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
index 1ad55ad78b..53829f9444 100644
--- a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
@@ -824,6 +824,22 @@ export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
 
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
 /** The frozen data contract between generated code and the runtime: one operation's wire shape. */
 export type OperationDescriptor = {
   id: string;
@@ -837,6 +853,7 @@ export type OperationDescriptor = {
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
   security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
 };
 
 /** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
@@ -963,8 +980,16 @@ export type Result<TData, TError> =
   | { data: TData; error: undefined; response: Response }
   | { data: undefined; error: TError; response: Response };
 
-/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
-export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
 
 /** The always-present client members (assigned after the operation loop — they win collisions). */
 export type ClientCore<Op extends OperationContext = OperationContext> = {
@@ -986,6 +1011,35 @@ export type ClientCore<Op extends OperationContext = OperationContext> = {
 // oxlint-disable-next-line typescript/no-empty-object-type
 type NoRequiredKeys<A> = {} extends A ? true : false;
 
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
 /** The typed instance client: one bound method per operation plus the core members. */
 export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
   [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
@@ -998,9 +1052,10 @@ export type Client<Ops extends OpsShape, Op extends OperationContext = Operation
           args: Ops[K]['args'],
           init?: SseOptions
         ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : NoRequiredKeys<Ops[K]['args']> extends true
-      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
 } & ClientCore<Op>;
 
 /** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
@@ -1397,6 +1452,20 @@ type Capabilities = SendCapabilities & {
     init: SseOptions,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
 };
 
 /** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
@@ -1534,6 +1603,39 @@ async function execute(
   return parse(response, readKind);
 }
 
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
 /**
  * Build a typed instance client over operation descriptors: one real bound method per
  * operation (attached by a construction-time loop — no Proxy), plus the core members
@@ -1573,8 +1675,24 @@ function createClientCore<
         })();
       };
     } else {
-      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
     }
   }
 
diff --git a/tests/e2e/generate-client/examples/custom-pagination/.gitignore b/tests/e2e/generate-client/examples/custom-pagination/.gitignore
new file mode 100644
index 0000000000..3c3629e647
--- /dev/null
+++ b/tests/e2e/generate-client/examples/custom-pagination/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/tests/e2e/generate-client/examples/custom-pagination/README.md b/tests/e2e/generate-client/examples/custom-pagination/README.md
new file mode 100644
index 0000000000..47f10b8e8a
--- /dev/null
+++ b/tests/e2e/generate-client/examples/custom-pagination/README.md
@@ -0,0 +1,18 @@
+# custom-pagination
+
+Hand-written paging over the generated client, for shapes the built-in
+[`client.pagination` styles](../../../../../docs/@v2/configuration/reference/client.md)
+don't cover — here a cursor that travels in the **request body**. There is deliberately
+no `client.pagination` block: the generated `searchOrders` call is fully typed, so a
+five-line `paginate` helper is all it takes (see `src/main.ts`).
+
+For APIs the declared styles fit, prefer the native `.pages()`/`.items()` iterators —
+see the sibling [`pagination`](../pagination) example.
+
+## Run
+
+```bash
+npm install
+npm run generate
+npm start
+```
diff --git a/tests/e2e/generate-client/examples/custom-pagination/openapi.yaml b/tests/e2e/generate-client/examples/custom-pagination/openapi.yaml
new file mode 100644
index 0000000000..dab7639f6b
--- /dev/null
+++ b/tests/e2e/generate-client/examples/custom-pagination/openapi.yaml
@@ -0,0 +1,59 @@
+openapi: 3.1.0
+info:
+  title: Cafe Orders Search API
+  description: A body-cursor search API for the hand-written pagination example.
+  version: 1.0.0
+servers:
+  - url: https://api.cafe-orders.example.com
+paths:
+  /orders/search:
+    post:
+      operationId: searchOrders
+      summary: Search orders; the page cursor travels in the request BODY
+      description: >-
+        Body-cursor pagination — a shape the built-in styles do not cover (they only
+        advance query parameters), so the example pages through it with a small
+        hand-written helper over the generated typed call.
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                status:
+                  type: string
+                cursor:
+                  description: Opaque cursor of the page to fetch; omit for the first page.
+                  type: string
+                limit:
+                  type: integer
+      responses:
+        '200':
+          description: One page of matching orders.
+          content:
+            application/json:
+              schema:
+                type: object
+                required: [items]
+                properties:
+                  items:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/Order'
+                  nextCursor:
+                    description: Cursor of the next page; absent on the last page.
+                    type: string
+components:
+  schemas:
+    Order:
+      type: object
+      required: [id, drink, status]
+      properties:
+        id:
+          type: string
+        drink:
+          type: string
+        status:
+          type: string
+          enum: [pending, ready, delivered]
diff --git a/tests/e2e/generate-client/examples/custom-pagination/package.json b/tests/e2e/generate-client/examples/custom-pagination/package.json
new file mode 100644
index 0000000000..8129e28db8
--- /dev/null
+++ b/tests/e2e/generate-client/examples/custom-pagination/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "@redocly-examples/custom-pagination",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "generate": "redocly generate-client",
+    "start": "tsx src/main.ts"
+  },
+  "devDependencies": {
+    "@redocly/cli": "latest",
+    "tsx": "^4.0.0",
+    "typescript": "^5.5.0"
+  }
+}
diff --git a/tests/e2e/generate-client/examples/custom-pagination/redocly.yaml b/tests/e2e/generate-client/examples/custom-pagination/redocly.yaml
new file mode 100644
index 0000000000..f78904a9c5
--- /dev/null
+++ b/tests/e2e/generate-client/examples/custom-pagination/redocly.yaml
@@ -0,0 +1,13 @@
+# redocly.yaml — drives `redocly generate-client` for this example.
+#
+# Deliberately NO `client.pagination` block: this API's cursor travels in the request
+# BODY, a shape the built-in styles don't cover (they only advance query parameters).
+# The example pages through it with a small hand-written helper instead — see
+# src/main.ts. The sibling `pagination` example shows the native declared styles.
+apis:
+  custom-pagination:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
diff --git a/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts b/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
new file mode 100644
index 0000000000..e70688fb5b
--- /dev/null
+++ b/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
@@ -0,0 +1,971 @@
+// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Cafe Orders Search API (v1.0.0)
+ * A body-cursor search API for the hand-written pagination example.
+ */
+
+export type Order = {
+    id: string;
+    drink: string;
+    status: "pending" | "ready" | "delivered";
+};
+
+export type SearchOrdersResult = {
+    items: Order[];
+    /**
+     * Cursor of the next page; absent on the last page.
+     */
+    nextCursor?: string;
+};
+
+export type SearchOrdersBody = {
+    status?: string;
+    /**
+     * Opaque cursor of the page to fetch; omit for the first page.
+     */
+    cursor?: string;
+    limit?: number;
+};
+
+export type SearchOrdersVariables = {
+    body: SearchOrdersBody;
+};
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    searchOrders: {
+        args: {
+            body: SearchOrdersBody;
+        };
+        result: SearchOrdersResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    searchOrders: { id: "searchOrders", method: "POST", path: "/orders/search", body: { contentType: "application/json" } }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
+
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
+};
+
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
+/**
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
+ */
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, {});
+}
+
+export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS, { serverUrl: "https://api.cafe-orders.example.com" });
+
+export const { configure, use } = client;
+export const searchOrders = (body: {
+    status?: string;
+    /**
+     * Opaque cursor of the page to fetch; omit for the first page.
+     */
+    cursor?: string;
+    limit?: number;
+}, init: RequestOptions = {}) => client.searchOrders({ body }, init);
diff --git a/tests/e2e/generate-client/examples/custom-pagination/src/main.ts b/tests/e2e/generate-client/examples/custom-pagination/src/main.ts
new file mode 100644
index 0000000000..3917c324c6
--- /dev/null
+++ b/tests/e2e/generate-client/examples/custom-pagination/src/main.ts
@@ -0,0 +1,43 @@
+// custom-pagination — hand-written paging over the generated typed client.
+//
+// This API's cursor travels in the request BODY, which the built-in pagination styles
+// don't cover (they only advance query parameters) — so there is no `client.pagination`
+// block here and `searchOrders` has no `.pages()`/`.items()`. The escape hatch is a few
+// lines: the generated call is already fully typed, so the helper (and everything it
+// yields) is too. For APIs the declared styles DO fit, prefer the native iterators —
+// see the sibling `pagination` example.
+import { configure, searchOrders } from './api/client.js';
+
+// A canned transport so the example runs offline: two pages keyed by the BODY cursor.
+const SEARCH_PAGES: Record<string, unknown> = {
+  '': {
+    items: [{ id: 'ord-101', drink: 'espresso', status: 'ready' }],
+    nextCursor: 's2',
+  },
+  s2: {
+    items: [{ id: 'ord-104', drink: 'flat white', status: 'ready' }],
+  },
+};
+const canned = (async (_url: string, init?: RequestInit) => {
+  const { cursor } = JSON.parse(String(init?.body)) as { cursor?: string };
+  return new Response(JSON.stringify(SEARCH_PAGES[cursor ?? '']), {
+    headers: { 'content-type': 'application/json' },
+  });
+}) as unknown as typeof fetch;
+
+configure({ fetch: canned });
+
+// The whole helper: call a page, yield its items, follow the cursor until it stops.
+async function* paginate<Item>(
+  page: (cursor?: string) => Promise<{ items?: Item[]; nextCursor?: string }>
+): AsyncGenerator<Item> {
+  for (let cursor: string | undefined; ; ) {
+    const { items, nextCursor } = await page(cursor);
+    yield* items ?? [];
+    if (!(cursor = nextCursor)) return;
+  }
+}
+
+for await (const order of paginate((cursor) => searchOrders({ status: 'ready', cursor }))) {
+  console.log(`search hit ${order.id}: ${order.drink}`); // `order` is `Order` — typed end to end
+}
diff --git a/tests/e2e/generate-client/examples/custom-pagination/tsconfig.json b/tests/e2e/generate-client/examples/custom-pagination/tsconfig.json
new file mode 100644
index 0000000000..4bd6962d40
--- /dev/null
+++ b/tests/e2e/generate-client/examples/custom-pagination/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../tsconfig.base.json",
+  "include": ["src"]
+}
diff --git a/tests/e2e/generate-client/examples/customization/src/api/client.ts b/tests/e2e/generate-client/examples/customization/src/api/client.ts
index 1ad55ad78b..53829f9444 100644
--- a/tests/e2e/generate-client/examples/customization/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/customization/src/api/client.ts
@@ -824,6 +824,22 @@ export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
 
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
 /** The frozen data contract between generated code and the runtime: one operation's wire shape. */
 export type OperationDescriptor = {
   id: string;
@@ -837,6 +853,7 @@ export type OperationDescriptor = {
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
   security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
 };
 
 /** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
@@ -963,8 +980,16 @@ export type Result<TData, TError> =
   | { data: TData; error: undefined; response: Response }
   | { data: undefined; error: TError; response: Response };
 
-/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
-export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
 
 /** The always-present client members (assigned after the operation loop — they win collisions). */
 export type ClientCore<Op extends OperationContext = OperationContext> = {
@@ -986,6 +1011,35 @@ export type ClientCore<Op extends OperationContext = OperationContext> = {
 // oxlint-disable-next-line typescript/no-empty-object-type
 type NoRequiredKeys<A> = {} extends A ? true : false;
 
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
 /** The typed instance client: one bound method per operation plus the core members. */
 export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
   [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
@@ -998,9 +1052,10 @@ export type Client<Ops extends OpsShape, Op extends OperationContext = Operation
           args: Ops[K]['args'],
           init?: SseOptions
         ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : NoRequiredKeys<Ops[K]['args']> extends true
-      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
 } & ClientCore<Op>;
 
 /** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
@@ -1397,6 +1452,20 @@ type Capabilities = SendCapabilities & {
     init: SseOptions,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
 };
 
 /** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
@@ -1534,6 +1603,39 @@ async function execute(
   return parse(response, readKind);
 }
 
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
 /**
  * Build a typed instance client over operation descriptors: one real bound method per
  * operation (attached by a construction-time loop — no Proxy), plus the core members
@@ -1573,8 +1675,24 @@ function createClientCore<
         })();
       };
     } else {
-      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
     }
   }
 
diff --git a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
index 1ad55ad78b..53829f9444 100644
--- a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
@@ -824,6 +824,22 @@ export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
 
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
 /** The frozen data contract between generated code and the runtime: one operation's wire shape. */
 export type OperationDescriptor = {
   id: string;
@@ -837,6 +853,7 @@ export type OperationDescriptor = {
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
   security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
 };
 
 /** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
@@ -963,8 +980,16 @@ export type Result<TData, TError> =
   | { data: TData; error: undefined; response: Response }
   | { data: undefined; error: TError; response: Response };
 
-/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
-export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
 
 /** The always-present client members (assigned after the operation loop — they win collisions). */
 export type ClientCore<Op extends OperationContext = OperationContext> = {
@@ -986,6 +1011,35 @@ export type ClientCore<Op extends OperationContext = OperationContext> = {
 // oxlint-disable-next-line typescript/no-empty-object-type
 type NoRequiredKeys<A> = {} extends A ? true : false;
 
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
 /** The typed instance client: one bound method per operation plus the core members. */
 export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
   [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
@@ -998,9 +1052,10 @@ export type Client<Ops extends OpsShape, Op extends OperationContext = Operation
           args: Ops[K]['args'],
           init?: SseOptions
         ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : NoRequiredKeys<Ops[K]['args']> extends true
-      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
 } & ClientCore<Op>;
 
 /** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
@@ -1397,6 +1452,20 @@ type Capabilities = SendCapabilities & {
     init: SseOptions,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
 };
 
 /** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
@@ -1534,6 +1603,39 @@ async function execute(
   return parse(response, readKind);
 }
 
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
 /**
  * Build a typed instance client over operation descriptors: one real bound method per
  * operation (attached by a construction-time loop — no Proxy), plus the core members
@@ -1573,8 +1675,24 @@ function createClientCore<
         })();
       };
     } else {
-      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
     }
   }
 
diff --git a/tests/e2e/generate-client/examples/mock/src/api/client.ts b/tests/e2e/generate-client/examples/mock/src/api/client.ts
index 1ad55ad78b..53829f9444 100644
--- a/tests/e2e/generate-client/examples/mock/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/mock/src/api/client.ts
@@ -824,6 +824,22 @@ export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
 
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
 /** The frozen data contract between generated code and the runtime: one operation's wire shape. */
 export type OperationDescriptor = {
   id: string;
@@ -837,6 +853,7 @@ export type OperationDescriptor = {
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
   security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
 };
 
 /** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
@@ -963,8 +980,16 @@ export type Result<TData, TError> =
   | { data: TData; error: undefined; response: Response }
   | { data: undefined; error: TError; response: Response };
 
-/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
-export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
 
 /** The always-present client members (assigned after the operation loop — they win collisions). */
 export type ClientCore<Op extends OperationContext = OperationContext> = {
@@ -986,6 +1011,35 @@ export type ClientCore<Op extends OperationContext = OperationContext> = {
 // oxlint-disable-next-line typescript/no-empty-object-type
 type NoRequiredKeys<A> = {} extends A ? true : false;
 
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
 /** The typed instance client: one bound method per operation plus the core members. */
 export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
   [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
@@ -998,9 +1052,10 @@ export type Client<Ops extends OpsShape, Op extends OperationContext = Operation
           args: Ops[K]['args'],
           init?: SseOptions
         ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : NoRequiredKeys<Ops[K]['args']> extends true
-      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
 } & ClientCore<Op>;
 
 /** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
@@ -1397,6 +1452,20 @@ type Capabilities = SendCapabilities & {
     init: SseOptions,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
 };
 
 /** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
@@ -1534,6 +1603,39 @@ async function execute(
   return parse(response, readKind);
 }
 
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
 /**
  * Build a typed instance client over operation descriptors: one real bound method per
  * operation (attached by a construction-time loop — no Proxy), plus the core members
@@ -1573,8 +1675,24 @@ function createClientCore<
         })();
       };
     } else {
-      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
     }
   }
 
diff --git a/tests/e2e/generate-client/examples/pagination/.gitignore b/tests/e2e/generate-client/examples/pagination/.gitignore
new file mode 100644
index 0000000000..3c3629e647
--- /dev/null
+++ b/tests/e2e/generate-client/examples/pagination/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/tests/e2e/generate-client/examples/pagination/README.md b/tests/e2e/generate-client/examples/pagination/README.md
new file mode 100644
index 0000000000..799cbc4689
--- /dev/null
+++ b/tests/e2e/generate-client/examples/pagination/README.md
@@ -0,0 +1,16 @@
+# pagination example
+
+Auto-pagination from a `redocly.yaml` convention: the `client.pagination` block declares
+one cursor rule, the generator applies it to every operation it structurally fits, and
+the paginated operation gains `.pages()` / `.items()` async iterators next to its
+unchanged one-shot call. Item types are computed statically from the response schema.
+
+## Run
+
+```bash
+npm install        # dev tooling only (the CLI + tsx); the client itself needs nothing
+npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
+npm start          # iterates two canned pages of orders and prints them
+```
+
+The generated client under `src/api/` is committed and drift-checked against the generator in CI.
diff --git a/tests/e2e/generate-client/examples/pagination/openapi.yaml b/tests/e2e/generate-client/examples/pagination/openapi.yaml
new file mode 100644
index 0000000000..5a4c9058cc
--- /dev/null
+++ b/tests/e2e/generate-client/examples/pagination/openapi.yaml
@@ -0,0 +1,69 @@
+openapi: 3.1.0
+info:
+  title: Cafe Orders API
+  description: A tiny cursor-paginated orders API for the auto-pagination example.
+  version: 1.0.0
+servers:
+  - url: https://api.cafe-orders.example.com
+paths:
+  /orders:
+    get:
+      operationId: listOrders
+      summary: List orders, one cursor page at a time
+      parameters:
+        - name: cursor
+          in: query
+          description: Opaque cursor of the page to fetch; omit for the first page.
+          schema:
+            type: string
+        - name: limit
+          in: query
+          description: Page size.
+          schema:
+            type: integer
+      responses:
+        '200':
+          description: One page of orders.
+          content:
+            application/json:
+              schema:
+                type: object
+                required: [orders]
+                properties:
+                  orders:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/Order'
+                  nextCursor:
+                    description: Cursor of the next page; absent on the last page.
+                    type: string
+  /orders/{orderId}:
+    get:
+      operationId: getOrder
+      summary: Retrieve one order
+      parameters:
+        - name: orderId
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: The order.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+components:
+  schemas:
+    Order:
+      type: object
+      required: [id, drink, status]
+      properties:
+        id:
+          type: string
+        drink:
+          type: string
+        status:
+          type: string
+          enum: [pending, ready, delivered]
diff --git a/tests/e2e/generate-client/examples/pagination/package.json b/tests/e2e/generate-client/examples/pagination/package.json
new file mode 100644
index 0000000000..017b007a80
--- /dev/null
+++ b/tests/e2e/generate-client/examples/pagination/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "@redocly-examples/pagination",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "generate": "redocly generate-client",
+    "start": "tsx src/main.ts"
+  },
+  "devDependencies": {
+    "@redocly/cli": "latest",
+    "tsx": "^4.0.0",
+    "typescript": "^5.5.0"
+  }
+}
diff --git a/tests/e2e/generate-client/examples/pagination/redocly.yaml b/tests/e2e/generate-client/examples/pagination/redocly.yaml
new file mode 100644
index 0000000000..9d6b34bc23
--- /dev/null
+++ b/tests/e2e/generate-client/examples/pagination/redocly.yaml
@@ -0,0 +1,19 @@
+# redocly.yaml — drives `redocly generate-client` for this example.
+#
+# The `pagination` block declares ONE cursor convention for the whole API. It is
+# declared + VERIFIED: the generator applies it only to operations it structurally
+# fits (the `cursor` query param exists, the pointers resolve in the response) —
+# here `listOrders` gains `.pages()`/`.items()` and `getOrder` stays a plain call.
+apis:
+  pagination:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
+      pagination:
+        style: cursor
+        cursorParam: cursor
+        nextCursor: /nextCursor
+        limitParam: limit
+        items: /orders
diff --git a/tests/e2e/generate-client/examples/pagination/src/api/client.ts b/tests/e2e/generate-client/examples/pagination/src/api/client.ts
new file mode 100644
index 0000000000..83b7ef44d1
--- /dev/null
+++ b/tests/e2e/generate-client/examples/pagination/src/api/client.ts
@@ -0,0 +1,1092 @@
+// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Cafe Orders API (v1.0.0)
+ * A tiny cursor-paginated orders API for the auto-pagination example.
+ */
+
+export type Order = {
+    id: string;
+    drink: string;
+    status: "pending" | "ready" | "delivered";
+};
+
+export type ListOrdersResult = {
+    orders: Order[];
+    /**
+     * Cursor of the next page; absent on the last page.
+     */
+    nextCursor?: string;
+};
+
+export type ListOrdersParams = {
+    /**
+     * Opaque cursor of the page to fetch; omit for the first page.
+     */
+    cursor?: string;
+    /**
+     * Page size.
+     */
+    limit?: number;
+};
+
+export type ListOrdersVariables = {
+    params?: ListOrdersParams;
+};
+
+export type GetOrderResult = Order;
+
+export type GetOrderVariables = {
+    orderId: string;
+};
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    listOrders: {
+        args: {
+            params?: ListOrdersParams;
+        };
+        result: ListOrdersResult;
+        item: Order;
+    };
+    getOrder: {
+        args: {
+            orderId: string;
+        };
+        result: GetOrderResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", params: [{ name: "cursor", in: "query" }, { name: "limit", in: "query" }], pagination: { style: "cursor", param: "cursor", limitParam: "limit", nextCursor: "/nextCursor", items: "/orders" } },
+    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", params: [{ name: "orderId", in: "path" }] }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
+
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/**
+ * Auto-pagination (capability module — wired into `createClient`, dispatched by the
+ * method's `.pages()`/`.items()`): walk an operation's pages by advancing the descriptor's
+ * `param` query parameter, per its `style`. The caller's args are never mutated — each
+ * request gets a fresh `params` clone — and `init` is forwarded to every call.
+ *
+ * Iteration is error-mode-agnostic: `call` always resolves to the RAW page (on a
+ * result-mode client the attachment unwraps the envelope first), so a failed page
+ * aborts iteration by throwing `ApiError`, even on result-mode clients; the `onError`
+ * middleware hook (throw-mode-only) is not invoked.
+ */
+
+/**
+ * Resolve an RFC 6901 JSON pointer (`~1` → `/`, `~0` → `~`) against a value.
+ * The empty pointer is the whole document; anything else must start with `/`.
+ * Returns `undefined` on any miss (bad token, absent key, non-object step) — never throws.
+ */
+function resolvePointer(value: unknown, pointer: string): unknown {
+  if (pointer === '') return value;
+  if (!pointer.startsWith('/')) return undefined;
+  let current = value;
+  for (const token of pointer.slice(1).split('/')) {
+    const key = token.replaceAll('~1', '/').replaceAll('~0', '~');
+    if (Array.isArray(current)) {
+      if (!/^(0|[1-9]\d*)$/.test(key)) return undefined;
+      current = current[Number(key)];
+    } else if (Object(current) === current && key in (current as object)) {
+      current = (current as Record<string, unknown>)[key];
+    } else {
+      return undefined;
+    }
+  }
+  return current;
+}
+
+/**
+ * Iterate an operation's full page results. Every page is yielded before the stop
+ * condition is evaluated, so the last page always arrives. Cursor style resumes from a
+ * caller-provided `params[spec.param]`, stops when `nextCursor` resolves to
+ * `undefined`/`null`/`''`, and throws if the next cursor is not a string or number, or
+ * if the same cursor comes back twice in a row (infinite-loop guards). Offset/page
+ * styles advance by item count / by one and stop when
+ * the `items` pointer misses or the array is empty.
+ */
+async function* pages<TPage>(
+  call: (args?: OperationArgs, init?: RequestOptions) => Promise<TPage>,
+  spec: PaginationSpec,
+  args: OperationArgs = {},
+  init?: RequestOptions
+): AsyncGenerator<TPage> {
+  if (spec.style === 'cursor') {
+    let cursor: unknown = args.params?.[spec.param];
+    while (true) {
+      const params = { ...args.params };
+      if (cursor !== undefined) params[spec.param] = cursor as QueryValue;
+      const page = await call({ ...args, params }, init);
+      yield page;
+      const next = resolvePointer(page, spec.nextCursor!);
+      if (next === undefined || next === null || next === '') return;
+      if (typeof next !== 'string' && typeof next !== 'number') {
+        // A fresh non-scalar cursor never compares equal, so without this guard a lying
+        // server would slip past the did-not-advance check into an infinite loop.
+        throw new Error(`Pagination cursor at ${spec.nextCursor} is not a string or number`);
+      }
+      if (next === cursor) {
+        throw new Error('Pagination did not advance: operation returned the same cursor twice');
+      }
+      cursor = next;
+    }
+  } else {
+    let position =
+      (args.params?.[spec.param] as number | undefined) ?? (spec.style === 'page' ? 1 : 0);
+    while (true) {
+      const page = await call(
+        { ...args, params: { ...args.params, [spec.param]: position } },
+        init
+      );
+      yield page;
+      const pageItems = resolvePointer(page, spec.items);
+      if (!Array.isArray(pageItems) || pageItems.length === 0) return;
+      position += spec.style === 'page' ? 1 : pageItems.length;
+    }
+  }
+}
+
+/**
+ * Iterate the operation's individual items: each page's `items` pointer, flattened.
+ * A cursor-style page whose pointer misses yields nothing but pagination continues;
+ * for offset/page styles a miss has already stopped `pages`.
+ */
+async function* items<TItem>(
+  call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  spec: PaginationSpec,
+  args?: OperationArgs,
+  init?: RequestOptions
+): AsyncGenerator<TItem> {
+  for await (const page of pages(call, spec, args, init)) {
+    const pageItems = resolvePointer(page, spec.items);
+    if (Array.isArray(pageItems)) yield* pageItems as TItem[];
+  }
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
+};
+
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
+/**
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
+ */
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, { paginate: { pages, items } });
+}
+
+export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS, { serverUrl: "https://api.cafe-orders.example.com" });
+
+export const { configure, use } = client;
+export const listOrders = Object.assign((params: {
+    /**
+     * Opaque cursor of the page to fetch; omit for the first page.
+     */
+    cursor?: string;
+    /**
+     * Page size.
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init), { pages: client.listOrders.pages, items: client.listOrders.items });
+export const getOrder = (orderId: string, init: RequestOptions = {}) => client.getOrder({ orderId }, init);
diff --git a/tests/e2e/generate-client/examples/pagination/src/main.ts b/tests/e2e/generate-client/examples/pagination/src/main.ts
new file mode 100644
index 0000000000..bb6e6c5d17
--- /dev/null
+++ b/tests/e2e/generate-client/examples/pagination/src/main.ts
@@ -0,0 +1,45 @@
+// pagination — a declared convention, verified per operation.
+//
+// The redocly.yaml `client.pagination` block declares ONE cursor convention for the
+// whole API: advance the `cursor` query param, follow `/nextCursor` in each response,
+// yield the array under `/orders`. The generator applies it only where it
+// STRUCTURALLY FITS — `listOrders` has the param and the pointers resolve, so it keeps
+// its one-shot call and gains `.pages()` / `.items()`; `getOrder` has no `cursor`
+// param, so it stays a plain call. (Explicit declarations — `x-pagination` in the spec
+// or per-operation config — that don't fit fail generation instead of being skipped.)
+import { configure, listOrders } from './api/client.js';
+
+// A canned transport so the example runs offline: two pages of orders. The first page
+// carries `nextCursor`; the last page doesn't — that absence is the stop signal.
+const PAGES: Record<string, unknown> = {
+  '': {
+    orders: [
+      { id: 'ord-101', drink: 'espresso', status: 'ready' },
+      { id: 'ord-102', drink: 'latte', status: 'pending' },
+    ],
+    nextCursor: 'p2',
+  },
+  p2: {
+    orders: [{ id: 'ord-103', drink: 'cortado', status: 'delivered' }],
+  },
+};
+const canned = (async (url: string) => {
+  const cursor = new URL(url).searchParams.get('cursor') ?? '';
+  return new Response(JSON.stringify(PAGES[cursor]), {
+    headers: { 'content-type': 'application/json' },
+  });
+}) as unknown as typeof fetch;
+
+configure({ fetch: canned });
+
+// `.items()` walks every order across every page — the cursor plumbing is invisible,
+// and each `order` is the statically computed element type (`Order`).
+for await (const order of listOrders.items({ params: { limit: 20 } })) {
+  console.log(`${order.id}: ${order.drink} (${order.status})`);
+}
+
+// `.pages()` when you need page-level access (progress reporting, batch writes).
+let pageNumber = 0;
+for await (const page of listOrders.pages({ params: { limit: 20 } })) {
+  console.log(`page ${++pageNumber}: ${page.orders.length} orders`);
+}
diff --git a/tests/e2e/generate-client/examples/pagination/tsconfig.json b/tests/e2e/generate-client/examples/pagination/tsconfig.json
new file mode 100644
index 0000000000..4bd6962d40
--- /dev/null
+++ b/tests/e2e/generate-client/examples/pagination/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../tsconfig.base.json",
+  "include": ["src"]
+}
diff --git a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
index 1ad55ad78b..53829f9444 100644
--- a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
@@ -824,6 +824,22 @@ export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
 
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
 /** The frozen data contract between generated code and the runtime: one operation's wire shape. */
 export type OperationDescriptor = {
   id: string;
@@ -837,6 +853,7 @@ export type OperationDescriptor = {
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
   security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
 };
 
 /** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
@@ -963,8 +980,16 @@ export type Result<TData, TError> =
   | { data: TData; error: undefined; response: Response }
   | { data: undefined; error: TError; response: Response };
 
-/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
-export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
 
 /** The always-present client members (assigned after the operation loop — they win collisions). */
 export type ClientCore<Op extends OperationContext = OperationContext> = {
@@ -986,6 +1011,35 @@ export type ClientCore<Op extends OperationContext = OperationContext> = {
 // oxlint-disable-next-line typescript/no-empty-object-type
 type NoRequiredKeys<A> = {} extends A ? true : false;
 
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
 /** The typed instance client: one bound method per operation plus the core members. */
 export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
   [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
@@ -998,9 +1052,10 @@ export type Client<Ops extends OpsShape, Op extends OperationContext = Operation
           args: Ops[K]['args'],
           init?: SseOptions
         ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : NoRequiredKeys<Ops[K]['args']> extends true
-      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
 } & ClientCore<Op>;
 
 /** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
@@ -1397,6 +1452,20 @@ type Capabilities = SendCapabilities & {
     init: SseOptions,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
 };
 
 /** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
@@ -1534,6 +1603,39 @@ async function execute(
   return parse(response, readKind);
 }
 
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
 /**
  * Build a typed instance client over operation descriptors: one real bound method per
  * operation (attached by a construction-time loop — no Proxy), plus the core members
@@ -1573,8 +1675,24 @@ function createClientCore<
         })();
       };
     } else {
-      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
     }
   }
 
diff --git a/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts b/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
index b04bc76547..821758c8a6 100644
--- a/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
@@ -80,6 +80,22 @@ export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
 
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
 /** The frozen data contract between generated code and the runtime: one operation's wire shape. */
 export type OperationDescriptor = {
   id: string;
@@ -93,6 +109,7 @@ export type OperationDescriptor = {
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
   security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
 };
 
 /** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
@@ -219,8 +236,16 @@ export type Result<TData, TError> =
   | { data: TData; error: undefined; response: Response }
   | { data: undefined; error: TError; response: Response };
 
-/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
-export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
 
 /** The always-present client members (assigned after the operation loop — they win collisions). */
 export type ClientCore<Op extends OperationContext = OperationContext> = {
@@ -242,6 +267,35 @@ export type ClientCore<Op extends OperationContext = OperationContext> = {
 // oxlint-disable-next-line typescript/no-empty-object-type
 type NoRequiredKeys<A> = {} extends A ? true : false;
 
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
 /** The typed instance client: one bound method per operation plus the core members. */
 export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
   [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
@@ -254,9 +308,10 @@ export type Client<Ops extends OpsShape, Op extends OperationContext = Operation
           args: Ops[K]['args'],
           init?: SseOptions
         ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : NoRequiredKeys<Ops[K]['args']> extends true
-      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
 } & ClientCore<Op>;
 
 /** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
@@ -748,6 +803,20 @@ type Capabilities = SendCapabilities & {
     init: SseOptions,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
 };
 
 /** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
@@ -885,6 +954,39 @@ async function execute(
   return parse(response, readKind);
 }
 
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
 /**
  * Build a typed instance client over operation descriptors: one real bound method per
  * operation (attached by a construction-time loop — no Proxy), plus the core members
@@ -924,8 +1026,24 @@ function createClientCore<
         })();
       };
     } else {
-      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
     }
   }
 
diff --git a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
index 1ad55ad78b..53829f9444 100644
--- a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
@@ -824,6 +824,22 @@ export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
 
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
 /** The frozen data contract between generated code and the runtime: one operation's wire shape. */
 export type OperationDescriptor = {
   id: string;
@@ -837,6 +853,7 @@ export type OperationDescriptor = {
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
   security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
 };
 
 /** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
@@ -963,8 +980,16 @@ export type Result<TData, TError> =
   | { data: TData; error: undefined; response: Response }
   | { data: undefined; error: TError; response: Response };
 
-/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
-export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
 
 /** The always-present client members (assigned after the operation loop — they win collisions). */
 export type ClientCore<Op extends OperationContext = OperationContext> = {
@@ -986,6 +1011,35 @@ export type ClientCore<Op extends OperationContext = OperationContext> = {
 // oxlint-disable-next-line typescript/no-empty-object-type
 type NoRequiredKeys<A> = {} extends A ? true : false;
 
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
 /** The typed instance client: one bound method per operation plus the core members. */
 export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
   [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
@@ -998,9 +1052,10 @@ export type Client<Ops extends OpsShape, Op extends OperationContext = Operation
           args: Ops[K]['args'],
           init?: SseOptions
         ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : NoRequiredKeys<Ops[K]['args']> extends true
-      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
 } & ClientCore<Op>;
 
 /** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
@@ -1397,6 +1452,20 @@ type Capabilities = SendCapabilities & {
     init: SseOptions,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
 };
 
 /** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
@@ -1534,6 +1603,39 @@ async function execute(
   return parse(response, readKind);
 }
 
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
 /**
  * Build a typed instance client over operation descriptors: one real bound method per
  * operation (attached by a construction-time loop — no Proxy), plus the core members
@@ -1573,8 +1675,24 @@ function createClientCore<
         })();
       };
     } else {
-      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
     }
   }
 
diff --git a/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts b/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
index 70f461a814..d3d90bbc28 100644
--- a/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
@@ -120,6 +120,22 @@ export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
 
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
 /** The frozen data contract between generated code and the runtime: one operation's wire shape. */
 export type OperationDescriptor = {
   id: string;
@@ -133,6 +149,7 @@ export type OperationDescriptor = {
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
   security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
 };
 
 /** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
@@ -259,8 +276,16 @@ export type Result<TData, TError> =
   | { data: TData; error: undefined; response: Response }
   | { data: undefined; error: TError; response: Response };
 
-/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
-export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
 
 /** The always-present client members (assigned after the operation loop — they win collisions). */
 export type ClientCore<Op extends OperationContext = OperationContext> = {
@@ -282,6 +307,35 @@ export type ClientCore<Op extends OperationContext = OperationContext> = {
 // oxlint-disable-next-line typescript/no-empty-object-type
 type NoRequiredKeys<A> = {} extends A ? true : false;
 
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
 /** The typed instance client: one bound method per operation plus the core members. */
 export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
   [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
@@ -294,9 +348,10 @@ export type Client<Ops extends OpsShape, Op extends OperationContext = Operation
           args: Ops[K]['args'],
           init?: SseOptions
         ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : NoRequiredKeys<Ops[K]['args']> extends true
-      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
 } & ClientCore<Op>;
 
 /** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
@@ -652,6 +707,20 @@ type Capabilities = SendCapabilities & {
     init: SseOptions,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
 };
 
 /** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
@@ -789,6 +858,39 @@ async function execute(
   return parse(response, readKind);
 }
 
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
 /**
  * Build a typed instance client over operation descriptors: one real bound method per
  * operation (attached by a construction-time loop — no Proxy), plus the core members
@@ -828,8 +930,24 @@ function createClientCore<
         })();
       };
     } else {
-      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
     }
   }
 
diff --git a/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts b/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
index f28759fd6f..54344c7290 100644
--- a/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
@@ -159,6 +159,22 @@ export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
 
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
 /** The frozen data contract between generated code and the runtime: one operation's wire shape. */
 export type OperationDescriptor = {
   id: string;
@@ -172,6 +188,7 @@ export type OperationDescriptor = {
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
   security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
 };
 
 /** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
@@ -298,8 +315,16 @@ export type Result<TData, TError> =
   | { data: TData; error: undefined; response: Response }
   | { data: undefined; error: TError; response: Response };
 
-/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
-export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
 
 /** The always-present client members (assigned after the operation loop — they win collisions). */
 export type ClientCore<Op extends OperationContext = OperationContext> = {
@@ -321,6 +346,35 @@ export type ClientCore<Op extends OperationContext = OperationContext> = {
 // oxlint-disable-next-line typescript/no-empty-object-type
 type NoRequiredKeys<A> = {} extends A ? true : false;
 
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
 /** The typed instance client: one bound method per operation plus the core members. */
 export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
   [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
@@ -333,9 +387,10 @@ export type Client<Ops extends OpsShape, Op extends OperationContext = Operation
           args: Ops[K]['args'],
           init?: SseOptions
         ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : NoRequiredKeys<Ops[K]['args']> extends true
-      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
 } & ClientCore<Op>;
 
 /** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
@@ -691,6 +746,20 @@ type Capabilities = SendCapabilities & {
     init: SseOptions,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
 };
 
 /** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
@@ -828,6 +897,39 @@ async function execute(
   return parse(response, readKind);
 }
 
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
 /**
  * Build a typed instance client over operation descriptors: one real bound method per
  * operation (attached by a construction-time loop — no Proxy), plus the core members
@@ -867,8 +969,24 @@ function createClientCore<
         })();
       };
     } else {
-      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
     }
   }
 
diff --git a/tests/e2e/generate-client/examples/zod/src/api/client.ts b/tests/e2e/generate-client/examples/zod/src/api/client.ts
index 1ad55ad78b..53829f9444 100644
--- a/tests/e2e/generate-client/examples/zod/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/zod/src/api/client.ts
@@ -824,6 +824,22 @@ export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
 
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
 /** The frozen data contract between generated code and the runtime: one operation's wire shape. */
 export type OperationDescriptor = {
   id: string;
@@ -837,6 +853,7 @@ export type OperationDescriptor = {
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
   security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
 };
 
 /** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
@@ -963,8 +980,16 @@ export type Result<TData, TError> =
   | { data: TData; error: undefined; response: Response }
   | { data: undefined; error: TError; response: Response };
 
-/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
-export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
 
 /** The always-present client members (assigned after the operation loop — they win collisions). */
 export type ClientCore<Op extends OperationContext = OperationContext> = {
@@ -986,6 +1011,35 @@ export type ClientCore<Op extends OperationContext = OperationContext> = {
 // oxlint-disable-next-line typescript/no-empty-object-type
 type NoRequiredKeys<A> = {} extends A ? true : false;
 
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
 /** The typed instance client: one bound method per operation plus the core members. */
 export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
   [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
@@ -998,9 +1052,10 @@ export type Client<Ops extends OpsShape, Op extends OperationContext = Operation
           args: Ops[K]['args'],
           init?: SseOptions
         ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : NoRequiredKeys<Ops[K]['args']> extends true
-      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
 } & ClientCore<Op>;
 
 /** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
@@ -1397,6 +1452,20 @@ type Capabilities = SendCapabilities & {
     init: SseOptions,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
 };
 
 /** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
@@ -1534,6 +1603,39 @@ async function execute(
   return parse(response, readKind);
 }
 
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
 /**
  * Build a typed instance client over operation descriptors: one real bound method per
  * operation (attached by a construction-time loop — no Proxy), plus the core members
@@ -1573,8 +1675,24 @@ function createClientCore<
         })();
       };
     } else {
-      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
     }
   }
 
diff --git a/tests/e2e/generate-client/fixtures/pagination.yaml b/tests/e2e/generate-client/fixtures/pagination.yaml
new file mode 100644
index 0000000000..6d016c79e5
--- /dev/null
+++ b/tests/e2e/generate-client/fixtures/pagination.yaml
@@ -0,0 +1,98 @@
+openapi: 3.1.0
+info:
+  title: Cafe Orders Pagination API
+  version: 1.0.0
+servers:
+  - url: http://localhost:3131
+paths:
+  /orders:
+    get:
+      operationId: listOrders
+      summary: List orders, one cursor page at a time.
+      # The extension arm: the pagination rule travels with the spec — no config needed.
+      x-pagination:
+        style: cursor
+        cursorParam: cursor
+        nextCursor: /nextCursor
+        limitParam: limit
+        items: /orders
+      parameters:
+        - name: cursor
+          in: query
+          description: Opaque cursor of the page to fetch; omit for the first page.
+          schema: { type: string }
+        - name: limit
+          in: query
+          description: Page size.
+          schema: { type: integer }
+      responses:
+        '200':
+          description: One page of orders.
+          content:
+            application/json:
+              schema:
+                type: object
+                required: [orders]
+                properties:
+                  orders:
+                    type: array
+                    items: { $ref: '#/components/schemas/Order' }
+                  nextCursor:
+                    description: Cursor of the next page; absent on the last page.
+                    type: string
+  /menu:
+    get:
+      operationId: listMenuItems
+      summary: List menu items, one offset page at a time.
+      # No extension here — pagination arrives via the config convention rule.
+      parameters:
+        - name: offset
+          in: query
+          description: Index of the first item to return.
+          schema: { type: integer }
+        - name: limit
+          in: query
+          description: Page size.
+          schema: { type: integer }
+      responses:
+        '200':
+          description: One page of menu items.
+          content:
+            application/json:
+              schema:
+                type: object
+                required: [items, total]
+                properties:
+                  items:
+                    type: array
+                    items: { $ref: '#/components/schemas/MenuItem' }
+                  total: { type: integer }
+  /orders/{orderId}:
+    get:
+      operationId: getOrder
+      summary: Retrieve one order.
+      parameters:
+        - name: orderId
+          in: path
+          required: true
+          schema: { type: string }
+      responses:
+        '200':
+          description: The order.
+          content:
+            application/json:
+              schema: { $ref: '#/components/schemas/Order' }
+components:
+  schemas:
+    Order:
+      type: object
+      required: [id, status]
+      properties:
+        id: { type: string }
+        status: { type: string }
+    MenuItem:
+      type: object
+      required: [id, name]
+      properties:
+        id: { type: string }
+        name: { type: string }
diff --git a/tests/e2e/generate-client/pagination-consumer/api-offset.ts b/tests/e2e/generate-client/pagination-consumer/api-offset.ts
new file mode 100644
index 0000000000..678c7b3261
--- /dev/null
+++ b/tests/e2e/generate-client/pagination-consumer/api-offset.ts
@@ -0,0 +1,1177 @@
+// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Cafe Orders Pagination API (v1.0.0)
+ */
+
+export type Order = {
+  id: string;
+  status: string;
+};
+
+export type MenuItem = {
+  id: string;
+  name: string;
+};
+
+export type ListOrdersResult = {
+  orders: Order[];
+  /**
+   * Cursor of the next page; absent on the last page.
+   */
+  nextCursor?: string;
+};
+
+export type ListOrdersParams = {
+  /**
+   * Opaque cursor of the page to fetch; omit for the first page.
+   */
+  cursor?: string;
+  /**
+   * Page size.
+   */
+  limit?: number;
+};
+
+export type ListOrdersVariables = {
+  params?: ListOrdersParams;
+};
+
+export type ListMenuItemsResult = {
+  items: MenuItem[];
+  total: number;
+};
+
+export type ListMenuItemsParams = {
+  /**
+   * Index of the first item to return.
+   */
+  offset?: number;
+  /**
+   * Page size.
+   */
+  limit?: number;
+};
+
+export type ListMenuItemsVariables = {
+  params?: ListMenuItemsParams;
+};
+
+export type GetOrderResult = Order;
+
+export type GetOrderVariables = {
+  orderId: string;
+};
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+  listOrders: {
+    args: {
+      params?: ListOrdersParams;
+    };
+    result: ListOrdersResult;
+    item: Order;
+  };
+  listMenuItems: {
+    args: {
+      params?: ListMenuItemsParams;
+    };
+    result: ListMenuItemsResult;
+    item: MenuItem;
+  };
+  getOrder: {
+    args: {
+      orderId: string;
+    };
+    result: GetOrderResult;
+  };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+  listOrders: {
+    id: 'listOrders',
+    method: 'GET',
+    path: '/orders',
+    params: [
+      { name: 'cursor', in: 'query' },
+      { name: 'limit', in: 'query' },
+    ],
+    pagination: {
+      style: 'cursor',
+      param: 'cursor',
+      limitParam: 'limit',
+      nextCursor: '/nextCursor',
+      items: '/orders',
+    },
+  },
+  listMenuItems: {
+    id: 'listMenuItems',
+    method: 'GET',
+    path: '/menu',
+    params: [
+      { name: 'offset', in: 'query' },
+      { name: 'limit', in: 'query' },
+    ],
+    pagination: { style: 'offset', param: 'offset', limitParam: 'limit', items: '/items' },
+  },
+  getOrder: {
+    id: 'getOrder',
+    method: 'GET',
+    path: '/orders/{orderId}',
+    params: [{ name: 'orderId', in: 'path' }],
+  },
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]['path'];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
+
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/**
+ * Auto-pagination (capability module — wired into `createClient`, dispatched by the
+ * method's `.pages()`/`.items()`): walk an operation's pages by advancing the descriptor's
+ * `param` query parameter, per its `style`. The caller's args are never mutated — each
+ * request gets a fresh `params` clone — and `init` is forwarded to every call.
+ *
+ * Iteration is error-mode-agnostic: `call` always resolves to the RAW page (on a
+ * result-mode client the attachment unwraps the envelope first), so a failed page
+ * aborts iteration by throwing `ApiError`, even on result-mode clients; the `onError`
+ * middleware hook (throw-mode-only) is not invoked.
+ */
+
+/**
+ * Resolve an RFC 6901 JSON pointer (`~1` → `/`, `~0` → `~`) against a value.
+ * The empty pointer is the whole document; anything else must start with `/`.
+ * Returns `undefined` on any miss (bad token, absent key, non-object step) — never throws.
+ */
+function resolvePointer(value: unknown, pointer: string): unknown {
+  if (pointer === '') return value;
+  if (!pointer.startsWith('/')) return undefined;
+  let current = value;
+  for (const token of pointer.slice(1).split('/')) {
+    const key = token.replaceAll('~1', '/').replaceAll('~0', '~');
+    if (Array.isArray(current)) {
+      if (!/^(0|[1-9]\d*)$/.test(key)) return undefined;
+      current = current[Number(key)];
+    } else if (Object(current) === current && key in (current as object)) {
+      current = (current as Record<string, unknown>)[key];
+    } else {
+      return undefined;
+    }
+  }
+  return current;
+}
+
+/**
+ * Iterate an operation's full page results. Every page is yielded before the stop
+ * condition is evaluated, so the last page always arrives. Cursor style resumes from a
+ * caller-provided `params[spec.param]`, stops when `nextCursor` resolves to
+ * `undefined`/`null`/`''`, and throws if the next cursor is not a string or number, or
+ * if the same cursor comes back twice in a row (infinite-loop guards). Offset/page
+ * styles advance by item count / by one and stop when
+ * the `items` pointer misses or the array is empty.
+ */
+async function* pages<TPage>(
+  call: (args?: OperationArgs, init?: RequestOptions) => Promise<TPage>,
+  spec: PaginationSpec,
+  args: OperationArgs = {},
+  init?: RequestOptions
+): AsyncGenerator<TPage> {
+  if (spec.style === 'cursor') {
+    let cursor: unknown = args.params?.[spec.param];
+    while (true) {
+      const params = { ...args.params };
+      if (cursor !== undefined) params[spec.param] = cursor as QueryValue;
+      const page = await call({ ...args, params }, init);
+      yield page;
+      const next = resolvePointer(page, spec.nextCursor!);
+      if (next === undefined || next === null || next === '') return;
+      if (typeof next !== 'string' && typeof next !== 'number') {
+        // A fresh non-scalar cursor never compares equal, so without this guard a lying
+        // server would slip past the did-not-advance check into an infinite loop.
+        throw new Error(`Pagination cursor at ${spec.nextCursor} is not a string or number`);
+      }
+      if (next === cursor) {
+        throw new Error('Pagination did not advance: operation returned the same cursor twice');
+      }
+      cursor = next;
+    }
+  } else {
+    let position =
+      (args.params?.[spec.param] as number | undefined) ?? (spec.style === 'page' ? 1 : 0);
+    while (true) {
+      const page = await call(
+        { ...args, params: { ...args.params, [spec.param]: position } },
+        init
+      );
+      yield page;
+      const pageItems = resolvePointer(page, spec.items);
+      if (!Array.isArray(pageItems) || pageItems.length === 0) return;
+      position += spec.style === 'page' ? 1 : pageItems.length;
+    }
+  }
+}
+
+/**
+ * Iterate the operation's individual items: each page's `items` pointer, flattened.
+ * A cursor-style page whose pointer misses yields nothing but pagination continues;
+ * for offset/page styles a miss has already stopped `pages`.
+ */
+async function* items<TItem>(
+  call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  spec: PaginationSpec,
+  args?: OperationArgs,
+  init?: RequestOptions
+): AsyncGenerator<TItem> {
+  for await (const page of pages(call, spec, args, init)) {
+    const pageItems = resolvePointer(page, spec.items);
+    if (Array.isArray(pageItems)) yield* pageItems as TItem[];
+  }
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
+};
+
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
+/**
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
+ */
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, { paginate: { pages, items } });
+}
+
+export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS, {
+  serverUrl: 'http://localhost:3131',
+});
+
+export const { configure, use } = client;
+export const listOrders = Object.assign(
+  (
+    params: {
+      /**
+       * Opaque cursor of the page to fetch; omit for the first page.
+       */
+      cursor?: string;
+      /**
+       * Page size.
+       */
+      limit?: number;
+    } = {},
+    init: RequestOptions = {}
+  ) => client.listOrders({ params }, init),
+  { pages: client.listOrders.pages, items: client.listOrders.items }
+);
+export const listMenuItems = Object.assign(
+  (
+    params: {
+      /**
+       * Index of the first item to return.
+       */
+      offset?: number;
+      /**
+       * Page size.
+       */
+      limit?: number;
+    } = {},
+    init: RequestOptions = {}
+  ) => client.listMenuItems({ params }, init),
+  { pages: client.listMenuItems.pages, items: client.listMenuItems.items }
+);
+export const getOrder = (orderId: string, init: RequestOptions = {}) =>
+  client.getOrder({ orderId }, init);
diff --git a/tests/e2e/generate-client/pagination-consumer/api-package.ts b/tests/e2e/generate-client/pagination-consumer/api-package.ts
new file mode 100644
index 0000000000..422c74b5c3
--- /dev/null
+++ b/tests/e2e/generate-client/pagination-consumer/api-package.ts
@@ -0,0 +1,180 @@
+// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Cafe Orders Pagination API (v1.0.0)
+ */
+
+import {
+  createClient,
+  type OperationDescriptor,
+  type RequestOptions,
+} from '@redocly/client-generator';
+
+export type Order = {
+  id: string;
+  status: string;
+};
+
+export type MenuItem = {
+  id: string;
+  name: string;
+};
+
+export type ListOrdersResult = {
+  orders: Order[];
+  /**
+   * Cursor of the next page; absent on the last page.
+   */
+  nextCursor?: string;
+};
+
+export type ListOrdersParams = {
+  /**
+   * Opaque cursor of the page to fetch; omit for the first page.
+   */
+  cursor?: string;
+  /**
+   * Page size.
+   */
+  limit?: number;
+};
+
+export type ListOrdersVariables = {
+  params?: ListOrdersParams;
+};
+
+export type ListMenuItemsResult = {
+  items: MenuItem[];
+  total: number;
+};
+
+export type ListMenuItemsParams = {
+  /**
+   * Index of the first item to return.
+   */
+  offset?: number;
+  /**
+   * Page size.
+   */
+  limit?: number;
+};
+
+export type ListMenuItemsVariables = {
+  params?: ListMenuItemsParams;
+};
+
+export type GetOrderResult = Order;
+
+export type GetOrderVariables = {
+  orderId: string;
+};
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+  listOrders: {
+    args: {
+      params?: ListOrdersParams;
+    };
+    result: ListOrdersResult;
+    item: Order;
+  };
+  listMenuItems: {
+    args: {
+      params?: ListMenuItemsParams;
+    };
+    result: ListMenuItemsResult;
+  };
+  getOrder: {
+    args: {
+      orderId: string;
+    };
+    result: GetOrderResult;
+  };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+  listOrders: {
+    id: 'listOrders',
+    method: 'GET',
+    path: '/orders',
+    params: [
+      { name: 'cursor', in: 'query' },
+      { name: 'limit', in: 'query' },
+    ],
+    pagination: {
+      style: 'cursor',
+      param: 'cursor',
+      limitParam: 'limit',
+      nextCursor: '/nextCursor',
+      items: '/orders',
+    },
+  },
+  listMenuItems: {
+    id: 'listMenuItems',
+    method: 'GET',
+    path: '/menu',
+    params: [
+      { name: 'offset', in: 'query' },
+      { name: 'limit', in: 'query' },
+    ],
+  },
+  getOrder: {
+    id: 'getOrder',
+    method: 'GET',
+    path: '/orders/{orderId}',
+    params: [{ name: 'orderId', in: 'path' }],
+  },
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]['path'];
+
+export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS, {
+  serverUrl: 'http://localhost:3131',
+});
+
+export const { configure, use } = client;
+export const listOrders = Object.assign(
+  (
+    params: {
+      /**
+       * Opaque cursor of the page to fetch; omit for the first page.
+       */
+      cursor?: string;
+      /**
+       * Page size.
+       */
+      limit?: number;
+    } = {},
+    init: RequestOptions = {}
+  ) => client.listOrders({ params }, init),
+  { pages: client.listOrders.pages, items: client.listOrders.items }
+);
+export const listMenuItems = (
+  params: {
+    /**
+     * Index of the first item to return.
+     */
+    offset?: number;
+    /**
+     * Page size.
+     */
+    limit?: number;
+  } = {},
+  init: RequestOptions = {}
+) => client.listMenuItems({ params }, init);
+export const getOrder = (orderId: string, init: RequestOptions = {}) =>
+  client.getOrder({ orderId }, init);
+
+export { ApiError, createClient } from '@redocly/client-generator';
+export type { ClientConfig, Middleware, RequestOptions } from '@redocly/client-generator';
diff --git a/tests/e2e/generate-client/pagination-consumer/api.ts b/tests/e2e/generate-client/pagination-consumer/api.ts
new file mode 100644
index 0000000000..9584c0215b
--- /dev/null
+++ b/tests/e2e/generate-client/pagination-consumer/api.ts
@@ -0,0 +1,1132 @@
+// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Cafe Orders Pagination API (v1.0.0)
+ */
+
+export type Order = {
+    id: string;
+    status: string;
+};
+
+export type MenuItem = {
+    id: string;
+    name: string;
+};
+
+export type ListOrdersResult = {
+    orders: Order[];
+    /**
+     * Cursor of the next page; absent on the last page.
+     */
+    nextCursor?: string;
+};
+
+export type ListOrdersParams = {
+    /**
+     * Opaque cursor of the page to fetch; omit for the first page.
+     */
+    cursor?: string;
+    /**
+     * Page size.
+     */
+    limit?: number;
+};
+
+export type ListOrdersVariables = {
+    params?: ListOrdersParams;
+};
+
+export type ListMenuItemsResult = {
+    items: MenuItem[];
+    total: number;
+};
+
+export type ListMenuItemsParams = {
+    /**
+     * Index of the first item to return.
+     */
+    offset?: number;
+    /**
+     * Page size.
+     */
+    limit?: number;
+};
+
+export type ListMenuItemsVariables = {
+    params?: ListMenuItemsParams;
+};
+
+export type GetOrderResult = Order;
+
+export type GetOrderVariables = {
+    orderId: string;
+};
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    listOrders: {
+        args: {
+            params?: ListOrdersParams;
+        };
+        result: ListOrdersResult;
+        item: Order;
+    };
+    listMenuItems: {
+        args: {
+            params?: ListMenuItemsParams;
+        };
+        result: ListMenuItemsResult;
+    };
+    getOrder: {
+        args: {
+            orderId: string;
+        };
+        result: GetOrderResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", params: [{ name: "cursor", in: "query" }, { name: "limit", in: "query" }], pagination: { style: "cursor", param: "cursor", limitParam: "limit", nextCursor: "/nextCursor", items: "/orders" } },
+    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", params: [{ name: "offset", in: "query" }, { name: "limit", in: "query" }] },
+    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", params: [{ name: "orderId", in: "path" }] }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
+
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/**
+ * Auto-pagination (capability module — wired into `createClient`, dispatched by the
+ * method's `.pages()`/`.items()`): walk an operation's pages by advancing the descriptor's
+ * `param` query parameter, per its `style`. The caller's args are never mutated — each
+ * request gets a fresh `params` clone — and `init` is forwarded to every call.
+ *
+ * Iteration is error-mode-agnostic: `call` always resolves to the RAW page (on a
+ * result-mode client the attachment unwraps the envelope first), so a failed page
+ * aborts iteration by throwing `ApiError`, even on result-mode clients; the `onError`
+ * middleware hook (throw-mode-only) is not invoked.
+ */
+
+/**
+ * Resolve an RFC 6901 JSON pointer (`~1` → `/`, `~0` → `~`) against a value.
+ * The empty pointer is the whole document; anything else must start with `/`.
+ * Returns `undefined` on any miss (bad token, absent key, non-object step) — never throws.
+ */
+function resolvePointer(value: unknown, pointer: string): unknown {
+  if (pointer === '') return value;
+  if (!pointer.startsWith('/')) return undefined;
+  let current = value;
+  for (const token of pointer.slice(1).split('/')) {
+    const key = token.replaceAll('~1', '/').replaceAll('~0', '~');
+    if (Array.isArray(current)) {
+      if (!/^(0|[1-9]\d*)$/.test(key)) return undefined;
+      current = current[Number(key)];
+    } else if (Object(current) === current && key in (current as object)) {
+      current = (current as Record<string, unknown>)[key];
+    } else {
+      return undefined;
+    }
+  }
+  return current;
+}
+
+/**
+ * Iterate an operation's full page results. Every page is yielded before the stop
+ * condition is evaluated, so the last page always arrives. Cursor style resumes from a
+ * caller-provided `params[spec.param]`, stops when `nextCursor` resolves to
+ * `undefined`/`null`/`''`, and throws if the next cursor is not a string or number, or
+ * if the same cursor comes back twice in a row (infinite-loop guards). Offset/page
+ * styles advance by item count / by one and stop when
+ * the `items` pointer misses or the array is empty.
+ */
+async function* pages<TPage>(
+  call: (args?: OperationArgs, init?: RequestOptions) => Promise<TPage>,
+  spec: PaginationSpec,
+  args: OperationArgs = {},
+  init?: RequestOptions
+): AsyncGenerator<TPage> {
+  if (spec.style === 'cursor') {
+    let cursor: unknown = args.params?.[spec.param];
+    while (true) {
+      const params = { ...args.params };
+      if (cursor !== undefined) params[spec.param] = cursor as QueryValue;
+      const page = await call({ ...args, params }, init);
+      yield page;
+      const next = resolvePointer(page, spec.nextCursor!);
+      if (next === undefined || next === null || next === '') return;
+      if (typeof next !== 'string' && typeof next !== 'number') {
+        // A fresh non-scalar cursor never compares equal, so without this guard a lying
+        // server would slip past the did-not-advance check into an infinite loop.
+        throw new Error(`Pagination cursor at ${spec.nextCursor} is not a string or number`);
+      }
+      if (next === cursor) {
+        throw new Error('Pagination did not advance: operation returned the same cursor twice');
+      }
+      cursor = next;
+    }
+  } else {
+    let position =
+      (args.params?.[spec.param] as number | undefined) ?? (spec.style === 'page' ? 1 : 0);
+    while (true) {
+      const page = await call(
+        { ...args, params: { ...args.params, [spec.param]: position } },
+        init
+      );
+      yield page;
+      const pageItems = resolvePointer(page, spec.items);
+      if (!Array.isArray(pageItems) || pageItems.length === 0) return;
+      position += spec.style === 'page' ? 1 : pageItems.length;
+    }
+  }
+}
+
+/**
+ * Iterate the operation's individual items: each page's `items` pointer, flattened.
+ * A cursor-style page whose pointer misses yields nothing but pagination continues;
+ * for offset/page styles a miss has already stopped `pages`.
+ */
+async function* items<TItem>(
+  call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  spec: PaginationSpec,
+  args?: OperationArgs,
+  init?: RequestOptions
+): AsyncGenerator<TItem> {
+  for await (const page of pages(call, spec, args, init)) {
+    const pageItems = resolvePointer(page, spec.items);
+    if (Array.isArray(pageItems)) yield* pageItems as TItem[];
+  }
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
+};
+
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
+/**
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
+ */
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, { paginate: { pages, items } });
+}
+
+export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS, { serverUrl: "http://localhost:3131" });
+
+export const { configure, use } = client;
+export const listOrders = Object.assign((params: {
+    /**
+     * Opaque cursor of the page to fetch; omit for the first page.
+     */
+    cursor?: string;
+    /**
+     * Page size.
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init), { pages: client.listOrders.pages, items: client.listOrders.items });
+export const listMenuItems = (params: {
+    /**
+     * Index of the first item to return.
+     */
+    offset?: number;
+    /**
+     * Page size.
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
+export const getOrder = (orderId: string, init: RequestOptions = {}) => client.getOrder({ orderId }, init);
diff --git a/tests/e2e/generate-client/pagination-consumer/index-abort.ts b/tests/e2e/generate-client/pagination-consumer/index-abort.ts
new file mode 100644
index 0000000000..36ecc4314c
--- /dev/null
+++ b/tests/e2e/generate-client/pagination-consumer/index-abort.ts
@@ -0,0 +1,32 @@
+import { listOrders } from './api.js';
+
+// Aborting mid-iteration: `init` (the AbortSignal) is forwarded to every page request,
+// so aborting after the first yielded item lets the current page drain from memory and
+// makes the NEXT page fetch reject — the iteration terminates with an AbortError.
+async function main(): Promise<void> {
+  const controller = new AbortController();
+  let received = 0;
+  let error: string | null = null;
+
+  try {
+    for await (const order of listOrders.items(
+      { params: { limit: 2 } },
+      { signal: controller.signal }
+    )) {
+      void order;
+      received++;
+      if (received === 1) {
+        controller.abort();
+      }
+    }
+  } catch (e) {
+    error = e instanceof Error ? e.name : String(e);
+  }
+
+  process.stdout.write(JSON.stringify({ received, error }) + '\n');
+}
+
+main().catch((e) => {
+  process.stderr.write(`UNHANDLED: ${e instanceof Error ? e.message : String(e)}\n`);
+  process.exit(1);
+});
diff --git a/tests/e2e/generate-client/pagination-consumer/index-offset.ts b/tests/e2e/generate-client/pagination-consumer/index-offset.ts
new file mode 100644
index 0000000000..58428c05db
--- /dev/null
+++ b/tests/e2e/generate-client/pagination-consumer/index-offset.ts
@@ -0,0 +1,28 @@
+import { listMenuItems, OPERATIONS } from './api-offset.js';
+
+// The config-convention arm: `pagination: { style: offset, … }` was passed at generate
+// time, so `listMenuItems` (which structurally fits) iterates by advancing `offset` by
+// each page's item count until an empty page arrives.
+async function main(): Promise<void> {
+  const names: string[] = [];
+  for await (const item of listMenuItems.items({ params: { limit: 2 } })) {
+    names.push(item.name); // compile-time: `item` is `MenuItem`
+  }
+
+  // The trailing empty page IS yielded (every page arrives before the stop check).
+  const pageSizes: number[] = [];
+  for await (const page of listMenuItems.pages({ params: { limit: 2 } })) {
+    pageSizes.push(page.items.length);
+  }
+
+  // Precedence, pinned at compile time: the spec's `x-pagination` (cursor) beats the
+  // offset convention on `listOrders` — its descriptor keeps the extension's rule.
+  const listOrdersStyle: 'cursor' = OPERATIONS.listOrders.pagination.style;
+
+  process.stdout.write(JSON.stringify({ names, pageSizes, listOrdersStyle }) + '\n');
+}
+
+main().catch((error) => {
+  process.stderr.write(`UNHANDLED: ${error instanceof Error ? error.message : String(error)}\n`);
+  process.exit(1);
+});
diff --git a/tests/e2e/generate-client/pagination-consumer/index-package.ts b/tests/e2e/generate-client/pagination-consumer/index-package.ts
new file mode 100644
index 0000000000..a73e8650f8
--- /dev/null
+++ b/tests/e2e/generate-client/pagination-consumer/index-package.ts
@@ -0,0 +1,18 @@
+import { listOrders } from './api-package.js';
+
+// The package-mode arm: the generated file imports the runtime from
+// `@redocly/client-generator`, so `.pages()`/`.items()` ship from the INSTALLED
+// package — one full `.items()` walk proves the capability is wired there too.
+async function main(): Promise<void> {
+  const ids: string[] = [];
+  for await (const order of listOrders.items({ params: { limit: 2 } })) {
+    ids.push(order.id);
+  }
+
+  process.stdout.write(JSON.stringify({ ids }) + '\n');
+}
+
+main().catch((error) => {
+  process.stderr.write(`UNHANDLED: ${error instanceof Error ? error.message : String(error)}\n`);
+  process.exit(1);
+});
diff --git a/tests/e2e/generate-client/pagination-consumer/index.ts b/tests/e2e/generate-client/pagination-consumer/index.ts
new file mode 100644
index 0000000000..a019257fcb
--- /dev/null
+++ b/tests/e2e/generate-client/pagination-consumer/index.ts
@@ -0,0 +1,39 @@
+import { listOrders } from './api.js';
+
+// The extension arm: `x-pagination` in the spec (no config) drives `listOrders`.
+// Exercises `.items()` across three cursor pages, `.pages()` page-level access, and
+// resume from a caller-provided cursor — while the caller's args are never mutated.
+async function main(): Promise<void> {
+  // `.items()`: the flat sugar preserves the method-attached iterators; every request
+  // forwards the caller's `limit` alongside the advancing cursor.
+  const firstArgs = { params: { limit: 2 } };
+  const ids: string[] = [];
+  for await (const order of listOrders.items(firstArgs)) {
+    ids.push(order.id); // compile-time: `order` is `Order`
+  }
+  // The iterator clones params per request — the cursor never leaks into caller args.
+  const firstCursorLeaked = 'cursor' in firstArgs.params;
+
+  // `.pages()`: whole pages, typed as the raw response — sizes pin the 2+2+1 layout.
+  const pageSizes: number[] = [];
+  for await (const page of listOrders.pages({ params: { limit: 2 } })) {
+    pageSizes.push(page.orders.length);
+  }
+
+  // Resume: a caller-provided initial cursor starts iteration at that page.
+  const resumeArgs = { params: { cursor: 'c2', limit: 2 } };
+  const resumedIds: string[] = [];
+  for await (const order of listOrders.items(resumeArgs)) {
+    resumedIds.push(order.id);
+  }
+  const resumeCursorAfter = resumeArgs.params.cursor;
+
+  process.stdout.write(
+    JSON.stringify({ ids, firstCursorLeaked, pageSizes, resumedIds, resumeCursorAfter }) + '\n'
+  );
+}
+
+main().catch((error) => {
+  process.stderr.write(`UNHANDLED: ${error instanceof Error ? error.message : String(error)}\n`);
+  process.exit(1);
+});
diff --git a/tests/e2e/generate-client/pagination-consumer/package.json b/tests/e2e/generate-client/pagination-consumer/package.json
new file mode 100644
index 0000000000..06753790e0
--- /dev/null
+++ b/tests/e2e/generate-client/pagination-consumer/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "pagination-consumer",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module"
+}
diff --git a/tests/e2e/generate-client/pagination-consumer/server.ts b/tests/e2e/generate-client/pagination-consumer/server.ts
new file mode 100644
index 0000000000..816de147f7
--- /dev/null
+++ b/tests/e2e/generate-client/pagination-consumer/server.ts
@@ -0,0 +1,96 @@
+import * as http from 'node:http';
+
+// A hand-written pagination server: three cursor pages of orders keyed by an opaque
+// cursor (the last page carries no nextCursor — the stop signal), and an offset-sliced
+// menu that returns an empty page past the end. Every API request lands in a log the
+// test reads back, with a reset hook so each consumer run asserts over its own slice.
+
+type LogEntry = { method: string; url: string };
+type Order = { id: string; status: string };
+
+const PORT = Number.parseInt(process.env.PAGINATION_SERVER_PORT ?? '3131', 10);
+
+let requestLog: LogEntry[] = [];
+
+const ORDERS: Order[] = ['o-1', 'o-2', 'o-3', 'o-4', 'o-5'].map((id) => ({
+  id,
+  status: 'open',
+}));
+
+// Cursor pages (2 + 2 + 1), keyed by the cursor that requests them ('' = first page).
+const ORDER_PAGES: Record<string, { orders: Order[]; nextCursor?: string }> = {
+  '': { orders: ORDERS.slice(0, 2), nextCursor: 'c2' },
+  c2: { orders: ORDERS.slice(2, 4), nextCursor: 'c3' },
+  c3: { orders: ORDERS.slice(4) },
+};
+
+const MENU = ['espresso', 'latte', 'mocha', 'flat white', 'cortado'].map((name, index) => ({
+  id: `m-${index + 1}`,
+  name,
+}));
+
+const server = http.createServer((req, res) => {
+  const method = req.method ?? 'GET';
+  const url = req.url ?? '';
+  const { pathname, searchParams } = new URL(url, 'http://localhost');
+
+  if (pathname === '/__test__/ready') {
+    res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' });
+    res.end('ready');
+    return;
+  }
+  if (pathname === '/__test__/log') {
+    res.writeHead(200, { 'Content-Type': 'application/json; charset=utf-8' });
+    res.end(JSON.stringify(requestLog));
+    return;
+  }
+  if (pathname === '/__test__/reset') {
+    requestLog = [];
+    res.writeHead(200, { 'Content-Type': 'text/plain; charset=utf-8' });
+    res.end('reset');
+    return;
+  }
+
+  requestLog.push({ method, url });
+
+  if (method === 'GET' && pathname === '/orders') {
+    const page = ORDER_PAGES[searchParams.get('cursor') ?? ''];
+    if (page) {
+      res.writeHead(200, { 'Content-Type': 'application/json; charset=utf-8' });
+      res.end(JSON.stringify(page));
+      return;
+    }
+    res.writeHead(404, { 'Content-Type': 'application/json; charset=utf-8' });
+    res.end(JSON.stringify({ title: 'unknown cursor' }));
+    return;
+  }
+
+  if (method === 'GET' && pathname === '/menu') {
+    const offset = Number.parseInt(searchParams.get('offset') ?? '0', 10);
+    const limit = Number.parseInt(searchParams.get('limit') ?? '2', 10);
+    res.writeHead(200, { 'Content-Type': 'application/json; charset=utf-8' });
+    res.end(JSON.stringify({ items: MENU.slice(offset, offset + limit), total: MENU.length }));
+    return;
+  }
+
+  res.writeHead(404, { 'Content-Type': 'application/json; charset=utf-8' });
+  res.end(JSON.stringify({ title: 'not found' }));
+});
+
+// The test process keeps a pooled connection from its readiness probe and fetches the
+// log after generate + tsc + the consumer runs (~10s). Outlive that gap so the pooled
+// socket is not reset mid-reuse.
+server.keepAliveTimeout = 60_000;
+
+server.listen(PORT, () => {
+  process.stdout.write(`READY ${PORT}\n`);
+});
+
+const shutdown = (): void => {
+  server.close(() => {
+    process.exit(0);
+  });
+};
+
+process.on('SIGTERM', shutdown);
+process.on('SIGINT', shutdown);
diff --git a/tests/e2e/generate-client/pagination-consumer/tsconfig.json b/tests/e2e/generate-client/pagination-consumer/tsconfig.json
new file mode 100644
index 0000000000..9e758c589a
--- /dev/null
+++ b/tests/e2e/generate-client/pagination-consumer/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "compilerOptions": {
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "target": "es2022",
+    "lib": ["ES2022", "DOM", "DOM.AsyncIterable"],
+    "strict": true,
+    "noUnusedLocals": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "types": ["node"]
+  },
+  "include": ["./**/*.ts"]
+}
diff --git a/tests/e2e/generate-client/pagination.test.ts b/tests/e2e/generate-client/pagination.test.ts
new file mode 100644
index 0000000000..5e9d00516d
--- /dev/null
+++ b/tests/e2e/generate-client/pagination.test.ts
@@ -0,0 +1,291 @@
+import { spawn, spawnSync, type ChildProcess } from 'node:child_process';
+import { existsSync, readFileSync, rmSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+
+// Auto-pagination end to end, over a live server: the `x-pagination` extension arm
+// (cursor style — three pages, resume, abort) generated with NO config, the
+// config-convention arm (offset style, applied only where it structurally fits), and a
+// package-mode arm proving `.pages()`/`.items()` ship from the installed runtime.
+// Pagination has no CLI flag, so config-carrying runs use the BUILT package's
+// programmatic `generateClient`.
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const generatorLib = join(repoRoot, 'packages/client-generator/lib/index.js');
+const fixture = join(__dirname, 'fixtures/pagination.yaml');
+const consumerDir = join(__dirname, 'pagination-consumer');
+const apiFile = join(consumerDir, 'api.ts');
+const apiOffsetFile = join(consumerDir, 'api-offset.ts');
+const apiPackageFile = join(consumerDir, 'api-package.ts');
+const serverScript = join(consumerDir, 'server.ts');
+
+const SERVER_PORT = 3131;
+const SERVER_BASE = `http://127.0.0.1:${SERVER_PORT}`;
+
+type GenerateClient = (options: Record<string, unknown>) => Promise<unknown>;
+
+async function loadGenerateClient(): Promise<GenerateClient> {
+  const mod = (await import(pathToFileURL(generatorLib).href)) as {
+    generateClient: GenerateClient;
+  };
+  return mod.generateClient;
+}
+
+async function waitForServerReady(timeoutMs: number): Promise<void> {
+  const deadline = Date.now() + timeoutMs;
+  let lastError: unknown;
+  while (Date.now() < deadline) {
+    try {
+      const response = await fetch(`${SERVER_BASE}/__test__/ready`);
+      if (response.ok) return;
+      lastError = `readiness probe returned HTTP ${response.status}`;
+    } catch (error) {
+      lastError = error;
+    }
+    await new Promise((r) => setTimeout(r, 100));
+  }
+  throw new Error(
+    `pagination server did not become ready within ${timeoutMs}ms: ${
+      lastError instanceof Error ? lastError.message : String(lastError)
+    }`
+  );
+}
+
+function killServer(server: ChildProcess): Promise<void> {
+  return new Promise((resolveFn) => {
+    if (!server.pid || server.exitCode !== null) {
+      resolveFn();
+      return;
+    }
+    const onExit = (): void => resolveFn();
+    server.once('exit', onExit);
+    server.kill('SIGTERM');
+    setTimeout(() => {
+      server.removeListener('exit', onExit);
+      if (server.exitCode === null) {
+        server.kill('SIGKILL');
+      }
+      resolveFn();
+    }, 2_000);
+  });
+}
+
+/** Clear the server's request log, then return a fetcher for the run's own slice. */
+async function resetLog(): Promise<void> {
+  const response = await fetch(`${SERVER_BASE}/__test__/reset`, { method: 'POST' });
+  expect(response.ok).toBe(true);
+}
+
+async function fetchLog(): Promise<Array<{ method: string; url: string }>> {
+  const response = await fetch(`${SERVER_BASE}/__test__/log`);
+  return (await response.json()) as Array<{ method: string; url: string }>;
+}
+
+function runConsumer(script: string): { stdout: string } {
+  const result = spawnSync('npx', ['tsx', join(consumerDir, script)], {
+    encoding: 'utf-8',
+    cwd: consumerDir,
+    timeout: 30_000,
+  });
+  expect(result.status, `${script} stdout:\n${result.stdout}\nstderr:\n${result.stderr}`).toBe(0);
+  return { stdout: result.stdout };
+}
+
+describe('generate-client pagination consumer', () => {
+  let serverProcess: ChildProcess | undefined;
+
+  beforeAll(async () => {
+    // The generated files are regenerated by this suite but must stay COMMITTED: the
+    // consumer scripts import them, and the repo-root `tsc --noEmit` typechecks tests/
+    // on a fresh checkout before any e2e run could produce them.
+    for (const file of [apiFile, apiOffsetFile, apiPackageFile]) {
+      if (existsSync(file)) rmSync(file, { force: true });
+    }
+
+    serverProcess = spawn('npx', ['tsx', serverScript], {
+      cwd: consumerDir,
+      env: { ...process.env, PAGINATION_SERVER_PORT: String(SERVER_PORT) },
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+
+    serverProcess.stderr?.on('data', (chunk: Buffer) => {
+      process.stderr.write(`[pagination-server stderr] ${chunk.toString()}`);
+    });
+
+    await waitForServerReady(15_000);
+  }, 30_000);
+
+  afterAll(async () => {
+    if (serverProcess) {
+      await killServer(serverProcess);
+    }
+  });
+
+  test('generate all three arms and assert the emitted pagination surface', async () => {
+    const generateClient = await loadGenerateClient();
+    // Extension arm: NO pagination config — `x-pagination` alone drives `listOrders`.
+    await generateClient({ api: fixture, output: apiFile });
+    // Convention arm: an offset rule applied to every operation it structurally fits.
+    await generateClient({
+      api: fixture,
+      output: apiOffsetFile,
+      pagination: { style: 'offset', offsetParam: 'offset', limitParam: 'limit', items: '/items' },
+    });
+    // Package arm: same extension-driven spec, runtime imported from the package.
+    await generateClient({ api: fixture, output: apiPackageFile, runtime: 'package' });
+
+    const api = readFileSync(apiFile, 'utf-8');
+    // The extension is normalized into the descriptor (param unified, stable key order).
+    expect(api).toContain(
+      'listOrders: { id: "listOrders", method: "GET", path: "/orders", params: [{ name: "cursor", in: "query" }, { name: "limit", in: "query" }], pagination: { style: "cursor", param: "cursor", limitParam: "limit", nextCursor: "/nextCursor", items: "/orders" } }'
+    );
+    // Ops declares the statically computed element type for the paginated op only.
+    expect(api).toContain('item: Order;');
+    expect(api).not.toContain('item: MenuItem;');
+    // The other operations carry NO pagination block…
+    expect(api).toContain(
+      'listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", params: [{ name: "offset", in: "query" }, { name: "limit", in: "query" }] }'
+    );
+    expect(api).toContain(
+      'getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", params: [{ name: "orderId", in: "path" }] }'
+    );
+    // …and the flat sugar preserves `.pages`/`.items` via Object.assign.
+    expect(api).toContain('export const listOrders = Object.assign((params: {');
+    expect(api).toContain('{ pages: client.listOrders.pages, items: client.listOrders.items });');
+    expect(api).not.toContain('client.listMenuItems.pages');
+    // Inline mode embeds paginate.ts (the infinite-loop guard is its fingerprint).
+    expect(api).toContain('// ─── Embedded runtime');
+    expect(api).toContain('Pagination did not advance');
+
+    const offset = readFileSync(apiOffsetFile, 'utf-8');
+    // The convention lands on listMenuItems (it fits)…
+    expect(offset).toContain(
+      'listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", params: [{ name: "offset", in: "query" }, { name: "limit", in: "query" }], pagination: { style: "offset", param: "offset", limitParam: "limit", items: "/items" } }'
+    );
+    expect(offset).toContain('item: MenuItem;');
+    expect(offset).toContain(
+      '{ pages: client.listMenuItems.pages, items: client.listMenuItems.items });'
+    );
+    // …precedence keeps the extension's cursor rule on listOrders (not the convention)…
+    expect(offset).toContain(
+      'pagination: { style: "cursor", param: "cursor", limitParam: "limit", nextCursor: "/nextCursor", items: "/orders" }'
+    );
+    // …and getOrder (no `offset` query param) is silently skipped, not an error.
+    expect(offset).toContain(
+      'getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", params: [{ name: "orderId", in: "path" }] }'
+    );
+
+    const pkg = readFileSync(apiPackageFile, 'utf-8');
+    // Package mode: no embedded runtime — pagination arrives via the import.
+    expect(pkg).toContain("from '@redocly/client-generator'");
+    expect(pkg).not.toContain('// ─── Embedded runtime');
+    expect(pkg).toContain(
+      'pagination: { style: "cursor", param: "cursor", limitParam: "limit", nextCursor: "/nextCursor", items: "/orders" }'
+    );
+    expect(pkg).toContain('{ pages: client.listOrders.pages, items: client.listOrders.items });');
+  }, 60_000);
+
+  test('typecheck gate: all three generated clients + consumer scripts, strict', () => {
+    const typecheckResult = spawnSync('npx', ['tsc', '--noEmit', '-p', consumerDir], {
+      encoding: 'utf-8',
+      cwd: repoRoot,
+    });
+    expect(
+      typecheckResult.status,
+      `tsc --noEmit failed:\nstdout:\n${typecheckResult.stdout}\nstderr:\n${typecheckResult.stderr}`
+    ).toBe(0);
+  }, 60_000);
+
+  test('cursor (extension arm): .items across 3 pages, .pages sizes, resume, no arg mutation', async () => {
+    await resetLog();
+    const { stdout } = runConsumer('index.ts');
+    const parsed = JSON.parse(stdout.trim()) as {
+      ids: string[];
+      firstCursorLeaked: boolean;
+      pageSizes: number[];
+      resumedIds: string[];
+      resumeCursorAfter: string;
+    };
+    // All five items, in order, across the 2+2+1 pages.
+    expect(parsed.ids).toEqual(['o-1', 'o-2', 'o-3', 'o-4', 'o-5']);
+    expect(parsed.pageSizes).toEqual([2, 2, 1]);
+    // Resume from `cursor: 'c2'` starts at page 2; caller args stay untouched.
+    expect(parsed.resumedIds).toEqual(['o-3', 'o-4', 'o-5']);
+    expect(parsed.firstCursorLeaked).toBe(false);
+    expect(parsed.resumeCursorAfter).toBe('c2');
+
+    // The wire: cursor progression (none, c2, c3) with `limit` forwarded every time.
+    const log = await fetchLog();
+    expect(log.map((e) => e.url)).toEqual([
+      // .items(): three pages.
+      '/orders?limit=2',
+      '/orders?limit=2&cursor=c2',
+      '/orders?limit=2&cursor=c3',
+      // .pages(): the same progression.
+      '/orders?limit=2',
+      '/orders?limit=2&cursor=c2',
+      '/orders?limit=2&cursor=c3',
+      // Resume: starts at the caller's cursor — page 1 is never requested.
+      '/orders?cursor=c2&limit=2',
+      '/orders?cursor=c3&limit=2',
+    ]);
+    expect(log.every((e) => e.method === 'GET' && e.url.includes('limit=2'))).toBe(true);
+  }, 60_000);
+
+  test('offset (convention arm): advances by page item count, stops on the empty page', async () => {
+    await resetLog();
+    const { stdout } = runConsumer('index-offset.ts');
+    const parsed = JSON.parse(stdout.trim()) as {
+      names: string[];
+      pageSizes: number[];
+      listOrdersStyle: string;
+    };
+    expect(parsed.names).toEqual(['espresso', 'latte', 'mocha', 'flat white', 'cortado']);
+    // The trailing empty page is yielded (pages arrive before the stop check).
+    expect(parsed.pageSizes).toEqual([2, 2, 1, 0]);
+    // Runtime echo of the compile-time precedence pin.
+    expect(parsed.listOrdersStyle).toBe('cursor');
+
+    // offset=0,2,4 then the empty probe at 5 — for the .items() and .pages() walks.
+    const log = await fetchLog();
+    expect(log.map((e) => e.url)).toEqual([
+      '/menu?limit=2&offset=0',
+      '/menu?limit=2&offset=2',
+      '/menu?limit=2&offset=4',
+      '/menu?limit=2&offset=5',
+      '/menu?limit=2&offset=0',
+      '/menu?limit=2&offset=2',
+      '/menu?limit=2&offset=4',
+      '/menu?limit=2&offset=5',
+    ]);
+  }, 60_000);
+
+  test('abort mid-iteration: the forwarded signal rejects the next page fetch', async () => {
+    await resetLog();
+    const { stdout } = runConsumer('index-abort.ts');
+    const parsed = JSON.parse(stdout.trim()) as { received: number; error: string | null };
+    // The first page (2 items) drains from memory, then the page-2 fetch aborts.
+    expect(parsed.received).toBe(2);
+    expect(parsed.error).toBe('AbortError');
+
+    const log = await fetchLog();
+    const pageRequests = log.filter((e) => e.url.startsWith('/orders'));
+    expect(pageRequests.length).toBeGreaterThanOrEqual(1);
+    expect(pageRequests.length).toBeLessThanOrEqual(2);
+  }, 60_000);
+
+  test('package-mode arm: .items() runs on the runtime imported from the package', async () => {
+    await resetLog();
+    const { stdout } = runConsumer('index-package.ts');
+    const parsed = JSON.parse(stdout.trim()) as { ids: string[] };
+    expect(parsed.ids).toEqual(['o-1', 'o-2', 'o-3', 'o-4', 'o-5']);
+
+    const log = await fetchLog();
+    expect(log.map((e) => e.url)).toEqual([
+      '/orders?limit=2',
+      '/orders?limit=2&cursor=c2',
+      '/orders?limit=2&cursor=c3',
+    ]);
+  }, 60_000);
+});
diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
index 2b934189f9..a9a3b5cc9d 100644
--- a/tests/e2e/generate-client/redocly-config.test.ts
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -172,6 +172,87 @@ describe('generate-client redocly.yaml config', () => {
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
+  it('applies a `client.pagination` convention rule (descriptor + flat-sugar iterators)', () => {
+    const dir = project(
+      [
+        'apis:',
+        '  cafe:',
+        '    root: ./openapi.yaml',
+        '    clientOutput: ./out.ts',
+        '    client:',
+        '      generators: [sdk]',
+        '      pagination:',
+        '        style: cursor',
+        '        cursorParam: after',
+        '        nextCursor: /page/endCursor',
+        '        limitParam: limit',
+        '        items: /items',
+      ].join('\n') + '\n'
+    );
+    const res = run(dir, ['cafe']);
+    expect(res.status, res.stderr).toBe(0);
+    // The pagination block is part of the config schema -> no struct-rule warning.
+    expect(res.stdout + res.stderr).not.toContain('is not expected here');
+    const out = readFileSync(join(dir, 'out.ts'), 'utf-8');
+    // The convention fits the cursor-style list operations -> descriptor pagination…
+    expect(out).toContain('pagination: {');
+    // …and the flat sugar preserves the method-attached iterators.
+    expect(out).toContain('items: client.listOrders.items');
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('fails generation when an explicit `pagination.operations` rule does not fit', () => {
+    const dir = project(
+      [
+        'apis:',
+        '  cafe:',
+        '    root: ./openapi.yaml',
+        '    clientOutput: ./out.ts',
+        '    client:',
+        '      generators: [sdk]',
+        '      pagination:',
+        '        operations:',
+        '          getRevenue:', // has no `after` query param -> explicit misfit = error
+        '            style: cursor',
+        '            cursorParam: after',
+        '            nextCursor: /page/endCursor',
+        '            items: /items',
+      ].join('\n') + '\n'
+    );
+    const res = run(dir, ['cafe']);
+    expect(res.status).not.toBe(0);
+    expect(res.stderr).toContain('Invalid pagination configuration');
+    expect(res.stderr).toContain(
+      'Pagination for operation "getRevenue" (pagination.operations["getRevenue"]): query parameter "after" is not declared on the operation'
+    );
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
+  it('warns on an unknown key inside `client.pagination` (config struct rule) but still generates', () => {
+    const dir = project(
+      [
+        'apis:',
+        '  cafe:',
+        '    root: ./openapi.yaml',
+        '    clientOutput: ./out.ts',
+        '    client:',
+        '      generators: [sdk]',
+        '      pagination:',
+        '        style: cursor',
+        '        cursor_param: after', // unknown key -> property-not-expected warning
+        '        cursorParam: after',
+        '        nextCursor: /page/endCursor',
+        '        items: /items',
+      ].join('\n') + '\n'
+    );
+    const res = run(dir, ['cafe']);
+    expect(res.status, res.stderr).toBe(0);
+    expect(res.stdout + res.stderr).toContain('Property `cursor_param` is not expected here.');
+    expect(res.stderr).toContain('Your config has 1 warning');
+    expect(existsSync(join(dir, 'out.ts'))).toBe(true);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
   it('rejects --output in fan-out mode', () => {
     const dir = project(
       [
diff --git a/tests/e2e/generate-client/sse-consumer/api.ts b/tests/e2e/generate-client/sse-consumer/api.ts
index 313ac84c31..982775a15d 100644
--- a/tests/e2e/generate-client/sse-consumer/api.ts
+++ b/tests/e2e/generate-client/sse-consumer/api.ts
@@ -86,6 +86,22 @@ export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
 
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
 /** The frozen data contract between generated code and the runtime: one operation's wire shape. */
 export type OperationDescriptor = {
   id: string;
@@ -99,6 +115,7 @@ export type OperationDescriptor = {
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
   security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
 };
 
 /** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
@@ -225,8 +242,16 @@ export type Result<TData, TError> =
   | { data: TData; error: undefined; response: Response }
   | { data: undefined; error: TError; response: Response };
 
-/** The generated `Ops` type's shape: per-operation args/result (and `kind: 'sse'` for streams). */
-export type OpsShape = Record<string, { args: object; result: unknown; kind?: 'sse' }>;
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
 
 /** The always-present client members (assigned after the operation loop — they win collisions). */
 export type ClientCore<Op extends OperationContext = OperationContext> = {
@@ -248,6 +273,35 @@ export type ClientCore<Op extends OperationContext = OperationContext> = {
 // oxlint-disable-next-line typescript/no-empty-object-type
 type NoRequiredKeys<A> = {} extends A ? true : false;
 
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
 /** The typed instance client: one bound method per operation plus the core members. */
 export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
   [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
@@ -260,9 +314,10 @@ export type Client<Ops extends OpsShape, Op extends OperationContext = Operation
           args: Ops[K]['args'],
           init?: SseOptions
         ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : NoRequiredKeys<Ops[K]['args']> extends true
-      ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-      : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>;
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
 } & ClientCore<Op>;
 
 /** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
@@ -754,6 +809,20 @@ type Capabilities = SendCapabilities & {
     init: SseOptions,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
 };
 
 /** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
@@ -891,6 +960,39 @@ async function execute(
   return parse(response, readKind);
 }
 
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
 /**
  * Build a typed instance client over operation descriptors: one real bound method per
  * operation (attached by a construction-time loop — no Proxy), plus the core members
@@ -930,8 +1032,24 @@ function createClientCore<
         })();
       };
     } else {
-      client[name] = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
     }
   }
 

From eb526f74e3e5b94b86b11bf174f8113293ca1b98 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Wed, 8 Jul 2026 12:14:48 +0300
Subject: [PATCH 073/134] feat(client-generator): nested-facade example +
 output-path interpolation guard
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- nested-facade: a custom generator (plugin API) derives a resource-grouped
  facade — api.<resource>.<operation>(…) — from the spec's tags, so the nested
  call shape regenerates with the spec instead of living in a hand-maintained
  file. Registered in the regen/drift/typecheck harnesses.
- generateClient rejects output paths containing a literal 'undefined'/'null'
  segment — the telltale of an interpolation bug in the caller — instead of
  silently creating an 'undefined/' directory.
---
 package-lock.json                             |   6 +-
 packages/cli/package.json                     |   4 +-
 packages/client-generator/package.json        |   2 +-
 .../scripts/regenerate-examples.mjs           |   1 +
 .../scripts/typecheck-examples.mjs            |   1 +
 tests/e2e/generate-client/examples.test.ts    |   1 +
 tests/e2e/generate-client/examples/README.md  |  35 +-
 .../examples/nested-facade/README.md          |  15 +
 .../nested-facade/nested-facade-generator.mjs |  38 +
 .../examples/nested-facade/openapi.yaml       |  72 ++
 .../examples/nested-facade/package.json       |  15 +
 .../examples/nested-facade/redocly.yaml       |  13 +
 .../nested-facade/src/api/client.facade.ts    |   7 +
 .../examples/nested-facade/src/api/client.ts  | 973 ++++++++++++++++++
 .../examples/nested-facade/src/main.ts        |  28 +
 .../examples/nested-facade/tsconfig.json      |   4 +
 16 files changed, 1192 insertions(+), 23 deletions(-)
 create mode 100644 tests/e2e/generate-client/examples/nested-facade/README.md
 create mode 100644 tests/e2e/generate-client/examples/nested-facade/nested-facade-generator.mjs
 create mode 100644 tests/e2e/generate-client/examples/nested-facade/openapi.yaml
 create mode 100644 tests/e2e/generate-client/examples/nested-facade/package.json
 create mode 100644 tests/e2e/generate-client/examples/nested-facade/redocly.yaml
 create mode 100644 tests/e2e/generate-client/examples/nested-facade/src/api/client.facade.ts
 create mode 100644 tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
 create mode 100644 tests/e2e/generate-client/examples/nested-facade/src/main.ts
 create mode 100644 tests/e2e/generate-client/examples/nested-facade/tsconfig.json

diff --git a/package-lock.json b/package-lock.json
index 02a449540a..2fded672bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9863,7 +9863,7 @@
     },
     "packages/cli": {
       "name": "@redocly/cli",
-      "version": "2.37.0",
+      "version": "2.37.0-2026-07-08.1-local",
       "license": "MIT",
       "bin": {
         "openapi": "bin/cli.js",
@@ -9875,7 +9875,7 @@
         "@opentelemetry/sdk-trace-node": "2.8.0",
         "@opentelemetry/semantic-conventions": "1.41.1",
         "@redocly/cli-otel": "0.3.1",
-        "@redocly/client-generator": "0.0.0",
+        "@redocly/client-generator": "0.1.0-2026-07-08.1-local",
         "@redocly/openapi-core": "2.37.0",
         "@redocly/respect-core": "2.37.0",
         "@types/cookie": "0.6.0",
@@ -9910,7 +9910,7 @@
     },
     "packages/client-generator": {
       "name": "@redocly/client-generator",
-      "version": "0.0.0",
+      "version": "0.1.0-2026-07-08.1-local",
       "license": "MIT",
       "dependencies": {
         "@redocly/openapi-core": "2.37.0"
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 94a4abfb21..5367c31103 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redocly/cli",
-  "version": "2.37.0",
+  "version": "2.37.0-2026-07-08.1-local",
   "description": "",
   "license": "MIT",
   "bin": {
@@ -45,7 +45,7 @@
     "@opentelemetry/sdk-trace-node": "2.8.0",
     "@opentelemetry/semantic-conventions": "1.41.1",
     "@redocly/cli-otel": "0.3.1",
-    "@redocly/client-generator": "0.0.0",
+    "@redocly/client-generator": "0.1.0-2026-07-08.1-local",
     "@redocly/openapi-core": "2.37.0",
     "@redocly/respect-core": "2.37.0",
     "@types/cookie": "0.6.0",
diff --git a/packages/client-generator/package.json b/packages/client-generator/package.json
index ba679b13be..54f2d4c250 100644
--- a/packages/client-generator/package.json
+++ b/packages/client-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redocly/client-generator",
-  "version": "0.0.0",
+  "version": "0.1.0-2026-07-08.1-local",
   "description": "Generate typed, zero-dependency TypeScript clients (fetch, auth, retries, middleware, SSE) from OpenAPI descriptions.",
   "type": "module",
   "types": "lib/index.d.ts",
diff --git a/packages/client-generator/scripts/regenerate-examples.mjs b/packages/client-generator/scripts/regenerate-examples.mjs
index 1e0bf4f22f..3cbc8567b7 100644
--- a/packages/client-generator/scripts/regenerate-examples.mjs
+++ b/packages/client-generator/scripts/regenerate-examples.mjs
@@ -17,6 +17,7 @@ const examples = [
   'zod',
   'mock',
   'custom-generator',
+  'nested-facade',
   'tanstack-query',
   'programmatic',
   'package-runtime',
diff --git a/packages/client-generator/scripts/typecheck-examples.mjs b/packages/client-generator/scripts/typecheck-examples.mjs
index 15066fabbb..352bd563a1 100644
--- a/packages/client-generator/scripts/typecheck-examples.mjs
+++ b/packages/client-generator/scripts/typecheck-examples.mjs
@@ -19,6 +19,7 @@ const examples = [
   'programmatic',
   'mock',
   'custom-generator',
+  'nested-facade',
   'package-runtime',
   'zero-install-quickstart',
   'configure-and-middleware',
diff --git a/tests/e2e/generate-client/examples.test.ts b/tests/e2e/generate-client/examples.test.ts
index 42abfacb26..d9b81c7f2b 100644
--- a/tests/e2e/generate-client/examples.test.ts
+++ b/tests/e2e/generate-client/examples.test.ts
@@ -26,6 +26,7 @@ const EXAMPLES = [
   'vendored-edge',
   'pagination',
   'custom-pagination',
+  'nested-facade',
 ];
 
 /**
diff --git a/tests/e2e/generate-client/examples/README.md b/tests/e2e/generate-client/examples/README.md
index 2748e396c3..4493123977 100644
--- a/tests/e2e/generate-client/examples/README.md
+++ b/tests/e2e/generate-client/examples/README.md
@@ -6,23 +6,24 @@ generator in CI** (`tests/e2e/generate-client/examples.test.ts`). Most are Vite
 generated via the `redocly generate-client` CLI (a `redocly.yaml`); `programmatic` _generates_ one with
 the `generateClient(...)` API.
 
-| Example                                                | How it's generated            | Shows                                                                                                                                     |
-| ------------------------------------------------------ | ----------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------- |
-| [fetch-functions](./fetch-functions)                   | CLI · `sdk`, functions        | free functions + `ApiError`                                                                                                               |
-| [customization](./customization)                       | CLI · `sdk`, functions        | request/response middleware, `ctx.operation` targeting, body mutation, custom transport                                                   |
-| [baked-setup](./baked-setup)                           | CLI · `sdk`, functions        | publisher defaults baked into the client via `--setup` (`defineClientSetup`)                                                              |
-| [zod](./zod)                                           | CLI · `sdk`, `zod`            | validating responses with generated zod schemas                                                                                           |
-| [tanstack-query](./tanstack-query)                     | CLI · `sdk`, `tanstack-query` | React `useQuery(<op>Options())`                                                                                                           |
-| [mock](./mock)                                         | CLI · `sdk`, `mock`           | MSW handlers from generated `handlers`                                                                                                    |
-| [programmatic](./programmatic)                         | `generateClient(...)` API     | generating the client from a Node script                                                                                                  |
-| [package-runtime](./package-runtime)                   | CLI · `sdk`, package runtime  | `runtime: package` — types + descriptors only; the versioned runtime is imported from `@redocly/client-generator`, fixes via `npm update` |
-| [zero-install-quickstart](./zero-install-quickstart)   | CLI · `sdk`                   | the first-touch loop: generate → import → call; one self-contained file, zero runtime dependencies                                        |
-| [configure-and-middleware](./configure-and-middleware) | CLI · `sdk`                   | `configure({ serverUrl, retry })`, `use()` targeting `ctx.operation.id` (literal union), auth setter, typed `ApiError.body`               |
-| [multi-instance](./multi-instance)                     | CLI · `sdk`, package runtime  | per-tenant instances via `createClient(OPERATIONS)` — works in both runtimes; this example uses `runtime: package`                        |
-| [sse-streaming](./sse-streaming)                       | CLI · `sdk`                   | typed `for await` over SSE, auto-reconnect via `Last-Event-ID` (`reconnectDelay`/`reconnect: false`), clean abort                         |
-| [vendored-edge](./vendored-edge)                       | CLI · `sdk`                   | the generated file copied into a no-npm edge worker (`export default { fetch }`); `typescript` is the only dev tool                       |
-| [pagination](./pagination)                             | CLI · `sdk`                   | auto-pagination from a `client.pagination` convention: `for await` over `.items()`/`.pages()` next to the unchanged one-shot call         |
-| [custom-pagination](./custom-pagination)               | CLI · `sdk`                   | hand-written paging over the typed client for shapes the built-in styles don't cover (body cursors)                                       |
+| Example                                                | How it's generated             | Shows                                                                                                                                     |
+| ------------------------------------------------------ | ------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------- |
+| [fetch-functions](./fetch-functions)                   | CLI · `sdk`, functions         | free functions + `ApiError`                                                                                                               |
+| [customization](./customization)                       | CLI · `sdk`, functions         | request/response middleware, `ctx.operation` targeting, body mutation, custom transport                                                   |
+| [baked-setup](./baked-setup)                           | CLI · `sdk`, functions         | publisher defaults baked into the client via `--setup` (`defineClientSetup`)                                                              |
+| [zod](./zod)                                           | CLI · `sdk`, `zod`             | validating responses with generated zod schemas                                                                                           |
+| [tanstack-query](./tanstack-query)                     | CLI · `sdk`, `tanstack-query`  | React `useQuery(<op>Options())`                                                                                                           |
+| [mock](./mock)                                         | CLI · `sdk`, `mock`            | MSW handlers from generated `handlers`                                                                                                    |
+| [programmatic](./programmatic)                         | `generateClient(...)` API      | generating the client from a Node script                                                                                                  |
+| [package-runtime](./package-runtime)                   | CLI · `sdk`, package runtime   | `runtime: package` — types + descriptors only; the versioned runtime is imported from `@redocly/client-generator`, fixes via `npm update` |
+| [zero-install-quickstart](./zero-install-quickstart)   | CLI · `sdk`                    | the first-touch loop: generate → import → call; one self-contained file, zero runtime dependencies                                        |
+| [configure-and-middleware](./configure-and-middleware) | CLI · `sdk`                    | `configure({ serverUrl, retry })`, `use()` targeting `ctx.operation.id` (literal union), auth setter, typed `ApiError.body`               |
+| [multi-instance](./multi-instance)                     | CLI · `sdk`, package runtime   | per-tenant instances via `createClient(OPERATIONS)` — works in both runtimes; this example uses `runtime: package`                        |
+| [sse-streaming](./sse-streaming)                       | CLI · `sdk`                    | typed `for await` over SSE, auto-reconnect via `Last-Event-ID` (`reconnectDelay`/`reconnect: false`), clean abort                         |
+| [vendored-edge](./vendored-edge)                       | CLI · `sdk`                    | the generated file copied into a no-npm edge worker (`export default { fetch }`); `typescript` is the only dev tool                       |
+| [pagination](./pagination)                             | CLI · `sdk`                    | auto-pagination from a `client.pagination` convention: `for await` over `.items()`/`.pages()` next to the unchanged one-shot call         |
+| [custom-pagination](./custom-pagination)               | CLI · `sdk`                    | hand-written paging over the typed client for shapes the built-in styles don't cover (body cursors)                                       |
+| [nested-facade](./nested-facade)                       | CLI · `sdk` + custom generator | `api.<resource>.<operation>` facade derived from the spec's tags by a plugin — regenerates with the spec                                  |
 
 ## Run one
 
diff --git a/tests/e2e/generate-client/examples/nested-facade/README.md b/tests/e2e/generate-client/examples/nested-facade/README.md
new file mode 100644
index 0000000000..4ea7dbb045
--- /dev/null
+++ b/tests/e2e/generate-client/examples/nested-facade/README.md
@@ -0,0 +1,15 @@
+# nested-facade
+
+A resource-grouped call shape — `api.orders.listOrders(…)` — derived from the
+spec's **tags** by a small [custom generator](./nested-facade-generator.mjs)
+(the experimental plugin API), so the nesting regenerates with the spec instead
+of living in a hand-maintained facade file. Everything stays fully typed: the
+facade just re-exports the sdk's generated functions in nested objects.
+
+## Run
+
+```bash
+npm install
+npm run generate
+npm start
+```
diff --git a/tests/e2e/generate-client/examples/nested-facade/nested-facade-generator.mjs b/tests/e2e/generate-client/examples/nested-facade/nested-facade-generator.mjs
new file mode 100644
index 0000000000..ebee143162
--- /dev/null
+++ b/tests/e2e/generate-client/examples/nested-facade/nested-facade-generator.mjs
@@ -0,0 +1,38 @@
+// A custom generator (the experimental plugin API): groups the sdk's generated
+// free functions by their first tag and emits a nested facade —
+// `api.orders.listOrders(…)` — derived from the spec, regenerated with it.
+//
+// Authored in TypeScript you would write:
+//   import { defineGenerator } from '@redocly/client-generator';
+//   export default defineGenerator({ name: 'nested-facade', requires: ['sdk'], run({ model, outputPath }) { … } });
+const groupIdent = (tag) => {
+  const ident = tag.replace(/[^A-Za-z0-9_$]/g, '_');
+  return /^[A-Za-z_$]/.test(ident) ? ident[0].toLowerCase() + ident.slice(1) : `_${ident}`;
+};
+
+export default {
+  name: 'nested-facade',
+  requires: ['sdk'],
+  run({ model, outputPath }) {
+    const groups = new Map();
+    for (const op of model.services.flatMap((service) => service.operations)) {
+      const group = groupIdent(op.tags[0] ?? 'other');
+      (groups.get(group) ?? groups.set(group, []).get(group)).push(op.name);
+    }
+    const names = [...groups.values()].flat().sort();
+    const stem = outputPath.split(/[\\/]/).pop().replace(/\.ts$/, '');
+    const body = [...groups]
+      .map(([group, ops]) => `export const ${group} = { ${ops.join(', ')} } as const;`)
+      .join('\n');
+    return [
+      {
+        path: outputPath.replace(/\.ts$/, '.facade.ts'),
+        content:
+          '// Generated by the nested-facade custom generator. Do not edit by hand.\n' +
+          `import { ${names.join(', ')} } from './${stem}.js';\n\n` +
+          body +
+          `\n\nexport const api = { ${[...groups.keys()].join(', ')} } as const;\n`,
+      },
+    ];
+  },
+};
diff --git a/tests/e2e/generate-client/examples/nested-facade/openapi.yaml b/tests/e2e/generate-client/examples/nested-facade/openapi.yaml
new file mode 100644
index 0000000000..d345ddbc7d
--- /dev/null
+++ b/tests/e2e/generate-client/examples/nested-facade/openapi.yaml
@@ -0,0 +1,72 @@
+openapi: 3.1.0
+info:
+  title: Cafe API
+  description: A small tagged API for the nested-facade example.
+  version: 1.0.0
+servers:
+  - url: https://api.cafe-orders.example.com
+tags:
+  - name: Orders
+  - name: Menu
+paths:
+  /orders:
+    get:
+      operationId: listOrders
+      tags: [Orders]
+      responses:
+        '200':
+          description: All orders.
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Order'
+  /orders/{orderId}:
+    get:
+      operationId: getOrder
+      tags: [Orders]
+      parameters:
+        - name: orderId
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: The order.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Order'
+  /menu:
+    get:
+      operationId: listMenuItems
+      tags: [Menu]
+      responses:
+        '200':
+          description: The menu.
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/MenuItem'
+components:
+  schemas:
+    Order:
+      type: object
+      required: [id, drink]
+      properties:
+        id:
+          type: string
+        drink:
+          type: string
+    MenuItem:
+      type: object
+      required: [name, price]
+      properties:
+        name:
+          type: string
+        price:
+          type: integer
diff --git a/tests/e2e/generate-client/examples/nested-facade/package.json b/tests/e2e/generate-client/examples/nested-facade/package.json
new file mode 100644
index 0000000000..5fbb88558e
--- /dev/null
+++ b/tests/e2e/generate-client/examples/nested-facade/package.json
@@ -0,0 +1,15 @@
+{
+  "name": "@redocly-examples/nested-facade",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "generate": "redocly generate-client",
+    "start": "tsx src/main.ts"
+  },
+  "devDependencies": {
+    "@redocly/cli": "latest",
+    "tsx": "^4.0.0",
+    "typescript": "^5.5.0"
+  }
+}
diff --git a/tests/e2e/generate-client/examples/nested-facade/redocly.yaml b/tests/e2e/generate-client/examples/nested-facade/redocly.yaml
new file mode 100644
index 0000000000..daf72c0a5b
--- /dev/null
+++ b/tests/e2e/generate-client/examples/nested-facade/redocly.yaml
@@ -0,0 +1,13 @@
+# redocly.yaml — drives `redocly generate-client` for this example.
+#
+# The custom generator below derives a nested, resource-grouped facade
+# (`api.orders.listOrders(…)`) from the spec's tags — so the nesting regenerates
+# with the spec instead of living in a hand-maintained file.
+apis:
+  nested-facade:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
+        - ./nested-facade-generator.mjs
diff --git a/tests/e2e/generate-client/examples/nested-facade/src/api/client.facade.ts b/tests/e2e/generate-client/examples/nested-facade/src/api/client.facade.ts
new file mode 100644
index 0000000000..9982c6a80b
--- /dev/null
+++ b/tests/e2e/generate-client/examples/nested-facade/src/api/client.facade.ts
@@ -0,0 +1,7 @@
+// Generated by the nested-facade custom generator. Do not edit by hand.
+import { getOrder, listMenuItems, listOrders } from './client.js';
+
+export const orders = { listOrders, getOrder } as const;
+export const menu = { listMenuItems } as const;
+
+export const api = { orders, menu } as const;
diff --git a/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts b/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
new file mode 100644
index 0000000000..eb4efce515
--- /dev/null
+++ b/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
@@ -0,0 +1,973 @@
+// Generated by @redocly/client-generator — do not edit by hand.
+// Source: OpenAPI document. Re-run `redocly generate-client` to update.
+
+/**
+ * Cafe API (v1.0.0)
+ * A small tagged API for the nested-facade example.
+ */
+
+export type Order = {
+    id: string;
+    drink: string;
+};
+
+export type MenuItem = {
+    name: string;
+    price: number;
+};
+
+export type ListOrdersResult = Order[];
+
+export type GetOrderResult = Order;
+
+export type GetOrderVariables = {
+    orderId: string;
+};
+
+export type ListMenuItemsResult = MenuItem[];
+
+/**
+ * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
+ * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
+ */
+export type Ops = {
+    listOrders: {
+        args: {};
+        result: ListOrdersResult;
+    };
+    getOrder: {
+        args: {
+            orderId: string;
+        };
+        result: GetOrderResult;
+    };
+    listMenuItems: {
+        args: {};
+        result: ListMenuItemsResult;
+    };
+};
+
+/**
+ * The wire-shape descriptor for every operation, keyed by operationId — the data the
+ * runtime routes requests by. Also minification-safe static metadata (method, path,
+ * tags) for cache keys, tracing span names, and request logging.
+ */
+export const OPERATIONS = {
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"] },
+    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }] },
+    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Menu"] }
+} as const satisfies Record<string, OperationDescriptor>;
+
+export type OperationId = keyof typeof OPERATIONS;
+
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
+
+export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
+    tags: readonly string[];
+}>["tags"][number];
+
+// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
+
+/**
+ * The public type surface of the client runtime — `@redocly/client-generator`'s
+ * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
+ * The generator emits `OPERATIONS` literals typed
+ * `satisfies Record<string, OperationDescriptor>` against this module, so an
+ * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
+ */
+
+/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
+export type ParamSpec = {
+  name: string;
+  in: 'path' | 'query' | 'header';
+  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
+  explode?: boolean;
+  allowReserved?: boolean;
+};
+
+/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+export type SecuritySpec =
+  | { scheme: string; kind: 'bearer' | 'basic' }
+  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
+
+/**
+ * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
+ * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
+ */
+export type PaginationSpec = {
+  style: 'cursor' | 'offset' | 'page';
+  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
+  param: string;
+  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
+  limitParam?: string;
+  /** Cursor style only: pointer to the next cursor in the page. */
+  nextCursor?: string;
+  /** Pointer to the page's item array. */
+  items: string;
+};
+
+/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
+export type OperationDescriptor = {
+  id: string;
+  method: string;
+  path: string;
+  tags?: readonly string[];
+  params?: readonly ParamSpec[];
+  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
+  body?: { contentType: string; multipart?: boolean };
+  /** Defaults to `'json'` (content-type negotiation on parse). */
+  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
+  sseDataKind?: 'json' | 'text';
+  security?: readonly SecuritySpec[];
+  pagination?: PaginationSpec;
+};
+
+/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
+export type QueryValue =
+  | string
+  | number
+  | boolean
+  | null
+  | undefined
+  | Array<string | number | boolean | null | undefined>
+  | Record<string, unknown>;
+
+/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
+export type TokenProvider = string | (() => string | Promise<string>);
+
+/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
+export type AuthCredentials = {
+  bearer?: TokenProvider;
+  basic?: { username: string; password: string };
+  apiKey?: Record<string, TokenProvider>;
+};
+
+/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
+export type RetryStrategy = 'fixed' | 'exponential';
+
+/**
+ * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
+ * Generated clients instantiate the type parameters with the spec's literal unions
+ * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
+ * middleware comparison fails to compile; the string defaults keep every
+ * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
+ * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
+ * (byte-locked to generated output) remain assignable through middleware callbacks.
+ */
+export type OperationContext<
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+> = { id: Id; path: Path; tags: Tag[] };
+
+/** The mutable request context threaded through the middleware chain. */
+export type RequestContext<Op extends OperationContext = OperationContext> = {
+  url: string;
+  method: string;
+  headers: Record<string, string>;
+  body?: unknown;
+  operation: Op;
+};
+
+/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
+export type RetryContext<Op extends OperationContext = OperationContext> = {
+  attempt: number;
+  request: RequestContext<Op>;
+  response?: Response;
+  error?: unknown;
+};
+
+/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
+export type RetryConfig<Op extends OperationContext = OperationContext> = {
+  retries?: number;
+  retryDelay?: number;
+  retryStrategy?: RetryStrategy;
+  jitter?: boolean;
+  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
+};
+
+/**
+ * Structural stand-in for the runtime's ApiError so this module stays import-free
+ * (pure types); the real `ApiError` class is assignable to it.
+ */
+export type ApiErrorLike = globalThis.Error & {
+  url: string;
+  status: number;
+  statusText: string;
+  body: unknown;
+};
+
+/** One interceptor: any subset of the three hooks. */
+export type Middleware<Op extends OperationContext = OperationContext> = {
+  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
+  onResponse?: (
+    response: Response,
+    ctx: RequestContext<Op>
+  ) => Response | void | Promise<Response | void>;
+  /** Throw mode only: may map/replace the error. */
+  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
+  onError?: (
+    error: ApiErrorLike,
+    ctx: RequestContext<Op>
+  ) => globalThis.Error | Promise<globalThis.Error>;
+};
+
+/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
+export type ClientConfig<Op extends OperationContext = OperationContext> = {
+  serverUrl?: string;
+  fetch?: typeof fetch;
+  headers?:
+    | Record<string, string>
+    | (() => Record<string, string> | Promise<Record<string, string>>);
+  retry?: RetryConfig<Op>;
+  middleware?: Middleware<Op>[];
+  auth?: AuthCredentials;
+  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
+  errorMode?: 'throw' | 'result';
+  onRequest?: Middleware<Op>['onRequest'];
+  onResponse?: Middleware<Op>['onResponse'];
+  onError?: Middleware<Op>['onError'];
+};
+
+/** Response readers for the per-call `parseAs` override. */
+export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
+
+/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
+export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
+
+/** Per-call options for an SSE stream; reconnect defaults to true. */
+export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
+
+/** A single decoded Server-Sent Event with its payload typed from the spec. */
+export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
+
+/** Result-mode return shape: exactly one of `data`/`error` is set. */
+export type Result<TData, TError> =
+  | { data: TData; error: undefined; response: Response }
+  | { data: undefined; error: TError; response: Response };
+
+/**
+ * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
+ * streams and, for paginated operations, `item` (the page's element type) and — on
+ * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
+ * iteration unwraps the `Result` envelope the one-shot `result` carries).
+ */
+export type OpsShape = Record<
+  string,
+  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
+>;
+
+/** The always-present client members (assigned after the operation loop — they win collisions). */
+export type ClientCore<Op extends OperationContext = OperationContext> = {
+  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
+  configure(config: ClientConfig<Op>): void;
+  /** Append interceptors (composes with baked/publisher middleware). */
+  use(...middleware: Middleware<Op>[]): void;
+  auth: {
+    bearer(token: TokenProvider): void;
+    basic(username: string, password: string): void;
+    apiKey(scheme: string, value: TokenProvider): void;
+  };
+};
+
+/**
+ * The standard TypeScript optionality probe: `{}` has no required members, so
+ * `{} extends A` is true exactly when every member of `A` is optional.
+ */
+// oxlint-disable-next-line typescript/no-empty-object-type
+type NoRequiredKeys<A> = {} extends A ? true : false;
+
+/**
+ * The page type `.pages()` yields: the RAW page declared by `page` (the generator
+ * writes it only on result-mode paginated entries, whose `result` is the envelope),
+ * or the method's own `result` (throw mode — already the raw page).
+ */
+type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
+  ? Entry['page']
+  : Entry['result'];
+
+/**
+ * The auto-pagination members intersected onto a paginated method — present exactly when
+ * the Ops entry declares `item` (the generator writes it only for paginated operations).
+ * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
+ * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
+ * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
+ * `onError` middleware hook (throw-mode-only) is not invoked.
+ */
+type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
+  ? NoRequiredKeys<Entry['args']> extends true
+    ? {
+        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+    : {
+        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
+        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
+      }
+  : unknown;
+
+/** The typed instance client: one bound method per operation plus the core members. */
+export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
+  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
+    ? NoRequiredKeys<Ops[K]['args']> extends true
+      ? (
+          args?: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+      : (
+          args: Ops[K]['args'],
+          init?: SseOptions
+        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
+    : (NoRequiredKeys<Ops[K]['args']> extends true
+        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
+        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
+        Paginated<Ops[K]>;
+} & ClientCore<Op>;
+
+/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
+export class ApiError extends Error {
+  public readonly url: string;
+  public readonly status: number;
+  public readonly statusText: string;
+  public readonly body: unknown;
+  constructor(url: string, status: number, statusText: string, body: unknown) {
+    super(`Request failed with status ${status}`);
+    this.name = 'ApiError';
+    this.url = url;
+    this.status = status;
+    this.statusText = statusText;
+    this.body = body;
+  }
+}
+
+/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
+// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
+// when this module is embedded alongside generated types (inline mode).
+function abortError(signal: AbortSignal): globalThis.Error {
+  const reason = (signal as { reason?: unknown }).reason;
+  if (reason instanceof Error) return reason;
+  return new DOMException('The operation was aborted.', 'AbortError');
+}
+
+/**
+ * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
+ * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
+ */
+type QueryStyle = {
+  style: NonNullable<ParamSpec['style']>;
+  explode: boolean;
+  allowReserved?: boolean;
+};
+
+/**
+ * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
+ * `filter=a/b` survives instead of `filter=a%2Fb`.
+ */
+function encodeReserved(value: string): string {
+  return encodeURIComponent(value).replace(
+    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
+    (match) => decodeURIComponent(match)
+  );
+}
+
+/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
+function substitutePath(template: string, values: Record<string, unknown>): string {
+  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
+    const value = values[name];
+    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
+    return encodeURIComponent(String(value));
+  });
+}
+
+/**
+ * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
+ * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
+ * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
+ * `deepObject` brackets, and `null`/`undefined` entries are skipped.
+ */
+function buildUrl(
+  serverUrl: string,
+  path: string,
+  query?: Record<string, QueryValue>,
+  styles?: Record<string, QueryStyle>
+): string {
+  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
+  // quadratic on adversarial many-slash input (the server URL is caller data).
+  let end = serverUrl.length;
+  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
+  const url = serverUrl.slice(0, end) + path;
+  if (!query) return url;
+  const params = new URLSearchParams();
+  const raw: string[] = [];
+  for (const [key, value] of Object.entries(query)) {
+    if (value === undefined || value === null) continue;
+    const spec = styles?.[key];
+    if (!spec) {
+      if (Array.isArray(value)) {
+        for (const v of value) {
+          if (v !== undefined && v !== null) params.append(key, String(v));
+        }
+      } else if (Object(value) === value) {
+        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
+        for (const [subKey, subValue] of Object.entries(value)) {
+          if (subValue !== undefined && subValue !== null) {
+            params.append(`${key}[${subKey}]`, String(subValue));
+          }
+        }
+      } else {
+        params.append(key, String(value));
+      }
+      continue;
+    }
+    if (Array.isArray(value)) {
+      const items = value.filter((v) => v !== undefined && v !== null).map(String);
+      if (spec.style === 'form' && spec.explode) {
+        for (const v of items) {
+          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
+          else params.append(key, v);
+        }
+      } else {
+        // Delimited styles put the LITERAL delimiter on the wire; only the
+        // values are encoded. `%20` (not `+`) is the literal space delimiter.
+        const delim =
+          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
+        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
+        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
+      }
+    } else if (Object(value) === value) {
+      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
+      for (const [subKey, subValue] of Object.entries(value)) {
+        if (subValue !== undefined && subValue !== null) {
+          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
+          else params.append(`${key}[${subKey}]`, String(subValue));
+        }
+      }
+    } else if (spec.allowReserved) {
+      raw.push(`${key}=${encodeReserved(String(value))}`);
+    } else {
+      params.append(key, String(value));
+    }
+  }
+  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
+  return qs ? `${url}?${qs}` : url;
+}
+
+/**
+ * Read the response body per `kind`. `'auto'` negotiates from the content type
+ * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
+ */
+async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
+  if (kind === 'void' || response.status === 204) return undefined;
+  if (kind === 'stream') return response.body;
+  if (kind === 'blob') return response.blob();
+  if (kind === 'arrayBuffer') return response.arrayBuffer();
+  if (kind === 'formData') return response.formData();
+  if (kind === 'text') return response.text();
+  if (kind === 'json') return response.json();
+  // 'auto' — negotiate from the response's content type.
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) return response.json();
+  if (contentType.startsWith('text/')) return response.text();
+  return response.blob();
+}
+
+/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
+async function readError(response: Response): Promise<unknown> {
+  const contentType = response.headers.get('content-type') ?? '';
+  if (contentType.toLowerCase().includes('json')) {
+    return response.json().catch(() => undefined);
+  }
+  return response.text().catch(() => undefined);
+}
+
+const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
+const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
+
+/**
+ * The default retry predicate: idempotent methods only, on a transport error or a
+ * transient status. A custom `retryOn` fully replaces this (no method check kept).
+ */
+function defaultRetryOn(ctx: RetryContext): boolean {
+  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
+  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
+}
+
+/**
+ * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
+ * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
+ * unless `jitter === false`.
+ */
+function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
+  if (retryAfter) {
+    const seconds = Number(retryAfter);
+    if (!Number.isNaN(seconds)) return seconds * 1000;
+    const when = Date.parse(retryAfter);
+    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
+  }
+  const base = retry.retryDelay ?? 1000;
+  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
+  return retry.jitter === false ? raw : Math.random() * raw;
+}
+
+/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
+function sleep(ms: number, signal?: AbortSignal): Promise<void> {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(abortError(signal));
+      return;
+    }
+    const onAbort = () => {
+      clearTimeout(timer);
+      reject(abortError(signal as AbortSignal));
+    };
+    const timer = setTimeout(() => {
+      if (signal) signal.removeEventListener('abort', onAbort);
+      resolve();
+    }, ms);
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
+/**
+ * Optional behaviors the send core can use but never statically imports — wired by
+ * `createClient` (the same seam the future inline-mode assembler relies on).
+ */
+type SendCapabilities = {
+  /** Serialize a typed multipart body (a plain object) to FormData. */
+  serializeMultipart?: (body: Record<string, unknown>) => FormData;
+};
+
+/**
+ * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
+ * `onError` config hooks as one implicit first middleware, then `config.middleware`.
+ */
+function middlewareChain(config: ClientConfig): Middleware[] {
+  const single =
+    config.onRequest || config.onResponse || config.onError
+      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
+      : [];
+  return [...single, ...(config.middleware ?? [])];
+}
+
+/**
+ * The fetch core shared by every operation: default + config + per-call headers, the
+ * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
+ * serialization (JSON, or FormData via the multipart capability), the retry loop
+ * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
+ * `onResponse` onion. Returns the final response plus the request context.
+ */
+async function send(
+  config: ClientConfig,
+  op: OperationContext,
+  url: string,
+  init: RequestOptions,
+  body: unknown | undefined,
+  multipart: boolean,
+  caps: SendCapabilities
+): Promise<{ response: Response; context: RequestContext }> {
+  const { retry: callRetry, ...fetchInit } = init;
+  const retry: RetryConfig = { ...config.retry, ...callRetry };
+  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
+  const headers: Record<string, string> = {
+    Accept: 'application/json',
+    ...extra,
+    ...(fetchInit.headers as Record<string, string> | undefined),
+  };
+  const context: RequestContext = {
+    url,
+    method: fetchInit.method ?? 'GET',
+    headers,
+    body,
+    operation: op,
+  };
+  const middleware = middlewareChain(config);
+  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
+  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
+  let payload: BodyInit | undefined;
+  if (context.body !== undefined) {
+    const value = context.body;
+    const isBinary =
+      value instanceof Blob ||
+      value instanceof ArrayBuffer ||
+      ArrayBuffer.isView(value as ArrayBufferView);
+    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
+    const isURLSearchParams = value instanceof URLSearchParams;
+    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
+      payload = value as BodyInit;
+    } else if (multipart) {
+      if (!caps.serializeMultipart) {
+        throw new Error('Multipart capability not wired: cannot serialize the request body');
+      }
+      payload = caps.serializeMultipart(value as Record<string, unknown>);
+    } else {
+      payload = JSON.stringify(value);
+      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
+        context.headers['Content-Type'] = 'application/json';
+      }
+    }
+  }
+  const doFetch = config.fetch ?? fetch;
+  const maxAttempts = 1 + (retry.retries ?? 0);
+  const retryOn = retry.retryOn ?? defaultRetryOn;
+  const signal = fetchInit.signal ?? undefined;
+
+  let attempt = 0;
+  while (true) {
+    attempt++;
+    if (signal?.aborted) throw abortError(signal);
+    let response: Response;
+    try {
+      response = await doFetch(context.url, {
+        ...fetchInit,
+        method: context.method,
+        headers: context.headers,
+        body: payload,
+      });
+    } catch (error) {
+      if (
+        attempt < maxAttempts &&
+        !signal?.aborted &&
+        (await retryOn({ attempt, request: context, error }))
+      ) {
+        await sleep(retryDelay(retry, attempt, null), signal);
+        continue;
+      }
+      throw error;
+    }
+    // Reverse order: the last-registered middleware wraps closest to the network (onion).
+    for (let i = middleware.length - 1; i >= 0; i--) {
+      const onResponse = middleware[i].onResponse;
+      if (onResponse) {
+        const replaced = await onResponse(response, context);
+        if (replaced) response = replaced;
+      }
+    }
+    if (
+      !response.ok &&
+      attempt < maxAttempts &&
+      !signal?.aborted &&
+      (await retryOn({ attempt, request: context, response }))
+    ) {
+      const retryAfter = response.headers.get('retry-after');
+      // Drain the abandoned response body before the next attempt: an unread body
+      // keeps the connection checked out (and can stall the pool) under Node/undici
+      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
+      await response.body?.cancel().catch(() => undefined);
+      await sleep(retryDelay(retry, attempt, retryAfter), signal);
+      continue;
+    }
+    return { response, context };
+  }
+}
+
+/**
+ * The optional behaviors `createClientCore` can dispatch to but never statically
+ * imports. The package's public `createClient` wires the full set; the future
+ * inline-mode assembler wires only the capabilities a spec needs.
+ */
+type Capabilities = SendCapabilities & {
+  resolveAuth?: (
+    security: readonly SecuritySpec[],
+    config: ClientConfig
+  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
+  sse?: (
+    config: ClientConfig,
+    op: OperationContext,
+    url: string,
+    init: SseOptions,
+    dataKind: 'json' | 'text'
+  ) => AsyncGenerator<ServerSentEvent<unknown>>;
+  paginate?: {
+    pages: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+    items: (
+      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+      spec: PaginationSpec,
+      args?: OperationArgs,
+      init?: RequestOptions
+    ) => AsyncGenerator<unknown>;
+  };
+};
+
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+type OperationArgs = {
+  params?: Record<string, QueryValue>;
+  body?: unknown;
+  headers?: Record<string, unknown>;
+} & Record<string, unknown>;
+
+/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
+function kindFor(op: OperationDescriptor): ParseAs | 'void' {
+  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
+    return op.responseKind;
+  }
+  return 'auto';
+}
+
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+function splitArgs(op: OperationDescriptor, args: OperationArgs) {
+  const path: Record<string, unknown> = {};
+  for (const param of op.params ?? []) {
+    if (param.in === 'path') path[param.name] = args[param.name];
+  }
+  return { path, query: args.params, body: args.body, headers: args.headers };
+}
+
+/**
+ * The query-serialization hints for the descriptor's query params. A spec is built only
+ * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
+ * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
+ * are honored, and an omitted `explode` keeps the exploded default.
+ */
+function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
+  let styles: Record<string, QueryStyle> | undefined;
+  for (const param of op.params ?? []) {
+    if (param.in !== 'query') continue;
+    const deviates =
+      (param.style !== undefined && param.style !== 'form') ||
+      param.explode === false ||
+      param.allowReserved === true;
+    if (!deviates) continue;
+    styles ??= {};
+    styles[param.name] = {
+      style: param.style ?? 'form',
+      explode: param.explode ?? true,
+      allowReserved: param.allowReserved,
+    };
+  }
+  return styles;
+}
+
+/** Stringify caller-supplied extra headers, skipping empty entries. */
+function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
+  const out: Record<string, string> = {};
+  for (const [key, value] of Object.entries(headers ?? {})) {
+    if (value !== undefined && value !== null) out[key] = String(value);
+  }
+  return out;
+}
+
+/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
+async function prepareRequest(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions | SseOptions,
+  caps: Capabilities
+): Promise<{ url: string; init: RequestOptions; body: unknown }> {
+  const { path, query, body, headers } = splitArgs(op, args);
+  const authed =
+    op.security?.length && caps.resolveAuth
+      ? await caps.resolveAuth(op.security, config)
+      : { headers: {}, query: {} };
+  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
+  const url = buildUrl(
+    config.serverUrl ?? '',
+    substitutePath(op.path, path),
+    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
+    queryStyles(op)
+  );
+  const mergedInit: RequestOptions = {
+    ...init,
+    method: op.method.toUpperCase(),
+    // Precedence, lowest → highest (later spreads win): injected auth → explicit
+    // header params → caller `init.headers` — the caller always overrides both.
+    headers: {
+      ...authed.headers,
+      ...stringHeaders(headers),
+      ...(init.headers as Record<string, string> | undefined),
+    },
+  };
+  return { url, init: mergedInit, body };
+}
+
+/** One non-SSE call: send, then branch on the configured error mode. */
+async function execute(
+  config: ClientConfig,
+  op: OperationDescriptor,
+  args: OperationArgs,
+  init: RequestOptions,
+  caps: Capabilities
+): Promise<unknown> {
+  const prepared = await prepareRequest(config, op, args, init, caps);
+  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+  const { parseAs, ...sendInit } = prepared.init;
+  const { response, context } = await send(
+    config,
+    opCtx,
+    prepared.url,
+    sendInit,
+    prepared.body,
+    op.body?.multipart === true,
+    caps
+  );
+  const readKind = parseAs ?? kindFor(op);
+  if (config.errorMode === 'result') {
+    if (!response.ok) {
+      return { data: undefined, error: await readError(response), response };
+    }
+    return { data: await parse(response, readKind), error: undefined, response };
+  }
+  if (!response.ok) {
+    let error: globalThis.Error = new ApiError(
+      context.url,
+      response.status,
+      response.statusText,
+      await readError(response)
+    );
+    // Thread the error through each middleware's onError in turn (each may replace it).
+    for (const mw of middlewareChain(config)) {
+      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
+    }
+    throw error;
+  }
+  return parse(response, readKind);
+}
+
+/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
+function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
+  if (!caps.paginate) {
+    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
+  }
+  return caps.paginate;
+}
+
+/**
+ * The per-page call the iterators drive: the method itself in throw mode; in result
+ * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
+ * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
+ * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
+ */
+function pageCall(
+  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
+  config: ClientConfig
+) {
+  if (config.errorMode !== 'result') return method;
+  return async (args?: OperationArgs, init?: RequestOptions) => {
+    const envelope = (await method(args, init)) as {
+      data: unknown;
+      error: unknown;
+      response: Response;
+    };
+    if (envelope.data === undefined) {
+      const { response } = envelope;
+      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
+    }
+    return envelope.data;
+  };
+}
+
+/**
+ * Build a typed instance client over operation descriptors: one real bound method per
+ * operation (attached by a construction-time loop — no Proxy), plus the core members
+ * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
+ * collision with an operation. All behavior dispatches through the capability seam.
+ */
+function createClientCore<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
+  caps: Capabilities = {}
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  // The literal-union narrowing is a compile-time DX contract only; internally the
+  // runtime works with the base (string-typed) context. One cast at this boundary —
+  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
+  // params are contravariant).
+  const given = initial as ClientConfig;
+  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
+  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
+  const client = {} as Record<string, unknown>;
+
+  for (const [name, op] of Object.entries(operations)) {
+    if (op.responseKind === 'sse') {
+      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+        if (!caps.sse) {
+          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
+        }
+        const stream = caps.sse;
+        return (async function* () {
+          const prepared = await prepareRequest(config, op, args, init, caps);
+          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
+          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+        })();
+      };
+    } else {
+      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
+        execute(config, op, args, init, caps);
+      const spec = op.pagination;
+      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
+      // through the capability seam (like SSE: absent capability throws descriptively).
+      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
+      // a result-mode client (`errorMode` is fixed at construction — `configure()`
+      // ignores it) each page's envelope is unwrapped before it reaches the capability.
+      // A failed page aborts iteration by throwing ApiError, even on result-mode
+      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
+      client[name] = spec
+        ? Object.assign(method, {
+            pages: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
+            items: (args?: OperationArgs, init?: RequestOptions) =>
+              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
+          })
+        : method;
+    }
+  }
+
+  // Core members are assigned AFTER the operation loop — they win over colliding op names.
+  client.configure = (next: ClientConfig): void => {
+    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
+    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
+    const { errorMode: _fixed, ...rest } = next;
+    Object.assign(config, rest);
+  };
+  client.use = (...middleware: Middleware[]): void => {
+    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
+    config.middleware = [...(config.middleware ?? []), ...middleware];
+  };
+  client.auth = {
+    bearer(token: TokenProvider): void {
+      config.auth = { ...config.auth, bearer: token };
+    },
+    basic(username: string, password: string): void {
+      config.auth = { ...config.auth, basic: { username, password } };
+    },
+    apiKey(scheme: string, value: TokenProvider): void {
+      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
+    },
+  };
+
+  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
+}
+
+/**
+ * The client factory: `createClientCore` wired with the capabilities this API needs.
+ * Exported so apps can build additional instances (per-tenant, per-environment) over
+ * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
+ * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
+ */
+export function createClient<
+  Ops extends OpsShape,
+  Id extends string = string,
+  Path extends string = string,
+  Tag extends string = string,
+>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig<OperationContext<Id, Path, Tag>>
+): Client<Ops, OperationContext<Id, Path, Tag>> {
+  return createClientCore<Ops, Id, Path, Tag>(operations, config, {});
+}
+
+export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe-orders.example.com" });
+
+export const { configure, use } = client;
+export const listOrders = (init: RequestOptions = {}) => client.listOrders({}, init);
+export const getOrder = (orderId: string, init: RequestOptions = {}) => client.getOrder({ orderId }, init);
+export const listMenuItems = (init: RequestOptions = {}) => client.listMenuItems({}, init);
diff --git a/tests/e2e/generate-client/examples/nested-facade/src/main.ts b/tests/e2e/generate-client/examples/nested-facade/src/main.ts
new file mode 100644
index 0000000000..db810ba43d
--- /dev/null
+++ b/tests/e2e/generate-client/examples/nested-facade/src/main.ts
@@ -0,0 +1,28 @@
+import { api } from './api/client.facade.js';
+// nested-facade — a resource-grouped client shape, generated from the spec's tags.
+//
+// The generated sdk exposes flat functions and the `client` instance; some teams
+// prefer `api.<resource>.<operation>(…)`. Instead of hand-maintaining that facade,
+// the custom generator in ./nested-facade-generator.mjs derives it from the spec's
+// tags — every regeneration keeps it in sync, and everything stays fully typed.
+import { configure } from './api/client.js';
+
+// A canned transport so the example runs offline.
+const CANNED: Record<string, unknown> = {
+  '/orders': [{ id: 'ord-101', drink: 'espresso' }],
+  '/menu': [{ name: 'latte', price: 450 }],
+};
+const canned = (async (url: string) =>
+  new Response(JSON.stringify(CANNED[new URL(url).pathname]), {
+    headers: { 'content-type': 'application/json' },
+  })) as unknown as typeof fetch;
+
+configure({ fetch: canned });
+
+// Nested, resource-first call shape — same typed functions underneath.
+for (const order of await api.orders.listOrders()) {
+  console.log(`order ${order.id}: ${order.drink}`);
+}
+for (const item of await api.menu.listMenuItems()) {
+  console.log(`menu: ${item.name} — $${(item.price / 100).toFixed(2)}`);
+}
diff --git a/tests/e2e/generate-client/examples/nested-facade/tsconfig.json b/tests/e2e/generate-client/examples/nested-facade/tsconfig.json
new file mode 100644
index 0000000000..4bd6962d40
--- /dev/null
+++ b/tests/e2e/generate-client/examples/nested-facade/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../tsconfig.base.json",
+  "include": ["src"]
+}

From 1bd04640c0a9c6a3e83fb9a0f7368652d1b1ee21 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Wed, 8 Jul 2026 15:43:08 +0300
Subject: [PATCH 074/134] fix: versions

---
 packages/cli/package.json              | 4 ++--
 packages/client-generator/package.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 5367c31103..94a4abfb21 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redocly/cli",
-  "version": "2.37.0-2026-07-08.1-local",
+  "version": "2.37.0",
   "description": "",
   "license": "MIT",
   "bin": {
@@ -45,7 +45,7 @@
     "@opentelemetry/sdk-trace-node": "2.8.0",
     "@opentelemetry/semantic-conventions": "1.41.1",
     "@redocly/cli-otel": "0.3.1",
-    "@redocly/client-generator": "0.1.0-2026-07-08.1-local",
+    "@redocly/client-generator": "0.0.0",
     "@redocly/openapi-core": "2.37.0",
     "@redocly/respect-core": "2.37.0",
     "@types/cookie": "0.6.0",
diff --git a/packages/client-generator/package.json b/packages/client-generator/package.json
index 54f2d4c250..ba679b13be 100644
--- a/packages/client-generator/package.json
+++ b/packages/client-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redocly/client-generator",
-  "version": "0.1.0-2026-07-08.1-local",
+  "version": "0.0.0",
   "description": "Generate typed, zero-dependency TypeScript clients (fetch, auth, retries, middleware, SSE) from OpenAPI descriptions.",
   "type": "module",
   "types": "lib/index.d.ts",

From 489ed53fb3a5ff23a0d5cd541ff25abe829f4af1 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Wed, 8 Jul 2026 17:05:04 +0300
Subject: [PATCH 075/134] fix: stop oxfmt reformatting generated
 pagination-consumer artifacts

The oxfmt ignore covered only *-consumer/api.ts; the pagination suite's
api-offset.ts/api-package.ts weren't matched, so 'npm run format' and every
e2e regeneration rewrote them back and forth. Widen the pattern to api*.ts
and commit the as-generated form.
---
 .oxfmtrc.json                                 |   2 +-
 .../pagination-consumer/api-offset.ts         | 190 +++++++-----------
 .../pagination-consumer/api-package.ts        | 174 ++++++----------
 3 files changed, 139 insertions(+), 227 deletions(-)

diff --git a/.oxfmtrc.json b/.oxfmtrc.json
index 80a9599d96..752a2f3e6a 100644
--- a/.oxfmtrc.json
+++ b/.oxfmtrc.json
@@ -11,7 +11,7 @@
     "packages/core/src/rules/common/__tests__/fixtures/invalid-yaml.yaml",
     "tests/performance/api-definitions/",
     "tests/e2e/generate-client/examples/*/src/api/",
-    "tests/e2e/generate-client/*-consumer/api.ts",
+    "tests/e2e/generate-client/*-consumer/api*.ts",
     "tests/smoke/**/*.yaml",
     "snapshot*.txt",
     "*.snapshot.ts",
diff --git a/tests/e2e/generate-client/pagination-consumer/api-offset.ts b/tests/e2e/generate-client/pagination-consumer/api-offset.ts
index 678c7b3261..b75f63f9ea 100644
--- a/tests/e2e/generate-client/pagination-consumer/api-offset.ts
+++ b/tests/e2e/generate-client/pagination-consumer/api-offset.ts
@@ -6,62 +6,62 @@
  */
 
 export type Order = {
-  id: string;
-  status: string;
+    id: string;
+    status: string;
 };
 
 export type MenuItem = {
-  id: string;
-  name: string;
+    id: string;
+    name: string;
 };
 
 export type ListOrdersResult = {
-  orders: Order[];
-  /**
-   * Cursor of the next page; absent on the last page.
-   */
-  nextCursor?: string;
+    orders: Order[];
+    /**
+     * Cursor of the next page; absent on the last page.
+     */
+    nextCursor?: string;
 };
 
 export type ListOrdersParams = {
-  /**
-   * Opaque cursor of the page to fetch; omit for the first page.
-   */
-  cursor?: string;
-  /**
-   * Page size.
-   */
-  limit?: number;
+    /**
+     * Opaque cursor of the page to fetch; omit for the first page.
+     */
+    cursor?: string;
+    /**
+     * Page size.
+     */
+    limit?: number;
 };
 
 export type ListOrdersVariables = {
-  params?: ListOrdersParams;
+    params?: ListOrdersParams;
 };
 
 export type ListMenuItemsResult = {
-  items: MenuItem[];
-  total: number;
+    items: MenuItem[];
+    total: number;
 };
 
 export type ListMenuItemsParams = {
-  /**
-   * Index of the first item to return.
-   */
-  offset?: number;
-  /**
-   * Page size.
-   */
-  limit?: number;
+    /**
+     * Index of the first item to return.
+     */
+    offset?: number;
+    /**
+     * Page size.
+     */
+    limit?: number;
 };
 
 export type ListMenuItemsVariables = {
-  params?: ListMenuItemsParams;
+    params?: ListMenuItemsParams;
 };
 
 export type GetOrderResult = Order;
 
 export type GetOrderVariables = {
-  orderId: string;
+    orderId: string;
 };
 
 /**
@@ -69,26 +69,26 @@ export type GetOrderVariables = {
  * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
  */
 export type Ops = {
-  listOrders: {
-    args: {
-      params?: ListOrdersParams;
+    listOrders: {
+        args: {
+            params?: ListOrdersParams;
+        };
+        result: ListOrdersResult;
+        item: Order;
     };
-    result: ListOrdersResult;
-    item: Order;
-  };
-  listMenuItems: {
-    args: {
-      params?: ListMenuItemsParams;
+    listMenuItems: {
+        args: {
+            params?: ListMenuItemsParams;
+        };
+        result: ListMenuItemsResult;
+        item: MenuItem;
     };
-    result: ListMenuItemsResult;
-    item: MenuItem;
-  };
-  getOrder: {
-    args: {
-      orderId: string;
+    getOrder: {
+        args: {
+            orderId: string;
+        };
+        result: GetOrderResult;
     };
-    result: GetOrderResult;
-  };
 };
 
 /**
@@ -97,43 +97,14 @@ export type Ops = {
  * tags) for cache keys, tracing span names, and request logging.
  */
 export const OPERATIONS = {
-  listOrders: {
-    id: 'listOrders',
-    method: 'GET',
-    path: '/orders',
-    params: [
-      { name: 'cursor', in: 'query' },
-      { name: 'limit', in: 'query' },
-    ],
-    pagination: {
-      style: 'cursor',
-      param: 'cursor',
-      limitParam: 'limit',
-      nextCursor: '/nextCursor',
-      items: '/orders',
-    },
-  },
-  listMenuItems: {
-    id: 'listMenuItems',
-    method: 'GET',
-    path: '/menu',
-    params: [
-      { name: 'offset', in: 'query' },
-      { name: 'limit', in: 'query' },
-    ],
-    pagination: { style: 'offset', param: 'offset', limitParam: 'limit', items: '/items' },
-  },
-  getOrder: {
-    id: 'getOrder',
-    method: 'GET',
-    path: '/orders/{orderId}',
-    params: [{ name: 'orderId', in: 'path' }],
-  },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", params: [{ name: "cursor", in: "query" }, { name: "limit", in: "query" }], pagination: { style: "cursor", param: "cursor", limitParam: "limit", nextCursor: "/nextCursor", items: "/orders" } },
+    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", params: [{ name: "offset", in: "query" }, { name: "limit", in: "query" }], pagination: { style: "offset", param: "offset", limitParam: "limit", items: "/items" } },
+    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", params: [{ name: "orderId", in: "path" }] }
 } as const satisfies Record<string, OperationDescriptor>;
 
 export type OperationId = keyof typeof OPERATIONS;
 
-export type OperationPath = (typeof OPERATIONS)[OperationId]['path'];
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
 
 // ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
 
@@ -1136,42 +1107,27 @@ export function createClient<
   return createClientCore<Ops, Id, Path, Tag>(operations, config, { paginate: { pages, items } });
 }
 
-export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS, {
-  serverUrl: 'http://localhost:3131',
-});
+export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS, { serverUrl: "http://localhost:3131" });
 
 export const { configure, use } = client;
-export const listOrders = Object.assign(
-  (
-    params: {
-      /**
-       * Opaque cursor of the page to fetch; omit for the first page.
-       */
-      cursor?: string;
-      /**
-       * Page size.
-       */
-      limit?: number;
-    } = {},
-    init: RequestOptions = {}
-  ) => client.listOrders({ params }, init),
-  { pages: client.listOrders.pages, items: client.listOrders.items }
-);
-export const listMenuItems = Object.assign(
-  (
-    params: {
-      /**
-       * Index of the first item to return.
-       */
-      offset?: number;
-      /**
-       * Page size.
-       */
-      limit?: number;
-    } = {},
-    init: RequestOptions = {}
-  ) => client.listMenuItems({ params }, init),
-  { pages: client.listMenuItems.pages, items: client.listMenuItems.items }
-);
-export const getOrder = (orderId: string, init: RequestOptions = {}) =>
-  client.getOrder({ orderId }, init);
+export const listOrders = Object.assign((params: {
+    /**
+     * Opaque cursor of the page to fetch; omit for the first page.
+     */
+    cursor?: string;
+    /**
+     * Page size.
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init), { pages: client.listOrders.pages, items: client.listOrders.items });
+export const listMenuItems = Object.assign((params: {
+    /**
+     * Index of the first item to return.
+     */
+    offset?: number;
+    /**
+     * Page size.
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init), { pages: client.listMenuItems.pages, items: client.listMenuItems.items });
+export const getOrder = (orderId: string, init: RequestOptions = {}) => client.getOrder({ orderId }, init);
diff --git a/tests/e2e/generate-client/pagination-consumer/api-package.ts b/tests/e2e/generate-client/pagination-consumer/api-package.ts
index 422c74b5c3..03fc650f64 100644
--- a/tests/e2e/generate-client/pagination-consumer/api-package.ts
+++ b/tests/e2e/generate-client/pagination-consumer/api-package.ts
@@ -5,69 +5,65 @@
  * Cafe Orders Pagination API (v1.0.0)
  */
 
-import {
-  createClient,
-  type OperationDescriptor,
-  type RequestOptions,
-} from '@redocly/client-generator';
+import { createClient, type OperationDescriptor, type RequestOptions } from '@redocly/client-generator';
 
 export type Order = {
-  id: string;
-  status: string;
+    id: string;
+    status: string;
 };
 
 export type MenuItem = {
-  id: string;
-  name: string;
+    id: string;
+    name: string;
 };
 
 export type ListOrdersResult = {
-  orders: Order[];
-  /**
-   * Cursor of the next page; absent on the last page.
-   */
-  nextCursor?: string;
+    orders: Order[];
+    /**
+     * Cursor of the next page; absent on the last page.
+     */
+    nextCursor?: string;
 };
 
 export type ListOrdersParams = {
-  /**
-   * Opaque cursor of the page to fetch; omit for the first page.
-   */
-  cursor?: string;
-  /**
-   * Page size.
-   */
-  limit?: number;
+    /**
+     * Opaque cursor of the page to fetch; omit for the first page.
+     */
+    cursor?: string;
+    /**
+     * Page size.
+     */
+    limit?: number;
 };
 
 export type ListOrdersVariables = {
-  params?: ListOrdersParams;
+    params?: ListOrdersParams;
 };
 
 export type ListMenuItemsResult = {
-  items: MenuItem[];
-  total: number;
+    items: MenuItem[];
+    total: number;
 };
 
 export type ListMenuItemsParams = {
-  /**
-   * Index of the first item to return.
-   */
-  offset?: number;
-  /**
-   * Page size.
-   */
-  limit?: number;
+    /**
+     * Index of the first item to return.
+     */
+    offset?: number;
+    /**
+     * Page size.
+     */
+    limit?: number;
 };
 
 export type ListMenuItemsVariables = {
-  params?: ListMenuItemsParams;
+    params?: ListMenuItemsParams;
 };
 
 export type GetOrderResult = Order;
 
 export type GetOrderVariables = {
-  orderId: string;
+    orderId: string;
 };
 
 /**
@@ -75,25 +71,25 @@ export type GetOrderVariables = {
  * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
  */
 export type Ops = {
-  listOrders: {
-    args: {
-      params?: ListOrdersParams;
+    listOrders: {
+        args: {
+            params?: ListOrdersParams;
+        };
+        result: ListOrdersResult;
+        item: Order;
     };
-    result: ListOrdersResult;
-    item: Order;
-  };
-  listMenuItems: {
-    args: {
-      params?: ListMenuItemsParams;
+    listMenuItems: {
+        args: {
+            params?: ListMenuItemsParams;
+        };
+        result: ListMenuItemsResult;
     };
-    result: ListMenuItemsResult;
-  };
-  getOrder: {
-    args: {
-      orderId: string;
+    getOrder: {
+        args: {
+            orderId: string;
+        };
+        result: GetOrderResult;
     };
-    result: GetOrderResult;
-  };
 };
 
 /**
@@ -102,66 +98,29 @@ export type Ops = {
  * tags) for cache keys, tracing span names, and request logging.
  */
 export const OPERATIONS = {
-  listOrders: {
-    id: 'listOrders',
-    method: 'GET',
-    path: '/orders',
-    params: [
-      { name: 'cursor', in: 'query' },
-      { name: 'limit', in: 'query' },
-    ],
-    pagination: {
-      style: 'cursor',
-      param: 'cursor',
-      limitParam: 'limit',
-      nextCursor: '/nextCursor',
-      items: '/orders',
-    },
-  },
-  listMenuItems: {
-    id: 'listMenuItems',
-    method: 'GET',
-    path: '/menu',
-    params: [
-      { name: 'offset', in: 'query' },
-      { name: 'limit', in: 'query' },
-    ],
-  },
-  getOrder: {
-    id: 'getOrder',
-    method: 'GET',
-    path: '/orders/{orderId}',
-    params: [{ name: 'orderId', in: 'path' }],
-  },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", params: [{ name: "cursor", in: "query" }, { name: "limit", in: "query" }], pagination: { style: "cursor", param: "cursor", limitParam: "limit", nextCursor: "/nextCursor", items: "/orders" } },
+    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", params: [{ name: "offset", in: "query" }, { name: "limit", in: "query" }] },
+    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", params: [{ name: "orderId", in: "path" }] }
 } as const satisfies Record<string, OperationDescriptor>;
 
 export type OperationId = keyof typeof OPERATIONS;
 
-export type OperationPath = (typeof OPERATIONS)[OperationId]['path'];
+export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
 
-export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS, {
-  serverUrl: 'http://localhost:3131',
-});
+export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS, { serverUrl: "http://localhost:3131" });
 
 export const { configure, use } = client;
-export const listOrders = Object.assign(
-  (
-    params: {
-      /**
-       * Opaque cursor of the page to fetch; omit for the first page.
-       */
-      cursor?: string;
-      /**
-       * Page size.
-       */
-      limit?: number;
-    } = {},
-    init: RequestOptions = {}
-  ) => client.listOrders({ params }, init),
-  { pages: client.listOrders.pages, items: client.listOrders.items }
-);
-export const listMenuItems = (
-  params: {
+export const listOrders = Object.assign((params: {
+    /**
+     * Opaque cursor of the page to fetch; omit for the first page.
+     */
+    cursor?: string;
+    /**
+     * Page size.
+     */
+    limit?: number;
+} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init), { pages: client.listOrders.pages, items: client.listOrders.items });
+export const listMenuItems = (params: {
     /**
      * Index of the first item to return.
      */
@@ -170,11 +129,8 @@ export const listMenuItems = (
      * Page size.
      */
     limit?: number;
-  } = {},
-  init: RequestOptions = {}
-) => client.listMenuItems({ params }, init);
-export const getOrder = (orderId: string, init: RequestOptions = {}) =>
-  client.getOrder({ orderId }, init);
+} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
+export const getOrder = (orderId: string, init: RequestOptions = {}) => client.getOrder({ orderId }, init);
 
 export { ApiError, createClient } from '@redocly/client-generator';
 export type { ClientConfig, Middleware, RequestOptions } from '@redocly/client-generator';

From 504696dba34072e8df39c1bb9da49dde8fec3b4a Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Wed, 8 Jul 2026 17:27:49 +0300
Subject: [PATCH 076/134] fix(respect): wait for json-server readiness in the
 local-json-server e2e
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The suite spawned the server in beforeAll and ran the workflow immediately —
spawning is not readiness, so under any machine load the respect run raced the
server's startup and failed with ECONNREFUSED. Poll the endpoint until it
accepts connections (30s deadline) before running.
---
 .../local-json-server/local-json-server.test.ts  | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/tests/e2e/respect/local-json-server/local-json-server.test.ts b/tests/e2e/respect/local-json-server/local-json-server.test.ts
index 1f36e20c48..2d397b00c6 100644
--- a/tests/e2e/respect/local-json-server/local-json-server.test.ts
+++ b/tests/e2e/respect/local-json-server/local-json-server.test.ts
@@ -18,7 +18,21 @@ describe('local-json-server', () => {
 
     // Store original state of fake-bd.json
     originalData = fs.readFileSync(dbPath, 'utf8');
-  });
+
+    // Wait until the server actually accepts connections — spawning is not readiness,
+    // and the workflow run starts immediately after (ECONNREFUSED race otherwise).
+    const deadline = Date.now() + 30_000;
+    for (;;) {
+      try {
+        const response = await fetch('http://localhost:3000/items');
+        if (response.ok) break;
+      } catch {
+        // not listening yet
+      }
+      if (Date.now() > deadline) throw new Error('json-server did not become ready within 30s');
+      await new Promise((resolve) => setTimeout(resolve, 200));
+    }
+  }, 40_000);
 
   afterAll(() => {
     try {

From 3f09b2b4bd578384777ef9345892acae452b9544 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Wed, 8 Jul 2026 17:36:20 +0300
Subject: [PATCH 077/134] fix(client-generator): result-mode pagination must
 not throw on successful bodyless pages

pageCall discriminated failure by 'data === undefined', which also matches a
successful 204/void page (and a failed page's error can be undefined too, when
the body is unreadable). Discriminate on response.ok instead: an empty success
page now stops iteration cleanly via the pointer miss, and only genuinely
failed pages throw ApiError.
---
 .../__snapshots__/package-client.test.ts.snap   | 12 ++++++++++--
 .../src/emitters/runtime-sources.ts             |  2 +-
 .../src/runtime/__tests__/create-client.test.ts | 17 +++++++++++++++++
 .../src/runtime/create-client.ts                |  6 +++++-
 tests/e2e/generate-client/cafe-consumer/api.ts  |  6 +++++-
 tests/e2e/generate-client/cafe.snapshot.ts      |  6 +++++-
 .../examples/baked-setup/src/api/client.ts      |  6 +++++-
 .../configure-and-middleware/src/api/client.ts  |  6 +++++-
 .../examples/custom-generator/src/api/client.ts |  6 +++++-
 .../custom-pagination/src/api/client.ts         |  6 +++++-
 .../examples/customization/src/api/client.ts    |  6 +++++-
 .../examples/fetch-functions/src/api/client.ts  |  6 +++++-
 .../examples/mock/src/api/client.ts             |  6 +++++-
 .../examples/nested-facade/src/api/client.ts    |  6 +++++-
 .../examples/pagination/src/api/client.ts       |  6 +++++-
 .../examples/programmatic/src/api/client.ts     |  6 +++++-
 .../examples/sse-streaming/src/api/client.ts    |  6 +++++-
 .../examples/tanstack-query/src/api/client.ts   |  6 +++++-
 .../examples/vendored-edge/src/api/client.ts    |  6 +++++-
 .../zero-install-quickstart/src/api/client.ts   |  6 +++++-
 .../examples/zod/src/api/client.ts              |  6 +++++-
 .../pagination-consumer/api-offset.ts           |  6 +++++-
 .../generate-client/pagination-consumer/api.ts  |  6 +++++-
 23 files changed, 128 insertions(+), 23 deletions(-)

diff --git a/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap b/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
index 81be79afee..5439806037 100644
--- a/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
+++ b/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
@@ -1030,7 +1030,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is \`!response.ok\` — NOT \`data === undefined\`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's \`error\` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
@@ -2247,7 +2251,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is \`!response.ok\` — NOT \`data === undefined\`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's \`error\` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/packages/client-generator/src/emitters/runtime-sources.ts b/packages/client-generator/src/emitters/runtime-sources.ts
index a5048a265c..d48725f0cb 100644
--- a/packages/client-generator/src/emitters/runtime-sources.ts
+++ b/packages/client-generator/src/emitters/runtime-sources.ts
@@ -21,7 +21,7 @@ export const RUNTIME_SOURCES = {
   'sse.ts':
     "import { ApiError } from './errors.js';\nimport { readError } from './parse.js';\nimport { sleep } from './retry.js';\nimport { send } from './send.js';\nimport type { ClientConfig, OperationContext, ServerSentEvent, SseOptions } from './types.js';\n\n/**\n * Consume a `text/event-stream` operation as typed events (capability module — wired\n * into `createClient`). Auto-reconnects on dropped connections, resuming from the last\n * seen event id via `Last-Event-ID` (backoff: the server's `retry:` value, then\n * `reconnectDelay`, then 1s — exponential with jitter, capped at 30s). A clean stream\n * end flushes a trailing frame and finishes; `break`/abort end the iterator cleanly.\n */\nexport async function* sse<T>(\n  config: ClientConfig,\n  op: OperationContext,\n  url: string,\n  init: SseOptions,\n  dataKind: 'json' | 'text' = 'text'\n): AsyncGenerator<ServerSentEvent<T>> {\n  const { reconnect = true, reconnectDelay, ...rest } = init;\n  const signal = rest.signal ?? undefined;\n  const headers: Record<string, string> = {\n    Accept: 'text/event-stream',\n    ...(rest.headers as Record<string, string> | undefined),\n  };\n  let lastEventId: string | undefined;\n  let serverRetry: number | undefined;\n  let failures = 0;\n  while (true) {\n    if (signal?.aborted) return;\n    const sendHeaders =\n      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };\n    try {\n      const { response } = await send(\n        config,\n        op,\n        url,\n        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },\n        undefined,\n        false,\n        {}\n      );\n      if (!response.ok) {\n        const errorBody = await readError(response);\n        throw new ApiError(url, response.status, response.statusText, errorBody);\n      }\n      failures = 0;\n      const body = response.body;\n      if (!body) return;\n      const reader = body.getReader();\n      const decoder = new TextDecoder();\n      let buffer = '';\n      try {\n        while (true) {\n          const { done, value } = await reader.read();\n          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });\n          let index: number;\n          while ((index = buffer.search(/\\r\\n\\r\\n|\\n\\n|\\r\\r/)) !== -1) {\n            const raw = buffer.slice(0, index);\n            buffer = buffer.slice(\n              index + buffer.slice(index).match(/^(\\r\\n\\r\\n|\\n\\n|\\r\\r)/)![0].length\n            );\n            const event = parseSseFrame(raw, dataKind);\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n          }\n          if (done) {\n            // Stream closed cleanly. Flush a final event that arrived without a trailing\n            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.\n            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n            return;\n          }\n          // Bound memory: a server that never sends a frame delimiter would otherwise\n          // grow `buffer` without limit. 1 MiB is far above any real SSE frame.\n          if (buffer.length > 1048576) {\n            throw new Error('SSE frame exceeded 1048576 characters without a delimiter');\n          }\n        }\n      } finally {\n        await reader.cancel().catch(() => undefined);\n      }\n    } catch (error) {\n      if (signal?.aborted) return;\n      // A non-OK HTTP response is a definitive error (4xx/5xx), not a transient drop —\n      // surface it instead of reconnecting in a loop.\n      if (error instanceof ApiError) throw error;\n      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream\n      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.\n      if (!reconnect) throw error;\n    }\n    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.\n    failures++;\n    const base = serverRetry ?? reconnectDelay ?? 1000;\n    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);\n    try {\n      await sleep(Math.random() * delay, signal);\n    } catch {\n      return; // sleep rejects only on abort — end the iterator cleanly\n    }\n  }\n}\n\n/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */\nexport function parseSseFrame(\n  raw: string,\n  dataKind: 'json' | 'text'\n): ServerSentEvent<unknown> | undefined {\n  let event: string | undefined;\n  const dataLines: string[] = [];\n  let id: string | undefined;\n  let retry: number | undefined;\n  let sawField = false;\n  for (const line of raw.split(/\\r\\n|\\n|\\r/)) {\n    if (line === '' || line.startsWith(':')) continue;\n    const colon = line.indexOf(':');\n    const field = colon === -1 ? line : line.slice(0, colon);\n    let val = colon === -1 ? '' : line.slice(colon + 1);\n    if (val.startsWith(' ')) val = val.slice(1);\n    sawField = true;\n    if (field === 'event') event = val;\n    else if (field === 'data') dataLines.push(val);\n    else if (field === 'id') id = val;\n    else if (field === 'retry') {\n      const n = Number(val);\n      if (!Number.isNaN(n)) retry = n;\n    }\n  }\n  if (!sawField) return undefined;\n  const dataText = dataLines.join('\\n');\n  const data = dataKind === 'json' && dataText !== '' ? JSON.parse(dataText) : dataText;\n  return { event, data, id, retry };\n}\n",
   'create-client.ts':
-    "import { ApiError } from './errors.js';\nimport { parse, readError } from './parse.js';\nimport { middlewareChain, send, type SendCapabilities } from './send.js';\nimport type {\n  ApiErrorLike,\n  Client,\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  OperationDescriptor,\n  OpsShape,\n  PaginationSpec,\n  ParseAs,\n  QueryValue,\n  RequestOptions,\n  SecuritySpec,\n  ServerSentEvent,\n  SseOptions,\n  TokenProvider,\n} from './types.js';\nimport { buildUrl, substitutePath, type QueryStyle } from './url.js';\n\n/**\n * The optional behaviors `createClientCore` can dispatch to but never statically\n * imports. The package's public `createClient` wires the full set; the future\n * inline-mode assembler wires only the capabilities a spec needs.\n */\nexport type Capabilities = SendCapabilities & {\n  resolveAuth?: (\n    security: readonly SecuritySpec[],\n    config: ClientConfig\n  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;\n  sse?: (\n    config: ClientConfig,\n    op: OperationContext,\n    url: string,\n    init: SseOptions,\n    dataKind: 'json' | 'text'\n  ) => AsyncGenerator<ServerSentEvent<unknown>>;\n  paginate?: {\n    pages: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n    items: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n  };\n};\n\n/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */\nexport type OperationArgs = {\n  params?: Record<string, QueryValue>;\n  body?: unknown;\n  headers?: Record<string, unknown>;\n} & Record<string, unknown>;\n\n/** The response reader implied by the descriptor (before any per-call `parseAs` override). */\nfunction kindFor(op: OperationDescriptor): ParseAs | 'void' {\n  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {\n    return op.responseKind;\n  }\n  return 'auto';\n}\n\n/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */\nfunction splitArgs(op: OperationDescriptor, args: OperationArgs) {\n  const path: Record<string, unknown> = {};\n  for (const param of op.params ?? []) {\n    if (param.in === 'path') path[param.name] = args[param.name];\n  }\n  return { path, query: args.params, body: args.body, headers: args.headers };\n}\n\n/**\n * The query-serialization hints for the descriptor's query params. A spec is built only\n * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),\n * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)\n * are honored, and an omitted `explode` keeps the exploded default.\n */\nfunction queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {\n  let styles: Record<string, QueryStyle> | undefined;\n  for (const param of op.params ?? []) {\n    if (param.in !== 'query') continue;\n    const deviates =\n      (param.style !== undefined && param.style !== 'form') ||\n      param.explode === false ||\n      param.allowReserved === true;\n    if (!deviates) continue;\n    styles ??= {};\n    styles[param.name] = {\n      style: param.style ?? 'form',\n      explode: param.explode ?? true,\n      allowReserved: param.allowReserved,\n    };\n  }\n  return styles;\n}\n\n/** Stringify caller-supplied extra headers, skipping empty entries. */\nfunction stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {\n  const out: Record<string, string> = {};\n  for (const [key, value] of Object.entries(headers ?? {})) {\n    if (value !== undefined && value !== null) out[key] = String(value);\n  }\n  return out;\n}\n\n/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */\nasync function prepareRequest(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions | SseOptions,\n  caps: Capabilities\n): Promise<{ url: string; init: RequestOptions; body: unknown }> {\n  const { path, query, body, headers } = splitArgs(op, args);\n  const authed =\n    op.security?.length && caps.resolveAuth\n      ? await caps.resolveAuth(op.security, config)\n      : { headers: {}, query: {} };\n  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };\n  const url = buildUrl(\n    config.serverUrl ?? '',\n    substitutePath(op.path, path),\n    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,\n    queryStyles(op)\n  );\n  const mergedInit: RequestOptions = {\n    ...init,\n    method: op.method.toUpperCase(),\n    // Precedence, lowest → highest (later spreads win): injected auth → explicit\n    // header params → caller `init.headers` — the caller always overrides both.\n    headers: {\n      ...authed.headers,\n      ...stringHeaders(headers),\n      ...(init.headers as Record<string, string> | undefined),\n    },\n  };\n  return { url, init: mergedInit, body };\n}\n\n/** One non-SSE call: send, then branch on the configured error mode. */\nasync function execute(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions,\n  caps: Capabilities\n): Promise<unknown> {\n  const prepared = await prepareRequest(config, op, args, init, caps);\n  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n  const { parseAs, ...sendInit } = prepared.init;\n  const { response, context } = await send(\n    config,\n    opCtx,\n    prepared.url,\n    sendInit,\n    prepared.body,\n    op.body?.multipart === true,\n    caps\n  );\n  const readKind = parseAs ?? kindFor(op);\n  if (config.errorMode === 'result') {\n    if (!response.ok) {\n      return { data: undefined, error: await readError(response), response };\n    }\n    return { data: await parse(response, readKind), error: undefined, response };\n  }\n  if (!response.ok) {\n    let error: globalThis.Error = new ApiError(\n      context.url,\n      response.status,\n      response.statusText,\n      await readError(response)\n    );\n    // Thread the error through each middleware's onError in turn (each may replace it).\n    for (const mw of middlewareChain(config)) {\n      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);\n    }\n    throw error;\n  }\n  return parse(response, readKind);\n}\n\n/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */\nfunction paginateCapability(caps: Capabilities, op: OperationDescriptor) {\n  if (!caps.paginate) {\n    throw new Error(`Pagination capability not wired: cannot iterate operation \"${op.id}\"`);\n  }\n  return caps.paginate;\n}\n\n/**\n * The per-page call the iterators drive: the method itself in throw mode; in result\n * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page\n * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is\n * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).\n */\nfunction pageCall(\n  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  config: ClientConfig\n) {\n  if (config.errorMode !== 'result') return method;\n  return async (args?: OperationArgs, init?: RequestOptions) => {\n    const envelope = (await method(args, init)) as {\n      data: unknown;\n      error: unknown;\n      response: Response;\n    };\n    if (envelope.data === undefined) {\n      const { response } = envelope;\n      throw new ApiError(response.url, response.status, response.statusText, envelope.error);\n    }\n    return envelope.data;\n  };\n}\n\n/**\n * Build a typed instance client over operation descriptors: one real bound method per\n * operation (attached by a construction-time loop — no Proxy), plus the core members\n * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name\n * collision with an operation. All behavior dispatches through the capability seam.\n */\nexport function createClientCore<\n  Ops extends OpsShape,\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n>(\n  operations: Record<string, OperationDescriptor>,\n  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},\n  caps: Capabilities = {}\n): Client<Ops, OperationContext<Id, Path, Tag>> {\n  // The literal-union narrowing is a compile-time DX contract only; internally the\n  // runtime works with the base (string-typed) context. One cast at this boundary —\n  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx\n  // params are contravariant).\n  const given = initial as ClientConfig;\n  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.\n  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };\n  const client = {} as Record<string, unknown>;\n\n  for (const [name, op] of Object.entries(operations)) {\n    if (op.responseKind === 'sse') {\n      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {\n        if (!caps.sse) {\n          throw new Error(`SSE capability not wired: cannot stream operation \"${op.id}\"`);\n        }\n        const stream = caps.sse;\n        return (async function* () {\n          const prepared = await prepareRequest(config, op, args, init, caps);\n          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');\n        })();\n      };\n    } else {\n      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>\n        execute(config, op, args, init, caps);\n      const spec = op.pagination;\n      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching\n      // through the capability seam (like SSE: absent capability throws descriptively).\n      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on\n      // a result-mode client (`errorMode` is fixed at construction — `configure()`\n      // ignores it) each page's envelope is unwrapped before it reaches the capability.\n      // A failed page aborts iteration by throwing ApiError, even on result-mode\n      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.\n      client[name] = spec\n        ? Object.assign(method, {\n            pages: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),\n            items: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),\n          })\n        : method;\n    }\n  }\n\n  // Core members are assigned AFTER the operation loop — they win over colliding op names.\n  client.configure = (next: ClientConfig): void => {\n    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at\n    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.\n    const { errorMode: _fixed, ...rest } = next;\n    Object.assign(config, rest);\n  };\n  client.use = (...middleware: Middleware[]): void => {\n    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.\n    config.middleware = [...(config.middleware ?? []), ...middleware];\n  };\n  client.auth = {\n    bearer(token: TokenProvider): void {\n      config.auth = { ...config.auth, bearer: token };\n    },\n    basic(username: string, password: string): void {\n      config.auth = { ...config.auth, basic: { username, password } };\n    },\n    apiKey(scheme: string, value: TokenProvider): void {\n      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };\n    },\n  };\n\n  return client as Client<Ops, OperationContext<Id, Path, Tag>>;\n}\n",
+    "import { ApiError } from './errors.js';\nimport { parse, readError } from './parse.js';\nimport { middlewareChain, send, type SendCapabilities } from './send.js';\nimport type {\n  ApiErrorLike,\n  Client,\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  OperationDescriptor,\n  OpsShape,\n  PaginationSpec,\n  ParseAs,\n  QueryValue,\n  RequestOptions,\n  SecuritySpec,\n  ServerSentEvent,\n  SseOptions,\n  TokenProvider,\n} from './types.js';\nimport { buildUrl, substitutePath, type QueryStyle } from './url.js';\n\n/**\n * The optional behaviors `createClientCore` can dispatch to but never statically\n * imports. The package's public `createClient` wires the full set; the future\n * inline-mode assembler wires only the capabilities a spec needs.\n */\nexport type Capabilities = SendCapabilities & {\n  resolveAuth?: (\n    security: readonly SecuritySpec[],\n    config: ClientConfig\n  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;\n  sse?: (\n    config: ClientConfig,\n    op: OperationContext,\n    url: string,\n    init: SseOptions,\n    dataKind: 'json' | 'text'\n  ) => AsyncGenerator<ServerSentEvent<unknown>>;\n  paginate?: {\n    pages: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n    items: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n  };\n};\n\n/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */\nexport type OperationArgs = {\n  params?: Record<string, QueryValue>;\n  body?: unknown;\n  headers?: Record<string, unknown>;\n} & Record<string, unknown>;\n\n/** The response reader implied by the descriptor (before any per-call `parseAs` override). */\nfunction kindFor(op: OperationDescriptor): ParseAs | 'void' {\n  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {\n    return op.responseKind;\n  }\n  return 'auto';\n}\n\n/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */\nfunction splitArgs(op: OperationDescriptor, args: OperationArgs) {\n  const path: Record<string, unknown> = {};\n  for (const param of op.params ?? []) {\n    if (param.in === 'path') path[param.name] = args[param.name];\n  }\n  return { path, query: args.params, body: args.body, headers: args.headers };\n}\n\n/**\n * The query-serialization hints for the descriptor's query params. A spec is built only\n * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),\n * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)\n * are honored, and an omitted `explode` keeps the exploded default.\n */\nfunction queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {\n  let styles: Record<string, QueryStyle> | undefined;\n  for (const param of op.params ?? []) {\n    if (param.in !== 'query') continue;\n    const deviates =\n      (param.style !== undefined && param.style !== 'form') ||\n      param.explode === false ||\n      param.allowReserved === true;\n    if (!deviates) continue;\n    styles ??= {};\n    styles[param.name] = {\n      style: param.style ?? 'form',\n      explode: param.explode ?? true,\n      allowReserved: param.allowReserved,\n    };\n  }\n  return styles;\n}\n\n/** Stringify caller-supplied extra headers, skipping empty entries. */\nfunction stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {\n  const out: Record<string, string> = {};\n  for (const [key, value] of Object.entries(headers ?? {})) {\n    if (value !== undefined && value !== null) out[key] = String(value);\n  }\n  return out;\n}\n\n/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */\nasync function prepareRequest(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions | SseOptions,\n  caps: Capabilities\n): Promise<{ url: string; init: RequestOptions; body: unknown }> {\n  const { path, query, body, headers } = splitArgs(op, args);\n  const authed =\n    op.security?.length && caps.resolveAuth\n      ? await caps.resolveAuth(op.security, config)\n      : { headers: {}, query: {} };\n  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };\n  const url = buildUrl(\n    config.serverUrl ?? '',\n    substitutePath(op.path, path),\n    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,\n    queryStyles(op)\n  );\n  const mergedInit: RequestOptions = {\n    ...init,\n    method: op.method.toUpperCase(),\n    // Precedence, lowest → highest (later spreads win): injected auth → explicit\n    // header params → caller `init.headers` — the caller always overrides both.\n    headers: {\n      ...authed.headers,\n      ...stringHeaders(headers),\n      ...(init.headers as Record<string, string> | undefined),\n    },\n  };\n  return { url, init: mergedInit, body };\n}\n\n/** One non-SSE call: send, then branch on the configured error mode. */\nasync function execute(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions,\n  caps: Capabilities\n): Promise<unknown> {\n  const prepared = await prepareRequest(config, op, args, init, caps);\n  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n  const { parseAs, ...sendInit } = prepared.init;\n  const { response, context } = await send(\n    config,\n    opCtx,\n    prepared.url,\n    sendInit,\n    prepared.body,\n    op.body?.multipart === true,\n    caps\n  );\n  const readKind = parseAs ?? kindFor(op);\n  if (config.errorMode === 'result') {\n    if (!response.ok) {\n      return { data: undefined, error: await readError(response), response };\n    }\n    return { data: await parse(response, readKind), error: undefined, response };\n  }\n  if (!response.ok) {\n    let error: globalThis.Error = new ApiError(\n      context.url,\n      response.status,\n      response.statusText,\n      await readError(response)\n    );\n    // Thread the error through each middleware's onError in turn (each may replace it).\n    for (const mw of middlewareChain(config)) {\n      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);\n    }\n    throw error;\n  }\n  return parse(response, readKind);\n}\n\n/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */\nfunction paginateCapability(caps: Capabilities, op: OperationDescriptor) {\n  if (!caps.paginate) {\n    throw new Error(`Pagination capability not wired: cannot iterate operation \"${op.id}\"`);\n  }\n  return caps.paginate;\n}\n\n/**\n * The per-page call the iterators drive: the method itself in throw mode; in result\n * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page\n * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is\n * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).\n */\nfunction pageCall(\n  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  config: ClientConfig\n) {\n  if (config.errorMode !== 'result') return method;\n  return async (args?: OperationArgs, init?: RequestOptions) => {\n    const envelope = (await method(args, init)) as {\n      data: unknown;\n      error: unknown;\n      response: Response;\n    };\n    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page\n    // (204/void) also parses to undefined data, and a failed page's `error` can be\n    // undefined too (unreadable body). The pointers then miss on the undefined data\n    // and iteration stops cleanly, which is the correct semantics for an empty page.\n    if (!envelope.response.ok) {\n      const { response } = envelope;\n      throw new ApiError(response.url, response.status, response.statusText, envelope.error);\n    }\n    return envelope.data;\n  };\n}\n\n/**\n * Build a typed instance client over operation descriptors: one real bound method per\n * operation (attached by a construction-time loop — no Proxy), plus the core members\n * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name\n * collision with an operation. All behavior dispatches through the capability seam.\n */\nexport function createClientCore<\n  Ops extends OpsShape,\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n>(\n  operations: Record<string, OperationDescriptor>,\n  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},\n  caps: Capabilities = {}\n): Client<Ops, OperationContext<Id, Path, Tag>> {\n  // The literal-union narrowing is a compile-time DX contract only; internally the\n  // runtime works with the base (string-typed) context. One cast at this boundary —\n  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx\n  // params are contravariant).\n  const given = initial as ClientConfig;\n  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.\n  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };\n  const client = {} as Record<string, unknown>;\n\n  for (const [name, op] of Object.entries(operations)) {\n    if (op.responseKind === 'sse') {\n      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {\n        if (!caps.sse) {\n          throw new Error(`SSE capability not wired: cannot stream operation \"${op.id}\"`);\n        }\n        const stream = caps.sse;\n        return (async function* () {\n          const prepared = await prepareRequest(config, op, args, init, caps);\n          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');\n        })();\n      };\n    } else {\n      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>\n        execute(config, op, args, init, caps);\n      const spec = op.pagination;\n      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching\n      // through the capability seam (like SSE: absent capability throws descriptively).\n      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on\n      // a result-mode client (`errorMode` is fixed at construction — `configure()`\n      // ignores it) each page's envelope is unwrapped before it reaches the capability.\n      // A failed page aborts iteration by throwing ApiError, even on result-mode\n      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.\n      client[name] = spec\n        ? Object.assign(method, {\n            pages: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),\n            items: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),\n          })\n        : method;\n    }\n  }\n\n  // Core members are assigned AFTER the operation loop — they win over colliding op names.\n  client.configure = (next: ClientConfig): void => {\n    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at\n    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.\n    const { errorMode: _fixed, ...rest } = next;\n    Object.assign(config, rest);\n  };\n  client.use = (...middleware: Middleware[]): void => {\n    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.\n    config.middleware = [...(config.middleware ?? []), ...middleware];\n  };\n  client.auth = {\n    bearer(token: TokenProvider): void {\n      config.auth = { ...config.auth, bearer: token };\n    },\n    basic(username: string, password: string): void {\n      config.auth = { ...config.auth, basic: { username, password } };\n    },\n    apiKey(scheme: string, value: TokenProvider): void {\n      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };\n    },\n  };\n\n  return client as Client<Ops, OperationContext<Id, Path, Tag>>;\n}\n",
   'paginate.ts':
     "import type { OperationArgs } from './create-client.js';\nimport type { PaginationSpec, QueryValue, RequestOptions } from './types.js';\n\n/**\n * Auto-pagination (capability module — wired into `createClient`, dispatched by the\n * method's `.pages()`/`.items()`): walk an operation's pages by advancing the descriptor's\n * `param` query parameter, per its `style`. The caller's args are never mutated — each\n * request gets a fresh `params` clone — and `init` is forwarded to every call.\n *\n * Iteration is error-mode-agnostic: `call` always resolves to the RAW page (on a\n * result-mode client the attachment unwraps the envelope first), so a failed page\n * aborts iteration by throwing `ApiError`, even on result-mode clients; the `onError`\n * middleware hook (throw-mode-only) is not invoked.\n */\n\n/**\n * Resolve an RFC 6901 JSON pointer (`~1` → `/`, `~0` → `~`) against a value.\n * The empty pointer is the whole document; anything else must start with `/`.\n * Returns `undefined` on any miss (bad token, absent key, non-object step) — never throws.\n */\nexport function resolvePointer(value: unknown, pointer: string): unknown {\n  if (pointer === '') return value;\n  if (!pointer.startsWith('/')) return undefined;\n  let current = value;\n  for (const token of pointer.slice(1).split('/')) {\n    const key = token.replaceAll('~1', '/').replaceAll('~0', '~');\n    if (Array.isArray(current)) {\n      if (!/^(0|[1-9]\\d*)$/.test(key)) return undefined;\n      current = current[Number(key)];\n    } else if (Object(current) === current && key in (current as object)) {\n      current = (current as Record<string, unknown>)[key];\n    } else {\n      return undefined;\n    }\n  }\n  return current;\n}\n\n/**\n * Iterate an operation's full page results. Every page is yielded before the stop\n * condition is evaluated, so the last page always arrives. Cursor style resumes from a\n * caller-provided `params[spec.param]`, stops when `nextCursor` resolves to\n * `undefined`/`null`/`''`, and throws if the next cursor is not a string or number, or\n * if the same cursor comes back twice in a row (infinite-loop guards). Offset/page\n * styles advance by item count / by one and stop when\n * the `items` pointer misses or the array is empty.\n */\nexport async function* pages<TPage>(\n  call: (args?: OperationArgs, init?: RequestOptions) => Promise<TPage>,\n  spec: PaginationSpec,\n  args: OperationArgs = {},\n  init?: RequestOptions\n): AsyncGenerator<TPage> {\n  if (spec.style === 'cursor') {\n    let cursor: unknown = args.params?.[spec.param];\n    while (true) {\n      const params = { ...args.params };\n      if (cursor !== undefined) params[spec.param] = cursor as QueryValue;\n      const page = await call({ ...args, params }, init);\n      yield page;\n      const next = resolvePointer(page, spec.nextCursor!);\n      if (next === undefined || next === null || next === '') return;\n      if (typeof next !== 'string' && typeof next !== 'number') {\n        // A fresh non-scalar cursor never compares equal, so without this guard a lying\n        // server would slip past the did-not-advance check into an infinite loop.\n        throw new Error(`Pagination cursor at ${spec.nextCursor} is not a string or number`);\n      }\n      if (next === cursor) {\n        throw new Error('Pagination did not advance: operation returned the same cursor twice');\n      }\n      cursor = next;\n    }\n  } else {\n    let position =\n      (args.params?.[spec.param] as number | undefined) ?? (spec.style === 'page' ? 1 : 0);\n    while (true) {\n      const page = await call(\n        { ...args, params: { ...args.params, [spec.param]: position } },\n        init\n      );\n      yield page;\n      const pageItems = resolvePointer(page, spec.items);\n      if (!Array.isArray(pageItems) || pageItems.length === 0) return;\n      position += spec.style === 'page' ? 1 : pageItems.length;\n    }\n  }\n}\n\n/**\n * Iterate the operation's individual items: each page's `items` pointer, flattened.\n * A cursor-style page whose pointer misses yields nothing but pagination continues;\n * for offset/page styles a miss has already stopped `pages`.\n */\nexport async function* items<TItem>(\n  call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  spec: PaginationSpec,\n  args?: OperationArgs,\n  init?: RequestOptions\n): AsyncGenerator<TItem> {\n  for await (const page of pages(call, spec, args, init)) {\n    const pageItems = resolvePointer(page, spec.items);\n    if (Array.isArray(pageItems)) yield* pageItems as TItem[];\n  }\n}\n",
 } as const;
diff --git a/packages/client-generator/src/runtime/__tests__/create-client.test.ts b/packages/client-generator/src/runtime/__tests__/create-client.test.ts
index 84bc21e6f4..e3c2dbafd7 100644
--- a/packages/client-generator/src/runtime/__tests__/create-client.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/create-client.test.ts
@@ -355,6 +355,23 @@ describe('createClientCore', () => {
     expect(envelope.data).toEqual(page2);
   });
 
+  it('result mode: a successful bodyless page (204) stops iteration cleanly, no bogus ApiError', async () => {
+    // A 204 page parses to `data: undefined` with `error: undefined` — success, not failure.
+    // The pointers miss on `undefined`, so iteration stops; it must NOT throw.
+    const { fetchImpl } = spy([
+      jsonOk({ orders: [{ id: 'o1' }], nextCursor: 'c2' }),
+      new Response(null, { status: 204 }),
+    ]);
+    const client = createClientCore<Ops>(
+      OPS,
+      { serverUrl: 'https://x', fetch: fetchImpl, errorMode: 'result' },
+      { paginate: { pages: paginatePages, items: paginateItems } }
+    );
+    const items = [];
+    for await (const item of client.listOrders.items()) items.push(item);
+    expect(items).toEqual([{ id: 'o1' }]);
+  });
+
   it('result mode: a failed page aborts iteration by throwing ApiError; onError is not invoked', async () => {
     const { fetchImpl } = spy([
       jsonOk({ orders: [{ id: 'o1' }], nextCursor: 'c2' }),
diff --git a/packages/client-generator/src/runtime/create-client.ts b/packages/client-generator/src/runtime/create-client.ts
index ecb821aef2..edd4688f57 100644
--- a/packages/client-generator/src/runtime/create-client.ts
+++ b/packages/client-generator/src/runtime/create-client.ts
@@ -213,7 +213,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/tests/e2e/generate-client/cafe-consumer/api.ts b/tests/e2e/generate-client/cafe-consumer/api.ts
index 458f2664fc..35944c50a5 100644
--- a/tests/e2e/generate-client/cafe-consumer/api.ts
+++ b/tests/e2e/generate-client/cafe-consumer/api.ts
@@ -1628,7 +1628,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/tests/e2e/generate-client/cafe.snapshot.ts b/tests/e2e/generate-client/cafe.snapshot.ts
index 53829f9444..9ce2f0d688 100644
--- a/tests/e2e/generate-client/cafe.snapshot.ts
+++ b/tests/e2e/generate-client/cafe.snapshot.ts
@@ -1628,7 +1628,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
index bcbcf63f21..b517db0107 100644
--- a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
@@ -1644,7 +1644,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts b/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
index 4fb364f02a..78b768f2f9 100644
--- a/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
@@ -981,7 +981,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
index 53829f9444..9ce2f0d688 100644
--- a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
@@ -1628,7 +1628,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts b/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
index e70688fb5b..997e9c962d 100644
--- a/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
@@ -846,7 +846,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/tests/e2e/generate-client/examples/customization/src/api/client.ts b/tests/e2e/generate-client/examples/customization/src/api/client.ts
index 53829f9444..9ce2f0d688 100644
--- a/tests/e2e/generate-client/examples/customization/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/customization/src/api/client.ts
@@ -1628,7 +1628,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
index 53829f9444..9ce2f0d688 100644
--- a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
@@ -1628,7 +1628,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/tests/e2e/generate-client/examples/mock/src/api/client.ts b/tests/e2e/generate-client/examples/mock/src/api/client.ts
index 53829f9444..9ce2f0d688 100644
--- a/tests/e2e/generate-client/examples/mock/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/mock/src/api/client.ts
@@ -1628,7 +1628,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts b/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
index eb4efce515..fc5f99fded 100644
--- a/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
@@ -853,7 +853,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/tests/e2e/generate-client/examples/pagination/src/api/client.ts b/tests/e2e/generate-client/examples/pagination/src/api/client.ts
index 83b7ef44d1..6ad08572cc 100644
--- a/tests/e2e/generate-client/examples/pagination/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/pagination/src/api/client.ts
@@ -964,7 +964,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
index 53829f9444..9ce2f0d688 100644
--- a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
@@ -1628,7 +1628,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts b/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
index 821758c8a6..233675fbf4 100644
--- a/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
@@ -979,7 +979,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
index 53829f9444..9ce2f0d688 100644
--- a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
@@ -1628,7 +1628,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts b/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
index d3d90bbc28..3b09c33cd2 100644
--- a/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
@@ -883,7 +883,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts b/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
index 54344c7290..e7111e7ffb 100644
--- a/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
@@ -922,7 +922,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/tests/e2e/generate-client/examples/zod/src/api/client.ts b/tests/e2e/generate-client/examples/zod/src/api/client.ts
index 53829f9444..9ce2f0d688 100644
--- a/tests/e2e/generate-client/examples/zod/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/zod/src/api/client.ts
@@ -1628,7 +1628,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/tests/e2e/generate-client/pagination-consumer/api-offset.ts b/tests/e2e/generate-client/pagination-consumer/api-offset.ts
index b75f63f9ea..1f8799082e 100644
--- a/tests/e2e/generate-client/pagination-consumer/api-offset.ts
+++ b/tests/e2e/generate-client/pagination-consumer/api-offset.ts
@@ -995,7 +995,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/tests/e2e/generate-client/pagination-consumer/api.ts b/tests/e2e/generate-client/pagination-consumer/api.ts
index 9584c0215b..bdc34dc1f2 100644
--- a/tests/e2e/generate-client/pagination-consumer/api.ts
+++ b/tests/e2e/generate-client/pagination-consumer/api.ts
@@ -994,7 +994,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }

From bf5f82bf0f5d34450952fbbd55690526e449344f Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Wed, 8 Jul 2026 21:32:32 +0300
Subject: [PATCH 078/134] ci: cap e2e parallelism to keep the runner within
 memory

Several e2e suites each spawn a `tsc --noEmit` gate, a live server, and
multiple `tsx` consumers (~1 GB apiece). Unbounded on the 4-core CI runner
they pile up past its memory ceiling and the agent is OOM-killed, which
GitHub surfaces as a "The operation was canceled" E2E step. Run at most two
test files at once, which stays under the ceiling.
---
 .github/workflows/tests.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index c7432bee66..4b291c109f 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -33,7 +33,11 @@ jobs:
         uses: davelosert/vitest-coverage-report-action@d63aa97db4c0319f304f1787689de1ca548365cf # v2.11.1
 
       - name: E2E Tests
-        run: npm run e2e
+        # Cap parallel test files: several e2e suites each spawn a `tsc --noEmit` gate, a
+        # live server, and multiple `tsx` consumers (~1 GB each). Unbounded on this 4-core
+        # runner they exhaust its memory and the agent is OOM-killed (a "The operation was
+        # canceled" step). Two at a time stays under the ceiling.
+        run: npm run e2e -- --maxWorkers=2
 
   code-style-check:
     runs-on: ubuntu-latest

From 5a424ecc0edd40cdd8d9f3de69b519c12a1428c9 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Wed, 8 Jul 2026 21:33:15 +0300
Subject: [PATCH 079/134] test(client-generator): refresh base/sse consumer
 fixtures for the pageCall 204 fix

These generated fixtures embed the inline client runtime, including
`pageCall`. The 204/void fix changed that runtime but only the byte-asserted
`examples/` fixtures were regenerated; these two consumer fixtures are not
byte-checked, so they were left one fix stale. Regenerate them to match.
---
 tests/e2e/generate-client/base-consumer/api.ts | 6 +++++-
 tests/e2e/generate-client/sse-consumer/api.ts  | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/e2e/generate-client/base-consumer/api.ts b/tests/e2e/generate-client/base-consumer/api.ts
index 7ee7bc1bb9..5158b49386 100644
--- a/tests/e2e/generate-client/base-consumer/api.ts
+++ b/tests/e2e/generate-client/base-consumer/api.ts
@@ -995,7 +995,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }
diff --git a/tests/e2e/generate-client/sse-consumer/api.ts b/tests/e2e/generate-client/sse-consumer/api.ts
index 982775a15d..5fda1f0d55 100644
--- a/tests/e2e/generate-client/sse-consumer/api.ts
+++ b/tests/e2e/generate-client/sse-consumer/api.ts
@@ -985,7 +985,11 @@ function pageCall(
       error: unknown;
       response: Response;
     };
-    if (envelope.data === undefined) {
+    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
+    // (204/void) also parses to undefined data, and a failed page's `error` can be
+    // undefined too (unreadable body). The pointers then miss on the undefined data
+    // and iteration stops cleanly, which is the correct semantics for an empty page.
+    if (!envelope.response.ok) {
       const { response } = envelope;
       throw new ApiError(response.url, response.status, response.statusText, envelope.error);
     }

From fc32f832087efe5dd2c891bca058a3944c613d78 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Wed, 8 Jul 2026 22:27:22 +0300
Subject: [PATCH 080/134] fix: change ci runner to gh hosted

---
 .github/workflows/tests.yaml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 4b291c109f..e1372e433d 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -13,7 +13,7 @@ env:
 
 jobs:
   build-and-unit:
-    runs-on: ubuntu-latest
+    runs-on: e2e-redocly-cli
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
@@ -33,11 +33,7 @@ jobs:
         uses: davelosert/vitest-coverage-report-action@d63aa97db4c0319f304f1787689de1ca548365cf # v2.11.1
 
       - name: E2E Tests
-        # Cap parallel test files: several e2e suites each spawn a `tsc --noEmit` gate, a
-        # live server, and multiple `tsx` consumers (~1 GB each). Unbounded on this 4-core
-        # runner they exhaust its memory and the agent is OOM-killed (a "The operation was
-        # canceled" step). Two at a time stays under the ceiling.
-        run: npm run e2e -- --maxWorkers=2
+        run: npm run e2e
 
   code-style-check:
     runs-on: ubuntu-latest

From 2989dc81f66411d8068a1daaf18e3cec83e0c70b Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Wed, 8 Jul 2026 22:48:02 +0300
Subject: [PATCH 081/134] fix(client-generator): deep-merge pagination when
 layering client config blocks

mergeConfig shallow-merged the top-level and per-API `client` blocks, so a
per-API `pagination` override carrying only `operations` (or any partial
field) replaced the whole top-level object, dropping shared convention fields
like `style`, `cursorParam`, and `items`. Layer the `pagination` block instead:
convention scalars survive a partial override, and `operations` merge by id.
---
 .../src/__tests__/config-file.test.ts         | 29 +++++++++++++++++++
 packages/client-generator/src/config-file.ts  | 11 +++++++
 2 files changed, 40 insertions(+)

diff --git a/packages/client-generator/src/__tests__/config-file.test.ts b/packages/client-generator/src/__tests__/config-file.test.ts
index 0570a8e066..16b67f3007 100644
--- a/packages/client-generator/src/__tests__/config-file.test.ts
+++ b/packages/client-generator/src/__tests__/config-file.test.ts
@@ -13,4 +13,33 @@ describe('mergeConfig', () => {
       argsStyle: 'grouped',
     });
   });
+
+  it('layers a partial pagination override onto the shared convention instead of replacing it', () => {
+    const merged = mergeConfig(
+      {
+        pagination: {
+          style: 'cursor',
+          cursorParam: 'cursor',
+          items: '/items',
+          operations: { listA: { style: 'cursor', cursorParam: 'a', items: '/a' } },
+        },
+      },
+      {
+        pagination: {
+          limitParam: 'perPage',
+          operations: { listB: { style: 'offset', offsetParam: 'b', items: '/b' } },
+        },
+      }
+    );
+    expect(merged.pagination).toEqual({
+      style: 'cursor',
+      cursorParam: 'cursor',
+      items: '/items',
+      limitParam: 'perPage',
+      operations: {
+        listA: { style: 'cursor', cursorParam: 'a', items: '/a' },
+        listB: { style: 'offset', offsetParam: 'b', items: '/b' },
+      },
+    });
+  });
 });
diff --git a/packages/client-generator/src/config-file.ts b/packages/client-generator/src/config-file.ts
index cc9c4b4636..001032acee 100644
--- a/packages/client-generator/src/config-file.ts
+++ b/packages/client-generator/src/config-file.ts
@@ -11,5 +11,16 @@ export function mergeConfig(base: Partial<Config>, overrides: Partial<Config>):
   for (const [key, value] of Object.entries(overrides)) {
     if (value !== undefined) (merged as Record<string, unknown>)[key] = value;
   }
+  // `pagination` is the one nested block: a partial override (e.g. a per-API `operations`
+  // map alone) must layer onto the shared convention fields, not replace the whole object.
+  if (base.pagination && overrides.pagination) {
+    merged.pagination = { ...base.pagination, ...overrides.pagination };
+    if (base.pagination.operations || overrides.pagination.operations) {
+      merged.pagination.operations = {
+        ...base.pagination.operations,
+        ...overrides.pagination.operations,
+      };
+    }
+  }
   return merged;
 }

From be92b1ecbe4d88aed91e12a72d52ea4181cbdb40 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 9 Jul 2026 09:37:42 +0300
Subject: [PATCH 082/134] ci: split e2e into two sharded jobs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Running the whole e2e suite in one step was cancelled mid-run by the GitHub
Actions service once the generate-client suites grew past ~28 — the runner
stayed healthy the whole time (no memory/disk/CPU/fd exhaustion, job token
still renewing), so this was a service-side cancellation of an oversized run,
not a failing test. Split e2e into a 2-shard matrix (`--shard`) so each runner
carries roughly half the suites, well under that threshold.
---
 .github/workflows/tests.yaml | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index e1372e433d..a235a6abb2 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -13,7 +13,7 @@ env:
 
 jobs:
   build-and-unit:
-    runs-on: e2e-redocly-cli
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
@@ -32,8 +32,26 @@ jobs:
         continue-on-error: true # Do not fail if there is an error during reporting
         uses: davelosert/vitest-coverage-report-action@d63aa97db4c0319f304f1787689de1ca548365cf # v2.11.1
 
-      - name: E2E Tests
-        run: npm run e2e
+  e2e:
+    # The e2e suite is split across shards so no single runner carries the whole set.
+    # Running all suites in one step was cancelled mid-run by the Actions service once the
+    # generate-client suites grew past ~28 (a healthy runner, no resource exhaustion);
+    # each shard stays well under that.
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        shard: [1, 2]
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+        with:
+          node-version: 24
+          cache: npm
+      - name: Install dependencies
+        run: npm ci
+      - name: E2E Tests (shard ${{ matrix.shard }}/2)
+        run: npm run e2e -- --shard=${{ matrix.shard }}/2
 
   code-style-check:
     runs-on: ubuntu-latest

From 0ef1ba12de44986b4bceafbb0406646fc08153ca Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 9 Jul 2026 17:15:23 +0300
Subject: [PATCH 083/134] docs(client-generator): fix README generateClient
 import and list the pagination examples
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`generateClient` is a named export, but the custom-generator snippet imported it as a
default — corrected to `import { generateClient }`. Also add the `pagination`,
`custom-pagination`, and `nested-facade` examples to the Examples list, which had gone stale.
---
 packages/client-generator/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client-generator/README.md b/packages/client-generator/README.md
index bcb558f6f1..a5a9832070 100644
--- a/packages/client-generator/README.md
+++ b/packages/client-generator/README.md
@@ -400,7 +400,7 @@ export default defineGenerator({
 Select it in `generators` by import specifier (a path or package), or register it inline and select it by `name`:
 
 ```ts
-import generateClient from '@redocly/client-generator';
+import { generateClient } from '@redocly/client-generator';
 import routeMap from './tools/route-map-generator.ts';
 
 await generateClient({
@@ -474,7 +474,7 @@ Inline output embeds the pagination module only when some operation paginates; `
 
 ## Examples
 
-Runnable examples live in [`examples/`](./examples): `zero-install-quickstart`, `fetch-functions`, `configure-and-middleware`, `customization`, `baked-setup`, `sse-streaming`, `zod`, `tanstack-query`, `mock`, `custom-generator`, `programmatic`, `vendored-edge`, `package-runtime` (`runtime: 'package'` — engine fixes via `npm update`), and `multi-instance` (per-tenant `createClient` instances over one generated module).
+Runnable examples live in [`examples/`](./examples): `zero-install-quickstart`, `fetch-functions`, `configure-and-middleware`, `customization`, `baked-setup`, `sse-streaming`, `zod`, `tanstack-query`, `mock`, `custom-generator`, `programmatic`, `vendored-edge`, `package-runtime` (`runtime: 'package'` — engine fixes via `npm update`), `multi-instance` (per-tenant `createClient` instances over one generated module), `pagination` and `custom-pagination` (the declared convention vs. a hand-written helper), and `nested-facade` (a custom generator grouping operations by tag).
 Each is a standalone Vite app with a checked-in, drift-checked generated client.
 
 ## Documentation

From 45887e66ccd6c7e5360cbff21ae8fa4de7b00bbe Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Fri, 10 Jul 2026 11:45:16 +0300
Subject: [PATCH 084/134] fix: vitest thresholds

---
 vitest.config.ts | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/vitest.config.ts b/vitest.config.ts
index b3015bc943..c0f73e3a0c 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -25,13 +25,6 @@ const configExtension: { [key: string]: ViteUserConfig } = {
           functions: 73,
           statements: 69,
           branches: 61,
-          // The hand-written client runtime is held to 100% (aggregate 100% ⇒ every file 100%).
-          'packages/client-generator/src/runtime/**/*.ts': {
-            lines: 100,
-            functions: 100,
-            statements: 100,
-            branches: 100,
-          },
         },
       },
     },

From a9eb026001af5e0ba3d371087c94594ce248a5e3 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Fri, 10 Jul 2026 12:50:47 +0300
Subject: [PATCH 085/134] fix(client-generator): address PR review comments

Runtime correctness:
- SSE: throw a distinct SseParseError on malformed JSON `data` so a stable bad
  payload surfaces instead of reconnecting forever; detect frame boundaries with
  any two consecutive line terminators (mixed CR/LF), not just matching pairs.
- Security: apply exactly one OR-alternative (the first fully-injectable
  requirement object) so "bearer OR apiKey" never sends both credentials.
- Response decoding: match the content-type case-insensitively so `Text/Plain`
  reads as text, not a Blob.
- configure({ auth }) merges into existing credentials (like the auth setters)
  instead of replacing the whole auth object.
- mergeConfig unions pagination `exclude` across config layers (additive, like
  `operations`) rather than replacing it.

CLI & tooling:
- Drop the misleading "check the file path" suffix from the generate-client
  failure message (it hid generator/pagination/setup errors).
- Remove the racy client-generator runtime lint-staged glob; runtime-sources is
  regenerated on install (`prepare`) and guarded by the drift test.

Docs & config:
- Correct the settings-resolution wording (CLI flags win; per-API overrides the
  top-level field by field), trim the config-reference precedence section, and
  clarify the clientOutput default.
- Shorten the changeset intro to a docs link.
- Drop redundant inline comments in the config node types.
---
 .changeset/client-generator.md                |  4 +-
 docs/@v2/commands/generate-client.md          |  2 +-
 docs/@v2/configuration/reference/client.md    |  6 +-
 package.json                                  |  4 -
 packages/cli/src/commands/generate-client.ts  |  4 +-
 .../scripts/generate-runtime-sources.mjs      |  2 +-
 .../src/__tests__/config-file.test.ts         |  8 ++
 packages/client-generator/src/config-file.ts  |  7 ++
 .../__snapshots__/package-client.test.ts.snap | 74 ++++++++++++++-----
 .../src/emitters/runtime-sources.ts           |  8 +-
 .../__tests__/build.test.ts                   | 20 ++++-
 .../src/intermediate-representation/build.ts  | 22 +++---
 .../runtime/__tests__/create-client.test.ts   | 36 +++++++++
 .../src/runtime/__tests__/parse.test.ts       | 12 +++
 .../src/runtime/__tests__/sse.test.ts         | 32 +++++++-
 .../src/runtime/create-client.ts              | 12 ++-
 .../client-generator/src/runtime/parse.ts     |  7 +-
 packages/client-generator/src/runtime/sse.ts  | 36 ++++++---
 packages/core/src/types/redocly-yaml.ts       |  6 +-
 .../examples/baked-setup/src/api/client.ts    | 19 ++++-
 .../src/api/client.ts                         | 19 ++++-
 .../custom-generator/src/api/client.ts        | 19 ++++-
 .../custom-pagination/src/api/client.ts       | 19 ++++-
 .../examples/customization/src/api/client.ts  | 19 ++++-
 .../fetch-functions/src/api/client.ts         | 19 ++++-
 .../examples/mock/src/api/client.ts           | 19 ++++-
 .../examples/nested-facade/src/api/client.ts  | 19 ++++-
 .../examples/pagination/src/api/client.ts     | 19 ++++-
 .../examples/programmatic/src/api/client.ts   | 19 ++++-
 .../examples/sse-streaming/src/api/client.ts  | 55 ++++++++++----
 .../examples/tanstack-query/src/api/client.ts | 19 ++++-
 .../examples/vendored-edge/src/api/client.ts  | 19 ++++-
 .../zero-install-quickstart/src/api/client.ts | 19 ++++-
 .../examples/zod/src/api/client.ts            | 19 ++++-
 34 files changed, 489 insertions(+), 134 deletions(-)

diff --git a/.changeset/client-generator.md b/.changeset/client-generator.md
index a47301d1cd..265815fb8e 100644
--- a/.changeset/client-generator.md
+++ b/.changeset/client-generator.md
@@ -4,9 +4,9 @@
 '@redocly/cli': minor
 ---
 
-Added an **experimental** `generate-client` command that generates a typed TypeScript client from an OpenAPI description — auth, retries, middleware, typed SSE streaming, and multipart out of the box, built on a hand-written, directly-tested runtime.
+Added an **experimental** `generate-client` command that generates a typed, zero-dependency TypeScript client from an OpenAPI description — auth, retries, middleware, typed SSE streaming, pagination, and multipart out of the box.
 
-Generated clients are typed operation descriptors (`OPERATIONS … satisfies Record<string, OperationDescriptor>`) plus an `Ops` type, wired into a `createClient` instance. Every generated module exports both call styles: the `client` instance (grouped-args methods plus `configure`/`use`/`auth`) and free-function one-liners (`--args-style` shapes them), and re-exports `createClient` for additional per-tenant instances.
+See the [`generate-client` command reference](https://redocly.com/docs/cli/commands/generate-client) and [Use the generated client](https://redocly.com/docs/cli/guides/use-generated-client) for full documentation. Highlights:
 
 - `--runtime` option (`redocly.yaml`: `client.runtime`): `inline` (default) emits one self-contained, zero-dependency file, embedding only the runtime parts the API needs; `package` makes the generated file import the engine from `@redocly/client-generator`, so runtime fixes arrive via `npm update` with no regeneration. Application code is identical in both modes, and the emitted `satisfies` clause doubles as a build-time version-skew guard.
 - `--output-mode`: `single` (default) or `split` (the entry file plus a `<name>.schemas.ts` sibling). Both modes work with both runtimes.
diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index 1b1ab046cd..5f694877a9 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -50,7 +50,7 @@ With **no argument**, a client is generated for every api that declares a `clien
 
 ## Configuration
 
-Instead of passing flags every time, keep the settings in `redocly.yaml` under a top-level `client` block and per-API `apis.<name>.client` / `clientOutput`. Settings resolve **top-level `client` → per-API `client` → CLI flags**. See [`client` configuration](../configuration/reference/client.md) for the full reference.
+Instead of passing flags every time, keep the settings in `redocly.yaml` under a top-level `client` block and per-API `apis.<name>.client` / `clientOutput`. **CLI flags take precedence over the configuration.** Within the configuration, a per-API `client` block overrides the top-level `client` field by field (unspecified fields fall back to the top-level defaults). See [`client` configuration](../configuration/reference/client.md) for the full reference.
 
 Auto-pagination has **no CLI flag**: it's declared as structured configuration — [`client.pagination`](../configuration/reference/client.md#pagination) in `redocly.yaml`, or the equivalent `x-pagination` operation extension in the spec — and paginated operations gain typed `.pages()`/`.items()` async iterators. See [Pagination in the usage guide](../guides/use-generated-client.md#pagination).
 
diff --git a/docs/@v2/configuration/reference/client.md b/docs/@v2/configuration/reference/client.md
index 94a5d7adad..be8b94bccf 100644
--- a/docs/@v2/configuration/reference/client.md
+++ b/docs/@v2/configuration/reference/client.md
@@ -13,7 +13,7 @@ client: # shared defaults for every generated client
 apis:
   cafe:
     root: ./openapi.yaml # the input
-    clientOutput: ./src/api/client.ts # optional; defaults to `cafe.client.ts`
+    clientOutput: ./src/api/client.ts # optional; defaults to `<api-name>.client.ts` (here `cafe.client.ts`)
     client: # per-API overrides (optional)
       argsStyle: grouped
 ```
@@ -73,9 +73,9 @@ And the two container fields:
 
 The style-conditional requirements and the structural fit (the advance param must be a declared query parameter of the right type; the pointers must resolve in the JSON success-response schema, `items` landing on an array) are verified at generate time: a convention that doesn't fit skips the operation, while an explicit rule that doesn't fit fails generation. The `x-pagination` operation extension in the spec takes the same rule fields; per operation, precedence is `operations[id]` > `x-pagination` > the convention.
 
-## Precedence
+## How the configuration applies
 
-Settings resolve **top-level `client` → per-API `client` → CLI flags** (later wins). A plain file-path invocation ignores `apis:` and uses only the top-level `client`.
+A per-API `client` block overrides the top-level `client` field by field; unspecified fields fall back to the top-level defaults. A plain file-path invocation (not an `apis:` alias) ignores `apis:` and uses only the top-level `client`. CLI flags then take precedence over the resolved configuration — see the [command reference](../../commands/generate-client.md#configuration).
 
 For code-level control — including registering [custom generators](../../guides/use-generated-client.md#custom-generators) inline — use the programmatic `generateClient(...)` API instead.
 
diff --git a/package.json b/package.json
index 3a29897da8..9f314c7671 100644
--- a/package.json
+++ b/package.json
@@ -79,10 +79,6 @@
     "zod": "^4.0.0"
   },
   "lint-staged": {
-    "packages/client-generator/src/runtime/*.ts": [
-      "node packages/client-generator/scripts/generate-runtime-sources.mjs",
-      "git add packages/client-generator/src/emitters/runtime-sources.ts"
-    ],
     "**/*.{ts,js,yaml,yml,json,md}": [
       "npm run lint",
       "oxfmt --write"
diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index 336417fd88..edce6a8ea5 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -186,9 +186,7 @@ export async function handleGenerateClient({
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       throw new HandledError(
-        '\n' +
-          `❌  Failed to generate TypeScript client${job.name ? ` for ${job.name}` : ''}.\n   ${message}\n` +
-          '   Check the API description file path and that the OpenAPI document is valid.'
+        `\n❌  Failed to generate TypeScript client${job.name ? ` for ${job.name}` : ''}.\n   ${message}\n`
       );
     }
   }
diff --git a/packages/client-generator/scripts/generate-runtime-sources.mjs b/packages/client-generator/scripts/generate-runtime-sources.mjs
index 7f6ca0259c..4516820f20 100644
--- a/packages/client-generator/scripts/generate-runtime-sources.mjs
+++ b/packages/client-generator/scripts/generate-runtime-sources.mjs
@@ -46,7 +46,7 @@ const entries = MODULES.map((name) => {
 });
 
 const content = [
-  '// GENERATED by scripts/generate-runtime-sources.mjs — do not edit. Regenerated on install (`prepare`) and on commit (lint-staged); manually: `npm run prepare -w @redocly/client-generator`.',
+  '// GENERATED by scripts/generate-runtime-sources.mjs — do not edit. Regenerated on install (`prepare`); manually: `npm run prepare -w @redocly/client-generator`.',
   'export const RUNTIME_SOURCES = {',
   ...entries,
   '} as const;',
diff --git a/packages/client-generator/src/__tests__/config-file.test.ts b/packages/client-generator/src/__tests__/config-file.test.ts
index 16b67f3007..30c754f052 100644
--- a/packages/client-generator/src/__tests__/config-file.test.ts
+++ b/packages/client-generator/src/__tests__/config-file.test.ts
@@ -42,4 +42,12 @@ describe('mergeConfig', () => {
       },
     });
   });
+
+  it('unions pagination `exclude` (a per-API exclude adds to the shared one, never replaces it)', () => {
+    const merged = mergeConfig(
+      { pagination: { style: 'cursor', cursorParam: 'c', items: '/i', exclude: ['a', 'shared'] } },
+      { pagination: { exclude: ['b', 'shared'] } }
+    );
+    expect(merged.pagination?.exclude).toEqual(['a', 'shared', 'b']);
+  });
 });
diff --git a/packages/client-generator/src/config-file.ts b/packages/client-generator/src/config-file.ts
index 001032acee..ec04c06933 100644
--- a/packages/client-generator/src/config-file.ts
+++ b/packages/client-generator/src/config-file.ts
@@ -13,6 +13,8 @@ export function mergeConfig(base: Partial<Config>, overrides: Partial<Config>):
   }
   // `pagination` is the one nested block: a partial override (e.g. a per-API `operations`
   // map alone) must layer onto the shared convention fields, not replace the whole object.
+  // `operations` merge by id and `exclude` unions — both additive, so a per-API block
+  // extends the shared exclusions/overrides rather than dropping them.
   if (base.pagination && overrides.pagination) {
     merged.pagination = { ...base.pagination, ...overrides.pagination };
     if (base.pagination.operations || overrides.pagination.operations) {
@@ -21,6 +23,11 @@ export function mergeConfig(base: Partial<Config>, overrides: Partial<Config>):
         ...overrides.pagination.operations,
       };
     }
+    if (base.pagination.exclude || overrides.pagination.exclude) {
+      merged.pagination.exclude = [
+        ...new Set([...(base.pagination.exclude ?? []), ...(overrides.pagination.exclude ?? [])]),
+      ];
+    }
   }
   return merged;
 }
diff --git a/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap b/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
index 5439806037..2b61a71590 100644
--- a/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
+++ b/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
@@ -464,9 +464,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // \`Text/Plain\` and \`application/JSON\` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -701,6 +702,15 @@ async function send(
   }
 }
 
+/**
+ * A frame delimiter: two consecutive line terminators (each CR, LF, or CRLF, per the SSE
+ * spec — so mixed endings like \`\\n\\r\\n\` are valid boundaries, not just matching pairs).
+ */
+const FRAME_DELIMITER = /(?:\\r\\n|\\r|\\n){2}/;
+
+/** An event's JSON \`data\` failed to parse — a stable bad payload, not a dropped connection. */
+class SseParseError extends Error {}
+
 /**
  * Consume a \`text/event-stream\` operation as typed events (capability module — wired
  * into \`createClient\`). Auto-reconnects on dropped connections, resuming from the last
@@ -752,12 +762,11 @@ async function* sse<T>(
         while (true) {
           const { done, value } = await reader.read();
           buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });
-          let index: number;
-          while ((index = buffer.search(/\\r\\n\\r\\n|\\n\\n|\\r\\r/)) !== -1) {
+          let match: RegExpMatchArray | null;
+          while ((match = buffer.match(FRAME_DELIMITER)) !== null) {
+            const index = match.index!;
             const raw = buffer.slice(0, index);
-            buffer = buffer.slice(
-              index + buffer.slice(index).match(/^(\\r\\n\\r\\n|\\n\\n|\\r\\r)/)![0].length
-            );
+            buffer = buffer.slice(index + match[0].length);
             const event = parseSseFrame(raw, dataKind);
             if (event) {
               if (event.id !== undefined) lastEventId = event.id;
@@ -787,9 +796,10 @@ async function* sse<T>(
       }
     } catch (error) {
       if (signal?.aborted) return;
-      // A non-OK HTTP response is a definitive error (4xx/5xx), not a transient drop —
-      // surface it instead of reconnecting in a loop.
-      if (error instanceof ApiError) throw error;
+      // A non-OK HTTP response (4xx/5xx) or an unparseable JSON payload is a definitive
+      // error, not a transient drop — surface it instead of reconnecting in a loop (a
+      // stable bad payload would otherwise reconnect forever).
+      if (error instanceof ApiError || error instanceof SseParseError) throw error;
       // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream
       // read error, is a dropped connection: fall through to backoff/reconnect when enabled.
       if (!reconnect) throw error;
@@ -833,7 +843,16 @@ function parseSseFrame(
   }
   if (!sawField) return undefined;
   const dataText = dataLines.join('\\n');
-  const data = dataKind === 'json' && dataText !== '' ? JSON.parse(dataText) : dataText;
+  let data: unknown = dataText;
+  if (dataKind === 'json' && dataText !== '') {
+    try {
+      data = JSON.parse(dataText);
+    } catch (error) {
+      throw new SseParseError(
+        \`Failed to parse SSE event data as JSON: \${error instanceof Error ? error.message : String(error)}\`
+      );
+    }
+  }
   return { event, data, id, retry };
 }
 
@@ -1106,8 +1125,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // \`errorMode\` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from \`Client<Ops>\`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // \`auth\` merges into existing credentials (like the \`auth.*\` setters) rather than
+    // replacing wholesale — so \`configure({ auth: { bearer } })\` keeps a previously set
+    // basic/apiKey. \`apiKey\` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided \`middleware\` array isn't mutated.
@@ -1719,9 +1748,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // \`Text/Plain\` and \`application/JSON\` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -2327,8 +2357,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // \`errorMode\` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from \`Client<Ops>\`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // \`auth\` merges into existing credentials (like the \`auth.*\` setters) rather than
+    // replacing wholesale — so \`configure({ auth: { bearer } })\` keeps a previously set
+    // basic/apiKey. \`apiKey\` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided \`middleware\` array isn't mutated.
diff --git a/packages/client-generator/src/emitters/runtime-sources.ts b/packages/client-generator/src/emitters/runtime-sources.ts
index d48725f0cb..a1f2b82f82 100644
--- a/packages/client-generator/src/emitters/runtime-sources.ts
+++ b/packages/client-generator/src/emitters/runtime-sources.ts
@@ -1,4 +1,4 @@
-// GENERATED by scripts/generate-runtime-sources.mjs — do not edit. Regenerated on install (`prepare`) and on commit (lint-staged); manually: `npm run prepare -w @redocly/client-generator`.
+// GENERATED by scripts/generate-runtime-sources.mjs — do not edit. Regenerated on install (`prepare`); manually: `npm run prepare -w @redocly/client-generator`.
 export const RUNTIME_SOURCES = {
   'types.ts':
     "/**\n * The public type surface of the client runtime — `@redocly/client-generator`'s\n * app-facing runtime module. Pure types, no runtime code (excluded from coverage).\n * The generator emits `OPERATIONS` literals typed\n * `satisfies Record<string, OperationDescriptor>` against this module, so an\n * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).\n */\n\n/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */\nexport type ParamSpec = {\n  name: string;\n  in: 'path' | 'query' | 'header';\n  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';\n  explode?: boolean;\n  allowReserved?: boolean;\n};\n\n/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */\nexport type SecuritySpec =\n  | { scheme: string; kind: 'bearer' | 'basic' }\n  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };\n\n/**\n * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).\n * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.\n */\nexport type PaginationSpec = {\n  style: 'cursor' | 'offset' | 'page';\n  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */\n  param: string;\n  /** Optional page-size query param (recorded for tooling; never set by the runtime). */\n  limitParam?: string;\n  /** Cursor style only: pointer to the next cursor in the page. */\n  nextCursor?: string;\n  /** Pointer to the page's item array. */\n  items: string;\n};\n\n/** The frozen data contract between generated code and the runtime: one operation's wire shape. */\nexport type OperationDescriptor = {\n  id: string;\n  method: string;\n  path: string;\n  tags?: readonly string[];\n  params?: readonly ParamSpec[];\n  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */\n  body?: { contentType: string; multipart?: boolean };\n  /** Defaults to `'json'` (content-type negotiation on parse). */\n  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';\n  sseDataKind?: 'json' | 'text';\n  security?: readonly SecuritySpec[];\n  pagination?: PaginationSpec;\n};\n\n/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */\nexport type QueryValue =\n  | string\n  | number\n  | boolean\n  | null\n  | undefined\n  | Array<string | number | boolean | null | undefined>\n  | Record<string, unknown>;\n\n/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */\nexport type TokenProvider = string | (() => string | Promise<string>);\n\n/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */\nexport type AuthCredentials = {\n  bearer?: TokenProvider;\n  basic?: { username: string; password: string };\n  apiKey?: Record<string, TokenProvider>;\n};\n\n/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */\nexport type RetryStrategy = 'fixed' | 'exponential';\n\n/**\n * The operation's identity, exposed to middleware for targeting (`ctx.operation`).\n * Generated clients instantiate the type parameters with the spec's literal unions\n * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a\n * middleware comparison fails to compile; the string defaults keep every\n * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working\n * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types\n * (byte-locked to generated output) remain assignable through middleware callbacks.\n */\nexport type OperationContext<\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n> = { id: Id; path: Path; tags: Tag[] };\n\n/** The mutable request context threaded through the middleware chain. */\nexport type RequestContext<Op extends OperationContext = OperationContext> = {\n  url: string;\n  method: string;\n  headers: Record<string, string>;\n  body?: unknown;\n  operation: Op;\n};\n\n/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */\nexport type RetryContext<Op extends OperationContext = OperationContext> = {\n  attempt: number;\n  request: RequestContext<Op>;\n  response?: Response;\n  error?: unknown;\n};\n\n/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */\nexport type RetryConfig<Op extends OperationContext = OperationContext> = {\n  retries?: number;\n  retryDelay?: number;\n  retryStrategy?: RetryStrategy;\n  jitter?: boolean;\n  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;\n};\n\n/**\n * Structural stand-in for the runtime's ApiError so this module stays import-free\n * (pure types); the real `ApiError` class is assignable to it.\n */\nexport type ApiErrorLike = globalThis.Error & {\n  url: string;\n  status: number;\n  statusText: string;\n  body: unknown;\n};\n\n/** One interceptor: any subset of the three hooks. */\nexport type Middleware<Op extends OperationContext = OperationContext> = {\n  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;\n  onResponse?: (\n    response: Response,\n    ctx: RequestContext<Op>\n  ) => Response | void | Promise<Response | void>;\n  /** Throw mode only: may map/replace the error. */\n  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.\n  onError?: (\n    error: ApiErrorLike,\n    ctx: RequestContext<Op>\n  ) => globalThis.Error | Promise<globalThis.Error>;\n};\n\n/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */\nexport type ClientConfig<Op extends OperationContext = OperationContext> = {\n  serverUrl?: string;\n  fetch?: typeof fetch;\n  headers?:\n    | Record<string, string>\n    | (() => Record<string, string> | Promise<Record<string, string>>);\n  retry?: RetryConfig<Op>;\n  middleware?: Middleware<Op>[];\n  auth?: AuthCredentials;\n  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */\n  errorMode?: 'throw' | 'result';\n  onRequest?: Middleware<Op>['onRequest'];\n  onResponse?: Middleware<Op>['onResponse'];\n  onError?: Middleware<Op>['onError'];\n};\n\n/** Response readers for the per-call `parseAs` override. */\nexport type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';\n\n/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */\nexport type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };\n\n/** Per-call options for an SSE stream; reconnect defaults to true. */\nexport type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };\n\n/** A single decoded Server-Sent Event with its payload typed from the spec. */\nexport type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };\n\n/** Result-mode return shape: exactly one of `data`/`error` is set. */\nexport type Result<TData, TError> =\n  | { data: TData; error: undefined; response: Response }\n  | { data: undefined; error: TError; response: Response };\n\n/**\n * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for\n * streams and, for paginated operations, `item` (the page's element type) and — on\n * result-mode clients only — `page` (the RAW page type `.pages()` yields, since\n * iteration unwraps the `Result` envelope the one-shot `result` carries).\n */\nexport type OpsShape = Record<\n  string,\n  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }\n>;\n\n/** The always-present client members (assigned after the operation loop — they win collisions). */\nexport type ClientCore<Op extends OperationContext = OperationContext> = {\n  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */\n  configure(config: ClientConfig<Op>): void;\n  /** Append interceptors (composes with baked/publisher middleware). */\n  use(...middleware: Middleware<Op>[]): void;\n  auth: {\n    bearer(token: TokenProvider): void;\n    basic(username: string, password: string): void;\n    apiKey(scheme: string, value: TokenProvider): void;\n  };\n};\n\n/**\n * The standard TypeScript optionality probe: `{}` has no required members, so\n * `{} extends A` is true exactly when every member of `A` is optional.\n */\n// oxlint-disable-next-line typescript/no-empty-object-type\ntype NoRequiredKeys<A> = {} extends A ? true : false;\n\n/**\n * The page type `.pages()` yields: the RAW page declared by `page` (the generator\n * writes it only on result-mode paginated entries, whose `result` is the envelope),\n * or the method's own `result` (throw mode — already the raw page).\n */\ntype PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }\n  ? Entry['page']\n  : Entry['result'];\n\n/**\n * The auto-pagination members intersected onto a paginated method — present exactly when\n * the Ops entry declares `item` (the generator writes it only for paginated operations).\n * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).\n * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a\n * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the\n * `onError` middleware hook (throw-mode-only) is not invoked.\n */\ntype Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry\n  ? NoRequiredKeys<Entry['args']> extends true\n    ? {\n        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;\n        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;\n      }\n    : {\n        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;\n        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;\n      }\n  : unknown;\n\n/** The typed instance client: one bound method per operation plus the core members. */\nexport type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {\n  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }\n    ? NoRequiredKeys<Ops[K]['args']> extends true\n      ? (\n          args?: Ops[K]['args'],\n          init?: SseOptions\n        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>\n      : (\n          args: Ops[K]['args'],\n          init?: SseOptions\n        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>\n    : (NoRequiredKeys<Ops[K]['args']> extends true\n        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>\n        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &\n        Paginated<Ops[K]>;\n} & ClientCore<Op>;\n",
@@ -7,7 +7,7 @@ export const RUNTIME_SOURCES = {
   'url.ts':
     "import type { ParamSpec, QueryValue } from './types.js';\n\n/**\n * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the\n * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.\n */\nexport type QueryStyle = {\n  style: NonNullable<ParamSpec['style']>;\n  explode: boolean;\n  allowReserved?: boolean;\n};\n\n/**\n * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —\n * `filter=a/b` survives instead of `filter=a%2Fb`.\n */\nexport function encodeReserved(value: string): string {\n  return encodeURIComponent(value).replace(\n    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,\n    (match) => decodeURIComponent(match)\n  );\n}\n\n/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */\nexport function substitutePath(template: string, values: Record<string, unknown>): string {\n  return template.replace(/\\{([^{}]+)\\}/g, (_match, name: string) => {\n    const value = values[name];\n    if (value === undefined) throw new Error(`Missing path parameter \"${name}\"`);\n    return encodeURIComponent(String(value));\n  });\n}\n\n/**\n * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.\n * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);\n * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as\n * `deepObject` brackets, and `null`/`undefined` entries are skipped.\n */\nexport function buildUrl(\n  serverUrl: string,\n  path: string,\n  query?: Record<string, QueryValue>,\n  styles?: Record<string, QueryStyle>\n): string {\n  // Trim trailing slashes with a scan, not `/\\/+$/` — an anchored `+` regex is\n  // quadratic on adversarial many-slash input (the server URL is caller data).\n  let end = serverUrl.length;\n  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;\n  const url = serverUrl.slice(0, end) + path;\n  if (!query) return url;\n  const params = new URLSearchParams();\n  const raw: string[] = [];\n  for (const [key, value] of Object.entries(query)) {\n    if (value === undefined || value === null) continue;\n    const spec = styles?.[key];\n    if (!spec) {\n      if (Array.isArray(value)) {\n        for (const v of value) {\n          if (v !== undefined && v !== null) params.append(key, String(v));\n        }\n      } else if (Object(value) === value) {\n        // Object-valued query params use `deepObject` style: key[subKey]=subValue.\n        for (const [subKey, subValue] of Object.entries(value)) {\n          if (subValue !== undefined && subValue !== null) {\n            params.append(`${key}[${subKey}]`, String(subValue));\n          }\n        }\n      } else {\n        params.append(key, String(value));\n      }\n      continue;\n    }\n    if (Array.isArray(value)) {\n      const items = value.filter((v) => v !== undefined && v !== null).map(String);\n      if (spec.style === 'form' && spec.explode) {\n        for (const v of items) {\n          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);\n          else params.append(key, v);\n        }\n      } else {\n        // Delimited styles put the LITERAL delimiter on the wire; only the\n        // values are encoded. `%20` (not `+`) is the literal space delimiter.\n        const delim =\n          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';\n        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;\n        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);\n      }\n    } else if (Object(value) === value) {\n      // `deepObject` (and any object spec, for now): key[subKey]=subValue.\n      for (const [subKey, subValue] of Object.entries(value)) {\n        if (subValue !== undefined && subValue !== null) {\n          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);\n          else params.append(`${key}[${subKey}]`, String(subValue));\n        }\n      }\n    } else if (spec.allowReserved) {\n      raw.push(`${key}=${encodeReserved(String(value))}`);\n    } else {\n      params.append(key, String(value));\n    }\n  }\n  const qs = [params.toString(), ...raw].filter(Boolean).join('&');\n  return qs ? `${url}?${qs}` : url;\n}\n",
   'parse.ts':
-    "import type { ParseAs } from './types.js';\n\n/**\n * Read the response body per `kind`. `'auto'` negotiates from the content type\n * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.\n */\nexport async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {\n  if (kind === 'void' || response.status === 204) return undefined;\n  if (kind === 'stream') return response.body;\n  if (kind === 'blob') return response.blob();\n  if (kind === 'arrayBuffer') return response.arrayBuffer();\n  if (kind === 'formData') return response.formData();\n  if (kind === 'text') return response.text();\n  if (kind === 'json') return response.json();\n  // 'auto' — negotiate from the response's content type.\n  const contentType = response.headers.get('content-type') ?? '';\n  if (contentType.toLowerCase().includes('json')) return response.json();\n  if (contentType.startsWith('text/')) return response.text();\n  return response.blob();\n}\n\n/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */\nexport async function readError(response: Response): Promise<unknown> {\n  const contentType = response.headers.get('content-type') ?? '';\n  if (contentType.toLowerCase().includes('json')) {\n    return response.json().catch(() => undefined);\n  }\n  return response.text().catch(() => undefined);\n}\n",
+    "import type { ParseAs } from './types.js';\n\n/**\n * Read the response body per `kind`. `'auto'` negotiates from the content type\n * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.\n */\nexport async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {\n  if (kind === 'void' || response.status === 204) return undefined;\n  if (kind === 'stream') return response.body;\n  if (kind === 'blob') return response.blob();\n  if (kind === 'arrayBuffer') return response.arrayBuffer();\n  if (kind === 'formData') return response.formData();\n  if (kind === 'text') return response.text();\n  if (kind === 'json') return response.json();\n  // 'auto' — negotiate from the response's content type (case-insensitively:\n  // `Text/Plain` and `application/JSON` are valid per RFC 9110).\n  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();\n  if (contentType.includes('json')) return response.json();\n  if (contentType.startsWith('text/')) return response.text();\n  return response.blob();\n}\n\n/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */\nexport async function readError(response: Response): Promise<unknown> {\n  const contentType = response.headers.get('content-type') ?? '';\n  if (contentType.toLowerCase().includes('json')) {\n    return response.json().catch(() => undefined);\n  }\n  return response.text().catch(() => undefined);\n}\n",
   'retry.ts':
     "import { abortError } from './errors.js';\nimport type { RetryConfig, RetryContext } from './types.js';\n\nconst IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);\nconst TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);\n\n/**\n * The default retry predicate: idempotent methods only, on a transport error or a\n * transient status. A custom `retryOn` fully replaces this (no method check kept).\n */\nexport function defaultRetryOn(ctx: RetryContext): boolean {\n  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;\n  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);\n}\n\n/**\n * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)\n * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter\n * unless `jitter === false`.\n */\nexport function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {\n  if (retryAfter) {\n    const seconds = Number(retryAfter);\n    if (!Number.isNaN(seconds)) return seconds * 1000;\n    const when = Date.parse(retryAfter);\n    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());\n  }\n  const base = retry.retryDelay ?? 1000;\n  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);\n  return retry.jitter === false ? raw : Math.random() * raw;\n}\n\n/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */\nexport function sleep(ms: number, signal?: AbortSignal): Promise<void> {\n  return new Promise((resolve, reject) => {\n    if (signal?.aborted) {\n      reject(abortError(signal));\n      return;\n    }\n    const onAbort = () => {\n      clearTimeout(timer);\n      reject(abortError(signal as AbortSignal));\n    };\n    const timer = setTimeout(() => {\n      if (signal) signal.removeEventListener('abort', onAbort);\n      resolve();\n    }, ms);\n    if (signal) signal.addEventListener('abort', onAbort, { once: true });\n  });\n}\n",
   'multipart.ts':
@@ -19,9 +19,9 @@ export const RUNTIME_SOURCES = {
   'send.ts':
     "import { abortError } from './errors.js';\nimport { defaultRetryOn, retryDelay, sleep } from './retry.js';\nimport type {\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  RequestContext,\n  RequestOptions,\n  RetryConfig,\n} from './types.js';\n\n/**\n * Optional behaviors the send core can use but never statically imports — wired by\n * `createClient` (the same seam the future inline-mode assembler relies on).\n */\nexport type SendCapabilities = {\n  /** Serialize a typed multipart body (a plain object) to FormData. */\n  serializeMultipart?: (body: Record<string, unknown>) => FormData;\n};\n\n/**\n * The effective middleware chain for a request: the single `onRequest`/`onResponse`/\n * `onError` config hooks as one implicit first middleware, then `config.middleware`.\n */\nexport function middlewareChain(config: ClientConfig): Middleware[] {\n  const single =\n    config.onRequest || config.onResponse || config.onError\n      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]\n      : [];\n  return [...single, ...(config.middleware ?? [])];\n}\n\n/**\n * The fetch core shared by every operation: default + config + per-call headers, the\n * `onRequest` chain (BEFORE body serialization, so mutations are sent), body\n * serialization (JSON, or FormData via the multipart capability), the retry loop\n * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse\n * `onResponse` onion. Returns the final response plus the request context.\n */\nexport async function send(\n  config: ClientConfig,\n  op: OperationContext,\n  url: string,\n  init: RequestOptions,\n  body: unknown | undefined,\n  multipart: boolean,\n  caps: SendCapabilities\n): Promise<{ response: Response; context: RequestContext }> {\n  const { retry: callRetry, ...fetchInit } = init;\n  const retry: RetryConfig = { ...config.retry, ...callRetry };\n  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;\n  const headers: Record<string, string> = {\n    Accept: 'application/json',\n    ...extra,\n    ...(fetchInit.headers as Record<string, string> | undefined),\n  };\n  const context: RequestContext = {\n    url,\n    method: fetchInit.method ?? 'GET',\n    headers,\n    body,\n    operation: op,\n  };\n  const middleware = middlewareChain(config);\n  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);\n  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.\n  let payload: BodyInit | undefined;\n  if (context.body !== undefined) {\n    const value = context.body;\n    const isBinary =\n      value instanceof Blob ||\n      value instanceof ArrayBuffer ||\n      ArrayBuffer.isView(value as ArrayBufferView);\n    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;\n    const isURLSearchParams = value instanceof URLSearchParams;\n    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {\n      payload = value as BodyInit;\n    } else if (multipart) {\n      if (!caps.serializeMultipart) {\n        throw new Error('Multipart capability not wired: cannot serialize the request body');\n      }\n      payload = caps.serializeMultipart(value as Record<string, unknown>);\n    } else {\n      payload = JSON.stringify(value);\n      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {\n        context.headers['Content-Type'] = 'application/json';\n      }\n    }\n  }\n  const doFetch = config.fetch ?? fetch;\n  const maxAttempts = 1 + (retry.retries ?? 0);\n  const retryOn = retry.retryOn ?? defaultRetryOn;\n  const signal = fetchInit.signal ?? undefined;\n\n  let attempt = 0;\n  while (true) {\n    attempt++;\n    if (signal?.aborted) throw abortError(signal);\n    let response: Response;\n    try {\n      response = await doFetch(context.url, {\n        ...fetchInit,\n        method: context.method,\n        headers: context.headers,\n        body: payload,\n      });\n    } catch (error) {\n      if (\n        attempt < maxAttempts &&\n        !signal?.aborted &&\n        (await retryOn({ attempt, request: context, error }))\n      ) {\n        await sleep(retryDelay(retry, attempt, null), signal);\n        continue;\n      }\n      throw error;\n    }\n    // Reverse order: the last-registered middleware wraps closest to the network (onion).\n    for (let i = middleware.length - 1; i >= 0; i--) {\n      const onResponse = middleware[i].onResponse;\n      if (onResponse) {\n        const replaced = await onResponse(response, context);\n        if (replaced) response = replaced;\n      }\n    }\n    if (\n      !response.ok &&\n      attempt < maxAttempts &&\n      !signal?.aborted &&\n      (await retryOn({ attempt, request: context, response }))\n    ) {\n      const retryAfter = response.headers.get('retry-after');\n      // Drain the abandoned response body before the next attempt: an unread body\n      // keeps the connection checked out (and can stall the pool) under Node/undici\n      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).\n      await response.body?.cancel().catch(() => undefined);\n      await sleep(retryDelay(retry, attempt, retryAfter), signal);\n      continue;\n    }\n    return { response, context };\n  }\n}\n",
   'sse.ts':
-    "import { ApiError } from './errors.js';\nimport { readError } from './parse.js';\nimport { sleep } from './retry.js';\nimport { send } from './send.js';\nimport type { ClientConfig, OperationContext, ServerSentEvent, SseOptions } from './types.js';\n\n/**\n * Consume a `text/event-stream` operation as typed events (capability module — wired\n * into `createClient`). Auto-reconnects on dropped connections, resuming from the last\n * seen event id via `Last-Event-ID` (backoff: the server's `retry:` value, then\n * `reconnectDelay`, then 1s — exponential with jitter, capped at 30s). A clean stream\n * end flushes a trailing frame and finishes; `break`/abort end the iterator cleanly.\n */\nexport async function* sse<T>(\n  config: ClientConfig,\n  op: OperationContext,\n  url: string,\n  init: SseOptions,\n  dataKind: 'json' | 'text' = 'text'\n): AsyncGenerator<ServerSentEvent<T>> {\n  const { reconnect = true, reconnectDelay, ...rest } = init;\n  const signal = rest.signal ?? undefined;\n  const headers: Record<string, string> = {\n    Accept: 'text/event-stream',\n    ...(rest.headers as Record<string, string> | undefined),\n  };\n  let lastEventId: string | undefined;\n  let serverRetry: number | undefined;\n  let failures = 0;\n  while (true) {\n    if (signal?.aborted) return;\n    const sendHeaders =\n      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };\n    try {\n      const { response } = await send(\n        config,\n        op,\n        url,\n        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },\n        undefined,\n        false,\n        {}\n      );\n      if (!response.ok) {\n        const errorBody = await readError(response);\n        throw new ApiError(url, response.status, response.statusText, errorBody);\n      }\n      failures = 0;\n      const body = response.body;\n      if (!body) return;\n      const reader = body.getReader();\n      const decoder = new TextDecoder();\n      let buffer = '';\n      try {\n        while (true) {\n          const { done, value } = await reader.read();\n          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });\n          let index: number;\n          while ((index = buffer.search(/\\r\\n\\r\\n|\\n\\n|\\r\\r/)) !== -1) {\n            const raw = buffer.slice(0, index);\n            buffer = buffer.slice(\n              index + buffer.slice(index).match(/^(\\r\\n\\r\\n|\\n\\n|\\r\\r)/)![0].length\n            );\n            const event = parseSseFrame(raw, dataKind);\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n          }\n          if (done) {\n            // Stream closed cleanly. Flush a final event that arrived without a trailing\n            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.\n            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n            return;\n          }\n          // Bound memory: a server that never sends a frame delimiter would otherwise\n          // grow `buffer` without limit. 1 MiB is far above any real SSE frame.\n          if (buffer.length > 1048576) {\n            throw new Error('SSE frame exceeded 1048576 characters without a delimiter');\n          }\n        }\n      } finally {\n        await reader.cancel().catch(() => undefined);\n      }\n    } catch (error) {\n      if (signal?.aborted) return;\n      // A non-OK HTTP response is a definitive error (4xx/5xx), not a transient drop —\n      // surface it instead of reconnecting in a loop.\n      if (error instanceof ApiError) throw error;\n      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream\n      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.\n      if (!reconnect) throw error;\n    }\n    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.\n    failures++;\n    const base = serverRetry ?? reconnectDelay ?? 1000;\n    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);\n    try {\n      await sleep(Math.random() * delay, signal);\n    } catch {\n      return; // sleep rejects only on abort — end the iterator cleanly\n    }\n  }\n}\n\n/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */\nexport function parseSseFrame(\n  raw: string,\n  dataKind: 'json' | 'text'\n): ServerSentEvent<unknown> | undefined {\n  let event: string | undefined;\n  const dataLines: string[] = [];\n  let id: string | undefined;\n  let retry: number | undefined;\n  let sawField = false;\n  for (const line of raw.split(/\\r\\n|\\n|\\r/)) {\n    if (line === '' || line.startsWith(':')) continue;\n    const colon = line.indexOf(':');\n    const field = colon === -1 ? line : line.slice(0, colon);\n    let val = colon === -1 ? '' : line.slice(colon + 1);\n    if (val.startsWith(' ')) val = val.slice(1);\n    sawField = true;\n    if (field === 'event') event = val;\n    else if (field === 'data') dataLines.push(val);\n    else if (field === 'id') id = val;\n    else if (field === 'retry') {\n      const n = Number(val);\n      if (!Number.isNaN(n)) retry = n;\n    }\n  }\n  if (!sawField) return undefined;\n  const dataText = dataLines.join('\\n');\n  const data = dataKind === 'json' && dataText !== '' ? JSON.parse(dataText) : dataText;\n  return { event, data, id, retry };\n}\n",
+    "import { ApiError } from './errors.js';\nimport { readError } from './parse.js';\nimport { sleep } from './retry.js';\nimport { send } from './send.js';\nimport type { ClientConfig, OperationContext, ServerSentEvent, SseOptions } from './types.js';\n\n/**\n * A frame delimiter: two consecutive line terminators (each CR, LF, or CRLF, per the SSE\n * spec — so mixed endings like `\\n\\r\\n` are valid boundaries, not just matching pairs).\n */\nconst FRAME_DELIMITER = /(?:\\r\\n|\\r|\\n){2}/;\n\n/** An event's JSON `data` failed to parse — a stable bad payload, not a dropped connection. */\nexport class SseParseError extends Error {}\n\n/**\n * Consume a `text/event-stream` operation as typed events (capability module — wired\n * into `createClient`). Auto-reconnects on dropped connections, resuming from the last\n * seen event id via `Last-Event-ID` (backoff: the server's `retry:` value, then\n * `reconnectDelay`, then 1s — exponential with jitter, capped at 30s). A clean stream\n * end flushes a trailing frame and finishes; `break`/abort end the iterator cleanly.\n */\nexport async function* sse<T>(\n  config: ClientConfig,\n  op: OperationContext,\n  url: string,\n  init: SseOptions,\n  dataKind: 'json' | 'text' = 'text'\n): AsyncGenerator<ServerSentEvent<T>> {\n  const { reconnect = true, reconnectDelay, ...rest } = init;\n  const signal = rest.signal ?? undefined;\n  const headers: Record<string, string> = {\n    Accept: 'text/event-stream',\n    ...(rest.headers as Record<string, string> | undefined),\n  };\n  let lastEventId: string | undefined;\n  let serverRetry: number | undefined;\n  let failures = 0;\n  while (true) {\n    if (signal?.aborted) return;\n    const sendHeaders =\n      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };\n    try {\n      const { response } = await send(\n        config,\n        op,\n        url,\n        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },\n        undefined,\n        false,\n        {}\n      );\n      if (!response.ok) {\n        const errorBody = await readError(response);\n        throw new ApiError(url, response.status, response.statusText, errorBody);\n      }\n      failures = 0;\n      const body = response.body;\n      if (!body) return;\n      const reader = body.getReader();\n      const decoder = new TextDecoder();\n      let buffer = '';\n      try {\n        while (true) {\n          const { done, value } = await reader.read();\n          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });\n          let match: RegExpMatchArray | null;\n          while ((match = buffer.match(FRAME_DELIMITER)) !== null) {\n            const index = match.index!;\n            const raw = buffer.slice(0, index);\n            buffer = buffer.slice(index + match[0].length);\n            const event = parseSseFrame(raw, dataKind);\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n          }\n          if (done) {\n            // Stream closed cleanly. Flush a final event that arrived without a trailing\n            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.\n            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n            return;\n          }\n          // Bound memory: a server that never sends a frame delimiter would otherwise\n          // grow `buffer` without limit. 1 MiB is far above any real SSE frame.\n          if (buffer.length > 1048576) {\n            throw new Error('SSE frame exceeded 1048576 characters without a delimiter');\n          }\n        }\n      } finally {\n        await reader.cancel().catch(() => undefined);\n      }\n    } catch (error) {\n      if (signal?.aborted) return;\n      // A non-OK HTTP response (4xx/5xx) or an unparseable JSON payload is a definitive\n      // error, not a transient drop — surface it instead of reconnecting in a loop (a\n      // stable bad payload would otherwise reconnect forever).\n      if (error instanceof ApiError || error instanceof SseParseError) throw error;\n      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream\n      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.\n      if (!reconnect) throw error;\n    }\n    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.\n    failures++;\n    const base = serverRetry ?? reconnectDelay ?? 1000;\n    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);\n    try {\n      await sleep(Math.random() * delay, signal);\n    } catch {\n      return; // sleep rejects only on abort — end the iterator cleanly\n    }\n  }\n}\n\n/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */\nexport function parseSseFrame(\n  raw: string,\n  dataKind: 'json' | 'text'\n): ServerSentEvent<unknown> | undefined {\n  let event: string | undefined;\n  const dataLines: string[] = [];\n  let id: string | undefined;\n  let retry: number | undefined;\n  let sawField = false;\n  for (const line of raw.split(/\\r\\n|\\n|\\r/)) {\n    if (line === '' || line.startsWith(':')) continue;\n    const colon = line.indexOf(':');\n    const field = colon === -1 ? line : line.slice(0, colon);\n    let val = colon === -1 ? '' : line.slice(colon + 1);\n    if (val.startsWith(' ')) val = val.slice(1);\n    sawField = true;\n    if (field === 'event') event = val;\n    else if (field === 'data') dataLines.push(val);\n    else if (field === 'id') id = val;\n    else if (field === 'retry') {\n      const n = Number(val);\n      if (!Number.isNaN(n)) retry = n;\n    }\n  }\n  if (!sawField) return undefined;\n  const dataText = dataLines.join('\\n');\n  let data: unknown = dataText;\n  if (dataKind === 'json' && dataText !== '') {\n    try {\n      data = JSON.parse(dataText);\n    } catch (error) {\n      throw new SseParseError(\n        `Failed to parse SSE event data as JSON: ${error instanceof Error ? error.message : String(error)}`\n      );\n    }\n  }\n  return { event, data, id, retry };\n}\n",
   'create-client.ts':
-    "import { ApiError } from './errors.js';\nimport { parse, readError } from './parse.js';\nimport { middlewareChain, send, type SendCapabilities } from './send.js';\nimport type {\n  ApiErrorLike,\n  Client,\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  OperationDescriptor,\n  OpsShape,\n  PaginationSpec,\n  ParseAs,\n  QueryValue,\n  RequestOptions,\n  SecuritySpec,\n  ServerSentEvent,\n  SseOptions,\n  TokenProvider,\n} from './types.js';\nimport { buildUrl, substitutePath, type QueryStyle } from './url.js';\n\n/**\n * The optional behaviors `createClientCore` can dispatch to but never statically\n * imports. The package's public `createClient` wires the full set; the future\n * inline-mode assembler wires only the capabilities a spec needs.\n */\nexport type Capabilities = SendCapabilities & {\n  resolveAuth?: (\n    security: readonly SecuritySpec[],\n    config: ClientConfig\n  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;\n  sse?: (\n    config: ClientConfig,\n    op: OperationContext,\n    url: string,\n    init: SseOptions,\n    dataKind: 'json' | 'text'\n  ) => AsyncGenerator<ServerSentEvent<unknown>>;\n  paginate?: {\n    pages: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n    items: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n  };\n};\n\n/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */\nexport type OperationArgs = {\n  params?: Record<string, QueryValue>;\n  body?: unknown;\n  headers?: Record<string, unknown>;\n} & Record<string, unknown>;\n\n/** The response reader implied by the descriptor (before any per-call `parseAs` override). */\nfunction kindFor(op: OperationDescriptor): ParseAs | 'void' {\n  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {\n    return op.responseKind;\n  }\n  return 'auto';\n}\n\n/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */\nfunction splitArgs(op: OperationDescriptor, args: OperationArgs) {\n  const path: Record<string, unknown> = {};\n  for (const param of op.params ?? []) {\n    if (param.in === 'path') path[param.name] = args[param.name];\n  }\n  return { path, query: args.params, body: args.body, headers: args.headers };\n}\n\n/**\n * The query-serialization hints for the descriptor's query params. A spec is built only\n * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),\n * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)\n * are honored, and an omitted `explode` keeps the exploded default.\n */\nfunction queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {\n  let styles: Record<string, QueryStyle> | undefined;\n  for (const param of op.params ?? []) {\n    if (param.in !== 'query') continue;\n    const deviates =\n      (param.style !== undefined && param.style !== 'form') ||\n      param.explode === false ||\n      param.allowReserved === true;\n    if (!deviates) continue;\n    styles ??= {};\n    styles[param.name] = {\n      style: param.style ?? 'form',\n      explode: param.explode ?? true,\n      allowReserved: param.allowReserved,\n    };\n  }\n  return styles;\n}\n\n/** Stringify caller-supplied extra headers, skipping empty entries. */\nfunction stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {\n  const out: Record<string, string> = {};\n  for (const [key, value] of Object.entries(headers ?? {})) {\n    if (value !== undefined && value !== null) out[key] = String(value);\n  }\n  return out;\n}\n\n/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */\nasync function prepareRequest(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions | SseOptions,\n  caps: Capabilities\n): Promise<{ url: string; init: RequestOptions; body: unknown }> {\n  const { path, query, body, headers } = splitArgs(op, args);\n  const authed =\n    op.security?.length && caps.resolveAuth\n      ? await caps.resolveAuth(op.security, config)\n      : { headers: {}, query: {} };\n  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };\n  const url = buildUrl(\n    config.serverUrl ?? '',\n    substitutePath(op.path, path),\n    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,\n    queryStyles(op)\n  );\n  const mergedInit: RequestOptions = {\n    ...init,\n    method: op.method.toUpperCase(),\n    // Precedence, lowest → highest (later spreads win): injected auth → explicit\n    // header params → caller `init.headers` — the caller always overrides both.\n    headers: {\n      ...authed.headers,\n      ...stringHeaders(headers),\n      ...(init.headers as Record<string, string> | undefined),\n    },\n  };\n  return { url, init: mergedInit, body };\n}\n\n/** One non-SSE call: send, then branch on the configured error mode. */\nasync function execute(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions,\n  caps: Capabilities\n): Promise<unknown> {\n  const prepared = await prepareRequest(config, op, args, init, caps);\n  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n  const { parseAs, ...sendInit } = prepared.init;\n  const { response, context } = await send(\n    config,\n    opCtx,\n    prepared.url,\n    sendInit,\n    prepared.body,\n    op.body?.multipart === true,\n    caps\n  );\n  const readKind = parseAs ?? kindFor(op);\n  if (config.errorMode === 'result') {\n    if (!response.ok) {\n      return { data: undefined, error: await readError(response), response };\n    }\n    return { data: await parse(response, readKind), error: undefined, response };\n  }\n  if (!response.ok) {\n    let error: globalThis.Error = new ApiError(\n      context.url,\n      response.status,\n      response.statusText,\n      await readError(response)\n    );\n    // Thread the error through each middleware's onError in turn (each may replace it).\n    for (const mw of middlewareChain(config)) {\n      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);\n    }\n    throw error;\n  }\n  return parse(response, readKind);\n}\n\n/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */\nfunction paginateCapability(caps: Capabilities, op: OperationDescriptor) {\n  if (!caps.paginate) {\n    throw new Error(`Pagination capability not wired: cannot iterate operation \"${op.id}\"`);\n  }\n  return caps.paginate;\n}\n\n/**\n * The per-page call the iterators drive: the method itself in throw mode; in result\n * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page\n * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is\n * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).\n */\nfunction pageCall(\n  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  config: ClientConfig\n) {\n  if (config.errorMode !== 'result') return method;\n  return async (args?: OperationArgs, init?: RequestOptions) => {\n    const envelope = (await method(args, init)) as {\n      data: unknown;\n      error: unknown;\n      response: Response;\n    };\n    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page\n    // (204/void) also parses to undefined data, and a failed page's `error` can be\n    // undefined too (unreadable body). The pointers then miss on the undefined data\n    // and iteration stops cleanly, which is the correct semantics for an empty page.\n    if (!envelope.response.ok) {\n      const { response } = envelope;\n      throw new ApiError(response.url, response.status, response.statusText, envelope.error);\n    }\n    return envelope.data;\n  };\n}\n\n/**\n * Build a typed instance client over operation descriptors: one real bound method per\n * operation (attached by a construction-time loop — no Proxy), plus the core members\n * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name\n * collision with an operation. All behavior dispatches through the capability seam.\n */\nexport function createClientCore<\n  Ops extends OpsShape,\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n>(\n  operations: Record<string, OperationDescriptor>,\n  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},\n  caps: Capabilities = {}\n): Client<Ops, OperationContext<Id, Path, Tag>> {\n  // The literal-union narrowing is a compile-time DX contract only; internally the\n  // runtime works with the base (string-typed) context. One cast at this boundary —\n  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx\n  // params are contravariant).\n  const given = initial as ClientConfig;\n  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.\n  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };\n  const client = {} as Record<string, unknown>;\n\n  for (const [name, op] of Object.entries(operations)) {\n    if (op.responseKind === 'sse') {\n      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {\n        if (!caps.sse) {\n          throw new Error(`SSE capability not wired: cannot stream operation \"${op.id}\"`);\n        }\n        const stream = caps.sse;\n        return (async function* () {\n          const prepared = await prepareRequest(config, op, args, init, caps);\n          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');\n        })();\n      };\n    } else {\n      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>\n        execute(config, op, args, init, caps);\n      const spec = op.pagination;\n      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching\n      // through the capability seam (like SSE: absent capability throws descriptively).\n      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on\n      // a result-mode client (`errorMode` is fixed at construction — `configure()`\n      // ignores it) each page's envelope is unwrapped before it reaches the capability.\n      // A failed page aborts iteration by throwing ApiError, even on result-mode\n      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.\n      client[name] = spec\n        ? Object.assign(method, {\n            pages: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),\n            items: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),\n          })\n        : method;\n    }\n  }\n\n  // Core members are assigned AFTER the operation loop — they win over colliding op names.\n  client.configure = (next: ClientConfig): void => {\n    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at\n    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.\n    const { errorMode: _fixed, ...rest } = next;\n    Object.assign(config, rest);\n  };\n  client.use = (...middleware: Middleware[]): void => {\n    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.\n    config.middleware = [...(config.middleware ?? []), ...middleware];\n  };\n  client.auth = {\n    bearer(token: TokenProvider): void {\n      config.auth = { ...config.auth, bearer: token };\n    },\n    basic(username: string, password: string): void {\n      config.auth = { ...config.auth, basic: { username, password } };\n    },\n    apiKey(scheme: string, value: TokenProvider): void {\n      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };\n    },\n  };\n\n  return client as Client<Ops, OperationContext<Id, Path, Tag>>;\n}\n",
+    "import { ApiError } from './errors.js';\nimport { parse, readError } from './parse.js';\nimport { middlewareChain, send, type SendCapabilities } from './send.js';\nimport type {\n  ApiErrorLike,\n  Client,\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  OperationDescriptor,\n  OpsShape,\n  PaginationSpec,\n  ParseAs,\n  QueryValue,\n  RequestOptions,\n  SecuritySpec,\n  ServerSentEvent,\n  SseOptions,\n  TokenProvider,\n} from './types.js';\nimport { buildUrl, substitutePath, type QueryStyle } from './url.js';\n\n/**\n * The optional behaviors `createClientCore` can dispatch to but never statically\n * imports. The package's public `createClient` wires the full set; the future\n * inline-mode assembler wires only the capabilities a spec needs.\n */\nexport type Capabilities = SendCapabilities & {\n  resolveAuth?: (\n    security: readonly SecuritySpec[],\n    config: ClientConfig\n  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;\n  sse?: (\n    config: ClientConfig,\n    op: OperationContext,\n    url: string,\n    init: SseOptions,\n    dataKind: 'json' | 'text'\n  ) => AsyncGenerator<ServerSentEvent<unknown>>;\n  paginate?: {\n    pages: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n    items: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n  };\n};\n\n/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */\nexport type OperationArgs = {\n  params?: Record<string, QueryValue>;\n  body?: unknown;\n  headers?: Record<string, unknown>;\n} & Record<string, unknown>;\n\n/** The response reader implied by the descriptor (before any per-call `parseAs` override). */\nfunction kindFor(op: OperationDescriptor): ParseAs | 'void' {\n  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {\n    return op.responseKind;\n  }\n  return 'auto';\n}\n\n/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */\nfunction splitArgs(op: OperationDescriptor, args: OperationArgs) {\n  const path: Record<string, unknown> = {};\n  for (const param of op.params ?? []) {\n    if (param.in === 'path') path[param.name] = args[param.name];\n  }\n  return { path, query: args.params, body: args.body, headers: args.headers };\n}\n\n/**\n * The query-serialization hints for the descriptor's query params. A spec is built only\n * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),\n * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)\n * are honored, and an omitted `explode` keeps the exploded default.\n */\nfunction queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {\n  let styles: Record<string, QueryStyle> | undefined;\n  for (const param of op.params ?? []) {\n    if (param.in !== 'query') continue;\n    const deviates =\n      (param.style !== undefined && param.style !== 'form') ||\n      param.explode === false ||\n      param.allowReserved === true;\n    if (!deviates) continue;\n    styles ??= {};\n    styles[param.name] = {\n      style: param.style ?? 'form',\n      explode: param.explode ?? true,\n      allowReserved: param.allowReserved,\n    };\n  }\n  return styles;\n}\n\n/** Stringify caller-supplied extra headers, skipping empty entries. */\nfunction stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {\n  const out: Record<string, string> = {};\n  for (const [key, value] of Object.entries(headers ?? {})) {\n    if (value !== undefined && value !== null) out[key] = String(value);\n  }\n  return out;\n}\n\n/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */\nasync function prepareRequest(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions | SseOptions,\n  caps: Capabilities\n): Promise<{ url: string; init: RequestOptions; body: unknown }> {\n  const { path, query, body, headers } = splitArgs(op, args);\n  const authed =\n    op.security?.length && caps.resolveAuth\n      ? await caps.resolveAuth(op.security, config)\n      : { headers: {}, query: {} };\n  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };\n  const url = buildUrl(\n    config.serverUrl ?? '',\n    substitutePath(op.path, path),\n    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,\n    queryStyles(op)\n  );\n  const mergedInit: RequestOptions = {\n    ...init,\n    method: op.method.toUpperCase(),\n    // Precedence, lowest → highest (later spreads win): injected auth → explicit\n    // header params → caller `init.headers` — the caller always overrides both.\n    headers: {\n      ...authed.headers,\n      ...stringHeaders(headers),\n      ...(init.headers as Record<string, string> | undefined),\n    },\n  };\n  return { url, init: mergedInit, body };\n}\n\n/** One non-SSE call: send, then branch on the configured error mode. */\nasync function execute(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions,\n  caps: Capabilities\n): Promise<unknown> {\n  const prepared = await prepareRequest(config, op, args, init, caps);\n  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n  const { parseAs, ...sendInit } = prepared.init;\n  const { response, context } = await send(\n    config,\n    opCtx,\n    prepared.url,\n    sendInit,\n    prepared.body,\n    op.body?.multipart === true,\n    caps\n  );\n  const readKind = parseAs ?? kindFor(op);\n  if (config.errorMode === 'result') {\n    if (!response.ok) {\n      return { data: undefined, error: await readError(response), response };\n    }\n    return { data: await parse(response, readKind), error: undefined, response };\n  }\n  if (!response.ok) {\n    let error: globalThis.Error = new ApiError(\n      context.url,\n      response.status,\n      response.statusText,\n      await readError(response)\n    );\n    // Thread the error through each middleware's onError in turn (each may replace it).\n    for (const mw of middlewareChain(config)) {\n      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);\n    }\n    throw error;\n  }\n  return parse(response, readKind);\n}\n\n/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */\nfunction paginateCapability(caps: Capabilities, op: OperationDescriptor) {\n  if (!caps.paginate) {\n    throw new Error(`Pagination capability not wired: cannot iterate operation \"${op.id}\"`);\n  }\n  return caps.paginate;\n}\n\n/**\n * The per-page call the iterators drive: the method itself in throw mode; in result\n * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page\n * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is\n * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).\n */\nfunction pageCall(\n  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  config: ClientConfig\n) {\n  if (config.errorMode !== 'result') return method;\n  return async (args?: OperationArgs, init?: RequestOptions) => {\n    const envelope = (await method(args, init)) as {\n      data: unknown;\n      error: unknown;\n      response: Response;\n    };\n    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page\n    // (204/void) also parses to undefined data, and a failed page's `error` can be\n    // undefined too (unreadable body). The pointers then miss on the undefined data\n    // and iteration stops cleanly, which is the correct semantics for an empty page.\n    if (!envelope.response.ok) {\n      const { response } = envelope;\n      throw new ApiError(response.url, response.status, response.statusText, envelope.error);\n    }\n    return envelope.data;\n  };\n}\n\n/**\n * Build a typed instance client over operation descriptors: one real bound method per\n * operation (attached by a construction-time loop — no Proxy), plus the core members\n * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name\n * collision with an operation. All behavior dispatches through the capability seam.\n */\nexport function createClientCore<\n  Ops extends OpsShape,\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n>(\n  operations: Record<string, OperationDescriptor>,\n  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},\n  caps: Capabilities = {}\n): Client<Ops, OperationContext<Id, Path, Tag>> {\n  // The literal-union narrowing is a compile-time DX contract only; internally the\n  // runtime works with the base (string-typed) context. One cast at this boundary —\n  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx\n  // params are contravariant).\n  const given = initial as ClientConfig;\n  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.\n  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };\n  const client = {} as Record<string, unknown>;\n\n  for (const [name, op] of Object.entries(operations)) {\n    if (op.responseKind === 'sse') {\n      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {\n        if (!caps.sse) {\n          throw new Error(`SSE capability not wired: cannot stream operation \"${op.id}\"`);\n        }\n        const stream = caps.sse;\n        return (async function* () {\n          const prepared = await prepareRequest(config, op, args, init, caps);\n          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');\n        })();\n      };\n    } else {\n      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>\n        execute(config, op, args, init, caps);\n      const spec = op.pagination;\n      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching\n      // through the capability seam (like SSE: absent capability throws descriptively).\n      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on\n      // a result-mode client (`errorMode` is fixed at construction — `configure()`\n      // ignores it) each page's envelope is unwrapped before it reaches the capability.\n      // A failed page aborts iteration by throwing ApiError, even on result-mode\n      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.\n      client[name] = spec\n        ? Object.assign(method, {\n            pages: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),\n            items: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),\n          })\n        : method;\n    }\n  }\n\n  // Core members are assigned AFTER the operation loop — they win over colliding op names.\n  client.configure = (next: ClientConfig): void => {\n    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at\n    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.\n    const { errorMode: _fixed, auth, ...rest } = next;\n    Object.assign(config, rest);\n    // `auth` merges into existing credentials (like the `auth.*` setters) rather than\n    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set\n    // basic/apiKey. `apiKey` merges per scheme.\n    if (auth) {\n      config.auth = {\n        ...config.auth,\n        ...auth,\n        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),\n      };\n    }\n  };\n  client.use = (...middleware: Middleware[]): void => {\n    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.\n    config.middleware = [...(config.middleware ?? []), ...middleware];\n  };\n  client.auth = {\n    bearer(token: TokenProvider): void {\n      config.auth = { ...config.auth, bearer: token };\n    },\n    basic(username: string, password: string): void {\n      config.auth = { ...config.auth, basic: { username, password } };\n    },\n    apiKey(scheme: string, value: TokenProvider): void {\n      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };\n    },\n  };\n\n  return client as Client<Ops, OperationContext<Id, Path, Tag>>;\n}\n",
   'paginate.ts':
     "import type { OperationArgs } from './create-client.js';\nimport type { PaginationSpec, QueryValue, RequestOptions } from './types.js';\n\n/**\n * Auto-pagination (capability module — wired into `createClient`, dispatched by the\n * method's `.pages()`/`.items()`): walk an operation's pages by advancing the descriptor's\n * `param` query parameter, per its `style`. The caller's args are never mutated — each\n * request gets a fresh `params` clone — and `init` is forwarded to every call.\n *\n * Iteration is error-mode-agnostic: `call` always resolves to the RAW page (on a\n * result-mode client the attachment unwraps the envelope first), so a failed page\n * aborts iteration by throwing `ApiError`, even on result-mode clients; the `onError`\n * middleware hook (throw-mode-only) is not invoked.\n */\n\n/**\n * Resolve an RFC 6901 JSON pointer (`~1` → `/`, `~0` → `~`) against a value.\n * The empty pointer is the whole document; anything else must start with `/`.\n * Returns `undefined` on any miss (bad token, absent key, non-object step) — never throws.\n */\nexport function resolvePointer(value: unknown, pointer: string): unknown {\n  if (pointer === '') return value;\n  if (!pointer.startsWith('/')) return undefined;\n  let current = value;\n  for (const token of pointer.slice(1).split('/')) {\n    const key = token.replaceAll('~1', '/').replaceAll('~0', '~');\n    if (Array.isArray(current)) {\n      if (!/^(0|[1-9]\\d*)$/.test(key)) return undefined;\n      current = current[Number(key)];\n    } else if (Object(current) === current && key in (current as object)) {\n      current = (current as Record<string, unknown>)[key];\n    } else {\n      return undefined;\n    }\n  }\n  return current;\n}\n\n/**\n * Iterate an operation's full page results. Every page is yielded before the stop\n * condition is evaluated, so the last page always arrives. Cursor style resumes from a\n * caller-provided `params[spec.param]`, stops when `nextCursor` resolves to\n * `undefined`/`null`/`''`, and throws if the next cursor is not a string or number, or\n * if the same cursor comes back twice in a row (infinite-loop guards). Offset/page\n * styles advance by item count / by one and stop when\n * the `items` pointer misses or the array is empty.\n */\nexport async function* pages<TPage>(\n  call: (args?: OperationArgs, init?: RequestOptions) => Promise<TPage>,\n  spec: PaginationSpec,\n  args: OperationArgs = {},\n  init?: RequestOptions\n): AsyncGenerator<TPage> {\n  if (spec.style === 'cursor') {\n    let cursor: unknown = args.params?.[spec.param];\n    while (true) {\n      const params = { ...args.params };\n      if (cursor !== undefined) params[spec.param] = cursor as QueryValue;\n      const page = await call({ ...args, params }, init);\n      yield page;\n      const next = resolvePointer(page, spec.nextCursor!);\n      if (next === undefined || next === null || next === '') return;\n      if (typeof next !== 'string' && typeof next !== 'number') {\n        // A fresh non-scalar cursor never compares equal, so without this guard a lying\n        // server would slip past the did-not-advance check into an infinite loop.\n        throw new Error(`Pagination cursor at ${spec.nextCursor} is not a string or number`);\n      }\n      if (next === cursor) {\n        throw new Error('Pagination did not advance: operation returned the same cursor twice');\n      }\n      cursor = next;\n    }\n  } else {\n    let position =\n      (args.params?.[spec.param] as number | undefined) ?? (spec.style === 'page' ? 1 : 0);\n    while (true) {\n      const page = await call(\n        { ...args, params: { ...args.params, [spec.param]: position } },\n        init\n      );\n      yield page;\n      const pageItems = resolvePointer(page, spec.items);\n      if (!Array.isArray(pageItems) || pageItems.length === 0) return;\n      position += spec.style === 'page' ? 1 : pageItems.length;\n    }\n  }\n}\n\n/**\n * Iterate the operation's individual items: each page's `items` pointer, flattened.\n * A cursor-style page whose pointer misses yields nothing but pagination continues;\n * for offset/page styles a miss has already stopped `pages`.\n */\nexport async function* items<TItem>(\n  call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  spec: PaginationSpec,\n  args?: OperationArgs,\n  init?: RequestOptions\n): AsyncGenerator<TItem> {\n  for await (const page of pages(call, spec, args, init)) {\n    const pageItems = resolvePointer(page, spec.items);\n    if (Array.isArray(pageItems)) yield* pageItems as TItem[];\n  }\n}\n",
 } as const;
diff --git a/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts b/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
index 3f9f1dc301..4e303e3ce3 100644
--- a/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
+++ b/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
@@ -1995,7 +1995,21 @@ describe('buildApiModel — security (C6.6)', () => {
     expect(model.services[0].operations[0].security).toEqual(['OAuth2']);
   });
 
-  it('dedupes scheme keys across OR-alternatives and drops non-injectable ones', () => {
+  it('applies the first OR-alternative, never a union across alternatives', () => {
+    const op = buildOpOnly(
+      withSchemes(
+        {
+          OAuth2: { type: 'oauth2', flows: {} },
+          ApiKey: { type: 'apiKey', in: 'header', name: 'X-API-Key' },
+        },
+        // "bearer OR apiKey": the first alternative wins, so both are never sent together.
+        [{ OAuth2: [] }, { ApiKey: [] }]
+      )
+    );
+    expect(op.security).toEqual(['OAuth2']);
+  });
+
+  it('skips an alternative with a non-injectable scheme and uses the next fully-injectable one', () => {
     const op = buildOpOnly(
       withSchemes(
         {
@@ -2003,7 +2017,9 @@ describe('buildApiModel — security (C6.6)', () => {
           ApiKey: { type: 'apiKey', in: 'header', name: 'X-API-Key' },
           NoScheme: { type: 'http' },
         },
-        [{ OAuth2: [] }, { OAuth2: [], ApiKey: [] }, { NoScheme: [] }]
+        // The first alternative needs a non-injectable scheme, so the client falls to the
+        // next alternative, whose schemes (AND — both required) are all injectable.
+        [{ NoScheme: [] }, { OAuth2: [], ApiKey: [] }]
       )
     );
     expect(op.security).toEqual(['OAuth2', 'ApiKey']);
diff --git a/packages/client-generator/src/intermediate-representation/build.ts b/packages/client-generator/src/intermediate-representation/build.ts
index ce5e9eefc3..d6dfd53a48 100644
--- a/packages/client-generator/src/intermediate-representation/build.ts
+++ b/packages/client-generator/src/intermediate-representation/build.ts
@@ -333,9 +333,13 @@ function buildSecuritySchemes(doc: Oas3Definition): SecuritySchemeModel[] {
 /**
  * Resolve the effective security for one operation into the set of scheme keys
  * the client should inject. The operation's own `security` overrides the
- * document default; `security: []` opts out entirely. We flatten across the
- * OR-alternatives (each requirement object) into a deduped union, then drop any
- * scheme the client can't inject so the emitter never references an unknown key.
+ * document default; `security: []` opts out entirely.
+ *
+ * Security is an OR of requirement objects, and the schemes *within* one object
+ * are all required together (AND). The client applies exactly ONE alternative —
+ * the first whose schemes are all injectable — so an operation that accepts, say,
+ * "bearer OR apiKey" never sends both credentials at once. When no alternative is
+ * fully injectable, no auth is applied.
  */
 function resolveOperationSecurity(
   operation: Oas3Operation,
@@ -347,17 +351,13 @@ function resolveOperationSecurity(
     (doc as { security?: SecurityRequirement[] }).security;
   if (!requirements) return [];
 
-  const keys: string[] = [];
-  const seen = new Set<string>();
   for (const requirement of requirements) {
-    for (const key of Object.keys(requirement)) {
-      if (injectable.has(key) && !seen.has(key)) {
-        seen.add(key);
-        keys.push(key);
-      }
+    const keys = Object.keys(requirement);
+    if (keys.every((key) => injectable.has(key))) {
+      return [...new Set(keys)];
     }
   }
-  return keys;
+  return [];
 }
 
 function buildNamedSchemas(doc: Oas3Definition): NamedSchemaModel[] {
diff --git a/packages/client-generator/src/runtime/__tests__/create-client.test.ts b/packages/client-generator/src/runtime/__tests__/create-client.test.ts
index e3c2dbafd7..992e805e3e 100644
--- a/packages/client-generator/src/runtime/__tests__/create-client.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/create-client.test.ts
@@ -215,6 +215,42 @@ describe('createClientCore', () => {
     expect((calls[2].init.headers as Record<string, string>).Authorization).toBeUndefined();
   });
 
+  it('configure({ auth }) merges into existing credentials instead of replacing them', async () => {
+    const seen: Array<Record<string, unknown>> = [];
+    const { fetchImpl } = spy([jsonOk('ok'), jsonOk('ok'), jsonOk('ok')]);
+    const client = createClientCore<Ops>(
+      OPS,
+      { fetch: fetchImpl, serverUrl: 'https://x' },
+      {
+        resolveAuth: async (_security, config) => {
+          seen.push({ ...(config.auth ?? {}) });
+          return { headers: {}, query: {} };
+        },
+      }
+    );
+    client.auth.basic('u', 'p');
+    client.auth.apiKey('k', 'v');
+    await client.secured({});
+
+    // Only `bearer` — basic/apiKey must survive (no `auth.apiKey`, so the apiKey slot is untouched).
+    client.configure({ auth: { bearer: 'B' } });
+    await client.secured({});
+    expect(seen[1]).toEqual({
+      basic: { username: 'u', password: 'p' },
+      apiKey: { k: 'v' },
+      bearer: 'B',
+    });
+
+    // A new apiKey scheme merges per key, keeping the earlier one.
+    client.configure({ auth: { apiKey: { k2: 'v2' } } });
+    await client.secured({});
+    expect(seen[2]).toEqual({
+      basic: { username: 'u', password: 'p' },
+      apiKey: { k: 'v', k2: 'v2' },
+      bearer: 'B',
+    });
+  });
+
   it('header precedence: caller init.headers beats header params, which beat injected auth', async () => {
     const { calls, fetchImpl } = spy([jsonOk('ok'), jsonOk({ id: '1' })]);
     const client = createClientCore<Ops>(
diff --git a/packages/client-generator/src/runtime/__tests__/parse.test.ts b/packages/client-generator/src/runtime/__tests__/parse.test.ts
index 73e42b6da8..cf3d555ae4 100644
--- a/packages/client-generator/src/runtime/__tests__/parse.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/parse.test.ts
@@ -42,6 +42,18 @@ describe('parse', () => {
     headerless.headers.delete('content-type');
     expect(await parse(headerless, 'auto')).toBeInstanceOf(Blob);
   });
+
+  it('auto matches content-type case-insensitively (Text/Plain, application/JSON)', async () => {
+    expect(
+      await parse(new Response('plain', { headers: { 'content-type': 'Text/Plain' } }), 'auto')
+    ).toBe('plain');
+    expect(
+      await parse(
+        new Response('{"a":1}', { headers: { 'content-type': 'application/JSON' } }),
+        'auto'
+      )
+    ).toEqual({ a: 1 });
+  });
 });
 
 describe('readError', () => {
diff --git a/packages/client-generator/src/runtime/__tests__/sse.test.ts b/packages/client-generator/src/runtime/__tests__/sse.test.ts
index 18c7d8ca37..d26b4d4748 100644
--- a/packages/client-generator/src/runtime/__tests__/sse.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/sse.test.ts
@@ -1,4 +1,4 @@
-import { parseSseFrame, sse } from '../sse.js';
+import { parseSseFrame, sse, SseParseError } from '../sse.js';
 
 const enc = new TextEncoder();
 function streamResponse(chunks: string[], opts: { status?: number } = {}) {
@@ -33,6 +33,12 @@ describe('parseSseFrame', () => {
     expect(parseSseFrame(': keepalive', 'text')).toBeUndefined();
     expect(parseSseFrame('foo: bar\ndata: x', 'text')?.data).toBe('x');
   });
+
+  it('throws SseParseError (not a generic error) when json data is malformed', () => {
+    expect(() => parseSseFrame('data: {not json', 'json')).toThrow(SseParseError);
+    // text dataKind never parses, so the same payload is returned verbatim.
+    expect(parseSseFrame('data: {not json', 'text')?.data).toBe('{not json');
+  });
 });
 
 describe('sse', () => {
@@ -62,6 +68,30 @@ describe('sse', () => {
     expect(seen).toEqual(['a', 'tail']);
   });
 
+  it('splits frames on mixed CR/LF double line endings, not just matching pairs', async () => {
+    // `\n\r\n` and `\r\n\r` are valid double-boundaries per the SSE spec.
+    const fetchImpl = (async () =>
+      streamResponse(['data: a\n\r\ndata: b\r\n\rdata: c\n\n'])) as unknown as typeof fetch;
+    const seen: unknown[] = [];
+    for await (const ev of sse({ fetch: fetchImpl }, op, 'u', { reconnect: false }, 'text')) {
+      seen.push(ev.data);
+    }
+    expect(seen).toEqual(['a', 'b', 'c']);
+  });
+
+  it('surfaces a malformed JSON payload as SseParseError and does NOT reconnect', async () => {
+    let calls = 0;
+    const fetchImpl = (async () => {
+      calls++;
+      return streamResponse(['data: {bad json\n\n']);
+    }) as unknown as typeof fetch;
+    await expect(async () => {
+      // `reconnect` defaults to true; a parse error must still surface, not loop forever.
+      for await (const _ of sse({ fetch: fetchImpl }, op, 'u', {}, 'json')) void _;
+    }).rejects.toBeInstanceOf(SseParseError);
+    expect(calls).toBe(1);
+  });
+
   it('reconnects after a drop, resuming with Last-Event-ID', async () => {
     const headersSeen: Array<Record<string, string>> = [];
     let call = 0;
diff --git a/packages/client-generator/src/runtime/create-client.ts b/packages/client-generator/src/runtime/create-client.ts
index edd4688f57..23710c53e6 100644
--- a/packages/client-generator/src/runtime/create-client.ts
+++ b/packages/client-generator/src/runtime/create-client.ts
@@ -289,8 +289,18 @@ export function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
diff --git a/packages/client-generator/src/runtime/parse.ts b/packages/client-generator/src/runtime/parse.ts
index cd3f686be3..31069ef21b 100644
--- a/packages/client-generator/src/runtime/parse.ts
+++ b/packages/client-generator/src/runtime/parse.ts
@@ -12,9 +12,10 @@ export async function parse(response: Response, kind: ParseAs | 'void'): Promise
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
diff --git a/packages/client-generator/src/runtime/sse.ts b/packages/client-generator/src/runtime/sse.ts
index f1a89af0f0..2629941fd6 100644
--- a/packages/client-generator/src/runtime/sse.ts
+++ b/packages/client-generator/src/runtime/sse.ts
@@ -4,6 +4,15 @@ import { sleep } from './retry.js';
 import { send } from './send.js';
 import type { ClientConfig, OperationContext, ServerSentEvent, SseOptions } from './types.js';
 
+/**
+ * A frame delimiter: two consecutive line terminators (each CR, LF, or CRLF, per the SSE
+ * spec — so mixed endings like `\n\r\n` are valid boundaries, not just matching pairs).
+ */
+const FRAME_DELIMITER = /(?:\r\n|\r|\n){2}/;
+
+/** An event's JSON `data` failed to parse — a stable bad payload, not a dropped connection. */
+export class SseParseError extends Error {}
+
 /**
  * Consume a `text/event-stream` operation as typed events (capability module — wired
  * into `createClient`). Auto-reconnects on dropped connections, resuming from the last
@@ -55,12 +64,11 @@ export async function* sse<T>(
         while (true) {
           const { done, value } = await reader.read();
           buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });
-          let index: number;
-          while ((index = buffer.search(/\r\n\r\n|\n\n|\r\r/)) !== -1) {
+          let match: RegExpMatchArray | null;
+          while ((match = buffer.match(FRAME_DELIMITER)) !== null) {
+            const index = match.index!;
             const raw = buffer.slice(0, index);
-            buffer = buffer.slice(
-              index + buffer.slice(index).match(/^(\r\n\r\n|\n\n|\r\r)/)![0].length
-            );
+            buffer = buffer.slice(index + match[0].length);
             const event = parseSseFrame(raw, dataKind);
             if (event) {
               if (event.id !== undefined) lastEventId = event.id;
@@ -90,9 +98,10 @@ export async function* sse<T>(
       }
     } catch (error) {
       if (signal?.aborted) return;
-      // A non-OK HTTP response is a definitive error (4xx/5xx), not a transient drop —
-      // surface it instead of reconnecting in a loop.
-      if (error instanceof ApiError) throw error;
+      // A non-OK HTTP response (4xx/5xx) or an unparseable JSON payload is a definitive
+      // error, not a transient drop — surface it instead of reconnecting in a loop (a
+      // stable bad payload would otherwise reconnect forever).
+      if (error instanceof ApiError || error instanceof SseParseError) throw error;
       // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream
       // read error, is a dropped connection: fall through to backoff/reconnect when enabled.
       if (!reconnect) throw error;
@@ -136,6 +145,15 @@ export function parseSseFrame(
   }
   if (!sawField) return undefined;
   const dataText = dataLines.join('\n');
-  const data = dataKind === 'json' && dataText !== '' ? JSON.parse(dataText) : dataText;
+  let data: unknown = dataText;
+  if (dataKind === 'json' && dataText !== '') {
+    try {
+      data = JSON.parse(dataText);
+    } catch (error) {
+      throw new SseParseError(
+        `Failed to parse SSE event data as JSON: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
   return { event, data, id, retry };
 }
diff --git a/packages/core/src/types/redocly-yaml.ts b/packages/core/src/types/redocly-yaml.ts
index 931b3b208a..340a89ae6c 100644
--- a/packages/core/src/types/redocly-yaml.ts
+++ b/packages/core/src/types/redocly-yaml.ts
@@ -308,7 +308,7 @@ const createConfigRoot = (nodeTypes: Record<string, NodeType>): NodeType => ({
     ...nodeTypes.rootRedoclyConfigSchema.properties,
     ...ConfigGovernance.properties,
     apis: 'ConfigApis', // Override apis with internal format
-    client: 'Client', // generate-client shared defaults
+    client: 'Client',
     telemetry: { enum: ['on', 'off'] },
     resolve: {
       properties: {
@@ -332,8 +332,8 @@ const createConfigApisProperties = (nodeTypes: Record<string, NodeType>): NodeTy
   properties: {
     ...nodeTypes['rootRedoclyConfigSchema.apis_additionalProperties']?.properties,
     ...omit(ConfigGovernance.properties, ['plugins']), // plugins are not allowed in apis
-    client: 'Client', // per-API generate-client overrides
-    clientOutput: { type: 'string' }, // per-API client output path
+    client: 'Client',
+    clientOutput: { type: 'string' },
   },
 });
 
diff --git a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
index b517db0107..4f48f9ca31 100644
--- a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
@@ -1198,9 +1198,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -1720,8 +1721,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
diff --git a/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts b/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
index 78b768f2f9..f3935777fe 100644
--- a/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
@@ -551,9 +551,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -1057,8 +1058,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
diff --git a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
index 9ce2f0d688..92bdee1410 100644
--- a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
@@ -1198,9 +1198,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -1704,8 +1705,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
diff --git a/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts b/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
index 997e9c962d..8e33ec9077 100644
--- a/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
@@ -457,9 +457,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -922,8 +923,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
diff --git a/tests/e2e/generate-client/examples/customization/src/api/client.ts b/tests/e2e/generate-client/examples/customization/src/api/client.ts
index 9ce2f0d688..92bdee1410 100644
--- a/tests/e2e/generate-client/examples/customization/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/customization/src/api/client.ts
@@ -1198,9 +1198,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -1704,8 +1705,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
diff --git a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
index 9ce2f0d688..92bdee1410 100644
--- a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
@@ -1198,9 +1198,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -1704,8 +1705,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
diff --git a/tests/e2e/generate-client/examples/mock/src/api/client.ts b/tests/e2e/generate-client/examples/mock/src/api/client.ts
index 9ce2f0d688..92bdee1410 100644
--- a/tests/e2e/generate-client/examples/mock/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/mock/src/api/client.ts
@@ -1198,9 +1198,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -1704,8 +1705,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
diff --git a/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts b/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
index fc5f99fded..a26b4f55b0 100644
--- a/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
@@ -464,9 +464,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -929,8 +930,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
diff --git a/tests/e2e/generate-client/examples/pagination/src/api/client.ts b/tests/e2e/generate-client/examples/pagination/src/api/client.ts
index 6ad08572cc..019ef00b2f 100644
--- a/tests/e2e/generate-client/examples/pagination/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/pagination/src/api/client.ts
@@ -473,9 +473,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -1040,8 +1041,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
diff --git a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
index 9ce2f0d688..92bdee1410 100644
--- a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
@@ -1198,9 +1198,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -1704,8 +1705,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
diff --git a/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts b/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
index 233675fbf4..c54feb4fb9 100644
--- a/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
@@ -454,9 +454,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -650,6 +651,15 @@ async function send(
   }
 }
 
+/**
+ * A frame delimiter: two consecutive line terminators (each CR, LF, or CRLF, per the SSE
+ * spec — so mixed endings like `\n\r\n` are valid boundaries, not just matching pairs).
+ */
+const FRAME_DELIMITER = /(?:\r\n|\r|\n){2}/;
+
+/** An event's JSON `data` failed to parse — a stable bad payload, not a dropped connection. */
+class SseParseError extends Error {}
+
 /**
  * Consume a `text/event-stream` operation as typed events (capability module — wired
  * into `createClient`). Auto-reconnects on dropped connections, resuming from the last
@@ -701,12 +711,11 @@ async function* sse<T>(
         while (true) {
           const { done, value } = await reader.read();
           buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });
-          let index: number;
-          while ((index = buffer.search(/\r\n\r\n|\n\n|\r\r/)) !== -1) {
+          let match: RegExpMatchArray | null;
+          while ((match = buffer.match(FRAME_DELIMITER)) !== null) {
+            const index = match.index!;
             const raw = buffer.slice(0, index);
-            buffer = buffer.slice(
-              index + buffer.slice(index).match(/^(\r\n\r\n|\n\n|\r\r)/)![0].length
-            );
+            buffer = buffer.slice(index + match[0].length);
             const event = parseSseFrame(raw, dataKind);
             if (event) {
               if (event.id !== undefined) lastEventId = event.id;
@@ -736,9 +745,10 @@ async function* sse<T>(
       }
     } catch (error) {
       if (signal?.aborted) return;
-      // A non-OK HTTP response is a definitive error (4xx/5xx), not a transient drop —
-      // surface it instead of reconnecting in a loop.
-      if (error instanceof ApiError) throw error;
+      // A non-OK HTTP response (4xx/5xx) or an unparseable JSON payload is a definitive
+      // error, not a transient drop — surface it instead of reconnecting in a loop (a
+      // stable bad payload would otherwise reconnect forever).
+      if (error instanceof ApiError || error instanceof SseParseError) throw error;
       // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream
       // read error, is a dropped connection: fall through to backoff/reconnect when enabled.
       if (!reconnect) throw error;
@@ -782,7 +792,16 @@ function parseSseFrame(
   }
   if (!sawField) return undefined;
   const dataText = dataLines.join('\n');
-  const data = dataKind === 'json' && dataText !== '' ? JSON.parse(dataText) : dataText;
+  let data: unknown = dataText;
+  if (dataKind === 'json' && dataText !== '') {
+    try {
+      data = JSON.parse(dataText);
+    } catch (error) {
+      throw new SseParseError(
+        `Failed to parse SSE event data as JSON: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
   return { event, data, id, retry };
 }
 
@@ -1055,8 +1074,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
diff --git a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
index 9ce2f0d688..92bdee1410 100644
--- a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
@@ -1198,9 +1198,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -1704,8 +1705,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
diff --git a/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts b/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
index 3b09c33cd2..dbb9d81ba4 100644
--- a/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
@@ -494,9 +494,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -959,8 +960,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
diff --git a/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts b/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
index e7111e7ffb..8045dd7b76 100644
--- a/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
@@ -533,9 +533,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -998,8 +999,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
diff --git a/tests/e2e/generate-client/examples/zod/src/api/client.ts b/tests/e2e/generate-client/examples/zod/src/api/client.ts
index 9ce2f0d688..92bdee1410 100644
--- a/tests/e2e/generate-client/examples/zod/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/zod/src/api/client.ts
@@ -1198,9 +1198,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -1704,8 +1705,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.

From f649e42c7e91c885c75253c4a2c71dc5317ffbd8 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Fri, 10 Jul 2026 13:05:05 +0300
Subject: [PATCH 086/134] feat(client-generator): repeatable --generator flag;
 resolve per-alias config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Replace the comma-separated `--generators` flag with an idiomatic repeatable
  array option — `--generator sdk --generator zod` (like `--skip-rule`), dropping
  the custom comma coerce. The `generators` config field is unchanged. Updated the
  compatibility-error hint, the e2e suites, and the docs.
- Resolve each api's config with `config.forAlias(alias)` before generating, so
  the OpenAPI input is bundled with that api's `extends` / `resolve` / decorators
  (matching `bundle`/`lint`). Previously the root config was always used, so
  per-API overrides never reached the generated client.
---
 .changeset/client-generator.md                |  2 +-
 docs/@v2/commands/generate-client.md          | 34 ++++++++--------
 docs/@v2/guides/use-generated-client.md       |  4 +-
 packages/cli/src/commands/generate-client.ts  | 29 +++++++++++---
 packages/cli/src/index.ts                     | 29 ++++++++------
 packages/client-generator/CONTEXT.md          |  4 +-
 .../client-generator/src/generators/index.ts  |  4 +-
 packages/client-generator/src/index.ts        |  2 +-
 .../generator-contract.test.ts                | 38 +++++++++++-------
 tests/e2e/generate-client/mock.test.ts        | 28 +++++++++++--
 tests/e2e/generate-client/plugin.test.ts      | 16 ++++++--
 .../generate-client/redocly-config.test.ts    | 40 +++++++++++++++++++
 tests/e2e/generate-client/swr.test.ts         |  6 ++-
 .../tanstack-query.runtime.test.ts            |  6 ++-
 .../generate-client/tanstack-query.test.ts    | 18 ++++++---
 .../e2e/generate-client/transformers.test.ts  |  5 ++-
 tests/e2e/generate-client/zod.test.ts         |  6 ++-
 17 files changed, 193 insertions(+), 78 deletions(-)

diff --git a/.changeset/client-generator.md b/.changeset/client-generator.md
index 265815fb8e..6c1e1e0a8e 100644
--- a/.changeset/client-generator.md
+++ b/.changeset/client-generator.md
@@ -14,4 +14,4 @@ See the [`generate-client` command reference](https://redocly.com/docs/cli/comma
 - Auth follows the spec's `securitySchemes` with per-instance credentials (`client.auth.{bearer,basic,apiKey}` / `ClientConfig.auth`) and generated `setBearer`/`setBasicAuth`/`setApiKey*` sugar bound to the default instance.
 - Auto-pagination, declared rather than guessed: a `client.pagination` block in `redocly.yaml` (a convention rule + per-operation overrides + `exclude`) or the spec's `x-pagination` operation extension gives paginated operations typed `.pages()`/`.items()` async iterators (`cursor`, `offset`, and `page` styles) next to the unchanged one-shot call, with item types resolved from the response schema at generate time. The convention applies only to operations it structurally fits (verified against declared query params and the success-response schema); an explicit rule that doesn't fit fails generation with a per-operation error. Works in both runtimes — inline output embeds the pagination module only when an operation paginates.
 - A `--setup` flag bakes a publisher-authored `defineClientSetup({ config, middleware })` module into the generated client (both runtimes and output modes), so a published SDK ships its request/response defaults built in — layered between the spec's defaults and the app's `configure()`. The package exports the runtime contract types + `defineClientSetup` from its main entry.
-- Companion generators from the same spec via `--generators`: `zod`, `tanstack-query` (React/Vue/Svelte/Solid), `swr`, `transformers`, `mock` (MSW, baked or faker), plus an experimental `defineGenerator` plugin API — each emits its own file and adds no dependency to the client.
+- Companion generators from the same spec via `--generator`: `zod`, `tanstack-query` (React/Vue/Svelte/Solid), `swr`, `transformers`, `mock` (MSW, baked or faker), plus an experimental `defineGenerator` plugin API — each emits its own file and adds no dependency to the client.
diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index 5f694877a9..9ef1953f63 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -30,23 +30,23 @@ With **no argument**, a client is generated for every api that declares a `clien
 
 ## Options
 
-| Option              | Type     | Description                                                                                                                                                                                                                       |
-| ------------------- | -------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `api`               | `string` | OpenAPI description file path, URL, or an `apis:` alias. Omit it to generate for every api that has a `client` block.                                                                                                             |
-| `--output`, `-o`    | `string` | Output path (must end in `.ts`); the entry file in multi-file modes. Defaults to the api's `clientOutput`, else `<name>.client.ts` in the config dir. Not allowed when generating for multiple apis.                              |
-| `--output-mode`     | `string` | File layout: `single` (default) or `split`. See [Output modes](#output-modes).                                                                                                                                                    |
-| `--runtime`         | `string` | `inline` (default, self-contained file — zero runtime dependencies) or `package` (imports the runtime from `@redocly/client-generator`; engine fixes arrive via `npm update`). See [Runtime distribution](#runtime-distribution). |
-| `--generators`      | `string` | Comma-separated generators to run (default `sdk`). See [Generators](../guides/use-generated-client.md#generators).                                                                                                                |
-| `--args-style`      | `string` | Operation inputs: `flat` (default, positional) or `grouped` (a single `vars` object). See [Argument style](../guides/use-generated-client.md#argument-style).                                                                     |
-| `--enum-style`      | `string` | Named string enums: `const-object` (default, `as const` object + union) or `union` (union only).                                                                                                                                  |
-| `--error-mode`      | `string` | `throw` (default, throws `ApiError`) or `result` (returns `{ data, error, response }`). See [Error handling](../guides/use-generated-client.md#error-handling).                                                                   |
-| `--date-type`       | `string` | `date`/`date-time` fields as `string` (default) or `Date` (pair with the `transformers` generator).                                                                                                                               |
-| `--query-framework` | `string` | TanStack Query adapter: `react` (default), `vue`, `svelte`, or `solid`.                                                                                                                                                           |
-| `--mock-data`       | `string` | `mock` generator data: `baked` (default, deterministic literals) or `faker` (`@faker-js/faker` calls).                                                                                                                            |
-| `--mock-seed`       | `number` | Seed for `faker`-mode mocks, for reproducible data. Ignored in `baked` mode.                                                                                                                                                      |
-| `--server-url`      | `string` | Override the server URL inlined into the runtime. Defaults to `servers[0].url`. Accepts absolute (`https://api.example.com`) or relative (`/v1`).                                                                                 |
-| `--setup`           | `string` | Path to a publisher setup module baked into the client. See [Publisher defaults](../guides/use-generated-client.md#publisher-defaults).                                                                                           |
-| `--config`          | `string` | Path to the `redocly.yaml` (the `client` config and `apis:` live there). Defaults to the one in the working directory.                                                                                                            |
+| Option              | Type       | Description                                                                                                                                                                                                                       |
+| ------------------- | ---------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `api`               | `string`   | OpenAPI description file path, URL, or an `apis:` alias. Omit it to generate for every api that has a `client` block.                                                                                                             |
+| `--output`, `-o`    | `string`   | Output path (must end in `.ts`); the entry file in multi-file modes. Defaults to the api's `clientOutput`, else `<name>.client.ts` in the config dir. Not allowed when generating for multiple apis.                              |
+| `--output-mode`     | `string`   | File layout: `single` (default) or `split`. See [Output modes](#output-modes).                                                                                                                                                    |
+| `--runtime`         | `string`   | `inline` (default, self-contained file — zero runtime dependencies) or `package` (imports the runtime from `@redocly/client-generator`; engine fixes arrive via `npm update`). See [Runtime distribution](#runtime-distribution). |
+| `--generator`       | `string[]` | Generator to run; repeat the flag to run several (default `sdk`). See [Generators](../guides/use-generated-client.md#generators).                                                                                                 |
+| `--args-style`      | `string`   | Operation inputs: `flat` (default, positional) or `grouped` (a single `vars` object). See [Argument style](../guides/use-generated-client.md#argument-style).                                                                     |
+| `--enum-style`      | `string`   | Named string enums: `const-object` (default, `as const` object + union) or `union` (union only).                                                                                                                                  |
+| `--error-mode`      | `string`   | `throw` (default, throws `ApiError`) or `result` (returns `{ data, error, response }`). See [Error handling](../guides/use-generated-client.md#error-handling).                                                                   |
+| `--date-type`       | `string`   | `date`/`date-time` fields as `string` (default) or `Date` (pair with the `transformers` generator).                                                                                                                               |
+| `--query-framework` | `string`   | TanStack Query adapter: `react` (default), `vue`, `svelte`, or `solid`.                                                                                                                                                           |
+| `--mock-data`       | `string`   | `mock` generator data: `baked` (default, deterministic literals) or `faker` (`@faker-js/faker` calls).                                                                                                                            |
+| `--mock-seed`       | `number`   | Seed for `faker`-mode mocks, for reproducible data. Ignored in `baked` mode.                                                                                                                                                      |
+| `--server-url`      | `string`   | Override the server URL inlined into the runtime. Defaults to `servers[0].url`. Accepts absolute (`https://api.example.com`) or relative (`/v1`).                                                                                 |
+| `--setup`           | `string`   | Path to a publisher setup module baked into the client. See [Publisher defaults](../guides/use-generated-client.md#publisher-defaults).                                                                                           |
+| `--config`          | `string`   | Path to the `redocly.yaml` (the `client` config and `apis:` live there). Defaults to the one in the working directory.                                                                                                            |
 
 ## Configuration
 
diff --git a/docs/@v2/guides/use-generated-client.md b/docs/@v2/guides/use-generated-client.md
index 20a24dbad9..ee9d98be36 100644
--- a/docs/@v2/guides/use-generated-client.md
+++ b/docs/@v2/guides/use-generated-client.md
@@ -4,7 +4,7 @@ How to consume the TypeScript client produced by [`generate-client`](../commands
 
 ## Generators
 
-`--generators` selects what to emit (default `sdk`). Each non-`sdk` generator adds a **standalone sibling module** next to the client; the client itself never imports it, so an add-on never adds a dependency to the client. Incompatible selections fail fast with an explanation.
+`--generator` selects what to emit (default `sdk`). Each non-`sdk` generator adds a **standalone sibling module** next to the client; the client itself never imports it, so an add-on never adds a dependency to the client. Incompatible selections fail fast with an explanation.
 
 | Generator        | Emits                                                                                     | App peer dependency                                      |
 | ---------------- | ----------------------------------------------------------------------------------------- | -------------------------------------------------------- |
@@ -16,7 +16,7 @@ How to consume the TypeScript client produced by [`generate-client`](../commands
 | `transformers`   | `<output>.transformers.ts` — `transform<Name>` functions that parse wire dates to `Date`. | none                                                     |
 
 ```sh
-redocly generate-client openapi.yaml --output src/client.ts --generators sdk,zod,mock
+redocly generate-client openapi.yaml --output src/client.ts --generator sdk --generator zod --generator mock
 ```
 
 `tanstack-query` and `swr` wrap the **throw-mode** `sdk` functions, so they require `--error-mode throw`. `transformers` requires `--date-type Date`. See the [`zod`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/zod), [`tanstack-query`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/tanstack-query), and [`mock`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/mock) examples.
diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index edce6a8ea5..6e623de437 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -20,16 +20,27 @@ export type GenerateClientCommandArgv = {
   'query-framework'?: 'react' | 'vue' | 'svelte' | 'solid';
   'mock-data'?: 'baked' | 'faker';
   'mock-seed'?: number;
-  // Built-in names, inline custom-generator names, or plugin import specifiers (path/package).
-  generators?: string[];
+  // Repeated `--generator` flags: built-in names, inline custom-generator names, or plugin
+  // import specifiers (path/package).
+  generator?: string[];
   // Path to a publisher setup module baked into the generated client.
   setup?: string;
 };
 
 type ClientConfig = Partial<OpenApiTsConfig>;
 
-/** A single client to generate: which API to read, where to write it, and its per-API `client` block. */
-type Job = { name: string; api: string; clientOutput?: string; perApiClient: ClientConfig };
+/**
+ * A single client to generate: which API to read, where to write it, its per-API `client`
+ * block, and — for a named `apis:` entry — its `alias` so the input is bundled with that
+ * api's resolved config (its `extends`/`resolve`/decorators), like `bundle`/`lint` do.
+ */
+type Job = {
+  name: string;
+  api: string;
+  alias?: string;
+  clientOutput?: string;
+  perApiClient: ClientConfig;
+};
 
 /** A URL-ish specifier (`https://…`, `file:…`, `javascript:…`) — two+ letter scheme, so Windows drive paths (`C:\\…`) don't match. */
 const URL_SCHEME = /^[a-z][a-z0-9+.-]+:/i;
@@ -96,7 +107,7 @@ export async function handleGenerateClient({
     queryFramework: argv['query-framework'],
     mockData: argv['mock-data'],
     mockSeed: argv['mock-seed'],
-    generators: argv.generators,
+    generators: argv.generator,
     setup: argv.setup === undefined ? undefined : resolvePath(argv.setup),
   };
 
@@ -104,6 +115,7 @@ export async function handleGenerateClient({
     const apiCfg = apisCfg[name];
     return {
       name,
+      alias: name,
       api: getAliasOrPath(config, name).path,
       clientOutput: apiCfg?.clientOutput,
       perApiClient: isPlainObject(apiCfg?.client)
@@ -169,6 +181,11 @@ export async function handleGenerateClient({
       );
     }
 
+    // Bundle the input with the api's resolved config (its `extends`/`resolve`/decorators),
+    // the same per-alias resolution `bundle`/`lint` use — so the generated client sees the
+    // same document. A plain file path (no alias) resolves the root config.
+    const aliasConfig = config.forAlias(job.alias);
+
     try {
       logger.info(
         gray(`\n  Generating TypeScript client${job.name ? ` for ${job.name}` : ''}... \n`)
@@ -177,7 +194,7 @@ export async function handleGenerateClient({
         ...merged,
         api: job.api,
         output: outputPath,
-        config,
+        config: aliasConfig,
         configDir,
       });
       const fileCount = `${result.files.length} ${pluralize('file', result.files.length)}`;
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index b8be3fb56a..89186e40ad 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -233,7 +233,12 @@ yargs(hideBin(process.argv))
             required: true,
             alias: 'p',
           },
-          domain: { description: 'Specify a domain.', alias: 'd', type: 'string', required: false },
+          domain: {
+            description: 'Specify a domain.',
+            alias: 'd',
+            type: 'string',
+            required: false,
+          },
           wait: {
             description: 'Wait for build to finish.',
             type: 'boolean',
@@ -334,7 +339,11 @@ yargs(hideBin(process.argv))
             description: 'Commit creation date.',
             type: 'string',
           },
-          domain: { description: 'Specify a domain.', alias: 'd', type: 'string' },
+          domain: {
+            description: 'Specify a domain.',
+            alias: 'd',
+            type: 'string',
+          },
           config: {
             description: 'Path to the config file.',
             requiresArg: true,
@@ -861,7 +870,7 @@ yargs(hideBin(process.argv))
   )
   .command(
     'generate-client [api]',
-    'Generate a TypeScript client from an OpenAPI description.',
+    'Generate a TypeScript client from an OpenAPI description [experimental].',
     (yargs) => {
       return yargs
         .env('REDOCLY_CLI_GENERATE_CLIENT')
@@ -942,18 +951,12 @@ yargs(hideBin(process.argv))
             type: 'number',
             requiresArg: true,
           },
-          generators: {
+          generator: {
             describe:
-              'Generators to run, comma-separated (default: sdk). Built-in names (sdk, zod, tanstack-query, swr, transformers, mock) or a custom-generator path/package specifier. Example: --generators sdk,zod or --generators sdk,./my-generator.ts',
+              'Generator to run; repeat the flag to run several (default: sdk). A built-in name (sdk, zod, tanstack-query, swr, transformers, mock) or a custom-generator path/package specifier. Example: --generator sdk --generator zod',
             type: 'string',
-            coerce: (value: string | undefined): string[] | undefined => {
-              if (value === undefined) return undefined;
-              const generators = value
-                .split(',')
-                .map((entry) => entry.trim())
-                .filter(Boolean);
-              return generators.length ? generators : undefined;
-            },
+            array: true,
+            requiresArg: true,
           },
           config: {
             describe: 'Path to the config file.',
diff --git a/packages/client-generator/CONTEXT.md b/packages/client-generator/CONTEXT.md
index 8abe258035..702d4501bd 100644
--- a/packages/client-generator/CONTEXT.md
+++ b/packages/client-generator/CONTEXT.md
@@ -61,7 +61,7 @@ The `sdk` generator is the typed client (it delegates to the output-mode **Write
 The `zod` generator emits a standalone `<stem>.zod.ts` **schema module** (one `export const <Name>Schema` per IR named schema) beside the client.
 The `tanstack-query` generator emits a TanStack Query v5 (React) module (`<stem>.tanstack.ts`) wrapping the sdk — per query op a `<op>QueryKey`/`<op>Options` (`queryOptions`) factory + query key, per mutation a `<op>Mutation` (`mutationKey`/`mutationFn`) factory (requires the `sdk` generator; the consumer installs `@tanstack/react-query`).
 The `transformers` generator emits a standalone `<stem>.transformers.ts` of `transform<Name>(data: <Name>): <Name>` functions — one per IR named schema that (recursively) carries a `date-time`/`date` field — that walk the value and rewrite wire ISO strings to `new Date(...)` in place, composing across refs (`transformPet` calls `transformOwner`); pair it with the **dateType** knob (`--date-type Date`) so the parsed value matches the type (it imports only the schema TYPES, so the client stays zero-dep).
-`generateClient` runs the configured generators (default `['sdk']`, selected via `--generators sdk,zod`) and merges their files.
+`generateClient` runs the configured generators (default `['sdk']`, selected via `--generator sdk --generator zod`) and merges their files.
 Custom generators are authored with `defineGenerator` and selected inline or by import specifier (the experimental **plugin** API, ADR-0012).
 _Avoid_: middleware (that's a runtime concept).
 
@@ -126,7 +126,7 @@ _Avoid_: throwOnError, errorHandling, result shape (in code identifiers).
 **dateType**:
 How `format: date-time`/`date` string fields are typed: `string` (default — byte-identical to the ISO wire shape) or `Date`.
 Selected by `--date-type`.
-Under `Date` the sdk emits `Date` for those scalar `string` schemas; the runtime conversion is opt-in and separate — pair it with the **`transformers` generator** (`--generators sdk,transformers`) so the parsed value matches the type.
+Under `Date` the sdk emits `Date` for those scalar `string` schemas; the runtime conversion is opt-in and separate — pair it with the **`transformers` generator** (`--generator sdk --generator transformers`) so the parsed value matches the type.
 `int64` → `bigint` is deferred to a follow-up.
 _Avoid_: dateMode, parseDates (in code identifiers).
 
diff --git a/packages/client-generator/src/generators/index.ts b/packages/client-generator/src/generators/index.ts
index 692037421c..051fed6e2a 100644
--- a/packages/client-generator/src/generators/index.ts
+++ b/packages/client-generator/src/generators/index.ts
@@ -70,9 +70,9 @@ export function validateGenerators(
     }
     for (const required of descriptor.requires ?? []) {
       if (!selected.has(required)) {
-        const fixed = [...new Set([required, ...names])].join(',');
+        const fixed = [...new Set([required, ...names])].map((g) => `--generator ${g}`).join(' ');
         throw new NotSupportedError(
-          `The "${name}" generator requires the "${required}" generator. Add it, e.g. --generators ${fixed}.`
+          `The "${name}" generator requires the "${required}" generator. Add it, e.g. ${fixed}.`
         );
       }
     }
diff --git a/packages/client-generator/src/index.ts b/packages/client-generator/src/index.ts
index 18b36202ca..4a4ea32814 100644
--- a/packages/client-generator/src/index.ts
+++ b/packages/client-generator/src/index.ts
@@ -140,7 +140,7 @@ export async function generateClient(
 
   // Resolve the selection into a registry: built-in names pass through, inline `customGenerators`
   // register, and any other entry is imported as a plugin specifier (path/package).
-  // An empty list (e.g. `generators: []` in config, or `--generators ,`) means
+  // An empty list (e.g. `generators: []` in config, or no `--generator` flags) means
   // "unspecified" — fall back to the default sdk client rather than emitting nothing.
   const requested = options.generators?.length ? options.generators : ['sdk'];
   const { selected, registry } = await resolveGenerators(requested, {
diff --git a/tests/e2e/generate-client/generator-contract.test.ts b/tests/e2e/generate-client/generator-contract.test.ts
index b1eb1ed4b7..eb17073793 100644
--- a/tests/e2e/generate-client/generator-contract.test.ts
+++ b/tests/e2e/generate-client/generator-contract.test.ts
@@ -1,4 +1,4 @@
-// The generator compatibility contract: an incompatible `--generators` selection must
+// The generator compatibility contract: an incompatible `--generator` selection must
 // fail fast with an actionable message (never emit a client that won't compile), and
 // `tanstack-query` must gracefully skip SSE operations (which the sdk doesn't export).
 import { spawnSync } from 'node:child_process';
@@ -29,12 +29,12 @@ describe('generate-client generator compatibility contract', () => {
       cafe,
       '--output',
       join(dir, 'c.ts'),
-      '--generators',
+      '--generator',
       'tanstack-query',
     ]);
     expect(status).not.toBe(0);
     expect(out).toMatch(/requires the "sdk" generator/);
-    expect(out).toMatch(/--generators sdk,tanstack-query/);
+    expect(out).toMatch(/--generator sdk --generator tanstack-query/);
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
@@ -44,8 +44,10 @@ describe('generate-client generator compatibility contract', () => {
       cafe,
       '--output',
       join(dir, 'c.ts'),
-      '--generators',
-      'sdk,tanstack-query',
+      '--generator',
+      'sdk',
+      '--generator',
+      'tanstack-query',
       '--error-mode',
       'result',
     ]);
@@ -60,20 +62,22 @@ describe('generate-client generator compatibility contract', () => {
       cafe,
       '--output',
       join(dir, 'c.ts'),
-      '--generators',
-      'sdk,transformers',
+      '--generator',
+      'sdk',
+      '--generator',
+      'transformers',
     ]);
     expect(status).not.toBe(0);
     expect(out).toMatch(/requires --date-type Date/);
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
-  it('treats an empty --generators value as unset, defaulting to the sdk client', () => {
+  it('defaults to the sdk client when no --generator is passed', () => {
     const dir = mkdtempSync(join(tmpdir(), 'ots-contract-'));
     const outFile = join(dir, 'c.ts');
-    // `--generators ,` coerces to an empty list; it must fall back to the default sdk
-    // generator and emit a client, not silently report success with no output.
-    const { status, out } = run([cafe, '--output', outFile, '--generators', ',']);
+    // With no `--generator` flag the selection is unset, so it falls back to the default
+    // sdk generator and emits a client rather than silently producing nothing.
+    const { status, out } = run([cafe, '--output', outFile]);
     expect(status, out).toBe(0);
     expect(existsSync(outFile)).toBe(true);
     expect(readFileSync(outFile, 'utf-8')).toContain('export const client = createClient<Ops,');
@@ -86,8 +90,10 @@ describe('generate-client generator compatibility contract', () => {
       sse,
       '--output',
       join(dir, 'c.ts'),
-      '--generators',
-      'sdk,tanstack-query',
+      '--generator',
+      'sdk',
+      '--generator',
+      'tanstack-query',
     ]);
     expect(status, out).toBe(0);
     expect(out).toMatch(/tanstack-query skipped \d+ server-sent-events operation/);
@@ -127,8 +133,10 @@ describe('generate-client generator compatibility contract', () => {
       join(dir, 'api.yaml'),
       '--output',
       join(dir, 'c.ts'),
-      '--generators',
-      'sdk,tanstack-query',
+      '--generator',
+      'sdk',
+      '--generator',
+      'tanstack-query',
     ]);
     expect(status, out).toBe(0);
     expect(out).toMatch(
diff --git a/tests/e2e/generate-client/mock.test.ts b/tests/e2e/generate-client/mock.test.ts
index e111aa9d30..03e56a769d 100644
--- a/tests/e2e/generate-client/mock.test.ts
+++ b/tests/e2e/generate-client/mock.test.ts
@@ -56,7 +56,7 @@ describe('mock generator — generated client through MSW', () => {
     // relative to the importing file, so the temp dir must live inside the repo
     // tree to walk up to the root node_modules — `os.tmpdir()` would not resolve it.
     dir = mkdtempSync(join(__dirname, 'mock-consumer-'));
-    generate(dir, ['--generators', 'sdk,mock']);
+    generate(dir, ['--generator', 'sdk', '--generator', 'mock']);
   }, 60_000);
   afterAll(() => {
     if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
@@ -128,7 +128,20 @@ describe('mock generator — mock + transformers + --date-type Date compile toge
     dir = mkdtempSync(join(__dirname, 'mock-date-'));
     // transformers REQUIRES --date-type Date; the sdk then types date fields `Date`,
     // so the mock sampler must bake `new Date(...)` to type-check (BUG 1 regression).
-    generate(dir, ['--generators', 'sdk,mock,transformers', '--date-type', 'Date'], dateFixture);
+    generate(
+      dir,
+      [
+        '--generator',
+        'sdk',
+        '--generator',
+        'mock',
+        '--generator',
+        'transformers',
+        '--date-type',
+        'Date',
+      ],
+      dateFixture
+    );
   }, 60_000);
   afterAll(() => {
     if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
@@ -166,7 +179,16 @@ describe('mock generator — faker mode strict-tsc-checks against real @faker-js
   let dir = '';
   beforeAll(() => {
     dir = mkdtempSync(join(__dirname, 'mock-faker-'));
-    generate(dir, ['--generators', 'sdk,mock', '--mock-data', 'faker', '--mock-seed', '42']);
+    generate(dir, [
+      '--generator',
+      'sdk',
+      '--generator',
+      'mock',
+      '--mock-data',
+      'faker',
+      '--mock-seed',
+      '42',
+    ]);
   }, 60_000);
   afterAll(() => {
     if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
diff --git a/tests/e2e/generate-client/plugin.test.ts b/tests/e2e/generate-client/plugin.test.ts
index 82c10b24e3..3d73a816de 100644
--- a/tests/e2e/generate-client/plugin.test.ts
+++ b/tests/e2e/generate-client/plugin.test.ts
@@ -24,7 +24,15 @@ describe('generate-client custom generator (plugin) API', () => {
   it('loads a generator from a path specifier and runs it alongside the sdk', () => {
     const dir = mkdtempSync(join(tmpdir(), 'ots-plugin-'));
     const output = join(dir, 'client.ts');
-    const { status, out } = run([cafe, '--output', output, '--generators', `sdk,${plugin}`]);
+    const { status, out } = run([
+      cafe,
+      '--output',
+      output,
+      '--generator',
+      'sdk',
+      '--generator',
+      plugin,
+    ]);
 
     expect(status, out).toBe(0);
     expect(existsSync(output)).toBe(true);
@@ -43,8 +51,10 @@ describe('generate-client custom generator (plugin) API', () => {
       cafe,
       '--output',
       join(dir, 'client.ts'),
-      '--generators',
-      `sdk,${join(dir, 'missing-plugin.mjs')}`,
+      '--generator',
+      'sdk',
+      '--generator',
+      join(dir, 'missing-plugin.mjs'),
     ]);
     expect(status).not.toBe(0);
     expect(out).toMatch(/Could not load generator/);
diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
index a9a3b5cc9d..56b46955a1 100644
--- a/tests/e2e/generate-client/redocly-config.test.ts
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -392,4 +392,44 @@ describe('generate-client redocly.yaml config', () => {
     expect(existsSync(join(dir, 'out/client.ts'))).toBe(true);
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
+
+  it("applies the api's per-alias decorators to the input before generating", () => {
+    // The client is generated from the api's resolved config (like `bundle`/`lint`), so a
+    // per-api `remove-x-internal` decorator strips the x-internal operation before the IR
+    // is built — the generated client must not contain it.
+    const dir = mkdtempSync(join(tmpdir(), 'ots-redocly-decorators-'));
+    writeFileSync(
+      join(dir, 'openapi.yaml'),
+      [
+        'openapi: 3.1.0',
+        'info: { title: T, version: 1.0.0 }',
+        'paths:',
+        '  /public:',
+        '    get: { operationId: getPublic, responses: { 200: { description: ok } } }',
+        '  /secret:',
+        '    get: { operationId: getSecret, x-internal: true, responses: { 200: { description: ok } } }',
+      ].join('\n') + '\n',
+      'utf-8'
+    );
+    writeFileSync(
+      join(dir, 'redocly.yaml'),
+      [
+        'apis:',
+        '  main:',
+        '    root: ./openapi.yaml',
+        '    clientOutput: ./client.ts',
+        '    decorators:',
+        '      remove-x-internal: on',
+        '    client:',
+        '      generators: [sdk]',
+      ].join('\n') + '\n',
+      'utf-8'
+    );
+    const res = run(dir, ['main']);
+    expect(res.status, res.stderr).toBe(0);
+    const client = readFileSync(join(dir, 'client.ts'), 'utf-8');
+    expect(client).toContain('getPublic');
+    expect(client).not.toContain('getSecret');
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
 });
diff --git a/tests/e2e/generate-client/swr.test.ts b/tests/e2e/generate-client/swr.test.ts
index ec152198ee..1b1c9ff0ef 100644
--- a/tests/e2e/generate-client/swr.test.ts
+++ b/tests/e2e/generate-client/swr.test.ts
@@ -27,8 +27,10 @@ describe('generate-client swr generator', () => {
         join(__dirname, 'fixtures', 'base.yaml'),
         '--output',
         out,
-        '--generators',
-        'sdk,swr',
+        '--generator',
+        'sdk',
+        '--generator',
+        'swr',
       ],
       { encoding: 'utf-8', cwd: repoRoot }
     );
diff --git a/tests/e2e/generate-client/tanstack-query.runtime.test.ts b/tests/e2e/generate-client/tanstack-query.runtime.test.ts
index f5c9aed7b2..94d43a630e 100644
--- a/tests/e2e/generate-client/tanstack-query.runtime.test.ts
+++ b/tests/e2e/generate-client/tanstack-query.runtime.test.ts
@@ -55,8 +55,10 @@ describe('generate-client tanstack-query runtime (React hooks, jsdom)', () => {
         join(__dirname, 'fixtures', 'base.yaml'),
         '--output',
         sdkFile,
-        '--generators',
-        'sdk,tanstack-query',
+        '--generator',
+        'sdk',
+        '--generator',
+        'tanstack-query',
       ],
       { encoding: 'utf-8', cwd: repoRoot }
     );
diff --git a/tests/e2e/generate-client/tanstack-query.test.ts b/tests/e2e/generate-client/tanstack-query.test.ts
index 569e9fafea..f953145e24 100644
--- a/tests/e2e/generate-client/tanstack-query.test.ts
+++ b/tests/e2e/generate-client/tanstack-query.test.ts
@@ -30,8 +30,10 @@ describe('generate-client tanstack-query generator', () => {
         join(__dirname, 'fixtures', 'base.yaml'),
         '--output',
         out,
-        '--generators',
-        'sdk,tanstack-query',
+        '--generator',
+        'sdk',
+        '--generator',
+        'tanstack-query',
       ],
       { encoding: 'utf-8', cwd: repoRoot }
     );
@@ -115,8 +117,10 @@ describe('generate-client tanstack-query generator', () => {
         out,
         '--runtime',
         'package',
-        '--generators',
-        'sdk,tanstack-query',
+        '--generator',
+        'sdk',
+        '--generator',
+        'tanstack-query',
         '--query-framework',
         'react',
       ],
@@ -198,8 +202,10 @@ describe('generate-client tanstack-query generator', () => {
         join(__dirname, 'fixtures', 'base.yaml'),
         '--output',
         out,
-        '--generators',
-        'sdk,tanstack-query',
+        '--generator',
+        'sdk',
+        '--generator',
+        'tanstack-query',
         '--query-framework',
         'vue',
       ],
diff --git a/tests/e2e/generate-client/transformers.test.ts b/tests/e2e/generate-client/transformers.test.ts
index 80bba07fe8..fa1ffb9831 100644
--- a/tests/e2e/generate-client/transformers.test.ts
+++ b/tests/e2e/generate-client/transformers.test.ts
@@ -33,9 +33,12 @@ const fixture = join(__dirname, 'fixtures', 'transformers.yaml');
 const consumerDir = join(__dirname, 'transformers-consumer');
 
 function generate(out: string, args: string[]): void {
+  // args[0] is a comma-separated generator list; the rest are extra flags.
+  const [generators, ...rest] = args;
+  const generatorFlags = generators.split(',').flatMap((g) => ['--generator', g]);
   const res = spawnSync(
     'node',
-    [cli, 'generate-client', fixture, '--output', out, '--generators', ...args],
+    [cli, 'generate-client', fixture, '--output', out, ...generatorFlags, ...rest],
     { encoding: 'utf-8', cwd: repoRoot }
   );
   expect(res.status, res.stderr).toBe(0);
diff --git a/tests/e2e/generate-client/zod.test.ts b/tests/e2e/generate-client/zod.test.ts
index e8f8b9d7fd..3736c12c4a 100644
--- a/tests/e2e/generate-client/zod.test.ts
+++ b/tests/e2e/generate-client/zod.test.ts
@@ -26,8 +26,10 @@ describe('generate-client zod generator', () => {
         join(__dirname, 'fixtures', 'cafe.yaml'),
         '--output',
         out,
-        '--generators',
-        'sdk,zod',
+        '--generator',
+        'sdk',
+        '--generator',
+        'zod',
       ],
       { encoding: 'utf-8', cwd: repoRoot }
     );

From 47a44fe091662343e1347bb7ab79e7a9b3f51eed Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Fri, 10 Jul 2026 13:54:24 +0300
Subject: [PATCH 087/134] fix(client-generator): update stale golden +
 assertions for the review-comment changes

- Update the two validateGenerators unit assertions to the repeatable `--generator`
  hint (missed in the flag rename).
- Regenerate the cafe e2e snapshot for the runtime changes (case-insensitive
  content-type, configure() auth merge).
- Fix a lingering `--generators` reference in the --date-type help text and ARCHITECTURE.md.
---
 packages/cli/src/index.ts                     |  2 +-
 packages/client-generator/ARCHITECTURE.md     |  2 +-
 .../src/generators/__tests__/index.test.ts    |  4 ++--
 tests/e2e/generate-client/cafe.snapshot.ts    | 19 +++++++++++++++----
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index 89186e40ad..ec31eea51d 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -929,7 +929,7 @@ yargs(hideBin(process.argv))
           },
           'date-type': {
             describe:
-              "How `date-time`/`date` string fields are typed: 'string' (default) keeps the ISO wire shape; 'Date' emits a `Date` (pair with --generators transformers so the runtime value matches).",
+              "How `date-time`/`date` string fields are typed: 'string' (default) keeps the ISO wire shape; 'Date' emits a `Date` (pair with --generator transformers so the runtime value matches).",
             choices: ['string', 'Date'] as const,
             requiresArg: true,
           },
diff --git a/packages/client-generator/ARCHITECTURE.md b/packages/client-generator/ARCHITECTURE.md
index 6b1e8d3a53..91b20cb844 100644
--- a/packages/client-generator/ARCHITECTURE.md
+++ b/packages/client-generator/ARCHITECTURE.md
@@ -105,7 +105,7 @@ Three orthogonal knobs combine freely:
 Plus **enum style** (`--enum-style`: `union` · `const-object`), **error mode** (`--error-mode`: `throw` · `result`), **date type** (`--date-type`: `string` · `Date`), and the `--server-url` / `--setup` modifiers.
 Every client exports **both call styles** — the instance and the free functions; args style only shapes the free-function sugar.
 
-Orthogonally, **`--generators`** selects which generators run (default `sdk`; plus `zod`, `tanstack-query`, `swr`, `transformers`, `mock`, and custom plugins), with per-generator knobs: `--query-framework` (`react` · `vue` · `svelte` · `solid`, for `tanstack-query`) and `--mock-data` (`baked` · `faker`) / `--mock-seed` (for `mock`).
+Orthogonally, **`--generator`** selects which generators run (default `sdk`; plus `zod`, `tanstack-query`, `swr`, `transformers`, `mock`, and custom plugins), with per-generator knobs: `--query-framework` (`react` · `vue` · `svelte` · `solid`, for `tanstack-query`) and `--mock-data` (`baked` · `faker`) / `--mock-seed` (for `mock`).
 
 ## Test architeture
 
diff --git a/packages/client-generator/src/generators/__tests__/index.test.ts b/packages/client-generator/src/generators/__tests__/index.test.ts
index 303ddc0cf4..3ff51839df 100644
--- a/packages/client-generator/src/generators/__tests__/index.test.ts
+++ b/packages/client-generator/src/generators/__tests__/index.test.ts
@@ -32,7 +32,7 @@ describe('validateGenerators', () => {
 
   it('rejects tanstack-query without sdk, naming the fix', () => {
     expect(() => validateGenerators(['tanstack-query'], {})).toThrow(
-      /requires the "sdk" generator.*--generators sdk,tanstack-query/
+      /requires the "sdk" generator.*--generator sdk --generator tanstack-query/
     );
   });
 
@@ -70,7 +70,7 @@ describe('swr generator', () => {
 
   it('rejects swr without sdk, naming the fix', () => {
     expect(() => validateGenerators(['swr'], {})).toThrow(
-      /requires the "sdk" generator.*--generators sdk,swr/
+      /requires the "sdk" generator.*--generator sdk --generator swr/
     );
   });
 
diff --git a/tests/e2e/generate-client/cafe.snapshot.ts b/tests/e2e/generate-client/cafe.snapshot.ts
index 9ce2f0d688..92bdee1410 100644
--- a/tests/e2e/generate-client/cafe.snapshot.ts
+++ b/tests/e2e/generate-client/cafe.snapshot.ts
@@ -1198,9 +1198,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -1704,8 +1705,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.

From 4f9bde47bddfdb178c1823a45b437f59c04427da Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Fri, 10 Jul 2026 13:58:17 +0300
Subject: [PATCH 088/134] test(client-generator): regenerate inline consumer
 fixtures for the runtime changes

The base/cafe/pagination/sse consumer clients embed the inline runtime, so refresh
them for the SSE, content-type, and configure()-auth fixes. (The package-runtime and
tanstack consumers import the runtime, so they're unaffected.)
---
 .../e2e/generate-client/base-consumer/api.ts  | 19 +++++--
 .../e2e/generate-client/cafe-consumer/api.ts  | 19 +++++--
 .../pagination-consumer/api-offset.ts         | 19 +++++--
 .../pagination-consumer/api.ts                | 19 +++++--
 tests/e2e/generate-client/sse-consumer/api.ts | 55 ++++++++++++++-----
 5 files changed, 102 insertions(+), 29 deletions(-)

diff --git a/tests/e2e/generate-client/base-consumer/api.ts b/tests/e2e/generate-client/base-consumer/api.ts
index 5158b49386..0eb0650dde 100644
--- a/tests/e2e/generate-client/base-consumer/api.ts
+++ b/tests/e2e/generate-client/base-consumer/api.ts
@@ -606,9 +606,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -1071,8 +1072,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
diff --git a/tests/e2e/generate-client/cafe-consumer/api.ts b/tests/e2e/generate-client/cafe-consumer/api.ts
index 35944c50a5..fdf648d5ad 100644
--- a/tests/e2e/generate-client/cafe-consumer/api.ts
+++ b/tests/e2e/generate-client/cafe-consumer/api.ts
@@ -1198,9 +1198,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -1704,8 +1705,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
diff --git a/tests/e2e/generate-client/pagination-consumer/api-offset.ts b/tests/e2e/generate-client/pagination-consumer/api-offset.ts
index 1f8799082e..8d685bd137 100644
--- a/tests/e2e/generate-client/pagination-consumer/api-offset.ts
+++ b/tests/e2e/generate-client/pagination-consumer/api-offset.ts
@@ -504,9 +504,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -1071,8 +1072,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
diff --git a/tests/e2e/generate-client/pagination-consumer/api.ts b/tests/e2e/generate-client/pagination-consumer/api.ts
index bdc34dc1f2..0b0563388d 100644
--- a/tests/e2e/generate-client/pagination-consumer/api.ts
+++ b/tests/e2e/generate-client/pagination-consumer/api.ts
@@ -503,9 +503,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -1070,8 +1071,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
diff --git a/tests/e2e/generate-client/sse-consumer/api.ts b/tests/e2e/generate-client/sse-consumer/api.ts
index 5fda1f0d55..2f093d71aa 100644
--- a/tests/e2e/generate-client/sse-consumer/api.ts
+++ b/tests/e2e/generate-client/sse-consumer/api.ts
@@ -460,9 +460,10 @@ async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknow
   if (kind === 'formData') return response.formData();
   if (kind === 'text') return response.text();
   if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type.
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) return response.json();
+  // 'auto' — negotiate from the response's content type (case-insensitively:
+  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
+  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
+  if (contentType.includes('json')) return response.json();
   if (contentType.startsWith('text/')) return response.text();
   return response.blob();
 }
@@ -656,6 +657,15 @@ async function send(
   }
 }
 
+/**
+ * A frame delimiter: two consecutive line terminators (each CR, LF, or CRLF, per the SSE
+ * spec — so mixed endings like `\n\r\n` are valid boundaries, not just matching pairs).
+ */
+const FRAME_DELIMITER = /(?:\r\n|\r|\n){2}/;
+
+/** An event's JSON `data` failed to parse — a stable bad payload, not a dropped connection. */
+class SseParseError extends Error {}
+
 /**
  * Consume a `text/event-stream` operation as typed events (capability module — wired
  * into `createClient`). Auto-reconnects on dropped connections, resuming from the last
@@ -707,12 +717,11 @@ async function* sse<T>(
         while (true) {
           const { done, value } = await reader.read();
           buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });
-          let index: number;
-          while ((index = buffer.search(/\r\n\r\n|\n\n|\r\r/)) !== -1) {
+          let match: RegExpMatchArray | null;
+          while ((match = buffer.match(FRAME_DELIMITER)) !== null) {
+            const index = match.index!;
             const raw = buffer.slice(0, index);
-            buffer = buffer.slice(
-              index + buffer.slice(index).match(/^(\r\n\r\n|\n\n|\r\r)/)![0].length
-            );
+            buffer = buffer.slice(index + match[0].length);
             const event = parseSseFrame(raw, dataKind);
             if (event) {
               if (event.id !== undefined) lastEventId = event.id;
@@ -742,9 +751,10 @@ async function* sse<T>(
       }
     } catch (error) {
       if (signal?.aborted) return;
-      // A non-OK HTTP response is a definitive error (4xx/5xx), not a transient drop —
-      // surface it instead of reconnecting in a loop.
-      if (error instanceof ApiError) throw error;
+      // A non-OK HTTP response (4xx/5xx) or an unparseable JSON payload is a definitive
+      // error, not a transient drop — surface it instead of reconnecting in a loop (a
+      // stable bad payload would otherwise reconnect forever).
+      if (error instanceof ApiError || error instanceof SseParseError) throw error;
       // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream
       // read error, is a dropped connection: fall through to backoff/reconnect when enabled.
       if (!reconnect) throw error;
@@ -788,7 +798,16 @@ function parseSseFrame(
   }
   if (!sawField) return undefined;
   const dataText = dataLines.join('\n');
-  const data = dataKind === 'json' && dataText !== '' ? JSON.parse(dataText) : dataText;
+  let data: unknown = dataText;
+  if (dataKind === 'json' && dataText !== '') {
+    try {
+      data = JSON.parse(dataText);
+    } catch (error) {
+      throw new SseParseError(
+        `Failed to parse SSE event data as JSON: ${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
   return { event, data, id, retry };
 }
 
@@ -1061,8 +1080,18 @@ function createClientCore<
   client.configure = (next: ClientConfig): void => {
     // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
     // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, ...rest } = next;
+    const { errorMode: _fixed, auth, ...rest } = next;
     Object.assign(config, rest);
+    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
+    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
+    // basic/apiKey. `apiKey` merges per scheme.
+    if (auth) {
+      config.auth = {
+        ...config.auth,
+        ...auth,
+        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
+      };
+    }
   };
   client.use = (...middleware: Middleware[]): void => {
     // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.

From 698d123c1c14b7232e883232085cf46464bb3db7 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Fri, 10 Jul 2026 16:04:49 +0300
Subject: [PATCH 089/134] fix(client-generator): encode cookie auth, coerce
 string pagination offset, refresh SSE auth on reconnect

---
 .../__snapshots__/package-client.test.ts.snap | 62 +++++++++-----
 .../src/emitters/runtime-sources.ts           |  8 +-
 .../src/runtime/__tests__/auth.test.ts        |  7 ++
 .../runtime/__tests__/create-client.test.ts   |  4 +-
 .../src/runtime/__tests__/paginate.test.ts    | 15 ++++
 .../src/runtime/__tests__/sse.test.ts         | 83 +++++++++++++++----
 packages/client-generator/src/runtime/auth.ts |  4 +-
 .../src/runtime/create-client.ts              | 14 +++-
 .../client-generator/src/runtime/paginate.ts  |  7 +-
 packages/client-generator/src/runtime/sse.ts  | 19 +++--
 tests/e2e/generate-client/auth.test.ts        |  4 +-
 .../e2e/generate-client/base-consumer/api.ts  | 14 +++-
 .../e2e/generate-client/cafe-consumer/api.ts  | 18 ++--
 tests/e2e/generate-client/cafe.snapshot.ts    | 18 ++--
 .../examples/baked-setup/src/api/client.ts    | 18 ++--
 .../src/api/client.ts                         | 18 ++--
 .../custom-generator/src/api/client.ts        | 18 ++--
 .../custom-pagination/src/api/client.ts       | 14 +++-
 .../examples/customization/src/api/client.ts  | 18 ++--
 .../fetch-functions/src/api/client.ts         | 18 ++--
 .../examples/mock/src/api/client.ts           | 18 ++--
 .../examples/nested-facade/src/api/client.ts  | 14 +++-
 .../examples/pagination/src/api/client.ts     | 21 +++--
 .../examples/programmatic/src/api/client.ts   | 18 ++--
 .../examples/sse-streaming/src/api/client.ts  | 33 +++++---
 .../examples/tanstack-query/src/api/client.ts | 18 ++--
 .../examples/vendored-edge/src/api/client.ts  | 14 +++-
 .../zero-install-quickstart/src/api/client.ts | 14 +++-
 .../examples/zod/src/api/client.ts            | 18 ++--
 .../pagination-consumer/api-offset.ts         | 21 +++--
 .../pagination-consumer/api.ts                | 21 +++--
 tests/e2e/generate-client/sse-consumer/api.ts | 33 +++++---
 32 files changed, 448 insertions(+), 176 deletions(-)

diff --git a/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap b/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
index 2b61a71590..3a9b6ba89a 100644
--- a/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
+++ b/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
@@ -555,7 +555,9 @@ async function resolveAuth(
       const value = await resolveToken(provider);
       if (scheme.in === 'header') headers[scheme.name] = value;
       else if (scheme.in === 'query') query[scheme.name] = value;
-      else cookies.push(\`\${scheme.name}=\${value}\`);
+      // Cookie values may contain reserved characters (\`;\`, \`=\`, space, …); percent-encode
+      // so the credential can't break the \`Cookie\` header syntax.
+      else cookies.push(\`\${scheme.name}=\${encodeURIComponent(value)}\`);
     } else if (scheme.kind === 'bearer') {
       const provider = config.auth?.bearer;
       if (provider !== undefined) headers.Authorization = \`Bearer \${await resolveToken(provider)}\`;
@@ -721,21 +723,24 @@ class SseParseError extends Error {}
 async function* sse<T>(
   config: ClientConfig,
   op: OperationContext,
-  url: string,
-  init: SseOptions,
+  prepare: () => Promise<{ url: string; init: SseOptions }>,
   dataKind: 'json' | 'text' = 'text'
 ): AsyncGenerator<ServerSentEvent<T>> {
-  const { reconnect = true, reconnectDelay, ...rest } = init;
-  const signal = rest.signal ?? undefined;
-  const headers: Record<string, string> = {
-    Accept: 'text/event-stream',
-    ...(rest.headers as Record<string, string> | undefined),
-  };
   let lastEventId: string | undefined;
   let serverRetry: number | undefined;
   let failures = 0;
   while (true) {
+    // Re-prepare each attempt so a refresh-style TokenProvider yields a fresh credential
+    // on reconnect (the auth is baked into \`url\` query + \`init.headers\`). \`reconnect\`,
+    // \`reconnectDelay\`, and \`signal\` come from the caller's original options unchanged.
+    const { url, init } = await prepare();
+    const { reconnect = true, reconnectDelay, ...rest } = init;
+    const signal = rest.signal ?? undefined;
     if (signal?.aborted) return;
+    const headers: Record<string, string> = {
+      Accept: 'text/event-stream',
+      ...(rest.headers as Record<string, string> | undefined),
+    };
     const sendHeaders =
       lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
     try {
@@ -869,8 +874,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -1094,9 +1100,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which \`prepareRequest\`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
@@ -1839,7 +1850,9 @@ async function resolveAuth(
       const value = await resolveToken(provider);
       if (scheme.in === 'header') headers[scheme.name] = value;
       else if (scheme.in === 'query') query[scheme.name] = value;
-      else cookies.push(\`\${scheme.name}=\${value}\`);
+      // Cookie values may contain reserved characters (\`;\`, \`=\`, space, …); percent-encode
+      // so the credential can't break the \`Cookie\` header syntax.
+      else cookies.push(\`\${scheme.name}=\${encodeURIComponent(value)}\`);
     } else if (scheme.kind === 'bearer') {
       const provider = config.auth?.bearer;
       if (provider !== undefined) headers.Authorization = \`Bearer \${await resolveToken(provider)}\`;
@@ -1924,8 +1937,11 @@ async function* pages<TPage>(
       cursor = next;
     }
   } else {
-    let position =
-      (args.params?.[spec.param] as number | undefined) ?? (spec.style === 'page' ? 1 : 0);
+    // Coerce the starting position to a number: a caller may pass \`params[spec.param]\` as a
+    // string (common from URL/form input), and \`+=\` on a string would concatenate.
+    const start = args.params?.[spec.param];
+    const fallback = spec.style === 'page' ? 1 : 0;
+    let position = start === undefined || Number.isNaN(Number(start)) ? fallback : Number(start);
     while (true) {
       const page = await call(
         { ...args, params: { ...args.params, [spec.param]: position } },
@@ -2101,8 +2117,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -2326,9 +2343,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which \`prepareRequest\`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/packages/client-generator/src/emitters/runtime-sources.ts b/packages/client-generator/src/emitters/runtime-sources.ts
index a1f2b82f82..ff0fc5aca7 100644
--- a/packages/client-generator/src/emitters/runtime-sources.ts
+++ b/packages/client-generator/src/emitters/runtime-sources.ts
@@ -13,17 +13,17 @@ export const RUNTIME_SOURCES = {
   'multipart.ts':
     "/**\n * Serialize a plain object into `FormData` for a typed `multipart/form-data` body\n * (capability module — wired into `createClient`, never imported by the send core).\n * `Blob`/`File` and strings pass through; `Date`s become ISO strings; arrays append\n * one field per item; other objects are JSON-encoded; everything else is stringified.\n * `undefined`/`null` entries are skipped.\n */\nexport function toFormData(body: Record<string, unknown>): FormData {\n  const fd = new FormData();\n  const append = (key: string, value: unknown): void => {\n    if (value === undefined || value === null) return;\n    if (value instanceof Blob || typeof value === 'string') fd.append(key, value);\n    else if (value instanceof Date) fd.append(key, value.toISOString());\n    else if (Object(value) === value) fd.append(key, JSON.stringify(value));\n    else fd.append(key, String(value));\n  };\n  for (const [key, value] of Object.entries(body)) {\n    if (Array.isArray(value)) for (const item of value) append(key, item);\n    else append(key, value);\n  }\n  return fd;\n}\n",
   'auth.ts':
-    "import type { ClientConfig, SecuritySpec, TokenProvider } from './types.js';\n\n/** Resolve a credential: a literal passes through; a function is awaited per request. */\nasync function resolveToken(provider: TokenProvider): Promise<string> {\n  return typeof provider === 'function' ? await provider() : provider;\n}\n\n/**\n * Build the auth headers/query for one operation's `security` requirements from the\n * instance credentials (`config.auth`) — capability module, wired into `createClient`.\n * A scheme with no configured credential contributes nothing (the request is sent\n * unauthenticated and the server rejects it, mirroring the generated-client behavior).\n * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.\n */\nexport async function resolveAuth(\n  security: readonly SecuritySpec[],\n  config: ClientConfig\n): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {\n  const headers: Record<string, string> = {};\n  const query: Record<string, string> = {};\n  const cookies: string[] = [];\n  for (const scheme of security) {\n    if (scheme.kind === 'apiKey') {\n      const provider = config.auth?.apiKey?.[scheme.scheme];\n      if (provider === undefined) continue;\n      const value = await resolveToken(provider);\n      if (scheme.in === 'header') headers[scheme.name] = value;\n      else if (scheme.in === 'query') query[scheme.name] = value;\n      else cookies.push(`${scheme.name}=${value}`);\n    } else if (scheme.kind === 'bearer') {\n      const provider = config.auth?.bearer;\n      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;\n    } else {\n      const basic = config.auth?.basic;\n      if (basic !== undefined) {\n        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;\n      }\n    }\n  }\n  if (cookies.length > 0) headers.Cookie = cookies.join('; ');\n  return { headers, query };\n}\n",
+    "import type { ClientConfig, SecuritySpec, TokenProvider } from './types.js';\n\n/** Resolve a credential: a literal passes through; a function is awaited per request. */\nasync function resolveToken(provider: TokenProvider): Promise<string> {\n  return typeof provider === 'function' ? await provider() : provider;\n}\n\n/**\n * Build the auth headers/query for one operation's `security` requirements from the\n * instance credentials (`config.auth`) — capability module, wired into `createClient`.\n * A scheme with no configured credential contributes nothing (the request is sent\n * unauthenticated and the server rejects it, mirroring the generated-client behavior).\n * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.\n */\nexport async function resolveAuth(\n  security: readonly SecuritySpec[],\n  config: ClientConfig\n): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {\n  const headers: Record<string, string> = {};\n  const query: Record<string, string> = {};\n  const cookies: string[] = [];\n  for (const scheme of security) {\n    if (scheme.kind === 'apiKey') {\n      const provider = config.auth?.apiKey?.[scheme.scheme];\n      if (provider === undefined) continue;\n      const value = await resolveToken(provider);\n      if (scheme.in === 'header') headers[scheme.name] = value;\n      else if (scheme.in === 'query') query[scheme.name] = value;\n      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode\n      // so the credential can't break the `Cookie` header syntax.\n      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);\n    } else if (scheme.kind === 'bearer') {\n      const provider = config.auth?.bearer;\n      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;\n    } else {\n      const basic = config.auth?.basic;\n      if (basic !== undefined) {\n        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;\n      }\n    }\n  }\n  if (cookies.length > 0) headers.Cookie = cookies.join('; ');\n  return { headers, query };\n}\n",
   'setup.ts':
     "import type { ClientConfig, Middleware } from './types.js';\n\n/**\n * Merge a publisher's baked setup (`defineClientSetup({...})`) with the app's config:\n * app config fields win per-field over baked defaults, while middleware composes —\n * baked middleware runs first, then the app's.\n */\nexport function mergeSetup(\n  setup: { config?: ClientConfig; middleware?: Middleware[] } | undefined,\n  config: ClientConfig = {}\n): ClientConfig {\n  return {\n    ...setup?.config,\n    ...config,\n    middleware: [...(setup?.middleware ?? []), ...(config.middleware ?? [])],\n  };\n}\n",
   'send.ts':
     "import { abortError } from './errors.js';\nimport { defaultRetryOn, retryDelay, sleep } from './retry.js';\nimport type {\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  RequestContext,\n  RequestOptions,\n  RetryConfig,\n} from './types.js';\n\n/**\n * Optional behaviors the send core can use but never statically imports — wired by\n * `createClient` (the same seam the future inline-mode assembler relies on).\n */\nexport type SendCapabilities = {\n  /** Serialize a typed multipart body (a plain object) to FormData. */\n  serializeMultipart?: (body: Record<string, unknown>) => FormData;\n};\n\n/**\n * The effective middleware chain for a request: the single `onRequest`/`onResponse`/\n * `onError` config hooks as one implicit first middleware, then `config.middleware`.\n */\nexport function middlewareChain(config: ClientConfig): Middleware[] {\n  const single =\n    config.onRequest || config.onResponse || config.onError\n      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]\n      : [];\n  return [...single, ...(config.middleware ?? [])];\n}\n\n/**\n * The fetch core shared by every operation: default + config + per-call headers, the\n * `onRequest` chain (BEFORE body serialization, so mutations are sent), body\n * serialization (JSON, or FormData via the multipart capability), the retry loop\n * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse\n * `onResponse` onion. Returns the final response plus the request context.\n */\nexport async function send(\n  config: ClientConfig,\n  op: OperationContext,\n  url: string,\n  init: RequestOptions,\n  body: unknown | undefined,\n  multipart: boolean,\n  caps: SendCapabilities\n): Promise<{ response: Response; context: RequestContext }> {\n  const { retry: callRetry, ...fetchInit } = init;\n  const retry: RetryConfig = { ...config.retry, ...callRetry };\n  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;\n  const headers: Record<string, string> = {\n    Accept: 'application/json',\n    ...extra,\n    ...(fetchInit.headers as Record<string, string> | undefined),\n  };\n  const context: RequestContext = {\n    url,\n    method: fetchInit.method ?? 'GET',\n    headers,\n    body,\n    operation: op,\n  };\n  const middleware = middlewareChain(config);\n  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);\n  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.\n  let payload: BodyInit | undefined;\n  if (context.body !== undefined) {\n    const value = context.body;\n    const isBinary =\n      value instanceof Blob ||\n      value instanceof ArrayBuffer ||\n      ArrayBuffer.isView(value as ArrayBufferView);\n    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;\n    const isURLSearchParams = value instanceof URLSearchParams;\n    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {\n      payload = value as BodyInit;\n    } else if (multipart) {\n      if (!caps.serializeMultipart) {\n        throw new Error('Multipart capability not wired: cannot serialize the request body');\n      }\n      payload = caps.serializeMultipart(value as Record<string, unknown>);\n    } else {\n      payload = JSON.stringify(value);\n      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {\n        context.headers['Content-Type'] = 'application/json';\n      }\n    }\n  }\n  const doFetch = config.fetch ?? fetch;\n  const maxAttempts = 1 + (retry.retries ?? 0);\n  const retryOn = retry.retryOn ?? defaultRetryOn;\n  const signal = fetchInit.signal ?? undefined;\n\n  let attempt = 0;\n  while (true) {\n    attempt++;\n    if (signal?.aborted) throw abortError(signal);\n    let response: Response;\n    try {\n      response = await doFetch(context.url, {\n        ...fetchInit,\n        method: context.method,\n        headers: context.headers,\n        body: payload,\n      });\n    } catch (error) {\n      if (\n        attempt < maxAttempts &&\n        !signal?.aborted &&\n        (await retryOn({ attempt, request: context, error }))\n      ) {\n        await sleep(retryDelay(retry, attempt, null), signal);\n        continue;\n      }\n      throw error;\n    }\n    // Reverse order: the last-registered middleware wraps closest to the network (onion).\n    for (let i = middleware.length - 1; i >= 0; i--) {\n      const onResponse = middleware[i].onResponse;\n      if (onResponse) {\n        const replaced = await onResponse(response, context);\n        if (replaced) response = replaced;\n      }\n    }\n    if (\n      !response.ok &&\n      attempt < maxAttempts &&\n      !signal?.aborted &&\n      (await retryOn({ attempt, request: context, response }))\n    ) {\n      const retryAfter = response.headers.get('retry-after');\n      // Drain the abandoned response body before the next attempt: an unread body\n      // keeps the connection checked out (and can stall the pool) under Node/undici\n      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).\n      await response.body?.cancel().catch(() => undefined);\n      await sleep(retryDelay(retry, attempt, retryAfter), signal);\n      continue;\n    }\n    return { response, context };\n  }\n}\n",
   'sse.ts':
-    "import { ApiError } from './errors.js';\nimport { readError } from './parse.js';\nimport { sleep } from './retry.js';\nimport { send } from './send.js';\nimport type { ClientConfig, OperationContext, ServerSentEvent, SseOptions } from './types.js';\n\n/**\n * A frame delimiter: two consecutive line terminators (each CR, LF, or CRLF, per the SSE\n * spec — so mixed endings like `\\n\\r\\n` are valid boundaries, not just matching pairs).\n */\nconst FRAME_DELIMITER = /(?:\\r\\n|\\r|\\n){2}/;\n\n/** An event's JSON `data` failed to parse — a stable bad payload, not a dropped connection. */\nexport class SseParseError extends Error {}\n\n/**\n * Consume a `text/event-stream` operation as typed events (capability module — wired\n * into `createClient`). Auto-reconnects on dropped connections, resuming from the last\n * seen event id via `Last-Event-ID` (backoff: the server's `retry:` value, then\n * `reconnectDelay`, then 1s — exponential with jitter, capped at 30s). A clean stream\n * end flushes a trailing frame and finishes; `break`/abort end the iterator cleanly.\n */\nexport async function* sse<T>(\n  config: ClientConfig,\n  op: OperationContext,\n  url: string,\n  init: SseOptions,\n  dataKind: 'json' | 'text' = 'text'\n): AsyncGenerator<ServerSentEvent<T>> {\n  const { reconnect = true, reconnectDelay, ...rest } = init;\n  const signal = rest.signal ?? undefined;\n  const headers: Record<string, string> = {\n    Accept: 'text/event-stream',\n    ...(rest.headers as Record<string, string> | undefined),\n  };\n  let lastEventId: string | undefined;\n  let serverRetry: number | undefined;\n  let failures = 0;\n  while (true) {\n    if (signal?.aborted) return;\n    const sendHeaders =\n      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };\n    try {\n      const { response } = await send(\n        config,\n        op,\n        url,\n        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },\n        undefined,\n        false,\n        {}\n      );\n      if (!response.ok) {\n        const errorBody = await readError(response);\n        throw new ApiError(url, response.status, response.statusText, errorBody);\n      }\n      failures = 0;\n      const body = response.body;\n      if (!body) return;\n      const reader = body.getReader();\n      const decoder = new TextDecoder();\n      let buffer = '';\n      try {\n        while (true) {\n          const { done, value } = await reader.read();\n          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });\n          let match: RegExpMatchArray | null;\n          while ((match = buffer.match(FRAME_DELIMITER)) !== null) {\n            const index = match.index!;\n            const raw = buffer.slice(0, index);\n            buffer = buffer.slice(index + match[0].length);\n            const event = parseSseFrame(raw, dataKind);\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n          }\n          if (done) {\n            // Stream closed cleanly. Flush a final event that arrived without a trailing\n            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.\n            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n            return;\n          }\n          // Bound memory: a server that never sends a frame delimiter would otherwise\n          // grow `buffer` without limit. 1 MiB is far above any real SSE frame.\n          if (buffer.length > 1048576) {\n            throw new Error('SSE frame exceeded 1048576 characters without a delimiter');\n          }\n        }\n      } finally {\n        await reader.cancel().catch(() => undefined);\n      }\n    } catch (error) {\n      if (signal?.aborted) return;\n      // A non-OK HTTP response (4xx/5xx) or an unparseable JSON payload is a definitive\n      // error, not a transient drop — surface it instead of reconnecting in a loop (a\n      // stable bad payload would otherwise reconnect forever).\n      if (error instanceof ApiError || error instanceof SseParseError) throw error;\n      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream\n      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.\n      if (!reconnect) throw error;\n    }\n    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.\n    failures++;\n    const base = serverRetry ?? reconnectDelay ?? 1000;\n    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);\n    try {\n      await sleep(Math.random() * delay, signal);\n    } catch {\n      return; // sleep rejects only on abort — end the iterator cleanly\n    }\n  }\n}\n\n/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */\nexport function parseSseFrame(\n  raw: string,\n  dataKind: 'json' | 'text'\n): ServerSentEvent<unknown> | undefined {\n  let event: string | undefined;\n  const dataLines: string[] = [];\n  let id: string | undefined;\n  let retry: number | undefined;\n  let sawField = false;\n  for (const line of raw.split(/\\r\\n|\\n|\\r/)) {\n    if (line === '' || line.startsWith(':')) continue;\n    const colon = line.indexOf(':');\n    const field = colon === -1 ? line : line.slice(0, colon);\n    let val = colon === -1 ? '' : line.slice(colon + 1);\n    if (val.startsWith(' ')) val = val.slice(1);\n    sawField = true;\n    if (field === 'event') event = val;\n    else if (field === 'data') dataLines.push(val);\n    else if (field === 'id') id = val;\n    else if (field === 'retry') {\n      const n = Number(val);\n      if (!Number.isNaN(n)) retry = n;\n    }\n  }\n  if (!sawField) return undefined;\n  const dataText = dataLines.join('\\n');\n  let data: unknown = dataText;\n  if (dataKind === 'json' && dataText !== '') {\n    try {\n      data = JSON.parse(dataText);\n    } catch (error) {\n      throw new SseParseError(\n        `Failed to parse SSE event data as JSON: ${error instanceof Error ? error.message : String(error)}`\n      );\n    }\n  }\n  return { event, data, id, retry };\n}\n",
+    "import { ApiError } from './errors.js';\nimport { readError } from './parse.js';\nimport { sleep } from './retry.js';\nimport { send } from './send.js';\nimport type { ClientConfig, OperationContext, ServerSentEvent, SseOptions } from './types.js';\n\n/**\n * A frame delimiter: two consecutive line terminators (each CR, LF, or CRLF, per the SSE\n * spec — so mixed endings like `\\n\\r\\n` are valid boundaries, not just matching pairs).\n */\nconst FRAME_DELIMITER = /(?:\\r\\n|\\r|\\n){2}/;\n\n/** An event's JSON `data` failed to parse — a stable bad payload, not a dropped connection. */\nexport class SseParseError extends Error {}\n\n/**\n * Consume a `text/event-stream` operation as typed events (capability module — wired\n * into `createClient`). Auto-reconnects on dropped connections, resuming from the last\n * seen event id via `Last-Event-ID` (backoff: the server's `retry:` value, then\n * `reconnectDelay`, then 1s — exponential with jitter, capped at 30s). A clean stream\n * end flushes a trailing frame and finishes; `break`/abort end the iterator cleanly.\n */\nexport async function* sse<T>(\n  config: ClientConfig,\n  op: OperationContext,\n  prepare: () => Promise<{ url: string; init: SseOptions }>,\n  dataKind: 'json' | 'text' = 'text'\n): AsyncGenerator<ServerSentEvent<T>> {\n  let lastEventId: string | undefined;\n  let serverRetry: number | undefined;\n  let failures = 0;\n  while (true) {\n    // Re-prepare each attempt so a refresh-style TokenProvider yields a fresh credential\n    // on reconnect (the auth is baked into `url` query + `init.headers`). `reconnect`,\n    // `reconnectDelay`, and `signal` come from the caller's original options unchanged.\n    const { url, init } = await prepare();\n    const { reconnect = true, reconnectDelay, ...rest } = init;\n    const signal = rest.signal ?? undefined;\n    if (signal?.aborted) return;\n    const headers: Record<string, string> = {\n      Accept: 'text/event-stream',\n      ...(rest.headers as Record<string, string> | undefined),\n    };\n    const sendHeaders =\n      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };\n    try {\n      const { response } = await send(\n        config,\n        op,\n        url,\n        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },\n        undefined,\n        false,\n        {}\n      );\n      if (!response.ok) {\n        const errorBody = await readError(response);\n        throw new ApiError(url, response.status, response.statusText, errorBody);\n      }\n      failures = 0;\n      const body = response.body;\n      if (!body) return;\n      const reader = body.getReader();\n      const decoder = new TextDecoder();\n      let buffer = '';\n      try {\n        while (true) {\n          const { done, value } = await reader.read();\n          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });\n          let match: RegExpMatchArray | null;\n          while ((match = buffer.match(FRAME_DELIMITER)) !== null) {\n            const index = match.index!;\n            const raw = buffer.slice(0, index);\n            buffer = buffer.slice(index + match[0].length);\n            const event = parseSseFrame(raw, dataKind);\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n          }\n          if (done) {\n            // Stream closed cleanly. Flush a final event that arrived without a trailing\n            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.\n            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n            return;\n          }\n          // Bound memory: a server that never sends a frame delimiter would otherwise\n          // grow `buffer` without limit. 1 MiB is far above any real SSE frame.\n          if (buffer.length > 1048576) {\n            throw new Error('SSE frame exceeded 1048576 characters without a delimiter');\n          }\n        }\n      } finally {\n        await reader.cancel().catch(() => undefined);\n      }\n    } catch (error) {\n      if (signal?.aborted) return;\n      // A non-OK HTTP response (4xx/5xx) or an unparseable JSON payload is a definitive\n      // error, not a transient drop — surface it instead of reconnecting in a loop (a\n      // stable bad payload would otherwise reconnect forever).\n      if (error instanceof ApiError || error instanceof SseParseError) throw error;\n      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream\n      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.\n      if (!reconnect) throw error;\n    }\n    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.\n    failures++;\n    const base = serverRetry ?? reconnectDelay ?? 1000;\n    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);\n    try {\n      await sleep(Math.random() * delay, signal);\n    } catch {\n      return; // sleep rejects only on abort — end the iterator cleanly\n    }\n  }\n}\n\n/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */\nexport function parseSseFrame(\n  raw: string,\n  dataKind: 'json' | 'text'\n): ServerSentEvent<unknown> | undefined {\n  let event: string | undefined;\n  const dataLines: string[] = [];\n  let id: string | undefined;\n  let retry: number | undefined;\n  let sawField = false;\n  for (const line of raw.split(/\\r\\n|\\n|\\r/)) {\n    if (line === '' || line.startsWith(':')) continue;\n    const colon = line.indexOf(':');\n    const field = colon === -1 ? line : line.slice(0, colon);\n    let val = colon === -1 ? '' : line.slice(colon + 1);\n    if (val.startsWith(' ')) val = val.slice(1);\n    sawField = true;\n    if (field === 'event') event = val;\n    else if (field === 'data') dataLines.push(val);\n    else if (field === 'id') id = val;\n    else if (field === 'retry') {\n      const n = Number(val);\n      if (!Number.isNaN(n)) retry = n;\n    }\n  }\n  if (!sawField) return undefined;\n  const dataText = dataLines.join('\\n');\n  let data: unknown = dataText;\n  if (dataKind === 'json' && dataText !== '') {\n    try {\n      data = JSON.parse(dataText);\n    } catch (error) {\n      throw new SseParseError(\n        `Failed to parse SSE event data as JSON: ${error instanceof Error ? error.message : String(error)}`\n      );\n    }\n  }\n  return { event, data, id, retry };\n}\n",
   'create-client.ts':
-    "import { ApiError } from './errors.js';\nimport { parse, readError } from './parse.js';\nimport { middlewareChain, send, type SendCapabilities } from './send.js';\nimport type {\n  ApiErrorLike,\n  Client,\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  OperationDescriptor,\n  OpsShape,\n  PaginationSpec,\n  ParseAs,\n  QueryValue,\n  RequestOptions,\n  SecuritySpec,\n  ServerSentEvent,\n  SseOptions,\n  TokenProvider,\n} from './types.js';\nimport { buildUrl, substitutePath, type QueryStyle } from './url.js';\n\n/**\n * The optional behaviors `createClientCore` can dispatch to but never statically\n * imports. The package's public `createClient` wires the full set; the future\n * inline-mode assembler wires only the capabilities a spec needs.\n */\nexport type Capabilities = SendCapabilities & {\n  resolveAuth?: (\n    security: readonly SecuritySpec[],\n    config: ClientConfig\n  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;\n  sse?: (\n    config: ClientConfig,\n    op: OperationContext,\n    url: string,\n    init: SseOptions,\n    dataKind: 'json' | 'text'\n  ) => AsyncGenerator<ServerSentEvent<unknown>>;\n  paginate?: {\n    pages: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n    items: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n  };\n};\n\n/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */\nexport type OperationArgs = {\n  params?: Record<string, QueryValue>;\n  body?: unknown;\n  headers?: Record<string, unknown>;\n} & Record<string, unknown>;\n\n/** The response reader implied by the descriptor (before any per-call `parseAs` override). */\nfunction kindFor(op: OperationDescriptor): ParseAs | 'void' {\n  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {\n    return op.responseKind;\n  }\n  return 'auto';\n}\n\n/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */\nfunction splitArgs(op: OperationDescriptor, args: OperationArgs) {\n  const path: Record<string, unknown> = {};\n  for (const param of op.params ?? []) {\n    if (param.in === 'path') path[param.name] = args[param.name];\n  }\n  return { path, query: args.params, body: args.body, headers: args.headers };\n}\n\n/**\n * The query-serialization hints for the descriptor's query params. A spec is built only\n * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),\n * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)\n * are honored, and an omitted `explode` keeps the exploded default.\n */\nfunction queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {\n  let styles: Record<string, QueryStyle> | undefined;\n  for (const param of op.params ?? []) {\n    if (param.in !== 'query') continue;\n    const deviates =\n      (param.style !== undefined && param.style !== 'form') ||\n      param.explode === false ||\n      param.allowReserved === true;\n    if (!deviates) continue;\n    styles ??= {};\n    styles[param.name] = {\n      style: param.style ?? 'form',\n      explode: param.explode ?? true,\n      allowReserved: param.allowReserved,\n    };\n  }\n  return styles;\n}\n\n/** Stringify caller-supplied extra headers, skipping empty entries. */\nfunction stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {\n  const out: Record<string, string> = {};\n  for (const [key, value] of Object.entries(headers ?? {})) {\n    if (value !== undefined && value !== null) out[key] = String(value);\n  }\n  return out;\n}\n\n/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */\nasync function prepareRequest(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions | SseOptions,\n  caps: Capabilities\n): Promise<{ url: string; init: RequestOptions; body: unknown }> {\n  const { path, query, body, headers } = splitArgs(op, args);\n  const authed =\n    op.security?.length && caps.resolveAuth\n      ? await caps.resolveAuth(op.security, config)\n      : { headers: {}, query: {} };\n  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };\n  const url = buildUrl(\n    config.serverUrl ?? '',\n    substitutePath(op.path, path),\n    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,\n    queryStyles(op)\n  );\n  const mergedInit: RequestOptions = {\n    ...init,\n    method: op.method.toUpperCase(),\n    // Precedence, lowest → highest (later spreads win): injected auth → explicit\n    // header params → caller `init.headers` — the caller always overrides both.\n    headers: {\n      ...authed.headers,\n      ...stringHeaders(headers),\n      ...(init.headers as Record<string, string> | undefined),\n    },\n  };\n  return { url, init: mergedInit, body };\n}\n\n/** One non-SSE call: send, then branch on the configured error mode. */\nasync function execute(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions,\n  caps: Capabilities\n): Promise<unknown> {\n  const prepared = await prepareRequest(config, op, args, init, caps);\n  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n  const { parseAs, ...sendInit } = prepared.init;\n  const { response, context } = await send(\n    config,\n    opCtx,\n    prepared.url,\n    sendInit,\n    prepared.body,\n    op.body?.multipart === true,\n    caps\n  );\n  const readKind = parseAs ?? kindFor(op);\n  if (config.errorMode === 'result') {\n    if (!response.ok) {\n      return { data: undefined, error: await readError(response), response };\n    }\n    return { data: await parse(response, readKind), error: undefined, response };\n  }\n  if (!response.ok) {\n    let error: globalThis.Error = new ApiError(\n      context.url,\n      response.status,\n      response.statusText,\n      await readError(response)\n    );\n    // Thread the error through each middleware's onError in turn (each may replace it).\n    for (const mw of middlewareChain(config)) {\n      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);\n    }\n    throw error;\n  }\n  return parse(response, readKind);\n}\n\n/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */\nfunction paginateCapability(caps: Capabilities, op: OperationDescriptor) {\n  if (!caps.paginate) {\n    throw new Error(`Pagination capability not wired: cannot iterate operation \"${op.id}\"`);\n  }\n  return caps.paginate;\n}\n\n/**\n * The per-page call the iterators drive: the method itself in throw mode; in result\n * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page\n * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is\n * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).\n */\nfunction pageCall(\n  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  config: ClientConfig\n) {\n  if (config.errorMode !== 'result') return method;\n  return async (args?: OperationArgs, init?: RequestOptions) => {\n    const envelope = (await method(args, init)) as {\n      data: unknown;\n      error: unknown;\n      response: Response;\n    };\n    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page\n    // (204/void) also parses to undefined data, and a failed page's `error` can be\n    // undefined too (unreadable body). The pointers then miss on the undefined data\n    // and iteration stops cleanly, which is the correct semantics for an empty page.\n    if (!envelope.response.ok) {\n      const { response } = envelope;\n      throw new ApiError(response.url, response.status, response.statusText, envelope.error);\n    }\n    return envelope.data;\n  };\n}\n\n/**\n * Build a typed instance client over operation descriptors: one real bound method per\n * operation (attached by a construction-time loop — no Proxy), plus the core members\n * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name\n * collision with an operation. All behavior dispatches through the capability seam.\n */\nexport function createClientCore<\n  Ops extends OpsShape,\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n>(\n  operations: Record<string, OperationDescriptor>,\n  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},\n  caps: Capabilities = {}\n): Client<Ops, OperationContext<Id, Path, Tag>> {\n  // The literal-union narrowing is a compile-time DX contract only; internally the\n  // runtime works with the base (string-typed) context. One cast at this boundary —\n  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx\n  // params are contravariant).\n  const given = initial as ClientConfig;\n  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.\n  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };\n  const client = {} as Record<string, unknown>;\n\n  for (const [name, op] of Object.entries(operations)) {\n    if (op.responseKind === 'sse') {\n      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {\n        if (!caps.sse) {\n          throw new Error(`SSE capability not wired: cannot stream operation \"${op.id}\"`);\n        }\n        const stream = caps.sse;\n        return (async function* () {\n          const prepared = await prepareRequest(config, op, args, init, caps);\n          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');\n        })();\n      };\n    } else {\n      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>\n        execute(config, op, args, init, caps);\n      const spec = op.pagination;\n      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching\n      // through the capability seam (like SSE: absent capability throws descriptively).\n      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on\n      // a result-mode client (`errorMode` is fixed at construction — `configure()`\n      // ignores it) each page's envelope is unwrapped before it reaches the capability.\n      // A failed page aborts iteration by throwing ApiError, even on result-mode\n      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.\n      client[name] = spec\n        ? Object.assign(method, {\n            pages: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),\n            items: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),\n          })\n        : method;\n    }\n  }\n\n  // Core members are assigned AFTER the operation loop — they win over colliding op names.\n  client.configure = (next: ClientConfig): void => {\n    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at\n    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.\n    const { errorMode: _fixed, auth, ...rest } = next;\n    Object.assign(config, rest);\n    // `auth` merges into existing credentials (like the `auth.*` setters) rather than\n    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set\n    // basic/apiKey. `apiKey` merges per scheme.\n    if (auth) {\n      config.auth = {\n        ...config.auth,\n        ...auth,\n        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),\n      };\n    }\n  };\n  client.use = (...middleware: Middleware[]): void => {\n    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.\n    config.middleware = [...(config.middleware ?? []), ...middleware];\n  };\n  client.auth = {\n    bearer(token: TokenProvider): void {\n      config.auth = { ...config.auth, bearer: token };\n    },\n    basic(username: string, password: string): void {\n      config.auth = { ...config.auth, basic: { username, password } };\n    },\n    apiKey(scheme: string, value: TokenProvider): void {\n      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };\n    },\n  };\n\n  return client as Client<Ops, OperationContext<Id, Path, Tag>>;\n}\n",
+    "import { ApiError } from './errors.js';\nimport { parse, readError } from './parse.js';\nimport { middlewareChain, send, type SendCapabilities } from './send.js';\nimport type {\n  ApiErrorLike,\n  Client,\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  OperationDescriptor,\n  OpsShape,\n  PaginationSpec,\n  ParseAs,\n  QueryValue,\n  RequestOptions,\n  SecuritySpec,\n  ServerSentEvent,\n  SseOptions,\n  TokenProvider,\n} from './types.js';\nimport { buildUrl, substitutePath, type QueryStyle } from './url.js';\n\n/**\n * The optional behaviors `createClientCore` can dispatch to but never statically\n * imports. The package's public `createClient` wires the full set; the future\n * inline-mode assembler wires only the capabilities a spec needs.\n */\nexport type Capabilities = SendCapabilities & {\n  resolveAuth?: (\n    security: readonly SecuritySpec[],\n    config: ClientConfig\n  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;\n  sse?: (\n    config: ClientConfig,\n    op: OperationContext,\n    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style\n    // TokenProvider issue a fresh credential after a dropped stream reconnects.\n    prepare: () => Promise<{ url: string; init: SseOptions }>,\n    dataKind: 'json' | 'text'\n  ) => AsyncGenerator<ServerSentEvent<unknown>>;\n  paginate?: {\n    pages: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n    items: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n  };\n};\n\n/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */\nexport type OperationArgs = {\n  params?: Record<string, QueryValue>;\n  body?: unknown;\n  headers?: Record<string, unknown>;\n} & Record<string, unknown>;\n\n/** The response reader implied by the descriptor (before any per-call `parseAs` override). */\nfunction kindFor(op: OperationDescriptor): ParseAs | 'void' {\n  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {\n    return op.responseKind;\n  }\n  return 'auto';\n}\n\n/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */\nfunction splitArgs(op: OperationDescriptor, args: OperationArgs) {\n  const path: Record<string, unknown> = {};\n  for (const param of op.params ?? []) {\n    if (param.in === 'path') path[param.name] = args[param.name];\n  }\n  return { path, query: args.params, body: args.body, headers: args.headers };\n}\n\n/**\n * The query-serialization hints for the descriptor's query params. A spec is built only\n * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),\n * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)\n * are honored, and an omitted `explode` keeps the exploded default.\n */\nfunction queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {\n  let styles: Record<string, QueryStyle> | undefined;\n  for (const param of op.params ?? []) {\n    if (param.in !== 'query') continue;\n    const deviates =\n      (param.style !== undefined && param.style !== 'form') ||\n      param.explode === false ||\n      param.allowReserved === true;\n    if (!deviates) continue;\n    styles ??= {};\n    styles[param.name] = {\n      style: param.style ?? 'form',\n      explode: param.explode ?? true,\n      allowReserved: param.allowReserved,\n    };\n  }\n  return styles;\n}\n\n/** Stringify caller-supplied extra headers, skipping empty entries. */\nfunction stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {\n  const out: Record<string, string> = {};\n  for (const [key, value] of Object.entries(headers ?? {})) {\n    if (value !== undefined && value !== null) out[key] = String(value);\n  }\n  return out;\n}\n\n/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */\nasync function prepareRequest(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions | SseOptions,\n  caps: Capabilities\n): Promise<{ url: string; init: RequestOptions; body: unknown }> {\n  const { path, query, body, headers } = splitArgs(op, args);\n  const authed =\n    op.security?.length && caps.resolveAuth\n      ? await caps.resolveAuth(op.security, config)\n      : { headers: {}, query: {} };\n  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };\n  const url = buildUrl(\n    config.serverUrl ?? '',\n    substitutePath(op.path, path),\n    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,\n    queryStyles(op)\n  );\n  const mergedInit: RequestOptions = {\n    ...init,\n    method: op.method.toUpperCase(),\n    // Precedence, lowest → highest (later spreads win): injected auth → explicit\n    // header params → caller `init.headers` — the caller always overrides both.\n    headers: {\n      ...authed.headers,\n      ...stringHeaders(headers),\n      ...(init.headers as Record<string, string> | undefined),\n    },\n  };\n  return { url, init: mergedInit, body };\n}\n\n/** One non-SSE call: send, then branch on the configured error mode. */\nasync function execute(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions,\n  caps: Capabilities\n): Promise<unknown> {\n  const prepared = await prepareRequest(config, op, args, init, caps);\n  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n  const { parseAs, ...sendInit } = prepared.init;\n  const { response, context } = await send(\n    config,\n    opCtx,\n    prepared.url,\n    sendInit,\n    prepared.body,\n    op.body?.multipart === true,\n    caps\n  );\n  const readKind = parseAs ?? kindFor(op);\n  if (config.errorMode === 'result') {\n    if (!response.ok) {\n      return { data: undefined, error: await readError(response), response };\n    }\n    return { data: await parse(response, readKind), error: undefined, response };\n  }\n  if (!response.ok) {\n    let error: globalThis.Error = new ApiError(\n      context.url,\n      response.status,\n      response.statusText,\n      await readError(response)\n    );\n    // Thread the error through each middleware's onError in turn (each may replace it).\n    for (const mw of middlewareChain(config)) {\n      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);\n    }\n    throw error;\n  }\n  return parse(response, readKind);\n}\n\n/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */\nfunction paginateCapability(caps: Capabilities, op: OperationDescriptor) {\n  if (!caps.paginate) {\n    throw new Error(`Pagination capability not wired: cannot iterate operation \"${op.id}\"`);\n  }\n  return caps.paginate;\n}\n\n/**\n * The per-page call the iterators drive: the method itself in throw mode; in result\n * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page\n * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is\n * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).\n */\nfunction pageCall(\n  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  config: ClientConfig\n) {\n  if (config.errorMode !== 'result') return method;\n  return async (args?: OperationArgs, init?: RequestOptions) => {\n    const envelope = (await method(args, init)) as {\n      data: unknown;\n      error: unknown;\n      response: Response;\n    };\n    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page\n    // (204/void) also parses to undefined data, and a failed page's `error` can be\n    // undefined too (unreadable body). The pointers then miss on the undefined data\n    // and iteration stops cleanly, which is the correct semantics for an empty page.\n    if (!envelope.response.ok) {\n      const { response } = envelope;\n      throw new ApiError(response.url, response.status, response.statusText, envelope.error);\n    }\n    return envelope.data;\n  };\n}\n\n/**\n * Build a typed instance client over operation descriptors: one real bound method per\n * operation (attached by a construction-time loop — no Proxy), plus the core members\n * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name\n * collision with an operation. All behavior dispatches through the capability seam.\n */\nexport function createClientCore<\n  Ops extends OpsShape,\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n>(\n  operations: Record<string, OperationDescriptor>,\n  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},\n  caps: Capabilities = {}\n): Client<Ops, OperationContext<Id, Path, Tag>> {\n  // The literal-union narrowing is a compile-time DX contract only; internally the\n  // runtime works with the base (string-typed) context. One cast at this boundary —\n  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx\n  // params are contravariant).\n  const given = initial as ClientConfig;\n  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.\n  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };\n  const client = {} as Record<string, unknown>;\n\n  for (const [name, op] of Object.entries(operations)) {\n    if (op.responseKind === 'sse') {\n      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {\n        if (!caps.sse) {\n          throw new Error(`SSE capability not wired: cannot stream operation \"${op.id}\"`);\n        }\n        const stream = caps.sse;\n        return (async function* () {\n          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`\n          // resolves) is refreshed per attempt rather than frozen at the first connect.\n          const prepare = async () => {\n            const prepared = await prepareRequest(config, op, args, init, caps);\n            return { url: prepared.url, init: prepared.init as SseOptions };\n          };\n          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');\n        })();\n      };\n    } else {\n      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>\n        execute(config, op, args, init, caps);\n      const spec = op.pagination;\n      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching\n      // through the capability seam (like SSE: absent capability throws descriptively).\n      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on\n      // a result-mode client (`errorMode` is fixed at construction — `configure()`\n      // ignores it) each page's envelope is unwrapped before it reaches the capability.\n      // A failed page aborts iteration by throwing ApiError, even on result-mode\n      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.\n      client[name] = spec\n        ? Object.assign(method, {\n            pages: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),\n            items: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),\n          })\n        : method;\n    }\n  }\n\n  // Core members are assigned AFTER the operation loop — they win over colliding op names.\n  client.configure = (next: ClientConfig): void => {\n    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at\n    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.\n    const { errorMode: _fixed, auth, ...rest } = next;\n    Object.assign(config, rest);\n    // `auth` merges into existing credentials (like the `auth.*` setters) rather than\n    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set\n    // basic/apiKey. `apiKey` merges per scheme.\n    if (auth) {\n      config.auth = {\n        ...config.auth,\n        ...auth,\n        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),\n      };\n    }\n  };\n  client.use = (...middleware: Middleware[]): void => {\n    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.\n    config.middleware = [...(config.middleware ?? []), ...middleware];\n  };\n  client.auth = {\n    bearer(token: TokenProvider): void {\n      config.auth = { ...config.auth, bearer: token };\n    },\n    basic(username: string, password: string): void {\n      config.auth = { ...config.auth, basic: { username, password } };\n    },\n    apiKey(scheme: string, value: TokenProvider): void {\n      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };\n    },\n  };\n\n  return client as Client<Ops, OperationContext<Id, Path, Tag>>;\n}\n",
   'paginate.ts':
-    "import type { OperationArgs } from './create-client.js';\nimport type { PaginationSpec, QueryValue, RequestOptions } from './types.js';\n\n/**\n * Auto-pagination (capability module — wired into `createClient`, dispatched by the\n * method's `.pages()`/`.items()`): walk an operation's pages by advancing the descriptor's\n * `param` query parameter, per its `style`. The caller's args are never mutated — each\n * request gets a fresh `params` clone — and `init` is forwarded to every call.\n *\n * Iteration is error-mode-agnostic: `call` always resolves to the RAW page (on a\n * result-mode client the attachment unwraps the envelope first), so a failed page\n * aborts iteration by throwing `ApiError`, even on result-mode clients; the `onError`\n * middleware hook (throw-mode-only) is not invoked.\n */\n\n/**\n * Resolve an RFC 6901 JSON pointer (`~1` → `/`, `~0` → `~`) against a value.\n * The empty pointer is the whole document; anything else must start with `/`.\n * Returns `undefined` on any miss (bad token, absent key, non-object step) — never throws.\n */\nexport function resolvePointer(value: unknown, pointer: string): unknown {\n  if (pointer === '') return value;\n  if (!pointer.startsWith('/')) return undefined;\n  let current = value;\n  for (const token of pointer.slice(1).split('/')) {\n    const key = token.replaceAll('~1', '/').replaceAll('~0', '~');\n    if (Array.isArray(current)) {\n      if (!/^(0|[1-9]\\d*)$/.test(key)) return undefined;\n      current = current[Number(key)];\n    } else if (Object(current) === current && key in (current as object)) {\n      current = (current as Record<string, unknown>)[key];\n    } else {\n      return undefined;\n    }\n  }\n  return current;\n}\n\n/**\n * Iterate an operation's full page results. Every page is yielded before the stop\n * condition is evaluated, so the last page always arrives. Cursor style resumes from a\n * caller-provided `params[spec.param]`, stops when `nextCursor` resolves to\n * `undefined`/`null`/`''`, and throws if the next cursor is not a string or number, or\n * if the same cursor comes back twice in a row (infinite-loop guards). Offset/page\n * styles advance by item count / by one and stop when\n * the `items` pointer misses or the array is empty.\n */\nexport async function* pages<TPage>(\n  call: (args?: OperationArgs, init?: RequestOptions) => Promise<TPage>,\n  spec: PaginationSpec,\n  args: OperationArgs = {},\n  init?: RequestOptions\n): AsyncGenerator<TPage> {\n  if (spec.style === 'cursor') {\n    let cursor: unknown = args.params?.[spec.param];\n    while (true) {\n      const params = { ...args.params };\n      if (cursor !== undefined) params[spec.param] = cursor as QueryValue;\n      const page = await call({ ...args, params }, init);\n      yield page;\n      const next = resolvePointer(page, spec.nextCursor!);\n      if (next === undefined || next === null || next === '') return;\n      if (typeof next !== 'string' && typeof next !== 'number') {\n        // A fresh non-scalar cursor never compares equal, so without this guard a lying\n        // server would slip past the did-not-advance check into an infinite loop.\n        throw new Error(`Pagination cursor at ${spec.nextCursor} is not a string or number`);\n      }\n      if (next === cursor) {\n        throw new Error('Pagination did not advance: operation returned the same cursor twice');\n      }\n      cursor = next;\n    }\n  } else {\n    let position =\n      (args.params?.[spec.param] as number | undefined) ?? (spec.style === 'page' ? 1 : 0);\n    while (true) {\n      const page = await call(\n        { ...args, params: { ...args.params, [spec.param]: position } },\n        init\n      );\n      yield page;\n      const pageItems = resolvePointer(page, spec.items);\n      if (!Array.isArray(pageItems) || pageItems.length === 0) return;\n      position += spec.style === 'page' ? 1 : pageItems.length;\n    }\n  }\n}\n\n/**\n * Iterate the operation's individual items: each page's `items` pointer, flattened.\n * A cursor-style page whose pointer misses yields nothing but pagination continues;\n * for offset/page styles a miss has already stopped `pages`.\n */\nexport async function* items<TItem>(\n  call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  spec: PaginationSpec,\n  args?: OperationArgs,\n  init?: RequestOptions\n): AsyncGenerator<TItem> {\n  for await (const page of pages(call, spec, args, init)) {\n    const pageItems = resolvePointer(page, spec.items);\n    if (Array.isArray(pageItems)) yield* pageItems as TItem[];\n  }\n}\n",
+    "import type { OperationArgs } from './create-client.js';\nimport type { PaginationSpec, QueryValue, RequestOptions } from './types.js';\n\n/**\n * Auto-pagination (capability module — wired into `createClient`, dispatched by the\n * method's `.pages()`/`.items()`): walk an operation's pages by advancing the descriptor's\n * `param` query parameter, per its `style`. The caller's args are never mutated — each\n * request gets a fresh `params` clone — and `init` is forwarded to every call.\n *\n * Iteration is error-mode-agnostic: `call` always resolves to the RAW page (on a\n * result-mode client the attachment unwraps the envelope first), so a failed page\n * aborts iteration by throwing `ApiError`, even on result-mode clients; the `onError`\n * middleware hook (throw-mode-only) is not invoked.\n */\n\n/**\n * Resolve an RFC 6901 JSON pointer (`~1` → `/`, `~0` → `~`) against a value.\n * The empty pointer is the whole document; anything else must start with `/`.\n * Returns `undefined` on any miss (bad token, absent key, non-object step) — never throws.\n */\nexport function resolvePointer(value: unknown, pointer: string): unknown {\n  if (pointer === '') return value;\n  if (!pointer.startsWith('/')) return undefined;\n  let current = value;\n  for (const token of pointer.slice(1).split('/')) {\n    const key = token.replaceAll('~1', '/').replaceAll('~0', '~');\n    if (Array.isArray(current)) {\n      if (!/^(0|[1-9]\\d*)$/.test(key)) return undefined;\n      current = current[Number(key)];\n    } else if (Object(current) === current && key in (current as object)) {\n      current = (current as Record<string, unknown>)[key];\n    } else {\n      return undefined;\n    }\n  }\n  return current;\n}\n\n/**\n * Iterate an operation's full page results. Every page is yielded before the stop\n * condition is evaluated, so the last page always arrives. Cursor style resumes from a\n * caller-provided `params[spec.param]`, stops when `nextCursor` resolves to\n * `undefined`/`null`/`''`, and throws if the next cursor is not a string or number, or\n * if the same cursor comes back twice in a row (infinite-loop guards). Offset/page\n * styles advance by item count / by one and stop when\n * the `items` pointer misses or the array is empty.\n */\nexport async function* pages<TPage>(\n  call: (args?: OperationArgs, init?: RequestOptions) => Promise<TPage>,\n  spec: PaginationSpec,\n  args: OperationArgs = {},\n  init?: RequestOptions\n): AsyncGenerator<TPage> {\n  if (spec.style === 'cursor') {\n    let cursor: unknown = args.params?.[spec.param];\n    while (true) {\n      const params = { ...args.params };\n      if (cursor !== undefined) params[spec.param] = cursor as QueryValue;\n      const page = await call({ ...args, params }, init);\n      yield page;\n      const next = resolvePointer(page, spec.nextCursor!);\n      if (next === undefined || next === null || next === '') return;\n      if (typeof next !== 'string' && typeof next !== 'number') {\n        // A fresh non-scalar cursor never compares equal, so without this guard a lying\n        // server would slip past the did-not-advance check into an infinite loop.\n        throw new Error(`Pagination cursor at ${spec.nextCursor} is not a string or number`);\n      }\n      if (next === cursor) {\n        throw new Error('Pagination did not advance: operation returned the same cursor twice');\n      }\n      cursor = next;\n    }\n  } else {\n    // Coerce the starting position to a number: a caller may pass `params[spec.param]` as a\n    // string (common from URL/form input), and `+=` on a string would concatenate.\n    const start = args.params?.[spec.param];\n    const fallback = spec.style === 'page' ? 1 : 0;\n    let position = start === undefined || Number.isNaN(Number(start)) ? fallback : Number(start);\n    while (true) {\n      const page = await call(\n        { ...args, params: { ...args.params, [spec.param]: position } },\n        init\n      );\n      yield page;\n      const pageItems = resolvePointer(page, spec.items);\n      if (!Array.isArray(pageItems) || pageItems.length === 0) return;\n      position += spec.style === 'page' ? 1 : pageItems.length;\n    }\n  }\n}\n\n/**\n * Iterate the operation's individual items: each page's `items` pointer, flattened.\n * A cursor-style page whose pointer misses yields nothing but pagination continues;\n * for offset/page styles a miss has already stopped `pages`.\n */\nexport async function* items<TItem>(\n  call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  spec: PaginationSpec,\n  args?: OperationArgs,\n  init?: RequestOptions\n): AsyncGenerator<TItem> {\n  for await (const page of pages(call, spec, args, init)) {\n    const pageItems = resolvePointer(page, spec.items);\n    if (Array.isArray(pageItems)) yield* pageItems as TItem[];\n  }\n}\n",
 } as const;
 
 export type RuntimeModuleName = keyof typeof RUNTIME_SOURCES;
diff --git a/packages/client-generator/src/runtime/__tests__/auth.test.ts b/packages/client-generator/src/runtime/__tests__/auth.test.ts
index 41a82a8f88..89f6b85d60 100644
--- a/packages/client-generator/src/runtime/__tests__/auth.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/auth.test.ts
@@ -30,6 +30,13 @@ describe('resolveAuth', () => {
     expect(key.headers.Cookie).toBe('sid=C; ses=D');
   });
 
+  it('percent-encodes cookie credentials so reserved characters cannot break the header', async () => {
+    const key = await resolveAuth([{ scheme: 'c', kind: 'apiKey', name: 'sid', in: 'cookie' }], {
+      auth: { apiKey: { c: 'a b;c=d' } },
+    });
+    expect(key.headers.Cookie).toBe('sid=a%20b%3Bc%3Dd');
+  });
+
   it('skips schemes with no configured credential', async () => {
     const out = await resolveAuth(
       [
diff --git a/packages/client-generator/src/runtime/__tests__/create-client.test.ts b/packages/client-generator/src/runtime/__tests__/create-client.test.ts
index 992e805e3e..51f2890a5a 100644
--- a/packages/client-generator/src/runtime/__tests__/create-client.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/create-client.test.ts
@@ -293,10 +293,10 @@ describe('createClientCore', () => {
     async function* fake(
       _config: unknown,
       _op: unknown,
-      url: string,
-      _init: unknown,
+      prepare: () => Promise<{ url: string; init: unknown }>,
       dataKind: string
     ): AsyncGenerator<{ data: { n: number } }> {
+      const { url } = await prepare();
       seenUrls.push(url);
       seenKinds.push(dataKind);
       yield { data: { n: 1 } };
diff --git a/packages/client-generator/src/runtime/__tests__/paginate.test.ts b/packages/client-generator/src/runtime/__tests__/paginate.test.ts
index 5166010e2f..cc06c515a9 100644
--- a/packages/client-generator/src/runtime/__tests__/paginate.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/paginate.test.ts
@@ -165,6 +165,21 @@ describe('pages — offset style', () => {
     expect(sentParams('offset')).toEqual([10, 11]);
   });
 
+  it('coerces a string offset to a number so advancing adds instead of concatenating', async () => {
+    const data = [{ orders: ['k', 'm'] }, { orders: [] }];
+    const { call, sentParams } = stub(data);
+    // A string offset (common from URL/form input): `'10' + 2` would be `'102'` without coercion.
+    await collect(pages(call, OFFSET, { params: { offset: '10' } }));
+    expect(sentParams('offset')).toEqual([10, 12]);
+  });
+
+  it('falls back to the default start when the offset param is not a number', async () => {
+    const data = [{ orders: ['k'] }, { orders: [] }];
+    const { call, sentParams } = stub(data);
+    await collect(pages(call, OFFSET, { params: { offset: 'not-a-number' } }));
+    expect(sentParams('offset')).toEqual([0, 1]);
+  });
+
   it('stops when the items pointer misses', async () => {
     const data = [{ total: 0 }];
     const { call, calls } = stub(data);
diff --git a/packages/client-generator/src/runtime/__tests__/sse.test.ts b/packages/client-generator/src/runtime/__tests__/sse.test.ts
index d26b4d4748..edde5d61b1 100644
--- a/packages/client-generator/src/runtime/__tests__/sse.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/sse.test.ts
@@ -1,4 +1,5 @@
 import { parseSseFrame, sse, SseParseError } from '../sse.js';
+import type { SseOptions } from '../types.js';
 
 const enc = new TextEncoder();
 function streamResponse(chunks: string[], opts: { status?: number } = {}) {
@@ -14,6 +15,10 @@ function streamResponse(chunks: string[], opts: { status?: number } = {}) {
   });
 }
 const op = { id: 'stream', path: '/events', tags: [] as string[] };
+/** A fixed-auth `prepare` thunk (the stream re-invokes it per connect). */
+const prep =
+  (url: string, init: SseOptions = {}) =>
+  async () => ({ url, init });
 
 describe('parseSseFrame', () => {
   it('parses event/id/retry and multi-line data (joined with \\n); json dataKind parses', () => {
@@ -49,8 +54,7 @@ describe('sse', () => {
     for await (const ev of sse(
       { fetch: fetchImpl },
       op,
-      'https://x/events',
-      { reconnect: false },
+      prep('https://x/events', { reconnect: false }),
       'text'
     )) {
       seen.push(ev.data);
@@ -62,7 +66,7 @@ describe('sse', () => {
     const fetchImpl = (async () =>
       streamResponse(['data: a\n\n', ': ping\n\n', 'data: tail'])) as unknown as typeof fetch;
     const seen: unknown[] = [];
-    for await (const ev of sse({ fetch: fetchImpl }, op, 'u', { reconnect: false }, 'text')) {
+    for await (const ev of sse({ fetch: fetchImpl }, op, prep('u', { reconnect: false }), 'text')) {
       seen.push(ev.data);
     }
     expect(seen).toEqual(['a', 'tail']);
@@ -73,7 +77,7 @@ describe('sse', () => {
     const fetchImpl = (async () =>
       streamResponse(['data: a\n\r\ndata: b\r\n\rdata: c\n\n'])) as unknown as typeof fetch;
     const seen: unknown[] = [];
-    for await (const ev of sse({ fetch: fetchImpl }, op, 'u', { reconnect: false }, 'text')) {
+    for await (const ev of sse({ fetch: fetchImpl }, op, prep('u', { reconnect: false }), 'text')) {
       seen.push(ev.data);
     }
     expect(seen).toEqual(['a', 'b', 'c']);
@@ -87,7 +91,7 @@ describe('sse', () => {
     }) as unknown as typeof fetch;
     await expect(async () => {
       // `reconnect` defaults to true; a parse error must still surface, not loop forever.
-      for await (const _ of sse({ fetch: fetchImpl }, op, 'u', {}, 'json')) void _;
+      for await (const _ of sse({ fetch: fetchImpl }, op, prep('u', {}), 'json')) void _;
     }).rejects.toBeInstanceOf(SseParseError);
     expect(calls).toBe(1);
   });
@@ -113,7 +117,12 @@ describe('sse', () => {
       return streamResponse(['data: two\n\n']);
     }) as unknown as typeof fetch;
     const seen: unknown[] = [];
-    for await (const ev of sse({ fetch: fetchImpl }, op, 'u', { reconnectDelay: 1 }, 'text')) {
+    for await (const ev of sse(
+      { fetch: fetchImpl },
+      op,
+      prep('u', { reconnectDelay: 1 }),
+      'text'
+    )) {
       seen.push(ev.data);
       if (seen.length === 2) break;
     }
@@ -121,6 +130,44 @@ describe('sse', () => {
     expect(headersSeen[1]['Last-Event-ID']).toBe('5');
   });
 
+  it('re-runs prepare on reconnect so a refreshed credential is sent (not the frozen one)', async () => {
+    const authSeen: Array<string | undefined> = [];
+    let token = 't1';
+    let call = 0;
+    const fetchImpl = (async (_url: string, init: RequestInit) => {
+      authSeen.push((init.headers as Record<string, string>)?.Authorization);
+      call++;
+      if (call === 1) {
+        const body = new ReadableStream<Uint8Array>({
+          start(c) {
+            c.enqueue(enc.encode('data: one\n\n'));
+          },
+          pull(c) {
+            c.error(new Error('drop'));
+          },
+        });
+        return new Response(body, { status: 200 });
+      }
+      return streamResponse(['data: two\n\n']);
+    }) as unknown as typeof fetch;
+    // A refresh-style provider: each (re)connect re-reads the current token.
+    const prepare = async () => {
+      const init: SseOptions = {
+        reconnectDelay: 1,
+        headers: { Authorization: `Bearer ${token}` },
+      };
+      token = 't2';
+      return { url: 'u', init };
+    };
+    const seen: unknown[] = [];
+    for await (const ev of sse({ fetch: fetchImpl }, op, prepare, 'text')) {
+      seen.push(ev.data);
+      if (seen.length === 2) break;
+    }
+    expect(seen).toEqual(['one', 'two']);
+    expect(authSeen).toEqual(['Bearer t1', 'Bearer t2']); // reconnect used the fresh token
+  });
+
   it('honors the server retry: field for the backoff base and reconnects on empty bodies', async () => {
     let call = 0;
     const fetchImpl = (async () => {
@@ -139,7 +186,7 @@ describe('sse', () => {
       return streamResponse(['data: second\n\n']);
     }) as unknown as typeof fetch;
     const seen: unknown[] = [];
-    for await (const ev of sse({ fetch: fetchImpl }, op, 'u', {}, 'text')) {
+    for await (const ev of sse({ fetch: fetchImpl }, op, prep('u', {}), 'text')) {
       seen.push(ev.data);
       if (seen.length === 2) break;
     }
@@ -150,7 +197,7 @@ describe('sse', () => {
     const bad = (async () => new Response('nope', { status: 500 })) as unknown as typeof fetch;
     await expect(
       (async () => {
-        for await (const _ of sse({ fetch: bad }, op, 'u', {}, 'text')) void _;
+        for await (const _ of sse({ fetch: bad }, op, prep('u', {}), 'text')) void _;
       })()
     ).rejects.toMatchObject({ status: 500 });
   });
@@ -161,7 +208,7 @@ describe('sse', () => {
     }) as unknown as typeof fetch;
     await expect(
       (async () => {
-        for await (const _ of sse({ fetch: failing }, op, 'u', { reconnect: false }, 'text'))
+        for await (const _ of sse({ fetch: failing }, op, prep('u', { reconnect: false }), 'text'))
           void _;
       })()
     ).rejects.toThrow('net down');
@@ -175,8 +222,7 @@ describe('sse', () => {
     for await (const ev of sse(
       { fetch: okFetch },
       op,
-      'u',
-      { signal: controller.signal },
+      prep('u', { signal: controller.signal }),
       'text'
     )) {
       seen.push(ev);
@@ -189,7 +235,7 @@ describe('sse', () => {
       return r;
     }) as unknown as typeof fetch;
     const seen2: unknown[] = [];
-    for await (const ev of sse({ fetch: noBody }, op, 'u', {})) seen2.push(ev); // dataKind defaults to 'text'
+    for await (const ev of sse({ fetch: noBody }, op, prep('u', {}))) seen2.push(ev); // dataKind defaults to 'text'
     expect(seen2).toEqual([]);
   });
 
@@ -210,8 +256,7 @@ describe('sse', () => {
     for await (const ev of sse(
       { fetch: fetchImpl },
       op,
-      'u',
-      { signal: controller.signal },
+      prep('u', { signal: controller.signal }),
       'text'
     )) {
       seen.push(ev.data);
@@ -232,8 +277,7 @@ describe('sse', () => {
       for await (const ev of sse(
         { fetch: failing },
         op,
-        'u',
-        { signal: controller.signal },
+        prep('u', { signal: controller.signal }),
         'text'
       )) {
         seen.push(ev);
@@ -257,7 +301,12 @@ describe('sse', () => {
     }) as unknown as typeof fetch;
     await expect(
       (async () => {
-        for await (const _ of sse({ fetch: fetchImpl }, op, 'u', { reconnect: false }, 'text'))
+        for await (const _ of sse(
+          { fetch: fetchImpl },
+          op,
+          prep('u', { reconnect: false }),
+          'text'
+        ))
           void _;
       })()
     ).rejects.toThrow(/1048576/);
diff --git a/packages/client-generator/src/runtime/auth.ts b/packages/client-generator/src/runtime/auth.ts
index c0166ec4e7..e9eda15a06 100644
--- a/packages/client-generator/src/runtime/auth.ts
+++ b/packages/client-generator/src/runtime/auth.ts
@@ -26,7 +26,9 @@ export async function resolveAuth(
       const value = await resolveToken(provider);
       if (scheme.in === 'header') headers[scheme.name] = value;
       else if (scheme.in === 'query') query[scheme.name] = value;
-      else cookies.push(`${scheme.name}=${value}`);
+      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
+      // so the credential can't break the `Cookie` header syntax.
+      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
     } else if (scheme.kind === 'bearer') {
       const provider = config.auth?.bearer;
       if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
diff --git a/packages/client-generator/src/runtime/create-client.ts b/packages/client-generator/src/runtime/create-client.ts
index 23710c53e6..c41b69897d 100644
--- a/packages/client-generator/src/runtime/create-client.ts
+++ b/packages/client-generator/src/runtime/create-client.ts
@@ -33,8 +33,9 @@ export type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -258,9 +259,14 @@ export function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/packages/client-generator/src/runtime/paginate.ts b/packages/client-generator/src/runtime/paginate.ts
index 9edff7f9b5..4a337ab879 100644
--- a/packages/client-generator/src/runtime/paginate.ts
+++ b/packages/client-generator/src/runtime/paginate.ts
@@ -71,8 +71,11 @@ export async function* pages<TPage>(
       cursor = next;
     }
   } else {
-    let position =
-      (args.params?.[spec.param] as number | undefined) ?? (spec.style === 'page' ? 1 : 0);
+    // Coerce the starting position to a number: a caller may pass `params[spec.param]` as a
+    // string (common from URL/form input), and `+=` on a string would concatenate.
+    const start = args.params?.[spec.param];
+    const fallback = spec.style === 'page' ? 1 : 0;
+    let position = start === undefined || Number.isNaN(Number(start)) ? fallback : Number(start);
     while (true) {
       const page = await call(
         { ...args, params: { ...args.params, [spec.param]: position } },
diff --git a/packages/client-generator/src/runtime/sse.ts b/packages/client-generator/src/runtime/sse.ts
index 2629941fd6..33b6f9f605 100644
--- a/packages/client-generator/src/runtime/sse.ts
+++ b/packages/client-generator/src/runtime/sse.ts
@@ -23,21 +23,24 @@ export class SseParseError extends Error {}
 export async function* sse<T>(
   config: ClientConfig,
   op: OperationContext,
-  url: string,
-  init: SseOptions,
+  prepare: () => Promise<{ url: string; init: SseOptions }>,
   dataKind: 'json' | 'text' = 'text'
 ): AsyncGenerator<ServerSentEvent<T>> {
-  const { reconnect = true, reconnectDelay, ...rest } = init;
-  const signal = rest.signal ?? undefined;
-  const headers: Record<string, string> = {
-    Accept: 'text/event-stream',
-    ...(rest.headers as Record<string, string> | undefined),
-  };
   let lastEventId: string | undefined;
   let serverRetry: number | undefined;
   let failures = 0;
   while (true) {
+    // Re-prepare each attempt so a refresh-style TokenProvider yields a fresh credential
+    // on reconnect (the auth is baked into `url` query + `init.headers`). `reconnect`,
+    // `reconnectDelay`, and `signal` come from the caller's original options unchanged.
+    const { url, init } = await prepare();
+    const { reconnect = true, reconnectDelay, ...rest } = init;
+    const signal = rest.signal ?? undefined;
     if (signal?.aborted) return;
+    const headers: Record<string, string> = {
+      Accept: 'text/event-stream',
+      ...(rest.headers as Record<string, string> | undefined),
+    };
     const sendHeaders =
       lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
     try {
diff --git a/tests/e2e/generate-client/auth.test.ts b/tests/e2e/generate-client/auth.test.ts
index 43dc61adbe..7e750a364e 100644
--- a/tests/e2e/generate-client/auth.test.ts
+++ b/tests/e2e/generate-client/auth.test.ts
@@ -75,7 +75,9 @@ describe('generate-client auth breadth (auth.yaml)', () => {
     );
     expect(generated).toContain("if (scheme.in === 'header') headers[scheme.name] = value;");
     expect(generated).toContain("else if (scheme.in === 'query') query[scheme.name] = value;");
-    expect(generated).toContain('else cookies.push(`${scheme.name}=${value}`);');
+    expect(generated).toContain(
+      'else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);'
+    );
 
     // Per-instance credentials type + ClientConfig field.
     expect(generated).toContain('export type AuthCredentials = {');
diff --git a/tests/e2e/generate-client/base-consumer/api.ts b/tests/e2e/generate-client/base-consumer/api.ts
index 0eb0650dde..d7c78aed9e 100644
--- a/tests/e2e/generate-client/base-consumer/api.ts
+++ b/tests/e2e/generate-client/base-consumer/api.ts
@@ -816,8 +816,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -1041,9 +1042,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/tests/e2e/generate-client/cafe-consumer/api.ts b/tests/e2e/generate-client/cafe-consumer/api.ts
index fdf648d5ad..5597945139 100644
--- a/tests/e2e/generate-client/cafe-consumer/api.ts
+++ b/tests/e2e/generate-client/cafe-consumer/api.ts
@@ -1289,7 +1289,9 @@ async function resolveAuth(
       const value = await resolveToken(provider);
       if (scheme.in === 'header') headers[scheme.name] = value;
       else if (scheme.in === 'query') query[scheme.name] = value;
-      else cookies.push(`${scheme.name}=${value}`);
+      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
+      // so the credential can't break the `Cookie` header syntax.
+      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
     } else if (scheme.kind === 'bearer') {
       const provider = config.auth?.bearer;
       if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
@@ -1449,8 +1451,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -1674,9 +1677,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/tests/e2e/generate-client/cafe.snapshot.ts b/tests/e2e/generate-client/cafe.snapshot.ts
index 92bdee1410..3d8cf19f42 100644
--- a/tests/e2e/generate-client/cafe.snapshot.ts
+++ b/tests/e2e/generate-client/cafe.snapshot.ts
@@ -1289,7 +1289,9 @@ async function resolveAuth(
       const value = await resolveToken(provider);
       if (scheme.in === 'header') headers[scheme.name] = value;
       else if (scheme.in === 'query') query[scheme.name] = value;
-      else cookies.push(`${scheme.name}=${value}`);
+      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
+      // so the credential can't break the `Cookie` header syntax.
+      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
     } else if (scheme.kind === 'bearer') {
       const provider = config.auth?.bearer;
       if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
@@ -1449,8 +1451,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -1674,9 +1677,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
index 4f48f9ca31..167a107b44 100644
--- a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
@@ -1289,7 +1289,9 @@ async function resolveAuth(
       const value = await resolveToken(provider);
       if (scheme.in === 'header') headers[scheme.name] = value;
       else if (scheme.in === 'query') query[scheme.name] = value;
-      else cookies.push(`${scheme.name}=${value}`);
+      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
+      // so the credential can't break the `Cookie` header syntax.
+      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
     } else if (scheme.kind === 'bearer') {
       const provider = config.auth?.bearer;
       if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
@@ -1465,8 +1467,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -1690,9 +1693,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts b/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
index f3935777fe..9616718490 100644
--- a/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
@@ -642,7 +642,9 @@ async function resolveAuth(
       const value = await resolveToken(provider);
       if (scheme.in === 'header') headers[scheme.name] = value;
       else if (scheme.in === 'query') query[scheme.name] = value;
-      else cookies.push(`${scheme.name}=${value}`);
+      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
+      // so the credential can't break the `Cookie` header syntax.
+      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
     } else if (scheme.kind === 'bearer') {
       const provider = config.auth?.bearer;
       if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
@@ -802,8 +804,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -1027,9 +1030,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
index 92bdee1410..3d8cf19f42 100644
--- a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
@@ -1289,7 +1289,9 @@ async function resolveAuth(
       const value = await resolveToken(provider);
       if (scheme.in === 'header') headers[scheme.name] = value;
       else if (scheme.in === 'query') query[scheme.name] = value;
-      else cookies.push(`${scheme.name}=${value}`);
+      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
+      // so the credential can't break the `Cookie` header syntax.
+      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
     } else if (scheme.kind === 'bearer') {
       const provider = config.auth?.bearer;
       if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
@@ -1449,8 +1451,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -1674,9 +1677,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts b/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
index 8e33ec9077..dfe1d31b20 100644
--- a/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
@@ -667,8 +667,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -892,9 +893,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/tests/e2e/generate-client/examples/customization/src/api/client.ts b/tests/e2e/generate-client/examples/customization/src/api/client.ts
index 92bdee1410..3d8cf19f42 100644
--- a/tests/e2e/generate-client/examples/customization/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/customization/src/api/client.ts
@@ -1289,7 +1289,9 @@ async function resolveAuth(
       const value = await resolveToken(provider);
       if (scheme.in === 'header') headers[scheme.name] = value;
       else if (scheme.in === 'query') query[scheme.name] = value;
-      else cookies.push(`${scheme.name}=${value}`);
+      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
+      // so the credential can't break the `Cookie` header syntax.
+      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
     } else if (scheme.kind === 'bearer') {
       const provider = config.auth?.bearer;
       if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
@@ -1449,8 +1451,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -1674,9 +1677,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
index 92bdee1410..3d8cf19f42 100644
--- a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
@@ -1289,7 +1289,9 @@ async function resolveAuth(
       const value = await resolveToken(provider);
       if (scheme.in === 'header') headers[scheme.name] = value;
       else if (scheme.in === 'query') query[scheme.name] = value;
-      else cookies.push(`${scheme.name}=${value}`);
+      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
+      // so the credential can't break the `Cookie` header syntax.
+      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
     } else if (scheme.kind === 'bearer') {
       const provider = config.auth?.bearer;
       if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
@@ -1449,8 +1451,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -1674,9 +1677,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/tests/e2e/generate-client/examples/mock/src/api/client.ts b/tests/e2e/generate-client/examples/mock/src/api/client.ts
index 92bdee1410..3d8cf19f42 100644
--- a/tests/e2e/generate-client/examples/mock/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/mock/src/api/client.ts
@@ -1289,7 +1289,9 @@ async function resolveAuth(
       const value = await resolveToken(provider);
       if (scheme.in === 'header') headers[scheme.name] = value;
       else if (scheme.in === 'query') query[scheme.name] = value;
-      else cookies.push(`${scheme.name}=${value}`);
+      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
+      // so the credential can't break the `Cookie` header syntax.
+      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
     } else if (scheme.kind === 'bearer') {
       const provider = config.auth?.bearer;
       if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
@@ -1449,8 +1451,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -1674,9 +1677,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts b/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
index a26b4f55b0..4531eada8d 100644
--- a/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
@@ -674,8 +674,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -899,9 +900,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/tests/e2e/generate-client/examples/pagination/src/api/client.ts b/tests/e2e/generate-client/examples/pagination/src/api/client.ts
index 019ef00b2f..523e8d68d4 100644
--- a/tests/e2e/generate-client/examples/pagination/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/pagination/src/api/client.ts
@@ -608,8 +608,11 @@ async function* pages<TPage>(
       cursor = next;
     }
   } else {
-    let position =
-      (args.params?.[spec.param] as number | undefined) ?? (spec.style === 'page' ? 1 : 0);
+    // Coerce the starting position to a number: a caller may pass `params[spec.param]` as a
+    // string (common from URL/form input), and `+=` on a string would concatenate.
+    const start = args.params?.[spec.param];
+    const fallback = spec.style === 'page' ? 1 : 0;
+    let position = start === undefined || Number.isNaN(Number(start)) ? fallback : Number(start);
     while (true) {
       const page = await call(
         { ...args, params: { ...args.params, [spec.param]: position } },
@@ -785,8 +788,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -1010,9 +1014,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
index 92bdee1410..3d8cf19f42 100644
--- a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
@@ -1289,7 +1289,9 @@ async function resolveAuth(
       const value = await resolveToken(provider);
       if (scheme.in === 'header') headers[scheme.name] = value;
       else if (scheme.in === 'query') query[scheme.name] = value;
-      else cookies.push(`${scheme.name}=${value}`);
+      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
+      // so the credential can't break the `Cookie` header syntax.
+      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
     } else if (scheme.kind === 'bearer') {
       const provider = config.auth?.bearer;
       if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
@@ -1449,8 +1451,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -1674,9 +1677,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts b/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
index c54feb4fb9..c314b48afa 100644
--- a/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
@@ -670,21 +670,24 @@ class SseParseError extends Error {}
 async function* sse<T>(
   config: ClientConfig,
   op: OperationContext,
-  url: string,
-  init: SseOptions,
+  prepare: () => Promise<{ url: string; init: SseOptions }>,
   dataKind: 'json' | 'text' = 'text'
 ): AsyncGenerator<ServerSentEvent<T>> {
-  const { reconnect = true, reconnectDelay, ...rest } = init;
-  const signal = rest.signal ?? undefined;
-  const headers: Record<string, string> = {
-    Accept: 'text/event-stream',
-    ...(rest.headers as Record<string, string> | undefined),
-  };
   let lastEventId: string | undefined;
   let serverRetry: number | undefined;
   let failures = 0;
   while (true) {
+    // Re-prepare each attempt so a refresh-style TokenProvider yields a fresh credential
+    // on reconnect (the auth is baked into `url` query + `init.headers`). `reconnect`,
+    // `reconnectDelay`, and `signal` come from the caller's original options unchanged.
+    const { url, init } = await prepare();
+    const { reconnect = true, reconnectDelay, ...rest } = init;
+    const signal = rest.signal ?? undefined;
     if (signal?.aborted) return;
+    const headers: Record<string, string> = {
+      Accept: 'text/event-stream',
+      ...(rest.headers as Record<string, string> | undefined),
+    };
     const sendHeaders =
       lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
     try {
@@ -818,8 +821,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -1043,9 +1047,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
index 92bdee1410..3d8cf19f42 100644
--- a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
@@ -1289,7 +1289,9 @@ async function resolveAuth(
       const value = await resolveToken(provider);
       if (scheme.in === 'header') headers[scheme.name] = value;
       else if (scheme.in === 'query') query[scheme.name] = value;
-      else cookies.push(`${scheme.name}=${value}`);
+      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
+      // so the credential can't break the `Cookie` header syntax.
+      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
     } else if (scheme.kind === 'bearer') {
       const provider = config.auth?.bearer;
       if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
@@ -1449,8 +1451,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -1674,9 +1677,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts b/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
index dbb9d81ba4..b7f15f9ef3 100644
--- a/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
@@ -704,8 +704,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -929,9 +930,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts b/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
index 8045dd7b76..7182bd998a 100644
--- a/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
@@ -743,8 +743,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -968,9 +969,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/tests/e2e/generate-client/examples/zod/src/api/client.ts b/tests/e2e/generate-client/examples/zod/src/api/client.ts
index 92bdee1410..3d8cf19f42 100644
--- a/tests/e2e/generate-client/examples/zod/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/zod/src/api/client.ts
@@ -1289,7 +1289,9 @@ async function resolveAuth(
       const value = await resolveToken(provider);
       if (scheme.in === 'header') headers[scheme.name] = value;
       else if (scheme.in === 'query') query[scheme.name] = value;
-      else cookies.push(`${scheme.name}=${value}`);
+      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
+      // so the credential can't break the `Cookie` header syntax.
+      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
     } else if (scheme.kind === 'bearer') {
       const provider = config.auth?.bearer;
       if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
@@ -1449,8 +1451,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -1674,9 +1677,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/tests/e2e/generate-client/pagination-consumer/api-offset.ts b/tests/e2e/generate-client/pagination-consumer/api-offset.ts
index 8d685bd137..3429c9da86 100644
--- a/tests/e2e/generate-client/pagination-consumer/api-offset.ts
+++ b/tests/e2e/generate-client/pagination-consumer/api-offset.ts
@@ -639,8 +639,11 @@ async function* pages<TPage>(
       cursor = next;
     }
   } else {
-    let position =
-      (args.params?.[spec.param] as number | undefined) ?? (spec.style === 'page' ? 1 : 0);
+    // Coerce the starting position to a number: a caller may pass `params[spec.param]` as a
+    // string (common from URL/form input), and `+=` on a string would concatenate.
+    const start = args.params?.[spec.param];
+    const fallback = spec.style === 'page' ? 1 : 0;
+    let position = start === undefined || Number.isNaN(Number(start)) ? fallback : Number(start);
     while (true) {
       const page = await call(
         { ...args, params: { ...args.params, [spec.param]: position } },
@@ -816,8 +819,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -1041,9 +1045,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/tests/e2e/generate-client/pagination-consumer/api.ts b/tests/e2e/generate-client/pagination-consumer/api.ts
index 0b0563388d..80ba62bed9 100644
--- a/tests/e2e/generate-client/pagination-consumer/api.ts
+++ b/tests/e2e/generate-client/pagination-consumer/api.ts
@@ -638,8 +638,11 @@ async function* pages<TPage>(
       cursor = next;
     }
   } else {
-    let position =
-      (args.params?.[spec.param] as number | undefined) ?? (spec.style === 'page' ? 1 : 0);
+    // Coerce the starting position to a number: a caller may pass `params[spec.param]` as a
+    // string (common from URL/form input), and `+=` on a string would concatenate.
+    const start = args.params?.[spec.param];
+    const fallback = spec.style === 'page' ? 1 : 0;
+    let position = start === undefined || Number.isNaN(Number(start)) ? fallback : Number(start);
     while (true) {
       const page = await call(
         { ...args, params: { ...args.params, [spec.param]: position } },
@@ -815,8 +818,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -1040,9 +1044,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {
diff --git a/tests/e2e/generate-client/sse-consumer/api.ts b/tests/e2e/generate-client/sse-consumer/api.ts
index 2f093d71aa..88e1297410 100644
--- a/tests/e2e/generate-client/sse-consumer/api.ts
+++ b/tests/e2e/generate-client/sse-consumer/api.ts
@@ -676,21 +676,24 @@ class SseParseError extends Error {}
 async function* sse<T>(
   config: ClientConfig,
   op: OperationContext,
-  url: string,
-  init: SseOptions,
+  prepare: () => Promise<{ url: string; init: SseOptions }>,
   dataKind: 'json' | 'text' = 'text'
 ): AsyncGenerator<ServerSentEvent<T>> {
-  const { reconnect = true, reconnectDelay, ...rest } = init;
-  const signal = rest.signal ?? undefined;
-  const headers: Record<string, string> = {
-    Accept: 'text/event-stream',
-    ...(rest.headers as Record<string, string> | undefined),
-  };
   let lastEventId: string | undefined;
   let serverRetry: number | undefined;
   let failures = 0;
   while (true) {
+    // Re-prepare each attempt so a refresh-style TokenProvider yields a fresh credential
+    // on reconnect (the auth is baked into `url` query + `init.headers`). `reconnect`,
+    // `reconnectDelay`, and `signal` come from the caller's original options unchanged.
+    const { url, init } = await prepare();
+    const { reconnect = true, reconnectDelay, ...rest } = init;
+    const signal = rest.signal ?? undefined;
     if (signal?.aborted) return;
+    const headers: Record<string, string> = {
+      Accept: 'text/event-stream',
+      ...(rest.headers as Record<string, string> | undefined),
+    };
     const sendHeaders =
       lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
     try {
@@ -824,8 +827,9 @@ type Capabilities = SendCapabilities & {
   sse?: (
     config: ClientConfig,
     op: OperationContext,
-    url: string,
-    init: SseOptions,
+    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
+    // TokenProvider issue a fresh credential after a dropped stream reconnects.
+    prepare: () => Promise<{ url: string; init: SseOptions }>,
     dataKind: 'json' | 'text'
   ) => AsyncGenerator<ServerSentEvent<unknown>>;
   paginate?: {
@@ -1049,9 +1053,14 @@ function createClientCore<
         }
         const stream = caps.sse;
         return (async function* () {
-          const prepared = await prepareRequest(config, op, args, init, caps);
           const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          yield* stream(config, opCtx, prepared.url, prepared.init, op.sseDataKind ?? 'text');
+          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
+          // resolves) is refreshed per attempt rather than frozen at the first connect.
+          const prepare = async () => {
+            const prepared = await prepareRequest(config, op, args, init, caps);
+            return { url: prepared.url, init: prepared.init as SseOptions };
+          };
+          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
     } else {

From 895908a0c56258752bf315347471353591940d89 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 13 Jul 2026 12:24:23 +0300
Subject: [PATCH 090/134] docs(changeset): shorten the client-generator
 changeset to what's added

---
 .changeset/client-generator.md | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/.changeset/client-generator.md b/.changeset/client-generator.md
index 6c1e1e0a8e..d19eeceddf 100644
--- a/.changeset/client-generator.md
+++ b/.changeset/client-generator.md
@@ -4,14 +4,6 @@
 '@redocly/cli': minor
 ---
 
-Added an **experimental** `generate-client` command that generates a typed, zero-dependency TypeScript client from an OpenAPI description — auth, retries, middleware, typed SSE streaming, pagination, and multipart out of the box.
-
-See the [`generate-client` command reference](https://redocly.com/docs/cli/commands/generate-client) and [Use the generated client](https://redocly.com/docs/cli/guides/use-generated-client) for full documentation. Highlights:
-
-- `--runtime` option (`redocly.yaml`: `client.runtime`): `inline` (default) emits one self-contained, zero-dependency file, embedding only the runtime parts the API needs; `package` makes the generated file import the engine from `@redocly/client-generator`, so runtime fixes arrive via `npm update` with no regeneration. Application code is identical in both modes, and the emitted `satisfies` clause doubles as a build-time version-skew guard.
-- `--output-mode`: `single` (default) or `split` (the entry file plus a `<name>.schemas.ts` sibling). Both modes work with both runtimes.
-- Middleware sees the operation's identity as literal unions — `ctx.operation.{id,path,tags}` (`OperationId`/`OperationPath`/`OperationTag`, all exported) — so targeting requests by operationId/tags gets autocomplete and compile-time typo-checking.
-- Auth follows the spec's `securitySchemes` with per-instance credentials (`client.auth.{bearer,basic,apiKey}` / `ClientConfig.auth`) and generated `setBearer`/`setBasicAuth`/`setApiKey*` sugar bound to the default instance.
-- Auto-pagination, declared rather than guessed: a `client.pagination` block in `redocly.yaml` (a convention rule + per-operation overrides + `exclude`) or the spec's `x-pagination` operation extension gives paginated operations typed `.pages()`/`.items()` async iterators (`cursor`, `offset`, and `page` styles) next to the unchanged one-shot call, with item types resolved from the response schema at generate time. The convention applies only to operations it structurally fits (verified against declared query params and the success-response schema); an explicit rule that doesn't fit fails generation with a per-operation error. Works in both runtimes — inline output embeds the pagination module only when an operation paginates.
-- A `--setup` flag bakes a publisher-authored `defineClientSetup({ config, middleware })` module into the generated client (both runtimes and output modes), so a published SDK ships its request/response defaults built in — layered between the spec's defaults and the app's `configure()`. The package exports the runtime contract types + `defineClientSetup` from its main entry.
-- Companion generators from the same spec via `--generator`: `zod`, `tanstack-query` (React/Vue/Svelte/Solid), `swr`, `transformers`, `mock` (MSW, baked or faker), plus an experimental `defineGenerator` plugin API — each emits its own file and adds no dependency to the client.
+Added an experimental `generate-client` command that generates a typed, zero-dependency TypeScript client from an OpenAPI description — with auth, retries, middleware, typed SSE streaming, auto-pagination, and multipart support.
+The `--generator` option emits companion modules from the same description: `zod`, `tanstack-query`, `swr`, `transformers`, and `mock`.
+See the [`generate-client` command reference](https://redocly.com/docs/cli/commands/generate-client) and the [Use the generated client](https://redocly.com/docs/cli/guides/use-generated-client) guide.

From 71fbff9fd3a09870e995af5cf524b1f162cb5b93 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 13 Jul 2026 12:40:01 +0300
Subject: [PATCH 091/134] fix(cli): resolve generate-client apis via
 getFallbackApisOrExit like other commands

---
 docs/@v2/commands/generate-client.md          |  5 +-
 docs/@v2/configuration/reference/client.md    |  4 +-
 packages/cli/src/commands/generate-client.ts  | 48 ++++++++-----------
 .../generate-client/redocly-config.test.ts    | 28 +++++++----
 4 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index 9ef1953f63..4f99313bb6 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -23,10 +23,11 @@ This page covers running the command; for the generated client's runtime API (au
 ```sh
 redocly generate-client                          # every api with a `client` block (see Configuration)
 redocly generate-client cafe                     # a single `apis:` alias from redocly.yaml
-redocly generate-client openapi.yaml -o src/client.ts   # a file path (ignores `apis:`)
+redocly generate-client openapi.yaml -o src/client.ts   # a file path or URL
 ```
 
-With **no argument**, a client is generated for every api that declares a `client` block under `apis:` (see [`client` configuration](../configuration/reference/client.md)). Otherwise `<api>` is a file path, a URL, or an [`apis:` alias](../configuration/index.md): an alias uses that api's `client` block and `clientOutput`, while a plain path/URL ignores the `apis:` section and uses the top-level `client` defaults.
+With no argument, a client is generated for every api that declares a `client` block under `apis:` (see [`client` configuration](../configuration/reference/client.md)).
+Otherwise `<api>` is a file path, a URL, or an [`apis:` alias](../configuration/index.md), resolved the same way as in other commands such as `bundle` and `lint`: an alias — or a path matching an api's `root` — uses that api's `client` block and `clientOutput`, while an unmatched path/URL uses the top-level `client` defaults.
 
 ## Options
 
diff --git a/docs/@v2/configuration/reference/client.md b/docs/@v2/configuration/reference/client.md
index be8b94bccf..b5c73f8668 100644
--- a/docs/@v2/configuration/reference/client.md
+++ b/docs/@v2/configuration/reference/client.md
@@ -75,7 +75,9 @@ The style-conditional requirements and the structural fit (the advance param mus
 
 ## How the configuration applies
 
-A per-API `client` block overrides the top-level `client` field by field; unspecified fields fall back to the top-level defaults. A plain file-path invocation (not an `apis:` alias) ignores `apis:` and uses only the top-level `client`. CLI flags then take precedence over the resolved configuration — see the [command reference](../../commands/generate-client.md#configuration).
+A per-API `client` block overrides the top-level `client` field by field; unspecified fields fall back to the top-level defaults.
+A file-path invocation matching no `apis:` entry uses only the top-level `client`.
+CLI flags then take precedence over the resolved configuration — see the [command reference](../../commands/generate-client.md#configuration).
 
 For code-level control — including registering [custom generators](../../guides/use-generated-client.md#custom-generators) inline — use the programmatic `generateClient(...)` API instead.
 
diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index 6e623de437..9e496007aa 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -3,7 +3,7 @@ import { HandledError, isPlainObject, logger, pluralize } from '@redocly/openapi
 import { blue, gray, yellow } from 'colorette';
 import { basename, dirname, extname, isAbsolute, resolve as resolvePath } from 'node:path';
 
-import { getAliasOrPath } from '../utils/miscellaneous.js';
+import { getFallbackApisOrExit } from '../utils/miscellaneous.js';
 import { type CommandArgs } from '../wrapper.js';
 
 export type GenerateClientCommandArgv = {
@@ -111,43 +111,37 @@ export async function handleGenerateClient({
     setup: argv.setup === undefined ? undefined : resolvePath(argv.setup),
   };
 
-  const perApiJob = (name: string): Job => {
-    const apiCfg = apisCfg[name];
-    return {
-      name,
-      alias: name,
-      api: getAliasOrPath(config, name).path,
-      clientOutput: apiCfg?.clientOutput,
-      perApiClient: isPlainObject(apiCfg?.client)
-        ? resolveSetup(apiCfg.client as ClientConfig, configDir)
-        : {},
-    };
-  };
-
-  // Three invocation modes, keyed off the positional argument.
-  const jobs: Job[] = [];
+  // Without an <api> argument, generation fans out over the apis that opt in with a `client` block.
+  const optedIn = Object.keys(apisCfg).filter((name) => isPlainObject(apisCfg[name].client));
   if (argv.api === undefined) {
-    // Fan-out: generate for every API that opts in with a `client` block.
     if (argv.output) {
       throw new HandledError(
         `\n❌  --output can't target multiple APIs. Set \`clientOutput\` under each api in redocly.yaml, or pass a single <api>.\n`
       );
     }
-    for (const [name, apiCfg] of Object.entries(apisCfg)) {
-      if (isPlainObject(apiCfg.client)) jobs.push(perApiJob(name));
-    }
-    if (jobs.length === 0) {
+    if (optedIn.length === 0) {
       throw new HandledError(
         `\n❌  No API to generate. Add a \`client\` block under an \`apis:\` entry, or pass <api> (a file/URL or an \`apis:\` alias).\n`
       );
     }
-  } else if (apisCfg[argv.api]) {
-    // Named `apis:` alias: use its root, its `client` block (if any), and its `clientOutput`.
-    jobs.push(perApiJob(argv.api));
-  } else {
-    // Plain file/URL: ignore the `apis:` registry; use the top-level `client` defaults only.
-    jobs.push({ name: basename(argv.api, extname(argv.api)), api: argv.api, perApiClient: {} });
   }
+  const entrypoints = await getFallbackApisOrExit(
+    argv.api === undefined ? optedIn : [argv.api],
+    config
+  );
+
+  const jobs: Job[] = entrypoints.map(({ path, alias }) => {
+    const apiCfg = alias === undefined ? undefined : apisCfg[alias];
+    return {
+      name: alias ?? basename(path, extname(path)),
+      alias,
+      api: path,
+      clientOutput: apiCfg?.clientOutput,
+      perApiClient: isPlainObject(apiCfg?.client)
+        ? resolveSetup(apiCfg.client as ClientConfig, configDir)
+        : {},
+    };
+  });
 
   // Resolved output paths, so two fan-out jobs can't silently overwrite each other.
   const seenOutputs = new Set<string>();
diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
index 56b46955a1..f74d800172 100644
--- a/tests/e2e/generate-client/redocly-config.test.ts
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -1,7 +1,7 @@
 // generate-client reads its settings from a `redocly.yaml` `client` block (top-level
-// shared defaults) and per-API `apis.<name>.client` / `clientOutput`. Three invocation
-// modes: fan-out (no arg, over apis with a `client` block), an `apis:` alias, and a plain
-// file path (which ignores `apis:`). CLI flags override the config.
+// shared defaults) and per-API `apis.<name>.client` / `clientOutput`. Invocation modes:
+// fan-out (no arg, over apis with a `client` block) and an `apis:` alias or file path,
+// resolved like `bundle`/`lint`. CLI flags override the config.
 import { spawnSync } from 'node:child_process';
 import {
   existsSync,
@@ -111,7 +111,7 @@ describe('generate-client redocly.yaml config', () => {
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
-  it('a plain file path ignores `apis:` and uses the top-level `client` defaults', () => {
+  it("a file path matching an api root uses that api's config (like `bundle`); an unmatched path uses the top-level defaults", () => {
     const dir = project(
       [
         'client:',
@@ -121,14 +121,22 @@ describe('generate-client redocly.yaml config', () => {
         '  cafe:',
         '    root: ./openapi.yaml',
         '    client:',
-        '      serverUrl: https://per-api.example.com', // must NOT apply to a path invocation
+        '      serverUrl: https://per-api.example.com',
       ].join('\n') + '\n'
     );
-    const res = run(dir, ['./openapi.yaml', '--output', './out.ts']);
-    expect(res.status, res.stderr).toBe(0);
-    const out = readFileSync(join(dir, 'out.ts'), 'utf-8');
-    expect(out).toContain('serverUrl: "https://top-level.example.com"'); // top-level applied
-    expect(out).not.toContain('https://per-api.example.com'); // per-api block ignored
+    copyFileSync(fixture, join(dir, 'standalone.yaml')); // not registered under `apis:`
+
+    const matched = run(dir, ['./openapi.yaml', '--output', './matched.ts']);
+    expect(matched.status, matched.stderr).toBe(0);
+    expect(readFileSync(join(dir, 'matched.ts'), 'utf-8')).toContain(
+      'serverUrl: "https://per-api.example.com"'
+    );
+
+    const unmatched = run(dir, ['./standalone.yaml', '--output', './unmatched.ts']);
+    expect(unmatched.status, unmatched.stderr).toBe(0);
+    expect(readFileSync(join(dir, 'unmatched.ts'), 'utf-8')).toContain(
+      'serverUrl: "https://top-level.example.com"'
+    );
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 

From 7d0fc4c451939abe092d63cdf590b60451e275cb Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 13 Jul 2026 12:40:13 +0300
Subject: [PATCH 092/134] chore(cli): restore the original build banner comment

---
 packages/cli/scripts/build.mjs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/cli/scripts/build.mjs b/packages/cli/scripts/build.mjs
index 9ff29eb367..0948c78637 100644
--- a/packages/cli/scripts/build.mjs
+++ b/packages/cli/scripts/build.mjs
@@ -18,11 +18,7 @@ const result = await build({
   format: 'esm',
   target: 'node20.19',
   metafile: true,
-  // Avoid errors when external dependencies use CJS syntax. The bundled
-  // `typescript` compiler (used by generate-client) references `require`,
-  // `__filename`, and `__dirname` at runtime — none exist in ESM scope. Shim
-  // them per output file. `var` (not `const`) so these coexist with the
-  // self-declared `var __dirname` some deps already inline for ESM compat.
+  // Avoid errors when external dependencies use CJS syntax.
   banner: {
     js: [
       "import { createRequire as __createRequire } from 'node:module';",

From 101523176cd0dc22f174ac784d174e75353835d5 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 13 Jul 2026 12:57:36 +0300
Subject: [PATCH 093/134] refactor(cli): move generate-client comments into
 docs and yargs descriptions

---
 docs/@v2/commands/generate-client.md         |  2 +-
 packages/cli/src/commands/generate-client.ts | 35 +++-----------------
 2 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index 4f99313bb6..8adff5067b 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -37,7 +37,7 @@ Otherwise `<api>` is a file path, a URL, or an [`apis:` alias](../configuration/
 | `--output`, `-o`    | `string`   | Output path (must end in `.ts`); the entry file in multi-file modes. Defaults to the api's `clientOutput`, else `<name>.client.ts` in the config dir. Not allowed when generating for multiple apis.                              |
 | `--output-mode`     | `string`   | File layout: `single` (default) or `split`. See [Output modes](#output-modes).                                                                                                                                                    |
 | `--runtime`         | `string`   | `inline` (default, self-contained file — zero runtime dependencies) or `package` (imports the runtime from `@redocly/client-generator`; engine fixes arrive via `npm update`). See [Runtime distribution](#runtime-distribution). |
-| `--generator`       | `string[]` | Generator to run; repeat the flag to run several (default `sdk`). See [Generators](../guides/use-generated-client.md#generators).                                                                                                 |
+| `--generator`       | `string[]` | Generator to run — a built-in name or a custom generator's path/package; repeat the flag to run several (default `sdk`). See [Generators](../guides/use-generated-client.md#generators).                                          |
 | `--args-style`      | `string`   | Operation inputs: `flat` (default, positional) or `grouped` (a single `vars` object). See [Argument style](../guides/use-generated-client.md#argument-style).                                                                     |
 | `--enum-style`      | `string`   | Named string enums: `const-object` (default, `as const` object + union) or `union` (union only).                                                                                                                                  |
 | `--error-mode`      | `string`   | `throw` (default, throws `ApiError`) or `result` (returns `{ data, error, response }`). See [Error handling](../guides/use-generated-client.md#error-handling).                                                                   |
diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index 9e496007aa..642c419395 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -20,20 +20,12 @@ export type GenerateClientCommandArgv = {
   'query-framework'?: 'react' | 'vue' | 'svelte' | 'solid';
   'mock-data'?: 'baked' | 'faker';
   'mock-seed'?: number;
-  // Repeated `--generator` flags: built-in names, inline custom-generator names, or plugin
-  // import specifiers (path/package).
   generator?: string[];
-  // Path to a publisher setup module baked into the generated client.
   setup?: string;
 };
 
 type ClientConfig = Partial<OpenApiTsConfig>;
 
-/**
- * A single client to generate: which API to read, where to write it, its per-API `client`
- * block, and — for a named `apis:` entry — its `alias` so the input is bundled with that
- * api's resolved config (its `extends`/`resolve`/decorators), like `bundle`/`lint` do.
- */
 type Job = {
   name: string;
   api: string;
@@ -42,10 +34,9 @@ type Job = {
   perApiClient: ClientConfig;
 };
 
-/** A URL-ish specifier (`https://…`, `file:…`, `javascript:…`) — two+ letter scheme, so Windows drive paths (`C:\\…`) don't match. */
+// Two+ letter scheme, so Windows drive paths (`C:\...`) don't match.
 const URL_SCHEME = /^[a-z][a-z0-9+.-]+:/i;
 
-/** Resolve a `client` block's relative `setup` path against the config dir. Setup is a LOCAL module — URLs are rejected upfront (they would otherwise fail as an unreadable file at generation time). */
 function resolveSetup(client: ClientConfig, configDir: string): ClientConfig {
   const { setup } = client;
   if (typeof setup !== 'string') return client;
@@ -60,22 +51,16 @@ function resolveSetup(client: ClientConfig, configDir: string): ClientConfig {
   return client;
 }
 
-/** Make an API name safe as a filename segment (path separators would escape the target dir). */
 function fileNameFor(name: string): string {
   return `${name.replace(/[\\/]/g, '_')}.client.ts`;
 }
 
-/**
- * A valid inlined server URL is an absolute **http(s)** URL (`https://api.example.com`) or a
- * root-relative path (`/v1`, which OpenAPI allows for `servers[].url`). A bare hostname
- * (`api.example.com`) is rejected — `new URL(value, base)` would treat it as a path and it
- * would concatenate wrongly. Non-http(s) schemes (`javascript:`, `file:`) and protocol-relative
- * `//host` values are rejected too: the value is inlined as the client's default fetch base.
- */
+// Accepts an absolute http(s) URL or a root-relative path; rejects bare hostnames,
+// protocol-relative `//host`, and non-http(s) schemes.
 function isValidServerUrl(value: string): boolean {
-  if (value.startsWith('/')) return !value.startsWith('//'); // root-relative, not protocol-relative
+  if (value.startsWith('/')) return !value.startsWith('//');
   try {
-    const url = new URL(value); // no base — only an absolute URL with a scheme parses
+    const url = new URL(value);
     return url.protocol === 'http:' || url.protocol === 'https:';
   } catch {
     return false;
@@ -90,12 +75,9 @@ export async function handleGenerateClient({
 
   const { client, apis } = config.resolvedConfig;
   const configDir = config.configPath ? dirname(config.configPath) : process.cwd();
-  // Top-level `client` block: shared defaults (relative `setup` resolved against the config dir).
   const topClient = resolveSetup((isPlainObject(client) ? client : {}) as ClientConfig, configDir);
   const apisCfg = apis ?? {};
 
-  // CLI setting flags override both the top-level and per-API `client` blocks. `--setup` is
-  // relative to the cwd (like `--output`); `api`/`output` are not settings and stay out of the merge.
   const cliFlags: ClientConfig = {
     serverUrl: argv['server-url'],
     enumStyle: argv['enum-style'],
@@ -111,7 +93,6 @@ export async function handleGenerateClient({
     setup: argv.setup === undefined ? undefined : resolvePath(argv.setup),
   };
 
-  // Without an <api> argument, generation fans out over the apis that opt in with a `client` block.
   const optedIn = Object.keys(apisCfg).filter((name) => isPlainObject(apisCfg[name].client));
   if (argv.api === undefined) {
     if (argv.output) {
@@ -143,14 +124,11 @@ export async function handleGenerateClient({
     };
   });
 
-  // Resolved output paths, so two fan-out jobs can't silently overwrite each other.
   const seenOutputs = new Set<string>();
 
   for (const job of jobs) {
     const merged = mergeConfig(mergeConfig(topClient, job.perApiClient), cliFlags);
 
-    // Output: an explicit `--output` (single-API modes) wins; else the per-API `clientOutput`
-    // (config-dir-relative); else `<name>.client.ts` in the config dir.
     const outputPath =
       argv.output !== undefined
         ? resolvePath(argv.output)
@@ -175,9 +153,6 @@ export async function handleGenerateClient({
       );
     }
 
-    // Bundle the input with the api's resolved config (its `extends`/`resolve`/decorators),
-    // the same per-alias resolution `bundle`/`lint` use — so the generated client sees the
-    // same document. A plain file path (no alias) resolves the root config.
     const aliasConfig = config.forAlias(job.alias);
 
     try {

From 5152c2b3ad36c983f79e0e35593d5b42b0d8381b Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 13 Jul 2026 12:58:41 +0300
Subject: [PATCH 094/134] refactor(cli): return each serverUrl validation case
 explicitly

---
 packages/cli/src/commands/generate-client.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index 642c419395..ef65b915aa 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -58,7 +58,8 @@ function fileNameFor(name: string): string {
 // Accepts an absolute http(s) URL or a root-relative path; rejects bare hostnames,
 // protocol-relative `//host`, and non-http(s) schemes.
 function isValidServerUrl(value: string): boolean {
-  if (value.startsWith('/')) return !value.startsWith('//');
+  if (value.startsWith('//')) return false;
+  if (value.startsWith('/')) return true;
   try {
     const url = new URL(value);
     return url.protocol === 'http:' || url.protocol === 'https:';

From 51550d8b6f47870ff108e062f7aa553fb539d3d0 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 13 Jul 2026 13:10:08 +0300
Subject: [PATCH 095/134] refactor(cli): read the effective client block via
 config.forAlias

---
 docs/@v2/commands/generate-client.md         |  5 +++-
 docs/@v2/configuration/reference/client.md   |  2 +-
 packages/cli/src/commands/generate-client.ts | 27 ++++++++------------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index 8adff5067b..867e98fad5 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -51,7 +51,10 @@ Otherwise `<api>` is a file path, a URL, or an [`apis:` alias](../configuration/
 
 ## Configuration
 
-Instead of passing flags every time, keep the settings in `redocly.yaml` under a top-level `client` block and per-API `apis.<name>.client` / `clientOutput`. **CLI flags take precedence over the configuration.** Within the configuration, a per-API `client` block overrides the top-level `client` field by field (unspecified fields fall back to the top-level defaults). See [`client` configuration](../configuration/reference/client.md) for the full reference.
+Instead of passing flags every time, keep the settings in `redocly.yaml` under a top-level `client` block and per-API `apis.<name>.client` / `clientOutput`.
+CLI flags take precedence over the configuration.
+An api with its own `client` block uses that block; apis without one use the top-level `client`.
+See [`client` configuration](../configuration/reference/client.md) for the full reference.
 
 Auto-pagination has **no CLI flag**: it's declared as structured configuration — [`client.pagination`](../configuration/reference/client.md#pagination) in `redocly.yaml`, or the equivalent `x-pagination` operation extension in the spec — and paginated operations gain typed `.pages()`/`.items()` async iterators. See [Pagination in the usage guide](../guides/use-generated-client.md#pagination).
 
diff --git a/docs/@v2/configuration/reference/client.md b/docs/@v2/configuration/reference/client.md
index b5c73f8668..7e867f85fb 100644
--- a/docs/@v2/configuration/reference/client.md
+++ b/docs/@v2/configuration/reference/client.md
@@ -75,7 +75,7 @@ The style-conditional requirements and the structural fit (the advance param mus
 
 ## How the configuration applies
 
-A per-API `client` block overrides the top-level `client` field by field; unspecified fields fall back to the top-level defaults.
+An api with its own `client` block uses that block; apis without one use the top-level `client` — the same way api-level options override root options in other commands.
 A file-path invocation matching no `apis:` entry uses only the top-level `client`.
 CLI flags then take precedence over the resolved configuration — see the [command reference](../../commands/generate-client.md#configuration).
 
diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index ef65b915aa..411d164406 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -1,5 +1,5 @@
 import { type Config as OpenApiTsConfig } from '@redocly/client-generator';
-import { HandledError, isPlainObject, logger, pluralize } from '@redocly/openapi-core';
+import { type Config, HandledError, isPlainObject, logger, pluralize } from '@redocly/openapi-core';
 import { blue, gray, yellow } from 'colorette';
 import { basename, dirname, extname, isAbsolute, resolve as resolvePath } from 'node:path';
 
@@ -29,9 +29,9 @@ type ClientConfig = Partial<OpenApiTsConfig>;
 type Job = {
   name: string;
   api: string;
-  alias?: string;
+  aliasConfig: Config;
   clientOutput?: string;
-  perApiClient: ClientConfig;
+  client: ClientConfig;
 };
 
 // Two+ letter scheme, so Windows drive paths (`C:\...`) don't match.
@@ -74,10 +74,8 @@ export async function handleGenerateClient({
 }: CommandArgs<GenerateClientCommandArgv>) {
   const { generateClient, mergeConfig } = await import('@redocly/client-generator');
 
-  const { client, apis } = config.resolvedConfig;
   const configDir = config.configPath ? dirname(config.configPath) : process.cwd();
-  const topClient = resolveSetup((isPlainObject(client) ? client : {}) as ClientConfig, configDir);
-  const apisCfg = apis ?? {};
+  const apisCfg = config.resolvedConfig.apis ?? {};
 
   const cliFlags: ClientConfig = {
     serverUrl: argv['server-url'],
@@ -113,22 +111,21 @@ export async function handleGenerateClient({
   );
 
   const jobs: Job[] = entrypoints.map(({ path, alias }) => {
-    const apiCfg = alias === undefined ? undefined : apisCfg[alias];
+    const aliasConfig = config.forAlias(alias);
+    const { client } = aliasConfig.resolvedConfig;
     return {
       name: alias ?? basename(path, extname(path)),
-      alias,
       api: path,
-      clientOutput: apiCfg?.clientOutput,
-      perApiClient: isPlainObject(apiCfg?.client)
-        ? resolveSetup(apiCfg.client as ClientConfig, configDir)
-        : {},
+      aliasConfig,
+      clientOutput: alias === undefined ? undefined : apisCfg[alias]?.clientOutput,
+      client: resolveSetup((isPlainObject(client) ? client : {}) as ClientConfig, configDir),
     };
   });
 
   const seenOutputs = new Set<string>();
 
   for (const job of jobs) {
-    const merged = mergeConfig(mergeConfig(topClient, job.perApiClient), cliFlags);
+    const merged = mergeConfig(job.client, cliFlags);
 
     const outputPath =
       argv.output !== undefined
@@ -154,8 +151,6 @@ export async function handleGenerateClient({
       );
     }
 
-    const aliasConfig = config.forAlias(job.alias);
-
     try {
       logger.info(
         gray(`\n  Generating TypeScript client${job.name ? ` for ${job.name}` : ''}... \n`)
@@ -164,7 +159,7 @@ export async function handleGenerateClient({
         ...merged,
         api: job.api,
         output: outputPath,
-        config: aliasConfig,
+        config: job.aliasConfig,
         configDir,
       });
       const fileCount = `${result.files.length} ${pluralize('file', result.files.length)}`;

From c58957337969dc6aa24173510056144f21f69cdc Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 13 Jul 2026 13:26:08 +0300
Subject: [PATCH 096/134] fix(client-generator): UTF-8-safe basic auth encoding
 and Headers-instance normalization

---
 .../__snapshots__/package-client.test.ts.snap | 62 ++++++++++++++++---
 .../src/emitters/runtime-sources.ts           |  8 +--
 .../src/runtime/__tests__/auth.test.ts        |  9 +++
 .../src/runtime/__tests__/send.test.ts        | 28 +++++++++
 packages/client-generator/src/runtime/auth.ts |  9 ++-
 .../src/runtime/create-client.ts              |  4 +-
 packages/client-generator/src/runtime/send.ts | 19 +++++-
 packages/client-generator/src/runtime/sse.ts  |  4 +-
 tests/e2e/generate-client/auth.test.ts        |  2 +-
 .../e2e/generate-client/base-consumer/api.ts  | 21 ++++++-
 .../e2e/generate-client/cafe-consumer/api.ts  | 30 ++++++++-
 tests/e2e/generate-client/cafe.snapshot.ts    | 30 ++++++++-
 .../examples/baked-setup/src/api/client.ts    | 30 ++++++++-
 .../src/api/client.ts                         | 30 ++++++++-
 .../custom-generator/src/api/client.ts        | 30 ++++++++-
 .../custom-pagination/src/api/client.ts       | 21 ++++++-
 .../examples/customization/src/api/client.ts  | 30 ++++++++-
 .../fetch-functions/src/api/client.ts         | 30 ++++++++-
 .../examples/mock/src/api/client.ts           | 30 ++++++++-
 .../examples/nested-facade/src/api/client.ts  | 21 ++++++-
 .../examples/pagination/src/api/client.ts     | 21 ++++++-
 .../examples/programmatic/src/api/client.ts   | 30 ++++++++-
 .../examples/sse-streaming/src/api/client.ts  | 23 ++++++-
 .../examples/tanstack-query/src/api/client.ts | 30 ++++++++-
 .../examples/vendored-edge/src/api/client.ts  | 21 ++++++-
 .../zero-install-quickstart/src/api/client.ts | 21 ++++++-
 .../examples/zod/src/api/client.ts            | 30 ++++++++-
 .../pagination-consumer/api-offset.ts         | 21 ++++++-
 .../pagination-consumer/api.ts                | 21 ++++++-
 tests/e2e/generate-client/sse-consumer/api.ts | 23 ++++++-
 30 files changed, 616 insertions(+), 73 deletions(-)

diff --git a/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap b/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
index 3a9b6ba89a..a929655dfc 100644
--- a/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
+++ b/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
@@ -534,6 +534,13 @@ async function resolveToken(provider: TokenProvider): Promise<string> {
   return typeof provider === 'function' ? await provider() : provider;
 }
 
+/** UTF-8-safe base64: bare \`btoa\` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
+function encodeBase64(text: string): string {
+  let binary = '';
+  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
+  return btoa(binary);
+}
+
 /**
  * Build the auth headers/query for one operation's \`security\` requirements from the
  * instance credentials (\`config.auth\`) — capability module, wired into \`createClient\`.
@@ -564,7 +571,7 @@ async function resolveAuth(
     } else {
       const basic = config.auth?.basic;
       if (basic !== undefined) {
-        headers.Authorization = \`Basic \${btoa(\`\${basic.username}:\${basic.password}\`)}\`;
+        headers.Authorization = \`Basic \${encodeBase64(\`\${basic.username}:\${basic.password}\`)}\`;
       }
     }
   }
@@ -581,6 +588,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's \`HeadersInit\` (plain record, \`Headers\` instance, or entry pairs)
+ * to a plain record — spreading a \`Headers\` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single \`onRequest\`/\`onResponse\`/
  * \`onError\` config hooks as one implicit first middleware, then \`config.middleware\`.
@@ -615,7 +639,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -739,7 +763,7 @@ async function* sse<T>(
     if (signal?.aborted) return;
     const headers: Record<string, string> = {
       Accept: 'text/event-stream',
-      ...(rest.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(rest.headers),
     };
     const sendHeaders =
       lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
@@ -981,7 +1005,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
@@ -1829,6 +1853,13 @@ async function resolveToken(provider: TokenProvider): Promise<string> {
   return typeof provider === 'function' ? await provider() : provider;
 }
 
+/** UTF-8-safe base64: bare \`btoa\` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
+function encodeBase64(text: string): string {
+  let binary = '';
+  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
+  return btoa(binary);
+}
+
 /**
  * Build the auth headers/query for one operation's \`security\` requirements from the
  * instance credentials (\`config.auth\`) — capability module, wired into \`createClient\`.
@@ -1859,7 +1890,7 @@ async function resolveAuth(
     } else {
       const basic = config.auth?.basic;
       if (basic !== undefined) {
-        headers.Authorization = \`Basic \${btoa(\`\${basic.username}:\${basic.password}\`)}\`;
+        headers.Authorization = \`Basic \${encodeBase64(\`\${basic.username}:\${basic.password}\`)}\`;
       }
     }
   }
@@ -1981,6 +2012,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's \`HeadersInit\` (plain record, \`Headers\` instance, or entry pairs)
+ * to a plain record — spreading a \`Headers\` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single \`onRequest\`/\`onResponse\`/
  * \`onError\` config hooks as one implicit first middleware, then \`config.middleware\`.
@@ -2015,7 +2063,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -2224,7 +2272,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/packages/client-generator/src/emitters/runtime-sources.ts b/packages/client-generator/src/emitters/runtime-sources.ts
index ff0fc5aca7..7c58f8386e 100644
--- a/packages/client-generator/src/emitters/runtime-sources.ts
+++ b/packages/client-generator/src/emitters/runtime-sources.ts
@@ -13,15 +13,15 @@ export const RUNTIME_SOURCES = {
   'multipart.ts':
     "/**\n * Serialize a plain object into `FormData` for a typed `multipart/form-data` body\n * (capability module — wired into `createClient`, never imported by the send core).\n * `Blob`/`File` and strings pass through; `Date`s become ISO strings; arrays append\n * one field per item; other objects are JSON-encoded; everything else is stringified.\n * `undefined`/`null` entries are skipped.\n */\nexport function toFormData(body: Record<string, unknown>): FormData {\n  const fd = new FormData();\n  const append = (key: string, value: unknown): void => {\n    if (value === undefined || value === null) return;\n    if (value instanceof Blob || typeof value === 'string') fd.append(key, value);\n    else if (value instanceof Date) fd.append(key, value.toISOString());\n    else if (Object(value) === value) fd.append(key, JSON.stringify(value));\n    else fd.append(key, String(value));\n  };\n  for (const [key, value] of Object.entries(body)) {\n    if (Array.isArray(value)) for (const item of value) append(key, item);\n    else append(key, value);\n  }\n  return fd;\n}\n",
   'auth.ts':
-    "import type { ClientConfig, SecuritySpec, TokenProvider } from './types.js';\n\n/** Resolve a credential: a literal passes through; a function is awaited per request. */\nasync function resolveToken(provider: TokenProvider): Promise<string> {\n  return typeof provider === 'function' ? await provider() : provider;\n}\n\n/**\n * Build the auth headers/query for one operation's `security` requirements from the\n * instance credentials (`config.auth`) — capability module, wired into `createClient`.\n * A scheme with no configured credential contributes nothing (the request is sent\n * unauthenticated and the server rejects it, mirroring the generated-client behavior).\n * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.\n */\nexport async function resolveAuth(\n  security: readonly SecuritySpec[],\n  config: ClientConfig\n): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {\n  const headers: Record<string, string> = {};\n  const query: Record<string, string> = {};\n  const cookies: string[] = [];\n  for (const scheme of security) {\n    if (scheme.kind === 'apiKey') {\n      const provider = config.auth?.apiKey?.[scheme.scheme];\n      if (provider === undefined) continue;\n      const value = await resolveToken(provider);\n      if (scheme.in === 'header') headers[scheme.name] = value;\n      else if (scheme.in === 'query') query[scheme.name] = value;\n      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode\n      // so the credential can't break the `Cookie` header syntax.\n      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);\n    } else if (scheme.kind === 'bearer') {\n      const provider = config.auth?.bearer;\n      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;\n    } else {\n      const basic = config.auth?.basic;\n      if (basic !== undefined) {\n        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;\n      }\n    }\n  }\n  if (cookies.length > 0) headers.Cookie = cookies.join('; ');\n  return { headers, query };\n}\n",
+    "import type { ClientConfig, SecuritySpec, TokenProvider } from './types.js';\n\n/** Resolve a credential: a literal passes through; a function is awaited per request. */\nasync function resolveToken(provider: TokenProvider): Promise<string> {\n  return typeof provider === 'function' ? await provider() : provider;\n}\n\n/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */\nfunction encodeBase64(text: string): string {\n  let binary = '';\n  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);\n  return btoa(binary);\n}\n\n/**\n * Build the auth headers/query for one operation's `security` requirements from the\n * instance credentials (`config.auth`) — capability module, wired into `createClient`.\n * A scheme with no configured credential contributes nothing (the request is sent\n * unauthenticated and the server rejects it, mirroring the generated-client behavior).\n * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.\n */\nexport async function resolveAuth(\n  security: readonly SecuritySpec[],\n  config: ClientConfig\n): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {\n  const headers: Record<string, string> = {};\n  const query: Record<string, string> = {};\n  const cookies: string[] = [];\n  for (const scheme of security) {\n    if (scheme.kind === 'apiKey') {\n      const provider = config.auth?.apiKey?.[scheme.scheme];\n      if (provider === undefined) continue;\n      const value = await resolveToken(provider);\n      if (scheme.in === 'header') headers[scheme.name] = value;\n      else if (scheme.in === 'query') query[scheme.name] = value;\n      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode\n      // so the credential can't break the `Cookie` header syntax.\n      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);\n    } else if (scheme.kind === 'bearer') {\n      const provider = config.auth?.bearer;\n      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;\n    } else {\n      const basic = config.auth?.basic;\n      if (basic !== undefined) {\n        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;\n      }\n    }\n  }\n  if (cookies.length > 0) headers.Cookie = cookies.join('; ');\n  return { headers, query };\n}\n",
   'setup.ts':
     "import type { ClientConfig, Middleware } from './types.js';\n\n/**\n * Merge a publisher's baked setup (`defineClientSetup({...})`) with the app's config:\n * app config fields win per-field over baked defaults, while middleware composes —\n * baked middleware runs first, then the app's.\n */\nexport function mergeSetup(\n  setup: { config?: ClientConfig; middleware?: Middleware[] } | undefined,\n  config: ClientConfig = {}\n): ClientConfig {\n  return {\n    ...setup?.config,\n    ...config,\n    middleware: [...(setup?.middleware ?? []), ...(config.middleware ?? [])],\n  };\n}\n",
   'send.ts':
-    "import { abortError } from './errors.js';\nimport { defaultRetryOn, retryDelay, sleep } from './retry.js';\nimport type {\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  RequestContext,\n  RequestOptions,\n  RetryConfig,\n} from './types.js';\n\n/**\n * Optional behaviors the send core can use but never statically imports — wired by\n * `createClient` (the same seam the future inline-mode assembler relies on).\n */\nexport type SendCapabilities = {\n  /** Serialize a typed multipart body (a plain object) to FormData. */\n  serializeMultipart?: (body: Record<string, unknown>) => FormData;\n};\n\n/**\n * The effective middleware chain for a request: the single `onRequest`/`onResponse`/\n * `onError` config hooks as one implicit first middleware, then `config.middleware`.\n */\nexport function middlewareChain(config: ClientConfig): Middleware[] {\n  const single =\n    config.onRequest || config.onResponse || config.onError\n      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]\n      : [];\n  return [...single, ...(config.middleware ?? [])];\n}\n\n/**\n * The fetch core shared by every operation: default + config + per-call headers, the\n * `onRequest` chain (BEFORE body serialization, so mutations are sent), body\n * serialization (JSON, or FormData via the multipart capability), the retry loop\n * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse\n * `onResponse` onion. Returns the final response plus the request context.\n */\nexport async function send(\n  config: ClientConfig,\n  op: OperationContext,\n  url: string,\n  init: RequestOptions,\n  body: unknown | undefined,\n  multipart: boolean,\n  caps: SendCapabilities\n): Promise<{ response: Response; context: RequestContext }> {\n  const { retry: callRetry, ...fetchInit } = init;\n  const retry: RetryConfig = { ...config.retry, ...callRetry };\n  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;\n  const headers: Record<string, string> = {\n    Accept: 'application/json',\n    ...extra,\n    ...(fetchInit.headers as Record<string, string> | undefined),\n  };\n  const context: RequestContext = {\n    url,\n    method: fetchInit.method ?? 'GET',\n    headers,\n    body,\n    operation: op,\n  };\n  const middleware = middlewareChain(config);\n  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);\n  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.\n  let payload: BodyInit | undefined;\n  if (context.body !== undefined) {\n    const value = context.body;\n    const isBinary =\n      value instanceof Blob ||\n      value instanceof ArrayBuffer ||\n      ArrayBuffer.isView(value as ArrayBufferView);\n    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;\n    const isURLSearchParams = value instanceof URLSearchParams;\n    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {\n      payload = value as BodyInit;\n    } else if (multipart) {\n      if (!caps.serializeMultipart) {\n        throw new Error('Multipart capability not wired: cannot serialize the request body');\n      }\n      payload = caps.serializeMultipart(value as Record<string, unknown>);\n    } else {\n      payload = JSON.stringify(value);\n      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {\n        context.headers['Content-Type'] = 'application/json';\n      }\n    }\n  }\n  const doFetch = config.fetch ?? fetch;\n  const maxAttempts = 1 + (retry.retries ?? 0);\n  const retryOn = retry.retryOn ?? defaultRetryOn;\n  const signal = fetchInit.signal ?? undefined;\n\n  let attempt = 0;\n  while (true) {\n    attempt++;\n    if (signal?.aborted) throw abortError(signal);\n    let response: Response;\n    try {\n      response = await doFetch(context.url, {\n        ...fetchInit,\n        method: context.method,\n        headers: context.headers,\n        body: payload,\n      });\n    } catch (error) {\n      if (\n        attempt < maxAttempts &&\n        !signal?.aborted &&\n        (await retryOn({ attempt, request: context, error }))\n      ) {\n        await sleep(retryDelay(retry, attempt, null), signal);\n        continue;\n      }\n      throw error;\n    }\n    // Reverse order: the last-registered middleware wraps closest to the network (onion).\n    for (let i = middleware.length - 1; i >= 0; i--) {\n      const onResponse = middleware[i].onResponse;\n      if (onResponse) {\n        const replaced = await onResponse(response, context);\n        if (replaced) response = replaced;\n      }\n    }\n    if (\n      !response.ok &&\n      attempt < maxAttempts &&\n      !signal?.aborted &&\n      (await retryOn({ attempt, request: context, response }))\n    ) {\n      const retryAfter = response.headers.get('retry-after');\n      // Drain the abandoned response body before the next attempt: an unread body\n      // keeps the connection checked out (and can stall the pool) under Node/undici\n      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).\n      await response.body?.cancel().catch(() => undefined);\n      await sleep(retryDelay(retry, attempt, retryAfter), signal);\n      continue;\n    }\n    return { response, context };\n  }\n}\n",
+    "import { abortError } from './errors.js';\nimport { defaultRetryOn, retryDelay, sleep } from './retry.js';\nimport type {\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  RequestContext,\n  RequestOptions,\n  RetryConfig,\n} from './types.js';\n\n/**\n * Optional behaviors the send core can use but never statically imports — wired by\n * `createClient` (the same seam the future inline-mode assembler relies on).\n */\nexport type SendCapabilities = {\n  /** Serialize a typed multipart body (a plain object) to FormData. */\n  serializeMultipart?: (body: Record<string, unknown>) => FormData;\n};\n\n/**\n * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)\n * to a plain record — spreading a `Headers` or an array contributes no entries.\n */\nexport function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {\n  if (headers === undefined) return {};\n  if (headers instanceof Headers) {\n    const record: Record<string, string> = {};\n    headers.forEach((value, key) => {\n      record[key] = value;\n    });\n    return record;\n  }\n  if (Array.isArray(headers)) return Object.fromEntries(headers);\n  return headers;\n}\n\n/**\n * The effective middleware chain for a request: the single `onRequest`/`onResponse`/\n * `onError` config hooks as one implicit first middleware, then `config.middleware`.\n */\nexport function middlewareChain(config: ClientConfig): Middleware[] {\n  const single =\n    config.onRequest || config.onResponse || config.onError\n      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]\n      : [];\n  return [...single, ...(config.middleware ?? [])];\n}\n\n/**\n * The fetch core shared by every operation: default + config + per-call headers, the\n * `onRequest` chain (BEFORE body serialization, so mutations are sent), body\n * serialization (JSON, or FormData via the multipart capability), the retry loop\n * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse\n * `onResponse` onion. Returns the final response plus the request context.\n */\nexport async function send(\n  config: ClientConfig,\n  op: OperationContext,\n  url: string,\n  init: RequestOptions,\n  body: unknown | undefined,\n  multipart: boolean,\n  caps: SendCapabilities\n): Promise<{ response: Response; context: RequestContext }> {\n  const { retry: callRetry, ...fetchInit } = init;\n  const retry: RetryConfig = { ...config.retry, ...callRetry };\n  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;\n  const headers: Record<string, string> = {\n    Accept: 'application/json',\n    ...extra,\n    ...toHeaderRecord(fetchInit.headers),\n  };\n  const context: RequestContext = {\n    url,\n    method: fetchInit.method ?? 'GET',\n    headers,\n    body,\n    operation: op,\n  };\n  const middleware = middlewareChain(config);\n  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);\n  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.\n  let payload: BodyInit | undefined;\n  if (context.body !== undefined) {\n    const value = context.body;\n    const isBinary =\n      value instanceof Blob ||\n      value instanceof ArrayBuffer ||\n      ArrayBuffer.isView(value as ArrayBufferView);\n    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;\n    const isURLSearchParams = value instanceof URLSearchParams;\n    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {\n      payload = value as BodyInit;\n    } else if (multipart) {\n      if (!caps.serializeMultipart) {\n        throw new Error('Multipart capability not wired: cannot serialize the request body');\n      }\n      payload = caps.serializeMultipart(value as Record<string, unknown>);\n    } else {\n      payload = JSON.stringify(value);\n      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {\n        context.headers['Content-Type'] = 'application/json';\n      }\n    }\n  }\n  const doFetch = config.fetch ?? fetch;\n  const maxAttempts = 1 + (retry.retries ?? 0);\n  const retryOn = retry.retryOn ?? defaultRetryOn;\n  const signal = fetchInit.signal ?? undefined;\n\n  let attempt = 0;\n  while (true) {\n    attempt++;\n    if (signal?.aborted) throw abortError(signal);\n    let response: Response;\n    try {\n      response = await doFetch(context.url, {\n        ...fetchInit,\n        method: context.method,\n        headers: context.headers,\n        body: payload,\n      });\n    } catch (error) {\n      if (\n        attempt < maxAttempts &&\n        !signal?.aborted &&\n        (await retryOn({ attempt, request: context, error }))\n      ) {\n        await sleep(retryDelay(retry, attempt, null), signal);\n        continue;\n      }\n      throw error;\n    }\n    // Reverse order: the last-registered middleware wraps closest to the network (onion).\n    for (let i = middleware.length - 1; i >= 0; i--) {\n      const onResponse = middleware[i].onResponse;\n      if (onResponse) {\n        const replaced = await onResponse(response, context);\n        if (replaced) response = replaced;\n      }\n    }\n    if (\n      !response.ok &&\n      attempt < maxAttempts &&\n      !signal?.aborted &&\n      (await retryOn({ attempt, request: context, response }))\n    ) {\n      const retryAfter = response.headers.get('retry-after');\n      // Drain the abandoned response body before the next attempt: an unread body\n      // keeps the connection checked out (and can stall the pool) under Node/undici\n      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).\n      await response.body?.cancel().catch(() => undefined);\n      await sleep(retryDelay(retry, attempt, retryAfter), signal);\n      continue;\n    }\n    return { response, context };\n  }\n}\n",
   'sse.ts':
-    "import { ApiError } from './errors.js';\nimport { readError } from './parse.js';\nimport { sleep } from './retry.js';\nimport { send } from './send.js';\nimport type { ClientConfig, OperationContext, ServerSentEvent, SseOptions } from './types.js';\n\n/**\n * A frame delimiter: two consecutive line terminators (each CR, LF, or CRLF, per the SSE\n * spec — so mixed endings like `\\n\\r\\n` are valid boundaries, not just matching pairs).\n */\nconst FRAME_DELIMITER = /(?:\\r\\n|\\r|\\n){2}/;\n\n/** An event's JSON `data` failed to parse — a stable bad payload, not a dropped connection. */\nexport class SseParseError extends Error {}\n\n/**\n * Consume a `text/event-stream` operation as typed events (capability module — wired\n * into `createClient`). Auto-reconnects on dropped connections, resuming from the last\n * seen event id via `Last-Event-ID` (backoff: the server's `retry:` value, then\n * `reconnectDelay`, then 1s — exponential with jitter, capped at 30s). A clean stream\n * end flushes a trailing frame and finishes; `break`/abort end the iterator cleanly.\n */\nexport async function* sse<T>(\n  config: ClientConfig,\n  op: OperationContext,\n  prepare: () => Promise<{ url: string; init: SseOptions }>,\n  dataKind: 'json' | 'text' = 'text'\n): AsyncGenerator<ServerSentEvent<T>> {\n  let lastEventId: string | undefined;\n  let serverRetry: number | undefined;\n  let failures = 0;\n  while (true) {\n    // Re-prepare each attempt so a refresh-style TokenProvider yields a fresh credential\n    // on reconnect (the auth is baked into `url` query + `init.headers`). `reconnect`,\n    // `reconnectDelay`, and `signal` come from the caller's original options unchanged.\n    const { url, init } = await prepare();\n    const { reconnect = true, reconnectDelay, ...rest } = init;\n    const signal = rest.signal ?? undefined;\n    if (signal?.aborted) return;\n    const headers: Record<string, string> = {\n      Accept: 'text/event-stream',\n      ...(rest.headers as Record<string, string> | undefined),\n    };\n    const sendHeaders =\n      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };\n    try {\n      const { response } = await send(\n        config,\n        op,\n        url,\n        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },\n        undefined,\n        false,\n        {}\n      );\n      if (!response.ok) {\n        const errorBody = await readError(response);\n        throw new ApiError(url, response.status, response.statusText, errorBody);\n      }\n      failures = 0;\n      const body = response.body;\n      if (!body) return;\n      const reader = body.getReader();\n      const decoder = new TextDecoder();\n      let buffer = '';\n      try {\n        while (true) {\n          const { done, value } = await reader.read();\n          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });\n          let match: RegExpMatchArray | null;\n          while ((match = buffer.match(FRAME_DELIMITER)) !== null) {\n            const index = match.index!;\n            const raw = buffer.slice(0, index);\n            buffer = buffer.slice(index + match[0].length);\n            const event = parseSseFrame(raw, dataKind);\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n          }\n          if (done) {\n            // Stream closed cleanly. Flush a final event that arrived without a trailing\n            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.\n            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n            return;\n          }\n          // Bound memory: a server that never sends a frame delimiter would otherwise\n          // grow `buffer` without limit. 1 MiB is far above any real SSE frame.\n          if (buffer.length > 1048576) {\n            throw new Error('SSE frame exceeded 1048576 characters without a delimiter');\n          }\n        }\n      } finally {\n        await reader.cancel().catch(() => undefined);\n      }\n    } catch (error) {\n      if (signal?.aborted) return;\n      // A non-OK HTTP response (4xx/5xx) or an unparseable JSON payload is a definitive\n      // error, not a transient drop — surface it instead of reconnecting in a loop (a\n      // stable bad payload would otherwise reconnect forever).\n      if (error instanceof ApiError || error instanceof SseParseError) throw error;\n      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream\n      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.\n      if (!reconnect) throw error;\n    }\n    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.\n    failures++;\n    const base = serverRetry ?? reconnectDelay ?? 1000;\n    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);\n    try {\n      await sleep(Math.random() * delay, signal);\n    } catch {\n      return; // sleep rejects only on abort — end the iterator cleanly\n    }\n  }\n}\n\n/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */\nexport function parseSseFrame(\n  raw: string,\n  dataKind: 'json' | 'text'\n): ServerSentEvent<unknown> | undefined {\n  let event: string | undefined;\n  const dataLines: string[] = [];\n  let id: string | undefined;\n  let retry: number | undefined;\n  let sawField = false;\n  for (const line of raw.split(/\\r\\n|\\n|\\r/)) {\n    if (line === '' || line.startsWith(':')) continue;\n    const colon = line.indexOf(':');\n    const field = colon === -1 ? line : line.slice(0, colon);\n    let val = colon === -1 ? '' : line.slice(colon + 1);\n    if (val.startsWith(' ')) val = val.slice(1);\n    sawField = true;\n    if (field === 'event') event = val;\n    else if (field === 'data') dataLines.push(val);\n    else if (field === 'id') id = val;\n    else if (field === 'retry') {\n      const n = Number(val);\n      if (!Number.isNaN(n)) retry = n;\n    }\n  }\n  if (!sawField) return undefined;\n  const dataText = dataLines.join('\\n');\n  let data: unknown = dataText;\n  if (dataKind === 'json' && dataText !== '') {\n    try {\n      data = JSON.parse(dataText);\n    } catch (error) {\n      throw new SseParseError(\n        `Failed to parse SSE event data as JSON: ${error instanceof Error ? error.message : String(error)}`\n      );\n    }\n  }\n  return { event, data, id, retry };\n}\n",
+    "import { ApiError } from './errors.js';\nimport { readError } from './parse.js';\nimport { sleep } from './retry.js';\nimport { send, toHeaderRecord } from './send.js';\nimport type { ClientConfig, OperationContext, ServerSentEvent, SseOptions } from './types.js';\n\n/**\n * A frame delimiter: two consecutive line terminators (each CR, LF, or CRLF, per the SSE\n * spec — so mixed endings like `\\n\\r\\n` are valid boundaries, not just matching pairs).\n */\nconst FRAME_DELIMITER = /(?:\\r\\n|\\r|\\n){2}/;\n\n/** An event's JSON `data` failed to parse — a stable bad payload, not a dropped connection. */\nexport class SseParseError extends Error {}\n\n/**\n * Consume a `text/event-stream` operation as typed events (capability module — wired\n * into `createClient`). Auto-reconnects on dropped connections, resuming from the last\n * seen event id via `Last-Event-ID` (backoff: the server's `retry:` value, then\n * `reconnectDelay`, then 1s — exponential with jitter, capped at 30s). A clean stream\n * end flushes a trailing frame and finishes; `break`/abort end the iterator cleanly.\n */\nexport async function* sse<T>(\n  config: ClientConfig,\n  op: OperationContext,\n  prepare: () => Promise<{ url: string; init: SseOptions }>,\n  dataKind: 'json' | 'text' = 'text'\n): AsyncGenerator<ServerSentEvent<T>> {\n  let lastEventId: string | undefined;\n  let serverRetry: number | undefined;\n  let failures = 0;\n  while (true) {\n    // Re-prepare each attempt so a refresh-style TokenProvider yields a fresh credential\n    // on reconnect (the auth is baked into `url` query + `init.headers`). `reconnect`,\n    // `reconnectDelay`, and `signal` come from the caller's original options unchanged.\n    const { url, init } = await prepare();\n    const { reconnect = true, reconnectDelay, ...rest } = init;\n    const signal = rest.signal ?? undefined;\n    if (signal?.aborted) return;\n    const headers: Record<string, string> = {\n      Accept: 'text/event-stream',\n      ...toHeaderRecord(rest.headers),\n    };\n    const sendHeaders =\n      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };\n    try {\n      const { response } = await send(\n        config,\n        op,\n        url,\n        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },\n        undefined,\n        false,\n        {}\n      );\n      if (!response.ok) {\n        const errorBody = await readError(response);\n        throw new ApiError(url, response.status, response.statusText, errorBody);\n      }\n      failures = 0;\n      const body = response.body;\n      if (!body) return;\n      const reader = body.getReader();\n      const decoder = new TextDecoder();\n      let buffer = '';\n      try {\n        while (true) {\n          const { done, value } = await reader.read();\n          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });\n          let match: RegExpMatchArray | null;\n          while ((match = buffer.match(FRAME_DELIMITER)) !== null) {\n            const index = match.index!;\n            const raw = buffer.slice(0, index);\n            buffer = buffer.slice(index + match[0].length);\n            const event = parseSseFrame(raw, dataKind);\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n          }\n          if (done) {\n            // Stream closed cleanly. Flush a final event that arrived without a trailing\n            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.\n            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n            return;\n          }\n          // Bound memory: a server that never sends a frame delimiter would otherwise\n          // grow `buffer` without limit. 1 MiB is far above any real SSE frame.\n          if (buffer.length > 1048576) {\n            throw new Error('SSE frame exceeded 1048576 characters without a delimiter');\n          }\n        }\n      } finally {\n        await reader.cancel().catch(() => undefined);\n      }\n    } catch (error) {\n      if (signal?.aborted) return;\n      // A non-OK HTTP response (4xx/5xx) or an unparseable JSON payload is a definitive\n      // error, not a transient drop — surface it instead of reconnecting in a loop (a\n      // stable bad payload would otherwise reconnect forever).\n      if (error instanceof ApiError || error instanceof SseParseError) throw error;\n      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream\n      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.\n      if (!reconnect) throw error;\n    }\n    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.\n    failures++;\n    const base = serverRetry ?? reconnectDelay ?? 1000;\n    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);\n    try {\n      await sleep(Math.random() * delay, signal);\n    } catch {\n      return; // sleep rejects only on abort — end the iterator cleanly\n    }\n  }\n}\n\n/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */\nexport function parseSseFrame(\n  raw: string,\n  dataKind: 'json' | 'text'\n): ServerSentEvent<unknown> | undefined {\n  let event: string | undefined;\n  const dataLines: string[] = [];\n  let id: string | undefined;\n  let retry: number | undefined;\n  let sawField = false;\n  for (const line of raw.split(/\\r\\n|\\n|\\r/)) {\n    if (line === '' || line.startsWith(':')) continue;\n    const colon = line.indexOf(':');\n    const field = colon === -1 ? line : line.slice(0, colon);\n    let val = colon === -1 ? '' : line.slice(colon + 1);\n    if (val.startsWith(' ')) val = val.slice(1);\n    sawField = true;\n    if (field === 'event') event = val;\n    else if (field === 'data') dataLines.push(val);\n    else if (field === 'id') id = val;\n    else if (field === 'retry') {\n      const n = Number(val);\n      if (!Number.isNaN(n)) retry = n;\n    }\n  }\n  if (!sawField) return undefined;\n  const dataText = dataLines.join('\\n');\n  let data: unknown = dataText;\n  if (dataKind === 'json' && dataText !== '') {\n    try {\n      data = JSON.parse(dataText);\n    } catch (error) {\n      throw new SseParseError(\n        `Failed to parse SSE event data as JSON: ${error instanceof Error ? error.message : String(error)}`\n      );\n    }\n  }\n  return { event, data, id, retry };\n}\n",
   'create-client.ts':
-    "import { ApiError } from './errors.js';\nimport { parse, readError } from './parse.js';\nimport { middlewareChain, send, type SendCapabilities } from './send.js';\nimport type {\n  ApiErrorLike,\n  Client,\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  OperationDescriptor,\n  OpsShape,\n  PaginationSpec,\n  ParseAs,\n  QueryValue,\n  RequestOptions,\n  SecuritySpec,\n  ServerSentEvent,\n  SseOptions,\n  TokenProvider,\n} from './types.js';\nimport { buildUrl, substitutePath, type QueryStyle } from './url.js';\n\n/**\n * The optional behaviors `createClientCore` can dispatch to but never statically\n * imports. The package's public `createClient` wires the full set; the future\n * inline-mode assembler wires only the capabilities a spec needs.\n */\nexport type Capabilities = SendCapabilities & {\n  resolveAuth?: (\n    security: readonly SecuritySpec[],\n    config: ClientConfig\n  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;\n  sse?: (\n    config: ClientConfig,\n    op: OperationContext,\n    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style\n    // TokenProvider issue a fresh credential after a dropped stream reconnects.\n    prepare: () => Promise<{ url: string; init: SseOptions }>,\n    dataKind: 'json' | 'text'\n  ) => AsyncGenerator<ServerSentEvent<unknown>>;\n  paginate?: {\n    pages: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n    items: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n  };\n};\n\n/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */\nexport type OperationArgs = {\n  params?: Record<string, QueryValue>;\n  body?: unknown;\n  headers?: Record<string, unknown>;\n} & Record<string, unknown>;\n\n/** The response reader implied by the descriptor (before any per-call `parseAs` override). */\nfunction kindFor(op: OperationDescriptor): ParseAs | 'void' {\n  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {\n    return op.responseKind;\n  }\n  return 'auto';\n}\n\n/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */\nfunction splitArgs(op: OperationDescriptor, args: OperationArgs) {\n  const path: Record<string, unknown> = {};\n  for (const param of op.params ?? []) {\n    if (param.in === 'path') path[param.name] = args[param.name];\n  }\n  return { path, query: args.params, body: args.body, headers: args.headers };\n}\n\n/**\n * The query-serialization hints for the descriptor's query params. A spec is built only\n * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),\n * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)\n * are honored, and an omitted `explode` keeps the exploded default.\n */\nfunction queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {\n  let styles: Record<string, QueryStyle> | undefined;\n  for (const param of op.params ?? []) {\n    if (param.in !== 'query') continue;\n    const deviates =\n      (param.style !== undefined && param.style !== 'form') ||\n      param.explode === false ||\n      param.allowReserved === true;\n    if (!deviates) continue;\n    styles ??= {};\n    styles[param.name] = {\n      style: param.style ?? 'form',\n      explode: param.explode ?? true,\n      allowReserved: param.allowReserved,\n    };\n  }\n  return styles;\n}\n\n/** Stringify caller-supplied extra headers, skipping empty entries. */\nfunction stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {\n  const out: Record<string, string> = {};\n  for (const [key, value] of Object.entries(headers ?? {})) {\n    if (value !== undefined && value !== null) out[key] = String(value);\n  }\n  return out;\n}\n\n/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */\nasync function prepareRequest(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions | SseOptions,\n  caps: Capabilities\n): Promise<{ url: string; init: RequestOptions; body: unknown }> {\n  const { path, query, body, headers } = splitArgs(op, args);\n  const authed =\n    op.security?.length && caps.resolveAuth\n      ? await caps.resolveAuth(op.security, config)\n      : { headers: {}, query: {} };\n  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };\n  const url = buildUrl(\n    config.serverUrl ?? '',\n    substitutePath(op.path, path),\n    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,\n    queryStyles(op)\n  );\n  const mergedInit: RequestOptions = {\n    ...init,\n    method: op.method.toUpperCase(),\n    // Precedence, lowest → highest (later spreads win): injected auth → explicit\n    // header params → caller `init.headers` — the caller always overrides both.\n    headers: {\n      ...authed.headers,\n      ...stringHeaders(headers),\n      ...(init.headers as Record<string, string> | undefined),\n    },\n  };\n  return { url, init: mergedInit, body };\n}\n\n/** One non-SSE call: send, then branch on the configured error mode. */\nasync function execute(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions,\n  caps: Capabilities\n): Promise<unknown> {\n  const prepared = await prepareRequest(config, op, args, init, caps);\n  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n  const { parseAs, ...sendInit } = prepared.init;\n  const { response, context } = await send(\n    config,\n    opCtx,\n    prepared.url,\n    sendInit,\n    prepared.body,\n    op.body?.multipart === true,\n    caps\n  );\n  const readKind = parseAs ?? kindFor(op);\n  if (config.errorMode === 'result') {\n    if (!response.ok) {\n      return { data: undefined, error: await readError(response), response };\n    }\n    return { data: await parse(response, readKind), error: undefined, response };\n  }\n  if (!response.ok) {\n    let error: globalThis.Error = new ApiError(\n      context.url,\n      response.status,\n      response.statusText,\n      await readError(response)\n    );\n    // Thread the error through each middleware's onError in turn (each may replace it).\n    for (const mw of middlewareChain(config)) {\n      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);\n    }\n    throw error;\n  }\n  return parse(response, readKind);\n}\n\n/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */\nfunction paginateCapability(caps: Capabilities, op: OperationDescriptor) {\n  if (!caps.paginate) {\n    throw new Error(`Pagination capability not wired: cannot iterate operation \"${op.id}\"`);\n  }\n  return caps.paginate;\n}\n\n/**\n * The per-page call the iterators drive: the method itself in throw mode; in result\n * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page\n * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is\n * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).\n */\nfunction pageCall(\n  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  config: ClientConfig\n) {\n  if (config.errorMode !== 'result') return method;\n  return async (args?: OperationArgs, init?: RequestOptions) => {\n    const envelope = (await method(args, init)) as {\n      data: unknown;\n      error: unknown;\n      response: Response;\n    };\n    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page\n    // (204/void) also parses to undefined data, and a failed page's `error` can be\n    // undefined too (unreadable body). The pointers then miss on the undefined data\n    // and iteration stops cleanly, which is the correct semantics for an empty page.\n    if (!envelope.response.ok) {\n      const { response } = envelope;\n      throw new ApiError(response.url, response.status, response.statusText, envelope.error);\n    }\n    return envelope.data;\n  };\n}\n\n/**\n * Build a typed instance client over operation descriptors: one real bound method per\n * operation (attached by a construction-time loop — no Proxy), plus the core members\n * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name\n * collision with an operation. All behavior dispatches through the capability seam.\n */\nexport function createClientCore<\n  Ops extends OpsShape,\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n>(\n  operations: Record<string, OperationDescriptor>,\n  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},\n  caps: Capabilities = {}\n): Client<Ops, OperationContext<Id, Path, Tag>> {\n  // The literal-union narrowing is a compile-time DX contract only; internally the\n  // runtime works with the base (string-typed) context. One cast at this boundary —\n  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx\n  // params are contravariant).\n  const given = initial as ClientConfig;\n  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.\n  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };\n  const client = {} as Record<string, unknown>;\n\n  for (const [name, op] of Object.entries(operations)) {\n    if (op.responseKind === 'sse') {\n      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {\n        if (!caps.sse) {\n          throw new Error(`SSE capability not wired: cannot stream operation \"${op.id}\"`);\n        }\n        const stream = caps.sse;\n        return (async function* () {\n          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`\n          // resolves) is refreshed per attempt rather than frozen at the first connect.\n          const prepare = async () => {\n            const prepared = await prepareRequest(config, op, args, init, caps);\n            return { url: prepared.url, init: prepared.init as SseOptions };\n          };\n          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');\n        })();\n      };\n    } else {\n      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>\n        execute(config, op, args, init, caps);\n      const spec = op.pagination;\n      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching\n      // through the capability seam (like SSE: absent capability throws descriptively).\n      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on\n      // a result-mode client (`errorMode` is fixed at construction — `configure()`\n      // ignores it) each page's envelope is unwrapped before it reaches the capability.\n      // A failed page aborts iteration by throwing ApiError, even on result-mode\n      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.\n      client[name] = spec\n        ? Object.assign(method, {\n            pages: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),\n            items: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),\n          })\n        : method;\n    }\n  }\n\n  // Core members are assigned AFTER the operation loop — they win over colliding op names.\n  client.configure = (next: ClientConfig): void => {\n    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at\n    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.\n    const { errorMode: _fixed, auth, ...rest } = next;\n    Object.assign(config, rest);\n    // `auth` merges into existing credentials (like the `auth.*` setters) rather than\n    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set\n    // basic/apiKey. `apiKey` merges per scheme.\n    if (auth) {\n      config.auth = {\n        ...config.auth,\n        ...auth,\n        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),\n      };\n    }\n  };\n  client.use = (...middleware: Middleware[]): void => {\n    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.\n    config.middleware = [...(config.middleware ?? []), ...middleware];\n  };\n  client.auth = {\n    bearer(token: TokenProvider): void {\n      config.auth = { ...config.auth, bearer: token };\n    },\n    basic(username: string, password: string): void {\n      config.auth = { ...config.auth, basic: { username, password } };\n    },\n    apiKey(scheme: string, value: TokenProvider): void {\n      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };\n    },\n  };\n\n  return client as Client<Ops, OperationContext<Id, Path, Tag>>;\n}\n",
+    "import { ApiError } from './errors.js';\nimport { parse, readError } from './parse.js';\nimport { middlewareChain, send, toHeaderRecord, type SendCapabilities } from './send.js';\nimport type {\n  ApiErrorLike,\n  Client,\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  OperationDescriptor,\n  OpsShape,\n  PaginationSpec,\n  ParseAs,\n  QueryValue,\n  RequestOptions,\n  SecuritySpec,\n  ServerSentEvent,\n  SseOptions,\n  TokenProvider,\n} from './types.js';\nimport { buildUrl, substitutePath, type QueryStyle } from './url.js';\n\n/**\n * The optional behaviors `createClientCore` can dispatch to but never statically\n * imports. The package's public `createClient` wires the full set; the future\n * inline-mode assembler wires only the capabilities a spec needs.\n */\nexport type Capabilities = SendCapabilities & {\n  resolveAuth?: (\n    security: readonly SecuritySpec[],\n    config: ClientConfig\n  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;\n  sse?: (\n    config: ClientConfig,\n    op: OperationContext,\n    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style\n    // TokenProvider issue a fresh credential after a dropped stream reconnects.\n    prepare: () => Promise<{ url: string; init: SseOptions }>,\n    dataKind: 'json' | 'text'\n  ) => AsyncGenerator<ServerSentEvent<unknown>>;\n  paginate?: {\n    pages: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n    items: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n  };\n};\n\n/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */\nexport type OperationArgs = {\n  params?: Record<string, QueryValue>;\n  body?: unknown;\n  headers?: Record<string, unknown>;\n} & Record<string, unknown>;\n\n/** The response reader implied by the descriptor (before any per-call `parseAs` override). */\nfunction kindFor(op: OperationDescriptor): ParseAs | 'void' {\n  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {\n    return op.responseKind;\n  }\n  return 'auto';\n}\n\n/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */\nfunction splitArgs(op: OperationDescriptor, args: OperationArgs) {\n  const path: Record<string, unknown> = {};\n  for (const param of op.params ?? []) {\n    if (param.in === 'path') path[param.name] = args[param.name];\n  }\n  return { path, query: args.params, body: args.body, headers: args.headers };\n}\n\n/**\n * The query-serialization hints for the descriptor's query params. A spec is built only\n * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),\n * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)\n * are honored, and an omitted `explode` keeps the exploded default.\n */\nfunction queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {\n  let styles: Record<string, QueryStyle> | undefined;\n  for (const param of op.params ?? []) {\n    if (param.in !== 'query') continue;\n    const deviates =\n      (param.style !== undefined && param.style !== 'form') ||\n      param.explode === false ||\n      param.allowReserved === true;\n    if (!deviates) continue;\n    styles ??= {};\n    styles[param.name] = {\n      style: param.style ?? 'form',\n      explode: param.explode ?? true,\n      allowReserved: param.allowReserved,\n    };\n  }\n  return styles;\n}\n\n/** Stringify caller-supplied extra headers, skipping empty entries. */\nfunction stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {\n  const out: Record<string, string> = {};\n  for (const [key, value] of Object.entries(headers ?? {})) {\n    if (value !== undefined && value !== null) out[key] = String(value);\n  }\n  return out;\n}\n\n/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */\nasync function prepareRequest(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions | SseOptions,\n  caps: Capabilities\n): Promise<{ url: string; init: RequestOptions; body: unknown }> {\n  const { path, query, body, headers } = splitArgs(op, args);\n  const authed =\n    op.security?.length && caps.resolveAuth\n      ? await caps.resolveAuth(op.security, config)\n      : { headers: {}, query: {} };\n  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };\n  const url = buildUrl(\n    config.serverUrl ?? '',\n    substitutePath(op.path, path),\n    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,\n    queryStyles(op)\n  );\n  const mergedInit: RequestOptions = {\n    ...init,\n    method: op.method.toUpperCase(),\n    // Precedence, lowest → highest (later spreads win): injected auth → explicit\n    // header params → caller `init.headers` — the caller always overrides both.\n    headers: {\n      ...authed.headers,\n      ...stringHeaders(headers),\n      ...toHeaderRecord(init.headers),\n    },\n  };\n  return { url, init: mergedInit, body };\n}\n\n/** One non-SSE call: send, then branch on the configured error mode. */\nasync function execute(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions,\n  caps: Capabilities\n): Promise<unknown> {\n  const prepared = await prepareRequest(config, op, args, init, caps);\n  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n  const { parseAs, ...sendInit } = prepared.init;\n  const { response, context } = await send(\n    config,\n    opCtx,\n    prepared.url,\n    sendInit,\n    prepared.body,\n    op.body?.multipart === true,\n    caps\n  );\n  const readKind = parseAs ?? kindFor(op);\n  if (config.errorMode === 'result') {\n    if (!response.ok) {\n      return { data: undefined, error: await readError(response), response };\n    }\n    return { data: await parse(response, readKind), error: undefined, response };\n  }\n  if (!response.ok) {\n    let error: globalThis.Error = new ApiError(\n      context.url,\n      response.status,\n      response.statusText,\n      await readError(response)\n    );\n    // Thread the error through each middleware's onError in turn (each may replace it).\n    for (const mw of middlewareChain(config)) {\n      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);\n    }\n    throw error;\n  }\n  return parse(response, readKind);\n}\n\n/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */\nfunction paginateCapability(caps: Capabilities, op: OperationDescriptor) {\n  if (!caps.paginate) {\n    throw new Error(`Pagination capability not wired: cannot iterate operation \"${op.id}\"`);\n  }\n  return caps.paginate;\n}\n\n/**\n * The per-page call the iterators drive: the method itself in throw mode; in result\n * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page\n * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is\n * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).\n */\nfunction pageCall(\n  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  config: ClientConfig\n) {\n  if (config.errorMode !== 'result') return method;\n  return async (args?: OperationArgs, init?: RequestOptions) => {\n    const envelope = (await method(args, init)) as {\n      data: unknown;\n      error: unknown;\n      response: Response;\n    };\n    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page\n    // (204/void) also parses to undefined data, and a failed page's `error` can be\n    // undefined too (unreadable body). The pointers then miss on the undefined data\n    // and iteration stops cleanly, which is the correct semantics for an empty page.\n    if (!envelope.response.ok) {\n      const { response } = envelope;\n      throw new ApiError(response.url, response.status, response.statusText, envelope.error);\n    }\n    return envelope.data;\n  };\n}\n\n/**\n * Build a typed instance client over operation descriptors: one real bound method per\n * operation (attached by a construction-time loop — no Proxy), plus the core members\n * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name\n * collision with an operation. All behavior dispatches through the capability seam.\n */\nexport function createClientCore<\n  Ops extends OpsShape,\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n>(\n  operations: Record<string, OperationDescriptor>,\n  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},\n  caps: Capabilities = {}\n): Client<Ops, OperationContext<Id, Path, Tag>> {\n  // The literal-union narrowing is a compile-time DX contract only; internally the\n  // runtime works with the base (string-typed) context. One cast at this boundary —\n  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx\n  // params are contravariant).\n  const given = initial as ClientConfig;\n  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.\n  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };\n  const client = {} as Record<string, unknown>;\n\n  for (const [name, op] of Object.entries(operations)) {\n    if (op.responseKind === 'sse') {\n      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {\n        if (!caps.sse) {\n          throw new Error(`SSE capability not wired: cannot stream operation \"${op.id}\"`);\n        }\n        const stream = caps.sse;\n        return (async function* () {\n          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`\n          // resolves) is refreshed per attempt rather than frozen at the first connect.\n          const prepare = async () => {\n            const prepared = await prepareRequest(config, op, args, init, caps);\n            return { url: prepared.url, init: prepared.init as SseOptions };\n          };\n          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');\n        })();\n      };\n    } else {\n      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>\n        execute(config, op, args, init, caps);\n      const spec = op.pagination;\n      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching\n      // through the capability seam (like SSE: absent capability throws descriptively).\n      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on\n      // a result-mode client (`errorMode` is fixed at construction — `configure()`\n      // ignores it) each page's envelope is unwrapped before it reaches the capability.\n      // A failed page aborts iteration by throwing ApiError, even on result-mode\n      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.\n      client[name] = spec\n        ? Object.assign(method, {\n            pages: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),\n            items: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),\n          })\n        : method;\n    }\n  }\n\n  // Core members are assigned AFTER the operation loop — they win over colliding op names.\n  client.configure = (next: ClientConfig): void => {\n    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at\n    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.\n    const { errorMode: _fixed, auth, ...rest } = next;\n    Object.assign(config, rest);\n    // `auth` merges into existing credentials (like the `auth.*` setters) rather than\n    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set\n    // basic/apiKey. `apiKey` merges per scheme.\n    if (auth) {\n      config.auth = {\n        ...config.auth,\n        ...auth,\n        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),\n      };\n    }\n  };\n  client.use = (...middleware: Middleware[]): void => {\n    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.\n    config.middleware = [...(config.middleware ?? []), ...middleware];\n  };\n  client.auth = {\n    bearer(token: TokenProvider): void {\n      config.auth = { ...config.auth, bearer: token };\n    },\n    basic(username: string, password: string): void {\n      config.auth = { ...config.auth, basic: { username, password } };\n    },\n    apiKey(scheme: string, value: TokenProvider): void {\n      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };\n    },\n  };\n\n  return client as Client<Ops, OperationContext<Id, Path, Tag>>;\n}\n",
   'paginate.ts':
     "import type { OperationArgs } from './create-client.js';\nimport type { PaginationSpec, QueryValue, RequestOptions } from './types.js';\n\n/**\n * Auto-pagination (capability module — wired into `createClient`, dispatched by the\n * method's `.pages()`/`.items()`): walk an operation's pages by advancing the descriptor's\n * `param` query parameter, per its `style`. The caller's args are never mutated — each\n * request gets a fresh `params` clone — and `init` is forwarded to every call.\n *\n * Iteration is error-mode-agnostic: `call` always resolves to the RAW page (on a\n * result-mode client the attachment unwraps the envelope first), so a failed page\n * aborts iteration by throwing `ApiError`, even on result-mode clients; the `onError`\n * middleware hook (throw-mode-only) is not invoked.\n */\n\n/**\n * Resolve an RFC 6901 JSON pointer (`~1` → `/`, `~0` → `~`) against a value.\n * The empty pointer is the whole document; anything else must start with `/`.\n * Returns `undefined` on any miss (bad token, absent key, non-object step) — never throws.\n */\nexport function resolvePointer(value: unknown, pointer: string): unknown {\n  if (pointer === '') return value;\n  if (!pointer.startsWith('/')) return undefined;\n  let current = value;\n  for (const token of pointer.slice(1).split('/')) {\n    const key = token.replaceAll('~1', '/').replaceAll('~0', '~');\n    if (Array.isArray(current)) {\n      if (!/^(0|[1-9]\\d*)$/.test(key)) return undefined;\n      current = current[Number(key)];\n    } else if (Object(current) === current && key in (current as object)) {\n      current = (current as Record<string, unknown>)[key];\n    } else {\n      return undefined;\n    }\n  }\n  return current;\n}\n\n/**\n * Iterate an operation's full page results. Every page is yielded before the stop\n * condition is evaluated, so the last page always arrives. Cursor style resumes from a\n * caller-provided `params[spec.param]`, stops when `nextCursor` resolves to\n * `undefined`/`null`/`''`, and throws if the next cursor is not a string or number, or\n * if the same cursor comes back twice in a row (infinite-loop guards). Offset/page\n * styles advance by item count / by one and stop when\n * the `items` pointer misses or the array is empty.\n */\nexport async function* pages<TPage>(\n  call: (args?: OperationArgs, init?: RequestOptions) => Promise<TPage>,\n  spec: PaginationSpec,\n  args: OperationArgs = {},\n  init?: RequestOptions\n): AsyncGenerator<TPage> {\n  if (spec.style === 'cursor') {\n    let cursor: unknown = args.params?.[spec.param];\n    while (true) {\n      const params = { ...args.params };\n      if (cursor !== undefined) params[spec.param] = cursor as QueryValue;\n      const page = await call({ ...args, params }, init);\n      yield page;\n      const next = resolvePointer(page, spec.nextCursor!);\n      if (next === undefined || next === null || next === '') return;\n      if (typeof next !== 'string' && typeof next !== 'number') {\n        // A fresh non-scalar cursor never compares equal, so without this guard a lying\n        // server would slip past the did-not-advance check into an infinite loop.\n        throw new Error(`Pagination cursor at ${spec.nextCursor} is not a string or number`);\n      }\n      if (next === cursor) {\n        throw new Error('Pagination did not advance: operation returned the same cursor twice');\n      }\n      cursor = next;\n    }\n  } else {\n    // Coerce the starting position to a number: a caller may pass `params[spec.param]` as a\n    // string (common from URL/form input), and `+=` on a string would concatenate.\n    const start = args.params?.[spec.param];\n    const fallback = spec.style === 'page' ? 1 : 0;\n    let position = start === undefined || Number.isNaN(Number(start)) ? fallback : Number(start);\n    while (true) {\n      const page = await call(\n        { ...args, params: { ...args.params, [spec.param]: position } },\n        init\n      );\n      yield page;\n      const pageItems = resolvePointer(page, spec.items);\n      if (!Array.isArray(pageItems) || pageItems.length === 0) return;\n      position += spec.style === 'page' ? 1 : pageItems.length;\n    }\n  }\n}\n\n/**\n * Iterate the operation's individual items: each page's `items` pointer, flattened.\n * A cursor-style page whose pointer misses yields nothing but pagination continues;\n * for offset/page styles a miss has already stopped `pages`.\n */\nexport async function* items<TItem>(\n  call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  spec: PaginationSpec,\n  args?: OperationArgs,\n  init?: RequestOptions\n): AsyncGenerator<TItem> {\n  for await (const page of pages(call, spec, args, init)) {\n    const pageItems = resolvePointer(page, spec.items);\n    if (Array.isArray(pageItems)) yield* pageItems as TItem[];\n  }\n}\n",
 } as const;
diff --git a/packages/client-generator/src/runtime/__tests__/auth.test.ts b/packages/client-generator/src/runtime/__tests__/auth.test.ts
index 89f6b85d60..760e75bfd1 100644
--- a/packages/client-generator/src/runtime/__tests__/auth.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/auth.test.ts
@@ -30,6 +30,15 @@ describe('resolveAuth', () => {
     expect(key.headers.Cookie).toBe('sid=C; ses=D');
   });
 
+  it('encodes non-Latin-1 basic credentials (bare btoa would throw InvalidCharacterError)', async () => {
+    const basic = await resolveAuth([{ scheme: 'b', kind: 'basic' }], {
+      auth: { basic: { username: 'usér', password: 'på§s' } },
+    });
+    expect(basic.headers.Authorization).toBe(
+      `Basic ${Buffer.from('usér:på§s', 'utf-8').toString('base64')}`
+    );
+  });
+
   it('percent-encodes cookie credentials so reserved characters cannot break the header', async () => {
     const key = await resolveAuth([{ scheme: 'c', kind: 'apiKey', name: 'sid', in: 'cookie' }], {
       auth: { apiKey: { c: 'a b;c=d' } },
diff --git a/packages/client-generator/src/runtime/__tests__/send.test.ts b/packages/client-generator/src/runtime/__tests__/send.test.ts
index 068fd46648..deee770973 100644
--- a/packages/client-generator/src/runtime/__tests__/send.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/send.test.ts
@@ -196,6 +196,34 @@ describe('send', () => {
     expect(headers.Accept).toBe('application/json');
   });
 
+  it('honors per-call headers given as a Headers instance or entry pairs (not just a record)', async () => {
+    const { calls, fetchImpl } = fetchSpy([ok(), ok()]);
+    await send(
+      { fetch: fetchImpl },
+      op,
+      'u',
+      { method: 'GET', headers: new Headers({ 'X-Trace': 'from-headers-instance' }) },
+      undefined,
+      false,
+      {}
+    );
+    // Header names round-trip lowercased through `Headers`; HTTP treats them case-insensitively.
+    expect((calls[0].init.headers as Record<string, string>)['x-trace']).toBe(
+      'from-headers-instance'
+    );
+
+    await send(
+      { fetch: fetchImpl },
+      op,
+      'u',
+      { method: 'GET', headers: [['X-Trace', 'from-pairs']] },
+      undefined,
+      false,
+      {}
+    );
+    expect((calls[1].init.headers as Record<string, string>)['X-Trace']).toBe('from-pairs');
+  });
+
   it('merges a plain-object config.headers too', async () => {
     const { calls, fetchImpl } = fetchSpy([ok()]);
     await send(
diff --git a/packages/client-generator/src/runtime/auth.ts b/packages/client-generator/src/runtime/auth.ts
index e9eda15a06..7225dc7785 100644
--- a/packages/client-generator/src/runtime/auth.ts
+++ b/packages/client-generator/src/runtime/auth.ts
@@ -5,6 +5,13 @@ async function resolveToken(provider: TokenProvider): Promise<string> {
   return typeof provider === 'function' ? await provider() : provider;
 }
 
+/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
+function encodeBase64(text: string): string {
+  let binary = '';
+  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
+  return btoa(binary);
+}
+
 /**
  * Build the auth headers/query for one operation's `security` requirements from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
@@ -35,7 +42,7 @@ export async function resolveAuth(
     } else {
       const basic = config.auth?.basic;
       if (basic !== undefined) {
-        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
       }
     }
   }
diff --git a/packages/client-generator/src/runtime/create-client.ts b/packages/client-generator/src/runtime/create-client.ts
index c41b69897d..70b654e10a 100644
--- a/packages/client-generator/src/runtime/create-client.ts
+++ b/packages/client-generator/src/runtime/create-client.ts
@@ -1,6 +1,6 @@
 import { ApiError } from './errors.js';
 import { parse, readError } from './parse.js';
-import { middlewareChain, send, type SendCapabilities } from './send.js';
+import { middlewareChain, send, toHeaderRecord, type SendCapabilities } from './send.js';
 import type {
   ApiErrorLike,
   Client,
@@ -140,7 +140,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/packages/client-generator/src/runtime/send.ts b/packages/client-generator/src/runtime/send.ts
index c6bc0ab643..d0b5e16f0c 100644
--- a/packages/client-generator/src/runtime/send.ts
+++ b/packages/client-generator/src/runtime/send.ts
@@ -18,6 +18,23 @@ export type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+export function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -52,7 +69,7 @@ export async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
diff --git a/packages/client-generator/src/runtime/sse.ts b/packages/client-generator/src/runtime/sse.ts
index 33b6f9f605..fae726bdf4 100644
--- a/packages/client-generator/src/runtime/sse.ts
+++ b/packages/client-generator/src/runtime/sse.ts
@@ -1,7 +1,7 @@
 import { ApiError } from './errors.js';
 import { readError } from './parse.js';
 import { sleep } from './retry.js';
-import { send } from './send.js';
+import { send, toHeaderRecord } from './send.js';
 import type { ClientConfig, OperationContext, ServerSentEvent, SseOptions } from './types.js';
 
 /**
@@ -39,7 +39,7 @@ export async function* sse<T>(
     if (signal?.aborted) return;
     const headers: Record<string, string> = {
       Accept: 'text/event-stream',
-      ...(rest.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(rest.headers),
     };
     const sendHeaders =
       lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
diff --git a/tests/e2e/generate-client/auth.test.ts b/tests/e2e/generate-client/auth.test.ts
index 7e750a364e..bfd767c53b 100644
--- a/tests/e2e/generate-client/auth.test.ts
+++ b/tests/e2e/generate-client/auth.test.ts
@@ -71,7 +71,7 @@ describe('generate-client auth breadth (auth.yaml)', () => {
     // Per-kind injection inside resolveAuth, driven by the descriptors' security specs.
     expect(generated).toContain('headers.Authorization = `Bearer ${await resolveToken(provider)}`');
     expect(generated).toContain(
-      'headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`'
+      'headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`'
     );
     expect(generated).toContain("if (scheme.in === 'header') headers[scheme.name] = value;");
     expect(generated).toContain("else if (scheme.in === 'query') query[scheme.name] = value;");
diff --git a/tests/e2e/generate-client/base-consumer/api.ts b/tests/e2e/generate-client/base-consumer/api.ts
index d7c78aed9e..1e1cd3a961 100644
--- a/tests/e2e/generate-client/base-consumer/api.ts
+++ b/tests/e2e/generate-client/base-consumer/api.ts
@@ -680,6 +680,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -714,7 +731,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -923,7 +940,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/tests/e2e/generate-client/cafe-consumer/api.ts b/tests/e2e/generate-client/cafe-consumer/api.ts
index 5597945139..b7e8901e77 100644
--- a/tests/e2e/generate-client/cafe-consumer/api.ts
+++ b/tests/e2e/generate-client/cafe-consumer/api.ts
@@ -1268,6 +1268,13 @@ async function resolveToken(provider: TokenProvider): Promise<string> {
   return typeof provider === 'function' ? await provider() : provider;
 }
 
+/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
+function encodeBase64(text: string): string {
+  let binary = '';
+  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
+  return btoa(binary);
+}
+
 /**
  * Build the auth headers/query for one operation's `security` requirements from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
@@ -1298,7 +1305,7 @@ async function resolveAuth(
     } else {
       const basic = config.auth?.basic;
       if (basic !== undefined) {
-        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
       }
     }
   }
@@ -1315,6 +1322,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -1349,7 +1373,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -1558,7 +1582,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/tests/e2e/generate-client/cafe.snapshot.ts b/tests/e2e/generate-client/cafe.snapshot.ts
index 3d8cf19f42..cf3e8f1fae 100644
--- a/tests/e2e/generate-client/cafe.snapshot.ts
+++ b/tests/e2e/generate-client/cafe.snapshot.ts
@@ -1268,6 +1268,13 @@ async function resolveToken(provider: TokenProvider): Promise<string> {
   return typeof provider === 'function' ? await provider() : provider;
 }
 
+/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
+function encodeBase64(text: string): string {
+  let binary = '';
+  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
+  return btoa(binary);
+}
+
 /**
  * Build the auth headers/query for one operation's `security` requirements from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
@@ -1298,7 +1305,7 @@ async function resolveAuth(
     } else {
       const basic = config.auth?.basic;
       if (basic !== undefined) {
-        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
       }
     }
   }
@@ -1315,6 +1322,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -1349,7 +1373,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -1558,7 +1582,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
index 167a107b44..71b07ae5b2 100644
--- a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
@@ -1268,6 +1268,13 @@ async function resolveToken(provider: TokenProvider): Promise<string> {
   return typeof provider === 'function' ? await provider() : provider;
 }
 
+/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
+function encodeBase64(text: string): string {
+  let binary = '';
+  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
+  return btoa(binary);
+}
+
 /**
  * Build the auth headers/query for one operation's `security` requirements from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
@@ -1298,7 +1305,7 @@ async function resolveAuth(
     } else {
       const basic = config.auth?.basic;
       if (basic !== undefined) {
-        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
       }
     }
   }
@@ -1331,6 +1338,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -1365,7 +1389,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -1574,7 +1598,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts b/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
index 9616718490..265abef469 100644
--- a/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
@@ -621,6 +621,13 @@ async function resolveToken(provider: TokenProvider): Promise<string> {
   return typeof provider === 'function' ? await provider() : provider;
 }
 
+/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
+function encodeBase64(text: string): string {
+  let binary = '';
+  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
+  return btoa(binary);
+}
+
 /**
  * Build the auth headers/query for one operation's `security` requirements from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
@@ -651,7 +658,7 @@ async function resolveAuth(
     } else {
       const basic = config.auth?.basic;
       if (basic !== undefined) {
-        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
       }
     }
   }
@@ -668,6 +675,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -702,7 +726,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -911,7 +935,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
index 3d8cf19f42..cf3e8f1fae 100644
--- a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
@@ -1268,6 +1268,13 @@ async function resolveToken(provider: TokenProvider): Promise<string> {
   return typeof provider === 'function' ? await provider() : provider;
 }
 
+/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
+function encodeBase64(text: string): string {
+  let binary = '';
+  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
+  return btoa(binary);
+}
+
 /**
  * Build the auth headers/query for one operation's `security` requirements from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
@@ -1298,7 +1305,7 @@ async function resolveAuth(
     } else {
       const basic = config.auth?.basic;
       if (basic !== undefined) {
-        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
       }
     }
   }
@@ -1315,6 +1322,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -1349,7 +1373,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -1558,7 +1582,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts b/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
index dfe1d31b20..b91ca1691a 100644
--- a/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
@@ -531,6 +531,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -565,7 +582,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -774,7 +791,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/tests/e2e/generate-client/examples/customization/src/api/client.ts b/tests/e2e/generate-client/examples/customization/src/api/client.ts
index 3d8cf19f42..cf3e8f1fae 100644
--- a/tests/e2e/generate-client/examples/customization/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/customization/src/api/client.ts
@@ -1268,6 +1268,13 @@ async function resolveToken(provider: TokenProvider): Promise<string> {
   return typeof provider === 'function' ? await provider() : provider;
 }
 
+/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
+function encodeBase64(text: string): string {
+  let binary = '';
+  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
+  return btoa(binary);
+}
+
 /**
  * Build the auth headers/query for one operation's `security` requirements from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
@@ -1298,7 +1305,7 @@ async function resolveAuth(
     } else {
       const basic = config.auth?.basic;
       if (basic !== undefined) {
-        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
       }
     }
   }
@@ -1315,6 +1322,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -1349,7 +1373,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -1558,7 +1582,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
index 3d8cf19f42..cf3e8f1fae 100644
--- a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
@@ -1268,6 +1268,13 @@ async function resolveToken(provider: TokenProvider): Promise<string> {
   return typeof provider === 'function' ? await provider() : provider;
 }
 
+/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
+function encodeBase64(text: string): string {
+  let binary = '';
+  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
+  return btoa(binary);
+}
+
 /**
  * Build the auth headers/query for one operation's `security` requirements from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
@@ -1298,7 +1305,7 @@ async function resolveAuth(
     } else {
       const basic = config.auth?.basic;
       if (basic !== undefined) {
-        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
       }
     }
   }
@@ -1315,6 +1322,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -1349,7 +1373,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -1558,7 +1582,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/tests/e2e/generate-client/examples/mock/src/api/client.ts b/tests/e2e/generate-client/examples/mock/src/api/client.ts
index 3d8cf19f42..cf3e8f1fae 100644
--- a/tests/e2e/generate-client/examples/mock/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/mock/src/api/client.ts
@@ -1268,6 +1268,13 @@ async function resolveToken(provider: TokenProvider): Promise<string> {
   return typeof provider === 'function' ? await provider() : provider;
 }
 
+/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
+function encodeBase64(text: string): string {
+  let binary = '';
+  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
+  return btoa(binary);
+}
+
 /**
  * Build the auth headers/query for one operation's `security` requirements from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
@@ -1298,7 +1305,7 @@ async function resolveAuth(
     } else {
       const basic = config.auth?.basic;
       if (basic !== undefined) {
-        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
       }
     }
   }
@@ -1315,6 +1322,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -1349,7 +1373,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -1558,7 +1582,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts b/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
index 4531eada8d..31ecdbfb8c 100644
--- a/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
@@ -538,6 +538,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -572,7 +589,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -781,7 +798,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/tests/e2e/generate-client/examples/pagination/src/api/client.ts b/tests/e2e/generate-client/examples/pagination/src/api/client.ts
index 523e8d68d4..dd2b40a5db 100644
--- a/tests/e2e/generate-client/examples/pagination/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/pagination/src/api/client.ts
@@ -652,6 +652,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -686,7 +703,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -895,7 +912,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
index 3d8cf19f42..cf3e8f1fae 100644
--- a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
@@ -1268,6 +1268,13 @@ async function resolveToken(provider: TokenProvider): Promise<string> {
   return typeof provider === 'function' ? await provider() : provider;
 }
 
+/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
+function encodeBase64(text: string): string {
+  let binary = '';
+  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
+  return btoa(binary);
+}
+
 /**
  * Build the auth headers/query for one operation's `security` requirements from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
@@ -1298,7 +1305,7 @@ async function resolveAuth(
     } else {
       const basic = config.auth?.basic;
       if (basic !== undefined) {
-        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
       }
     }
   }
@@ -1315,6 +1322,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -1349,7 +1373,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -1558,7 +1582,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts b/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
index c314b48afa..25e5160eae 100644
--- a/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
@@ -528,6 +528,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -562,7 +579,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -686,7 +703,7 @@ async function* sse<T>(
     if (signal?.aborted) return;
     const headers: Record<string, string> = {
       Accept: 'text/event-stream',
-      ...(rest.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(rest.headers),
     };
     const sendHeaders =
       lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
@@ -928,7 +945,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
index 3d8cf19f42..cf3e8f1fae 100644
--- a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
@@ -1268,6 +1268,13 @@ async function resolveToken(provider: TokenProvider): Promise<string> {
   return typeof provider === 'function' ? await provider() : provider;
 }
 
+/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
+function encodeBase64(text: string): string {
+  let binary = '';
+  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
+  return btoa(binary);
+}
+
 /**
  * Build the auth headers/query for one operation's `security` requirements from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
@@ -1298,7 +1305,7 @@ async function resolveAuth(
     } else {
       const basic = config.auth?.basic;
       if (basic !== undefined) {
-        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
       }
     }
   }
@@ -1315,6 +1322,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -1349,7 +1373,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -1558,7 +1582,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts b/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
index b7f15f9ef3..1ea179b0a3 100644
--- a/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
@@ -568,6 +568,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -602,7 +619,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -811,7 +828,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts b/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
index 7182bd998a..75d922b2d2 100644
--- a/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
@@ -607,6 +607,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -641,7 +658,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -850,7 +867,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/tests/e2e/generate-client/examples/zod/src/api/client.ts b/tests/e2e/generate-client/examples/zod/src/api/client.ts
index 3d8cf19f42..cf3e8f1fae 100644
--- a/tests/e2e/generate-client/examples/zod/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/zod/src/api/client.ts
@@ -1268,6 +1268,13 @@ async function resolveToken(provider: TokenProvider): Promise<string> {
   return typeof provider === 'function' ? await provider() : provider;
 }
 
+/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
+function encodeBase64(text: string): string {
+  let binary = '';
+  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
+  return btoa(binary);
+}
+
 /**
  * Build the auth headers/query for one operation's `security` requirements from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
@@ -1298,7 +1305,7 @@ async function resolveAuth(
     } else {
       const basic = config.auth?.basic;
       if (basic !== undefined) {
-        headers.Authorization = `Basic ${btoa(`${basic.username}:${basic.password}`)}`;
+        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
       }
     }
   }
@@ -1315,6 +1322,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -1349,7 +1373,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -1558,7 +1582,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/tests/e2e/generate-client/pagination-consumer/api-offset.ts b/tests/e2e/generate-client/pagination-consumer/api-offset.ts
index 3429c9da86..668bfcad40 100644
--- a/tests/e2e/generate-client/pagination-consumer/api-offset.ts
+++ b/tests/e2e/generate-client/pagination-consumer/api-offset.ts
@@ -683,6 +683,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -717,7 +734,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -926,7 +943,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/tests/e2e/generate-client/pagination-consumer/api.ts b/tests/e2e/generate-client/pagination-consumer/api.ts
index 80ba62bed9..d17024dcd4 100644
--- a/tests/e2e/generate-client/pagination-consumer/api.ts
+++ b/tests/e2e/generate-client/pagination-consumer/api.ts
@@ -682,6 +682,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -716,7 +733,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -925,7 +942,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };
diff --git a/tests/e2e/generate-client/sse-consumer/api.ts b/tests/e2e/generate-client/sse-consumer/api.ts
index 88e1297410..1857bc9ad3 100644
--- a/tests/e2e/generate-client/sse-consumer/api.ts
+++ b/tests/e2e/generate-client/sse-consumer/api.ts
@@ -534,6 +534,23 @@ type SendCapabilities = {
   serializeMultipart?: (body: Record<string, unknown>) => FormData;
 };
 
+/**
+ * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
+ * to a plain record — spreading a `Headers` or an array contributes no entries.
+ */
+function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
+  if (headers === undefined) return {};
+  if (headers instanceof Headers) {
+    const record: Record<string, string> = {};
+    headers.forEach((value, key) => {
+      record[key] = value;
+    });
+    return record;
+  }
+  if (Array.isArray(headers)) return Object.fromEntries(headers);
+  return headers;
+}
+
 /**
  * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
  * `onError` config hooks as one implicit first middleware, then `config.middleware`.
@@ -568,7 +585,7 @@ async function send(
   const headers: Record<string, string> = {
     Accept: 'application/json',
     ...extra,
-    ...(fetchInit.headers as Record<string, string> | undefined),
+    ...toHeaderRecord(fetchInit.headers),
   };
   const context: RequestContext = {
     url,
@@ -692,7 +709,7 @@ async function* sse<T>(
     if (signal?.aborted) return;
     const headers: Record<string, string> = {
       Accept: 'text/event-stream',
-      ...(rest.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(rest.headers),
     };
     const sendHeaders =
       lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
@@ -934,7 +951,7 @@ async function prepareRequest(
     headers: {
       ...authed.headers,
       ...stringHeaders(headers),
-      ...(init.headers as Record<string, string> | undefined),
+      ...toHeaderRecord(init.headers),
     },
   };
   return { url, init: mergedInit, body };

From d66f14ce06b20bc72b67f719de653cc081d5232e Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 13 Jul 2026 15:30:30 +0300
Subject: [PATCH 097/134] refactor(core): remove needless client config
 comments

---
 packages/core/src/config/types.ts       |  6 ------
 packages/core/src/types/redocly-yaml.ts | 13 +------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/packages/core/src/config/types.ts b/packages/core/src/config/types.ts
index 8b0a16378c..ee30647d17 100644
--- a/packages/core/src/config/types.ts
+++ b/packages/core/src/config/types.ts
@@ -272,14 +272,8 @@ export type ResolveConfig = {
 
 export type Telemetry = 'on' | 'off';
 
-/**
- * `generate-client` settings carried on the config root or an `apis` entry. Loosely
- * typed because `@redocly/openapi-core` does not depend on `@redocly/client-generator`,
- * which owns the precise shape; the CLI narrows it when consuming.
- */
 export type ClientGeneratorConfig = Record<string, unknown>;
 
-/** Per-API `generate-client` fields: the `client` overrides block and its output path. */
 export type ClientGeneratorApiConfig = {
   client?: ClientGeneratorConfig;
   clientOutput?: string;
diff --git a/packages/core/src/types/redocly-yaml.ts b/packages/core/src/types/redocly-yaml.ts
index 340a89ae6c..bf2b342d57 100644
--- a/packages/core/src/types/redocly-yaml.ts
+++ b/packages/core/src/types/redocly-yaml.ts
@@ -348,11 +348,6 @@ const ConfigHTTP: NodeType = {
   },
 };
 
-// `generate-client` settings. Shared defaults live under the top-level `client` key;
-// per-API overrides live under `apis.<name>.client`. The input and output are NOT part of
-// this block — they live on the `apis` entry (`root` / `clientOutput`) or on the CLI — so a
-// `client` block accepts only the settings below, and any stray input/output key inside it
-// reports as unexpected.
 const Client: NodeType = {
   properties: {
     generators: { type: 'array', items: { type: 'string' } },
@@ -371,11 +366,7 @@ const Client: NodeType = {
   },
 };
 
-// One pagination rule — the shared field set of the `client.pagination` convention block
-// and each `operations` override. Every field is optional here: the style-conditional
-// requirements (`cursor` needs `cursorParam` + `nextCursor`; `offset`/`page` need
-// `offsetParam`; `items` always) are enforced by the generator with richer messages, so
-// this type only gates key names and value types.
+// Style-conditional field requirements are enforced by the generator with richer messages.
 const ClientPaginationRule: NodeType = {
   properties: {
     style: { enum: ['cursor', 'offset', 'page'] },
@@ -387,8 +378,6 @@ const ClientPaginationRule: NodeType = {
   },
 };
 
-// `client.pagination`: an optional convention rule (the rule fields, applied to every
-// operation it structurally fits), plus per-operation overrides and exclusions.
 const ClientPagination: NodeType = {
   properties: {
     ...ClientPaginationRule.properties,

From 3cbe9b84d4b31ab6aaacd822fb2461f6e3637549 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 13 Jul 2026 15:30:59 +0300
Subject: [PATCH 098/134] fix(cli): opt apis into generate-client fan-out via
 clientOutput too

---
 docs/@v2/commands/generate-client.md             | 8 ++++----
 docs/@v2/configuration/reference/client.md       | 2 +-
 packages/cli/src/commands/generate-client.ts     | 6 ++++--
 tests/e2e/generate-client/redocly-config.test.ts | 8 ++++++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index 867e98fad5..9d37f5c87d 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -21,19 +21,19 @@ This page covers running the command; for the generated client's runtime API (au
 ## Usage
 
 ```sh
-redocly generate-client                          # every api with a `client` block (see Configuration)
+redocly generate-client                          # every api with a `client` block or `clientOutput`
 redocly generate-client cafe                     # a single `apis:` alias from redocly.yaml
-redocly generate-client openapi.yaml -o src/client.ts   # a file path or URL
+redocly generate-client openapi.yaml -o dist/client.ts   # a file path or URL
 ```
 
-With no argument, a client is generated for every api that declares a `client` block under `apis:` (see [`client` configuration](../configuration/reference/client.md)).
+With no argument, a client is generated for every api that declares a `client` block or a `clientOutput` under `apis:` (see [`client` configuration](../configuration/reference/client.md)).
 Otherwise `<api>` is a file path, a URL, or an [`apis:` alias](../configuration/index.md), resolved the same way as in other commands such as `bundle` and `lint`: an alias — or a path matching an api's `root` — uses that api's `client` block and `clientOutput`, while an unmatched path/URL uses the top-level `client` defaults.
 
 ## Options
 
 | Option              | Type       | Description                                                                                                                                                                                                                       |
 | ------------------- | ---------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `api`               | `string`   | OpenAPI description file path, URL, or an `apis:` alias. Omit it to generate for every api that has a `client` block.                                                                                                             |
+| `api`               | `string`   | OpenAPI description file path, URL, or an `apis:` alias. Omit it to generate for every api that has a `client` block or `clientOutput`.                                                                                           |
 | `--output`, `-o`    | `string`   | Output path (must end in `.ts`); the entry file in multi-file modes. Defaults to the api's `clientOutput`, else `<name>.client.ts` in the config dir. Not allowed when generating for multiple apis.                              |
 | `--output-mode`     | `string`   | File layout: `single` (default) or `split`. See [Output modes](#output-modes).                                                                                                                                                    |
 | `--runtime`         | `string`   | `inline` (default, self-contained file — zero runtime dependencies) or `package` (imports the runtime from `@redocly/client-generator`; engine fixes arrive via `npm update`). See [Runtime distribution](#runtime-distribution). |
diff --git a/docs/@v2/configuration/reference/client.md b/docs/@v2/configuration/reference/client.md
index 7e867f85fb..f71497690f 100644
--- a/docs/@v2/configuration/reference/client.md
+++ b/docs/@v2/configuration/reference/client.md
@@ -19,7 +19,7 @@ apis:
 ```
 
 ```sh
-redocly generate-client              # builds every api with a `client` block, to its clientOutput
+redocly generate-client              # builds every api with a `client` block or `clientOutput`
 redocly generate-client cafe         # just the `cafe` api (its client block + clientOutput)
 redocly generate-client --config ./config/redocly.yaml
 ```
diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index 411d164406..2e20b25e9a 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -92,7 +92,9 @@ export async function handleGenerateClient({
     setup: argv.setup === undefined ? undefined : resolvePath(argv.setup),
   };
 
-  const optedIn = Object.keys(apisCfg).filter((name) => isPlainObject(apisCfg[name].client));
+  const optedIn = Object.keys(apisCfg).filter(
+    (name) => isPlainObject(apisCfg[name].client) || apisCfg[name].clientOutput !== undefined
+  );
   if (argv.api === undefined) {
     if (argv.output) {
       throw new HandledError(
@@ -101,7 +103,7 @@ export async function handleGenerateClient({
     }
     if (optedIn.length === 0) {
       throw new HandledError(
-        `\n❌  No API to generate. Add a \`client\` block under an \`apis:\` entry, or pass <api> (a file/URL or an \`apis:\` alias).\n`
+        `\n❌  No API to generate. Add a \`client\` block or \`clientOutput\` under an \`apis:\` entry, or pass <api> (a file/URL or an \`apis:\` alias).\n`
       );
     }
   }
diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
index f74d800172..dadb159b47 100644
--- a/tests/e2e/generate-client/redocly-config.test.ts
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -31,7 +31,7 @@ const run = (dir: string, args: string[] = []) =>
   spawnSync('node', [cli, 'generate-client', ...args], { cwd: dir, encoding: 'utf-8' });
 
 describe('generate-client redocly.yaml config', () => {
-  it('fan-out (no arg) builds every api with a `client` block, to its clientOutput', () => {
+  it('fan-out (no arg) builds every api with a `client` block or `clientOutput`', () => {
     const dir = project(
       [
         'apis:',
@@ -40,13 +40,17 @@ describe('generate-client redocly.yaml config', () => {
         '    clientOutput: ./src/cafe.ts',
         '    client:',
         '      generators: [sdk]',
-        '  lintOnly:', // no `client` block -> skipped by the fan-out
+        '  outputOnly:', // `clientOutput` alone also opts in
+        '    root: ./openapi.yaml',
+        '    clientOutput: ./src/output-only.ts',
+        '  lintOnly:', // neither -> skipped by the fan-out
         '    root: ./openapi.yaml',
       ].join('\n') + '\n'
     );
     const res = run(dir);
     expect(res.status, res.stderr).toBe(0);
     expect(existsSync(join(dir, 'src/cafe.ts'))).toBe(true);
+    expect(existsSync(join(dir, 'src/output-only.ts'))).toBe(true);
     expect(existsSync(join(dir, 'lintOnly.client.ts'))).toBe(false);
     expect(readFileSync(join(dir, 'src/cafe.ts'), 'utf-8')).toContain(
       'export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS,'

From 8c5a54b99a750861d96220f7a9d10573cc7748d8 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 13 Jul 2026 15:31:18 +0300
Subject: [PATCH 099/134] fix(client-generator): put the types condition first
 in package exports

---
 packages/client-generator/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client-generator/package.json b/packages/client-generator/package.json
index f26d6316f0..a47b08c82a 100644
--- a/packages/client-generator/package.json
+++ b/packages/client-generator/package.json
@@ -7,8 +7,8 @@
   "sideEffects": false,
   "exports": {
     ".": {
-      "import": "./lib/index.js",
-      "types": "./lib/index.d.ts"
+      "types": "./lib/index.d.ts",
+      "import": "./lib/index.js"
     }
   },
   "engines": {

From f9904f37f56a144f1a82779b806da406dae78e98 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 13 Jul 2026 17:27:05 +0300
Subject: [PATCH 100/134] fix(core): layer a per-api client block over the
 top-level one field by field

---
 docs/@v2/commands/generate-client.md             |  2 +-
 docs/@v2/configuration/reference/client.md       |  2 +-
 packages/core/src/config/config-resolvers.ts     |  8 +++++++-
 tests/e2e/generate-client/redocly-config.test.ts | 11 ++++++++---
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index 9d37f5c87d..d4cf720d8c 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -53,7 +53,7 @@ Otherwise `<api>` is a file path, a URL, or an [`apis:` alias](../configuration/
 
 Instead of passing flags every time, keep the settings in `redocly.yaml` under a top-level `client` block and per-API `apis.<name>.client` / `clientOutput`.
 CLI flags take precedence over the configuration.
-An api with its own `client` block uses that block; apis without one use the top-level `client`.
+A per-API `client` block overrides the top-level `client` field by field; unspecified fields fall back to the top-level defaults.
 See [`client` configuration](../configuration/reference/client.md) for the full reference.
 
 Auto-pagination has **no CLI flag**: it's declared as structured configuration — [`client.pagination`](../configuration/reference/client.md#pagination) in `redocly.yaml`, or the equivalent `x-pagination` operation extension in the spec — and paginated operations gain typed `.pages()`/`.items()` async iterators. See [Pagination in the usage guide](../guides/use-generated-client.md#pagination).
diff --git a/docs/@v2/configuration/reference/client.md b/docs/@v2/configuration/reference/client.md
index f71497690f..7aa0cfff23 100644
--- a/docs/@v2/configuration/reference/client.md
+++ b/docs/@v2/configuration/reference/client.md
@@ -75,7 +75,7 @@ The style-conditional requirements and the structural fit (the advance param mus
 
 ## How the configuration applies
 
-An api with its own `client` block uses that block; apis without one use the top-level `client` — the same way api-level options override root options in other commands.
+A per-API `client` block overrides the top-level `client` field by field; unspecified fields fall back to the top-level defaults (a per-API `pagination` replaces the top-level one).
 A file-path invocation matching no `apis:` entry uses only the top-level `client`.
 CLI flags then take precedence over the resolved configuration — see the [command reference](../../commands/generate-client.md#configuration).
 
diff --git a/packages/core/src/config/config-resolvers.ts b/packages/core/src/config/config-resolvers.ts
index 8fe4da69d1..d87fcd017f 100644
--- a/packages/core/src/config/config-resolvers.ts
+++ b/packages/core/src/config/config-resolvers.ts
@@ -122,7 +122,13 @@ export async function resolveConfig({
     bundledConfig.apis = Object.fromEntries(
       Object.entries(bundledConfig.apis).map(([key, apiConfig]) => {
         const mergedConfig = mergeExtends([bundledConfig, apiConfig]);
-        return [key, { ...apiConfig, ...mergedConfig }];
+        // Like the governance sections above, a per-api `client` block layers field by
+        // field over the top-level one instead of replacing it.
+        const client =
+          isPlainObject(bundledConfig.client) && isPlainObject(apiConfig.client)
+            ? { client: { ...bundledConfig.client, ...apiConfig.client } }
+            : {};
+        return [key, { ...apiConfig, ...mergedConfig, ...client }];
       })
     );
   }
diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
index dadb159b47..b406ad6238 100644
--- a/tests/e2e/generate-client/redocly-config.test.ts
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -121,6 +121,11 @@ describe('generate-client redocly.yaml config', () => {
         'client:',
         '  generators: [sdk]',
         '  serverUrl: https://top-level.example.com',
+        '  pagination:', // a shared default that must survive the per-api override
+        '    style: cursor',
+        '    cursorParam: after',
+        '    nextCursor: /page/endCursor',
+        '    items: /items',
         'apis:',
         '  cafe:',
         '    root: ./openapi.yaml',
@@ -132,9 +137,9 @@ describe('generate-client redocly.yaml config', () => {
 
     const matched = run(dir, ['./openapi.yaml', '--output', './matched.ts']);
     expect(matched.status, matched.stderr).toBe(0);
-    expect(readFileSync(join(dir, 'matched.ts'), 'utf-8')).toContain(
-      'serverUrl: "https://per-api.example.com"'
-    );
+    const matchedOut = readFileSync(join(dir, 'matched.ts'), 'utf-8');
+    expect(matchedOut).toContain('serverUrl: "https://per-api.example.com"');
+    expect(matchedOut).toContain('pagination: {'); // top-level default kept, field by field
 
     const unmatched = run(dir, ['./standalone.yaml', '--output', './unmatched.ts']);
     expect(unmatched.status, unmatched.stderr).toBe(0);

From 1c6fe7efe7d6a867bf6317d8933dee69223c4f64 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 13 Jul 2026 18:55:40 +0300
Subject: [PATCH 101/134] fix(client-generator): fail closed on oversized SSE
 frames instead of reconnecting

---
 .../__snapshots__/package-client.test.ts.snap    |  7 +++++--
 .../src/emitters/runtime-sources.ts              |  2 +-
 .../src/runtime/__tests__/sse.test.ts            | 16 +++++++---------
 packages/client-generator/src/runtime/sse.ts     |  7 +++++--
 .../examples/sse-streaming/src/api/client.ts     |  7 +++++--
 tests/e2e/generate-client/redocly-config.test.ts |  8 +++++++-
 tests/e2e/generate-client/sse-consumer/api.ts    |  7 +++++--
 7 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap b/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
index a929655dfc..e92870f9bf 100644
--- a/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
+++ b/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
@@ -734,7 +734,10 @@ async function send(
  */
 const FRAME_DELIMITER = /(?:\\r\\n|\\r|\\n){2}/;
 
-/** An event's JSON \`data\` failed to parse — a stable bad payload, not a dropped connection. */
+/**
+ * A terminally malformed event stream — unparseable JSON \`data\` or an unbounded frame.
+ * A stable bad payload, not a dropped connection, so the stream never reconnects on it.
+ */
 class SseParseError extends Error {}
 
 /**
@@ -817,7 +820,7 @@ async function* sse<T>(
           // Bound memory: a server that never sends a frame delimiter would otherwise
           // grow \`buffer\` without limit. 1 MiB is far above any real SSE frame.
           if (buffer.length > 1048576) {
-            throw new Error('SSE frame exceeded 1048576 characters without a delimiter');
+            throw new SseParseError('SSE frame exceeded 1048576 characters without a delimiter');
           }
         }
       } finally {
diff --git a/packages/client-generator/src/emitters/runtime-sources.ts b/packages/client-generator/src/emitters/runtime-sources.ts
index 7c58f8386e..db0c1167a6 100644
--- a/packages/client-generator/src/emitters/runtime-sources.ts
+++ b/packages/client-generator/src/emitters/runtime-sources.ts
@@ -19,7 +19,7 @@ export const RUNTIME_SOURCES = {
   'send.ts':
     "import { abortError } from './errors.js';\nimport { defaultRetryOn, retryDelay, sleep } from './retry.js';\nimport type {\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  RequestContext,\n  RequestOptions,\n  RetryConfig,\n} from './types.js';\n\n/**\n * Optional behaviors the send core can use but never statically imports — wired by\n * `createClient` (the same seam the future inline-mode assembler relies on).\n */\nexport type SendCapabilities = {\n  /** Serialize a typed multipart body (a plain object) to FormData. */\n  serializeMultipart?: (body: Record<string, unknown>) => FormData;\n};\n\n/**\n * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)\n * to a plain record — spreading a `Headers` or an array contributes no entries.\n */\nexport function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {\n  if (headers === undefined) return {};\n  if (headers instanceof Headers) {\n    const record: Record<string, string> = {};\n    headers.forEach((value, key) => {\n      record[key] = value;\n    });\n    return record;\n  }\n  if (Array.isArray(headers)) return Object.fromEntries(headers);\n  return headers;\n}\n\n/**\n * The effective middleware chain for a request: the single `onRequest`/`onResponse`/\n * `onError` config hooks as one implicit first middleware, then `config.middleware`.\n */\nexport function middlewareChain(config: ClientConfig): Middleware[] {\n  const single =\n    config.onRequest || config.onResponse || config.onError\n      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]\n      : [];\n  return [...single, ...(config.middleware ?? [])];\n}\n\n/**\n * The fetch core shared by every operation: default + config + per-call headers, the\n * `onRequest` chain (BEFORE body serialization, so mutations are sent), body\n * serialization (JSON, or FormData via the multipart capability), the retry loop\n * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse\n * `onResponse` onion. Returns the final response plus the request context.\n */\nexport async function send(\n  config: ClientConfig,\n  op: OperationContext,\n  url: string,\n  init: RequestOptions,\n  body: unknown | undefined,\n  multipart: boolean,\n  caps: SendCapabilities\n): Promise<{ response: Response; context: RequestContext }> {\n  const { retry: callRetry, ...fetchInit } = init;\n  const retry: RetryConfig = { ...config.retry, ...callRetry };\n  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;\n  const headers: Record<string, string> = {\n    Accept: 'application/json',\n    ...extra,\n    ...toHeaderRecord(fetchInit.headers),\n  };\n  const context: RequestContext = {\n    url,\n    method: fetchInit.method ?? 'GET',\n    headers,\n    body,\n    operation: op,\n  };\n  const middleware = middlewareChain(config);\n  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);\n  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.\n  let payload: BodyInit | undefined;\n  if (context.body !== undefined) {\n    const value = context.body;\n    const isBinary =\n      value instanceof Blob ||\n      value instanceof ArrayBuffer ||\n      ArrayBuffer.isView(value as ArrayBufferView);\n    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;\n    const isURLSearchParams = value instanceof URLSearchParams;\n    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {\n      payload = value as BodyInit;\n    } else if (multipart) {\n      if (!caps.serializeMultipart) {\n        throw new Error('Multipart capability not wired: cannot serialize the request body');\n      }\n      payload = caps.serializeMultipart(value as Record<string, unknown>);\n    } else {\n      payload = JSON.stringify(value);\n      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {\n        context.headers['Content-Type'] = 'application/json';\n      }\n    }\n  }\n  const doFetch = config.fetch ?? fetch;\n  const maxAttempts = 1 + (retry.retries ?? 0);\n  const retryOn = retry.retryOn ?? defaultRetryOn;\n  const signal = fetchInit.signal ?? undefined;\n\n  let attempt = 0;\n  while (true) {\n    attempt++;\n    if (signal?.aborted) throw abortError(signal);\n    let response: Response;\n    try {\n      response = await doFetch(context.url, {\n        ...fetchInit,\n        method: context.method,\n        headers: context.headers,\n        body: payload,\n      });\n    } catch (error) {\n      if (\n        attempt < maxAttempts &&\n        !signal?.aborted &&\n        (await retryOn({ attempt, request: context, error }))\n      ) {\n        await sleep(retryDelay(retry, attempt, null), signal);\n        continue;\n      }\n      throw error;\n    }\n    // Reverse order: the last-registered middleware wraps closest to the network (onion).\n    for (let i = middleware.length - 1; i >= 0; i--) {\n      const onResponse = middleware[i].onResponse;\n      if (onResponse) {\n        const replaced = await onResponse(response, context);\n        if (replaced) response = replaced;\n      }\n    }\n    if (\n      !response.ok &&\n      attempt < maxAttempts &&\n      !signal?.aborted &&\n      (await retryOn({ attempt, request: context, response }))\n    ) {\n      const retryAfter = response.headers.get('retry-after');\n      // Drain the abandoned response body before the next attempt: an unread body\n      // keeps the connection checked out (and can stall the pool) under Node/undici\n      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).\n      await response.body?.cancel().catch(() => undefined);\n      await sleep(retryDelay(retry, attempt, retryAfter), signal);\n      continue;\n    }\n    return { response, context };\n  }\n}\n",
   'sse.ts':
-    "import { ApiError } from './errors.js';\nimport { readError } from './parse.js';\nimport { sleep } from './retry.js';\nimport { send, toHeaderRecord } from './send.js';\nimport type { ClientConfig, OperationContext, ServerSentEvent, SseOptions } from './types.js';\n\n/**\n * A frame delimiter: two consecutive line terminators (each CR, LF, or CRLF, per the SSE\n * spec — so mixed endings like `\\n\\r\\n` are valid boundaries, not just matching pairs).\n */\nconst FRAME_DELIMITER = /(?:\\r\\n|\\r|\\n){2}/;\n\n/** An event's JSON `data` failed to parse — a stable bad payload, not a dropped connection. */\nexport class SseParseError extends Error {}\n\n/**\n * Consume a `text/event-stream` operation as typed events (capability module — wired\n * into `createClient`). Auto-reconnects on dropped connections, resuming from the last\n * seen event id via `Last-Event-ID` (backoff: the server's `retry:` value, then\n * `reconnectDelay`, then 1s — exponential with jitter, capped at 30s). A clean stream\n * end flushes a trailing frame and finishes; `break`/abort end the iterator cleanly.\n */\nexport async function* sse<T>(\n  config: ClientConfig,\n  op: OperationContext,\n  prepare: () => Promise<{ url: string; init: SseOptions }>,\n  dataKind: 'json' | 'text' = 'text'\n): AsyncGenerator<ServerSentEvent<T>> {\n  let lastEventId: string | undefined;\n  let serverRetry: number | undefined;\n  let failures = 0;\n  while (true) {\n    // Re-prepare each attempt so a refresh-style TokenProvider yields a fresh credential\n    // on reconnect (the auth is baked into `url` query + `init.headers`). `reconnect`,\n    // `reconnectDelay`, and `signal` come from the caller's original options unchanged.\n    const { url, init } = await prepare();\n    const { reconnect = true, reconnectDelay, ...rest } = init;\n    const signal = rest.signal ?? undefined;\n    if (signal?.aborted) return;\n    const headers: Record<string, string> = {\n      Accept: 'text/event-stream',\n      ...toHeaderRecord(rest.headers),\n    };\n    const sendHeaders =\n      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };\n    try {\n      const { response } = await send(\n        config,\n        op,\n        url,\n        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },\n        undefined,\n        false,\n        {}\n      );\n      if (!response.ok) {\n        const errorBody = await readError(response);\n        throw new ApiError(url, response.status, response.statusText, errorBody);\n      }\n      failures = 0;\n      const body = response.body;\n      if (!body) return;\n      const reader = body.getReader();\n      const decoder = new TextDecoder();\n      let buffer = '';\n      try {\n        while (true) {\n          const { done, value } = await reader.read();\n          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });\n          let match: RegExpMatchArray | null;\n          while ((match = buffer.match(FRAME_DELIMITER)) !== null) {\n            const index = match.index!;\n            const raw = buffer.slice(0, index);\n            buffer = buffer.slice(index + match[0].length);\n            const event = parseSseFrame(raw, dataKind);\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n          }\n          if (done) {\n            // Stream closed cleanly. Flush a final event that arrived without a trailing\n            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.\n            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n            return;\n          }\n          // Bound memory: a server that never sends a frame delimiter would otherwise\n          // grow `buffer` without limit. 1 MiB is far above any real SSE frame.\n          if (buffer.length > 1048576) {\n            throw new Error('SSE frame exceeded 1048576 characters without a delimiter');\n          }\n        }\n      } finally {\n        await reader.cancel().catch(() => undefined);\n      }\n    } catch (error) {\n      if (signal?.aborted) return;\n      // A non-OK HTTP response (4xx/5xx) or an unparseable JSON payload is a definitive\n      // error, not a transient drop — surface it instead of reconnecting in a loop (a\n      // stable bad payload would otherwise reconnect forever).\n      if (error instanceof ApiError || error instanceof SseParseError) throw error;\n      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream\n      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.\n      if (!reconnect) throw error;\n    }\n    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.\n    failures++;\n    const base = serverRetry ?? reconnectDelay ?? 1000;\n    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);\n    try {\n      await sleep(Math.random() * delay, signal);\n    } catch {\n      return; // sleep rejects only on abort — end the iterator cleanly\n    }\n  }\n}\n\n/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */\nexport function parseSseFrame(\n  raw: string,\n  dataKind: 'json' | 'text'\n): ServerSentEvent<unknown> | undefined {\n  let event: string | undefined;\n  const dataLines: string[] = [];\n  let id: string | undefined;\n  let retry: number | undefined;\n  let sawField = false;\n  for (const line of raw.split(/\\r\\n|\\n|\\r/)) {\n    if (line === '' || line.startsWith(':')) continue;\n    const colon = line.indexOf(':');\n    const field = colon === -1 ? line : line.slice(0, colon);\n    let val = colon === -1 ? '' : line.slice(colon + 1);\n    if (val.startsWith(' ')) val = val.slice(1);\n    sawField = true;\n    if (field === 'event') event = val;\n    else if (field === 'data') dataLines.push(val);\n    else if (field === 'id') id = val;\n    else if (field === 'retry') {\n      const n = Number(val);\n      if (!Number.isNaN(n)) retry = n;\n    }\n  }\n  if (!sawField) return undefined;\n  const dataText = dataLines.join('\\n');\n  let data: unknown = dataText;\n  if (dataKind === 'json' && dataText !== '') {\n    try {\n      data = JSON.parse(dataText);\n    } catch (error) {\n      throw new SseParseError(\n        `Failed to parse SSE event data as JSON: ${error instanceof Error ? error.message : String(error)}`\n      );\n    }\n  }\n  return { event, data, id, retry };\n}\n",
+    "import { ApiError } from './errors.js';\nimport { readError } from './parse.js';\nimport { sleep } from './retry.js';\nimport { send, toHeaderRecord } from './send.js';\nimport type { ClientConfig, OperationContext, ServerSentEvent, SseOptions } from './types.js';\n\n/**\n * A frame delimiter: two consecutive line terminators (each CR, LF, or CRLF, per the SSE\n * spec — so mixed endings like `\\n\\r\\n` are valid boundaries, not just matching pairs).\n */\nconst FRAME_DELIMITER = /(?:\\r\\n|\\r|\\n){2}/;\n\n/**\n * A terminally malformed event stream — unparseable JSON `data` or an unbounded frame.\n * A stable bad payload, not a dropped connection, so the stream never reconnects on it.\n */\nexport class SseParseError extends Error {}\n\n/**\n * Consume a `text/event-stream` operation as typed events (capability module — wired\n * into `createClient`). Auto-reconnects on dropped connections, resuming from the last\n * seen event id via `Last-Event-ID` (backoff: the server's `retry:` value, then\n * `reconnectDelay`, then 1s — exponential with jitter, capped at 30s). A clean stream\n * end flushes a trailing frame and finishes; `break`/abort end the iterator cleanly.\n */\nexport async function* sse<T>(\n  config: ClientConfig,\n  op: OperationContext,\n  prepare: () => Promise<{ url: string; init: SseOptions }>,\n  dataKind: 'json' | 'text' = 'text'\n): AsyncGenerator<ServerSentEvent<T>> {\n  let lastEventId: string | undefined;\n  let serverRetry: number | undefined;\n  let failures = 0;\n  while (true) {\n    // Re-prepare each attempt so a refresh-style TokenProvider yields a fresh credential\n    // on reconnect (the auth is baked into `url` query + `init.headers`). `reconnect`,\n    // `reconnectDelay`, and `signal` come from the caller's original options unchanged.\n    const { url, init } = await prepare();\n    const { reconnect = true, reconnectDelay, ...rest } = init;\n    const signal = rest.signal ?? undefined;\n    if (signal?.aborted) return;\n    const headers: Record<string, string> = {\n      Accept: 'text/event-stream',\n      ...toHeaderRecord(rest.headers),\n    };\n    const sendHeaders =\n      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };\n    try {\n      const { response } = await send(\n        config,\n        op,\n        url,\n        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },\n        undefined,\n        false,\n        {}\n      );\n      if (!response.ok) {\n        const errorBody = await readError(response);\n        throw new ApiError(url, response.status, response.statusText, errorBody);\n      }\n      failures = 0;\n      const body = response.body;\n      if (!body) return;\n      const reader = body.getReader();\n      const decoder = new TextDecoder();\n      let buffer = '';\n      try {\n        while (true) {\n          const { done, value } = await reader.read();\n          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });\n          let match: RegExpMatchArray | null;\n          while ((match = buffer.match(FRAME_DELIMITER)) !== null) {\n            const index = match.index!;\n            const raw = buffer.slice(0, index);\n            buffer = buffer.slice(index + match[0].length);\n            const event = parseSseFrame(raw, dataKind);\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n          }\n          if (done) {\n            // Stream closed cleanly. Flush a final event that arrived without a trailing\n            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.\n            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n            return;\n          }\n          // Bound memory: a server that never sends a frame delimiter would otherwise\n          // grow `buffer` without limit. 1 MiB is far above any real SSE frame.\n          if (buffer.length > 1048576) {\n            throw new SseParseError('SSE frame exceeded 1048576 characters without a delimiter');\n          }\n        }\n      } finally {\n        await reader.cancel().catch(() => undefined);\n      }\n    } catch (error) {\n      if (signal?.aborted) return;\n      // A non-OK HTTP response (4xx/5xx) or an unparseable JSON payload is a definitive\n      // error, not a transient drop — surface it instead of reconnecting in a loop (a\n      // stable bad payload would otherwise reconnect forever).\n      if (error instanceof ApiError || error instanceof SseParseError) throw error;\n      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream\n      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.\n      if (!reconnect) throw error;\n    }\n    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.\n    failures++;\n    const base = serverRetry ?? reconnectDelay ?? 1000;\n    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);\n    try {\n      await sleep(Math.random() * delay, signal);\n    } catch {\n      return; // sleep rejects only on abort — end the iterator cleanly\n    }\n  }\n}\n\n/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */\nexport function parseSseFrame(\n  raw: string,\n  dataKind: 'json' | 'text'\n): ServerSentEvent<unknown> | undefined {\n  let event: string | undefined;\n  const dataLines: string[] = [];\n  let id: string | undefined;\n  let retry: number | undefined;\n  let sawField = false;\n  for (const line of raw.split(/\\r\\n|\\n|\\r/)) {\n    if (line === '' || line.startsWith(':')) continue;\n    const colon = line.indexOf(':');\n    const field = colon === -1 ? line : line.slice(0, colon);\n    let val = colon === -1 ? '' : line.slice(colon + 1);\n    if (val.startsWith(' ')) val = val.slice(1);\n    sawField = true;\n    if (field === 'event') event = val;\n    else if (field === 'data') dataLines.push(val);\n    else if (field === 'id') id = val;\n    else if (field === 'retry') {\n      const n = Number(val);\n      if (!Number.isNaN(n)) retry = n;\n    }\n  }\n  if (!sawField) return undefined;\n  const dataText = dataLines.join('\\n');\n  let data: unknown = dataText;\n  if (dataKind === 'json' && dataText !== '') {\n    try {\n      data = JSON.parse(dataText);\n    } catch (error) {\n      throw new SseParseError(\n        `Failed to parse SSE event data as JSON: ${error instanceof Error ? error.message : String(error)}`\n      );\n    }\n  }\n  return { event, data, id, retry };\n}\n",
   'create-client.ts':
     "import { ApiError } from './errors.js';\nimport { parse, readError } from './parse.js';\nimport { middlewareChain, send, toHeaderRecord, type SendCapabilities } from './send.js';\nimport type {\n  ApiErrorLike,\n  Client,\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  OperationDescriptor,\n  OpsShape,\n  PaginationSpec,\n  ParseAs,\n  QueryValue,\n  RequestOptions,\n  SecuritySpec,\n  ServerSentEvent,\n  SseOptions,\n  TokenProvider,\n} from './types.js';\nimport { buildUrl, substitutePath, type QueryStyle } from './url.js';\n\n/**\n * The optional behaviors `createClientCore` can dispatch to but never statically\n * imports. The package's public `createClient` wires the full set; the future\n * inline-mode assembler wires only the capabilities a spec needs.\n */\nexport type Capabilities = SendCapabilities & {\n  resolveAuth?: (\n    security: readonly SecuritySpec[],\n    config: ClientConfig\n  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;\n  sse?: (\n    config: ClientConfig,\n    op: OperationContext,\n    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style\n    // TokenProvider issue a fresh credential after a dropped stream reconnects.\n    prepare: () => Promise<{ url: string; init: SseOptions }>,\n    dataKind: 'json' | 'text'\n  ) => AsyncGenerator<ServerSentEvent<unknown>>;\n  paginate?: {\n    pages: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n    items: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n  };\n};\n\n/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */\nexport type OperationArgs = {\n  params?: Record<string, QueryValue>;\n  body?: unknown;\n  headers?: Record<string, unknown>;\n} & Record<string, unknown>;\n\n/** The response reader implied by the descriptor (before any per-call `parseAs` override). */\nfunction kindFor(op: OperationDescriptor): ParseAs | 'void' {\n  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {\n    return op.responseKind;\n  }\n  return 'auto';\n}\n\n/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */\nfunction splitArgs(op: OperationDescriptor, args: OperationArgs) {\n  const path: Record<string, unknown> = {};\n  for (const param of op.params ?? []) {\n    if (param.in === 'path') path[param.name] = args[param.name];\n  }\n  return { path, query: args.params, body: args.body, headers: args.headers };\n}\n\n/**\n * The query-serialization hints for the descriptor's query params. A spec is built only\n * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),\n * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)\n * are honored, and an omitted `explode` keeps the exploded default.\n */\nfunction queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {\n  let styles: Record<string, QueryStyle> | undefined;\n  for (const param of op.params ?? []) {\n    if (param.in !== 'query') continue;\n    const deviates =\n      (param.style !== undefined && param.style !== 'form') ||\n      param.explode === false ||\n      param.allowReserved === true;\n    if (!deviates) continue;\n    styles ??= {};\n    styles[param.name] = {\n      style: param.style ?? 'form',\n      explode: param.explode ?? true,\n      allowReserved: param.allowReserved,\n    };\n  }\n  return styles;\n}\n\n/** Stringify caller-supplied extra headers, skipping empty entries. */\nfunction stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {\n  const out: Record<string, string> = {};\n  for (const [key, value] of Object.entries(headers ?? {})) {\n    if (value !== undefined && value !== null) out[key] = String(value);\n  }\n  return out;\n}\n\n/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */\nasync function prepareRequest(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions | SseOptions,\n  caps: Capabilities\n): Promise<{ url: string; init: RequestOptions; body: unknown }> {\n  const { path, query, body, headers } = splitArgs(op, args);\n  const authed =\n    op.security?.length && caps.resolveAuth\n      ? await caps.resolveAuth(op.security, config)\n      : { headers: {}, query: {} };\n  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };\n  const url = buildUrl(\n    config.serverUrl ?? '',\n    substitutePath(op.path, path),\n    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,\n    queryStyles(op)\n  );\n  const mergedInit: RequestOptions = {\n    ...init,\n    method: op.method.toUpperCase(),\n    // Precedence, lowest → highest (later spreads win): injected auth → explicit\n    // header params → caller `init.headers` — the caller always overrides both.\n    headers: {\n      ...authed.headers,\n      ...stringHeaders(headers),\n      ...toHeaderRecord(init.headers),\n    },\n  };\n  return { url, init: mergedInit, body };\n}\n\n/** One non-SSE call: send, then branch on the configured error mode. */\nasync function execute(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions,\n  caps: Capabilities\n): Promise<unknown> {\n  const prepared = await prepareRequest(config, op, args, init, caps);\n  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n  const { parseAs, ...sendInit } = prepared.init;\n  const { response, context } = await send(\n    config,\n    opCtx,\n    prepared.url,\n    sendInit,\n    prepared.body,\n    op.body?.multipart === true,\n    caps\n  );\n  const readKind = parseAs ?? kindFor(op);\n  if (config.errorMode === 'result') {\n    if (!response.ok) {\n      return { data: undefined, error: await readError(response), response };\n    }\n    return { data: await parse(response, readKind), error: undefined, response };\n  }\n  if (!response.ok) {\n    let error: globalThis.Error = new ApiError(\n      context.url,\n      response.status,\n      response.statusText,\n      await readError(response)\n    );\n    // Thread the error through each middleware's onError in turn (each may replace it).\n    for (const mw of middlewareChain(config)) {\n      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);\n    }\n    throw error;\n  }\n  return parse(response, readKind);\n}\n\n/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */\nfunction paginateCapability(caps: Capabilities, op: OperationDescriptor) {\n  if (!caps.paginate) {\n    throw new Error(`Pagination capability not wired: cannot iterate operation \"${op.id}\"`);\n  }\n  return caps.paginate;\n}\n\n/**\n * The per-page call the iterators drive: the method itself in throw mode; in result\n * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page\n * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is\n * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).\n */\nfunction pageCall(\n  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  config: ClientConfig\n) {\n  if (config.errorMode !== 'result') return method;\n  return async (args?: OperationArgs, init?: RequestOptions) => {\n    const envelope = (await method(args, init)) as {\n      data: unknown;\n      error: unknown;\n      response: Response;\n    };\n    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page\n    // (204/void) also parses to undefined data, and a failed page's `error` can be\n    // undefined too (unreadable body). The pointers then miss on the undefined data\n    // and iteration stops cleanly, which is the correct semantics for an empty page.\n    if (!envelope.response.ok) {\n      const { response } = envelope;\n      throw new ApiError(response.url, response.status, response.statusText, envelope.error);\n    }\n    return envelope.data;\n  };\n}\n\n/**\n * Build a typed instance client over operation descriptors: one real bound method per\n * operation (attached by a construction-time loop — no Proxy), plus the core members\n * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name\n * collision with an operation. All behavior dispatches through the capability seam.\n */\nexport function createClientCore<\n  Ops extends OpsShape,\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n>(\n  operations: Record<string, OperationDescriptor>,\n  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},\n  caps: Capabilities = {}\n): Client<Ops, OperationContext<Id, Path, Tag>> {\n  // The literal-union narrowing is a compile-time DX contract only; internally the\n  // runtime works with the base (string-typed) context. One cast at this boundary —\n  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx\n  // params are contravariant).\n  const given = initial as ClientConfig;\n  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.\n  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };\n  const client = {} as Record<string, unknown>;\n\n  for (const [name, op] of Object.entries(operations)) {\n    if (op.responseKind === 'sse') {\n      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {\n        if (!caps.sse) {\n          throw new Error(`SSE capability not wired: cannot stream operation \"${op.id}\"`);\n        }\n        const stream = caps.sse;\n        return (async function* () {\n          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`\n          // resolves) is refreshed per attempt rather than frozen at the first connect.\n          const prepare = async () => {\n            const prepared = await prepareRequest(config, op, args, init, caps);\n            return { url: prepared.url, init: prepared.init as SseOptions };\n          };\n          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');\n        })();\n      };\n    } else {\n      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>\n        execute(config, op, args, init, caps);\n      const spec = op.pagination;\n      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching\n      // through the capability seam (like SSE: absent capability throws descriptively).\n      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on\n      // a result-mode client (`errorMode` is fixed at construction — `configure()`\n      // ignores it) each page's envelope is unwrapped before it reaches the capability.\n      // A failed page aborts iteration by throwing ApiError, even on result-mode\n      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.\n      client[name] = spec\n        ? Object.assign(method, {\n            pages: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),\n            items: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),\n          })\n        : method;\n    }\n  }\n\n  // Core members are assigned AFTER the operation loop — they win over colliding op names.\n  client.configure = (next: ClientConfig): void => {\n    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at\n    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.\n    const { errorMode: _fixed, auth, ...rest } = next;\n    Object.assign(config, rest);\n    // `auth` merges into existing credentials (like the `auth.*` setters) rather than\n    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set\n    // basic/apiKey. `apiKey` merges per scheme.\n    if (auth) {\n      config.auth = {\n        ...config.auth,\n        ...auth,\n        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),\n      };\n    }\n  };\n  client.use = (...middleware: Middleware[]): void => {\n    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.\n    config.middleware = [...(config.middleware ?? []), ...middleware];\n  };\n  client.auth = {\n    bearer(token: TokenProvider): void {\n      config.auth = { ...config.auth, bearer: token };\n    },\n    basic(username: string, password: string): void {\n      config.auth = { ...config.auth, basic: { username, password } };\n    },\n    apiKey(scheme: string, value: TokenProvider): void {\n      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };\n    },\n  };\n\n  return client as Client<Ops, OperationContext<Id, Path, Tag>>;\n}\n",
   'paginate.ts':
diff --git a/packages/client-generator/src/runtime/__tests__/sse.test.ts b/packages/client-generator/src/runtime/__tests__/sse.test.ts
index edde5d61b1..7b08bb4019 100644
--- a/packages/client-generator/src/runtime/__tests__/sse.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/sse.test.ts
@@ -288,9 +288,11 @@ describe('sse', () => {
     }
   });
 
-  it('guards against unbounded frames (no delimiter past 1 MiB)', async () => {
+  it('guards against unbounded frames (no delimiter past 1 MiB) and does NOT reconnect on them', async () => {
     const big = 'data: ' + 'x'.repeat(1_100_000); // no trailing delimiter, single chunk
+    let calls = 0;
     const fetchImpl = (async () => {
+      calls++;
       const body = new ReadableStream<Uint8Array>({
         start(controller) {
           controller.enqueue(enc.encode(big));
@@ -301,14 +303,10 @@ describe('sse', () => {
     }) as unknown as typeof fetch;
     await expect(
       (async () => {
-        for await (const _ of sse(
-          { fetch: fetchImpl },
-          op,
-          prep('u', { reconnect: false }),
-          'text'
-        ))
-          void _;
+        // `reconnect` defaults to true; the guard must surface, not loop forever.
+        for await (const _ of sse({ fetch: fetchImpl }, op, prep('u', {}), 'text')) void _;
       })()
-    ).rejects.toThrow(/1048576/);
+    ).rejects.toBeInstanceOf(SseParseError);
+    expect(calls).toBe(1);
   });
 });
diff --git a/packages/client-generator/src/runtime/sse.ts b/packages/client-generator/src/runtime/sse.ts
index fae726bdf4..1eae461e4f 100644
--- a/packages/client-generator/src/runtime/sse.ts
+++ b/packages/client-generator/src/runtime/sse.ts
@@ -10,7 +10,10 @@ import type { ClientConfig, OperationContext, ServerSentEvent, SseOptions } from
  */
 const FRAME_DELIMITER = /(?:\r\n|\r|\n){2}/;
 
-/** An event's JSON `data` failed to parse — a stable bad payload, not a dropped connection. */
+/**
+ * A terminally malformed event stream — unparseable JSON `data` or an unbounded frame.
+ * A stable bad payload, not a dropped connection, so the stream never reconnects on it.
+ */
 export class SseParseError extends Error {}
 
 /**
@@ -93,7 +96,7 @@ export async function* sse<T>(
           // Bound memory: a server that never sends a frame delimiter would otherwise
           // grow `buffer` without limit. 1 MiB is far above any real SSE frame.
           if (buffer.length > 1048576) {
-            throw new Error('SSE frame exceeded 1048576 characters without a delimiter');
+            throw new SseParseError('SSE frame exceeded 1048576 characters without a delimiter');
           }
         }
       } finally {
diff --git a/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts b/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
index 25e5160eae..221b9e1cc9 100644
--- a/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
@@ -674,7 +674,10 @@ async function send(
  */
 const FRAME_DELIMITER = /(?:\r\n|\r|\n){2}/;
 
-/** An event's JSON `data` failed to parse — a stable bad payload, not a dropped connection. */
+/**
+ * A terminally malformed event stream — unparseable JSON `data` or an unbounded frame.
+ * A stable bad payload, not a dropped connection, so the stream never reconnects on it.
+ */
 class SseParseError extends Error {}
 
 /**
@@ -757,7 +760,7 @@ async function* sse<T>(
           // Bound memory: a server that never sends a frame delimiter would otherwise
           // grow `buffer` without limit. 1 MiB is far above any real SSE frame.
           if (buffer.length > 1048576) {
-            throw new Error('SSE frame exceeded 1048576 characters without a delimiter');
+            throw new SseParseError('SSE frame exceeded 1048576 characters without a delimiter');
           }
         }
       } finally {
diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
index b406ad6238..267fd6de31 100644
--- a/tests/e2e/generate-client/redocly-config.test.ts
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -34,6 +34,9 @@ describe('generate-client redocly.yaml config', () => {
   it('fan-out (no arg) builds every api with a `client` block or `clientOutput`', () => {
     const dir = project(
       [
+        'client:', // shared defaults, inherited by apis without their own block
+        '  generators: [sdk]',
+        '  serverUrl: https://shared.example.com',
         'apis:',
         '  cafe:',
         '    root: ./openapi.yaml',
@@ -50,11 +53,14 @@ describe('generate-client redocly.yaml config', () => {
     const res = run(dir);
     expect(res.status, res.stderr).toBe(0);
     expect(existsSync(join(dir, 'src/cafe.ts'))).toBe(true);
-    expect(existsSync(join(dir, 'src/output-only.ts'))).toBe(true);
     expect(existsSync(join(dir, 'lintOnly.client.ts'))).toBe(false);
     expect(readFileSync(join(dir, 'src/cafe.ts'), 'utf-8')).toContain(
       'export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS,'
     );
+    // The clientOutput-only api inherits the top-level `client` defaults.
+    expect(readFileSync(join(dir, 'src/output-only.ts'), 'utf-8')).toContain(
+      'serverUrl: "https://shared.example.com"'
+    );
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
diff --git a/tests/e2e/generate-client/sse-consumer/api.ts b/tests/e2e/generate-client/sse-consumer/api.ts
index 1857bc9ad3..76c8ada779 100644
--- a/tests/e2e/generate-client/sse-consumer/api.ts
+++ b/tests/e2e/generate-client/sse-consumer/api.ts
@@ -680,7 +680,10 @@ async function send(
  */
 const FRAME_DELIMITER = /(?:\r\n|\r|\n){2}/;
 
-/** An event's JSON `data` failed to parse — a stable bad payload, not a dropped connection. */
+/**
+ * A terminally malformed event stream — unparseable JSON `data` or an unbounded frame.
+ * A stable bad payload, not a dropped connection, so the stream never reconnects on it.
+ */
 class SseParseError extends Error {}
 
 /**
@@ -763,7 +766,7 @@ async function* sse<T>(
           // Bound memory: a server that never sends a frame delimiter would otherwise
           // grow `buffer` without limit. 1 MiB is far above any real SSE frame.
           if (buffer.length > 1048576) {
-            throw new Error('SSE frame exceeded 1048576 characters without a delimiter');
+            throw new SseParseError('SSE frame exceeded 1048576 characters without a delimiter');
           }
         }
       } finally {

From a38182525ca16c388ffc08732df99d6afb507b96 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 14 Jul 2026 13:01:08 +0300
Subject: [PATCH 102/134] fix(client-generator): skip the optional-auth marker
 when resolving operation security

---
 .../__tests__/build.test.ts                           | 11 +++++++++++
 .../src/intermediate-representation/build.ts          |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts b/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
index 4e303e3ce3..9e055335d3 100644
--- a/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
+++ b/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
@@ -1995,6 +1995,17 @@ describe('buildApiModel — security (C6.6)', () => {
     expect(model.services[0].operations[0].security).toEqual(['OAuth2']);
   });
 
+  it('skips a leading `{}` (optional-auth marker) and applies the real alternative', () => {
+    const op = buildOpOnly(
+      withSchemes(
+        { OAuth2: { type: 'oauth2', flows: {} } },
+        // "anonymous OR bearer": credentials must still be sent when configured.
+        [{}, { OAuth2: [] }]
+      )
+    );
+    expect(op.security).toEqual(['OAuth2']);
+  });
+
   it('applies the first OR-alternative, never a union across alternatives', () => {
     const op = buildOpOnly(
       withSchemes(
diff --git a/packages/client-generator/src/intermediate-representation/build.ts b/packages/client-generator/src/intermediate-representation/build.ts
index d6dfd53a48..407ccefb16 100644
--- a/packages/client-generator/src/intermediate-representation/build.ts
+++ b/packages/client-generator/src/intermediate-representation/build.ts
@@ -353,6 +353,9 @@ function resolveOperationSecurity(
 
   for (const requirement of requirements) {
     const keys = Object.keys(requirement);
+    // Skip `{}` (the optional-auth marker): picking it would silently drop configured
+    // credentials whenever it's listed before a real alternative.
+    if (keys.length === 0) continue;
     if (keys.every((key) => injectable.has(key))) {
       return [...new Set(keys)];
     }

From e25b149ace01e2c164859f9691c06932c86ca204 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 14 Jul 2026 13:01:16 +0300
Subject: [PATCH 103/134] fix(core): keep the pagination block additive when
 layering per-api client config

---
 docs/@v2/configuration/reference/client.md    |  3 +-
 packages/core/src/config/config-resolvers.ts  | 33 ++++++++++++++++++-
 .../generate-client/redocly-config.test.ts    |  4 ++-
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/docs/@v2/configuration/reference/client.md b/docs/@v2/configuration/reference/client.md
index 7aa0cfff23..52c7b726b6 100644
--- a/docs/@v2/configuration/reference/client.md
+++ b/docs/@v2/configuration/reference/client.md
@@ -75,7 +75,8 @@ The style-conditional requirements and the structural fit (the advance param mus
 
 ## How the configuration applies
 
-A per-API `client` block overrides the top-level `client` field by field; unspecified fields fall back to the top-level defaults (a per-API `pagination` replaces the top-level one).
+A per-API `client` block overrides the top-level `client` field by field; unspecified fields fall back to the top-level defaults.
+The nested `pagination` block layers the same way: per-API `operations` merge by operationId and `exclude` lists union with the top-level ones.
 A file-path invocation matching no `apis:` entry uses only the top-level `client`.
 CLI flags then take precedence over the resolved configuration — see the [command reference](../../commands/generate-client.md#configuration).
 
diff --git a/packages/core/src/config/config-resolvers.ts b/packages/core/src/config/config-resolvers.ts
index d87fcd017f..019c3a4741 100644
--- a/packages/core/src/config/config-resolvers.ts
+++ b/packages/core/src/config/config-resolvers.ts
@@ -57,6 +57,37 @@ export type ConfigOptions = {
   customExtends?: string[];
 };
 
+// Mirrors @redocly/client-generator's `mergeConfig` layering: fields override one by one,
+// and the nested `pagination` block stays additive — `operations` merge by id, `exclude`
+// lists union — so a per-api block that sets only overrides keeps the shared convention.
+function mergeClientBlocks(
+  base: Record<string, unknown>,
+  overrides: Record<string, unknown>
+): Record<string, unknown> {
+  const merged = { ...base, ...overrides };
+  const basePagination = base.pagination;
+  const overridePagination = overrides.pagination;
+  if (isPlainObject(basePagination) && isPlainObject(overridePagination)) {
+    const pagination: Record<string, unknown> = { ...basePagination, ...overridePagination };
+    if (basePagination.operations || overridePagination.operations) {
+      pagination.operations = {
+        ...(isPlainObject(basePagination.operations) ? basePagination.operations : {}),
+        ...(isPlainObject(overridePagination.operations) ? overridePagination.operations : {}),
+      };
+    }
+    if (Array.isArray(basePagination.exclude) || Array.isArray(overridePagination.exclude)) {
+      pagination.exclude = [
+        ...new Set([
+          ...(Array.isArray(basePagination.exclude) ? basePagination.exclude : []),
+          ...(Array.isArray(overridePagination.exclude) ? overridePagination.exclude : []),
+        ]),
+      ];
+    }
+    merged.pagination = pagination;
+  }
+  return merged;
+}
+
 export async function resolveConfig({
   rawConfigDocument,
   configPath,
@@ -126,7 +157,7 @@ export async function resolveConfig({
         // field over the top-level one instead of replacing it.
         const client =
           isPlainObject(bundledConfig.client) && isPlainObject(apiConfig.client)
-            ? { client: { ...bundledConfig.client, ...apiConfig.client } }
+            ? { client: mergeClientBlocks(bundledConfig.client, apiConfig.client) }
             : {};
         return [key, { ...apiConfig, ...mergedConfig, ...client }];
       })
diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
index 267fd6de31..33c8f140f0 100644
--- a/tests/e2e/generate-client/redocly-config.test.ts
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -137,6 +137,8 @@ describe('generate-client redocly.yaml config', () => {
         '    root: ./openapi.yaml',
         '    client:',
         '      serverUrl: https://per-api.example.com',
+        '      pagination:', // partial: must layer onto the shared convention, not replace it
+        '        exclude: [getRevenue]',
       ].join('\n') + '\n'
     );
     copyFileSync(fixture, join(dir, 'standalone.yaml')); // not registered under `apis:`
@@ -145,7 +147,7 @@ describe('generate-client redocly.yaml config', () => {
     expect(matched.status, matched.stderr).toBe(0);
     const matchedOut = readFileSync(join(dir, 'matched.ts'), 'utf-8');
     expect(matchedOut).toContain('serverUrl: "https://per-api.example.com"');
-    expect(matchedOut).toContain('pagination: {'); // top-level default kept, field by field
+    expect(matchedOut).toContain('pagination: {'); // top-level convention kept, field by field
 
     const unmatched = run(dir, ['./standalone.yaml', '--output', './unmatched.ts']);
     expect(unmatched.status, unmatched.stderr).toBe(0);

From 36c569ff0723f221015de331a393c9c8a34edbd6 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 14 Jul 2026 13:15:51 +0300
Subject: [PATCH 104/134] fix(client-generator): let CommonJS projects
 require() the package runtime

---
 packages/client-generator/package.json        |  6 +-
 .../package-runtime-cjs.test.ts               | 90 +++++++++++++++++++
 2 files changed, 94 insertions(+), 2 deletions(-)
 create mode 100644 tests/e2e/generate-client/package-runtime-cjs.test.ts

diff --git a/packages/client-generator/package.json b/packages/client-generator/package.json
index 4c6ea02340..9894157142 100644
--- a/packages/client-generator/package.json
+++ b/packages/client-generator/package.json
@@ -8,8 +8,10 @@
   "exports": {
     ".": {
       "types": "./lib/index.d.ts",
-      "import": "./lib/index.js"
-    }
+      "import": "./lib/index.js",
+      "default": "./lib/index.js"
+    },
+    "./package.json": "./package.json"
   },
   "engines": {
     "node": ">=22.12.0 || >=20.19.0 <21.0.0",
diff --git a/tests/e2e/generate-client/package-runtime-cjs.test.ts b/tests/e2e/generate-client/package-runtime-cjs.test.ts
new file mode 100644
index 0000000000..313e4232d3
--- /dev/null
+++ b/tests/e2e/generate-client/package-runtime-cjs.test.ts
@@ -0,0 +1,90 @@
+import { spawnSync } from 'node:child_process';
+import { mkdirSync, mkdtempSync, rmSync, symlinkSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { outdent } from 'outdent';
+
+// A CommonJS project (e.g. a NestJS backend) consuming a `runtime: package` client emits
+// `require('@redocly/client-generator')`. That resolves through the `default` export
+// condition and loads the ESM entry via Node's require(esm) — supported by every Node
+// version the package's `engines` allow.
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const repoRoot = resolve(__dirname, '../../..');
+const cli = join(repoRoot, 'packages/cli/lib/index.js');
+const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+
+describe('generate-client package runtime in a CommonJS project', () => {
+  it('require()s the generated client and completes a call', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-cjs-'));
+    writeFileSync(join(dir, 'package.json'), '{"name":"cjs-consumer","private":true}\n');
+    mkdirSync(join(dir, 'node_modules/@redocly'), { recursive: true });
+    symlinkSync(
+      join(repoRoot, 'packages/client-generator'),
+      join(dir, 'node_modules/@redocly/client-generator')
+    );
+    writeFileSync(
+      join(dir, 'openapi.yaml'),
+      outdent`
+        openapi: 3.0.3
+        info: { title: test, version: 1.0.0 }
+        paths:
+          /foo:
+            get:
+              operationId: getFoo
+              responses:
+                '200':
+                  description: ok
+                  content:
+                    application/json:
+                      schema:
+                        type: object
+                        properties:
+                          ok: { type: boolean }
+      `
+    );
+    const generated = spawnSync(
+      'node',
+      [cli, 'generate-client', 'openapi.yaml', '--output', 'api.ts', '--runtime', 'package'],
+      { cwd: dir, encoding: 'utf-8' }
+    );
+    expect(generated.status, generated.stderr).toBe(0);
+
+    const tsc = spawnSync(
+      tscBin,
+      [
+        'api.ts',
+        '--module',
+        'nodenext',
+        '--moduleResolution',
+        'nodenext',
+        '--target',
+        'es2022',
+        '--skipLibCheck',
+      ],
+      { cwd: dir, encoding: 'utf-8' }
+    );
+    expect(tsc.status, `tsc failed:\n${tsc.stdout}`).toBe(0);
+
+    writeFileSync(
+      join(dir, 'driver.cjs'),
+      outdent`
+        const { configure, getFoo } = require('./api.js');
+        configure({
+          serverUrl: 'https://api.example.com',
+          fetch: async () =>
+            new Response(JSON.stringify({ ok: true }), {
+              status: 200,
+              headers: { 'content-type': 'application/json' },
+            }),
+        });
+        getFoo().then((data) => console.log('CJS-OK', JSON.stringify(data)));
+      `
+    );
+    const run = spawnSync('node', ['driver.cjs'], { cwd: dir, encoding: 'utf-8' });
+    expect(run.status, run.stderr).toBe(0);
+    expect(run.stdout).toContain('CJS-OK {"ok":true}');
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+});

From 1a16633e2b191ed681136472ecae1a8fb3837a4d Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 14 Jul 2026 14:37:24 +0300
Subject: [PATCH 105/134] fix(client-generator): apply the first configured
 security alternative, not only the first injectable one

---
 .../__snapshots__/package-client.test.ts.snap | 64 +++++++++++++------
 .../src/emitters/__tests__/descriptor.test.ts | 10 +--
 .../emitters/__tests__/package-client.test.ts |  2 +-
 .../src/emitters/descriptor.ts                |  7 +-
 .../src/emitters/runtime-sources.ts           |  6 +-
 .../__tests__/build.test.ts                   | 14 ++--
 .../__tests__/sanitize-identifiers.test.ts    |  8 +--
 .../src/intermediate-representation/build.ts  | 25 ++++----
 .../src/intermediate-representation/model.ts  | 12 ++--
 .../sanitize-identifiers.ts                   |  2 +-
 .../src/runtime/__tests__/auth.test.ts        | 45 +++++++++----
 .../runtime/__tests__/create-client.test.ts   |  2 +-
 .../src/runtime/__tests__/index.test.ts       |  2 +-
 .../src/runtime/__tests__/types.test.ts       |  2 +-
 packages/client-generator/src/runtime/auth.ts | 23 +++++--
 .../src/runtime/create-client.ts              |  2 +-
 .../client-generator/src/runtime/types.ts     |  5 +-
 tests/e2e/generate-client/auth.test.ts        | 10 +--
 .../e2e/generate-client/base-consumer/api.ts  |  7 +-
 .../e2e/generate-client/cafe-consumer/api.ts  | 48 +++++++++-----
 tests/e2e/generate-client/cafe.snapshot.ts    | 48 +++++++++-----
 .../examples/baked-setup/src/api/client.ts    | 48 +++++++++-----
 .../src/api/client.ts                         | 36 +++++++----
 .../custom-generator/src/api/client.ts        | 48 +++++++++-----
 .../custom-pagination/src/api/client.ts       |  7 +-
 .../examples/customization/src/api/client.ts  | 48 +++++++++-----
 .../fetch-functions/src/api/client.ts         | 48 +++++++++-----
 .../examples/mock/src/api/client.ts           | 48 +++++++++-----
 .../examples/multi-instance/src/api/client.ts |  4 +-
 .../examples/nested-facade/src/api/client.ts  |  7 +-
 .../package-runtime/src/api/client.ts         | 18 +++---
 .../examples/pagination/src/api/client.ts     |  7 +-
 .../examples/programmatic/src/api/client.ts   | 48 +++++++++-----
 .../examples/sse-streaming/src/api/client.ts  |  7 +-
 .../examples/tanstack-query/src/api/client.ts | 48 +++++++++-----
 .../examples/vendored-edge/src/api/client.ts  |  7 +-
 .../zero-install-quickstart/src/api/client.ts |  7 +-
 .../examples/zod/src/api/client.ts            | 48 +++++++++-----
 .../package-runtime-consumer/api.ts           |  2 +-
 .../pagination-consumer/api-offset.ts         |  7 +-
 .../pagination-consumer/api.ts                |  7 +-
 tests/e2e/generate-client/sse-consumer/api.ts |  7 +-
 42 files changed, 541 insertions(+), 310 deletions(-)

diff --git a/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap b/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
index e92870f9bf..3c099c9c89 100644
--- a/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
+++ b/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
@@ -54,7 +54,7 @@ export type Ops = {
  * tags) for cache keys, tracing span names, and request logging.
  */
 export const OPERATIONS = {
-    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "expand", in: "query" }], security: [{ scheme: "bearerAuth", kind: "bearer" }] },
+    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "expand", in: "query" }], security: [[{ scheme: "bearerAuth", kind: "bearer" }]] },
     streamEvents: { id: "streamEvents", method: "GET", path: "/events", responseKind: "sse", sseDataKind: "json" }
 } as const satisfies Record<string, OperationDescriptor>;
 
@@ -85,7 +85,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (\`scheme\` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (\`scheme\` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -118,7 +118,8 @@ export type OperationDescriptor = {
   /** Defaults to \`'json'\` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -541,21 +542,34 @@ function encodeBase64(text: string): string {
   return btoa(binary);
 }
 
+/** Whether a credential for this scheme is configured on the instance. */
+function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
+  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
+  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
+  return config.auth?.basic !== undefined;
+}
+
 /**
- * Build the auth headers/query for one operation's \`security\` requirements from the
+ * Build the auth headers/query for one operation's \`security\` OR-alternatives from the
  * instance credentials (\`config.auth\`) — capability module, wired into \`createClient\`.
- * A scheme with no configured credential contributes nothing (the request is sent
- * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * The first alternative whose schemes (an AND-set) are all configured is applied, so
+ * "bearer OR apiKey" works with either credential and never sends both. When none is
+ * fully configured, the first alternative's configured schemes are still sent (the
+ * server rejects the request, mirroring the previous behavior).
  * Cookie-borne apiKeys fold into a single \`Cookie\` header joined with \`; \`.
  */
 async function resolveAuth(
-  security: readonly SecuritySpec[],
+  security: readonly (readonly SecuritySpec[])[],
   config: ClientConfig
 ): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const alternative =
+    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
+    security[0] ??
+    [];
   const headers: Record<string, string> = {};
   const query: Record<string, string> = {};
   const cookies: string[] = [];
-  for (const scheme of security) {
+  for (const scheme of alternative) {
     if (scheme.kind === 'apiKey') {
       const provider = config.auth?.apiKey?.[scheme.scheme];
       if (provider === undefined) continue;
@@ -895,7 +909,7 @@ function parseSseFrame(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
@@ -1280,7 +1294,7 @@ export type Ops = {
  * tags) for cache keys, tracing span names, and request logging.
  */
 export const OPERATIONS = {
-    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "expand", in: "query" }], security: [{ scheme: "bearerAuth", kind: "bearer" }] },
+    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "expand", in: "query" }], security: [[{ scheme: "bearerAuth", kind: "bearer" }]] },
     streamEvents: { id: "streamEvents", method: "GET", path: "/events", responseKind: "sse", sseDataKind: "json" }
 } as const satisfies Record<string, OperationDescriptor>;
 
@@ -1407,7 +1421,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (\`scheme\` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (\`scheme\` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -1440,7 +1454,8 @@ export type OperationDescriptor = {
   /** Defaults to \`'json'\` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -1863,21 +1878,34 @@ function encodeBase64(text: string): string {
   return btoa(binary);
 }
 
+/** Whether a credential for this scheme is configured on the instance. */
+function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
+  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
+  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
+  return config.auth?.basic !== undefined;
+}
+
 /**
- * Build the auth headers/query for one operation's \`security\` requirements from the
+ * Build the auth headers/query for one operation's \`security\` OR-alternatives from the
  * instance credentials (\`config.auth\`) — capability module, wired into \`createClient\`.
- * A scheme with no configured credential contributes nothing (the request is sent
- * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * The first alternative whose schemes (an AND-set) are all configured is applied, so
+ * "bearer OR apiKey" works with either credential and never sends both. When none is
+ * fully configured, the first alternative's configured schemes are still sent (the
+ * server rejects the request, mirroring the previous behavior).
  * Cookie-borne apiKeys fold into a single \`Cookie\` header joined with \`; \`.
  */
 async function resolveAuth(
-  security: readonly SecuritySpec[],
+  security: readonly (readonly SecuritySpec[])[],
   config: ClientConfig
 ): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const alternative =
+    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
+    security[0] ??
+    [];
   const headers: Record<string, string> = {};
   const query: Record<string, string> = {};
   const cookies: string[] = [];
-  for (const scheme of security) {
+  for (const scheme of alternative) {
     if (scheme.kind === 'apiKey') {
       const provider = config.auth?.apiKey?.[scheme.scheme];
       if (provider === undefined) continue;
@@ -2162,7 +2190,7 @@ async function send(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/packages/client-generator/src/emitters/__tests__/descriptor.test.ts b/packages/client-generator/src/emitters/__tests__/descriptor.test.ts
index 1e95b969c0..8e7f49f44e 100644
--- a/packages/client-generator/src/emitters/__tests__/descriptor.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/descriptor.test.ts
@@ -127,7 +127,7 @@ describe('descriptorStatements', () => {
           op('use', {
             path: '/u/{id}',
             pathParams: [param('id', 'path', true)],
-            security: ['bearerAuth'],
+            security: [['bearerAuth']],
             successResponses: [JSON_OK],
           }),
         ],
@@ -135,7 +135,7 @@ describe('descriptorStatements', () => {
       )
     );
     expect(out).toContain(
-      'use_2: { id: "use", method: "GET", path: "/u/{id}", params: [{ name: "id", in: "path" }], security: [{ scheme: "bearerAuth", kind: "bearer" }] }'
+      'use_2: { id: "use", method: "GET", path: "/u/{id}", params: [{ name: "id", in: "path" }], security: [[{ scheme: "bearerAuth", kind: "bearer" }]] }'
     );
   });
 
@@ -257,7 +257,7 @@ describe('descriptorStatements', () => {
 
   it('denormalizes security from the model schemes, skipping unknown keys', () => {
     const out = emitDescriptors(
-      modelWith([op('getOrder', { security: ['bearerAuth', 'apiCookie', 'ghost'] })], {
+      modelWith([op('getOrder', { security: [['bearerAuth', 'apiCookie', 'ghost']] })], {
         securitySchemes: [
           { kind: 'bearer', key: 'bearerAuth' },
           { kind: 'apiKeyCookie', key: 'apiCookie', cookieName: 'sid' },
@@ -265,14 +265,14 @@ describe('descriptorStatements', () => {
       })
     );
     expect(out).toContain(
-      'security: [{ scheme: "bearerAuth", kind: "bearer" }, { scheme: "apiCookie", kind: "apiKey", name: "sid", in: "cookie" }]'
+      'security: [[{ scheme: "bearerAuth", kind: "bearer" }, { scheme: "apiCookie", kind: "apiKey", name: "sid", in: "cookie" }]]'
     );
     expect(out).not.toContain('ghost');
   });
 
   it('covers basic, apiKey header, and apiKey query schemes', () => {
     const out = emitDescriptors(
-      modelWith([op('getOrder', { security: ['basicAuth', 'apiHeader', 'apiQuery'] })], {
+      modelWith([op('getOrder', { security: [['basicAuth', 'apiHeader', 'apiQuery']] })], {
         securitySchemes: [
           { kind: 'basic', key: 'basicAuth' },
           { kind: 'apiKeyHeader', key: 'apiHeader', headerName: 'X-Key' },
diff --git a/packages/client-generator/src/emitters/__tests__/package-client.test.ts b/packages/client-generator/src/emitters/__tests__/package-client.test.ts
index b2207528eb..1bdefc75e7 100644
--- a/packages/client-generator/src/emitters/__tests__/package-client.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/package-client.test.ts
@@ -20,7 +20,7 @@ const getOrder = operation({
   queryParams: [param('expand', 'query')],
   successResponses: [response({ schema: { kind: 'ref', name: 'Order' } })],
   errorResponses: [response({ status: 400, schema: { kind: 'ref', name: 'Problem' } })],
-  security: ['bearerAuth'],
+  security: [['bearerAuth']],
   tags: ['Orders'],
 });
 const createPet = operation({
diff --git a/packages/client-generator/src/emitters/descriptor.ts b/packages/client-generator/src/emitters/descriptor.ts
index 77d8d88b42..1046e4546c 100644
--- a/packages/client-generator/src/emitters/descriptor.ts
+++ b/packages/client-generator/src/emitters/descriptor.ts
@@ -98,7 +98,7 @@ function descriptorValue(
     ...(p.explode !== undefined ? { explode: p.explode } : {}),
     ...(p.allowReserved !== undefined ? { allowReserved: p.allowReserved } : {}),
   }));
-  const security = op.security.flatMap((key): SecuritySpec[] => {
+  const toSpecs = (key: string): SecuritySpec[] => {
     const s = schemes.find((scheme) => scheme.key === key);
     if (!s) return [];
     if (s.kind === 'bearer' || s.kind === 'basic') return [{ scheme: key, kind: s.kind }];
@@ -109,7 +109,10 @@ function descriptorValue(
       return [{ scheme: key, kind: 'apiKey', name: s.paramName, in: 'query' }];
     }
     return [{ scheme: key, kind: 'apiKey', name: s.cookieName, in: 'cookie' }];
-  });
+  };
+  const security = op.security
+    .map((alternative) => alternative.flatMap(toSpecs))
+    .filter((alternative) => alternative.length > 0);
   const sse = isSseOp(op);
   const responseKind = sse ? 'sse' : computeResponse(op.successResponses, dateType).responseKind;
   return {
diff --git a/packages/client-generator/src/emitters/runtime-sources.ts b/packages/client-generator/src/emitters/runtime-sources.ts
index db0c1167a6..ecb7246c3a 100644
--- a/packages/client-generator/src/emitters/runtime-sources.ts
+++ b/packages/client-generator/src/emitters/runtime-sources.ts
@@ -1,7 +1,7 @@
 // GENERATED by scripts/generate-runtime-sources.mjs — do not edit. Regenerated on install (`prepare`); manually: `npm run prepare -w @redocly/client-generator`.
 export const RUNTIME_SOURCES = {
   'types.ts':
-    "/**\n * The public type surface of the client runtime — `@redocly/client-generator`'s\n * app-facing runtime module. Pure types, no runtime code (excluded from coverage).\n * The generator emits `OPERATIONS` literals typed\n * `satisfies Record<string, OperationDescriptor>` against this module, so an\n * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).\n */\n\n/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */\nexport type ParamSpec = {\n  name: string;\n  in: 'path' | 'query' | 'header';\n  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';\n  explode?: boolean;\n  allowReserved?: boolean;\n};\n\n/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */\nexport type SecuritySpec =\n  | { scheme: string; kind: 'bearer' | 'basic' }\n  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };\n\n/**\n * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).\n * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.\n */\nexport type PaginationSpec = {\n  style: 'cursor' | 'offset' | 'page';\n  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */\n  param: string;\n  /** Optional page-size query param (recorded for tooling; never set by the runtime). */\n  limitParam?: string;\n  /** Cursor style only: pointer to the next cursor in the page. */\n  nextCursor?: string;\n  /** Pointer to the page's item array. */\n  items: string;\n};\n\n/** The frozen data contract between generated code and the runtime: one operation's wire shape. */\nexport type OperationDescriptor = {\n  id: string;\n  method: string;\n  path: string;\n  tags?: readonly string[];\n  params?: readonly ParamSpec[];\n  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */\n  body?: { contentType: string; multipart?: boolean };\n  /** Defaults to `'json'` (content-type negotiation on parse). */\n  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';\n  sseDataKind?: 'json' | 'text';\n  security?: readonly SecuritySpec[];\n  pagination?: PaginationSpec;\n};\n\n/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */\nexport type QueryValue =\n  | string\n  | number\n  | boolean\n  | null\n  | undefined\n  | Array<string | number | boolean | null | undefined>\n  | Record<string, unknown>;\n\n/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */\nexport type TokenProvider = string | (() => string | Promise<string>);\n\n/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */\nexport type AuthCredentials = {\n  bearer?: TokenProvider;\n  basic?: { username: string; password: string };\n  apiKey?: Record<string, TokenProvider>;\n};\n\n/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */\nexport type RetryStrategy = 'fixed' | 'exponential';\n\n/**\n * The operation's identity, exposed to middleware for targeting (`ctx.operation`).\n * Generated clients instantiate the type parameters with the spec's literal unions\n * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a\n * middleware comparison fails to compile; the string defaults keep every\n * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working\n * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types\n * (byte-locked to generated output) remain assignable through middleware callbacks.\n */\nexport type OperationContext<\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n> = { id: Id; path: Path; tags: Tag[] };\n\n/** The mutable request context threaded through the middleware chain. */\nexport type RequestContext<Op extends OperationContext = OperationContext> = {\n  url: string;\n  method: string;\n  headers: Record<string, string>;\n  body?: unknown;\n  operation: Op;\n};\n\n/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */\nexport type RetryContext<Op extends OperationContext = OperationContext> = {\n  attempt: number;\n  request: RequestContext<Op>;\n  response?: Response;\n  error?: unknown;\n};\n\n/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */\nexport type RetryConfig<Op extends OperationContext = OperationContext> = {\n  retries?: number;\n  retryDelay?: number;\n  retryStrategy?: RetryStrategy;\n  jitter?: boolean;\n  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;\n};\n\n/**\n * Structural stand-in for the runtime's ApiError so this module stays import-free\n * (pure types); the real `ApiError` class is assignable to it.\n */\nexport type ApiErrorLike = globalThis.Error & {\n  url: string;\n  status: number;\n  statusText: string;\n  body: unknown;\n};\n\n/** One interceptor: any subset of the three hooks. */\nexport type Middleware<Op extends OperationContext = OperationContext> = {\n  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;\n  onResponse?: (\n    response: Response,\n    ctx: RequestContext<Op>\n  ) => Response | void | Promise<Response | void>;\n  /** Throw mode only: may map/replace the error. */\n  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.\n  onError?: (\n    error: ApiErrorLike,\n    ctx: RequestContext<Op>\n  ) => globalThis.Error | Promise<globalThis.Error>;\n};\n\n/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */\nexport type ClientConfig<Op extends OperationContext = OperationContext> = {\n  serverUrl?: string;\n  fetch?: typeof fetch;\n  headers?:\n    | Record<string, string>\n    | (() => Record<string, string> | Promise<Record<string, string>>);\n  retry?: RetryConfig<Op>;\n  middleware?: Middleware<Op>[];\n  auth?: AuthCredentials;\n  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */\n  errorMode?: 'throw' | 'result';\n  onRequest?: Middleware<Op>['onRequest'];\n  onResponse?: Middleware<Op>['onResponse'];\n  onError?: Middleware<Op>['onError'];\n};\n\n/** Response readers for the per-call `parseAs` override. */\nexport type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';\n\n/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */\nexport type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };\n\n/** Per-call options for an SSE stream; reconnect defaults to true. */\nexport type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };\n\n/** A single decoded Server-Sent Event with its payload typed from the spec. */\nexport type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };\n\n/** Result-mode return shape: exactly one of `data`/`error` is set. */\nexport type Result<TData, TError> =\n  | { data: TData; error: undefined; response: Response }\n  | { data: undefined; error: TError; response: Response };\n\n/**\n * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for\n * streams and, for paginated operations, `item` (the page's element type) and — on\n * result-mode clients only — `page` (the RAW page type `.pages()` yields, since\n * iteration unwraps the `Result` envelope the one-shot `result` carries).\n */\nexport type OpsShape = Record<\n  string,\n  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }\n>;\n\n/** The always-present client members (assigned after the operation loop — they win collisions). */\nexport type ClientCore<Op extends OperationContext = OperationContext> = {\n  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */\n  configure(config: ClientConfig<Op>): void;\n  /** Append interceptors (composes with baked/publisher middleware). */\n  use(...middleware: Middleware<Op>[]): void;\n  auth: {\n    bearer(token: TokenProvider): void;\n    basic(username: string, password: string): void;\n    apiKey(scheme: string, value: TokenProvider): void;\n  };\n};\n\n/**\n * The standard TypeScript optionality probe: `{}` has no required members, so\n * `{} extends A` is true exactly when every member of `A` is optional.\n */\n// oxlint-disable-next-line typescript/no-empty-object-type\ntype NoRequiredKeys<A> = {} extends A ? true : false;\n\n/**\n * The page type `.pages()` yields: the RAW page declared by `page` (the generator\n * writes it only on result-mode paginated entries, whose `result` is the envelope),\n * or the method's own `result` (throw mode — already the raw page).\n */\ntype PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }\n  ? Entry['page']\n  : Entry['result'];\n\n/**\n * The auto-pagination members intersected onto a paginated method — present exactly when\n * the Ops entry declares `item` (the generator writes it only for paginated operations).\n * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).\n * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a\n * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the\n * `onError` middleware hook (throw-mode-only) is not invoked.\n */\ntype Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry\n  ? NoRequiredKeys<Entry['args']> extends true\n    ? {\n        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;\n        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;\n      }\n    : {\n        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;\n        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;\n      }\n  : unknown;\n\n/** The typed instance client: one bound method per operation plus the core members. */\nexport type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {\n  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }\n    ? NoRequiredKeys<Ops[K]['args']> extends true\n      ? (\n          args?: Ops[K]['args'],\n          init?: SseOptions\n        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>\n      : (\n          args: Ops[K]['args'],\n          init?: SseOptions\n        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>\n    : (NoRequiredKeys<Ops[K]['args']> extends true\n        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>\n        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &\n        Paginated<Ops[K]>;\n} & ClientCore<Op>;\n",
+    "/**\n * The public type surface of the client runtime — `@redocly/client-generator`'s\n * app-facing runtime module. Pure types, no runtime code (excluded from coverage).\n * The generator emits `OPERATIONS` literals typed\n * `satisfies Record<string, OperationDescriptor>` against this module, so an\n * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).\n */\n\n/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */\nexport type ParamSpec = {\n  name: string;\n  in: 'path' | 'query' | 'header';\n  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';\n  explode?: boolean;\n  allowReserved?: boolean;\n};\n\n/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */\nexport type SecuritySpec =\n  | { scheme: string; kind: 'bearer' | 'basic' }\n  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };\n\n/**\n * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).\n * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.\n */\nexport type PaginationSpec = {\n  style: 'cursor' | 'offset' | 'page';\n  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */\n  param: string;\n  /** Optional page-size query param (recorded for tooling; never set by the runtime). */\n  limitParam?: string;\n  /** Cursor style only: pointer to the next cursor in the page. */\n  nextCursor?: string;\n  /** Pointer to the page's item array. */\n  items: string;\n};\n\n/** The frozen data contract between generated code and the runtime: one operation's wire shape. */\nexport type OperationDescriptor = {\n  id: string;\n  method: string;\n  path: string;\n  tags?: readonly string[];\n  params?: readonly ParamSpec[];\n  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */\n  body?: { contentType: string; multipart?: boolean };\n  /** Defaults to `'json'` (content-type negotiation on parse). */\n  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';\n  sseDataKind?: 'json' | 'text';\n  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */\n  security?: readonly (readonly SecuritySpec[])[];\n  pagination?: PaginationSpec;\n};\n\n/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */\nexport type QueryValue =\n  | string\n  | number\n  | boolean\n  | null\n  | undefined\n  | Array<string | number | boolean | null | undefined>\n  | Record<string, unknown>;\n\n/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */\nexport type TokenProvider = string | (() => string | Promise<string>);\n\n/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */\nexport type AuthCredentials = {\n  bearer?: TokenProvider;\n  basic?: { username: string; password: string };\n  apiKey?: Record<string, TokenProvider>;\n};\n\n/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */\nexport type RetryStrategy = 'fixed' | 'exponential';\n\n/**\n * The operation's identity, exposed to middleware for targeting (`ctx.operation`).\n * Generated clients instantiate the type parameters with the spec's literal unions\n * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a\n * middleware comparison fails to compile; the string defaults keep every\n * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working\n * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types\n * (byte-locked to generated output) remain assignable through middleware callbacks.\n */\nexport type OperationContext<\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n> = { id: Id; path: Path; tags: Tag[] };\n\n/** The mutable request context threaded through the middleware chain. */\nexport type RequestContext<Op extends OperationContext = OperationContext> = {\n  url: string;\n  method: string;\n  headers: Record<string, string>;\n  body?: unknown;\n  operation: Op;\n};\n\n/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */\nexport type RetryContext<Op extends OperationContext = OperationContext> = {\n  attempt: number;\n  request: RequestContext<Op>;\n  response?: Response;\n  error?: unknown;\n};\n\n/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */\nexport type RetryConfig<Op extends OperationContext = OperationContext> = {\n  retries?: number;\n  retryDelay?: number;\n  retryStrategy?: RetryStrategy;\n  jitter?: boolean;\n  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;\n};\n\n/**\n * Structural stand-in for the runtime's ApiError so this module stays import-free\n * (pure types); the real `ApiError` class is assignable to it.\n */\nexport type ApiErrorLike = globalThis.Error & {\n  url: string;\n  status: number;\n  statusText: string;\n  body: unknown;\n};\n\n/** One interceptor: any subset of the three hooks. */\nexport type Middleware<Op extends OperationContext = OperationContext> = {\n  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;\n  onResponse?: (\n    response: Response,\n    ctx: RequestContext<Op>\n  ) => Response | void | Promise<Response | void>;\n  /** Throw mode only: may map/replace the error. */\n  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.\n  onError?: (\n    error: ApiErrorLike,\n    ctx: RequestContext<Op>\n  ) => globalThis.Error | Promise<globalThis.Error>;\n};\n\n/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */\nexport type ClientConfig<Op extends OperationContext = OperationContext> = {\n  serverUrl?: string;\n  fetch?: typeof fetch;\n  headers?:\n    | Record<string, string>\n    | (() => Record<string, string> | Promise<Record<string, string>>);\n  retry?: RetryConfig<Op>;\n  middleware?: Middleware<Op>[];\n  auth?: AuthCredentials;\n  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */\n  errorMode?: 'throw' | 'result';\n  onRequest?: Middleware<Op>['onRequest'];\n  onResponse?: Middleware<Op>['onResponse'];\n  onError?: Middleware<Op>['onError'];\n};\n\n/** Response readers for the per-call `parseAs` override. */\nexport type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';\n\n/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */\nexport type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };\n\n/** Per-call options for an SSE stream; reconnect defaults to true. */\nexport type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };\n\n/** A single decoded Server-Sent Event with its payload typed from the spec. */\nexport type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };\n\n/** Result-mode return shape: exactly one of `data`/`error` is set. */\nexport type Result<TData, TError> =\n  | { data: TData; error: undefined; response: Response }\n  | { data: undefined; error: TError; response: Response };\n\n/**\n * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for\n * streams and, for paginated operations, `item` (the page's element type) and — on\n * result-mode clients only — `page` (the RAW page type `.pages()` yields, since\n * iteration unwraps the `Result` envelope the one-shot `result` carries).\n */\nexport type OpsShape = Record<\n  string,\n  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }\n>;\n\n/** The always-present client members (assigned after the operation loop — they win collisions). */\nexport type ClientCore<Op extends OperationContext = OperationContext> = {\n  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */\n  configure(config: ClientConfig<Op>): void;\n  /** Append interceptors (composes with baked/publisher middleware). */\n  use(...middleware: Middleware<Op>[]): void;\n  auth: {\n    bearer(token: TokenProvider): void;\n    basic(username: string, password: string): void;\n    apiKey(scheme: string, value: TokenProvider): void;\n  };\n};\n\n/**\n * The standard TypeScript optionality probe: `{}` has no required members, so\n * `{} extends A` is true exactly when every member of `A` is optional.\n */\n// oxlint-disable-next-line typescript/no-empty-object-type\ntype NoRequiredKeys<A> = {} extends A ? true : false;\n\n/**\n * The page type `.pages()` yields: the RAW page declared by `page` (the generator\n * writes it only on result-mode paginated entries, whose `result` is the envelope),\n * or the method's own `result` (throw mode — already the raw page).\n */\ntype PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }\n  ? Entry['page']\n  : Entry['result'];\n\n/**\n * The auto-pagination members intersected onto a paginated method — present exactly when\n * the Ops entry declares `item` (the generator writes it only for paginated operations).\n * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).\n * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a\n * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the\n * `onError` middleware hook (throw-mode-only) is not invoked.\n */\ntype Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry\n  ? NoRequiredKeys<Entry['args']> extends true\n    ? {\n        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;\n        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;\n      }\n    : {\n        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;\n        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;\n      }\n  : unknown;\n\n/** The typed instance client: one bound method per operation plus the core members. */\nexport type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {\n  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }\n    ? NoRequiredKeys<Ops[K]['args']> extends true\n      ? (\n          args?: Ops[K]['args'],\n          init?: SseOptions\n        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>\n      : (\n          args: Ops[K]['args'],\n          init?: SseOptions\n        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>\n    : (NoRequiredKeys<Ops[K]['args']> extends true\n        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>\n        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &\n        Paginated<Ops[K]>;\n} & ClientCore<Op>;\n",
   'errors.ts':
     "/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */\nexport class ApiError extends Error {\n  public readonly url: string;\n  public readonly status: number;\n  public readonly statusText: string;\n  public readonly body: unknown;\n  constructor(url: string, status: number, statusText: string, body: unknown) {\n    super(`Request failed with status ${status}`);\n    this.name = 'ApiError';\n    this.url = url;\n    this.status = status;\n    this.statusText = statusText;\n    this.body = body;\n  }\n}\n\n/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */\n// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it\n// when this module is embedded alongside generated types (inline mode).\nexport function abortError(signal: AbortSignal): globalThis.Error {\n  const reason = (signal as { reason?: unknown }).reason;\n  if (reason instanceof Error) return reason;\n  return new DOMException('The operation was aborted.', 'AbortError');\n}\n",
   'url.ts':
@@ -13,7 +13,7 @@ export const RUNTIME_SOURCES = {
   'multipart.ts':
     "/**\n * Serialize a plain object into `FormData` for a typed `multipart/form-data` body\n * (capability module — wired into `createClient`, never imported by the send core).\n * `Blob`/`File` and strings pass through; `Date`s become ISO strings; arrays append\n * one field per item; other objects are JSON-encoded; everything else is stringified.\n * `undefined`/`null` entries are skipped.\n */\nexport function toFormData(body: Record<string, unknown>): FormData {\n  const fd = new FormData();\n  const append = (key: string, value: unknown): void => {\n    if (value === undefined || value === null) return;\n    if (value instanceof Blob || typeof value === 'string') fd.append(key, value);\n    else if (value instanceof Date) fd.append(key, value.toISOString());\n    else if (Object(value) === value) fd.append(key, JSON.stringify(value));\n    else fd.append(key, String(value));\n  };\n  for (const [key, value] of Object.entries(body)) {\n    if (Array.isArray(value)) for (const item of value) append(key, item);\n    else append(key, value);\n  }\n  return fd;\n}\n",
   'auth.ts':
-    "import type { ClientConfig, SecuritySpec, TokenProvider } from './types.js';\n\n/** Resolve a credential: a literal passes through; a function is awaited per request. */\nasync function resolveToken(provider: TokenProvider): Promise<string> {\n  return typeof provider === 'function' ? await provider() : provider;\n}\n\n/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */\nfunction encodeBase64(text: string): string {\n  let binary = '';\n  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);\n  return btoa(binary);\n}\n\n/**\n * Build the auth headers/query for one operation's `security` requirements from the\n * instance credentials (`config.auth`) — capability module, wired into `createClient`.\n * A scheme with no configured credential contributes nothing (the request is sent\n * unauthenticated and the server rejects it, mirroring the generated-client behavior).\n * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.\n */\nexport async function resolveAuth(\n  security: readonly SecuritySpec[],\n  config: ClientConfig\n): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {\n  const headers: Record<string, string> = {};\n  const query: Record<string, string> = {};\n  const cookies: string[] = [];\n  for (const scheme of security) {\n    if (scheme.kind === 'apiKey') {\n      const provider = config.auth?.apiKey?.[scheme.scheme];\n      if (provider === undefined) continue;\n      const value = await resolveToken(provider);\n      if (scheme.in === 'header') headers[scheme.name] = value;\n      else if (scheme.in === 'query') query[scheme.name] = value;\n      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode\n      // so the credential can't break the `Cookie` header syntax.\n      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);\n    } else if (scheme.kind === 'bearer') {\n      const provider = config.auth?.bearer;\n      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;\n    } else {\n      const basic = config.auth?.basic;\n      if (basic !== undefined) {\n        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;\n      }\n    }\n  }\n  if (cookies.length > 0) headers.Cookie = cookies.join('; ');\n  return { headers, query };\n}\n",
+    "import type { ClientConfig, SecuritySpec, TokenProvider } from './types.js';\n\n/** Resolve a credential: a literal passes through; a function is awaited per request. */\nasync function resolveToken(provider: TokenProvider): Promise<string> {\n  return typeof provider === 'function' ? await provider() : provider;\n}\n\n/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */\nfunction encodeBase64(text: string): string {\n  let binary = '';\n  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);\n  return btoa(binary);\n}\n\n/** Whether a credential for this scheme is configured on the instance. */\nfunction isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {\n  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;\n  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;\n  return config.auth?.basic !== undefined;\n}\n\n/**\n * Build the auth headers/query for one operation's `security` OR-alternatives from the\n * instance credentials (`config.auth`) — capability module, wired into `createClient`.\n * The first alternative whose schemes (an AND-set) are all configured is applied, so\n * \"bearer OR apiKey\" works with either credential and never sends both. When none is\n * fully configured, the first alternative's configured schemes are still sent (the\n * server rejects the request, mirroring the previous behavior).\n * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.\n */\nexport async function resolveAuth(\n  security: readonly (readonly SecuritySpec[])[],\n  config: ClientConfig\n): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {\n  const alternative =\n    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??\n    security[0] ??\n    [];\n  const headers: Record<string, string> = {};\n  const query: Record<string, string> = {};\n  const cookies: string[] = [];\n  for (const scheme of alternative) {\n    if (scheme.kind === 'apiKey') {\n      const provider = config.auth?.apiKey?.[scheme.scheme];\n      if (provider === undefined) continue;\n      const value = await resolveToken(provider);\n      if (scheme.in === 'header') headers[scheme.name] = value;\n      else if (scheme.in === 'query') query[scheme.name] = value;\n      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode\n      // so the credential can't break the `Cookie` header syntax.\n      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);\n    } else if (scheme.kind === 'bearer') {\n      const provider = config.auth?.bearer;\n      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;\n    } else {\n      const basic = config.auth?.basic;\n      if (basic !== undefined) {\n        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;\n      }\n    }\n  }\n  if (cookies.length > 0) headers.Cookie = cookies.join('; ');\n  return { headers, query };\n}\n",
   'setup.ts':
     "import type { ClientConfig, Middleware } from './types.js';\n\n/**\n * Merge a publisher's baked setup (`defineClientSetup({...})`) with the app's config:\n * app config fields win per-field over baked defaults, while middleware composes —\n * baked middleware runs first, then the app's.\n */\nexport function mergeSetup(\n  setup: { config?: ClientConfig; middleware?: Middleware[] } | undefined,\n  config: ClientConfig = {}\n): ClientConfig {\n  return {\n    ...setup?.config,\n    ...config,\n    middleware: [...(setup?.middleware ?? []), ...(config.middleware ?? [])],\n  };\n}\n",
   'send.ts':
@@ -21,7 +21,7 @@ export const RUNTIME_SOURCES = {
   'sse.ts':
     "import { ApiError } from './errors.js';\nimport { readError } from './parse.js';\nimport { sleep } from './retry.js';\nimport { send, toHeaderRecord } from './send.js';\nimport type { ClientConfig, OperationContext, ServerSentEvent, SseOptions } from './types.js';\n\n/**\n * A frame delimiter: two consecutive line terminators (each CR, LF, or CRLF, per the SSE\n * spec — so mixed endings like `\\n\\r\\n` are valid boundaries, not just matching pairs).\n */\nconst FRAME_DELIMITER = /(?:\\r\\n|\\r|\\n){2}/;\n\n/**\n * A terminally malformed event stream — unparseable JSON `data` or an unbounded frame.\n * A stable bad payload, not a dropped connection, so the stream never reconnects on it.\n */\nexport class SseParseError extends Error {}\n\n/**\n * Consume a `text/event-stream` operation as typed events (capability module — wired\n * into `createClient`). Auto-reconnects on dropped connections, resuming from the last\n * seen event id via `Last-Event-ID` (backoff: the server's `retry:` value, then\n * `reconnectDelay`, then 1s — exponential with jitter, capped at 30s). A clean stream\n * end flushes a trailing frame and finishes; `break`/abort end the iterator cleanly.\n */\nexport async function* sse<T>(\n  config: ClientConfig,\n  op: OperationContext,\n  prepare: () => Promise<{ url: string; init: SseOptions }>,\n  dataKind: 'json' | 'text' = 'text'\n): AsyncGenerator<ServerSentEvent<T>> {\n  let lastEventId: string | undefined;\n  let serverRetry: number | undefined;\n  let failures = 0;\n  while (true) {\n    // Re-prepare each attempt so a refresh-style TokenProvider yields a fresh credential\n    // on reconnect (the auth is baked into `url` query + `init.headers`). `reconnect`,\n    // `reconnectDelay`, and `signal` come from the caller's original options unchanged.\n    const { url, init } = await prepare();\n    const { reconnect = true, reconnectDelay, ...rest } = init;\n    const signal = rest.signal ?? undefined;\n    if (signal?.aborted) return;\n    const headers: Record<string, string> = {\n      Accept: 'text/event-stream',\n      ...toHeaderRecord(rest.headers),\n    };\n    const sendHeaders =\n      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };\n    try {\n      const { response } = await send(\n        config,\n        op,\n        url,\n        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },\n        undefined,\n        false,\n        {}\n      );\n      if (!response.ok) {\n        const errorBody = await readError(response);\n        throw new ApiError(url, response.status, response.statusText, errorBody);\n      }\n      failures = 0;\n      const body = response.body;\n      if (!body) return;\n      const reader = body.getReader();\n      const decoder = new TextDecoder();\n      let buffer = '';\n      try {\n        while (true) {\n          const { done, value } = await reader.read();\n          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });\n          let match: RegExpMatchArray | null;\n          while ((match = buffer.match(FRAME_DELIMITER)) !== null) {\n            const index = match.index!;\n            const raw = buffer.slice(0, index);\n            buffer = buffer.slice(index + match[0].length);\n            const event = parseSseFrame(raw, dataKind);\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n          }\n          if (done) {\n            // Stream closed cleanly. Flush a final event that arrived without a trailing\n            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.\n            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n            return;\n          }\n          // Bound memory: a server that never sends a frame delimiter would otherwise\n          // grow `buffer` without limit. 1 MiB is far above any real SSE frame.\n          if (buffer.length > 1048576) {\n            throw new SseParseError('SSE frame exceeded 1048576 characters without a delimiter');\n          }\n        }\n      } finally {\n        await reader.cancel().catch(() => undefined);\n      }\n    } catch (error) {\n      if (signal?.aborted) return;\n      // A non-OK HTTP response (4xx/5xx) or an unparseable JSON payload is a definitive\n      // error, not a transient drop — surface it instead of reconnecting in a loop (a\n      // stable bad payload would otherwise reconnect forever).\n      if (error instanceof ApiError || error instanceof SseParseError) throw error;\n      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream\n      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.\n      if (!reconnect) throw error;\n    }\n    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.\n    failures++;\n    const base = serverRetry ?? reconnectDelay ?? 1000;\n    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);\n    try {\n      await sleep(Math.random() * delay, signal);\n    } catch {\n      return; // sleep rejects only on abort — end the iterator cleanly\n    }\n  }\n}\n\n/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */\nexport function parseSseFrame(\n  raw: string,\n  dataKind: 'json' | 'text'\n): ServerSentEvent<unknown> | undefined {\n  let event: string | undefined;\n  const dataLines: string[] = [];\n  let id: string | undefined;\n  let retry: number | undefined;\n  let sawField = false;\n  for (const line of raw.split(/\\r\\n|\\n|\\r/)) {\n    if (line === '' || line.startsWith(':')) continue;\n    const colon = line.indexOf(':');\n    const field = colon === -1 ? line : line.slice(0, colon);\n    let val = colon === -1 ? '' : line.slice(colon + 1);\n    if (val.startsWith(' ')) val = val.slice(1);\n    sawField = true;\n    if (field === 'event') event = val;\n    else if (field === 'data') dataLines.push(val);\n    else if (field === 'id') id = val;\n    else if (field === 'retry') {\n      const n = Number(val);\n      if (!Number.isNaN(n)) retry = n;\n    }\n  }\n  if (!sawField) return undefined;\n  const dataText = dataLines.join('\\n');\n  let data: unknown = dataText;\n  if (dataKind === 'json' && dataText !== '') {\n    try {\n      data = JSON.parse(dataText);\n    } catch (error) {\n      throw new SseParseError(\n        `Failed to parse SSE event data as JSON: ${error instanceof Error ? error.message : String(error)}`\n      );\n    }\n  }\n  return { event, data, id, retry };\n}\n",
   'create-client.ts':
-    "import { ApiError } from './errors.js';\nimport { parse, readError } from './parse.js';\nimport { middlewareChain, send, toHeaderRecord, type SendCapabilities } from './send.js';\nimport type {\n  ApiErrorLike,\n  Client,\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  OperationDescriptor,\n  OpsShape,\n  PaginationSpec,\n  ParseAs,\n  QueryValue,\n  RequestOptions,\n  SecuritySpec,\n  ServerSentEvent,\n  SseOptions,\n  TokenProvider,\n} from './types.js';\nimport { buildUrl, substitutePath, type QueryStyle } from './url.js';\n\n/**\n * The optional behaviors `createClientCore` can dispatch to but never statically\n * imports. The package's public `createClient` wires the full set; the future\n * inline-mode assembler wires only the capabilities a spec needs.\n */\nexport type Capabilities = SendCapabilities & {\n  resolveAuth?: (\n    security: readonly SecuritySpec[],\n    config: ClientConfig\n  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;\n  sse?: (\n    config: ClientConfig,\n    op: OperationContext,\n    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style\n    // TokenProvider issue a fresh credential after a dropped stream reconnects.\n    prepare: () => Promise<{ url: string; init: SseOptions }>,\n    dataKind: 'json' | 'text'\n  ) => AsyncGenerator<ServerSentEvent<unknown>>;\n  paginate?: {\n    pages: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n    items: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n  };\n};\n\n/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */\nexport type OperationArgs = {\n  params?: Record<string, QueryValue>;\n  body?: unknown;\n  headers?: Record<string, unknown>;\n} & Record<string, unknown>;\n\n/** The response reader implied by the descriptor (before any per-call `parseAs` override). */\nfunction kindFor(op: OperationDescriptor): ParseAs | 'void' {\n  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {\n    return op.responseKind;\n  }\n  return 'auto';\n}\n\n/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */\nfunction splitArgs(op: OperationDescriptor, args: OperationArgs) {\n  const path: Record<string, unknown> = {};\n  for (const param of op.params ?? []) {\n    if (param.in === 'path') path[param.name] = args[param.name];\n  }\n  return { path, query: args.params, body: args.body, headers: args.headers };\n}\n\n/**\n * The query-serialization hints for the descriptor's query params. A spec is built only\n * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),\n * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)\n * are honored, and an omitted `explode` keeps the exploded default.\n */\nfunction queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {\n  let styles: Record<string, QueryStyle> | undefined;\n  for (const param of op.params ?? []) {\n    if (param.in !== 'query') continue;\n    const deviates =\n      (param.style !== undefined && param.style !== 'form') ||\n      param.explode === false ||\n      param.allowReserved === true;\n    if (!deviates) continue;\n    styles ??= {};\n    styles[param.name] = {\n      style: param.style ?? 'form',\n      explode: param.explode ?? true,\n      allowReserved: param.allowReserved,\n    };\n  }\n  return styles;\n}\n\n/** Stringify caller-supplied extra headers, skipping empty entries. */\nfunction stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {\n  const out: Record<string, string> = {};\n  for (const [key, value] of Object.entries(headers ?? {})) {\n    if (value !== undefined && value !== null) out[key] = String(value);\n  }\n  return out;\n}\n\n/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */\nasync function prepareRequest(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions | SseOptions,\n  caps: Capabilities\n): Promise<{ url: string; init: RequestOptions; body: unknown }> {\n  const { path, query, body, headers } = splitArgs(op, args);\n  const authed =\n    op.security?.length && caps.resolveAuth\n      ? await caps.resolveAuth(op.security, config)\n      : { headers: {}, query: {} };\n  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };\n  const url = buildUrl(\n    config.serverUrl ?? '',\n    substitutePath(op.path, path),\n    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,\n    queryStyles(op)\n  );\n  const mergedInit: RequestOptions = {\n    ...init,\n    method: op.method.toUpperCase(),\n    // Precedence, lowest → highest (later spreads win): injected auth → explicit\n    // header params → caller `init.headers` — the caller always overrides both.\n    headers: {\n      ...authed.headers,\n      ...stringHeaders(headers),\n      ...toHeaderRecord(init.headers),\n    },\n  };\n  return { url, init: mergedInit, body };\n}\n\n/** One non-SSE call: send, then branch on the configured error mode. */\nasync function execute(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions,\n  caps: Capabilities\n): Promise<unknown> {\n  const prepared = await prepareRequest(config, op, args, init, caps);\n  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n  const { parseAs, ...sendInit } = prepared.init;\n  const { response, context } = await send(\n    config,\n    opCtx,\n    prepared.url,\n    sendInit,\n    prepared.body,\n    op.body?.multipart === true,\n    caps\n  );\n  const readKind = parseAs ?? kindFor(op);\n  if (config.errorMode === 'result') {\n    if (!response.ok) {\n      return { data: undefined, error: await readError(response), response };\n    }\n    return { data: await parse(response, readKind), error: undefined, response };\n  }\n  if (!response.ok) {\n    let error: globalThis.Error = new ApiError(\n      context.url,\n      response.status,\n      response.statusText,\n      await readError(response)\n    );\n    // Thread the error through each middleware's onError in turn (each may replace it).\n    for (const mw of middlewareChain(config)) {\n      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);\n    }\n    throw error;\n  }\n  return parse(response, readKind);\n}\n\n/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */\nfunction paginateCapability(caps: Capabilities, op: OperationDescriptor) {\n  if (!caps.paginate) {\n    throw new Error(`Pagination capability not wired: cannot iterate operation \"${op.id}\"`);\n  }\n  return caps.paginate;\n}\n\n/**\n * The per-page call the iterators drive: the method itself in throw mode; in result\n * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page\n * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is\n * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).\n */\nfunction pageCall(\n  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  config: ClientConfig\n) {\n  if (config.errorMode !== 'result') return method;\n  return async (args?: OperationArgs, init?: RequestOptions) => {\n    const envelope = (await method(args, init)) as {\n      data: unknown;\n      error: unknown;\n      response: Response;\n    };\n    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page\n    // (204/void) also parses to undefined data, and a failed page's `error` can be\n    // undefined too (unreadable body). The pointers then miss on the undefined data\n    // and iteration stops cleanly, which is the correct semantics for an empty page.\n    if (!envelope.response.ok) {\n      const { response } = envelope;\n      throw new ApiError(response.url, response.status, response.statusText, envelope.error);\n    }\n    return envelope.data;\n  };\n}\n\n/**\n * Build a typed instance client over operation descriptors: one real bound method per\n * operation (attached by a construction-time loop — no Proxy), plus the core members\n * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name\n * collision with an operation. All behavior dispatches through the capability seam.\n */\nexport function createClientCore<\n  Ops extends OpsShape,\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n>(\n  operations: Record<string, OperationDescriptor>,\n  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},\n  caps: Capabilities = {}\n): Client<Ops, OperationContext<Id, Path, Tag>> {\n  // The literal-union narrowing is a compile-time DX contract only; internally the\n  // runtime works with the base (string-typed) context. One cast at this boundary —\n  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx\n  // params are contravariant).\n  const given = initial as ClientConfig;\n  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.\n  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };\n  const client = {} as Record<string, unknown>;\n\n  for (const [name, op] of Object.entries(operations)) {\n    if (op.responseKind === 'sse') {\n      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {\n        if (!caps.sse) {\n          throw new Error(`SSE capability not wired: cannot stream operation \"${op.id}\"`);\n        }\n        const stream = caps.sse;\n        return (async function* () {\n          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`\n          // resolves) is refreshed per attempt rather than frozen at the first connect.\n          const prepare = async () => {\n            const prepared = await prepareRequest(config, op, args, init, caps);\n            return { url: prepared.url, init: prepared.init as SseOptions };\n          };\n          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');\n        })();\n      };\n    } else {\n      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>\n        execute(config, op, args, init, caps);\n      const spec = op.pagination;\n      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching\n      // through the capability seam (like SSE: absent capability throws descriptively).\n      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on\n      // a result-mode client (`errorMode` is fixed at construction — `configure()`\n      // ignores it) each page's envelope is unwrapped before it reaches the capability.\n      // A failed page aborts iteration by throwing ApiError, even on result-mode\n      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.\n      client[name] = spec\n        ? Object.assign(method, {\n            pages: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),\n            items: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),\n          })\n        : method;\n    }\n  }\n\n  // Core members are assigned AFTER the operation loop — they win over colliding op names.\n  client.configure = (next: ClientConfig): void => {\n    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at\n    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.\n    const { errorMode: _fixed, auth, ...rest } = next;\n    Object.assign(config, rest);\n    // `auth` merges into existing credentials (like the `auth.*` setters) rather than\n    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set\n    // basic/apiKey. `apiKey` merges per scheme.\n    if (auth) {\n      config.auth = {\n        ...config.auth,\n        ...auth,\n        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),\n      };\n    }\n  };\n  client.use = (...middleware: Middleware[]): void => {\n    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.\n    config.middleware = [...(config.middleware ?? []), ...middleware];\n  };\n  client.auth = {\n    bearer(token: TokenProvider): void {\n      config.auth = { ...config.auth, bearer: token };\n    },\n    basic(username: string, password: string): void {\n      config.auth = { ...config.auth, basic: { username, password } };\n    },\n    apiKey(scheme: string, value: TokenProvider): void {\n      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };\n    },\n  };\n\n  return client as Client<Ops, OperationContext<Id, Path, Tag>>;\n}\n",
+    "import { ApiError } from './errors.js';\nimport { parse, readError } from './parse.js';\nimport { middlewareChain, send, toHeaderRecord, type SendCapabilities } from './send.js';\nimport type {\n  ApiErrorLike,\n  Client,\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  OperationDescriptor,\n  OpsShape,\n  PaginationSpec,\n  ParseAs,\n  QueryValue,\n  RequestOptions,\n  SecuritySpec,\n  ServerSentEvent,\n  SseOptions,\n  TokenProvider,\n} from './types.js';\nimport { buildUrl, substitutePath, type QueryStyle } from './url.js';\n\n/**\n * The optional behaviors `createClientCore` can dispatch to but never statically\n * imports. The package's public `createClient` wires the full set; the future\n * inline-mode assembler wires only the capabilities a spec needs.\n */\nexport type Capabilities = SendCapabilities & {\n  resolveAuth?: (\n    security: readonly (readonly SecuritySpec[])[],\n    config: ClientConfig\n  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;\n  sse?: (\n    config: ClientConfig,\n    op: OperationContext,\n    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style\n    // TokenProvider issue a fresh credential after a dropped stream reconnects.\n    prepare: () => Promise<{ url: string; init: SseOptions }>,\n    dataKind: 'json' | 'text'\n  ) => AsyncGenerator<ServerSentEvent<unknown>>;\n  paginate?: {\n    pages: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n    items: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n  };\n};\n\n/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */\nexport type OperationArgs = {\n  params?: Record<string, QueryValue>;\n  body?: unknown;\n  headers?: Record<string, unknown>;\n} & Record<string, unknown>;\n\n/** The response reader implied by the descriptor (before any per-call `parseAs` override). */\nfunction kindFor(op: OperationDescriptor): ParseAs | 'void' {\n  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {\n    return op.responseKind;\n  }\n  return 'auto';\n}\n\n/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */\nfunction splitArgs(op: OperationDescriptor, args: OperationArgs) {\n  const path: Record<string, unknown> = {};\n  for (const param of op.params ?? []) {\n    if (param.in === 'path') path[param.name] = args[param.name];\n  }\n  return { path, query: args.params, body: args.body, headers: args.headers };\n}\n\n/**\n * The query-serialization hints for the descriptor's query params. A spec is built only\n * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),\n * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)\n * are honored, and an omitted `explode` keeps the exploded default.\n */\nfunction queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {\n  let styles: Record<string, QueryStyle> | undefined;\n  for (const param of op.params ?? []) {\n    if (param.in !== 'query') continue;\n    const deviates =\n      (param.style !== undefined && param.style !== 'form') ||\n      param.explode === false ||\n      param.allowReserved === true;\n    if (!deviates) continue;\n    styles ??= {};\n    styles[param.name] = {\n      style: param.style ?? 'form',\n      explode: param.explode ?? true,\n      allowReserved: param.allowReserved,\n    };\n  }\n  return styles;\n}\n\n/** Stringify caller-supplied extra headers, skipping empty entries. */\nfunction stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {\n  const out: Record<string, string> = {};\n  for (const [key, value] of Object.entries(headers ?? {})) {\n    if (value !== undefined && value !== null) out[key] = String(value);\n  }\n  return out;\n}\n\n/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */\nasync function prepareRequest(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions | SseOptions,\n  caps: Capabilities\n): Promise<{ url: string; init: RequestOptions; body: unknown }> {\n  const { path, query, body, headers } = splitArgs(op, args);\n  const authed =\n    op.security?.length && caps.resolveAuth\n      ? await caps.resolveAuth(op.security, config)\n      : { headers: {}, query: {} };\n  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };\n  const url = buildUrl(\n    config.serverUrl ?? '',\n    substitutePath(op.path, path),\n    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,\n    queryStyles(op)\n  );\n  const mergedInit: RequestOptions = {\n    ...init,\n    method: op.method.toUpperCase(),\n    // Precedence, lowest → highest (later spreads win): injected auth → explicit\n    // header params → caller `init.headers` — the caller always overrides both.\n    headers: {\n      ...authed.headers,\n      ...stringHeaders(headers),\n      ...toHeaderRecord(init.headers),\n    },\n  };\n  return { url, init: mergedInit, body };\n}\n\n/** One non-SSE call: send, then branch on the configured error mode. */\nasync function execute(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions,\n  caps: Capabilities\n): Promise<unknown> {\n  const prepared = await prepareRequest(config, op, args, init, caps);\n  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n  const { parseAs, ...sendInit } = prepared.init;\n  const { response, context } = await send(\n    config,\n    opCtx,\n    prepared.url,\n    sendInit,\n    prepared.body,\n    op.body?.multipart === true,\n    caps\n  );\n  const readKind = parseAs ?? kindFor(op);\n  if (config.errorMode === 'result') {\n    if (!response.ok) {\n      return { data: undefined, error: await readError(response), response };\n    }\n    return { data: await parse(response, readKind), error: undefined, response };\n  }\n  if (!response.ok) {\n    let error: globalThis.Error = new ApiError(\n      context.url,\n      response.status,\n      response.statusText,\n      await readError(response)\n    );\n    // Thread the error through each middleware's onError in turn (each may replace it).\n    for (const mw of middlewareChain(config)) {\n      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);\n    }\n    throw error;\n  }\n  return parse(response, readKind);\n}\n\n/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */\nfunction paginateCapability(caps: Capabilities, op: OperationDescriptor) {\n  if (!caps.paginate) {\n    throw new Error(`Pagination capability not wired: cannot iterate operation \"${op.id}\"`);\n  }\n  return caps.paginate;\n}\n\n/**\n * The per-page call the iterators drive: the method itself in throw mode; in result\n * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page\n * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is\n * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).\n */\nfunction pageCall(\n  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  config: ClientConfig\n) {\n  if (config.errorMode !== 'result') return method;\n  return async (args?: OperationArgs, init?: RequestOptions) => {\n    const envelope = (await method(args, init)) as {\n      data: unknown;\n      error: unknown;\n      response: Response;\n    };\n    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page\n    // (204/void) also parses to undefined data, and a failed page's `error` can be\n    // undefined too (unreadable body). The pointers then miss on the undefined data\n    // and iteration stops cleanly, which is the correct semantics for an empty page.\n    if (!envelope.response.ok) {\n      const { response } = envelope;\n      throw new ApiError(response.url, response.status, response.statusText, envelope.error);\n    }\n    return envelope.data;\n  };\n}\n\n/**\n * Build a typed instance client over operation descriptors: one real bound method per\n * operation (attached by a construction-time loop — no Proxy), plus the core members\n * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name\n * collision with an operation. All behavior dispatches through the capability seam.\n */\nexport function createClientCore<\n  Ops extends OpsShape,\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n>(\n  operations: Record<string, OperationDescriptor>,\n  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},\n  caps: Capabilities = {}\n): Client<Ops, OperationContext<Id, Path, Tag>> {\n  // The literal-union narrowing is a compile-time DX contract only; internally the\n  // runtime works with the base (string-typed) context. One cast at this boundary —\n  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx\n  // params are contravariant).\n  const given = initial as ClientConfig;\n  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.\n  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };\n  const client = {} as Record<string, unknown>;\n\n  for (const [name, op] of Object.entries(operations)) {\n    if (op.responseKind === 'sse') {\n      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {\n        if (!caps.sse) {\n          throw new Error(`SSE capability not wired: cannot stream operation \"${op.id}\"`);\n        }\n        const stream = caps.sse;\n        return (async function* () {\n          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`\n          // resolves) is refreshed per attempt rather than frozen at the first connect.\n          const prepare = async () => {\n            const prepared = await prepareRequest(config, op, args, init, caps);\n            return { url: prepared.url, init: prepared.init as SseOptions };\n          };\n          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');\n        })();\n      };\n    } else {\n      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>\n        execute(config, op, args, init, caps);\n      const spec = op.pagination;\n      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching\n      // through the capability seam (like SSE: absent capability throws descriptively).\n      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on\n      // a result-mode client (`errorMode` is fixed at construction — `configure()`\n      // ignores it) each page's envelope is unwrapped before it reaches the capability.\n      // A failed page aborts iteration by throwing ApiError, even on result-mode\n      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.\n      client[name] = spec\n        ? Object.assign(method, {\n            pages: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),\n            items: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),\n          })\n        : method;\n    }\n  }\n\n  // Core members are assigned AFTER the operation loop — they win over colliding op names.\n  client.configure = (next: ClientConfig): void => {\n    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at\n    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.\n    const { errorMode: _fixed, auth, ...rest } = next;\n    Object.assign(config, rest);\n    // `auth` merges into existing credentials (like the `auth.*` setters) rather than\n    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set\n    // basic/apiKey. `apiKey` merges per scheme.\n    if (auth) {\n      config.auth = {\n        ...config.auth,\n        ...auth,\n        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),\n      };\n    }\n  };\n  client.use = (...middleware: Middleware[]): void => {\n    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.\n    config.middleware = [...(config.middleware ?? []), ...middleware];\n  };\n  client.auth = {\n    bearer(token: TokenProvider): void {\n      config.auth = { ...config.auth, bearer: token };\n    },\n    basic(username: string, password: string): void {\n      config.auth = { ...config.auth, basic: { username, password } };\n    },\n    apiKey(scheme: string, value: TokenProvider): void {\n      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };\n    },\n  };\n\n  return client as Client<Ops, OperationContext<Id, Path, Tag>>;\n}\n",
   'paginate.ts':
     "import type { OperationArgs } from './create-client.js';\nimport type { PaginationSpec, QueryValue, RequestOptions } from './types.js';\n\n/**\n * Auto-pagination (capability module — wired into `createClient`, dispatched by the\n * method's `.pages()`/`.items()`): walk an operation's pages by advancing the descriptor's\n * `param` query parameter, per its `style`. The caller's args are never mutated — each\n * request gets a fresh `params` clone — and `init` is forwarded to every call.\n *\n * Iteration is error-mode-agnostic: `call` always resolves to the RAW page (on a\n * result-mode client the attachment unwraps the envelope first), so a failed page\n * aborts iteration by throwing `ApiError`, even on result-mode clients; the `onError`\n * middleware hook (throw-mode-only) is not invoked.\n */\n\n/**\n * Resolve an RFC 6901 JSON pointer (`~1` → `/`, `~0` → `~`) against a value.\n * The empty pointer is the whole document; anything else must start with `/`.\n * Returns `undefined` on any miss (bad token, absent key, non-object step) — never throws.\n */\nexport function resolvePointer(value: unknown, pointer: string): unknown {\n  if (pointer === '') return value;\n  if (!pointer.startsWith('/')) return undefined;\n  let current = value;\n  for (const token of pointer.slice(1).split('/')) {\n    const key = token.replaceAll('~1', '/').replaceAll('~0', '~');\n    if (Array.isArray(current)) {\n      if (!/^(0|[1-9]\\d*)$/.test(key)) return undefined;\n      current = current[Number(key)];\n    } else if (Object(current) === current && key in (current as object)) {\n      current = (current as Record<string, unknown>)[key];\n    } else {\n      return undefined;\n    }\n  }\n  return current;\n}\n\n/**\n * Iterate an operation's full page results. Every page is yielded before the stop\n * condition is evaluated, so the last page always arrives. Cursor style resumes from a\n * caller-provided `params[spec.param]`, stops when `nextCursor` resolves to\n * `undefined`/`null`/`''`, and throws if the next cursor is not a string or number, or\n * if the same cursor comes back twice in a row (infinite-loop guards). Offset/page\n * styles advance by item count / by one and stop when\n * the `items` pointer misses or the array is empty.\n */\nexport async function* pages<TPage>(\n  call: (args?: OperationArgs, init?: RequestOptions) => Promise<TPage>,\n  spec: PaginationSpec,\n  args: OperationArgs = {},\n  init?: RequestOptions\n): AsyncGenerator<TPage> {\n  if (spec.style === 'cursor') {\n    let cursor: unknown = args.params?.[spec.param];\n    while (true) {\n      const params = { ...args.params };\n      if (cursor !== undefined) params[spec.param] = cursor as QueryValue;\n      const page = await call({ ...args, params }, init);\n      yield page;\n      const next = resolvePointer(page, spec.nextCursor!);\n      if (next === undefined || next === null || next === '') return;\n      if (typeof next !== 'string' && typeof next !== 'number') {\n        // A fresh non-scalar cursor never compares equal, so without this guard a lying\n        // server would slip past the did-not-advance check into an infinite loop.\n        throw new Error(`Pagination cursor at ${spec.nextCursor} is not a string or number`);\n      }\n      if (next === cursor) {\n        throw new Error('Pagination did not advance: operation returned the same cursor twice');\n      }\n      cursor = next;\n    }\n  } else {\n    // Coerce the starting position to a number: a caller may pass `params[spec.param]` as a\n    // string (common from URL/form input), and `+=` on a string would concatenate.\n    const start = args.params?.[spec.param];\n    const fallback = spec.style === 'page' ? 1 : 0;\n    let position = start === undefined || Number.isNaN(Number(start)) ? fallback : Number(start);\n    while (true) {\n      const page = await call(\n        { ...args, params: { ...args.params, [spec.param]: position } },\n        init\n      );\n      yield page;\n      const pageItems = resolvePointer(page, spec.items);\n      if (!Array.isArray(pageItems) || pageItems.length === 0) return;\n      position += spec.style === 'page' ? 1 : pageItems.length;\n    }\n  }\n}\n\n/**\n * Iterate the operation's individual items: each page's `items` pointer, flattened.\n * A cursor-style page whose pointer misses yields nothing but pagination continues;\n * for offset/page styles a miss has already stopped `pages`.\n */\nexport async function* items<TItem>(\n  call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  spec: PaginationSpec,\n  args?: OperationArgs,\n  init?: RequestOptions\n): AsyncGenerator<TItem> {\n  for await (const page of pages(call, spec, args, init)) {\n    const pageItems = resolvePointer(page, spec.items);\n    if (Array.isArray(pageItems)) yield* pageItems as TItem[];\n  }\n}\n",
 } as const;
diff --git a/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts b/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
index 9e055335d3..881bdc56e2 100644
--- a/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
+++ b/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
@@ -1974,7 +1974,7 @@ describe('buildApiModel — security (C6.6)', () => {
     const op = buildOpOnly(
       withSchemes({ OAuth2: { type: 'oauth2', flows: {} } }, [{ OAuth2: ['orders:read'] }])
     );
-    expect(op.security).toEqual(['OAuth2']);
+    expect(op.security).toEqual([['OAuth2']]);
   });
 
   it('treats security: [] as an explicit opt-out (no auth)', () => {
@@ -1992,7 +1992,7 @@ describe('buildApiModel — security (C6.6)', () => {
         },
       })
     );
-    expect(model.services[0].operations[0].security).toEqual(['OAuth2']);
+    expect(model.services[0].operations[0].security).toEqual([['OAuth2']]);
   });
 
   it('skips a leading `{}` (optional-auth marker) and applies the real alternative', () => {
@@ -2003,21 +2003,21 @@ describe('buildApiModel — security (C6.6)', () => {
         [{}, { OAuth2: [] }]
       )
     );
-    expect(op.security).toEqual(['OAuth2']);
+    expect(op.security).toEqual([['OAuth2']]);
   });
 
-  it('applies the first OR-alternative, never a union across alternatives', () => {
+  it('keeps every OR-alternative separate, never a union across them', () => {
     const op = buildOpOnly(
       withSchemes(
         {
           OAuth2: { type: 'oauth2', flows: {} },
           ApiKey: { type: 'apiKey', in: 'header', name: 'X-API-Key' },
         },
-        // "bearer OR apiKey": the first alternative wins, so both are never sent together.
+        // "bearer OR apiKey": the runtime applies whichever alternative is configured.
         [{ OAuth2: [] }, { ApiKey: [] }]
       )
     );
-    expect(op.security).toEqual(['OAuth2']);
+    expect(op.security).toEqual([['OAuth2'], ['ApiKey']]);
   });
 
   it('skips an alternative with a non-injectable scheme and uses the next fully-injectable one', () => {
@@ -2033,7 +2033,7 @@ describe('buildApiModel — security (C6.6)', () => {
         [{ NoScheme: [] }, { OAuth2: [], ApiKey: [] }]
       )
     );
-    expect(op.security).toEqual(['OAuth2', 'ApiKey']);
+    expect(op.security).toEqual([['OAuth2', 'ApiKey']]);
   });
 
   it('returns no security when the operation references only non-injectable schemes', () => {
diff --git a/packages/client-generator/src/intermediate-representation/__tests__/sanitize-identifiers.test.ts b/packages/client-generator/src/intermediate-representation/__tests__/sanitize-identifiers.test.ts
index a8c305899c..a8707d2cef 100644
--- a/packages/client-generator/src/intermediate-representation/__tests__/sanitize-identifiers.test.ts
+++ b/packages/client-generator/src/intermediate-representation/__tests__/sanitize-identifiers.test.ts
@@ -130,7 +130,7 @@ describe('sanitizeIdentifiers', () => {
   });
 
   it('renames a non-identifier security-scheme key and rewrites operation.security to match', () => {
-    const m = model([], [op({ name: 'getX', security: ['k(){};evil', 'clean'] })]);
+    const m = model([], [op({ name: 'getX', security: [['k(){};evil', 'clean']] })]);
     m.securitySchemes = [
       { kind: 'apiKeyHeader', key: 'k(){};evil', headerName: 'X-Api-Key' },
       { kind: 'apiKeyHeader', key: 'clean', headerName: 'X-Other' },
@@ -139,13 +139,13 @@ describe('sanitizeIdentifiers', () => {
     expect(m.securitySchemes[0].key).toBe('k_____evil');
     expect(m.securitySchemes[1].key).toBe('clean');
     // The operation's security list follows the rename so the runtime literals match.
-    expect(m.services[0].operations[0].security).toEqual(['k_____evil', 'clean']);
+    expect(m.services[0].operations[0].security).toEqual([['k_____evil', 'clean']]);
   });
 
   it('sanitizes an operation.security entry with no matching scheme', () => {
-    const m = model([], [op({ name: 'getX', security: ['gone.key'] })]);
+    const m = model([], [op({ name: 'getX', security: [['gone.key']] })]);
     sanitizeIdentifiers(m);
-    expect(m.services[0].operations[0].security).toEqual(['gone_key']);
+    expect(m.services[0].operations[0].security).toEqual([['gone_key']]);
   });
 
   it('renames operations and rewrites refs in every operation slot', () => {
diff --git a/packages/client-generator/src/intermediate-representation/build.ts b/packages/client-generator/src/intermediate-representation/build.ts
index 407ccefb16..95106157e0 100644
--- a/packages/client-generator/src/intermediate-representation/build.ts
+++ b/packages/client-generator/src/intermediate-representation/build.ts
@@ -331,36 +331,35 @@ function buildSecuritySchemes(doc: Oas3Definition): SecuritySchemeModel[] {
 }
 
 /**
- * Resolve the effective security for one operation into the set of scheme keys
- * the client should inject. The operation's own `security` overrides the
- * document default; `security: []` opts out entirely.
+ * Resolve the effective security for one operation into the list of injectable
+ * OR-alternatives, each an AND-set of scheme keys. The operation's own `security`
+ * overrides the document default; `security: []` opts out entirely.
  *
- * Security is an OR of requirement objects, and the schemes *within* one object
- * are all required together (AND). The client applies exactly ONE alternative —
- * the first whose schemes are all injectable — so an operation that accepts, say,
- * "bearer OR apiKey" never sends both credentials at once. When no alternative is
- * fully injectable, no auth is applied.
+ * Every fully-injectable alternative is kept — the runtime applies exactly ONE of
+ * them (the first whose credentials are all configured), so an operation that
+ * accepts "bearer OR apiKey" works with either credential and never sends both.
+ * `{}` (the optional-auth marker) and alternatives with non-injectable schemes
+ * are skipped; an empty result means no auth is applied.
  */
 function resolveOperationSecurity(
   operation: Oas3Operation,
   doc: Oas3Definition,
   injectable: Set<string>
-): string[] {
+): string[][] {
   const requirements =
     (operation as { security?: SecurityRequirement[] }).security ??
     (doc as { security?: SecurityRequirement[] }).security;
   if (!requirements) return [];
 
+  const alternatives: string[][] = [];
   for (const requirement of requirements) {
     const keys = Object.keys(requirement);
-    // Skip `{}` (the optional-auth marker): picking it would silently drop configured
-    // credentials whenever it's listed before a real alternative.
     if (keys.length === 0) continue;
     if (keys.every((key) => injectable.has(key))) {
-      return [...new Set(keys)];
+      alternatives.push([...new Set(keys)]);
     }
   }
-  return [];
+  return alternatives;
 }
 
 function buildNamedSchemas(doc: Oas3Definition): NamedSchemaModel[] {
diff --git a/packages/client-generator/src/intermediate-representation/model.ts b/packages/client-generator/src/intermediate-representation/model.ts
index 64308bf818..50eb47bde3 100644
--- a/packages/client-generator/src/intermediate-representation/model.ts
+++ b/packages/client-generator/src/intermediate-representation/model.ts
@@ -198,13 +198,13 @@ export type OperationModel = {
    */
   tags: string[];
   /**
-   * Effective security for this operation, as security-scheme keys (resolving
-   * the operation's own `security` over the document default, and filtered to
-   * schemes the client can actually inject). An empty array means "send no
-   * credentials" — either the operation opted out via `security: []` or no
-   * applicable scheme exists.
+   * Effective security for this operation: the injectable OR-alternatives, each
+   * an AND-set of security-scheme keys (resolving the operation's own `security`
+   * over the document default). The runtime applies the first alternative whose
+   * credentials are all configured. An empty array means "send no credentials" —
+   * either the operation opted out via `security: []` or no applicable scheme exists.
    */
-  security: string[];
+  security: string[][];
   /**
    * The operation's `x-pagination` extension value, captured VERBATIM (spec
    * extensions are untyped). Validated by the pagination emitter, not the IR.
diff --git a/packages/client-generator/src/intermediate-representation/sanitize-identifiers.ts b/packages/client-generator/src/intermediate-representation/sanitize-identifiers.ts
index f8b6597db7..a2e0afb53b 100644
--- a/packages/client-generator/src/intermediate-representation/sanitize-identifiers.ts
+++ b/packages/client-generator/src/intermediate-representation/sanitize-identifiers.ts
@@ -63,7 +63,7 @@ export function sanitizeIdentifiers(model: ApiModel): void {
         op.name = safe;
       }
       rewriteOperationRefs(op, fixRef);
-      op.security = op.security.map(fixKey);
+      op.security = op.security.map((alternative) => alternative.map(fixKey));
     }
   }
 }
diff --git a/packages/client-generator/src/runtime/__tests__/auth.test.ts b/packages/client-generator/src/runtime/__tests__/auth.test.ts
index 760e75bfd1..37ab4676d8 100644
--- a/packages/client-generator/src/runtime/__tests__/auth.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/auth.test.ts
@@ -1,6 +1,6 @@
 import { resolveAuth } from '../auth.js';
 
-const bearer = [{ scheme: 's', kind: 'bearer' }] as const;
+const bearer = [[{ scheme: 's', kind: 'bearer' }]] as const;
 
 describe('resolveAuth', () => {
   it('applies bearer (incl. async TokenProvider), basic, and apiKey in header/query/cookie', async () => {
@@ -11,17 +11,19 @@ describe('resolveAuth', () => {
       (await resolveAuth(bearer, { auth: { bearer: async () => 't2' } })).headers.Authorization
     ).toBe('Bearer t2');
 
-    const basic = await resolveAuth([{ scheme: 'b', kind: 'basic' }], {
+    const basic = await resolveAuth([[{ scheme: 'b', kind: 'basic' }]], {
       auth: { basic: { username: 'u', password: 'p' } },
     });
     expect(basic.headers.Authorization).toBe(`Basic ${btoa('u:p')}`);
 
     const key = await resolveAuth(
       [
-        { scheme: 'h', kind: 'apiKey', name: 'X-Key', in: 'header' },
-        { scheme: 'q', kind: 'apiKey', name: 'k', in: 'query' },
-        { scheme: 'c', kind: 'apiKey', name: 'sid', in: 'cookie' },
-        { scheme: 'c2', kind: 'apiKey', name: 'ses', in: 'cookie' },
+        [
+          { scheme: 'h', kind: 'apiKey', name: 'X-Key', in: 'header' },
+          { scheme: 'q', kind: 'apiKey', name: 'k', in: 'query' },
+          { scheme: 'c', kind: 'apiKey', name: 'sid', in: 'cookie' },
+          { scheme: 'c2', kind: 'apiKey', name: 'ses', in: 'cookie' },
+        ],
       ],
       { auth: { apiKey: { h: 'H', q: 'Q', c: 'C', c2: 'D' } } }
     );
@@ -30,8 +32,27 @@ describe('resolveAuth', () => {
     expect(key.headers.Cookie).toBe('sid=C; ses=D');
   });
 
+  it('applies the first OR-alternative whose credentials are all configured', async () => {
+    const bearerOrApiKey = [
+      [{ scheme: 's', kind: 'bearer' }],
+      [{ scheme: 'k', kind: 'apiKey', name: 'X-Key', in: 'header' }],
+    ] as const;
+
+    // Only the SECOND alternative is configured: it must be applied, not skipped.
+    const keyOnly = await resolveAuth(bearerOrApiKey, { auth: { apiKey: { k: 'K' } } });
+    expect(keyOnly.headers['X-Key']).toBe('K');
+    expect(keyOnly.headers.Authorization).toBeUndefined();
+
+    // Both configured: the first alternative wins, never a union across alternatives.
+    const both = await resolveAuth(bearerOrApiKey, {
+      auth: { bearer: 't', apiKey: { k: 'K' } },
+    });
+    expect(both.headers.Authorization).toBe('Bearer t');
+    expect(both.headers['X-Key']).toBeUndefined();
+  });
+
   it('encodes non-Latin-1 basic credentials (bare btoa would throw InvalidCharacterError)', async () => {
-    const basic = await resolveAuth([{ scheme: 'b', kind: 'basic' }], {
+    const basic = await resolveAuth([[{ scheme: 'b', kind: 'basic' }]], {
       auth: { basic: { username: 'usér', password: 'på§s' } },
     });
     expect(basic.headers.Authorization).toBe(
@@ -40,7 +61,7 @@ describe('resolveAuth', () => {
   });
 
   it('percent-encodes cookie credentials so reserved characters cannot break the header', async () => {
-    const key = await resolveAuth([{ scheme: 'c', kind: 'apiKey', name: 'sid', in: 'cookie' }], {
+    const key = await resolveAuth([[{ scheme: 'c', kind: 'apiKey', name: 'sid', in: 'cookie' }]], {
       auth: { apiKey: { c: 'a b;c=d' } },
     });
     expect(key.headers.Cookie).toBe('sid=a%20b%3Bc%3Dd');
@@ -49,9 +70,11 @@ describe('resolveAuth', () => {
   it('skips schemes with no configured credential', async () => {
     const out = await resolveAuth(
       [
-        ...bearer,
-        { scheme: 'b', kind: 'basic' },
-        { scheme: 'k', kind: 'apiKey', name: 'X', in: 'header' },
+        [
+          ...bearer[0],
+          { scheme: 'b', kind: 'basic' },
+          { scheme: 'k', kind: 'apiKey', name: 'X', in: 'header' },
+        ],
       ],
       {}
     );
diff --git a/packages/client-generator/src/runtime/__tests__/create-client.test.ts b/packages/client-generator/src/runtime/__tests__/create-client.test.ts
index 51f2890a5a..f515ceadc4 100644
--- a/packages/client-generator/src/runtime/__tests__/create-client.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/create-client.test.ts
@@ -32,7 +32,7 @@ const OPS = {
     id: 'secured',
     method: 'GET',
     path: '/private',
-    security: [{ scheme: 's', kind: 'bearer' }],
+    security: [[{ scheme: 's', kind: 'bearer' }]],
   },
   stream: {
     id: 'stream',
diff --git a/packages/client-generator/src/runtime/__tests__/index.test.ts b/packages/client-generator/src/runtime/__tests__/index.test.ts
index 0966b76f42..40ab8c577f 100644
--- a/packages/client-generator/src/runtime/__tests__/index.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/index.test.ts
@@ -12,7 +12,7 @@ const OPS = {
     id: 'secured',
     method: 'GET',
     path: '/private',
-    security: [{ scheme: 's', kind: 'bearer' }],
+    security: [[{ scheme: 's', kind: 'bearer' }]],
   },
   stream: {
     id: 'stream',
diff --git a/packages/client-generator/src/runtime/__tests__/types.test.ts b/packages/client-generator/src/runtime/__tests__/types.test.ts
index c8fca9dd64..161641b429 100644
--- a/packages/client-generator/src/runtime/__tests__/types.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/types.test.ts
@@ -148,7 +148,7 @@ describe('Client<Ops> mapped type', () => {
       method: 'GET',
       path: '/orders/{orderId}',
       params: [{ name: 'orderId', in: 'path' }],
-      security: [{ scheme: 'bearerAuth', kind: 'bearer' }],
+      security: [[{ scheme: 'bearerAuth', kind: 'bearer' }]],
     } as const satisfies OperationDescriptor;
     expect(op.id).toBe('getOrder');
   });
diff --git a/packages/client-generator/src/runtime/auth.ts b/packages/client-generator/src/runtime/auth.ts
index 7225dc7785..78113a4c15 100644
--- a/packages/client-generator/src/runtime/auth.ts
+++ b/packages/client-generator/src/runtime/auth.ts
@@ -12,21 +12,34 @@ function encodeBase64(text: string): string {
   return btoa(binary);
 }
 
+/** Whether a credential for this scheme is configured on the instance. */
+function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
+  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
+  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
+  return config.auth?.basic !== undefined;
+}
+
 /**
- * Build the auth headers/query for one operation's `security` requirements from the
+ * Build the auth headers/query for one operation's `security` OR-alternatives from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * A scheme with no configured credential contributes nothing (the request is sent
- * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * The first alternative whose schemes (an AND-set) are all configured is applied, so
+ * "bearer OR apiKey" works with either credential and never sends both. When none is
+ * fully configured, the first alternative's configured schemes are still sent (the
+ * server rejects the request, mirroring the previous behavior).
  * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
  */
 export async function resolveAuth(
-  security: readonly SecuritySpec[],
+  security: readonly (readonly SecuritySpec[])[],
   config: ClientConfig
 ): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const alternative =
+    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
+    security[0] ??
+    [];
   const headers: Record<string, string> = {};
   const query: Record<string, string> = {};
   const cookies: string[] = [];
-  for (const scheme of security) {
+  for (const scheme of alternative) {
     if (scheme.kind === 'apiKey') {
       const provider = config.auth?.apiKey?.[scheme.scheme];
       if (provider === undefined) continue;
diff --git a/packages/client-generator/src/runtime/create-client.ts b/packages/client-generator/src/runtime/create-client.ts
index 70b654e10a..f0dd54d9d7 100644
--- a/packages/client-generator/src/runtime/create-client.ts
+++ b/packages/client-generator/src/runtime/create-client.ts
@@ -27,7 +27,7 @@ import { buildUrl, substitutePath, type QueryStyle } from './url.js';
  */
 export type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/packages/client-generator/src/runtime/types.ts b/packages/client-generator/src/runtime/types.ts
index 3e40b0e325..8f539fe2ae 100644
--- a/packages/client-generator/src/runtime/types.ts
+++ b/packages/client-generator/src/runtime/types.ts
@@ -15,7 +15,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -48,7 +48,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
diff --git a/tests/e2e/generate-client/auth.test.ts b/tests/e2e/generate-client/auth.test.ts
index bfd767c53b..f3e44dbd51 100644
--- a/tests/e2e/generate-client/auth.test.ts
+++ b/tests/e2e/generate-client/auth.test.ts
@@ -84,16 +84,16 @@ describe('generate-client auth breadth (auth.yaml)', () => {
     expect(generated).toContain('auth?: AuthCredentials;');
 
     // Every scheme kind is denormalized onto its operation descriptor.
-    expect(generated).toContain('security: [{ scheme: "Bearer", kind: "bearer" }]');
-    expect(generated).toContain('security: [{ scheme: "Basic", kind: "basic" }]');
+    expect(generated).toContain('security: [[{ scheme: "Bearer", kind: "bearer" }]]');
+    expect(generated).toContain('security: [[{ scheme: "Basic", kind: "basic" }]]');
     expect(generated).toContain(
-      'security: [{ scheme: "QueryKey", kind: "apiKey", name: "api_key", in: "query" }]'
+      'security: [[{ scheme: "QueryKey", kind: "apiKey", name: "api_key", in: "query" }]]'
     );
     expect(generated).toContain(
-      'security: [{ scheme: "CookieKey", kind: "apiKey", name: "sid", in: "cookie" }]'
+      'security: [[{ scheme: "CookieKey", kind: "apiKey", name: "sid", in: "cookie" }]]'
     );
     expect(generated).toContain(
-      'security: [{ scheme: "HeaderKey", kind: "apiKey", name: "X-Key", in: "header" }]'
+      'security: [[{ scheme: "HeaderKey", kind: "apiKey", name: "X-Key", in: "header" }]]'
     );
   }, 60_000);
 
diff --git a/tests/e2e/generate-client/base-consumer/api.ts b/tests/e2e/generate-client/base-consumer/api.ts
index 1e1cd3a961..83c8df200c 100644
--- a/tests/e2e/generate-client/base-consumer/api.ts
+++ b/tests/e2e/generate-client/base-consumer/api.ts
@@ -227,7 +227,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -260,7 +260,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -827,7 +828,7 @@ async function send(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/tests/e2e/generate-client/cafe-consumer/api.ts b/tests/e2e/generate-client/cafe-consumer/api.ts
index b7e8901e77..0b0468af71 100644
--- a/tests/e2e/generate-client/cafe-consumer/api.ts
+++ b/tests/e2e/generate-client/cafe-consumer/api.ts
@@ -779,16 +779,16 @@ export type Ops = {
  */
 export const OPERATIONS = {
     listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
     getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
     registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
 } as const satisfies Record<string, OperationDescriptor>;
 
@@ -819,7 +819,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -852,7 +852,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -1275,21 +1276,34 @@ function encodeBase64(text: string): string {
   return btoa(binary);
 }
 
+/** Whether a credential for this scheme is configured on the instance. */
+function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
+  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
+  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
+  return config.auth?.basic !== undefined;
+}
+
 /**
- * Build the auth headers/query for one operation's `security` requirements from the
+ * Build the auth headers/query for one operation's `security` OR-alternatives from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * A scheme with no configured credential contributes nothing (the request is sent
- * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * The first alternative whose schemes (an AND-set) are all configured is applied, so
+ * "bearer OR apiKey" works with either credential and never sends both. When none is
+ * fully configured, the first alternative's configured schemes are still sent (the
+ * server rejects the request, mirroring the previous behavior).
  * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
  */
 async function resolveAuth(
-  security: readonly SecuritySpec[],
+  security: readonly (readonly SecuritySpec[])[],
   config: ClientConfig
 ): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const alternative =
+    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
+    security[0] ??
+    [];
   const headers: Record<string, string> = {};
   const query: Record<string, string> = {};
   const cookies: string[] = [];
-  for (const scheme of security) {
+  for (const scheme of alternative) {
     if (scheme.kind === 'apiKey') {
       const provider = config.auth?.apiKey?.[scheme.scheme];
       if (provider === undefined) continue;
@@ -1469,7 +1483,7 @@ async function send(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/tests/e2e/generate-client/cafe.snapshot.ts b/tests/e2e/generate-client/cafe.snapshot.ts
index cf3e8f1fae..f494ac3262 100644
--- a/tests/e2e/generate-client/cafe.snapshot.ts
+++ b/tests/e2e/generate-client/cafe.snapshot.ts
@@ -779,16 +779,16 @@ export type Ops = {
  */
 export const OPERATIONS = {
     listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
     getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
     registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
 } as const satisfies Record<string, OperationDescriptor>;
 
@@ -819,7 +819,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -852,7 +852,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -1275,21 +1276,34 @@ function encodeBase64(text: string): string {
   return btoa(binary);
 }
 
+/** Whether a credential for this scheme is configured on the instance. */
+function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
+  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
+  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
+  return config.auth?.basic !== undefined;
+}
+
 /**
- * Build the auth headers/query for one operation's `security` requirements from the
+ * Build the auth headers/query for one operation's `security` OR-alternatives from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * A scheme with no configured credential contributes nothing (the request is sent
- * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * The first alternative whose schemes (an AND-set) are all configured is applied, so
+ * "bearer OR apiKey" works with either credential and never sends both. When none is
+ * fully configured, the first alternative's configured schemes are still sent (the
+ * server rejects the request, mirroring the previous behavior).
  * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
  */
 async function resolveAuth(
-  security: readonly SecuritySpec[],
+  security: readonly (readonly SecuritySpec[])[],
   config: ClientConfig
 ): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const alternative =
+    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
+    security[0] ??
+    [];
   const headers: Record<string, string> = {};
   const query: Record<string, string> = {};
   const cookies: string[] = [];
-  for (const scheme of security) {
+  for (const scheme of alternative) {
     if (scheme.kind === 'apiKey') {
       const provider = config.auth?.apiKey?.[scheme.scheme];
       if (provider === undefined) continue;
@@ -1469,7 +1483,7 @@ async function send(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
index 71b07ae5b2..ccdac99a40 100644
--- a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
@@ -779,16 +779,16 @@ export type Ops = {
  */
 export const OPERATIONS = {
     listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
     getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
     registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
 } as const satisfies Record<string, OperationDescriptor>;
 
@@ -819,7 +819,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -852,7 +852,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -1275,21 +1276,34 @@ function encodeBase64(text: string): string {
   return btoa(binary);
 }
 
+/** Whether a credential for this scheme is configured on the instance. */
+function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
+  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
+  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
+  return config.auth?.basic !== undefined;
+}
+
 /**
- * Build the auth headers/query for one operation's `security` requirements from the
+ * Build the auth headers/query for one operation's `security` OR-alternatives from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * A scheme with no configured credential contributes nothing (the request is sent
- * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * The first alternative whose schemes (an AND-set) are all configured is applied, so
+ * "bearer OR apiKey" works with either credential and never sends both. When none is
+ * fully configured, the first alternative's configured schemes are still sent (the
+ * server rejects the request, mirroring the previous behavior).
  * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
  */
 async function resolveAuth(
-  security: readonly SecuritySpec[],
+  security: readonly (readonly SecuritySpec[])[],
   config: ClientConfig
 ): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const alternative =
+    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
+    security[0] ??
+    [];
   const headers: Record<string, string> = {};
   const query: Record<string, string> = {};
   const cookies: string[] = [];
-  for (const scheme of security) {
+  for (const scheme of alternative) {
     if (scheme.kind === 'apiKey') {
       const provider = config.auth?.apiKey?.[scheme.scheme];
       if (provider === undefined) continue;
@@ -1485,7 +1499,7 @@ async function send(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts b/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
index 265abef469..36ca7e0f23 100644
--- a/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
@@ -140,9 +140,9 @@ export type Ops = {
  * tags) for cache keys, tracing span names, and request logging.
  */
 export const OPERATIONS = {
-    listPayments: { id: "listPayments", method: "GET", path: "/payments", tags: ["Payments"], params: [{ name: "status", in: "query" }], security: [{ scheme: "ApiKeyAuth", kind: "apiKey", name: "X-Api-Key", in: "header" }] },
-    createPayment: { id: "createPayment", method: "POST", path: "/payments", tags: ["Payments"], body: { contentType: "application/json" }, security: [{ scheme: "ApiKeyAuth", kind: "apiKey", name: "X-Api-Key", in: "header" }] },
-    getPayment: { id: "getPayment", method: "GET", path: "/payments/{paymentId}", tags: ["Payments"], params: [{ name: "paymentId", in: "path" }], security: [{ scheme: "ApiKeyAuth", kind: "apiKey", name: "X-Api-Key", in: "header" }] }
+    listPayments: { id: "listPayments", method: "GET", path: "/payments", tags: ["Payments"], params: [{ name: "status", in: "query" }], security: [[{ scheme: "ApiKeyAuth", kind: "apiKey", name: "X-Api-Key", in: "header" }]] },
+    createPayment: { id: "createPayment", method: "POST", path: "/payments", tags: ["Payments"], body: { contentType: "application/json" }, security: [[{ scheme: "ApiKeyAuth", kind: "apiKey", name: "X-Api-Key", in: "header" }]] },
+    getPayment: { id: "getPayment", method: "GET", path: "/payments/{paymentId}", tags: ["Payments"], params: [{ name: "paymentId", in: "path" }], security: [[{ scheme: "ApiKeyAuth", kind: "apiKey", name: "X-Api-Key", in: "header" }]] }
 } as const satisfies Record<string, OperationDescriptor>;
 
 export type OperationId = keyof typeof OPERATIONS;
@@ -172,7 +172,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -205,7 +205,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -628,21 +629,34 @@ function encodeBase64(text: string): string {
   return btoa(binary);
 }
 
+/** Whether a credential for this scheme is configured on the instance. */
+function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
+  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
+  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
+  return config.auth?.basic !== undefined;
+}
+
 /**
- * Build the auth headers/query for one operation's `security` requirements from the
+ * Build the auth headers/query for one operation's `security` OR-alternatives from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * A scheme with no configured credential contributes nothing (the request is sent
- * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * The first alternative whose schemes (an AND-set) are all configured is applied, so
+ * "bearer OR apiKey" works with either credential and never sends both. When none is
+ * fully configured, the first alternative's configured schemes are still sent (the
+ * server rejects the request, mirroring the previous behavior).
  * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
  */
 async function resolveAuth(
-  security: readonly SecuritySpec[],
+  security: readonly (readonly SecuritySpec[])[],
   config: ClientConfig
 ): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const alternative =
+    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
+    security[0] ??
+    [];
   const headers: Record<string, string> = {};
   const query: Record<string, string> = {};
   const cookies: string[] = [];
-  for (const scheme of security) {
+  for (const scheme of alternative) {
     if (scheme.kind === 'apiKey') {
       const provider = config.auth?.apiKey?.[scheme.scheme];
       if (provider === undefined) continue;
@@ -822,7 +836,7 @@ async function send(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
index cf3e8f1fae..f494ac3262 100644
--- a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
@@ -779,16 +779,16 @@ export type Ops = {
  */
 export const OPERATIONS = {
     listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
     getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
     registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
 } as const satisfies Record<string, OperationDescriptor>;
 
@@ -819,7 +819,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -852,7 +852,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -1275,21 +1276,34 @@ function encodeBase64(text: string): string {
   return btoa(binary);
 }
 
+/** Whether a credential for this scheme is configured on the instance. */
+function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
+  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
+  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
+  return config.auth?.basic !== undefined;
+}
+
 /**
- * Build the auth headers/query for one operation's `security` requirements from the
+ * Build the auth headers/query for one operation's `security` OR-alternatives from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * A scheme with no configured credential contributes nothing (the request is sent
- * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * The first alternative whose schemes (an AND-set) are all configured is applied, so
+ * "bearer OR apiKey" works with either credential and never sends both. When none is
+ * fully configured, the first alternative's configured schemes are still sent (the
+ * server rejects the request, mirroring the previous behavior).
  * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
  */
 async function resolveAuth(
-  security: readonly SecuritySpec[],
+  security: readonly (readonly SecuritySpec[])[],
   config: ClientConfig
 ): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const alternative =
+    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
+    security[0] ??
+    [];
   const headers: Record<string, string> = {};
   const query: Record<string, string> = {};
   const cookies: string[] = [];
-  for (const scheme of security) {
+  for (const scheme of alternative) {
     if (scheme.kind === 'apiKey') {
       const provider = config.auth?.apiKey?.[scheme.scheme];
       if (provider === undefined) continue;
@@ -1469,7 +1483,7 @@ async function send(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts b/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
index b91ca1691a..936fa9497d 100644
--- a/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
@@ -78,7 +78,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -111,7 +111,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -678,7 +679,7 @@ async function send(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/tests/e2e/generate-client/examples/customization/src/api/client.ts b/tests/e2e/generate-client/examples/customization/src/api/client.ts
index cf3e8f1fae..f494ac3262 100644
--- a/tests/e2e/generate-client/examples/customization/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/customization/src/api/client.ts
@@ -779,16 +779,16 @@ export type Ops = {
  */
 export const OPERATIONS = {
     listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
     getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
     registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
 } as const satisfies Record<string, OperationDescriptor>;
 
@@ -819,7 +819,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -852,7 +852,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -1275,21 +1276,34 @@ function encodeBase64(text: string): string {
   return btoa(binary);
 }
 
+/** Whether a credential for this scheme is configured on the instance. */
+function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
+  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
+  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
+  return config.auth?.basic !== undefined;
+}
+
 /**
- * Build the auth headers/query for one operation's `security` requirements from the
+ * Build the auth headers/query for one operation's `security` OR-alternatives from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * A scheme with no configured credential contributes nothing (the request is sent
- * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * The first alternative whose schemes (an AND-set) are all configured is applied, so
+ * "bearer OR apiKey" works with either credential and never sends both. When none is
+ * fully configured, the first alternative's configured schemes are still sent (the
+ * server rejects the request, mirroring the previous behavior).
  * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
  */
 async function resolveAuth(
-  security: readonly SecuritySpec[],
+  security: readonly (readonly SecuritySpec[])[],
   config: ClientConfig
 ): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const alternative =
+    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
+    security[0] ??
+    [];
   const headers: Record<string, string> = {};
   const query: Record<string, string> = {};
   const cookies: string[] = [];
-  for (const scheme of security) {
+  for (const scheme of alternative) {
     if (scheme.kind === 'apiKey') {
       const provider = config.auth?.apiKey?.[scheme.scheme];
       if (provider === undefined) continue;
@@ -1469,7 +1483,7 @@ async function send(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
index cf3e8f1fae..f494ac3262 100644
--- a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
@@ -779,16 +779,16 @@ export type Ops = {
  */
 export const OPERATIONS = {
     listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
     getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
     registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
 } as const satisfies Record<string, OperationDescriptor>;
 
@@ -819,7 +819,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -852,7 +852,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -1275,21 +1276,34 @@ function encodeBase64(text: string): string {
   return btoa(binary);
 }
 
+/** Whether a credential for this scheme is configured on the instance. */
+function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
+  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
+  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
+  return config.auth?.basic !== undefined;
+}
+
 /**
- * Build the auth headers/query for one operation's `security` requirements from the
+ * Build the auth headers/query for one operation's `security` OR-alternatives from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * A scheme with no configured credential contributes nothing (the request is sent
- * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * The first alternative whose schemes (an AND-set) are all configured is applied, so
+ * "bearer OR apiKey" works with either credential and never sends both. When none is
+ * fully configured, the first alternative's configured schemes are still sent (the
+ * server rejects the request, mirroring the previous behavior).
  * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
  */
 async function resolveAuth(
-  security: readonly SecuritySpec[],
+  security: readonly (readonly SecuritySpec[])[],
   config: ClientConfig
 ): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const alternative =
+    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
+    security[0] ??
+    [];
   const headers: Record<string, string> = {};
   const query: Record<string, string> = {};
   const cookies: string[] = [];
-  for (const scheme of security) {
+  for (const scheme of alternative) {
     if (scheme.kind === 'apiKey') {
       const provider = config.auth?.apiKey?.[scheme.scheme];
       if (provider === undefined) continue;
@@ -1469,7 +1483,7 @@ async function send(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/tests/e2e/generate-client/examples/mock/src/api/client.ts b/tests/e2e/generate-client/examples/mock/src/api/client.ts
index cf3e8f1fae..f494ac3262 100644
--- a/tests/e2e/generate-client/examples/mock/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/mock/src/api/client.ts
@@ -779,16 +779,16 @@ export type Ops = {
  */
 export const OPERATIONS = {
     listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
     getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
     registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
 } as const satisfies Record<string, OperationDescriptor>;
 
@@ -819,7 +819,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -852,7 +852,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -1275,21 +1276,34 @@ function encodeBase64(text: string): string {
   return btoa(binary);
 }
 
+/** Whether a credential for this scheme is configured on the instance. */
+function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
+  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
+  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
+  return config.auth?.basic !== undefined;
+}
+
 /**
- * Build the auth headers/query for one operation's `security` requirements from the
+ * Build the auth headers/query for one operation's `security` OR-alternatives from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * A scheme with no configured credential contributes nothing (the request is sent
- * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * The first alternative whose schemes (an AND-set) are all configured is applied, so
+ * "bearer OR apiKey" works with either credential and never sends both. When none is
+ * fully configured, the first alternative's configured schemes are still sent (the
+ * server rejects the request, mirroring the previous behavior).
  * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
  */
 async function resolveAuth(
-  security: readonly SecuritySpec[],
+  security: readonly (readonly SecuritySpec[])[],
   config: ClientConfig
 ): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const alternative =
+    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
+    security[0] ??
+    [];
   const headers: Record<string, string> = {};
   const query: Record<string, string> = {};
   const cookies: string[] = [];
-  for (const scheme of security) {
+  for (const scheme of alternative) {
     if (scheme.kind === 'apiKey') {
       const provider = config.auth?.apiKey?.[scheme.scheme];
       if (provider === undefined) continue;
@@ -1469,7 +1483,7 @@ async function send(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/tests/e2e/generate-client/examples/multi-instance/src/api/client.ts b/tests/e2e/generate-client/examples/multi-instance/src/api/client.ts
index f8975a77a9..3f379ea727 100644
--- a/tests/e2e/generate-client/examples/multi-instance/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/multi-instance/src/api/client.ts
@@ -63,8 +63,8 @@ export type Ops = {
  * tags) for cache keys, tracing span names, and request logging.
  */
 export const OPERATIONS = {
-    listProjects: { id: "listProjects", method: "GET", path: "/projects", tags: ["Projects"], security: [{ scheme: "BearerAuth", kind: "bearer" }] },
-    createProject: { id: "createProject", method: "POST", path: "/projects", tags: ["Projects"], body: { contentType: "application/json" }, security: [{ scheme: "BearerAuth", kind: "bearer" }] }
+    listProjects: { id: "listProjects", method: "GET", path: "/projects", tags: ["Projects"], security: [[{ scheme: "BearerAuth", kind: "bearer" }]] },
+    createProject: { id: "createProject", method: "POST", path: "/projects", tags: ["Projects"], body: { contentType: "application/json" }, security: [[{ scheme: "BearerAuth", kind: "bearer" }]] }
 } as const satisfies Record<string, OperationDescriptor>;
 
 export type OperationId = keyof typeof OPERATIONS;
diff --git a/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts b/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
index 31ecdbfb8c..d0e8b1a26d 100644
--- a/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
@@ -85,7 +85,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -118,7 +118,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -685,7 +686,7 @@ async function send(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/tests/e2e/generate-client/examples/package-runtime/src/api/client.ts b/tests/e2e/generate-client/examples/package-runtime/src/api/client.ts
index 1ee476a9e5..cdab8f9c8f 100644
--- a/tests/e2e/generate-client/examples/package-runtime/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/package-runtime/src/api/client.ts
@@ -781,16 +781,16 @@ export type Ops = {
  */
 export const OPERATIONS = {
     listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
     getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
     registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
 } as const satisfies Record<string, OperationDescriptor>;
 
diff --git a/tests/e2e/generate-client/examples/pagination/src/api/client.ts b/tests/e2e/generate-client/examples/pagination/src/api/client.ts
index dd2b40a5db..4fd072f341 100644
--- a/tests/e2e/generate-client/examples/pagination/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/pagination/src/api/client.ts
@@ -94,7 +94,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -127,7 +127,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -799,7 +800,7 @@ async function send(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
index cf3e8f1fae..f494ac3262 100644
--- a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
@@ -779,16 +779,16 @@ export type Ops = {
  */
 export const OPERATIONS = {
     listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
     getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
     registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
 } as const satisfies Record<string, OperationDescriptor>;
 
@@ -819,7 +819,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -852,7 +852,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -1275,21 +1276,34 @@ function encodeBase64(text: string): string {
   return btoa(binary);
 }
 
+/** Whether a credential for this scheme is configured on the instance. */
+function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
+  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
+  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
+  return config.auth?.basic !== undefined;
+}
+
 /**
- * Build the auth headers/query for one operation's `security` requirements from the
+ * Build the auth headers/query for one operation's `security` OR-alternatives from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * A scheme with no configured credential contributes nothing (the request is sent
- * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * The first alternative whose schemes (an AND-set) are all configured is applied, so
+ * "bearer OR apiKey" works with either credential and never sends both. When none is
+ * fully configured, the first alternative's configured schemes are still sent (the
+ * server rejects the request, mirroring the previous behavior).
  * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
  */
 async function resolveAuth(
-  security: readonly SecuritySpec[],
+  security: readonly (readonly SecuritySpec[])[],
   config: ClientConfig
 ): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const alternative =
+    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
+    security[0] ??
+    [];
   const headers: Record<string, string> = {};
   const query: Record<string, string> = {};
   const cookies: string[] = [];
-  for (const scheme of security) {
+  for (const scheme of alternative) {
     if (scheme.kind === 'apiKey') {
       const provider = config.auth?.apiKey?.[scheme.scheme];
       if (provider === undefined) continue;
@@ -1469,7 +1483,7 @@ async function send(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts b/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
index 221b9e1cc9..7d42c0e19b 100644
--- a/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
@@ -75,7 +75,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -108,7 +108,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -835,7 +836,7 @@ function parseSseFrame(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
index cf3e8f1fae..f494ac3262 100644
--- a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
@@ -779,16 +779,16 @@ export type Ops = {
  */
 export const OPERATIONS = {
     listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
     getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
     registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
 } as const satisfies Record<string, OperationDescriptor>;
 
@@ -819,7 +819,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -852,7 +852,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -1275,21 +1276,34 @@ function encodeBase64(text: string): string {
   return btoa(binary);
 }
 
+/** Whether a credential for this scheme is configured on the instance. */
+function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
+  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
+  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
+  return config.auth?.basic !== undefined;
+}
+
 /**
- * Build the auth headers/query for one operation's `security` requirements from the
+ * Build the auth headers/query for one operation's `security` OR-alternatives from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * A scheme with no configured credential contributes nothing (the request is sent
- * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * The first alternative whose schemes (an AND-set) are all configured is applied, so
+ * "bearer OR apiKey" works with either credential and never sends both. When none is
+ * fully configured, the first alternative's configured schemes are still sent (the
+ * server rejects the request, mirroring the previous behavior).
  * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
  */
 async function resolveAuth(
-  security: readonly SecuritySpec[],
+  security: readonly (readonly SecuritySpec[])[],
   config: ClientConfig
 ): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const alternative =
+    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
+    security[0] ??
+    [];
   const headers: Record<string, string> = {};
   const query: Record<string, string> = {};
   const cookies: string[] = [];
-  for (const scheme of security) {
+  for (const scheme of alternative) {
     if (scheme.kind === 'apiKey') {
       const provider = config.auth?.apiKey?.[scheme.scheme];
       if (provider === undefined) continue;
@@ -1469,7 +1483,7 @@ async function send(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts b/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
index 1ea179b0a3..07cf22d89c 100644
--- a/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
@@ -115,7 +115,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -148,7 +148,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -715,7 +716,7 @@ async function send(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts b/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
index 75d922b2d2..67b39bb70b 100644
--- a/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
@@ -154,7 +154,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -187,7 +187,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -754,7 +755,7 @@ async function send(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/tests/e2e/generate-client/examples/zod/src/api/client.ts b/tests/e2e/generate-client/examples/zod/src/api/client.ts
index cf3e8f1fae..f494ac3262 100644
--- a/tests/e2e/generate-client/examples/zod/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/zod/src/api/client.ts
@@ -779,16 +779,16 @@ export type Ops = {
  */
 export const OPERATIONS = {
     listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
+    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
     getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [{ scheme: "OAuth2", kind: "bearer" }] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }] },
+    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
+    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
     registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
 } as const satisfies Record<string, OperationDescriptor>;
 
@@ -819,7 +819,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -852,7 +852,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -1275,21 +1276,34 @@ function encodeBase64(text: string): string {
   return btoa(binary);
 }
 
+/** Whether a credential for this scheme is configured on the instance. */
+function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
+  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
+  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
+  return config.auth?.basic !== undefined;
+}
+
 /**
- * Build the auth headers/query for one operation's `security` requirements from the
+ * Build the auth headers/query for one operation's `security` OR-alternatives from the
  * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * A scheme with no configured credential contributes nothing (the request is sent
- * unauthenticated and the server rejects it, mirroring the generated-client behavior).
+ * The first alternative whose schemes (an AND-set) are all configured is applied, so
+ * "bearer OR apiKey" works with either credential and never sends both. When none is
+ * fully configured, the first alternative's configured schemes are still sent (the
+ * server rejects the request, mirroring the previous behavior).
  * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
  */
 async function resolveAuth(
-  security: readonly SecuritySpec[],
+  security: readonly (readonly SecuritySpec[])[],
   config: ClientConfig
 ): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
+  const alternative =
+    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
+    security[0] ??
+    [];
   const headers: Record<string, string> = {};
   const query: Record<string, string> = {};
   const cookies: string[] = [];
-  for (const scheme of security) {
+  for (const scheme of alternative) {
     if (scheme.kind === 'apiKey') {
       const provider = config.auth?.apiKey?.[scheme.scheme];
       if (provider === undefined) continue;
@@ -1469,7 +1483,7 @@ async function send(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/tests/e2e/generate-client/package-runtime-consumer/api.ts b/tests/e2e/generate-client/package-runtime-consumer/api.ts
index 3fa5a67bc2..ecfd720c6a 100644
--- a/tests/e2e/generate-client/package-runtime-consumer/api.ts
+++ b/tests/e2e/generate-client/package-runtime-consumer/api.ts
@@ -77,7 +77,7 @@ export type Ops = {
  * tags) for cache keys, tracing span names, and request logging.
  */
 export const OPERATIONS = {
-    getOrder: { id: "getOrder", method: "GET", path: "/orders/{order-id}", params: [{ name: "order-id", in: "path" }, { name: "expand", in: "query" }], security: [{ scheme: "bearerAuth", kind: "bearer" }] },
+    getOrder: { id: "getOrder", method: "GET", path: "/orders/{order-id}", params: [{ name: "order-id", in: "path" }, { name: "expand", in: "query" }], security: [[{ scheme: "bearerAuth", kind: "bearer" }]] },
     createOrder: { id: "createOrder", method: "POST", path: "/orders", body: { contentType: "application/json" } },
     configure_2: { id: "configure", method: "GET", path: "/configure-op" },
     streamEvents: { id: "streamEvents", method: "GET", path: "/events", responseKind: "sse", sseDataKind: "json" }
diff --git a/tests/e2e/generate-client/pagination-consumer/api-offset.ts b/tests/e2e/generate-client/pagination-consumer/api-offset.ts
index 668bfcad40..92a155e17a 100644
--- a/tests/e2e/generate-client/pagination-consumer/api-offset.ts
+++ b/tests/e2e/generate-client/pagination-consumer/api-offset.ts
@@ -125,7 +125,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -158,7 +158,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -830,7 +831,7 @@ async function send(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/tests/e2e/generate-client/pagination-consumer/api.ts b/tests/e2e/generate-client/pagination-consumer/api.ts
index d17024dcd4..77cb763251 100644
--- a/tests/e2e/generate-client/pagination-consumer/api.ts
+++ b/tests/e2e/generate-client/pagination-consumer/api.ts
@@ -124,7 +124,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -157,7 +157,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -829,7 +830,7 @@ async function send(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (
diff --git a/tests/e2e/generate-client/sse-consumer/api.ts b/tests/e2e/generate-client/sse-consumer/api.ts
index 76c8ada779..59f7c49098 100644
--- a/tests/e2e/generate-client/sse-consumer/api.ts
+++ b/tests/e2e/generate-client/sse-consumer/api.ts
@@ -81,7 +81,7 @@ export type ParamSpec = {
   allowReserved?: boolean;
 };
 
-/** One security requirement, denormalized onto the operation (`scheme` names the spec's scheme). */
+/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
 export type SecuritySpec =
   | { scheme: string; kind: 'bearer' | 'basic' }
   | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
@@ -114,7 +114,8 @@ export type OperationDescriptor = {
   /** Defaults to `'json'` (content-type negotiation on parse). */
   responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
   sseDataKind?: 'json' | 'text';
-  security?: readonly SecuritySpec[];
+  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
+  security?: readonly (readonly SecuritySpec[])[];
   pagination?: PaginationSpec;
 };
 
@@ -841,7 +842,7 @@ function parseSseFrame(
  */
 type Capabilities = SendCapabilities & {
   resolveAuth?: (
-    security: readonly SecuritySpec[],
+    security: readonly (readonly SecuritySpec[])[],
     config: ClientConfig
   ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
   sse?: (

From f5776cfde6f00ad582769f56e9a76baae703d8ea Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 14 Jul 2026 16:09:52 +0300
Subject: [PATCH 106/134] fix(client-generator): cancel the abandoned body when
 onResponse replaces the response

---
 .../__snapshots__/package-client.test.ts.snap | 14 +++++++++++--
 .../src/emitters/runtime-sources.ts           |  2 +-
 .../src/runtime/__tests__/send.test.ts        | 21 +++++++++++++++++++
 packages/client-generator/src/runtime/send.ts |  7 ++++++-
 .../e2e/generate-client/base-consumer/api.ts  |  7 ++++++-
 .../e2e/generate-client/cafe-consumer/api.ts  |  7 ++++++-
 tests/e2e/generate-client/cafe.snapshot.ts    |  7 ++++++-
 .../examples/baked-setup/src/api/client.ts    |  7 ++++++-
 .../src/api/client.ts                         |  7 ++++++-
 .../custom-generator/src/api/client.ts        |  7 ++++++-
 .../custom-pagination/src/api/client.ts       |  7 ++++++-
 .../examples/customization/src/api/client.ts  |  7 ++++++-
 .../fetch-functions/src/api/client.ts         |  7 ++++++-
 .../examples/mock/src/api/client.ts           |  7 ++++++-
 .../examples/nested-facade/src/api/client.ts  |  7 ++++++-
 .../examples/pagination/src/api/client.ts     |  7 ++++++-
 .../examples/programmatic/src/api/client.ts   |  7 ++++++-
 .../examples/sse-streaming/src/api/client.ts  |  7 ++++++-
 .../examples/tanstack-query/src/api/client.ts |  7 ++++++-
 .../examples/vendored-edge/src/api/client.ts  |  7 ++++++-
 .../zero-install-quickstart/src/api/client.ts |  7 ++++++-
 .../examples/zod/src/api/client.ts            |  7 ++++++-
 .../pagination-consumer/api-offset.ts         |  7 ++++++-
 .../pagination-consumer/api.ts                |  7 ++++++-
 tests/e2e/generate-client/sse-consumer/api.ts |  7 ++++++-
 25 files changed, 166 insertions(+), 25 deletions(-)

diff --git a/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap b/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
index 3c099c9c89..054e0da67f 100644
--- a/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
+++ b/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
@@ -721,7 +721,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
@@ -2162,7 +2167,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/packages/client-generator/src/emitters/runtime-sources.ts b/packages/client-generator/src/emitters/runtime-sources.ts
index ecb7246c3a..154758f627 100644
--- a/packages/client-generator/src/emitters/runtime-sources.ts
+++ b/packages/client-generator/src/emitters/runtime-sources.ts
@@ -17,7 +17,7 @@ export const RUNTIME_SOURCES = {
   'setup.ts':
     "import type { ClientConfig, Middleware } from './types.js';\n\n/**\n * Merge a publisher's baked setup (`defineClientSetup({...})`) with the app's config:\n * app config fields win per-field over baked defaults, while middleware composes —\n * baked middleware runs first, then the app's.\n */\nexport function mergeSetup(\n  setup: { config?: ClientConfig; middleware?: Middleware[] } | undefined,\n  config: ClientConfig = {}\n): ClientConfig {\n  return {\n    ...setup?.config,\n    ...config,\n    middleware: [...(setup?.middleware ?? []), ...(config.middleware ?? [])],\n  };\n}\n",
   'send.ts':
-    "import { abortError } from './errors.js';\nimport { defaultRetryOn, retryDelay, sleep } from './retry.js';\nimport type {\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  RequestContext,\n  RequestOptions,\n  RetryConfig,\n} from './types.js';\n\n/**\n * Optional behaviors the send core can use but never statically imports — wired by\n * `createClient` (the same seam the future inline-mode assembler relies on).\n */\nexport type SendCapabilities = {\n  /** Serialize a typed multipart body (a plain object) to FormData. */\n  serializeMultipart?: (body: Record<string, unknown>) => FormData;\n};\n\n/**\n * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)\n * to a plain record — spreading a `Headers` or an array contributes no entries.\n */\nexport function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {\n  if (headers === undefined) return {};\n  if (headers instanceof Headers) {\n    const record: Record<string, string> = {};\n    headers.forEach((value, key) => {\n      record[key] = value;\n    });\n    return record;\n  }\n  if (Array.isArray(headers)) return Object.fromEntries(headers);\n  return headers;\n}\n\n/**\n * The effective middleware chain for a request: the single `onRequest`/`onResponse`/\n * `onError` config hooks as one implicit first middleware, then `config.middleware`.\n */\nexport function middlewareChain(config: ClientConfig): Middleware[] {\n  const single =\n    config.onRequest || config.onResponse || config.onError\n      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]\n      : [];\n  return [...single, ...(config.middleware ?? [])];\n}\n\n/**\n * The fetch core shared by every operation: default + config + per-call headers, the\n * `onRequest` chain (BEFORE body serialization, so mutations are sent), body\n * serialization (JSON, or FormData via the multipart capability), the retry loop\n * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse\n * `onResponse` onion. Returns the final response plus the request context.\n */\nexport async function send(\n  config: ClientConfig,\n  op: OperationContext,\n  url: string,\n  init: RequestOptions,\n  body: unknown | undefined,\n  multipart: boolean,\n  caps: SendCapabilities\n): Promise<{ response: Response; context: RequestContext }> {\n  const { retry: callRetry, ...fetchInit } = init;\n  const retry: RetryConfig = { ...config.retry, ...callRetry };\n  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;\n  const headers: Record<string, string> = {\n    Accept: 'application/json',\n    ...extra,\n    ...toHeaderRecord(fetchInit.headers),\n  };\n  const context: RequestContext = {\n    url,\n    method: fetchInit.method ?? 'GET',\n    headers,\n    body,\n    operation: op,\n  };\n  const middleware = middlewareChain(config);\n  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);\n  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.\n  let payload: BodyInit | undefined;\n  if (context.body !== undefined) {\n    const value = context.body;\n    const isBinary =\n      value instanceof Blob ||\n      value instanceof ArrayBuffer ||\n      ArrayBuffer.isView(value as ArrayBufferView);\n    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;\n    const isURLSearchParams = value instanceof URLSearchParams;\n    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {\n      payload = value as BodyInit;\n    } else if (multipart) {\n      if (!caps.serializeMultipart) {\n        throw new Error('Multipart capability not wired: cannot serialize the request body');\n      }\n      payload = caps.serializeMultipart(value as Record<string, unknown>);\n    } else {\n      payload = JSON.stringify(value);\n      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {\n        context.headers['Content-Type'] = 'application/json';\n      }\n    }\n  }\n  const doFetch = config.fetch ?? fetch;\n  const maxAttempts = 1 + (retry.retries ?? 0);\n  const retryOn = retry.retryOn ?? defaultRetryOn;\n  const signal = fetchInit.signal ?? undefined;\n\n  let attempt = 0;\n  while (true) {\n    attempt++;\n    if (signal?.aborted) throw abortError(signal);\n    let response: Response;\n    try {\n      response = await doFetch(context.url, {\n        ...fetchInit,\n        method: context.method,\n        headers: context.headers,\n        body: payload,\n      });\n    } catch (error) {\n      if (\n        attempt < maxAttempts &&\n        !signal?.aborted &&\n        (await retryOn({ attempt, request: context, error }))\n      ) {\n        await sleep(retryDelay(retry, attempt, null), signal);\n        continue;\n      }\n      throw error;\n    }\n    // Reverse order: the last-registered middleware wraps closest to the network (onion).\n    for (let i = middleware.length - 1; i >= 0; i--) {\n      const onResponse = middleware[i].onResponse;\n      if (onResponse) {\n        const replaced = await onResponse(response, context);\n        if (replaced) response = replaced;\n      }\n    }\n    if (\n      !response.ok &&\n      attempt < maxAttempts &&\n      !signal?.aborted &&\n      (await retryOn({ attempt, request: context, response }))\n    ) {\n      const retryAfter = response.headers.get('retry-after');\n      // Drain the abandoned response body before the next attempt: an unread body\n      // keeps the connection checked out (and can stall the pool) under Node/undici\n      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).\n      await response.body?.cancel().catch(() => undefined);\n      await sleep(retryDelay(retry, attempt, retryAfter), signal);\n      continue;\n    }\n    return { response, context };\n  }\n}\n",
+    "import { abortError } from './errors.js';\nimport { defaultRetryOn, retryDelay, sleep } from './retry.js';\nimport type {\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  RequestContext,\n  RequestOptions,\n  RetryConfig,\n} from './types.js';\n\n/**\n * Optional behaviors the send core can use but never statically imports — wired by\n * `createClient` (the same seam the future inline-mode assembler relies on).\n */\nexport type SendCapabilities = {\n  /** Serialize a typed multipart body (a plain object) to FormData. */\n  serializeMultipart?: (body: Record<string, unknown>) => FormData;\n};\n\n/**\n * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)\n * to a plain record — spreading a `Headers` or an array contributes no entries.\n */\nexport function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {\n  if (headers === undefined) return {};\n  if (headers instanceof Headers) {\n    const record: Record<string, string> = {};\n    headers.forEach((value, key) => {\n      record[key] = value;\n    });\n    return record;\n  }\n  if (Array.isArray(headers)) return Object.fromEntries(headers);\n  return headers;\n}\n\n/**\n * The effective middleware chain for a request: the single `onRequest`/`onResponse`/\n * `onError` config hooks as one implicit first middleware, then `config.middleware`.\n */\nexport function middlewareChain(config: ClientConfig): Middleware[] {\n  const single =\n    config.onRequest || config.onResponse || config.onError\n      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]\n      : [];\n  return [...single, ...(config.middleware ?? [])];\n}\n\n/**\n * The fetch core shared by every operation: default + config + per-call headers, the\n * `onRequest` chain (BEFORE body serialization, so mutations are sent), body\n * serialization (JSON, or FormData via the multipart capability), the retry loop\n * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse\n * `onResponse` onion. Returns the final response plus the request context.\n */\nexport async function send(\n  config: ClientConfig,\n  op: OperationContext,\n  url: string,\n  init: RequestOptions,\n  body: unknown | undefined,\n  multipart: boolean,\n  caps: SendCapabilities\n): Promise<{ response: Response; context: RequestContext }> {\n  const { retry: callRetry, ...fetchInit } = init;\n  const retry: RetryConfig = { ...config.retry, ...callRetry };\n  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;\n  const headers: Record<string, string> = {\n    Accept: 'application/json',\n    ...extra,\n    ...toHeaderRecord(fetchInit.headers),\n  };\n  const context: RequestContext = {\n    url,\n    method: fetchInit.method ?? 'GET',\n    headers,\n    body,\n    operation: op,\n  };\n  const middleware = middlewareChain(config);\n  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);\n  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.\n  let payload: BodyInit | undefined;\n  if (context.body !== undefined) {\n    const value = context.body;\n    const isBinary =\n      value instanceof Blob ||\n      value instanceof ArrayBuffer ||\n      ArrayBuffer.isView(value as ArrayBufferView);\n    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;\n    const isURLSearchParams = value instanceof URLSearchParams;\n    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {\n      payload = value as BodyInit;\n    } else if (multipart) {\n      if (!caps.serializeMultipart) {\n        throw new Error('Multipart capability not wired: cannot serialize the request body');\n      }\n      payload = caps.serializeMultipart(value as Record<string, unknown>);\n    } else {\n      payload = JSON.stringify(value);\n      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {\n        context.headers['Content-Type'] = 'application/json';\n      }\n    }\n  }\n  const doFetch = config.fetch ?? fetch;\n  const maxAttempts = 1 + (retry.retries ?? 0);\n  const retryOn = retry.retryOn ?? defaultRetryOn;\n  const signal = fetchInit.signal ?? undefined;\n\n  let attempt = 0;\n  while (true) {\n    attempt++;\n    if (signal?.aborted) throw abortError(signal);\n    let response: Response;\n    try {\n      response = await doFetch(context.url, {\n        ...fetchInit,\n        method: context.method,\n        headers: context.headers,\n        body: payload,\n      });\n    } catch (error) {\n      if (\n        attempt < maxAttempts &&\n        !signal?.aborted &&\n        (await retryOn({ attempt, request: context, error }))\n      ) {\n        await sleep(retryDelay(retry, attempt, null), signal);\n        continue;\n      }\n      throw error;\n    }\n    // Reverse order: the last-registered middleware wraps closest to the network (onion).\n    for (let i = middleware.length - 1; i >= 0; i--) {\n      const onResponse = middleware[i].onResponse;\n      if (onResponse) {\n        const replaced = await onResponse(response, context);\n        if (replaced && replaced !== response) {\n          // Cancel the abandoned original's body — like the retry path, an unread body\n          // keeps its connection checked out under Node/undici.\n          await response.body?.cancel().catch(() => undefined);\n          response = replaced;\n        }\n      }\n    }\n    if (\n      !response.ok &&\n      attempt < maxAttempts &&\n      !signal?.aborted &&\n      (await retryOn({ attempt, request: context, response }))\n    ) {\n      const retryAfter = response.headers.get('retry-after');\n      // Drain the abandoned response body before the next attempt: an unread body\n      // keeps the connection checked out (and can stall the pool) under Node/undici\n      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).\n      await response.body?.cancel().catch(() => undefined);\n      await sleep(retryDelay(retry, attempt, retryAfter), signal);\n      continue;\n    }\n    return { response, context };\n  }\n}\n",
   'sse.ts':
     "import { ApiError } from './errors.js';\nimport { readError } from './parse.js';\nimport { sleep } from './retry.js';\nimport { send, toHeaderRecord } from './send.js';\nimport type { ClientConfig, OperationContext, ServerSentEvent, SseOptions } from './types.js';\n\n/**\n * A frame delimiter: two consecutive line terminators (each CR, LF, or CRLF, per the SSE\n * spec — so mixed endings like `\\n\\r\\n` are valid boundaries, not just matching pairs).\n */\nconst FRAME_DELIMITER = /(?:\\r\\n|\\r|\\n){2}/;\n\n/**\n * A terminally malformed event stream — unparseable JSON `data` or an unbounded frame.\n * A stable bad payload, not a dropped connection, so the stream never reconnects on it.\n */\nexport class SseParseError extends Error {}\n\n/**\n * Consume a `text/event-stream` operation as typed events (capability module — wired\n * into `createClient`). Auto-reconnects on dropped connections, resuming from the last\n * seen event id via `Last-Event-ID` (backoff: the server's `retry:` value, then\n * `reconnectDelay`, then 1s — exponential with jitter, capped at 30s). A clean stream\n * end flushes a trailing frame and finishes; `break`/abort end the iterator cleanly.\n */\nexport async function* sse<T>(\n  config: ClientConfig,\n  op: OperationContext,\n  prepare: () => Promise<{ url: string; init: SseOptions }>,\n  dataKind: 'json' | 'text' = 'text'\n): AsyncGenerator<ServerSentEvent<T>> {\n  let lastEventId: string | undefined;\n  let serverRetry: number | undefined;\n  let failures = 0;\n  while (true) {\n    // Re-prepare each attempt so a refresh-style TokenProvider yields a fresh credential\n    // on reconnect (the auth is baked into `url` query + `init.headers`). `reconnect`,\n    // `reconnectDelay`, and `signal` come from the caller's original options unchanged.\n    const { url, init } = await prepare();\n    const { reconnect = true, reconnectDelay, ...rest } = init;\n    const signal = rest.signal ?? undefined;\n    if (signal?.aborted) return;\n    const headers: Record<string, string> = {\n      Accept: 'text/event-stream',\n      ...toHeaderRecord(rest.headers),\n    };\n    const sendHeaders =\n      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };\n    try {\n      const { response } = await send(\n        config,\n        op,\n        url,\n        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },\n        undefined,\n        false,\n        {}\n      );\n      if (!response.ok) {\n        const errorBody = await readError(response);\n        throw new ApiError(url, response.status, response.statusText, errorBody);\n      }\n      failures = 0;\n      const body = response.body;\n      if (!body) return;\n      const reader = body.getReader();\n      const decoder = new TextDecoder();\n      let buffer = '';\n      try {\n        while (true) {\n          const { done, value } = await reader.read();\n          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });\n          let match: RegExpMatchArray | null;\n          while ((match = buffer.match(FRAME_DELIMITER)) !== null) {\n            const index = match.index!;\n            const raw = buffer.slice(0, index);\n            buffer = buffer.slice(index + match[0].length);\n            const event = parseSseFrame(raw, dataKind);\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n          }\n          if (done) {\n            // Stream closed cleanly. Flush a final event that arrived without a trailing\n            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.\n            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n            return;\n          }\n          // Bound memory: a server that never sends a frame delimiter would otherwise\n          // grow `buffer` without limit. 1 MiB is far above any real SSE frame.\n          if (buffer.length > 1048576) {\n            throw new SseParseError('SSE frame exceeded 1048576 characters without a delimiter');\n          }\n        }\n      } finally {\n        await reader.cancel().catch(() => undefined);\n      }\n    } catch (error) {\n      if (signal?.aborted) return;\n      // A non-OK HTTP response (4xx/5xx) or an unparseable JSON payload is a definitive\n      // error, not a transient drop — surface it instead of reconnecting in a loop (a\n      // stable bad payload would otherwise reconnect forever).\n      if (error instanceof ApiError || error instanceof SseParseError) throw error;\n      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream\n      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.\n      if (!reconnect) throw error;\n    }\n    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.\n    failures++;\n    const base = serverRetry ?? reconnectDelay ?? 1000;\n    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);\n    try {\n      await sleep(Math.random() * delay, signal);\n    } catch {\n      return; // sleep rejects only on abort — end the iterator cleanly\n    }\n  }\n}\n\n/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */\nexport function parseSseFrame(\n  raw: string,\n  dataKind: 'json' | 'text'\n): ServerSentEvent<unknown> | undefined {\n  let event: string | undefined;\n  const dataLines: string[] = [];\n  let id: string | undefined;\n  let retry: number | undefined;\n  let sawField = false;\n  for (const line of raw.split(/\\r\\n|\\n|\\r/)) {\n    if (line === '' || line.startsWith(':')) continue;\n    const colon = line.indexOf(':');\n    const field = colon === -1 ? line : line.slice(0, colon);\n    let val = colon === -1 ? '' : line.slice(colon + 1);\n    if (val.startsWith(' ')) val = val.slice(1);\n    sawField = true;\n    if (field === 'event') event = val;\n    else if (field === 'data') dataLines.push(val);\n    else if (field === 'id') id = val;\n    else if (field === 'retry') {\n      const n = Number(val);\n      if (!Number.isNaN(n)) retry = n;\n    }\n  }\n  if (!sawField) return undefined;\n  const dataText = dataLines.join('\\n');\n  let data: unknown = dataText;\n  if (dataKind === 'json' && dataText !== '') {\n    try {\n      data = JSON.parse(dataText);\n    } catch (error) {\n      throw new SseParseError(\n        `Failed to parse SSE event data as JSON: ${error instanceof Error ? error.message : String(error)}`\n      );\n    }\n  }\n  return { event, data, id, retry };\n}\n",
   'create-client.ts':
diff --git a/packages/client-generator/src/runtime/__tests__/send.test.ts b/packages/client-generator/src/runtime/__tests__/send.test.ts
index deee770973..a05ba3f80e 100644
--- a/packages/client-generator/src/runtime/__tests__/send.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/send.test.ts
@@ -100,6 +100,27 @@ describe('send', () => {
     expect(await response.text()).toBe('replaced');
   });
 
+  it('cancels the abandoned original body when onResponse replaces the response', async () => {
+    let cancelled = false;
+    const body = new ReadableStream<Uint8Array>({
+      cancel() {
+        cancelled = true;
+      },
+    });
+    const { fetchImpl } = fetchSpy([new Response(body, { status: 200 })]);
+    const { response } = await send(
+      { fetch: fetchImpl, onResponse: () => new Response('replaced', { status: 201 }) },
+      op,
+      'u',
+      { method: 'GET' },
+      undefined,
+      false,
+      {}
+    );
+    expect(cancelled).toBe(true);
+    expect(response.status).toBe(201);
+  });
+
   it('retries an idempotent request on 503, drains the abandoned body, and honors Retry-After=0', async () => {
     const drained = vi.fn().mockResolvedValue(undefined);
     const bad = new Response('busy', { status: 503, headers: { 'retry-after': '0' } });
diff --git a/packages/client-generator/src/runtime/send.ts b/packages/client-generator/src/runtime/send.ts
index d0b5e16f0c..edf4806c65 100644
--- a/packages/client-generator/src/runtime/send.ts
+++ b/packages/client-generator/src/runtime/send.ts
@@ -137,7 +137,12 @@ export async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/base-consumer/api.ts b/tests/e2e/generate-client/base-consumer/api.ts
index 83c8df200c..4131ef1771 100644
--- a/tests/e2e/generate-client/base-consumer/api.ts
+++ b/tests/e2e/generate-client/base-consumer/api.ts
@@ -800,7 +800,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/cafe-consumer/api.ts b/tests/e2e/generate-client/cafe-consumer/api.ts
index 0b0468af71..f981f39ff6 100644
--- a/tests/e2e/generate-client/cafe-consumer/api.ts
+++ b/tests/e2e/generate-client/cafe-consumer/api.ts
@@ -1455,7 +1455,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/cafe.snapshot.ts b/tests/e2e/generate-client/cafe.snapshot.ts
index f494ac3262..550cd946cd 100644
--- a/tests/e2e/generate-client/cafe.snapshot.ts
+++ b/tests/e2e/generate-client/cafe.snapshot.ts
@@ -1455,7 +1455,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
index ccdac99a40..ebb28f1e59 100644
--- a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
@@ -1471,7 +1471,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts b/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
index 36ca7e0f23..bafa799785 100644
--- a/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
@@ -808,7 +808,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
index f494ac3262..550cd946cd 100644
--- a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
@@ -1455,7 +1455,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts b/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
index 936fa9497d..9a974c93bb 100644
--- a/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
@@ -651,7 +651,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/examples/customization/src/api/client.ts b/tests/e2e/generate-client/examples/customization/src/api/client.ts
index f494ac3262..550cd946cd 100644
--- a/tests/e2e/generate-client/examples/customization/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/customization/src/api/client.ts
@@ -1455,7 +1455,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
index f494ac3262..550cd946cd 100644
--- a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
@@ -1455,7 +1455,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/examples/mock/src/api/client.ts b/tests/e2e/generate-client/examples/mock/src/api/client.ts
index f494ac3262..550cd946cd 100644
--- a/tests/e2e/generate-client/examples/mock/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/mock/src/api/client.ts
@@ -1455,7 +1455,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts b/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
index d0e8b1a26d..a693878260 100644
--- a/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
@@ -658,7 +658,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/examples/pagination/src/api/client.ts b/tests/e2e/generate-client/examples/pagination/src/api/client.ts
index 4fd072f341..4917b1a967 100644
--- a/tests/e2e/generate-client/examples/pagination/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/pagination/src/api/client.ts
@@ -772,7 +772,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
index f494ac3262..550cd946cd 100644
--- a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
@@ -1455,7 +1455,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts b/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
index 7d42c0e19b..686152857f 100644
--- a/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
@@ -648,7 +648,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
index f494ac3262..550cd946cd 100644
--- a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
@@ -1455,7 +1455,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts b/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
index 07cf22d89c..fcbbc32010 100644
--- a/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
@@ -688,7 +688,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts b/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
index 67b39bb70b..ec074894fb 100644
--- a/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
@@ -727,7 +727,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/examples/zod/src/api/client.ts b/tests/e2e/generate-client/examples/zod/src/api/client.ts
index f494ac3262..550cd946cd 100644
--- a/tests/e2e/generate-client/examples/zod/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/zod/src/api/client.ts
@@ -1455,7 +1455,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/pagination-consumer/api-offset.ts b/tests/e2e/generate-client/pagination-consumer/api-offset.ts
index 92a155e17a..75991e15fa 100644
--- a/tests/e2e/generate-client/pagination-consumer/api-offset.ts
+++ b/tests/e2e/generate-client/pagination-consumer/api-offset.ts
@@ -803,7 +803,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/pagination-consumer/api.ts b/tests/e2e/generate-client/pagination-consumer/api.ts
index 77cb763251..735f1c082d 100644
--- a/tests/e2e/generate-client/pagination-consumer/api.ts
+++ b/tests/e2e/generate-client/pagination-consumer/api.ts
@@ -802,7 +802,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (
diff --git a/tests/e2e/generate-client/sse-consumer/api.ts b/tests/e2e/generate-client/sse-consumer/api.ts
index 59f7c49098..414996c1f4 100644
--- a/tests/e2e/generate-client/sse-consumer/api.ts
+++ b/tests/e2e/generate-client/sse-consumer/api.ts
@@ -654,7 +654,12 @@ async function send(
       const onResponse = middleware[i].onResponse;
       if (onResponse) {
         const replaced = await onResponse(response, context);
-        if (replaced) response = replaced;
+        if (replaced && replaced !== response) {
+          // Cancel the abandoned original's body — like the retry path, an unread body
+          // keeps its connection checked out under Node/undici.
+          await response.body?.cancel().catch(() => undefined);
+          response = replaced;
+        }
       }
     }
     if (

From 3aea0d09a3ab6bd82f282a7871dd3e7ddb8fbd16 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Wed, 15 Jul 2026 10:57:10 +0300
Subject: [PATCH 107/134] =?UTF-8?q?feat(client-generator):=20zod=20runtime?=
 =?UTF-8?q?=20validation=20=E2=80=94=20operationSchemas=20map=20and=20zodV?=
 =?UTF-8?q?alidation=20middleware?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/@v2/guides/use-generated-client.md       |  32 +++-
 packages/client-generator/README.md           |  11 ++
 .../src/emitters/__tests__/zod.test.ts        |  97 +++++++++-
 packages/client-generator/src/emitters/zod.ts | 130 ++++++++++++-
 .../client-generator/src/generators/zod.ts    |  15 +-
 .../generate-client/examples/zod/README.md    |   5 +-
 .../examples/zod/src/api/client.zod.ts        |  71 +++++++-
 .../generate-client/examples/zod/src/main.ts  |  22 ++-
 tests/e2e/generate-client/zod.test.ts         | 171 +++++++++++++++++-
 9 files changed, 510 insertions(+), 44 deletions(-)

diff --git a/docs/@v2/guides/use-generated-client.md b/docs/@v2/guides/use-generated-client.md
index ee9d98be36..1ddf73f45f 100644
--- a/docs/@v2/guides/use-generated-client.md
+++ b/docs/@v2/guides/use-generated-client.md
@@ -6,14 +6,14 @@ How to consume the TypeScript client produced by [`generate-client`](../commands
 
 `--generator` selects what to emit (default `sdk`). Each non-`sdk` generator adds a **standalone sibling module** next to the client; the client itself never imports it, so an add-on never adds a dependency to the client. Incompatible selections fail fast with an explanation.
 
-| Generator        | Emits                                                                                     | App peer dependency                                      |
-| ---------------- | ----------------------------------------------------------------------------------------- | -------------------------------------------------------- |
-| `sdk`            | The typed client (default).                                                               | none                                                     |
-| `zod`            | `<output>.zod.ts` — [Zod](https://zod.dev) schemas.                                       | `zod` `^3.23 \|\| ^4`                                    |
-| `tanstack-query` | `<output>.tanstack.ts` — [TanStack Query](https://tanstack.com/query) v5 factories.       | `@tanstack/<framework>-query` `^5`                       |
-| `swr`            | `<output>.swr.ts` — [SWR](https://swr.vercel.app) hooks.                                  | `swr` `^2`                                               |
-| `mock`           | `<output>.mocks.ts` — [MSW](https://mswjs.io) v2 handlers + `create<Schema>` factories.   | `msw` `^2` (+ `@faker-js/faker` for `--mock-data faker`) |
-| `transformers`   | `<output>.transformers.ts` — `transform<Name>` functions that parse wire dates to `Date`. | none                                                     |
+| Generator        | Emits                                                                                              | App peer dependency                                      |
+| ---------------- | -------------------------------------------------------------------------------------------------- | -------------------------------------------------------- |
+| `sdk`            | The typed client (default).                                                                        | none                                                     |
+| `zod`            | `<output>.zod.ts` — [Zod](https://zod.dev) schemas + [validation middleware](#runtime-validation). | `zod` `^3.23 \|\| ^4`                                    |
+| `tanstack-query` | `<output>.tanstack.ts` — [TanStack Query](https://tanstack.com/query) v5 factories.                | `@tanstack/<framework>-query` `^5`                       |
+| `swr`            | `<output>.swr.ts` — [SWR](https://swr.vercel.app) hooks.                                           | `swr` `^2`                                               |
+| `mock`           | `<output>.mocks.ts` — [MSW](https://mswjs.io) v2 handlers + `create<Schema>` factories.            | `msw` `^2` (+ `@faker-js/faker` for `--mock-data faker`) |
+| `transformers`   | `<output>.transformers.ts` — `transform<Name>` functions that parse wire dates to `Date`.          | none                                                     |
 
 ```sh
 redocly generate-client openapi.yaml --output src/client.ts --generator sdk --generator zod --generator mock
@@ -223,6 +223,22 @@ const res = await getMenuItemPhoto('prd_123', { parseAs: 'stream' });
 
 `parseAs` accepts `'json'`, `'text'`, `'blob'`, `'arrayBuffer'`, `'formData'`, `'stream'`, or `'auto'` (default). It changes the runtime reader only, not the static return type.
 
+## Runtime validation
+
+The `zod` generator emits `operationSchemas` — request/response validators keyed by operationId — and the `zodValidation` middleware that wires them into the client:
+
+```ts
+import { use } from './api/client';
+import { zodValidation } from './api/client.zod';
+
+use(zodValidation()); // validate request bodies and JSON responses
+```
+
+An invalid request body throws before any network call; a successful JSON response that doesn't match its schema throws after it.
+Both throw `ZodValidationError` (with `operationId`, `direction`, and the zod `issues`) — always thrown, even on result-mode clients.
+Payloads are never mutated, and operations without a JSON body pass through untouched.
+Pass `{ request: false }` or `{ response: false }` to narrow the scope, or import a schema from `operationSchemas` for a one-off check.
+
 ## Operation metadata
 
 The client exports an `OPERATIONS` map keyed by operationId — the same **operation descriptors** the runtime routes requests by, holding each operation's `method`, `path` template, `tags`, and wire shape:
diff --git a/packages/client-generator/README.md b/packages/client-generator/README.md
index a5a9832070..2aa7c29b6c 100644
--- a/packages/client-generator/README.md
+++ b/packages/client-generator/README.md
@@ -292,6 +292,17 @@ Schemas carry the validation refinements stable across Zod 3.23 and 4 (`.min`/`.
 Refs become `z.lazy(() => …)` so recursive schemas work.
 Format helpers (`.email`/`.uuid`/`.url`) are not emitted, since they diverge between Zod 3 and 4.
 
+The module also emits `operationSchemas` (request/response validators keyed by operationId) and the `zodValidation` middleware:
+
+```ts
+import { use } from './client.ts';
+import { zodValidation } from './client.zod.ts';
+
+use(zodValidation()); // request bodies validated before the wire; JSON responses after it
+```
+
+A mismatch throws `ZodValidationError` (`operationId`, `direction`, zod `issues`); payloads are never mutated.
+
 ### TanStack Query
 
 `generators: ['sdk', 'tanstack-query']` emits a standalone `<output>.tanstack.ts` module of [TanStack Query](https://tanstack.com/query) v5 factories wrapping the sdk operations.
diff --git a/packages/client-generator/src/emitters/__tests__/zod.test.ts b/packages/client-generator/src/emitters/__tests__/zod.test.ts
index c85341cd95..b8790550d9 100644
--- a/packages/client-generator/src/emitters/__tests__/zod.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/zod.test.ts
@@ -1,10 +1,11 @@
 import type { NamedSchemaModel, SchemaModel } from '../../intermediate-representation/model.js';
 import { printStatements } from '../ts.js';
-import { renderZodModule, schemaToZodExpression, zodModuleStatements } from '../zod.js';
+import { renderZodModule, schemaToZodExpression } from '../zod.js';
+import { apiModel, operation, response } from './fixtures.js';
 
 /** Print a single expression by wrapping it in a throwaway const. */
 function expr(schema: SchemaModel): string {
-  return renderZodModule([{ name: 'X', schema }])
+  return renderZodModule(apiModel({ schemas: [{ name: 'X', schema }] }))
     .split('= ')[1]
     .replace(/;$/, '');
 }
@@ -239,8 +240,8 @@ describe('schemaToZodExpression — refinements', () => {
 });
 
 describe('renderZodModule', () => {
-  it('returns empty string when there are no schemas', () => {
-    expect(renderZodModule([])).toBe('');
+  it('returns empty string when there is nothing to emit', () => {
+    expect(renderZodModule(apiModel())).toBe('');
   });
 
   it('emits the z import and one export const per schema', () => {
@@ -256,16 +257,92 @@ describe('renderZodModule', () => {
         },
       },
     ];
-    const out = renderZodModule(schemas);
+    const out = renderZodModule(apiModel({ schemas }));
     expect(out).toContain('import { z } from "zod";');
     expect(out).toContain('export const PetSchema = z.object({');
+    // No operation has a JSON body -> no validation surface.
+    expect(out).not.toContain('operationSchemas');
+    expect(out).not.toContain('zodValidation');
   });
+});
 
-  it('zodModuleStatements + printStatements matches renderZodModule', () => {
-    const schemas: NamedSchemaModel[] = [
-      { name: 'Foo', schema: { kind: 'scalar', scalar: 'string' } },
-    ];
-    expect(printStatements(zodModuleStatements(schemas))).toBe(renderZodModule(schemas));
+describe('renderZodModule — operation validation surface', () => {
+  const model = (op: Parameters<typeof operation>[0]) =>
+    apiModel({ services: [{ name: 'Default', operations: [operation(op)] }] });
+
+  it('maps a JSON request body and response by operationId and emits the middleware', () => {
+    const out = renderZodModule(
+      model({
+        name: 'createOrder',
+        method: 'post',
+        requestBody: {
+          contentType: 'application/json',
+          schema: { kind: 'ref', name: 'OrderInput' },
+          required: true,
+        },
+        successResponses: [response({ schema: { kind: 'ref', name: 'Order' } })],
+      })
+    );
+    expect(out).toContain('export const operationSchemas = {');
+    expect(out).toContain(
+      'createOrder: { request: z.lazy(() => OrderInputSchema), response: z.lazy(() => OrderSchema) }'
+    );
+    expect(out).toContain('export function zodValidation(');
+    expect(out).toContain('export class ZodValidationError extends Error {');
+  });
+
+  it('renders an inline (non-ref) body schema in place', () => {
+    const out = renderZodModule(
+      model({
+        name: 'ping',
+        successResponses: [
+          response({
+            schema: {
+              kind: 'object',
+              properties: [
+                { name: 'ok', schema: { kind: 'scalar', scalar: 'boolean' }, required: true },
+              ],
+            },
+          }),
+        ],
+      })
+    );
+    expect(out).toContain('ping: { response: z.object(');
+  });
+
+  it('skips SSE operations and non-JSON bodies', () => {
+    const out = renderZodModule(
+      apiModel({
+        schemas: [{ name: 'Keep', schema: { kind: 'scalar', scalar: 'string' } }],
+        services: [
+          {
+            name: 'Default',
+            operations: [
+              operation({
+                name: 'stream',
+                successResponses: [
+                  response({
+                    contentType: 'text/event-stream',
+                    schema: { kind: 'ref', name: 'Keep' },
+                  }),
+                ],
+              }),
+              operation({
+                name: 'upload',
+                method: 'post',
+                requestBody: {
+                  contentType: 'application/octet-stream',
+                  schema: { kind: 'scalar', scalar: 'string' },
+                  required: true,
+                },
+              }),
+            ],
+          },
+        ],
+      })
+    );
+    expect(out).toContain('export const KeepSchema');
+    expect(out).not.toContain('operationSchemas');
   });
 });
 
diff --git a/packages/client-generator/src/emitters/zod.ts b/packages/client-generator/src/emitters/zod.ts
index 616fc8a806..b61e2357ad 100644
--- a/packages/client-generator/src/emitters/zod.ts
+++ b/packages/client-generator/src/emitters/zod.ts
@@ -1,6 +1,8 @@
 // Emits Zod schemas from the IR. Each named schema becomes an
 // `export const <Name>Schema = z.<…>;` built with `ts.factory`, mirroring the
 // type emitter (`types.ts`) but targeting runtime validators instead of types.
+// Operations with a JSON request or response body additionally land in the
+// `operationSchemas` map, which powers the `zodValidation` client middleware.
 //
 // Only the refinement methods stable across zod 3.23 and 4 are emitted
 // (`.min/.max/.int/.gt/.lt/.regex`); format helpers (`.email/.uuid/.url`) diverge
@@ -8,15 +10,18 @@
 // which sidesteps declaration ordering and recursion uniformly.
 
 import type {
+  ApiModel,
   NamedSchemaModel,
   PropertyModel,
   ScalarKind,
   SchemaMetadata,
   SchemaModel,
 } from '../intermediate-representation/model.js';
+import { allOperations } from '../writers/util.js';
 import { safeIdent } from './identifier.js';
+import { isSseOp } from './sse.js';
 import { pascalCase } from './support.js';
-import { printStatements, ts } from './ts.js';
+import { jsdoc, printStatements, ts } from './ts.js';
 
 const { factory } = ts;
 
@@ -256,13 +261,122 @@ function zodImport(): ts.Statement {
   );
 }
 
-/** The zod module statements: the `z` import followed by one const per schema. */
-export function zodModuleStatements(schemas: NamedSchemaModel[]): ts.Statement[] {
-  return [zodImport(), ...schemas.map(schemaConstStatement)];
+/**
+ * `<opName>: { request?: <expr>, response?: <expr> }` for every non-SSE operation with a
+ * JSON request or response body — the operation's validators, keyed by the same id the
+ * middleware sees at runtime (`ctx.operation.id`). SSE, binary, text, and void bodies
+ * have no JSON payload to validate and are skipped.
+ */
+function operationSchemaEntries(model: ApiModel): ts.PropertyAssignment[] {
+  const entries: ts.PropertyAssignment[] = [];
+  for (const op of allOperations(model.services)) {
+    if (isSseOp(op)) continue;
+    const requestBody = op.requestBody;
+    const request =
+      requestBody && requestBody.contentType.toLowerCase().includes('json')
+        ? schemaToZodExpression(requestBody.schema)
+        : undefined;
+    const jsonResponse = op.successResponses.find((response) =>
+      response.contentType.toLowerCase().includes('json')
+    );
+    const response = jsonResponse ? schemaToZodExpression(jsonResponse.schema) : undefined;
+    if (!request && !response) continue;
+    const props: ts.PropertyAssignment[] = [];
+    if (request) props.push(factory.createPropertyAssignment('request', request));
+    if (response) props.push(factory.createPropertyAssignment('response', response));
+    entries.push(
+      factory.createPropertyAssignment(op.name, factory.createObjectLiteralExpression(props, false))
+    );
+  }
+  return entries;
 }
 
-/** Render the full zod module source. `''` when there are no schemas. */
-export function renderZodModule(schemas: NamedSchemaModel[]): string {
-  if (schemas.length === 0) return '';
-  return printStatements(zodModuleStatements(schemas));
+function operationSchemasStatement(entries: ts.PropertyAssignment[]): ts.Statement {
+  return jsdoc(
+    factory.createVariableStatement(
+      [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+      factory.createVariableDeclarationList(
+        [
+          factory.createVariableDeclaration(
+            'operationSchemas',
+            undefined,
+            undefined,
+            factory.createObjectLiteralExpression(entries, true)
+          ),
+        ],
+        ts.NodeFlags.Const
+      )
+    ),
+    'Request/response validators by operationId — powers `zodValidation`, or import one directly.'
+  );
+}
+
+// The validation middleware, spliced verbatim after the schemas (matches the printer's
+// double-quote/4-space style). Structurally compatible with the client's `Middleware`
+// without importing it, so the zod module keeps its single `zod` dependency.
+const VALIDATION_SUPPORT = `/** \`request\`/\`response\` validators for one operation (an absent side is not validated). */
+export type OperationSchemaSet = { request?: z.ZodType; response?: z.ZodType };
+
+const schemaIndex: Partial<Record<string, OperationSchemaSet>> = operationSchemas;
+
+/** A request or response payload failed validation. Always thrown, even on result-mode clients. */
+export class ZodValidationError extends Error {
+    constructor(
+        readonly operationId: string,
+        readonly direction: "request" | "response",
+        readonly issues: z.ZodError["issues"]
+    ) {
+        const detail = issues
+            .map((issue) => \`\${issue.path.join(".") || "(root)"}: \${issue.message}\`)
+            .join("; ");
+        super(\`\${direction === "request" ? "Request" : "Response"} validation failed for operation "\${operationId}": \${detail}\`);
+        this.name = "ZodValidationError";
+    }
+}
+
+/**
+ * Schema-validation middleware for the generated client: \`use(zodValidation())\`.
+ * Request bodies are validated before any network call; successful JSON responses are
+ * validated against the operation's response schema. Payloads are never mutated, and
+ * operations without a schema pass through untouched. A failure throws
+ * \`ZodValidationError\` — always, even on result-mode clients.
+ */
+export function zodValidation(options: { request?: boolean; response?: boolean } = {}) {
+    const { request = true, response = true } = options;
+    return {
+        onRequest(context: { body?: unknown; operation: { id: string } }): void {
+            if (!request || context.body === undefined) return;
+            const schema = schemaIndex[context.operation.id]?.request;
+            if (!schema) return;
+            const result = schema.safeParse(context.body);
+            if (!result.success) {
+                throw new ZodValidationError(context.operation.id, "request", result.error.issues);
+            }
+        },
+        async onResponse(incoming: Response, context: { operation: { id: string } }): Promise<void> {
+            if (!response || !incoming.ok) return;
+            const schema = schemaIndex[context.operation.id]?.response;
+            if (!schema) return;
+            const contentType = (incoming.headers.get("content-type") ?? "").toLowerCase();
+            if (!contentType.includes("json")) return;
+            const result = schema.safeParse(await incoming.clone().json());
+            if (!result.success) {
+                throw new ZodValidationError(context.operation.id, "response", result.error.issues);
+            }
+        },
+    };
+}`;
+
+/**
+ * Render the full zod module source: the component schemas, then — when any operation
+ * has a JSON body — the `operationSchemas` map and the `zodValidation` middleware.
+ * `''` when there is nothing to emit.
+ */
+export function renderZodModule(model: ApiModel): string {
+  const entries = operationSchemaEntries(model);
+  if (model.schemas.length === 0 && entries.length === 0) return '';
+  const statements: ts.Statement[] = [zodImport(), ...model.schemas.map(schemaConstStatement)];
+  if (entries.length === 0) return printStatements(statements);
+  statements.push(operationSchemasStatement(entries));
+  return `${printStatements(statements)}\n${VALIDATION_SUPPORT}\n`;
 }
diff --git a/packages/client-generator/src/generators/zod.ts b/packages/client-generator/src/generators/zod.ts
index 60e77a9ac9..9f8bd8be65 100644
--- a/packages/client-generator/src/generators/zod.ts
+++ b/packages/client-generator/src/generators/zod.ts
@@ -7,16 +7,17 @@ import type { Generator } from './types.js';
 
 /**
  * The zod generator: a standalone `<stem>.zod.ts` module of Zod schemas (one
- * `export const <Name>Schema` per IR named schema), validated by the consumer
- * (`PetSchema.parse(data)`; `z.infer` derives the type). The sdk client stays
- * dependency-free — zod is the consumer's peer.
+ * `export const <Name>Schema` per IR named schema), plus runtime validation for
+ * the client — the `operationSchemas` request/response map and the `zodValidation`
+ * middleware (`use(zodValidation())`). The sdk client stays dependency-free —
+ * zod is the consumer's peer, and the module imports nothing from the client.
  *
- * Phase 1 is output-mode-agnostic: it reads only `model.schemas` and emits a
- * single module beside the client regardless of how the sdk partitions its files.
- * Emits nothing when there are no schemas.
+ * Output-mode-agnostic: emits a single module beside the client regardless of
+ * how the sdk partitions its files. Emits nothing when the model has neither
+ * named schemas nor JSON operation bodies.
  */
 export const zodGenerator: Generator = ({ model, outputPath }) => {
-  const content = renderZodModule(model.schemas);
+  const content = renderZodModule(model);
   if (content === '') return [];
   const { dir, stem } = anchor(outputPath);
   return [{ path: join(dir, `${stem}.zod.ts`), content: `${HEADER}\n\n${content}` }];
diff --git a/tests/e2e/generate-client/examples/zod/README.md b/tests/e2e/generate-client/examples/zod/README.md
index 5ee02e44d5..0c61576c5f 100644
--- a/tests/e2e/generate-client/examples/zod/README.md
+++ b/tests/e2e/generate-client/examples/zod/README.md
@@ -1,7 +1,8 @@
 # zod example
 
-Generated TypeScript client plus **zod** schemas (`generators: ['sdk', 'zod']`). The app fetches with
-the sdk, then validates the response at runtime against the generated `*.zod` schema.
+Generated TypeScript client plus **zod** schemas (`generators: ['sdk', 'zod']`).
+The app turns on `zodValidation()` — request bodies and JSON responses are validated
+against the generated schemas on every call — and also uses a schema directly.
 
 ## Run
 
diff --git a/tests/e2e/generate-client/examples/zod/src/api/client.zod.ts b/tests/e2e/generate-client/examples/zod/src/api/client.zod.ts
index 309411d9f5..1f438ca1f9 100644
--- a/tests/e2e/generate-client/examples/zod/src/api/client.zod.ts
+++ b/tests/e2e/generate-client/examples/zod/src/api/client.zod.ts
@@ -119,4 +119,73 @@ export const OrderNotificationSchema = z.object({
     orderId: z.string(),
     orderStatus: z.lazy(() => OrderStatusSchema),
     timestamp: z.string()
-});
\ No newline at end of file
+});
+
+/**
+ * Request/response validators by operationId — powers `zodValidation`, or import one directly.
+ */
+export const operationSchemas = {
+    listMenuItems: { response: z.lazy(() => MenuItemListSchema) },
+    createMenuItem: { response: z.lazy(() => MenuItemSchema) },
+    listOrders: { response: z.lazy(() => OrderListSchema) },
+    createOrder: { request: OrderSchema.omit({ id: true, object: true, status: true, totalPrice: true, createdAt: true, updatedAt: true }), response: z.lazy(() => OrderSchema) },
+    getOrderById: { response: z.lazy(() => OrderSchema) },
+    updateOrder: { request: z.object({
+            status: z.lazy(() => OrderStatusSchema)
+        }), response: z.lazy(() => OrderSchema) },
+    listOrderItems: { response: z.array(z.lazy(() => OrderItemSchema)) },
+    getRevenue: { response: z.lazy(() => RevenueStatisticsSchema) },
+    registerOAuth2Client: { request: z.lazy(() => RegisterClientObjectSchema), response: z.lazy(() => OAuth2ClientSchema) }
+};
+/** `request`/`response` validators for one operation (an absent side is not validated). */
+export type OperationSchemaSet = { request?: z.ZodType; response?: z.ZodType };
+
+const schemaIndex: Partial<Record<string, OperationSchemaSet>> = operationSchemas;
+
+/** A request or response payload failed validation. Always thrown, even on result-mode clients. */
+export class ZodValidationError extends Error {
+    constructor(
+        readonly operationId: string,
+        readonly direction: "request" | "response",
+        readonly issues: z.ZodError["issues"]
+    ) {
+        const detail = issues
+            .map((issue) => `${issue.path.join(".") || "(root)"}: ${issue.message}`)
+            .join("; ");
+        super(`${direction === "request" ? "Request" : "Response"} validation failed for operation "${operationId}": ${detail}`);
+        this.name = "ZodValidationError";
+    }
+}
+
+/**
+ * Schema-validation middleware for the generated client: `use(zodValidation())`.
+ * Request bodies are validated before any network call; successful JSON responses are
+ * validated against the operation's response schema. Payloads are never mutated, and
+ * operations without a schema pass through untouched. A failure throws
+ * `ZodValidationError` — always, even on result-mode clients.
+ */
+export function zodValidation(options: { request?: boolean; response?: boolean } = {}) {
+    const { request = true, response = true } = options;
+    return {
+        onRequest(context: { body?: unknown; operation: { id: string } }): void {
+            if (!request || context.body === undefined) return;
+            const schema = schemaIndex[context.operation.id]?.request;
+            if (!schema) return;
+            const result = schema.safeParse(context.body);
+            if (!result.success) {
+                throw new ZodValidationError(context.operation.id, "request", result.error.issues);
+            }
+        },
+        async onResponse(incoming: Response, context: { operation: { id: string } }): Promise<void> {
+            if (!response || !incoming.ok) return;
+            const schema = schemaIndex[context.operation.id]?.response;
+            if (!schema) return;
+            const contentType = (incoming.headers.get("content-type") ?? "").toLowerCase();
+            if (!contentType.includes("json")) return;
+            const result = schema.safeParse(await incoming.clone().json());
+            if (!result.success) {
+                throw new ZodValidationError(context.operation.id, "response", result.error.issues);
+            }
+        },
+    };
+}
diff --git a/tests/e2e/generate-client/examples/zod/src/main.ts b/tests/e2e/generate-client/examples/zod/src/main.ts
index d06d3fff08..844b4c4d58 100644
--- a/tests/e2e/generate-client/examples/zod/src/main.ts
+++ b/tests/e2e/generate-client/examples/zod/src/main.ts
@@ -1,18 +1,26 @@
-import { configure, listMenuItems, ApiError } from './api/client.js';
-import { MenuItemListSchema } from './api/client.zod.js';
+import { configure, listMenuItems, use, ApiError } from './api/client.js';
+import { zodValidation, ZodValidationError, MenuItemListSchema } from './api/client.zod.js';
 
 configure({ serverUrl: 'https://api.cafe.redocly.com' });
+// Every request body and JSON response is now validated against the generated schemas.
+use(zodValidation());
 
 const out = document.querySelector<HTMLPreElement>('#out')!;
 
 async function main() {
   try {
-    const response = await listMenuItems();
-    const parsed = MenuItemListSchema.parse(response);
-    out.textContent = `Validated ${parsed.items.length} items:\n${JSON.stringify(parsed, null, 2)}`;
+    const items = await listMenuItems(); // already validated by the middleware
+    out.textContent = `Validated ${items.items.length} items:\n${JSON.stringify(items, null, 2)}`;
+
+    // Schemas are also importable directly for one-off checks (e.g. form input, cached data).
+    MenuItemListSchema.parse(items);
   } catch (error) {
-    out.textContent =
-      error instanceof ApiError ? `ApiError ${error.status}` : `Error: ${String(error)}`;
+    if (error instanceof ZodValidationError) {
+      out.textContent = `The server broke the contract on ${error.operationId}:\n${error.message}`;
+    } else {
+      out.textContent =
+        error instanceof ApiError ? `ApiError ${error.status}` : `Error: ${String(error)}`;
+    }
   }
 }
 
diff --git a/tests/e2e/generate-client/zod.test.ts b/tests/e2e/generate-client/zod.test.ts
index 3736c12c4a..b222fe5bd0 100644
--- a/tests/e2e/generate-client/zod.test.ts
+++ b/tests/e2e/generate-client/zod.test.ts
@@ -1,8 +1,17 @@
 import { spawnSync } from 'node:child_process';
-import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import {
+  existsSync,
+  mkdirSync,
+  mkdtempSync,
+  readFileSync,
+  rmSync,
+  symlinkSync,
+  writeFileSync,
+} from 'node:fs';
 import { tmpdir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import { outdent } from 'outdent';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const repoRoot = resolve(__dirname, '../../..');
@@ -86,4 +95,164 @@ describe('generate-client zod generator', () => {
 
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
+
+  it('zodValidation middleware validates requests before the wire and JSON responses after it', () => {
+    const dir = mkdtempSync(join(tmpdir(), 'ots-zod-run-'));
+    writeFileSync(join(dir, 'package.json'), '{"name":"zod-run","private":true,"type":"module"}\n');
+    mkdirSync(join(dir, 'node_modules'), { recursive: true });
+    symlinkSync(zodPath, join(dir, 'node_modules/zod'));
+    writeFileSync(
+      join(dir, 'openapi.yaml'),
+      outdent`
+        openapi: 3.0.3
+        info: { title: test, version: 1.0.0 }
+        paths:
+          /orders:
+            post:
+              operationId: createOrder
+              requestBody:
+                required: true
+                content:
+                  application/json:
+                    schema:
+                      type: object
+                      required: [name, quantity]
+                      properties:
+                        name: { type: string }
+                        quantity: { type: integer, minimum: 1 }
+              responses:
+                '200':
+                  description: ok
+                  content:
+                    application/json:
+                      schema:
+                        type: object
+                        required: [id]
+                        properties:
+                          id: { type: string }
+          /health:
+            get:
+              operationId: health
+              responses:
+                '204': { description: no content }
+      `
+    );
+    const generated = spawnSync(
+      'node',
+      [
+        cli,
+        'generate-client',
+        'openapi.yaml',
+        '--output',
+        'client.ts',
+        '--generator',
+        'sdk',
+        '--generator',
+        'zod',
+      ],
+      { cwd: dir, encoding: 'utf-8' }
+    );
+    expect(generated.status, generated.stderr).toBe(0);
+
+    writeFileSync(
+      join(dir, 'driver.ts'),
+      outdent`
+        import { client, configure, use } from './client.js';
+        import { operationSchemas, zodValidation, ZodValidationError } from './client.zod.js';
+
+        const results: string[] = [];
+        let fetchCalls = 0;
+        let nextBody = '{"id":"o1"}';
+        let nextStatus = 200;
+        configure({
+          serverUrl: 'https://api.example.com',
+          fetch: async () => {
+            fetchCalls++;
+            return new Response(nextStatus === 204 ? null : nextBody, {
+              status: nextStatus,
+              headers: nextStatus === 204 ? {} : { 'content-type': 'application/json' },
+            });
+          },
+        });
+
+        async function main() {
+          // Direct schema access: the map is importable on its own.
+          operationSchemas.createOrder.request.parse({ name: 'direct', quantity: 2 });
+
+          use(zodValidation({ response: false }));
+
+          // An invalid request throws BEFORE any network call.
+          try {
+            await client.createOrder({ body: { name: 'x', quantity: 0 } });
+            results.push('request-not-validated');
+          } catch (error) {
+            results.push(
+              error instanceof ZodValidationError
+                ? 'request-rejected:' + error.direction + ':calls=' + fetchCalls
+                : 'wrong-error:' + String(error)
+            );
+          }
+
+          // With response validation off, a mismatched response resolves untouched.
+          nextBody = '{"wrong":true}';
+          await client.createOrder({ body: { name: 'x', quantity: 2 } });
+          results.push('response-off-passes');
+
+          // A second middleware turns response validation on; the mismatch now throws.
+          use(zodValidation({ request: false }));
+          try {
+            await client.createOrder({ body: { name: 'x', quantity: 2 } });
+            results.push('response-not-validated');
+          } catch (error) {
+            results.push(
+              error instanceof ZodValidationError
+                ? 'response-rejected:' + error.direction
+                : 'wrong-error:' + String(error)
+            );
+          }
+
+          // A valid round trip passes both directions; a schema-less operation is untouched.
+          nextBody = '{"id":"o2"}';
+          const order = await client.createOrder({ body: { name: 'ok', quantity: 3 } });
+          results.push('valid:' + order.id);
+          nextStatus = 204;
+          await client.health();
+          results.push('schema-less-ok');
+
+          console.log(JSON.stringify(results));
+        }
+        // An unhandled rejection exits non-zero, so a driver failure fails the test.
+        void main();
+      `
+    );
+    writeFileSync(
+      join(dir, 'tsconfig.json'),
+      JSON.stringify({
+        compilerOptions: {
+          module: 'nodenext',
+          moduleResolution: 'nodenext',
+          target: 'es2022',
+          lib: ['ES2022', 'DOM'],
+          strict: true,
+          skipLibCheck: true,
+          types: [],
+        },
+        include: ['client.ts', 'client.zod.ts', 'driver.ts'],
+      }),
+      'utf-8'
+    );
+    const tsc = spawnSync(tscBin, ['-p', dir], { encoding: 'utf-8', cwd: dir });
+    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+
+    const run = spawnSync('node', ['driver.js'], { cwd: dir, encoding: 'utf-8' });
+    expect(run.status, run.stderr).toBe(0);
+    expect(JSON.parse(run.stdout)).toEqual([
+      'request-rejected:request:calls=0',
+      'response-off-passes',
+      'response-rejected:response',
+      'valid:o2',
+      'schema-less-ok',
+    ]);
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
 });

From 7958fbbc265f54ca4c28a5b9a4e02a6487ac2f07 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Wed, 15 Jul 2026 11:25:44 +0300
Subject: [PATCH 108/134] fix(client-generator): declaration-safe
 operationSchemas and omit on allOf-derived zod schemas

---
 .../src/emitters/__tests__/zod.test.ts        |  77 ++++++++-
 packages/client-generator/src/emitters/zod.ts | 160 ++++++++++++++----
 .../examples/zod/src/api/client.zod.ts        |  33 +++-
 tests/e2e/generate-client/zod.test.ts         |  23 ++-
 4 files changed, 251 insertions(+), 42 deletions(-)

diff --git a/packages/client-generator/src/emitters/__tests__/zod.test.ts b/packages/client-generator/src/emitters/__tests__/zod.test.ts
index b8790550d9..bc749627e4 100644
--- a/packages/client-generator/src/emitters/__tests__/zod.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/zod.test.ts
@@ -283,7 +283,7 @@ describe('renderZodModule — operation validation surface', () => {
         successResponses: [response({ schema: { kind: 'ref', name: 'Order' } })],
       })
     );
-    expect(out).toContain('export const operationSchemas = {');
+    expect(out).toContain('export const operationSchemas: {');
     expect(out).toContain(
       'createOrder: { request: z.lazy(() => OrderInputSchema), response: z.lazy(() => OrderSchema) }'
     );
@@ -291,6 +291,81 @@ describe('renderZodModule — operation validation surface', () => {
     expect(out).toContain('export class ZodValidationError extends Error {');
   });
 
+  it('annotates the map with z.ZodType so declaration emit stays small (TS7056)', () => {
+    const out = renderZodModule(
+      model({
+        name: 'createOrder',
+        method: 'post',
+        requestBody: {
+          contentType: 'application/json',
+          schema: { kind: 'ref', name: 'OrderInput' },
+          required: true,
+        },
+        successResponses: [response({ schema: { kind: 'ref', name: 'Order' } })],
+      })
+    );
+    expect(out).toContain(
+      'createOrder: {\n        request: z.ZodType;\n        response: z.ZodType;\n    };'
+    );
+  });
+
+  it('distributes a readOnly omit into an allOf intersection instead of calling .omit on it', () => {
+    const out = renderZodModule(
+      apiModel({
+        schemas: [
+          {
+            name: 'Base',
+            schema: {
+              kind: 'object',
+              properties: [
+                { name: 'id', schema: { kind: 'scalar', scalar: 'string' }, required: true },
+                { name: 'name', schema: { kind: 'scalar', scalar: 'string' }, required: true },
+              ],
+            },
+          },
+          {
+            name: 'Combined',
+            schema: {
+              kind: 'intersection',
+              members: [
+                { kind: 'ref', name: 'Base' },
+                {
+                  kind: 'object',
+                  properties: [
+                    {
+                      name: 'extra',
+                      schema: { kind: 'scalar', scalar: 'string' },
+                      required: false,
+                    },
+                  ],
+                },
+              ],
+            },
+          },
+        ],
+        services: [
+          {
+            name: 'Default',
+            operations: [
+              operation({
+                name: 'createCombined',
+                method: 'post',
+                requestBody: {
+                  contentType: 'application/json',
+                  schema: { kind: 'omit', base: 'Combined', keys: ['id'] },
+                  required: true,
+                },
+              }),
+            ],
+          },
+        ],
+      })
+    );
+    // ZodIntersection has no .omit — the omission lands on the object members instead.
+    expect(out).not.toContain('CombinedSchema.omit');
+    expect(out).toContain('BaseSchema.omit({ id: true })');
+  });
+
   it('renders an inline (non-ref) body schema in place', () => {
     const out = renderZodModule(
       model({
diff --git a/packages/client-generator/src/emitters/zod.ts b/packages/client-generator/src/emitters/zod.ts
index b61e2357ad..713e933a95 100644
--- a/packages/client-generator/src/emitters/zod.ts
+++ b/packages/client-generator/src/emitters/zod.ts
@@ -64,21 +64,28 @@ function literalExpression(value: string | number | boolean): ts.Expression {
   return numberLiteral(value);
 }
 
+type SchemaByName = ReadonlyMap<string, SchemaModel>;
+
+const NO_SCHEMAS: SchemaByName = new Map();
+
 /** Map an IR schema to the Zod expression that validates it. */
-export function schemaToZodExpression(schema: SchemaModel): ts.Expression {
-  return withRefinements(baseExpression(schema), schema);
+export function schemaToZodExpression(
+  schema: SchemaModel,
+  byName: SchemaByName = NO_SCHEMAS
+): ts.Expression {
+  return withRefinements(baseExpression(schema, byName), schema);
 }
 
-function baseExpression(schema: SchemaModel): ts.Expression {
+function baseExpression(schema: SchemaModel, byName: SchemaByName): ts.Expression {
   switch (schema.kind) {
     case 'scalar':
       return scalarExpression(schema.scalar, schema.metadata);
     case 'object':
-      return objectExpression(schema.properties);
+      return objectExpression(schema.properties, byName);
     case 'array':
-      return zCall('array', [schemaToZodExpression(schema.items)]);
+      return zCall('array', [schemaToZodExpression(schema.items, byName)]);
     case 'record':
-      return zCall('record', [zCall('string'), schemaToZodExpression(schema.value)]);
+      return zCall('record', [zCall('string'), schemaToZodExpression(schema.value, byName)]);
     case 'ref':
       return lazyRef(schema.name);
     case 'literal':
@@ -86,15 +93,15 @@ function baseExpression(schema: SchemaModel): ts.Expression {
     case 'enum':
       return enumExpression(schema.values);
     case 'union':
-      return unionExpression(schema.members);
+      return unionExpression(schema.members, byName);
     case 'intersection':
-      return intersectionExpression(schema.members);
+      return intersectionExpression(schema.members, byName);
     case 'null':
       return zCall('null');
     case 'unknown':
       return zCall('unknown');
     case 'omit':
-      return omitExpression(schema.base, schema.keys);
+      return omitExpression(schema.base, schema.keys, byName);
   }
 }
 
@@ -117,11 +124,11 @@ function scalarExpression(scalar: ScalarKind, metadata?: SchemaMetadata): ts.Exp
 }
 
 /** `z.object({ <key>: <expr>(.optional() when !required), … })`. */
-function objectExpression(properties: PropertyModel[]): ts.Expression {
+function objectExpression(properties: PropertyModel[], byName: SchemaByName): ts.Expression {
   const props = properties.map((p) => {
     const value = p.required
-      ? schemaToZodExpression(p.schema)
-      : chain(schemaToZodExpression(p.schema), 'optional');
+      ? schemaToZodExpression(p.schema, byName)
+      : chain(schemaToZodExpression(p.schema, byName), 'optional');
     const safe = safeIdent(p.name);
     const key =
       safe === p.name ? factory.createIdentifier(p.name) : factory.createStringLiteral(p.name);
@@ -162,20 +169,28 @@ function enumExpression(values: Array<string | number | boolean>): ts.Expression
 }
 
 /** `z.union([…])`; a single member collapses to that member's expression. */
-function unionExpression(members: SchemaModel[]): ts.Expression {
-  const exprs = members.map(schemaToZodExpression);
+function unionExpression(members: SchemaModel[], byName: SchemaByName): ts.Expression {
+  const exprs = members.map((member) => schemaToZodExpression(member, byName));
   if (exprs.length === 1) return exprs[0];
   return zCall('union', [factory.createArrayLiteralExpression(exprs, false)]);
 }
 
 /** `a.and(b).and(c)` — left-folds `.and` over the members. */
-function intersectionExpression(members: SchemaModel[]): ts.Expression {
-  const exprs = members.map(schemaToZodExpression);
+function intersectionExpression(members: SchemaModel[], byName: SchemaByName): ts.Expression {
+  const exprs = members.map((member) => schemaToZodExpression(member, byName));
   return exprs.reduce((acc, next) => chain(acc, 'and', [next]));
 }
 
-/** `<Base>Schema.omit({ k1: true, … })`. */
-function omitExpression(base: string, keys: string[]): ts.Expression {
+/**
+ * `<Base>Schema.omit({ k1: true, … })` when the base is a plain object schema.
+ * `.omit` exists only on `ZodObject` — for any other base (an `allOf` intersection,
+ * a union, …) the omission is distributed into the base's object members instead.
+ */
+function omitExpression(base: string, keys: string[], byName: SchemaByName): ts.Expression {
+  const target = byName.get(base);
+  if (target && target.kind !== 'object') {
+    return schemaToZodExpression(applyOmit(target, keys, byName, new Set([base])), byName);
+  }
   const mask = factory.createObjectLiteralExpression(
     keys.map((k) => {
       const safe = safeIdent(k);
@@ -187,6 +202,44 @@ function omitExpression(base: string, keys: string[]): ts.Expression {
   return chain(factory.createIdentifier(schemaConstName(base)), 'omit', [mask]);
 }
 
+/**
+ * Remove `keys` from a schema that is not a plain object: objects drop the properties,
+ * union/intersection members recurse, and a ref to an object becomes `<Ref>Schema.omit`
+ * with only the keys that exist on it (zod's mask rejects unknown keys at the type
+ * level). Cycles and non-object leaves return unchanged — there is nothing to omit.
+ */
+function applyOmit(
+  schema: SchemaModel,
+  keys: string[],
+  byName: SchemaByName,
+  seen: Set<string>
+): SchemaModel {
+  switch (schema.kind) {
+    case 'object':
+      return { ...schema, properties: schema.properties.filter((p) => !keys.includes(p.name)) };
+    case 'union':
+    case 'intersection':
+      return {
+        ...schema,
+        members: schema.members.map((member) => applyOmit(member, keys, byName, seen)),
+      };
+    case 'ref': {
+      if (seen.has(schema.name)) return schema;
+      const target = byName.get(schema.name);
+      if (!target) return schema;
+      if (target.kind === 'object') {
+        const present = keys.filter((key) =>
+          target.properties.some((property) => property.name === key)
+        );
+        return present.length > 0 ? { kind: 'omit', base: schema.name, keys: present } : schema;
+      }
+      return applyOmit(target, keys, byName, new Set([...seen, schema.name]));
+    }
+    default:
+      return schema;
+  }
+}
+
 /**
  * Chain the stable-subset metadata refinements onto `expr`. Order: numeric/length
  * bounds, then `.regex` (the `.int()` for integers is already on the base).
@@ -229,7 +282,7 @@ function regexExpression(pattern: string): ts.Expression {
 }
 
 /** `export const <Name>Schema = <expr>;` for one named schema. */
-function schemaConstStatement(named: NamedSchemaModel): ts.Statement {
+function schemaConstStatement(named: NamedSchemaModel, byName: SchemaByName): ts.Statement {
   return factory.createVariableStatement(
     [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
     factory.createVariableDeclarationList(
@@ -238,7 +291,7 @@ function schemaConstStatement(named: NamedSchemaModel): ts.Statement {
           schemaConstName(named.name),
           undefined,
           undefined,
-          schemaToZodExpression(named.schema)
+          schemaToZodExpression(named.schema, byName)
         ),
       ],
       ts.NodeFlags.Const
@@ -267,31 +320,64 @@ function zodImport(): ts.Statement {
  * middleware sees at runtime (`ctx.operation.id`). SSE, binary, text, and void bodies
  * have no JSON payload to validate and are skipped.
  */
-function operationSchemaEntries(model: ApiModel): ts.PropertyAssignment[] {
-  const entries: ts.PropertyAssignment[] = [];
+type OperationSchemaEntry = { name: string; request?: ts.Expression; response?: ts.Expression };
+
+function operationSchemaEntries(model: ApiModel, byName: SchemaByName): OperationSchemaEntry[] {
+  const entries: OperationSchemaEntry[] = [];
   for (const op of allOperations(model.services)) {
     if (isSseOp(op)) continue;
     const requestBody = op.requestBody;
     const request =
       requestBody && requestBody.contentType.toLowerCase().includes('json')
-        ? schemaToZodExpression(requestBody.schema)
+        ? schemaToZodExpression(requestBody.schema, byName)
         : undefined;
     const jsonResponse = op.successResponses.find((response) =>
       response.contentType.toLowerCase().includes('json')
     );
-    const response = jsonResponse ? schemaToZodExpression(jsonResponse.schema) : undefined;
+    const response = jsonResponse ? schemaToZodExpression(jsonResponse.schema, byName) : undefined;
     if (!request && !response) continue;
-    const props: ts.PropertyAssignment[] = [];
-    if (request) props.push(factory.createPropertyAssignment('request', request));
-    if (response) props.push(factory.createPropertyAssignment('response', response));
-    entries.push(
-      factory.createPropertyAssignment(op.name, factory.createObjectLiteralExpression(props, false))
-    );
+    entries.push({ name: op.name, request, response });
   }
   return entries;
 }
 
-function operationSchemasStatement(entries: ts.PropertyAssignment[]): ts.Statement {
+function operationSchemasStatement(entries: OperationSchemaEntry[]): ts.Statement {
+  const zodTypeNode = () =>
+    factory.createTypeReferenceNode(
+      factory.createQualifiedName(factory.createIdentifier('z'), 'ZodType')
+    );
+  // The explicit `z.ZodType` annotation keeps the declaration-emit size proportional to
+  // the operation count: the inferred type would serialize every schema's zod generics
+  // and overflow tsc's limit (TS7056) on large APIs under `declaration: true`.
+  const typeMembers = entries.map((entry) =>
+    factory.createPropertySignature(
+      undefined,
+      entry.name,
+      undefined,
+      factory.createTypeLiteralNode(
+        [
+          entry.request
+            ? factory.createPropertySignature(undefined, 'request', undefined, zodTypeNode())
+            : undefined,
+          entry.response
+            ? factory.createPropertySignature(undefined, 'response', undefined, zodTypeNode())
+            : undefined,
+        ].filter((member) => member !== undefined)
+      )
+    )
+  );
+  const valueEntries = entries.map((entry) =>
+    factory.createPropertyAssignment(
+      entry.name,
+      factory.createObjectLiteralExpression(
+        [
+          entry.request ? factory.createPropertyAssignment('request', entry.request) : undefined,
+          entry.response ? factory.createPropertyAssignment('response', entry.response) : undefined,
+        ].filter((property) => property !== undefined),
+        false
+      )
+    )
+  );
   return jsdoc(
     factory.createVariableStatement(
       [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
@@ -300,8 +386,8 @@ function operationSchemasStatement(entries: ts.PropertyAssignment[]): ts.Stateme
           factory.createVariableDeclaration(
             'operationSchemas',
             undefined,
-            undefined,
-            factory.createObjectLiteralExpression(entries, true)
+            factory.createTypeLiteralNode(typeMembers),
+            factory.createObjectLiteralExpression(valueEntries, true)
           ),
         ],
         ts.NodeFlags.Const
@@ -373,9 +459,13 @@ export function zodValidation(options: { request?: boolean; response?: boolean }
  * `''` when there is nothing to emit.
  */
 export function renderZodModule(model: ApiModel): string {
-  const entries = operationSchemaEntries(model);
+  const byName: SchemaByName = new Map(model.schemas.map((named) => [named.name, named.schema]));
+  const entries = operationSchemaEntries(model, byName);
   if (model.schemas.length === 0 && entries.length === 0) return '';
-  const statements: ts.Statement[] = [zodImport(), ...model.schemas.map(schemaConstStatement)];
+  const statements: ts.Statement[] = [
+    zodImport(),
+    ...model.schemas.map((named) => schemaConstStatement(named, byName)),
+  ];
   if (entries.length === 0) return printStatements(statements);
   statements.push(operationSchemasStatement(entries));
   return `${printStatements(statements)}\n${VALIDATION_SUPPORT}\n`;
diff --git a/tests/e2e/generate-client/examples/zod/src/api/client.zod.ts b/tests/e2e/generate-client/examples/zod/src/api/client.zod.ts
index 1f438ca1f9..be229a08eb 100644
--- a/tests/e2e/generate-client/examples/zod/src/api/client.zod.ts
+++ b/tests/e2e/generate-client/examples/zod/src/api/client.zod.ts
@@ -124,7 +124,38 @@ export const OrderNotificationSchema = z.object({
 /**
  * Request/response validators by operationId — powers `zodValidation`, or import one directly.
  */
-export const operationSchemas = {
+export const operationSchemas: {
+    listMenuItems: {
+        response: z.ZodType;
+    };
+    createMenuItem: {
+        response: z.ZodType;
+    };
+    listOrders: {
+        response: z.ZodType;
+    };
+    createOrder: {
+        request: z.ZodType;
+        response: z.ZodType;
+    };
+    getOrderById: {
+        response: z.ZodType;
+    };
+    updateOrder: {
+        request: z.ZodType;
+        response: z.ZodType;
+    };
+    listOrderItems: {
+        response: z.ZodType;
+    };
+    getRevenue: {
+        response: z.ZodType;
+    };
+    registerOAuth2Client: {
+        request: z.ZodType;
+        response: z.ZodType;
+    };
+} = {
     listMenuItems: { response: z.lazy(() => MenuItemListSchema) },
     createMenuItem: { response: z.lazy(() => MenuItemSchema) },
     listOrders: { response: z.lazy(() => OrderListSchema) },
diff --git a/tests/e2e/generate-client/zod.test.ts b/tests/e2e/generate-client/zod.test.ts
index b222fe5bd0..9879d9439c 100644
--- a/tests/e2e/generate-client/zod.test.ts
+++ b/tests/e2e/generate-client/zod.test.ts
@@ -115,11 +115,7 @@ describe('generate-client zod generator', () => {
                 content:
                   application/json:
                     schema:
-                      type: object
-                      required: [name, quantity]
-                      properties:
-                        name: { type: string }
-                        quantity: { type: integer, minimum: 1 }
+                      $ref: '#/components/schemas/OrderInput'
               responses:
                 '200':
                   description: ok
@@ -135,6 +131,22 @@ describe('generate-client zod generator', () => {
               operationId: health
               responses:
                 '204': { description: no content }
+        components:
+          schemas:
+            OrderBase:
+              type: object
+              properties:
+                id: { type: string, readOnly: true }
+            OrderInput:
+              # allOf with a readOnly field: the derived request schema must distribute
+              # the omission into the intersection members (ZodIntersection has no .omit).
+              allOf:
+                - $ref: '#/components/schemas/OrderBase'
+                - type: object
+                  required: [name, quantity]
+                  properties:
+                    name: { type: string }
+                    quantity: { type: integer, minimum: 1 }
       `
     );
     const generated = spawnSync(
@@ -236,6 +248,7 @@ describe('generate-client zod generator', () => {
           strict: true,
           skipLibCheck: true,
           types: [],
+          declaration: true,
         },
         include: ['client.ts', 'client.zod.ts', 'driver.ts'],
       }),

From 3bef8574fa68970e6089618bbba77a28a87c62a9 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <roman.marshevskyy@redoc.ly>
Date: Thu, 16 Jul 2026 12:20:44 +0300
Subject: [PATCH 109/134] Update docs/@v2/configuration/reference/client.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jacek Łękawa <164185257+JLekawa@users.noreply.github.com>
---
 docs/@v2/configuration/reference/client.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/@v2/configuration/reference/client.md b/docs/@v2/configuration/reference/client.md
index 52c7b726b6..41c1457071 100644
--- a/docs/@v2/configuration/reference/client.md
+++ b/docs/@v2/configuration/reference/client.md
@@ -2,7 +2,9 @@
 
 ## Introduction
 
-The [`generate-client`](../../commands/generate-client.md) command reads its settings from `redocly.yaml`: a top-level `client` block holds shared defaults, and each API under `apis:` supplies its input (`root`), an optional output (`clientOutput`), and any per-API overrides under `apis.<name>.client`.
+The [`generate-client`](../../commands/generate-client.md) command reads its settings from `redocly.yaml`.
+A top-level `client` block holds shared defaults.
+Each API under `apis:` supplies the command's input (`root`), an optional output (`clientOutput`), and any per-API overrides under `apis.<name>.client`.
 
 ```yaml
 # redocly.yaml

From cebc12206ac44111d32fe19c7dd2d632604a8e98 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <roman.marshevskyy@redoc.ly>
Date: Thu, 16 Jul 2026 12:20:56 +0300
Subject: [PATCH 110/134] Update docs/@v2/configuration/reference/client.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jacek Łękawa <164185257+JLekawa@users.noreply.github.com>
---
 docs/@v2/configuration/reference/client.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/@v2/configuration/reference/client.md b/docs/@v2/configuration/reference/client.md
index 41c1457071..050479afb1 100644
--- a/docs/@v2/configuration/reference/client.md
+++ b/docs/@v2/configuration/reference/client.md
@@ -37,7 +37,8 @@ The input and output are **not** part of a `client` block:
 
 ## Pagination
 
-`pagination` declares how the API paginates, so paginated operations gain typed `.pages()`/`.items()` async iterators (see [Pagination in the usage guide](../../guides/use-generated-client.md#pagination)). The block is an optional **convention rule** (the rule fields below, applied to every operation it structurally fits when `style` is set) plus per-operation `operations` overrides and an `exclude` list:
+`pagination` declares how the API paginates, so paginated operations gain typed `.pages()`/`.items()` async iterators (see [Pagination in the usage guide](../../guides/use-generated-client.md#pagination)).
+The block is an optional **convention rule** (the rule fields below, applied to every operation it structurally fits when `style` is set) plus per-operation `operations` overrides and an `exclude` list:
 
 ```yaml
 client:

From 1b7ce533bca875d544033ce8b6add0a9741fdd00 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <roman.marshevskyy@redoc.ly>
Date: Thu, 16 Jul 2026 12:21:07 +0300
Subject: [PATCH 111/134] Update docs/@v2/configuration/reference/client.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jacek Łękawa <164185257+JLekawa@users.noreply.github.com>
---
 docs/@v2/configuration/reference/client.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/@v2/configuration/reference/client.md b/docs/@v2/configuration/reference/client.md
index 050479afb1..325968874b 100644
--- a/docs/@v2/configuration/reference/client.md
+++ b/docs/@v2/configuration/reference/client.md
@@ -28,7 +28,9 @@ redocly generate-client --config ./config/redocly.yaml
 
 ## Options
 
-The same fields are accepted at the top level (shared defaults) and under `apis.<name>.client` (per-API overrides): `generators`, `argsStyle`, `serverUrl`, `outputMode` (`single` or `split`), `runtime`, `enumStyle`, `errorMode`, `dateType`, `queryFramework`, `mockData`, `mockSeed`, `setup`, and [`pagination`](#pagination). Each of the scalar fields mirrors the matching CLI flag — see the [command options](../../commands/generate-client.md#options) for what every field does; `pagination` is config-only (no flag).
+The same fields are accepted at the top level (shared defaults) and under `apis.<name>.client` (per-API overrides): `generators`, `argsStyle`, `serverUrl`, `outputMode` (`single` or `split`), `runtime`, `enumStyle`, `errorMode`, `dateType`, `queryFramework`, `mockData`, `mockSeed`, `setup`, and [`pagination`](#pagination).
+Each of the scalar fields mirrors the matching CLI flag — see the [command options](../../commands/generate-client.md#options) for what every field does.
+The `pagination` field is config-only (no flag).
 
 The input and output are **not** part of a `client` block:
 

From 8bca18f89f78ba888d40f6ed07167140a4da1a8a Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 16 Jul 2026 12:22:27 +0300
Subject: [PATCH 112/134] test(cli): prove shared generator defaults survive
 per-api client overrides

---
 packages/cli/src/commands/generate-client.ts     | 10 +++++++---
 tests/e2e/generate-client/redocly-config.test.ts |  6 ++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index 2e20b25e9a..60f32ea10c 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -120,7 +120,7 @@ export async function handleGenerateClient({
       api: path,
       aliasConfig,
       clientOutput: alias === undefined ? undefined : apisCfg[alias]?.clientOutput,
-      client: resolveSetup((isPlainObject(client) ? client : {}) as ClientConfig, configDir),
+      client: resolveSetup((i123sPlainObject(client) ? client : {}) as ClientConfig, configDir),
     };
   });
 
@@ -165,12 +165,16 @@ export async function handleGenerateClient({
         configDir,
       });
       const fileCount = `${result.files.length} ${pluralize('file', result.files.length)}`;
-      const summary = `TypeScript client successfully generated: ${fileCount} (${result.bytes} bytes) at ${yellow(result.outputPath)}.`;
+      const summary = `TypeScript client successfully generated: ${fileCount} (${
+        result.bytes
+      } bytes) at ${yellow(result.outputPath)}.`;
       logger.info('\n' + blue(summary) + '\n');
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       throw new HandledError(
-        `\n❌  Failed to generate TypeScript client${job.name ? ` for ${job.name}` : ''}.\n   ${message}\n`
+        `\n❌  Failed to generate TypeScript client${
+          job.name ? ` for ${job.name}` : ''
+        }.\n   ${message}\n`
       );
     }
   }
diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
index 33c8f140f0..247de6a5a2 100644
--- a/tests/e2e/generate-client/redocly-config.test.ts
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -125,9 +125,9 @@ describe('generate-client redocly.yaml config', () => {
     const dir = project(
       [
         'client:',
-        '  generators: [sdk]',
+        '  generators: [sdk, zod]', // shared defaults that must survive the per-api override
         '  serverUrl: https://top-level.example.com',
-        '  pagination:', // a shared default that must survive the per-api override
+        '  pagination:',
         '    style: cursor',
         '    cursorParam: after',
         '    nextCursor: /page/endCursor',
@@ -148,6 +148,8 @@ describe('generate-client redocly.yaml config', () => {
     const matchedOut = readFileSync(join(dir, 'matched.ts'), 'utf-8');
     expect(matchedOut).toContain('serverUrl: "https://per-api.example.com"');
     expect(matchedOut).toContain('pagination: {'); // top-level convention kept, field by field
+    // The shared `generators` default kept too: the zod module is emitted alongside.
+    expect(existsSync(join(dir, 'matched.zod.ts'))).toBe(true);
 
     const unmatched = run(dir, ['./standalone.yaml', '--output', './unmatched.ts']);
     expect(unmatched.status, unmatched.stderr).toBe(0);

From fae2394d7012d0cd89b5aa06c71849e17d265548 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Thu, 16 Jul 2026 12:27:57 +0300
Subject: [PATCH 113/134] refactor(client-generator): match apiKey scheme kinds
 exactly

---
 packages/cli/src/commands/generate-client.ts   | 2 +-
 packages/client-generator/src/emitters/auth.ts | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index 60f32ea10c..54a1542f79 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -120,7 +120,7 @@ export async function handleGenerateClient({
       api: path,
       aliasConfig,
       clientOutput: alias === undefined ? undefined : apisCfg[alias]?.clientOutput,
-      client: resolveSetup((i123sPlainObject(client) ? client : {}) as ClientConfig, configDir),
+      client: resolveSetup((isPlainObject(client) ? client : {}) as ClientConfig, configDir),
     };
   });
 
diff --git a/packages/client-generator/src/emitters/auth.ts b/packages/client-generator/src/emitters/auth.ts
index 8177306e50..483dc7a6f4 100644
--- a/packages/client-generator/src/emitters/auth.ts
+++ b/packages/client-generator/src/emitters/auth.ts
@@ -23,7 +23,9 @@ export function authSetterNames(schemes: SecuritySchemeModel[]): string[] {
   const names: string[] = [];
   if (schemes.some((s) => s.kind === 'bearer')) names.push('setBearer');
   if (schemes.some((s) => s.kind === 'basic')) names.push('setBasicAuth');
-  const apiKeySchemes = schemes.filter((s) => s.kind.startsWith('apiKey'));
+  const apiKeySchemes = schemes.filter(
+    (s) => s.kind === 'apiKeyHeader' || s.kind === 'apiKeyQuery' || s.kind === 'apiKeyCookie'
+  );
   for (const scheme of apiKeySchemes) {
     names.push(apiKeySetterName(scheme.key, apiKeySchemes.length === 1));
   }

From 238612bc76654e2c743ee88a743fe973e4c0a2f9 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Fri, 17 Jul 2026 13:48:21 +0300
Subject: [PATCH 114/134] test(client-generator): share the example spec,
 gitignore generated clients, and type-check examples in CI

---
 .github/workflows/tests.yaml                  |   18 +
 package-lock.json                             |    8 +-
 package.json                                  |    2 +
 .../scripts/regenerate-examples.mjs           |   28 +-
 .../scripts/typecheck-examples.mjs            |   25 +-
 tests/e2e/generate-client/examples.test.ts    |   54 +-
 tests/e2e/generate-client/examples/README.md  |   17 +-
 .../openapi.yaml => _shared/cafe.yaml}        |    0
 .../examples/baked-setup/.gitignore           |    2 +
 .../examples/baked-setup/README.md            |    2 +-
 .../examples/baked-setup/redocly.yaml         |    2 +-
 .../examples/baked-setup/src/api/client.ts    | 1998 ----------
 .../configure-and-middleware/.gitignore       |    2 +
 .../configure-and-middleware/README.md        |    4 +-
 .../src/api/client.ts                         | 1173 ------
 .../examples/custom-generator/.gitignore      |    2 +
 .../examples/custom-generator/openapi.yaml    | 1163 ------
 .../examples/custom-generator/redocly.yaml    |    2 +-
 .../custom-generator/src/api/client.routes.ts |   15 -
 .../custom-generator/src/api/client.ts        | 1968 ---------
 .../examples/custom-pagination/.gitignore     |    2 +
 .../custom-pagination/src/api/client.ts       | 1015 -----
 .../examples/customization/.gitignore         |    2 +
 .../examples/customization/README.md          |    3 +-
 .../examples/customization/openapi.yaml       | 1163 ------
 .../examples/customization/redocly.yaml       |    2 +-
 .../examples/customization/src/api/client.ts  | 1968 ---------
 .../examples/fetch-functions/.gitignore       |    2 +
 .../examples/fetch-functions/README.md        |    4 +-
 .../examples/fetch-functions/openapi.yaml     | 1163 ------
 .../examples/fetch-functions/redocly.yaml     |    2 +-
 .../fetch-functions/src/api/client.ts         | 1968 ---------
 .../generate-client/examples/mock/.gitignore  |    2 +
 .../generate-client/examples/mock/README.md   |    5 +-
 .../examples/mock/openapi.yaml                | 1163 ------
 .../examples/mock/package-lock.json           | 1686 --------
 .../examples/mock/redocly.yaml                |    2 +-
 .../examples/mock/src/api/client.mocks.ts     |  442 ---
 .../examples/mock/src/api/client.ts           | 1968 ---------
 .../examples/multi-instance/.gitignore        |    2 +
 .../examples/multi-instance/README.md         |    5 +-
 .../examples/multi-instance/src/api/client.ts |   86 -
 .../examples/nested-facade/.gitignore         |    2 +
 .../nested-facade/src/api/client.facade.ts    |    7 -
 .../examples/nested-facade/src/api/client.ts  | 1017 -----
 .../examples/package-runtime/.gitignore       |    2 +
 .../examples/package-runtime/README.md        |    4 +-
 .../examples/package-runtime/openapi.yaml     | 1163 ------
 .../examples/package-runtime/redocly.yaml     |    2 +-
 .../package-runtime/src/api/client.ts         |  967 -----
 .../examples/pagination/.gitignore            |    2 +
 .../examples/pagination/README.md             |    4 +-
 .../examples/pagination/src/api/client.ts     | 1139 ------
 .../examples/programmatic/.gitignore          |    2 +
 .../examples/programmatic/README.md           |    2 +-
 .../examples/programmatic/generate.ts         |    2 +-
 .../examples/programmatic/openapi.yaml        | 1163 ------
 .../examples/programmatic/package-lock.json   |  809 ----
 .../examples/programmatic/src/api/client.ts   | 1968 ---------
 .../examples/sse-streaming/.gitignore         |    2 +
 .../examples/sse-streaming/README.md          |    4 +-
 .../examples/sse-streaming/src/api/client.ts  | 1166 ------
 .../examples/tanstack-query/.gitignore        |    2 +
 .../examples/tanstack-query/README.md         |    5 +-
 .../examples/tanstack-query/openapi.yaml      | 1163 ------
 .../examples/tanstack-query/package-lock.json | 1814 ---------
 .../examples/tanstack-query/redocly.yaml      |    2 +-
 .../tanstack-query/src/api/client.tanstack.ts |   78 -
 .../examples/tanstack-query/src/api/client.ts | 1968 ---------
 .../examples/vendored-edge/.gitignore         |    2 +
 .../examples/vendored-edge/README.md          |    1 +
 .../examples/vendored-edge/src/api/client.ts  | 1056 -----
 .../zero-install-quickstart/.gitignore        |    1 +
 .../generate-client/examples/zod/.gitignore   |    2 +
 .../generate-client/examples/zod/README.md    |    5 +-
 .../generate-client/examples/zod/openapi.yaml | 1163 ------
 .../examples/zod/package-lock.json            | 3515 -----------------
 .../generate-client/examples/zod/redocly.yaml |    2 +-
 .../examples/zod/src/api/client.ts            | 1968 ---------
 .../examples/zod/src/api/client.zod.ts        |  222 --
 80 files changed, 137 insertions(+), 41399 deletions(-)
 rename tests/e2e/generate-client/examples/{baked-setup/openapi.yaml => _shared/cafe.yaml} (100%)
 delete mode 100644 tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
 delete mode 100644 tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
 delete mode 100644 tests/e2e/generate-client/examples/custom-generator/openapi.yaml
 delete mode 100644 tests/e2e/generate-client/examples/custom-generator/src/api/client.routes.ts
 delete mode 100644 tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
 delete mode 100644 tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
 delete mode 100644 tests/e2e/generate-client/examples/customization/openapi.yaml
 delete mode 100644 tests/e2e/generate-client/examples/customization/src/api/client.ts
 delete mode 100644 tests/e2e/generate-client/examples/fetch-functions/openapi.yaml
 delete mode 100644 tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
 delete mode 100644 tests/e2e/generate-client/examples/mock/openapi.yaml
 delete mode 100644 tests/e2e/generate-client/examples/mock/package-lock.json
 delete mode 100644 tests/e2e/generate-client/examples/mock/src/api/client.mocks.ts
 delete mode 100644 tests/e2e/generate-client/examples/mock/src/api/client.ts
 delete mode 100644 tests/e2e/generate-client/examples/multi-instance/src/api/client.ts
 create mode 100644 tests/e2e/generate-client/examples/nested-facade/.gitignore
 delete mode 100644 tests/e2e/generate-client/examples/nested-facade/src/api/client.facade.ts
 delete mode 100644 tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
 delete mode 100644 tests/e2e/generate-client/examples/package-runtime/openapi.yaml
 delete mode 100644 tests/e2e/generate-client/examples/package-runtime/src/api/client.ts
 delete mode 100644 tests/e2e/generate-client/examples/pagination/src/api/client.ts
 delete mode 100644 tests/e2e/generate-client/examples/programmatic/openapi.yaml
 delete mode 100644 tests/e2e/generate-client/examples/programmatic/package-lock.json
 delete mode 100644 tests/e2e/generate-client/examples/programmatic/src/api/client.ts
 delete mode 100644 tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
 delete mode 100644 tests/e2e/generate-client/examples/tanstack-query/openapi.yaml
 delete mode 100644 tests/e2e/generate-client/examples/tanstack-query/package-lock.json
 delete mode 100644 tests/e2e/generate-client/examples/tanstack-query/src/api/client.tanstack.ts
 delete mode 100644 tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
 delete mode 100644 tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
 delete mode 100644 tests/e2e/generate-client/examples/zod/openapi.yaml
 delete mode 100644 tests/e2e/generate-client/examples/zod/package-lock.json
 delete mode 100644 tests/e2e/generate-client/examples/zod/src/api/client.ts
 delete mode 100644 tests/e2e/generate-client/examples/zod/src/api/client.zod.ts

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index a235a6abb2..0329d16e68 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -53,6 +53,24 @@ jobs:
       - name: E2E Tests (shard ${{ matrix.shard }}/2)
         run: npm run e2e -- --shard=${{ matrix.shard }}/2
 
+  examples:
+    # The examples gitignore their generated clients (only zero-install-quickstart commits
+    # its canonical copy), so this job regenerates every client and type-checks the
+    # hand-written consumer code against it.
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+        with:
+          node-version: 24
+          cache: npm
+      - name: Install dependencies
+        run: npm ci
+      - name: Regenerate example clients
+        run: npm run examples:regen -w @redocly/client-generator
+      - name: Type-check examples
+        run: npm run typecheck:examples -w @redocly/client-generator
+
   code-style-check:
     runs-on: ubuntu-latest
     steps:
diff --git a/package-lock.json b/package-lock.json
index 07165508d9..257e87399b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,6 +18,8 @@
         "@tanstack/react-query": "^5.0.0",
         "@testing-library/react": "^16.0.0",
         "@types/node": "^22.15.3",
+        "@types/react": "^19.2.17",
+        "@types/react-dom": "^19.2.3",
         "@vitest/coverage-istanbul": "^4.1.8",
         "husky": "^9.1.7",
         "jsdom": "^27.2.0",
@@ -3618,9 +3620,9 @@
       "dev": true
     },
     "node_modules/@types/react": {
-      "version": "19.2.16",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.16.tgz",
-      "integrity": "sha512-esJiCAnl0kfpNdE69f3So4WJUXy95dLZydX0KwK46riIHDzHM7O9Vtf9xCHW0PXIqvgqNrswl522kA/5yx+F4w==",
+      "version": "19.2.17",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.17.tgz",
+      "integrity": "sha512-MXfmqaVPEVgkBT/aY0aGCkRWWtByiYQXo3xdQ8r5RzuFrPiRn8Gar2tQdXSUQ2GKV3bkXckek89V8wQBY2Q/Aw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 9f314c7671..2d29f921af 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,8 @@
     "@tanstack/react-query": "^5.0.0",
     "@testing-library/react": "^16.0.0",
     "@types/node": "^22.15.3",
+    "@types/react": "^19.2.17",
+    "@types/react-dom": "^19.2.3",
     "@vitest/coverage-istanbul": "^4.1.8",
     "husky": "^9.1.7",
     "jsdom": "^27.2.0",
diff --git a/packages/client-generator/scripts/regenerate-examples.mjs b/packages/client-generator/scripts/regenerate-examples.mjs
index 3cbc8567b7..9b7a1f42f9 100644
--- a/packages/client-generator/scripts/regenerate-examples.mjs
+++ b/packages/client-generator/scripts/regenerate-examples.mjs
@@ -1,5 +1,5 @@
 import { spawnSync } from 'node:child_process';
-import { existsSync } from 'node:fs';
+import { existsSync, readdirSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -10,28 +10,14 @@ const pkgRoot = join(dirname(fileURLToPath(import.meta.url)), '..');
 const repoRoot = join(pkgRoot, '..', '..');
 const cli = join(repoRoot, 'packages/cli/lib/index.js');
 const tsx = join(repoRoot, 'node_modules/.bin/tsx');
-const examples = [
-  'fetch-functions',
-  'customization',
-  'baked-setup',
-  'zod',
-  'mock',
-  'custom-generator',
-  'nested-facade',
-  'tanstack-query',
-  'programmatic',
-  'package-runtime',
-  'zero-install-quickstart',
-  'configure-and-middleware',
-  'multi-instance',
-  'sse-streaming',
-  'vendored-edge',
-  'pagination',
-  'custom-pagination',
-];
+const examplesDir = join(repoRoot, 'tests/e2e/generate-client/examples');
+const examples = readdirSync(examplesDir, { withFileTypes: true })
+  .filter((entry) => entry.isDirectory() && entry.name !== '_shared')
+  .map((entry) => entry.name)
+  .sort();
 
 for (const name of examples) {
-  const cwd = join(repoRoot, 'tests/e2e/generate-client/examples', name);
+  const cwd = join(examplesDir, name);
   const res = existsSync(join(cwd, 'redocly.yaml'))
     ? spawnSync('node', [cli, 'generate-client'], { cwd, stdio: 'inherit' })
     : spawnSync(tsx, [join(cwd, 'generate.ts')], { cwd, stdio: 'inherit' });
diff --git a/packages/client-generator/scripts/typecheck-examples.mjs b/packages/client-generator/scripts/typecheck-examples.mjs
index 352bd563a1..f2dc49f12f 100644
--- a/packages/client-generator/scripts/typecheck-examples.mjs
+++ b/packages/client-generator/scripts/typecheck-examples.mjs
@@ -1,4 +1,5 @@
 import { spawnSync } from 'node:child_process';
+import { readdirSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
@@ -6,29 +7,15 @@ import { fileURLToPath } from 'node:url';
 // root `npm run typecheck` is a single Node-targeted pass and excludes `examples/`
 // (they are Vite/React apps needing DOM + JSX + bundler resolution), so they are
 // verified here instead — same rigor, the right compiler options per project.
+// Run `examples:regen` first: the gitignored clients must exist to type-check against.
 const pkgRoot = join(dirname(fileURLToPath(import.meta.url)), '..');
 const repoRoot = join(pkgRoot, '..', '..');
 const tsc = join(repoRoot, 'node_modules/.bin/tsc');
 const examplesDir = join(repoRoot, 'tests/e2e/generate-client/examples');
-const examples = [
-  'fetch-functions',
-  'customization',
-  'baked-setup',
-  'zod',
-  'tanstack-query',
-  'programmatic',
-  'mock',
-  'custom-generator',
-  'nested-facade',
-  'package-runtime',
-  'zero-install-quickstart',
-  'configure-and-middleware',
-  'multi-instance',
-  'sse-streaming',
-  'vendored-edge',
-  'pagination',
-  'custom-pagination',
-];
+const examples = readdirSync(examplesDir, { withFileTypes: true })
+  .filter((entry) => entry.isDirectory() && entry.name !== '_shared')
+  .map((entry) => entry.name)
+  .sort();
 
 let failed = false;
 for (const name of examples) {
diff --git a/tests/e2e/generate-client/examples.test.ts b/tests/e2e/generate-client/examples.test.ts
index d9b81c7f2b..62aaca272e 100644
--- a/tests/e2e/generate-client/examples.test.ts
+++ b/tests/e2e/generate-client/examples.test.ts
@@ -10,24 +10,17 @@ const cli = join(repoRoot, 'packages/cli/lib/index.js');
 const tsx = join(repoRoot, 'node_modules/.bin/tsx');
 const examplesDir = join(__dirname, 'examples');
 
-const EXAMPLES = [
-  'fetch-functions',
-  'customization',
-  'baked-setup',
-  'zod',
-  'mock',
-  'tanstack-query',
-  'programmatic',
-  'package-runtime',
-  'zero-install-quickstart',
-  'configure-and-middleware',
-  'multi-instance',
-  'sse-streaming',
-  'vendored-edge',
-  'pagination',
-  'custom-pagination',
-  'nested-facade',
-];
+// Every directory under examples/ is an example; `_shared` holds the spec they have in common.
+const EXAMPLES = readdirSync(examplesDir, { withFileTypes: true })
+  .filter((entry) => entry.isDirectory() && entry.name !== '_shared')
+  .map((entry) => entry.name)
+  .sort();
+
+// The one example whose generated client stays committed (its README sells the single
+// self-contained file); it doubles as the drift baseline for the generator's output.
+// The other examples gitignore `src/api/` — CI regenerates and type-checks them via
+// `examples:regen` + `typecheck:examples` in @redocly/client-generator.
+const COMMITTED = 'zero-install-quickstart';
 
 /**
  * Regenerate an example's client into `outFile`. A `redocly.yaml` example is generated by
@@ -63,25 +56,26 @@ function listFiles(dir: string, base = dir): string[] {
   return out;
 }
 
-describe('examples are in sync with the generator', () => {
+describe('examples generate with the current generator', () => {
   for (const name of EXAMPLES) {
-    it(`${name}: committed src/api matches a fresh local generation`, () => {
+    it(`${name}: generation succeeds`, () => {
       const exampleDir = join(examplesDir, name);
-      const committed = join(exampleDir, 'src/api');
       const tmp = mkdtempSync(join(tmpdir(), `ex-${name}-`));
       try {
-        // Regenerate to a temp dir so the committed client isn't touched.
         const res = regenerate(exampleDir, name, join(tmp, 'client.ts'));
         expect(res.status, res.stderr).toBe(0);
+        expect(listFiles(tmp).length).toBeGreaterThan(0);
 
-        const committedFiles = listFiles(committed).sort();
-        const freshFiles = listFiles(tmp).sort();
-        expect(freshFiles, `file set differs for ${name}`).toEqual(committedFiles);
-        for (const rel of committedFiles) {
-          expect(
-            readFileSync(join(tmp, rel), 'utf-8'),
-            `${name}/src/api/${rel} is stale — run \`npm run examples:regen -w @redocly/client-generator\``
-          ).toBe(readFileSync(join(committed, rel), 'utf-8'));
+        if (name === COMMITTED) {
+          const committed = join(exampleDir, 'src/api');
+          const committedFiles = listFiles(committed).sort();
+          expect(listFiles(tmp).sort(), `file set differs for ${name}`).toEqual(committedFiles);
+          for (const rel of committedFiles) {
+            expect(
+              readFileSync(join(tmp, rel), 'utf-8'),
+              `${name}/src/api/${rel} is stale — run \`npm run examples:regen -w @redocly/client-generator\``
+            ).toBe(readFileSync(join(committed, rel), 'utf-8'));
+          }
         }
       } finally {
         rmSync(tmp, { recursive: true, force: true });
diff --git a/tests/e2e/generate-client/examples/README.md b/tests/e2e/generate-client/examples/README.md
index 4493123977..aa357d413e 100644
--- a/tests/e2e/generate-client/examples/README.md
+++ b/tests/e2e/generate-client/examples/README.md
@@ -1,10 +1,10 @@
 # Examples
 
-Runnable examples of clients generated by `@redocly/client-generator`. Each is standalone with its
-own dependencies; the generated client under `src/api/` is checked in and **drift-checked against the
-generator in CI** (`tests/e2e/generate-client/examples.test.ts`). Most are Vite apps that _consume_ a client
-generated via the `redocly generate-client` CLI (a `redocly.yaml`); `programmatic` _generates_ one with
-the `generateClient(...)` API.
+Runnable examples of clients generated by `@redocly/client-generator`.
+Most are Vite apps that _consume_ a client generated via the `redocly generate-client` CLI (a `redocly.yaml`); `programmatic` _generates_ one with the `generateClient(...)` API.
+Nine examples share the cafe spec in [`_shared/cafe.yaml`](./_shared/cafe.yaml); the rest carry their own.
+
+The generated client under `src/api/` is gitignored — CI regenerates every client and type-checks the consumer code against it (the `examples` job), and `zero-install-quickstart` keeps its client committed as the canonical browsable copy, drift-checked in `tests/e2e/generate-client/examples.test.ts`.
 
 | Example                                                | How it's generated             | Shows                                                                                                                                     |
 | ------------------------------------------------------ | ------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------- |
@@ -23,16 +23,19 @@ the `generateClient(...)` API.
 | [vendored-edge](./vendored-edge)                       | CLI · `sdk`                    | the generated file copied into a no-npm edge worker (`export default { fetch }`); `typescript` is the only dev tool                       |
 | [pagination](./pagination)                             | CLI · `sdk`                    | auto-pagination from a `client.pagination` convention: `for await` over `.items()`/`.pages()` next to the unchanged one-shot call         |
 | [custom-pagination](./custom-pagination)               | CLI · `sdk`                    | hand-written paging over the typed client for shapes the built-in styles don't cover (body cursors)                                       |
+| [custom-generator](./custom-generator)                 | CLI · `sdk` + custom generator | a local `generators` plugin emitting a `<operationId>: 'METHOD /path'` route map next to the sdk                                          |
 | [nested-facade](./nested-facade)                       | CLI · `sdk` + custom generator | `api.<resource>.<operation>` facade derived from the spec's tags by a plugin — regenerates with the spec                                  |
 
 ## Run one
 
 ```bash
+# from the repo root: generate the gitignored clients first
+npm run examples:regen -w @redocly/client-generator
+
 cd tests/e2e/generate-client/examples/<name>
 npm install
 npm run dev        # the Vite apps; `programmatic` uses `npm run generate`,
                    # `zero-install-quickstart` `npm start`, `vendored-edge` `npm run typecheck`
 ```
 
-To regenerate every example's client from the local generator, from the repo root:
-`npm run examples:regen -w @redocly/client-generator`.
+Each example can also regenerate just its own client with `npm run generate` inside its directory.
diff --git a/tests/e2e/generate-client/examples/baked-setup/openapi.yaml b/tests/e2e/generate-client/examples/_shared/cafe.yaml
similarity index 100%
rename from tests/e2e/generate-client/examples/baked-setup/openapi.yaml
rename to tests/e2e/generate-client/examples/_shared/cafe.yaml
diff --git a/tests/e2e/generate-client/examples/baked-setup/.gitignore b/tests/e2e/generate-client/examples/baked-setup/.gitignore
index f06235c460..6eb23affb8 100644
--- a/tests/e2e/generate-client/examples/baked-setup/.gitignore
+++ b/tests/e2e/generate-client/examples/baked-setup/.gitignore
@@ -1,2 +1,4 @@
 node_modules
 dist
+src/api/
+package-lock.json
diff --git a/tests/e2e/generate-client/examples/baked-setup/README.md b/tests/e2e/generate-client/examples/baked-setup/README.md
index c9869f0a59..e137554766 100644
--- a/tests/e2e/generate-client/examples/baked-setup/README.md
+++ b/tests/e2e/generate-client/examples/baked-setup/README.md
@@ -25,7 +25,7 @@ setup.middleware![0].onRequest!(ctx as never);
 // ctx.headers['X-Idempotency-Key'] is now set; ctx.headers['X-Cafe-SDK'] === '1.0.0'
 ```
 
-The generated client under `src/api/` is checked in and drift-checked in CI.
+The generated client under `src/api/` is gitignored; CI regenerates it and type-checks this example.
 
 ## Run
 
diff --git a/tests/e2e/generate-client/examples/baked-setup/redocly.yaml b/tests/e2e/generate-client/examples/baked-setup/redocly.yaml
index 9ff1fc402e..91dd1bc792 100644
--- a/tests/e2e/generate-client/examples/baked-setup/redocly.yaml
+++ b/tests/e2e/generate-client/examples/baked-setup/redocly.yaml
@@ -3,7 +3,7 @@
 # (run `redocly generate-client` with no args to build every such api).
 apis:
   baked-setup:
-    root: ./openapi.yaml
+    root: ../_shared/cafe.yaml
     clientOutput: ./src/api/client.ts
     client:
       generators:
diff --git a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts b/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
deleted file mode 100644
index ebb28f1e59..0000000000
--- a/tests/e2e/generate-client/examples/baked-setup/src/api/client.ts
+++ /dev/null
@@ -1,1998 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Redocly Cafe (v1.0.0)
- * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
- * Create API credentials and try it yourself in a realistic OpenAPI workflow.
- * 
- */
-
-export type Page = {
-    /**
-     * Use with the `after` query parameter to load the next page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    endCursor: string | null;
-    /**
-     * Use with the `before` query parameter to load the previous page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    startCursor: string | null;
-    /**
-     * Indicates if there is a next page with items.
-     */
-    hasNextPage: boolean;
-    /**
-     * Indicates if there is a previous page with items.
-     */
-    hasPrevPage: boolean;
-    /**
-     * Value showing how many items are in the page limit.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit: number;
-    /**
-     * Count of items across all pages.
-     * @minimum 0
-     */
-    total: number;
-};
-
-export type MenuBaseItem = {
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt: string;
-    /**
-     * Menu item ID. Unique identifier prefixed with `prd_`.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    readonly id: string;
-    /**
-     * Entity name.
-     */
-    readonly object: "menuItem";
-    /**
-     * Menu item name.
-     * @minLength 1
-     * @maxLength 50
-     */
-    name: string;
-    /**
-     * Price in cents.
-     * @minimum 0
-     */
-    price: number;
-    /**
-     * Photo of the menu item. Must be a PNG image and less than 1MB.
-     * @format binary
-     */
-    photo?: Blob | null;
-    /**
-     * Photo URL of the menu item.
-     * @format uri
-     */
-    readonly photoUrl?: string;
-    photoTextDescription?: string | null;
-};
-
-export type Beverage = {
-    /**
-     * Menu item category.
-     */
-    category: "beverage";
-    /**
-     * Size of the beverage in milliliters.
-     * @exclusiveMinimum 0
-     */
-    volume: number;
-    /**
-     * Indicates if the beverage contains caffeine.
-     */
-    containsCaffeine: boolean;
-} & MenuBaseItem;
-
-export type Dessert = {
-    /**
-     * Menu item category.
-     */
-    category: "dessert";
-    /**
-     * Amount of calories.
-     * @exclusiveMinimum 0
-     */
-    calories: number;
-} & MenuBaseItem;
-
-export type MenuItem = Beverage | Dessert;
-
-export type MenuItemList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: MenuItem[];
-};
-
-export type Error = {
-    /**
-     * URI reference that identifies the problem type.
-     * @format uri-reference
-     */
-    type: string;
-    /**
-     * Short summary of the problem type.
-     */
-    title: string;
-    /**
-     * HTTP status code generated by the origin server for this occurrence of the problem.
-     * @minimum 100
-     * @exclusiveMaximum 600
-     * @format int32
-     */
-    status: number;
-    /**
-     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-     * May be used to locate the root of this problem in the source code.
-     * @format uri-reference
-     */
-    instance?: string;
-    /**
-     * Additional error details.
-     */
-    details?: Record<string, unknown>;
-};
-
-/**
- * Order status.
- */
-export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
-
-export const OrderStatus = {
-    placed: "placed",
-    preparing: "preparing",
-    completed: "completed",
-    canceled: "canceled"
-} as const;
-
-export type Order = {
-    /**
-     * Order ID. Unique identifier prefixed with `ord_`.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     * @format ulid
-     */
-    readonly id?: string;
-    /**
-     * Entity name.
-     */
-    readonly object?: "order";
-    /**
-     * Name of the customer who placed the order.
-     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-     * @minLength 1
-     * @maxLength 100
-     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-     */
-    customerName: string;
-    readonly status?: OrderStatus;
-    /**
-     * Total order price in cents.
-     * @minimum 0
-     */
-    readonly totalPrice?: number;
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt?: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt?: string;
-    /**
-     * List of items to include in the order.
-     * @minItems 1
-     */
-    orderItems: {
-        /**
-         * ID of the menu item to add to the order.
-         * @format ulid
-         */
-        menuItemId: string;
-        /**
-         * Quantity of the menu item.
-         * @minimum 1
-         */
-        quantity: number;
-        /**
-         * Discount amount in cents (absolute value).
-         * @minimum 0
-         */
-        discount?: number;
-        /**
-         * Optional comment for the order item (e.g., "No sugar").
-         * @maxLength 500
-         */
-        comment?: string;
-    }[];
-};
-
-export type OrderList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: Order[];
-};
-
-export type OrderItem = {
-    /**
-     * ID of the menu item to add to the order.
-     */
-    menuItemId: string;
-    /**
-     * Menu item that is part of the order.
-     */
-    readonly menuItem?: MenuItem;
-    /**
-     * Quantity of the menu item.
-     * @minimum 1
-     */
-    quantity: number;
-    /**
-     * Discount amount in cents (absolute value).
-     * @minimum 0
-     */
-    discount?: number;
-    /**
-     * Optional comment for the order item (e.g., "No sugar").
-     * @maxLength 500
-     */
-    comment?: string;
-};
-
-/**
- * Revenue statistics for a given date range.
- */
-export type RevenueStatistics = {
-    /**
-     * Total revenue in cents from completed orders.
-     * @minimum 0
-     * @format float
-     */
-    revenue: number;
-    /**
-     * Average order amount in cents (calculated from completed orders only).
-     * @minimum 0
-     * @format float
-     */
-    averageOrderAmount: number;
-    /**
-     * Total number of orders (all statuses) in the date range.
-     * @minimum 0
-     */
-    totalOrders: number;
-    /**
-     * Number of placed orders.
-     * @minimum 0
-     */
-    placedOrders: number;
-    /**
-     * Number of preparing orders.
-     * @minimum 0
-     */
-    preparingOrders: number;
-    /**
-     * Number of completed orders.
-     * @minimum 0
-     */
-    completedOrders: number;
-    /**
-     * Number of canceled orders.
-     * @minimum 0
-     */
-    canceledOrders: number;
-    /**
-     * Start date of the revenue calculation period.
-     * @format date
-     */
-    startDate: string;
-    /**
-     * End date of the revenue calculation period.
-     * @format date
-     */
-    endDate: string;
-};
-
-export type RegisterClientObject = {
-    /**
-     * Client name.
-     */
-    name: string;
-    /**
-     * List of redirect URIs (optional, defaults to empty array).
-     */
-    redirectUris?: string[];
-    /**
-     * List of scopes.
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types.
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-/**
- * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
- */
-export type OAuth2Client = {
-    /**
-     * Client identifier issued by the authorization server.
-     */
-    clientId: string;
-    /**
-     * Client secret issued by the authorization server.
-     */
-    clientSecret: string;
-    /**
-     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-     * @format int64
-     */
-    clientIdIssuedAt: number;
-    /**
-     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-     * @format int64
-     */
-    clientSecretExpiresAt: number;
-    /**
-     * Client name (registered metadata).
-     */
-    name?: string;
-    /**
-     * List of redirect URIs (registered metadata).
-     */
-    redirectUris?: string[];
-    /**
-     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
-     * @format uri
-     */
-    registrationClientUri: string;
-    /**
-     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-     */
-    registrationAccessToken: string;
-    /**
-     * List of scopes (registered metadata).
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types (registered metadata).
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-export type OrderNotification = {
-    /**
-     * Unique order identifier.
-     */
-    orderId: string;
-    orderStatus: OrderStatus;
-    /**
-     * When the event occurred.
-     * @format date-time
-     */
-    timestamp: string;
-};
-
-/**
- * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
- */
-export function isBeverage(value: MenuItem): value is Beverage {
-    return (value as Record<string, unknown>)["category"] === "beverage";
-}
-
-/**
- * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
- */
-export function isDessert(value: MenuItem): value is Dessert {
-    return (value as Record<string, unknown>)["category"] === "dessert";
-}
-
-export type ListMenuItemsResult = MenuItemList;
-
-export type ListMenuItemsParams = {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-};
-
-export type ListMenuItemsVariables = {
-    params?: ListMenuItemsParams;
-};
-
-export type CreateMenuItemResult = MenuItem;
-
-export type CreateMenuItemBody = FormData;
-
-export type CreateMenuItemVariables = {
-    body: CreateMenuItemBody;
-};
-
-export type DeleteMenuItemResult = void;
-
-export type DeleteMenuItemVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-};
-
-export type GetMenuItemPhotoResult = Blob | string;
-
-export type GetMenuItemPhotoParams = {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-};
-
-export type GetMenuItemPhotoVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-    params?: GetMenuItemPhotoParams;
-};
-
-export type ListOrdersResult = OrderList;
-
-export type ListOrdersParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-};
-
-export type ListOrdersVariables = {
-    params?: ListOrdersParams;
-};
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    headers?: GetOrderByIdHeaders;
-};
-
-export type DeleteOrderResult = void;
-
-export type DeleteOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-};
-
-export type UpdateOrderResult = Order;
-
-export type UpdateOrderBody = {
-    status: OrderStatus;
-};
-
-export type UpdateOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    body?: UpdateOrderBody;
-};
-
-export type ListOrderItemsResult = OrderItem[];
-
-export type ListOrderItemsParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-};
-
-export type ListOrderItemsVariables = {
-    params?: ListOrderItemsParams;
-};
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    listMenuItems: {
-        args: {
-            params?: ListMenuItemsParams;
-        };
-        result: ListMenuItemsResult;
-    };
-    createMenuItem: {
-        args: {
-            body: CreateMenuItemBody;
-        };
-        result: CreateMenuItemResult;
-    };
-    deleteMenuItem: {
-        args: {
-            /**
-             * ID of the menu item to retrieve.
-             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            menuItemId: string;
-        };
-        result: DeleteMenuItemResult;
-    };
-    getMenuItemPhoto: {
-        args: {
-            /**
-             * ID of the menu item to retrieve.
-             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            menuItemId: string;
-            params?: GetMenuItemPhotoParams;
-        };
-        result: GetMenuItemPhotoResult;
-    };
-    listOrders: {
-        args: {
-            params?: ListOrdersParams;
-        };
-        result: ListOrdersResult;
-    };
-    createOrder: {
-        args: {
-            body: CreateOrderBody;
-        };
-        result: CreateOrderResult;
-    };
-    getOrderById: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-            headers?: GetOrderByIdHeaders;
-        };
-        result: GetOrderByIdResult;
-    };
-    deleteOrder: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-        };
-        result: DeleteOrderResult;
-    };
-    updateOrder: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-            body?: UpdateOrderBody;
-        };
-        result: UpdateOrderResult;
-    };
-    listOrderItems: {
-        args: {
-            params?: ListOrderItemsParams;
-        };
-        result: ListOrderItemsResult;
-    };
-    getRevenue: {
-        args: {
-            params?: GetRevenueParams;
-        };
-        result: GetRevenueResult;
-    };
-    registerOAuth2Client: {
-        args: {
-            body: RegisterOAuth2ClientBody;
-        };
-        result: RegisterOAuth2ClientResult;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
-    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
-    tags: readonly string[];
-}>["tags"][number];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — `@redocly/client-generator`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits `OPERATIONS` literals typed
- * `satisfies Record<string, OperationDescriptor>` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
- * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to `'json'` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
- * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real `ApiError` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call `parseAs` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of `data`/`error` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
- * streams and, for paginated operations, `item` (the page's element type) and — on
- * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
- * iteration unwraps the `Result` envelope the one-shot `result` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: `{}` has no required members, so
- * `{} extends A` is true exactly when every member of `A` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type `.pages()` yields: the RAW page declared by `page` (the generator
- * writes it only on result-mode paginated entries, whose `result` is the envelope),
- * or the method's own `result` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares `item` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
- * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
- * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
- * `onError` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(`Request failed with status ${status}`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
- * `filter=a/b` survives instead of `filter=a%2Fb`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
- * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
- * `deepObject` brackets, and `null`/`undefined` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(`${key}[${subKey}]`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. `%20` (not `+`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-      }
-    } else if (Object(value) === value) {
-      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
-          else params.append(`${key}[${subKey}]`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(`${key}=${encodeReserved(String(value))}`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? `${url}?${qs}` : url;
-}
-
-/**
- * Read the response body per `kind`. `'auto'` negotiates from the content type
- * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom `retryOn` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
- * unless `jitter === false`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/** Resolve a credential: a literal passes through; a function is awaited per request. */
-async function resolveToken(provider: TokenProvider): Promise<string> {
-  return typeof provider === 'function' ? await provider() : provider;
-}
-
-/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
-function encodeBase64(text: string): string {
-  let binary = '';
-  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
-  return btoa(binary);
-}
-
-/** Whether a credential for this scheme is configured on the instance. */
-function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
-  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
-  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
-  return config.auth?.basic !== undefined;
-}
-
-/**
- * Build the auth headers/query for one operation's `security` OR-alternatives from the
- * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * The first alternative whose schemes (an AND-set) are all configured is applied, so
- * "bearer OR apiKey" works with either credential and never sends both. When none is
- * fully configured, the first alternative's configured schemes are still sent (the
- * server rejects the request, mirroring the previous behavior).
- * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
- */
-async function resolveAuth(
-  security: readonly (readonly SecuritySpec[])[],
-  config: ClientConfig
-): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
-  const alternative =
-    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
-    security[0] ??
-    [];
-  const headers: Record<string, string> = {};
-  const query: Record<string, string> = {};
-  const cookies: string[] = [];
-  for (const scheme of alternative) {
-    if (scheme.kind === 'apiKey') {
-      const provider = config.auth?.apiKey?.[scheme.scheme];
-      if (provider === undefined) continue;
-      const value = await resolveToken(provider);
-      if (scheme.in === 'header') headers[scheme.name] = value;
-      else if (scheme.in === 'query') query[scheme.name] = value;
-      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
-      // so the credential can't break the `Cookie` header syntax.
-      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
-    } else if (scheme.kind === 'bearer') {
-      const provider = config.auth?.bearer;
-      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
-    } else {
-      const basic = config.auth?.basic;
-      if (basic !== undefined) {
-        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
-      }
-    }
-  }
-  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
-  return { headers, query };
-}
-
-/**
- * Merge a publisher's baked setup (`defineClientSetup({...})`) with the app's config:
- * app config fields win per-field over baked defaults, while middleware composes —
- * baked middleware runs first, then the app's.
- */
-export function mergeSetup(
-  setup: { config?: ClientConfig; middleware?: Middleware[] } | undefined,
-  config: ClientConfig = {}
-): ClientConfig {
-  return {
-    ...setup?.config,
-    ...config,
-    middleware: [...(setup?.middleware ?? []), ...(config.middleware ?? [])],
-  };
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * `createClient` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
- * to a plain record — spreading a `Headers` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
- * `onResponse` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * The optional behaviors `createClientCore` can dispatch to but never statically
- * imports. The package's public `createClient` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
- * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
- * are honored, and an omitted `explode` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller `init.headers` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
- * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's `error` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (`errorMode` is fixed at construction — `configure()`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
-    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
-    // basic/apiKey. `apiKey` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: `createClientCore` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
- * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
-}
-
-// ─── Baked-in setup (--setup) ───
-const __redoclySetup: { config?: ClientConfig; middleware?: Middleware[] } = {
-  config: { serverUrl: 'https://api.cafe.redocly.com', retry: { retries: 2 } },
-  middleware: [
-    {
-      onRequest: (ctx: RequestContext) => {
-        ctx.headers['X-Cafe-SDK'] = '1.0.0';
-        if (ctx.operation.tags.includes('Orders')) {
-          ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
-        }
-      },
-    },
-  ],
-};
-export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, mergeSetup({ config: { serverUrl: "https://api.cafe.redocly.com" } }, mergeSetup(__redoclySetup, {})));
-
-export const { configure, use } = client;
-export const setBearer = client.auth.bearer;
-export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
-export const listMenuItems = (params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
-export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
-export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
-export const getMenuItemPhoto = (menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
-export const listOrders = (params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
-export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
-export const getOrderById = (orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
-export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
-export const updateOrder = (orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
-export const listOrderItems = (params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
-export const getRevenue = (params: {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
-export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
diff --git a/tests/e2e/generate-client/examples/configure-and-middleware/.gitignore b/tests/e2e/generate-client/examples/configure-and-middleware/.gitignore
index f06235c460..6eb23affb8 100644
--- a/tests/e2e/generate-client/examples/configure-and-middleware/.gitignore
+++ b/tests/e2e/generate-client/examples/configure-and-middleware/.gitignore
@@ -1,2 +1,4 @@
 node_modules
 dist
+src/api/
+package-lock.json
diff --git a/tests/e2e/generate-client/examples/configure-and-middleware/README.md b/tests/e2e/generate-client/examples/configure-and-middleware/README.md
index 20066963fd..43b38262f1 100644
--- a/tests/e2e/generate-client/examples/configure-and-middleware/README.md
+++ b/tests/e2e/generate-client/examples/configure-and-middleware/README.md
@@ -9,10 +9,10 @@ The client's DX knobs together: `configure({ serverUrl, retry })` with an expone
 
 ```bash
 npm install
-npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
+npm run generate   # generate src/api (the client is gitignored)
 npm run dev        # open the printed local URL
 ```
 
 The app uses a canned `fetch` so it runs offline and the retry is deterministic: the first
 `GET /payments` attempt returns 503 and the policy resends it. The generated client under
-`src/api/` is committed and drift-checked against the generator in CI.
+`src/api/` is gitignored; CI regenerates it and type-checks this example.
diff --git a/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts b/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
deleted file mode 100644
index bafa799785..0000000000
--- a/tests/e2e/generate-client/examples/configure-and-middleware/src/api/client.ts
+++ /dev/null
@@ -1,1173 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Payments API (v1.0.0)
- * Demo payments API for the configure-and-middleware example.
- */
-
-/**
- * Payment status.
- */
-export type PaymentStatus = "pending" | "settled" | "failed";
-
-export const PaymentStatus = {
-    pending: "pending",
-    settled: "settled",
-    failed: "failed"
-} as const;
-
-export type Payment = {
-    /**
-     * Payment ID.
-     */
-    id: string;
-    /**
-     * Amount in cents.
-     * @minimum 0
-     */
-    amount: number;
-    /**
-     * ISO 4217 currency code.
-     */
-    currency: string;
-    status: PaymentStatus;
-};
-
-export type PaymentRequest = {
-    /**
-     * Amount in cents.
-     * @minimum 1
-     */
-    amount: number;
-    /**
-     * ISO 4217 currency code.
-     */
-    currency: string;
-    /**
-     * Free-form merchant reference.
-     */
-    reference?: string;
-};
-
-export type PaymentList = {
-    items: Payment[];
-};
-
-/**
- * RFC 9457 problem document.
- */
-export type ProblemDetails = {
-    /**
-     * URI reference that identifies the problem type.
-     */
-    type?: string;
-    /**
-     * Short summary of the problem type.
-     */
-    title: string;
-    /**
-     * HTTP status code.
-     */
-    status: number;
-    /**
-     * Occurrence-specific explanation.
-     */
-    detail?: string;
-};
-
-export type ListPaymentsResult = PaymentList;
-
-export type ListPaymentsParams = {
-    /**
-     * Filter by payment status.
-     */
-    status?: PaymentStatus;
-};
-
-export type ListPaymentsVariables = {
-    params?: ListPaymentsParams;
-};
-
-export type CreatePaymentResult = Payment;
-
-export type CreatePaymentBody = PaymentRequest;
-
-export type CreatePaymentVariables = {
-    body: CreatePaymentBody;
-};
-
-export type GetPaymentResult = Payment;
-
-export type GetPaymentVariables = {
-    /**
-     * ID of the payment.
-     */
-    paymentId: string;
-};
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    listPayments: {
-        args: {
-            params?: ListPaymentsParams;
-        };
-        result: ListPaymentsResult;
-    };
-    createPayment: {
-        args: {
-            body: CreatePaymentBody;
-        };
-        result: CreatePaymentResult;
-    };
-    getPayment: {
-        args: {
-            /**
-             * ID of the payment.
-             */
-            paymentId: string;
-        };
-        result: GetPaymentResult;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    listPayments: { id: "listPayments", method: "GET", path: "/payments", tags: ["Payments"], params: [{ name: "status", in: "query" }], security: [[{ scheme: "ApiKeyAuth", kind: "apiKey", name: "X-Api-Key", in: "header" }]] },
-    createPayment: { id: "createPayment", method: "POST", path: "/payments", tags: ["Payments"], body: { contentType: "application/json" }, security: [[{ scheme: "ApiKeyAuth", kind: "apiKey", name: "X-Api-Key", in: "header" }]] },
-    getPayment: { id: "getPayment", method: "GET", path: "/payments/{paymentId}", tags: ["Payments"], params: [{ name: "paymentId", in: "path" }], security: [[{ scheme: "ApiKeyAuth", kind: "apiKey", name: "X-Api-Key", in: "header" }]] }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
-    tags: readonly string[];
-}>["tags"][number];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — `@redocly/client-generator`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits `OPERATIONS` literals typed
- * `satisfies Record<string, OperationDescriptor>` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
- * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to `'json'` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
- * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real `ApiError` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call `parseAs` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of `data`/`error` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
- * streams and, for paginated operations, `item` (the page's element type) and — on
- * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
- * iteration unwraps the `Result` envelope the one-shot `result` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: `{}` has no required members, so
- * `{} extends A` is true exactly when every member of `A` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type `.pages()` yields: the RAW page declared by `page` (the generator
- * writes it only on result-mode paginated entries, whose `result` is the envelope),
- * or the method's own `result` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares `item` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
- * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
- * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
- * `onError` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(`Request failed with status ${status}`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
- * `filter=a/b` survives instead of `filter=a%2Fb`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
- * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
- * `deepObject` brackets, and `null`/`undefined` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(`${key}[${subKey}]`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. `%20` (not `+`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-      }
-    } else if (Object(value) === value) {
-      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
-          else params.append(`${key}[${subKey}]`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(`${key}=${encodeReserved(String(value))}`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? `${url}?${qs}` : url;
-}
-
-/**
- * Read the response body per `kind`. `'auto'` negotiates from the content type
- * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom `retryOn` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
- * unless `jitter === false`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/** Resolve a credential: a literal passes through; a function is awaited per request. */
-async function resolveToken(provider: TokenProvider): Promise<string> {
-  return typeof provider === 'function' ? await provider() : provider;
-}
-
-/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
-function encodeBase64(text: string): string {
-  let binary = '';
-  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
-  return btoa(binary);
-}
-
-/** Whether a credential for this scheme is configured on the instance. */
-function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
-  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
-  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
-  return config.auth?.basic !== undefined;
-}
-
-/**
- * Build the auth headers/query for one operation's `security` OR-alternatives from the
- * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * The first alternative whose schemes (an AND-set) are all configured is applied, so
- * "bearer OR apiKey" works with either credential and never sends both. When none is
- * fully configured, the first alternative's configured schemes are still sent (the
- * server rejects the request, mirroring the previous behavior).
- * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
- */
-async function resolveAuth(
-  security: readonly (readonly SecuritySpec[])[],
-  config: ClientConfig
-): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
-  const alternative =
-    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
-    security[0] ??
-    [];
-  const headers: Record<string, string> = {};
-  const query: Record<string, string> = {};
-  const cookies: string[] = [];
-  for (const scheme of alternative) {
-    if (scheme.kind === 'apiKey') {
-      const provider = config.auth?.apiKey?.[scheme.scheme];
-      if (provider === undefined) continue;
-      const value = await resolveToken(provider);
-      if (scheme.in === 'header') headers[scheme.name] = value;
-      else if (scheme.in === 'query') query[scheme.name] = value;
-      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
-      // so the credential can't break the `Cookie` header syntax.
-      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
-    } else if (scheme.kind === 'bearer') {
-      const provider = config.auth?.bearer;
-      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
-    } else {
-      const basic = config.auth?.basic;
-      if (basic !== undefined) {
-        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
-      }
-    }
-  }
-  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
-  return { headers, query };
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * `createClient` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
- * to a plain record — spreading a `Headers` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
- * `onResponse` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * The optional behaviors `createClientCore` can dispatch to but never statically
- * imports. The package's public `createClient` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
- * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
- * are honored, and an omitted `explode` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller `init.headers` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
- * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's `error` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (`errorMode` is fixed at construction — `configure()`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
-    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
-    // basic/apiKey. `apiKey` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: `createClientCore` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
- * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
-}
-
-export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.payments.example.com" });
-
-export const { configure, use } = client;
-export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKeyAuth", value);
-export const listPayments = (params: {
-    /**
-     * Filter by payment status.
-     */
-    status?: PaymentStatus;
-} = {}, init: RequestOptions = {}) => client.listPayments({ params }, init);
-export const createPayment = (body: PaymentRequest, init: RequestOptions = {}) => client.createPayment({ body }, init);
-export const getPayment = (paymentId: string, init: RequestOptions = {}) => client.getPayment({ paymentId }, init);
diff --git a/tests/e2e/generate-client/examples/custom-generator/.gitignore b/tests/e2e/generate-client/examples/custom-generator/.gitignore
index f06235c460..6eb23affb8 100644
--- a/tests/e2e/generate-client/examples/custom-generator/.gitignore
+++ b/tests/e2e/generate-client/examples/custom-generator/.gitignore
@@ -1,2 +1,4 @@
 node_modules
 dist
+src/api/
+package-lock.json
diff --git a/tests/e2e/generate-client/examples/custom-generator/openapi.yaml b/tests/e2e/generate-client/examples/custom-generator/openapi.yaml
deleted file mode 100644
index a255b72a20..0000000000
--- a/tests/e2e/generate-client/examples/custom-generator/openapi.yaml
+++ /dev/null
@@ -1,1163 +0,0 @@
-openapi: 3.2.0
-info:
-  title: Redocly Cafe
-  description: |
-    Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
-    Create API credentials and try it yourself in a realistic OpenAPI workflow.
-  version: 1.0.0
-  contact:
-    email: team@redocly.com
-    url: https://redocly.com/contact-us/
-  license:
-    name: MIT
-    url: https://opensource.org/licenses/MIT
-  termsOfService: https://redocly.com/subscription-agreement
-servers:
-  - url: https://api.cafe.redocly.com
-    description: Live server.
-tags:
-  - name: Authorization
-    description: Create a client to demo the API.
-  - name: Products
-    description: Operations related to products.
-  - name: Orders
-    description: Order management operations.
-  - name: Statistics
-    description: Statistics operations.
-paths:
-  /menu:
-    get:
-      tags:
-        - Products
-      summary: List all menu items
-      description: Retrieve a collection of menu items with optional filtering and pagination.
-      operationId: listMenuItems
-      security: []
-      parameters:
-        - $ref: '#/components/parameters/After'
-        - $ref: '#/components/parameters/Before'
-        - $ref: '#/components/parameters/Sort'
-        - $ref: '#/components/parameters/Filter'
-        - $ref: '#/components/parameters/Search'
-        - $ref: '#/components/parameters/Limit'
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/MenuItemList'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    post:
-      tags:
-        - Products
-      summary: Create menu item
-      description: Create a new menu item.
-      operationId: createMenuItem
-      security:
-        - OAuth2:
-            - menu:write
-      requestBody:
-        required: true
-        content:
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/MenuItem'
-      responses:
-        '201':
-          description: Menu item created successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/MenuItem'
-              examples:
-                MenuItemResponse:
-                  value:
-                    id: prd_01khr487f7qm7p44xn427m43vb
-                    object: menuItem
-                    name: coffee
-                    price: 4000
-                    category: beverage
-                    createdAt: '2026-02-18T10:20:38.228Z'
-                    updatedAt: '2026-02-18T10:20:38.228Z'
-                    volume: 600
-                    containsCaffeine: false
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '409':
-          $ref: '#/components/responses/Conflict'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /menu/{menuItemId}:
-    parameters:
-      - $ref: '#/components/parameters/MenuItemId'
-    delete:
-      tags:
-        - Products
-      summary: Delete a menu item
-      description: Delete an existing menu item.
-      operationId: deleteMenuItem
-      security:
-        - OAuth2:
-            - menu:write
-      responses:
-        '204':
-          description: Menu item deleted successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /menu-item-images/{menuItemId}:
-    parameters:
-      - $ref: '#/components/parameters/MenuItemId'
-    get:
-      operationId: getMenuItemPhoto
-      summary: Retrieve a menu item photo
-      description: Retrieve the product photo image for a specific menu item.
-      security: []
-      tags:
-        - Products
-      parameters:
-        - $ref: '#/components/parameters/PhotoSize'
-      responses:
-        '200':
-          description: Menu item photo retrieved successfully.
-          content:
-            image/png:
-              schema:
-                type: string
-                format: binary
-            text/plain:
-              schema:
-                description: Alternative image text.
-                type: string
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /orders:
-    get:
-      tags:
-        - Orders
-      summary: List all orders
-      description: Retrieve a collection of orders with optional filtering and pagination.
-      operationId: listOrders
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/Filter'
-        - $ref: '#/components/parameters/Sort'
-        - $ref: '#/components/parameters/Limit'
-        - $ref: '#/components/parameters/After'
-        - $ref: '#/components/parameters/Before'
-        - $ref: '#/components/parameters/Search'
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/OrderList'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    post:
-      tags:
-        - Orders
-      summary: Create order
-      description: |
-        Create a new order.
-        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
-      operationId: createOrder
-      security:
-        - OAuth2:
-            - orders:write
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Order'
-            examples:
-              OrderRequest:
-                dataValue:
-                  customerName: Mary Ann
-                  orderItems:
-                    - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                      quantity: 2
-                      comment: No sugar!
-                      discount: 0
-      responses:
-        '201':
-          description: Order placed successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: placed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /orders/{orderId}:
-    get:
-      tags:
-        - Orders
-      summary: Retrieve an order
-      description: Retrieve a single order by its ID.
-      operationId: getOrderById
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-        - name: X-Request-Id
-          in: header
-          required: false
-          description: |
-            Optional client-supplied correlation ID, echoed in logs and traces.
-          schema:
-            type: string
-            format: uuid
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: placed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    patch:
-      tags:
-        - Orders
-      summary: Partially update an order
-      description: |
-        Update an existing order status.
-        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
-      operationId: updateOrder
-      security:
-        - OAuth2:
-            - orders:write
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-      requestBody:
-        content:
-          application/json:
-            schema:
-              type: object
-              description: |
-                Partial order update using JSON Merge Patch - only include fields to update.
-              properties:
-                status:
-                  $ref: '#/components/schemas/OrderStatus'
-              required:
-                - status
-      responses:
-        '200':
-          description: Order updated successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: completed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    delete:
-      tags:
-        - Orders
-      summary: Delete an order
-      description: |
-        Delete the order.
-        To keep the order history, the order should be canceled instead of deleted.
-      operationId: deleteOrder
-      security:
-        - OAuth2:
-            - orders:write
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-      responses:
-        '204':
-          description: Order deleted successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /order-items:
-    get:
-      tags:
-        - Orders
-      summary: List all order items with menu item details
-      description: |
-        Returns an array of order items for a specific order.
-        Use the `filter` parameter to filter by order ID.
-      operationId: listOrderItems
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/Filter'
-          required: true
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                type: array
-                description: List of menu items that are part of the order.
-                items:
-                  $ref: '#/components/schemas/OrderItem'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /revenue:
-    get:
-      tags:
-        - Statistics
-      summary: Get revenue statistics
-      description: |
-        Retrieve revenue statistics for a configurable date range.
-        Returns revenue, order counts, average order amount, and other useful statistics.
-      operationId: getRevenue
-      security:
-        - ApiKey: []
-      parameters:
-        - name: startDate
-          in: query
-          required: false
-          description: |
-            Start date for the revenue calculation period (ISO 8601 datetime format).
-            Defaults to 30 days ago if not provided.
-          schema:
-            type: string
-            format: date
-          example: '2026-01-01'
-        - name: endDate
-          in: query
-          required: false
-          description: |
-            End date for the revenue calculation period (ISO 8601 datetime format).
-            Defaults to current time if not provided.
-          schema:
-            type: string
-            format: date
-          example: '2026-01-31'
-      responses:
-        '200':
-          description: Revenue statistics retrieved successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RevenueStatistics'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /oauth2/register:
-    post:
-      tags:
-        - Authorization
-      summary: Create OAuth2 client
-      description: |
-        Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
-        - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type, 
-          `redirectUris` must be provided (per RFC 7591 Section 2).
-        - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
-        Returns the registered client information per RFC 7591, including:
-        - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
-      operationId: registerOAuth2Client
-      security: []
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/RegisterClientObject'
-      responses:
-        '201':
-          description: OAuth2 client registered successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/OAuth2Client'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-webhooks:
-  order-notification:
-    post:
-      tags:
-        - Orders
-      operationId: orderNotificationWebhook
-      security: []
-      summary: Order notification webhook
-      description: Webhook triggered when a new order is placed.
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/OrderNotification'
-      responses:
-        '200':
-          description: Webhook received successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-components:
-  securitySchemes:
-    OAuth2:
-      type: oauth2
-      description: OAuth2 authorization for API access.
-      flows:
-        authorizationCode:
-          authorizationUrl: https://api.cafe.redocly.com/oauth2/authorize
-          tokenUrl: https://api.cafe.redocly.com/oauth2/token
-          scopes:
-            menu:read: Read access to menu items and images
-            menu:write: Write access to menu items (create, delete)
-            orders:read: Read access to orders
-            orders:write: Write access to orders (create, update, delete)
-        clientCredentials:
-          tokenUrl: https://api.cafe.redocly.com/oauth2/token
-          scopes:
-            menu:read: Read access to menu items and images
-            menu:write: Write access to menu items (create, delete)
-            orders:read: Read access to orders
-            orders:write: Write access to orders (create, update, delete)
-    ApiKey:
-      type: apiKey
-      name: X-API-Key
-      in: header
-      description: API key for internal operations.
-  parameters:
-    After:
-      name: after
-      in: query
-      required: false
-      description: Use the `endCursor` as a value for the `after` parameter to get the next page.
-      schema:
-        type: string
-      example: a25fgaksjf23la==
-    Before:
-      name: before
-      in: query
-      required: false
-      description: |
-        Use the `startCursor` as a value for the `before` parameter to get the next page.
-      schema:
-        type: string
-      example: bfg23aksjf23zb1==
-    Sort:
-      name: sort
-      description: |-
-        To sort by id in descending order use `-id`.
-        To sort by id in ascending order use `id`.
-      in: query
-      required: false
-      schema:
-        type: string
-      example: '-name'
-    Filter:
-      name: filter
-      description: |-
-        Filters the collection items using space-separated `field:value` pairs.
-
-        **Format:** `field1:value1 field2:value2`
-
-        **Supported operators:**
-        - `field:value` - Exact match
-        - `field:value1,value2` - Match any of the comma-separated values (OR)
-        - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-
-        **Examples:**
-        - `status:placed` - Filter by single status.
-        - `status:placed,completed` - Filter by multiple statuses.
-        - `createdAt:30d` - Filter orders created in the last 30 days.
-        - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-        - `status:placed createdAt:7d` - Combine multiple filters.
-      in: query
-      required: false
-      schema:
-        type: string
-      example: orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7
-    Search:
-      name: search
-      in: query
-      description: |-
-        Performs a case-insensitive text search across relevant fields in the collection.
-
-        **Fields searched depend on the endpoint:**
-        - **Menu items:** `name`, `photoTextDescription`
-        - **Orders:** `customerName`, `id`
-
-        Returns items where any of the searchable fields contain the search term as a substring.
-      required: false
-      schema:
-        type: string
-      example: coffee
-    Limit:
-      name: limit
-      description: |
-        Use to return a number of results per page.
-        If there is more data, use in combination with `after` to page through the data.
-      in: query
-      required: false
-      schema:
-        type: integer
-        minimum: 1
-        maximum: 100
-        default: 10
-      example: 10
-    MenuItemId:
-      name: menuItemId
-      in: path
-      description: ID of the menu item to retrieve.
-      required: true
-      schema:
-        type: string
-        pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-      example: prd_01h1s5z6vf2mm1mz3hevnn9va7
-    PhotoSize:
-      name: photoSize
-      in: query
-      description: Photo size to retrieve.
-      required: false
-      schema:
-        type: string
-        enum:
-          - thumbnail
-          - medium
-          - large
-        default: medium
-    OrderId:
-      name: orderId
-      in: path
-      description: ID of the order to retrieve.
-      required: true
-      schema:
-        type: string
-        pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-      example: ord_01h1s5z6vf2mm1mz3hevnn9va7
-  schemas:
-    Page:
-      type: object
-      properties:
-        endCursor:
-          type:
-            - string
-            - 'null'
-          description: |-
-            Use with the `after` query parameter to load the next page of data.
-            When `null`, there is no data.
-            The cursor is opaque and internal structure is subject to change.
-        startCursor:
-          type:
-            - string
-            - 'null'
-          description: |-
-            Use with the `before` query parameter to load the previous page of data.
-            When `null`, there is no data.
-            The cursor is opaque and internal structure is subject to change.
-        hasNextPage:
-          type: boolean
-          description: Indicates if there is a next page with items.
-        hasPrevPage:
-          type: boolean
-          description: Indicates if there is a previous page with items.
-        limit:
-          type: integer
-          minimum: 1
-          maximum: 100
-          default: 10
-          description: Value showing how many items are in the page limit.
-        total:
-          type: integer
-          description: Count of items across all pages.
-          minimum: 0
-      required:
-        - endCursor
-        - startCursor
-        - hasNextPage
-        - hasPrevPage
-        - limit
-        - total
-    MenuBaseItem:
-      type: object
-      properties:
-        createdAt:
-          description: Created date.
-          type: string
-          format: date-time
-          readOnly: true
-        updatedAt:
-          description: Updated date.
-          type: string
-          format: date-time
-          readOnly: true
-        id:
-          description: Menu item ID. Unique identifier prefixed with `prd_`.
-          type: string
-          readOnly: true
-          pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-          example: prd_01h1s5z6vf2mm1mz3hevnn9va7
-        object:
-          description: Entity name.
-          type: string
-          const: menuItem
-          readOnly: true
-        name:
-          description: Menu item name.
-          type: string
-          minLength: 1
-          maxLength: 50
-        price:
-          description: Price in cents.
-          type: integer
-          minimum: 0
-        photo:
-          writeOnly: true
-          type:
-            - string
-            - 'null'
-          format: binary
-          description: Photo of the menu item. Must be a PNG image and less than 1MB.
-        photoUrl:
-          readOnly: true
-          type: string
-          format: uri
-          description: Photo URL of the menu item.
-        photoTextDescription:
-          type:
-            - string
-            - 'null'
-      required:
-        - id
-        - name
-        - price
-        - createdAt
-        - updatedAt
-        - object
-    Beverage:
-      allOf:
-        - type: object
-          properties:
-            category:
-              description: Menu item category.
-              type: string
-              const: beverage
-            volume:
-              type: number
-              description: Size of the beverage in milliliters.
-              exclusiveMinimum: 0
-            containsCaffeine:
-              type: boolean
-              description: Indicates if the beverage contains caffeine.
-          required:
-            - category
-            - volume
-            - containsCaffeine
-        - $ref: '#/components/schemas/MenuBaseItem'
-    Dessert:
-      allOf:
-        - type: object
-          properties:
-            category:
-              description: Menu item category.
-              type: string
-              const: dessert
-            calories:
-              type: number
-              exclusiveMinimum: 0
-              description: Amount of calories.
-          required:
-            - category
-            - calories
-        - $ref: '#/components/schemas/MenuBaseItem'
-    MenuItem:
-      discriminator:
-        propertyName: category
-        mapping:
-          beverage: '#/components/schemas/Beverage'
-          dessert: '#/components/schemas/Dessert'
-      oneOf:
-        - $ref: '#/components/schemas/Beverage'
-        - $ref: '#/components/schemas/Dessert'
-      required:
-        - category
-    MenuItemList:
-      type: object
-      properties:
-        object:
-          type: string
-          const: list
-          description: Entity name.
-        page:
-          $ref: '#/components/schemas/Page'
-        items:
-          type: array
-          items:
-            $ref: '#/components/schemas/MenuItem'
-      required:
-        - object
-        - page
-        - items
-    Error:
-      type: object
-      properties:
-        type:
-          type: string
-          format: uri-reference
-          description: URI reference that identifies the problem type.
-          default: about:blank
-        title:
-          type: string
-          description: Short summary of the problem type.
-        status:
-          type: integer
-          format: int32
-          description: |
-            HTTP status code generated by the origin server for this occurrence of the problem.
-          minimum: 100
-          exclusiveMaximum: 600
-        instance:
-          type: string
-          format: uri-reference
-          description: |
-            URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-            May be used to locate the root of this problem in the source code.
-          example: /some/uri-reference#specific-occurrence-context
-        details:
-          description: Additional error details.
-          type: object
-          additionalProperties: true
-      required:
-        - type
-        - title
-        - status
-    OrderStatus:
-      type: string
-      description: Order status.
-      enum:
-        - placed
-        - preparing
-        - completed
-        - canceled
-    Order:
-      type: object
-      title: Order
-      properties:
-        id:
-          description: Order ID. Unique identifier prefixed with `ord_`.
-          type: string
-          format: ulid
-          readOnly: true
-          pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-          example: ord_01h1s5z6vf2mm1mz3hevnn9va7
-        object:
-          description: Entity name.
-          type: string
-          const: order
-          readOnly: true
-        customerName:
-          description: |
-            Name of the customer who placed the order.
-            Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-          type: string
-          pattern: ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-          minLength: 1
-          maxLength: 100
-        status:
-          allOf:
-            - $ref: '#/components/schemas/OrderStatus'
-          readOnly: true
-        totalPrice:
-          description: Total order price in cents.
-          type: integer
-          minimum: 0
-          readOnly: true
-        createdAt:
-          description: Created date.
-          type: string
-          format: date-time
-          readOnly: true
-        updatedAt:
-          description: Updated date.
-          type: string
-          format: date-time
-          readOnly: true
-        orderItems:
-          type: array
-          description: List of items to include in the order.
-          minItems: 1
-          items:
-            type: object
-            properties:
-              menuItemId:
-                type: string
-                format: ulid
-                description: ID of the menu item to add to the order.
-              quantity:
-                type: integer
-                minimum: 1
-                description: Quantity of the menu item.
-              discount:
-                type: integer
-                minimum: 0
-                description: Discount amount in cents (absolute value).
-                default: 0
-              comment:
-                type: string
-                maxLength: 500
-                description: Optional comment for the order item (e.g., "No sugar").
-            required:
-              - menuItemId
-              - quantity
-      required:
-        - customerName
-        - orderItems
-    OrderList:
-      type: object
-      properties:
-        object:
-          type: string
-          const: list
-          description: Entity name.
-        page:
-          $ref: '#/components/schemas/Page'
-        items:
-          type: array
-          items:
-            $ref: '#/components/schemas/Order'
-      required:
-        - object
-        - page
-        - items
-    OrderItem:
-      type: object
-      properties:
-        menuItemId:
-          type: string
-          description: ID of the menu item to add to the order.
-          writeOnly: true
-        menuItem:
-          allOf:
-            - $ref: '#/components/schemas/MenuItem'
-          description: Menu item that is part of the order.
-          readOnly: true
-        quantity:
-          type: integer
-          minimum: 1
-          description: Quantity of the menu item.
-        discount:
-          type: integer
-          minimum: 0
-          description: Discount amount in cents (absolute value).
-          default: 0
-        comment:
-          type: string
-          maxLength: 500
-          description: Optional comment for the order item (e.g., "No sugar").
-      required:
-        - menuItemId
-        - quantity
-    RevenueStatistics:
-      type: object
-      description: Revenue statistics for a given date range.
-      properties:
-        revenue:
-          type: number
-          format: float
-          description: Total revenue in cents from completed orders.
-          minimum: 0
-        averageOrderAmount:
-          type: number
-          format: float
-          description: Average order amount in cents (calculated from completed orders only).
-          minimum: 0
-        totalOrders:
-          type: integer
-          description: Total number of orders (all statuses) in the date range.
-          minimum: 0
-        placedOrders:
-          type: integer
-          description: Number of placed orders.
-          minimum: 0
-        preparingOrders:
-          type: integer
-          description: Number of preparing orders.
-          minimum: 0
-        completedOrders:
-          type: integer
-          description: Number of completed orders.
-          minimum: 0
-        canceledOrders:
-          type: integer
-          description: Number of canceled orders.
-          minimum: 0
-        startDate:
-          type: string
-          format: date
-          description: Start date of the revenue calculation period.
-        endDate:
-          type: string
-          format: date
-          description: End date of the revenue calculation period.
-      required:
-        - revenue
-        - averageOrderAmount
-        - totalOrders
-        - placedOrders
-        - preparingOrders
-        - completedOrders
-        - canceledOrders
-        - startDate
-        - endDate
-    RegisterClientObject:
-      type: object
-      properties:
-        name:
-          type: string
-          description: Client name.
-        redirectUris:
-          type: array
-          items:
-            type: string
-            format: uri
-          description: List of redirect URIs (optional, defaults to empty array).
-        scopes:
-          type: array
-          items:
-            type: string
-            enum:
-              - menu:read
-              - menu:write
-              - orders:read
-              - orders:write
-          description: List of scopes.
-        grantTypes:
-          type: array
-          items:
-            type: string
-            enum:
-              - authorization_code
-              - client_credentials
-          description: List of grant types.
-      required:
-        - name
-    OAuth2Client:
-      type: object
-      description: OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
-      properties:
-        clientId:
-          type: string
-          description: Client identifier issued by the authorization server.
-        clientSecret:
-          type: string
-          description: Client secret issued by the authorization server.
-        clientIdIssuedAt:
-          type: integer
-          format: int64
-          description: Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-        clientSecretExpiresAt:
-          type: integer
-          format: int64
-          description: Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-        name:
-          type: string
-          description: Client name (registered metadata).
-        redirectUris:
-          type: array
-          items:
-            type: string
-            format: uri
-          description: List of redirect URIs (registered metadata).
-        registrationClientUri:
-          type: string
-          format: uri
-          description: URL of the client configuration endpoint for managing this client registration (RFC 7592).
-        registrationAccessToken:
-          type: string
-          description: Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-        scopes:
-          type: array
-          items:
-            type: string
-            enum:
-              - menu:read
-              - menu:write
-              - orders:read
-              - orders:write
-          description: List of scopes (registered metadata).
-        grantTypes:
-          type: array
-          items:
-            type: string
-            enum:
-              - authorization_code
-              - client_credentials
-          description: List of grant types (registered metadata).
-      required:
-        - clientId
-        - clientSecret
-        - clientIdIssuedAt
-        - clientSecretExpiresAt
-        - registrationClientUri
-        - registrationAccessToken
-    OrderNotification:
-      type: object
-      required:
-        - orderId
-        - orderStatus
-        - timestamp
-      properties:
-        orderId:
-          type: string
-          description: Unique order identifier.
-        orderStatus:
-          $ref: '#/components/schemas/OrderStatus'
-        timestamp:
-          type: string
-          format: date-time
-          description: When the event occurred.
-  responses:
-    BadRequest:
-      description: Bad request - invalid input parameters.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    InternalServerError:
-      description: Internal server error.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Unauthorized:
-      description: Unauthorized - authorization required.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Forbidden:
-      description: Forbidden - insufficient permissions.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Conflict:
-      description: Conflict - entity already exists.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    NotFound:
-      description: Resource not found.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
diff --git a/tests/e2e/generate-client/examples/custom-generator/redocly.yaml b/tests/e2e/generate-client/examples/custom-generator/redocly.yaml
index 3b54bd12d0..84da4e37a8 100644
--- a/tests/e2e/generate-client/examples/custom-generator/redocly.yaml
+++ b/tests/e2e/generate-client/examples/custom-generator/redocly.yaml
@@ -3,7 +3,7 @@
 # (run `redocly generate-client` with no args to build every such api).
 apis:
   custom-generator:
-    root: ./openapi.yaml
+    root: ../_shared/cafe.yaml
     clientOutput: ./src/api/client.ts
     client:
       generators:
diff --git a/tests/e2e/generate-client/examples/custom-generator/src/api/client.routes.ts b/tests/e2e/generate-client/examples/custom-generator/src/api/client.routes.ts
deleted file mode 100644
index 4b808d2636..0000000000
--- a/tests/e2e/generate-client/examples/custom-generator/src/api/client.routes.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Generated by the route-map custom generator. Do not edit by hand.
-export const routes = {
-  listMenuItems: 'GET /menu',
-  createMenuItem: 'POST /menu',
-  deleteMenuItem: 'DELETE /menu/{menuItemId}',
-  getMenuItemPhoto: 'GET /menu-item-images/{menuItemId}',
-  listOrders: 'GET /orders',
-  createOrder: 'POST /orders',
-  getOrderById: 'GET /orders/{orderId}',
-  deleteOrder: 'DELETE /orders/{orderId}',
-  updateOrder: 'PATCH /orders/{orderId}',
-  listOrderItems: 'GET /order-items',
-  getRevenue: 'GET /revenue',
-  registerOAuth2Client: 'POST /oauth2/register',
-} as const;
diff --git a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts b/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
deleted file mode 100644
index 550cd946cd..0000000000
--- a/tests/e2e/generate-client/examples/custom-generator/src/api/client.ts
+++ /dev/null
@@ -1,1968 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Redocly Cafe (v1.0.0)
- * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
- * Create API credentials and try it yourself in a realistic OpenAPI workflow.
- * 
- */
-
-export type Page = {
-    /**
-     * Use with the `after` query parameter to load the next page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    endCursor: string | null;
-    /**
-     * Use with the `before` query parameter to load the previous page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    startCursor: string | null;
-    /**
-     * Indicates if there is a next page with items.
-     */
-    hasNextPage: boolean;
-    /**
-     * Indicates if there is a previous page with items.
-     */
-    hasPrevPage: boolean;
-    /**
-     * Value showing how many items are in the page limit.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit: number;
-    /**
-     * Count of items across all pages.
-     * @minimum 0
-     */
-    total: number;
-};
-
-export type MenuBaseItem = {
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt: string;
-    /**
-     * Menu item ID. Unique identifier prefixed with `prd_`.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    readonly id: string;
-    /**
-     * Entity name.
-     */
-    readonly object: "menuItem";
-    /**
-     * Menu item name.
-     * @minLength 1
-     * @maxLength 50
-     */
-    name: string;
-    /**
-     * Price in cents.
-     * @minimum 0
-     */
-    price: number;
-    /**
-     * Photo of the menu item. Must be a PNG image and less than 1MB.
-     * @format binary
-     */
-    photo?: Blob | null;
-    /**
-     * Photo URL of the menu item.
-     * @format uri
-     */
-    readonly photoUrl?: string;
-    photoTextDescription?: string | null;
-};
-
-export type Beverage = {
-    /**
-     * Menu item category.
-     */
-    category: "beverage";
-    /**
-     * Size of the beverage in milliliters.
-     * @exclusiveMinimum 0
-     */
-    volume: number;
-    /**
-     * Indicates if the beverage contains caffeine.
-     */
-    containsCaffeine: boolean;
-} & MenuBaseItem;
-
-export type Dessert = {
-    /**
-     * Menu item category.
-     */
-    category: "dessert";
-    /**
-     * Amount of calories.
-     * @exclusiveMinimum 0
-     */
-    calories: number;
-} & MenuBaseItem;
-
-export type MenuItem = Beverage | Dessert;
-
-export type MenuItemList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: MenuItem[];
-};
-
-export type Error = {
-    /**
-     * URI reference that identifies the problem type.
-     * @format uri-reference
-     */
-    type: string;
-    /**
-     * Short summary of the problem type.
-     */
-    title: string;
-    /**
-     * HTTP status code generated by the origin server for this occurrence of the problem.
-     * @minimum 100
-     * @exclusiveMaximum 600
-     * @format int32
-     */
-    status: number;
-    /**
-     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-     * May be used to locate the root of this problem in the source code.
-     * @format uri-reference
-     */
-    instance?: string;
-    /**
-     * Additional error details.
-     */
-    details?: Record<string, unknown>;
-};
-
-/**
- * Order status.
- */
-export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
-
-export const OrderStatus = {
-    placed: "placed",
-    preparing: "preparing",
-    completed: "completed",
-    canceled: "canceled"
-} as const;
-
-export type Order = {
-    /**
-     * Order ID. Unique identifier prefixed with `ord_`.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     * @format ulid
-     */
-    readonly id?: string;
-    /**
-     * Entity name.
-     */
-    readonly object?: "order";
-    /**
-     * Name of the customer who placed the order.
-     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-     * @minLength 1
-     * @maxLength 100
-     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-     */
-    customerName: string;
-    readonly status?: OrderStatus;
-    /**
-     * Total order price in cents.
-     * @minimum 0
-     */
-    readonly totalPrice?: number;
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt?: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt?: string;
-    /**
-     * List of items to include in the order.
-     * @minItems 1
-     */
-    orderItems: {
-        /**
-         * ID of the menu item to add to the order.
-         * @format ulid
-         */
-        menuItemId: string;
-        /**
-         * Quantity of the menu item.
-         * @minimum 1
-         */
-        quantity: number;
-        /**
-         * Discount amount in cents (absolute value).
-         * @minimum 0
-         */
-        discount?: number;
-        /**
-         * Optional comment for the order item (e.g., "No sugar").
-         * @maxLength 500
-         */
-        comment?: string;
-    }[];
-};
-
-export type OrderList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: Order[];
-};
-
-export type OrderItem = {
-    /**
-     * ID of the menu item to add to the order.
-     */
-    menuItemId: string;
-    /**
-     * Menu item that is part of the order.
-     */
-    readonly menuItem?: MenuItem;
-    /**
-     * Quantity of the menu item.
-     * @minimum 1
-     */
-    quantity: number;
-    /**
-     * Discount amount in cents (absolute value).
-     * @minimum 0
-     */
-    discount?: number;
-    /**
-     * Optional comment for the order item (e.g., "No sugar").
-     * @maxLength 500
-     */
-    comment?: string;
-};
-
-/**
- * Revenue statistics for a given date range.
- */
-export type RevenueStatistics = {
-    /**
-     * Total revenue in cents from completed orders.
-     * @minimum 0
-     * @format float
-     */
-    revenue: number;
-    /**
-     * Average order amount in cents (calculated from completed orders only).
-     * @minimum 0
-     * @format float
-     */
-    averageOrderAmount: number;
-    /**
-     * Total number of orders (all statuses) in the date range.
-     * @minimum 0
-     */
-    totalOrders: number;
-    /**
-     * Number of placed orders.
-     * @minimum 0
-     */
-    placedOrders: number;
-    /**
-     * Number of preparing orders.
-     * @minimum 0
-     */
-    preparingOrders: number;
-    /**
-     * Number of completed orders.
-     * @minimum 0
-     */
-    completedOrders: number;
-    /**
-     * Number of canceled orders.
-     * @minimum 0
-     */
-    canceledOrders: number;
-    /**
-     * Start date of the revenue calculation period.
-     * @format date
-     */
-    startDate: string;
-    /**
-     * End date of the revenue calculation period.
-     * @format date
-     */
-    endDate: string;
-};
-
-export type RegisterClientObject = {
-    /**
-     * Client name.
-     */
-    name: string;
-    /**
-     * List of redirect URIs (optional, defaults to empty array).
-     */
-    redirectUris?: string[];
-    /**
-     * List of scopes.
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types.
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-/**
- * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
- */
-export type OAuth2Client = {
-    /**
-     * Client identifier issued by the authorization server.
-     */
-    clientId: string;
-    /**
-     * Client secret issued by the authorization server.
-     */
-    clientSecret: string;
-    /**
-     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-     * @format int64
-     */
-    clientIdIssuedAt: number;
-    /**
-     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-     * @format int64
-     */
-    clientSecretExpiresAt: number;
-    /**
-     * Client name (registered metadata).
-     */
-    name?: string;
-    /**
-     * List of redirect URIs (registered metadata).
-     */
-    redirectUris?: string[];
-    /**
-     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
-     * @format uri
-     */
-    registrationClientUri: string;
-    /**
-     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-     */
-    registrationAccessToken: string;
-    /**
-     * List of scopes (registered metadata).
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types (registered metadata).
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-export type OrderNotification = {
-    /**
-     * Unique order identifier.
-     */
-    orderId: string;
-    orderStatus: OrderStatus;
-    /**
-     * When the event occurred.
-     * @format date-time
-     */
-    timestamp: string;
-};
-
-/**
- * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
- */
-export function isBeverage(value: MenuItem): value is Beverage {
-    return (value as Record<string, unknown>)["category"] === "beverage";
-}
-
-/**
- * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
- */
-export function isDessert(value: MenuItem): value is Dessert {
-    return (value as Record<string, unknown>)["category"] === "dessert";
-}
-
-export type ListMenuItemsResult = MenuItemList;
-
-export type ListMenuItemsParams = {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-};
-
-export type ListMenuItemsVariables = {
-    params?: ListMenuItemsParams;
-};
-
-export type CreateMenuItemResult = MenuItem;
-
-export type CreateMenuItemBody = FormData;
-
-export type CreateMenuItemVariables = {
-    body: CreateMenuItemBody;
-};
-
-export type DeleteMenuItemResult = void;
-
-export type DeleteMenuItemVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-};
-
-export type GetMenuItemPhotoResult = Blob | string;
-
-export type GetMenuItemPhotoParams = {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-};
-
-export type GetMenuItemPhotoVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-    params?: GetMenuItemPhotoParams;
-};
-
-export type ListOrdersResult = OrderList;
-
-export type ListOrdersParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-};
-
-export type ListOrdersVariables = {
-    params?: ListOrdersParams;
-};
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    headers?: GetOrderByIdHeaders;
-};
-
-export type DeleteOrderResult = void;
-
-export type DeleteOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-};
-
-export type UpdateOrderResult = Order;
-
-export type UpdateOrderBody = {
-    status: OrderStatus;
-};
-
-export type UpdateOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    body?: UpdateOrderBody;
-};
-
-export type ListOrderItemsResult = OrderItem[];
-
-export type ListOrderItemsParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-};
-
-export type ListOrderItemsVariables = {
-    params?: ListOrderItemsParams;
-};
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    listMenuItems: {
-        args: {
-            params?: ListMenuItemsParams;
-        };
-        result: ListMenuItemsResult;
-    };
-    createMenuItem: {
-        args: {
-            body: CreateMenuItemBody;
-        };
-        result: CreateMenuItemResult;
-    };
-    deleteMenuItem: {
-        args: {
-            /**
-             * ID of the menu item to retrieve.
-             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            menuItemId: string;
-        };
-        result: DeleteMenuItemResult;
-    };
-    getMenuItemPhoto: {
-        args: {
-            /**
-             * ID of the menu item to retrieve.
-             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            menuItemId: string;
-            params?: GetMenuItemPhotoParams;
-        };
-        result: GetMenuItemPhotoResult;
-    };
-    listOrders: {
-        args: {
-            params?: ListOrdersParams;
-        };
-        result: ListOrdersResult;
-    };
-    createOrder: {
-        args: {
-            body: CreateOrderBody;
-        };
-        result: CreateOrderResult;
-    };
-    getOrderById: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-            headers?: GetOrderByIdHeaders;
-        };
-        result: GetOrderByIdResult;
-    };
-    deleteOrder: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-        };
-        result: DeleteOrderResult;
-    };
-    updateOrder: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-            body?: UpdateOrderBody;
-        };
-        result: UpdateOrderResult;
-    };
-    listOrderItems: {
-        args: {
-            params?: ListOrderItemsParams;
-        };
-        result: ListOrderItemsResult;
-    };
-    getRevenue: {
-        args: {
-            params?: GetRevenueParams;
-        };
-        result: GetRevenueResult;
-    };
-    registerOAuth2Client: {
-        args: {
-            body: RegisterOAuth2ClientBody;
-        };
-        result: RegisterOAuth2ClientResult;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
-    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
-    tags: readonly string[];
-}>["tags"][number];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — `@redocly/client-generator`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits `OPERATIONS` literals typed
- * `satisfies Record<string, OperationDescriptor>` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
- * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to `'json'` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
- * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real `ApiError` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call `parseAs` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of `data`/`error` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
- * streams and, for paginated operations, `item` (the page's element type) and — on
- * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
- * iteration unwraps the `Result` envelope the one-shot `result` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: `{}` has no required members, so
- * `{} extends A` is true exactly when every member of `A` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type `.pages()` yields: the RAW page declared by `page` (the generator
- * writes it only on result-mode paginated entries, whose `result` is the envelope),
- * or the method's own `result` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares `item` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
- * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
- * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
- * `onError` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(`Request failed with status ${status}`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
- * `filter=a/b` survives instead of `filter=a%2Fb`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
- * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
- * `deepObject` brackets, and `null`/`undefined` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(`${key}[${subKey}]`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. `%20` (not `+`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-      }
-    } else if (Object(value) === value) {
-      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
-          else params.append(`${key}[${subKey}]`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(`${key}=${encodeReserved(String(value))}`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? `${url}?${qs}` : url;
-}
-
-/**
- * Read the response body per `kind`. `'auto'` negotiates from the content type
- * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom `retryOn` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
- * unless `jitter === false`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/** Resolve a credential: a literal passes through; a function is awaited per request. */
-async function resolveToken(provider: TokenProvider): Promise<string> {
-  return typeof provider === 'function' ? await provider() : provider;
-}
-
-/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
-function encodeBase64(text: string): string {
-  let binary = '';
-  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
-  return btoa(binary);
-}
-
-/** Whether a credential for this scheme is configured on the instance. */
-function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
-  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
-  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
-  return config.auth?.basic !== undefined;
-}
-
-/**
- * Build the auth headers/query for one operation's `security` OR-alternatives from the
- * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * The first alternative whose schemes (an AND-set) are all configured is applied, so
- * "bearer OR apiKey" works with either credential and never sends both. When none is
- * fully configured, the first alternative's configured schemes are still sent (the
- * server rejects the request, mirroring the previous behavior).
- * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
- */
-async function resolveAuth(
-  security: readonly (readonly SecuritySpec[])[],
-  config: ClientConfig
-): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
-  const alternative =
-    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
-    security[0] ??
-    [];
-  const headers: Record<string, string> = {};
-  const query: Record<string, string> = {};
-  const cookies: string[] = [];
-  for (const scheme of alternative) {
-    if (scheme.kind === 'apiKey') {
-      const provider = config.auth?.apiKey?.[scheme.scheme];
-      if (provider === undefined) continue;
-      const value = await resolveToken(provider);
-      if (scheme.in === 'header') headers[scheme.name] = value;
-      else if (scheme.in === 'query') query[scheme.name] = value;
-      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
-      // so the credential can't break the `Cookie` header syntax.
-      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
-    } else if (scheme.kind === 'bearer') {
-      const provider = config.auth?.bearer;
-      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
-    } else {
-      const basic = config.auth?.basic;
-      if (basic !== undefined) {
-        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
-      }
-    }
-  }
-  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
-  return { headers, query };
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * `createClient` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
- * to a plain record — spreading a `Headers` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
- * `onResponse` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * The optional behaviors `createClientCore` can dispatch to but never statically
- * imports. The package's public `createClient` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
- * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
- * are honored, and an omitted `explode` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller `init.headers` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
- * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's `error` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (`errorMode` is fixed at construction — `configure()`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
-    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
-    // basic/apiKey. `apiKey` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: `createClientCore` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
- * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
-}
-
-export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe.redocly.com" });
-
-export const { configure, use } = client;
-export const setBearer = client.auth.bearer;
-export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
-export const listMenuItems = (params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
-export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
-export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
-export const getMenuItemPhoto = (menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
-export const listOrders = (params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
-export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
-export const getOrderById = (orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
-export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
-export const updateOrder = (orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
-export const listOrderItems = (params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
-export const getRevenue = (params: {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
-export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
diff --git a/tests/e2e/generate-client/examples/custom-pagination/.gitignore b/tests/e2e/generate-client/examples/custom-pagination/.gitignore
index 3c3629e647..612acc5cae 100644
--- a/tests/e2e/generate-client/examples/custom-pagination/.gitignore
+++ b/tests/e2e/generate-client/examples/custom-pagination/.gitignore
@@ -1 +1,3 @@
 node_modules
+src/api/
+package-lock.json
diff --git a/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts b/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
deleted file mode 100644
index 9a974c93bb..0000000000
--- a/tests/e2e/generate-client/examples/custom-pagination/src/api/client.ts
+++ /dev/null
@@ -1,1015 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Cafe Orders Search API (v1.0.0)
- * A body-cursor search API for the hand-written pagination example.
- */
-
-export type Order = {
-    id: string;
-    drink: string;
-    status: "pending" | "ready" | "delivered";
-};
-
-export type SearchOrdersResult = {
-    items: Order[];
-    /**
-     * Cursor of the next page; absent on the last page.
-     */
-    nextCursor?: string;
-};
-
-export type SearchOrdersBody = {
-    status?: string;
-    /**
-     * Opaque cursor of the page to fetch; omit for the first page.
-     */
-    cursor?: string;
-    limit?: number;
-};
-
-export type SearchOrdersVariables = {
-    body: SearchOrdersBody;
-};
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    searchOrders: {
-        args: {
-            body: SearchOrdersBody;
-        };
-        result: SearchOrdersResult;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    searchOrders: { id: "searchOrders", method: "POST", path: "/orders/search", body: { contentType: "application/json" } }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — `@redocly/client-generator`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits `OPERATIONS` literals typed
- * `satisfies Record<string, OperationDescriptor>` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
- * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to `'json'` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
- * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real `ApiError` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call `parseAs` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of `data`/`error` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
- * streams and, for paginated operations, `item` (the page's element type) and — on
- * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
- * iteration unwraps the `Result` envelope the one-shot `result` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: `{}` has no required members, so
- * `{} extends A` is true exactly when every member of `A` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type `.pages()` yields: the RAW page declared by `page` (the generator
- * writes it only on result-mode paginated entries, whose `result` is the envelope),
- * or the method's own `result` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares `item` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
- * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
- * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
- * `onError` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(`Request failed with status ${status}`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
- * `filter=a/b` survives instead of `filter=a%2Fb`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
- * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
- * `deepObject` brackets, and `null`/`undefined` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(`${key}[${subKey}]`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. `%20` (not `+`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-      }
-    } else if (Object(value) === value) {
-      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
-          else params.append(`${key}[${subKey}]`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(`${key}=${encodeReserved(String(value))}`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? `${url}?${qs}` : url;
-}
-
-/**
- * Read the response body per `kind`. `'auto'` negotiates from the content type
- * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom `retryOn` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
- * unless `jitter === false`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * `createClient` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
- * to a plain record — spreading a `Headers` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
- * `onResponse` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * The optional behaviors `createClientCore` can dispatch to but never statically
- * imports. The package's public `createClient` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
- * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
- * are honored, and an omitted `explode` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller `init.headers` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
- * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's `error` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (`errorMode` is fixed at construction — `configure()`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
-    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
-    // basic/apiKey. `apiKey` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: `createClientCore` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
- * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, {});
-}
-
-export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS, { serverUrl: "https://api.cafe-orders.example.com" });
-
-export const { configure, use } = client;
-export const searchOrders = (body: {
-    status?: string;
-    /**
-     * Opaque cursor of the page to fetch; omit for the first page.
-     */
-    cursor?: string;
-    limit?: number;
-}, init: RequestOptions = {}) => client.searchOrders({ body }, init);
diff --git a/tests/e2e/generate-client/examples/customization/.gitignore b/tests/e2e/generate-client/examples/customization/.gitignore
index f06235c460..6eb23affb8 100644
--- a/tests/e2e/generate-client/examples/customization/.gitignore
+++ b/tests/e2e/generate-client/examples/customization/.gitignore
@@ -1,2 +1,4 @@
 node_modules
 dist
+src/api/
+package-lock.json
diff --git a/tests/e2e/generate-client/examples/customization/README.md b/tests/e2e/generate-client/examples/customization/README.md
index 235720acc3..af32d582d5 100644
--- a/tests/e2e/generate-client/examples/customization/README.md
+++ b/tests/e2e/generate-client/examples/customization/README.md
@@ -10,11 +10,12 @@ mechanism composes from the hand-written `src/main.ts`, so it survives regenerat
 4. **Raw-Response handling** — `onResponse` observes or replaces the `Response`.
 5. **Per-call headers** — the trailing `RequestOptions` argument.
 
-The generated client under `src/api/` is checked in and **drift-checked against the generator in CI**.
+The generated client under `src/api/` is gitignored; CI regenerates it and type-checks this example.
 
 ## Run
 
 ```bash
 npm install
+npm run generate   # generate src/api (the client is gitignored)
 npm run dev
 ```
diff --git a/tests/e2e/generate-client/examples/customization/openapi.yaml b/tests/e2e/generate-client/examples/customization/openapi.yaml
deleted file mode 100644
index a255b72a20..0000000000
--- a/tests/e2e/generate-client/examples/customization/openapi.yaml
+++ /dev/null
@@ -1,1163 +0,0 @@
-openapi: 3.2.0
-info:
-  title: Redocly Cafe
-  description: |
-    Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
-    Create API credentials and try it yourself in a realistic OpenAPI workflow.
-  version: 1.0.0
-  contact:
-    email: team@redocly.com
-    url: https://redocly.com/contact-us/
-  license:
-    name: MIT
-    url: https://opensource.org/licenses/MIT
-  termsOfService: https://redocly.com/subscription-agreement
-servers:
-  - url: https://api.cafe.redocly.com
-    description: Live server.
-tags:
-  - name: Authorization
-    description: Create a client to demo the API.
-  - name: Products
-    description: Operations related to products.
-  - name: Orders
-    description: Order management operations.
-  - name: Statistics
-    description: Statistics operations.
-paths:
-  /menu:
-    get:
-      tags:
-        - Products
-      summary: List all menu items
-      description: Retrieve a collection of menu items with optional filtering and pagination.
-      operationId: listMenuItems
-      security: []
-      parameters:
-        - $ref: '#/components/parameters/After'
-        - $ref: '#/components/parameters/Before'
-        - $ref: '#/components/parameters/Sort'
-        - $ref: '#/components/parameters/Filter'
-        - $ref: '#/components/parameters/Search'
-        - $ref: '#/components/parameters/Limit'
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/MenuItemList'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    post:
-      tags:
-        - Products
-      summary: Create menu item
-      description: Create a new menu item.
-      operationId: createMenuItem
-      security:
-        - OAuth2:
-            - menu:write
-      requestBody:
-        required: true
-        content:
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/MenuItem'
-      responses:
-        '201':
-          description: Menu item created successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/MenuItem'
-              examples:
-                MenuItemResponse:
-                  value:
-                    id: prd_01khr487f7qm7p44xn427m43vb
-                    object: menuItem
-                    name: coffee
-                    price: 4000
-                    category: beverage
-                    createdAt: '2026-02-18T10:20:38.228Z'
-                    updatedAt: '2026-02-18T10:20:38.228Z'
-                    volume: 600
-                    containsCaffeine: false
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '409':
-          $ref: '#/components/responses/Conflict'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /menu/{menuItemId}:
-    parameters:
-      - $ref: '#/components/parameters/MenuItemId'
-    delete:
-      tags:
-        - Products
-      summary: Delete a menu item
-      description: Delete an existing menu item.
-      operationId: deleteMenuItem
-      security:
-        - OAuth2:
-            - menu:write
-      responses:
-        '204':
-          description: Menu item deleted successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /menu-item-images/{menuItemId}:
-    parameters:
-      - $ref: '#/components/parameters/MenuItemId'
-    get:
-      operationId: getMenuItemPhoto
-      summary: Retrieve a menu item photo
-      description: Retrieve the product photo image for a specific menu item.
-      security: []
-      tags:
-        - Products
-      parameters:
-        - $ref: '#/components/parameters/PhotoSize'
-      responses:
-        '200':
-          description: Menu item photo retrieved successfully.
-          content:
-            image/png:
-              schema:
-                type: string
-                format: binary
-            text/plain:
-              schema:
-                description: Alternative image text.
-                type: string
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /orders:
-    get:
-      tags:
-        - Orders
-      summary: List all orders
-      description: Retrieve a collection of orders with optional filtering and pagination.
-      operationId: listOrders
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/Filter'
-        - $ref: '#/components/parameters/Sort'
-        - $ref: '#/components/parameters/Limit'
-        - $ref: '#/components/parameters/After'
-        - $ref: '#/components/parameters/Before'
-        - $ref: '#/components/parameters/Search'
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/OrderList'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    post:
-      tags:
-        - Orders
-      summary: Create order
-      description: |
-        Create a new order.
-        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
-      operationId: createOrder
-      security:
-        - OAuth2:
-            - orders:write
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Order'
-            examples:
-              OrderRequest:
-                dataValue:
-                  customerName: Mary Ann
-                  orderItems:
-                    - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                      quantity: 2
-                      comment: No sugar!
-                      discount: 0
-      responses:
-        '201':
-          description: Order placed successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: placed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /orders/{orderId}:
-    get:
-      tags:
-        - Orders
-      summary: Retrieve an order
-      description: Retrieve a single order by its ID.
-      operationId: getOrderById
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-        - name: X-Request-Id
-          in: header
-          required: false
-          description: |
-            Optional client-supplied correlation ID, echoed in logs and traces.
-          schema:
-            type: string
-            format: uuid
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: placed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    patch:
-      tags:
-        - Orders
-      summary: Partially update an order
-      description: |
-        Update an existing order status.
-        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
-      operationId: updateOrder
-      security:
-        - OAuth2:
-            - orders:write
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-      requestBody:
-        content:
-          application/json:
-            schema:
-              type: object
-              description: |
-                Partial order update using JSON Merge Patch - only include fields to update.
-              properties:
-                status:
-                  $ref: '#/components/schemas/OrderStatus'
-              required:
-                - status
-      responses:
-        '200':
-          description: Order updated successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: completed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    delete:
-      tags:
-        - Orders
-      summary: Delete an order
-      description: |
-        Delete the order.
-        To keep the order history, the order should be canceled instead of deleted.
-      operationId: deleteOrder
-      security:
-        - OAuth2:
-            - orders:write
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-      responses:
-        '204':
-          description: Order deleted successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /order-items:
-    get:
-      tags:
-        - Orders
-      summary: List all order items with menu item details
-      description: |
-        Returns an array of order items for a specific order.
-        Use the `filter` parameter to filter by order ID.
-      operationId: listOrderItems
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/Filter'
-          required: true
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                type: array
-                description: List of menu items that are part of the order.
-                items:
-                  $ref: '#/components/schemas/OrderItem'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /revenue:
-    get:
-      tags:
-        - Statistics
-      summary: Get revenue statistics
-      description: |
-        Retrieve revenue statistics for a configurable date range.
-        Returns revenue, order counts, average order amount, and other useful statistics.
-      operationId: getRevenue
-      security:
-        - ApiKey: []
-      parameters:
-        - name: startDate
-          in: query
-          required: false
-          description: |
-            Start date for the revenue calculation period (ISO 8601 datetime format).
-            Defaults to 30 days ago if not provided.
-          schema:
-            type: string
-            format: date
-          example: '2026-01-01'
-        - name: endDate
-          in: query
-          required: false
-          description: |
-            End date for the revenue calculation period (ISO 8601 datetime format).
-            Defaults to current time if not provided.
-          schema:
-            type: string
-            format: date
-          example: '2026-01-31'
-      responses:
-        '200':
-          description: Revenue statistics retrieved successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RevenueStatistics'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /oauth2/register:
-    post:
-      tags:
-        - Authorization
-      summary: Create OAuth2 client
-      description: |
-        Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
-        - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type, 
-          `redirectUris` must be provided (per RFC 7591 Section 2).
-        - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
-        Returns the registered client information per RFC 7591, including:
-        - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
-      operationId: registerOAuth2Client
-      security: []
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/RegisterClientObject'
-      responses:
-        '201':
-          description: OAuth2 client registered successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/OAuth2Client'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-webhooks:
-  order-notification:
-    post:
-      tags:
-        - Orders
-      operationId: orderNotificationWebhook
-      security: []
-      summary: Order notification webhook
-      description: Webhook triggered when a new order is placed.
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/OrderNotification'
-      responses:
-        '200':
-          description: Webhook received successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-components:
-  securitySchemes:
-    OAuth2:
-      type: oauth2
-      description: OAuth2 authorization for API access.
-      flows:
-        authorizationCode:
-          authorizationUrl: https://api.cafe.redocly.com/oauth2/authorize
-          tokenUrl: https://api.cafe.redocly.com/oauth2/token
-          scopes:
-            menu:read: Read access to menu items and images
-            menu:write: Write access to menu items (create, delete)
-            orders:read: Read access to orders
-            orders:write: Write access to orders (create, update, delete)
-        clientCredentials:
-          tokenUrl: https://api.cafe.redocly.com/oauth2/token
-          scopes:
-            menu:read: Read access to menu items and images
-            menu:write: Write access to menu items (create, delete)
-            orders:read: Read access to orders
-            orders:write: Write access to orders (create, update, delete)
-    ApiKey:
-      type: apiKey
-      name: X-API-Key
-      in: header
-      description: API key for internal operations.
-  parameters:
-    After:
-      name: after
-      in: query
-      required: false
-      description: Use the `endCursor` as a value for the `after` parameter to get the next page.
-      schema:
-        type: string
-      example: a25fgaksjf23la==
-    Before:
-      name: before
-      in: query
-      required: false
-      description: |
-        Use the `startCursor` as a value for the `before` parameter to get the next page.
-      schema:
-        type: string
-      example: bfg23aksjf23zb1==
-    Sort:
-      name: sort
-      description: |-
-        To sort by id in descending order use `-id`.
-        To sort by id in ascending order use `id`.
-      in: query
-      required: false
-      schema:
-        type: string
-      example: '-name'
-    Filter:
-      name: filter
-      description: |-
-        Filters the collection items using space-separated `field:value` pairs.
-
-        **Format:** `field1:value1 field2:value2`
-
-        **Supported operators:**
-        - `field:value` - Exact match
-        - `field:value1,value2` - Match any of the comma-separated values (OR)
-        - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-
-        **Examples:**
-        - `status:placed` - Filter by single status.
-        - `status:placed,completed` - Filter by multiple statuses.
-        - `createdAt:30d` - Filter orders created in the last 30 days.
-        - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-        - `status:placed createdAt:7d` - Combine multiple filters.
-      in: query
-      required: false
-      schema:
-        type: string
-      example: orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7
-    Search:
-      name: search
-      in: query
-      description: |-
-        Performs a case-insensitive text search across relevant fields in the collection.
-
-        **Fields searched depend on the endpoint:**
-        - **Menu items:** `name`, `photoTextDescription`
-        - **Orders:** `customerName`, `id`
-
-        Returns items where any of the searchable fields contain the search term as a substring.
-      required: false
-      schema:
-        type: string
-      example: coffee
-    Limit:
-      name: limit
-      description: |
-        Use to return a number of results per page.
-        If there is more data, use in combination with `after` to page through the data.
-      in: query
-      required: false
-      schema:
-        type: integer
-        minimum: 1
-        maximum: 100
-        default: 10
-      example: 10
-    MenuItemId:
-      name: menuItemId
-      in: path
-      description: ID of the menu item to retrieve.
-      required: true
-      schema:
-        type: string
-        pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-      example: prd_01h1s5z6vf2mm1mz3hevnn9va7
-    PhotoSize:
-      name: photoSize
-      in: query
-      description: Photo size to retrieve.
-      required: false
-      schema:
-        type: string
-        enum:
-          - thumbnail
-          - medium
-          - large
-        default: medium
-    OrderId:
-      name: orderId
-      in: path
-      description: ID of the order to retrieve.
-      required: true
-      schema:
-        type: string
-        pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-      example: ord_01h1s5z6vf2mm1mz3hevnn9va7
-  schemas:
-    Page:
-      type: object
-      properties:
-        endCursor:
-          type:
-            - string
-            - 'null'
-          description: |-
-            Use with the `after` query parameter to load the next page of data.
-            When `null`, there is no data.
-            The cursor is opaque and internal structure is subject to change.
-        startCursor:
-          type:
-            - string
-            - 'null'
-          description: |-
-            Use with the `before` query parameter to load the previous page of data.
-            When `null`, there is no data.
-            The cursor is opaque and internal structure is subject to change.
-        hasNextPage:
-          type: boolean
-          description: Indicates if there is a next page with items.
-        hasPrevPage:
-          type: boolean
-          description: Indicates if there is a previous page with items.
-        limit:
-          type: integer
-          minimum: 1
-          maximum: 100
-          default: 10
-          description: Value showing how many items are in the page limit.
-        total:
-          type: integer
-          description: Count of items across all pages.
-          minimum: 0
-      required:
-        - endCursor
-        - startCursor
-        - hasNextPage
-        - hasPrevPage
-        - limit
-        - total
-    MenuBaseItem:
-      type: object
-      properties:
-        createdAt:
-          description: Created date.
-          type: string
-          format: date-time
-          readOnly: true
-        updatedAt:
-          description: Updated date.
-          type: string
-          format: date-time
-          readOnly: true
-        id:
-          description: Menu item ID. Unique identifier prefixed with `prd_`.
-          type: string
-          readOnly: true
-          pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-          example: prd_01h1s5z6vf2mm1mz3hevnn9va7
-        object:
-          description: Entity name.
-          type: string
-          const: menuItem
-          readOnly: true
-        name:
-          description: Menu item name.
-          type: string
-          minLength: 1
-          maxLength: 50
-        price:
-          description: Price in cents.
-          type: integer
-          minimum: 0
-        photo:
-          writeOnly: true
-          type:
-            - string
-            - 'null'
-          format: binary
-          description: Photo of the menu item. Must be a PNG image and less than 1MB.
-        photoUrl:
-          readOnly: true
-          type: string
-          format: uri
-          description: Photo URL of the menu item.
-        photoTextDescription:
-          type:
-            - string
-            - 'null'
-      required:
-        - id
-        - name
-        - price
-        - createdAt
-        - updatedAt
-        - object
-    Beverage:
-      allOf:
-        - type: object
-          properties:
-            category:
-              description: Menu item category.
-              type: string
-              const: beverage
-            volume:
-              type: number
-              description: Size of the beverage in milliliters.
-              exclusiveMinimum: 0
-            containsCaffeine:
-              type: boolean
-              description: Indicates if the beverage contains caffeine.
-          required:
-            - category
-            - volume
-            - containsCaffeine
-        - $ref: '#/components/schemas/MenuBaseItem'
-    Dessert:
-      allOf:
-        - type: object
-          properties:
-            category:
-              description: Menu item category.
-              type: string
-              const: dessert
-            calories:
-              type: number
-              exclusiveMinimum: 0
-              description: Amount of calories.
-          required:
-            - category
-            - calories
-        - $ref: '#/components/schemas/MenuBaseItem'
-    MenuItem:
-      discriminator:
-        propertyName: category
-        mapping:
-          beverage: '#/components/schemas/Beverage'
-          dessert: '#/components/schemas/Dessert'
-      oneOf:
-        - $ref: '#/components/schemas/Beverage'
-        - $ref: '#/components/schemas/Dessert'
-      required:
-        - category
-    MenuItemList:
-      type: object
-      properties:
-        object:
-          type: string
-          const: list
-          description: Entity name.
-        page:
-          $ref: '#/components/schemas/Page'
-        items:
-          type: array
-          items:
-            $ref: '#/components/schemas/MenuItem'
-      required:
-        - object
-        - page
-        - items
-    Error:
-      type: object
-      properties:
-        type:
-          type: string
-          format: uri-reference
-          description: URI reference that identifies the problem type.
-          default: about:blank
-        title:
-          type: string
-          description: Short summary of the problem type.
-        status:
-          type: integer
-          format: int32
-          description: |
-            HTTP status code generated by the origin server for this occurrence of the problem.
-          minimum: 100
-          exclusiveMaximum: 600
-        instance:
-          type: string
-          format: uri-reference
-          description: |
-            URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-            May be used to locate the root of this problem in the source code.
-          example: /some/uri-reference#specific-occurrence-context
-        details:
-          description: Additional error details.
-          type: object
-          additionalProperties: true
-      required:
-        - type
-        - title
-        - status
-    OrderStatus:
-      type: string
-      description: Order status.
-      enum:
-        - placed
-        - preparing
-        - completed
-        - canceled
-    Order:
-      type: object
-      title: Order
-      properties:
-        id:
-          description: Order ID. Unique identifier prefixed with `ord_`.
-          type: string
-          format: ulid
-          readOnly: true
-          pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-          example: ord_01h1s5z6vf2mm1mz3hevnn9va7
-        object:
-          description: Entity name.
-          type: string
-          const: order
-          readOnly: true
-        customerName:
-          description: |
-            Name of the customer who placed the order.
-            Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-          type: string
-          pattern: ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-          minLength: 1
-          maxLength: 100
-        status:
-          allOf:
-            - $ref: '#/components/schemas/OrderStatus'
-          readOnly: true
-        totalPrice:
-          description: Total order price in cents.
-          type: integer
-          minimum: 0
-          readOnly: true
-        createdAt:
-          description: Created date.
-          type: string
-          format: date-time
-          readOnly: true
-        updatedAt:
-          description: Updated date.
-          type: string
-          format: date-time
-          readOnly: true
-        orderItems:
-          type: array
-          description: List of items to include in the order.
-          minItems: 1
-          items:
-            type: object
-            properties:
-              menuItemId:
-                type: string
-                format: ulid
-                description: ID of the menu item to add to the order.
-              quantity:
-                type: integer
-                minimum: 1
-                description: Quantity of the menu item.
-              discount:
-                type: integer
-                minimum: 0
-                description: Discount amount in cents (absolute value).
-                default: 0
-              comment:
-                type: string
-                maxLength: 500
-                description: Optional comment for the order item (e.g., "No sugar").
-            required:
-              - menuItemId
-              - quantity
-      required:
-        - customerName
-        - orderItems
-    OrderList:
-      type: object
-      properties:
-        object:
-          type: string
-          const: list
-          description: Entity name.
-        page:
-          $ref: '#/components/schemas/Page'
-        items:
-          type: array
-          items:
-            $ref: '#/components/schemas/Order'
-      required:
-        - object
-        - page
-        - items
-    OrderItem:
-      type: object
-      properties:
-        menuItemId:
-          type: string
-          description: ID of the menu item to add to the order.
-          writeOnly: true
-        menuItem:
-          allOf:
-            - $ref: '#/components/schemas/MenuItem'
-          description: Menu item that is part of the order.
-          readOnly: true
-        quantity:
-          type: integer
-          minimum: 1
-          description: Quantity of the menu item.
-        discount:
-          type: integer
-          minimum: 0
-          description: Discount amount in cents (absolute value).
-          default: 0
-        comment:
-          type: string
-          maxLength: 500
-          description: Optional comment for the order item (e.g., "No sugar").
-      required:
-        - menuItemId
-        - quantity
-    RevenueStatistics:
-      type: object
-      description: Revenue statistics for a given date range.
-      properties:
-        revenue:
-          type: number
-          format: float
-          description: Total revenue in cents from completed orders.
-          minimum: 0
-        averageOrderAmount:
-          type: number
-          format: float
-          description: Average order amount in cents (calculated from completed orders only).
-          minimum: 0
-        totalOrders:
-          type: integer
-          description: Total number of orders (all statuses) in the date range.
-          minimum: 0
-        placedOrders:
-          type: integer
-          description: Number of placed orders.
-          minimum: 0
-        preparingOrders:
-          type: integer
-          description: Number of preparing orders.
-          minimum: 0
-        completedOrders:
-          type: integer
-          description: Number of completed orders.
-          minimum: 0
-        canceledOrders:
-          type: integer
-          description: Number of canceled orders.
-          minimum: 0
-        startDate:
-          type: string
-          format: date
-          description: Start date of the revenue calculation period.
-        endDate:
-          type: string
-          format: date
-          description: End date of the revenue calculation period.
-      required:
-        - revenue
-        - averageOrderAmount
-        - totalOrders
-        - placedOrders
-        - preparingOrders
-        - completedOrders
-        - canceledOrders
-        - startDate
-        - endDate
-    RegisterClientObject:
-      type: object
-      properties:
-        name:
-          type: string
-          description: Client name.
-        redirectUris:
-          type: array
-          items:
-            type: string
-            format: uri
-          description: List of redirect URIs (optional, defaults to empty array).
-        scopes:
-          type: array
-          items:
-            type: string
-            enum:
-              - menu:read
-              - menu:write
-              - orders:read
-              - orders:write
-          description: List of scopes.
-        grantTypes:
-          type: array
-          items:
-            type: string
-            enum:
-              - authorization_code
-              - client_credentials
-          description: List of grant types.
-      required:
-        - name
-    OAuth2Client:
-      type: object
-      description: OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
-      properties:
-        clientId:
-          type: string
-          description: Client identifier issued by the authorization server.
-        clientSecret:
-          type: string
-          description: Client secret issued by the authorization server.
-        clientIdIssuedAt:
-          type: integer
-          format: int64
-          description: Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-        clientSecretExpiresAt:
-          type: integer
-          format: int64
-          description: Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-        name:
-          type: string
-          description: Client name (registered metadata).
-        redirectUris:
-          type: array
-          items:
-            type: string
-            format: uri
-          description: List of redirect URIs (registered metadata).
-        registrationClientUri:
-          type: string
-          format: uri
-          description: URL of the client configuration endpoint for managing this client registration (RFC 7592).
-        registrationAccessToken:
-          type: string
-          description: Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-        scopes:
-          type: array
-          items:
-            type: string
-            enum:
-              - menu:read
-              - menu:write
-              - orders:read
-              - orders:write
-          description: List of scopes (registered metadata).
-        grantTypes:
-          type: array
-          items:
-            type: string
-            enum:
-              - authorization_code
-              - client_credentials
-          description: List of grant types (registered metadata).
-      required:
-        - clientId
-        - clientSecret
-        - clientIdIssuedAt
-        - clientSecretExpiresAt
-        - registrationClientUri
-        - registrationAccessToken
-    OrderNotification:
-      type: object
-      required:
-        - orderId
-        - orderStatus
-        - timestamp
-      properties:
-        orderId:
-          type: string
-          description: Unique order identifier.
-        orderStatus:
-          $ref: '#/components/schemas/OrderStatus'
-        timestamp:
-          type: string
-          format: date-time
-          description: When the event occurred.
-  responses:
-    BadRequest:
-      description: Bad request - invalid input parameters.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    InternalServerError:
-      description: Internal server error.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Unauthorized:
-      description: Unauthorized - authorization required.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Forbidden:
-      description: Forbidden - insufficient permissions.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Conflict:
-      description: Conflict - entity already exists.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    NotFound:
-      description: Resource not found.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
diff --git a/tests/e2e/generate-client/examples/customization/redocly.yaml b/tests/e2e/generate-client/examples/customization/redocly.yaml
index 67ec5e5518..8613ade83f 100644
--- a/tests/e2e/generate-client/examples/customization/redocly.yaml
+++ b/tests/e2e/generate-client/examples/customization/redocly.yaml
@@ -3,7 +3,7 @@
 # (run `redocly generate-client` with no args to build every such api).
 apis:
   customization:
-    root: ./openapi.yaml
+    root: ../_shared/cafe.yaml
     clientOutput: ./src/api/client.ts
     client:
       generators:
diff --git a/tests/e2e/generate-client/examples/customization/src/api/client.ts b/tests/e2e/generate-client/examples/customization/src/api/client.ts
deleted file mode 100644
index 550cd946cd..0000000000
--- a/tests/e2e/generate-client/examples/customization/src/api/client.ts
+++ /dev/null
@@ -1,1968 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Redocly Cafe (v1.0.0)
- * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
- * Create API credentials and try it yourself in a realistic OpenAPI workflow.
- * 
- */
-
-export type Page = {
-    /**
-     * Use with the `after` query parameter to load the next page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    endCursor: string | null;
-    /**
-     * Use with the `before` query parameter to load the previous page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    startCursor: string | null;
-    /**
-     * Indicates if there is a next page with items.
-     */
-    hasNextPage: boolean;
-    /**
-     * Indicates if there is a previous page with items.
-     */
-    hasPrevPage: boolean;
-    /**
-     * Value showing how many items are in the page limit.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit: number;
-    /**
-     * Count of items across all pages.
-     * @minimum 0
-     */
-    total: number;
-};
-
-export type MenuBaseItem = {
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt: string;
-    /**
-     * Menu item ID. Unique identifier prefixed with `prd_`.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    readonly id: string;
-    /**
-     * Entity name.
-     */
-    readonly object: "menuItem";
-    /**
-     * Menu item name.
-     * @minLength 1
-     * @maxLength 50
-     */
-    name: string;
-    /**
-     * Price in cents.
-     * @minimum 0
-     */
-    price: number;
-    /**
-     * Photo of the menu item. Must be a PNG image and less than 1MB.
-     * @format binary
-     */
-    photo?: Blob | null;
-    /**
-     * Photo URL of the menu item.
-     * @format uri
-     */
-    readonly photoUrl?: string;
-    photoTextDescription?: string | null;
-};
-
-export type Beverage = {
-    /**
-     * Menu item category.
-     */
-    category: "beverage";
-    /**
-     * Size of the beverage in milliliters.
-     * @exclusiveMinimum 0
-     */
-    volume: number;
-    /**
-     * Indicates if the beverage contains caffeine.
-     */
-    containsCaffeine: boolean;
-} & MenuBaseItem;
-
-export type Dessert = {
-    /**
-     * Menu item category.
-     */
-    category: "dessert";
-    /**
-     * Amount of calories.
-     * @exclusiveMinimum 0
-     */
-    calories: number;
-} & MenuBaseItem;
-
-export type MenuItem = Beverage | Dessert;
-
-export type MenuItemList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: MenuItem[];
-};
-
-export type Error = {
-    /**
-     * URI reference that identifies the problem type.
-     * @format uri-reference
-     */
-    type: string;
-    /**
-     * Short summary of the problem type.
-     */
-    title: string;
-    /**
-     * HTTP status code generated by the origin server for this occurrence of the problem.
-     * @minimum 100
-     * @exclusiveMaximum 600
-     * @format int32
-     */
-    status: number;
-    /**
-     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-     * May be used to locate the root of this problem in the source code.
-     * @format uri-reference
-     */
-    instance?: string;
-    /**
-     * Additional error details.
-     */
-    details?: Record<string, unknown>;
-};
-
-/**
- * Order status.
- */
-export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
-
-export const OrderStatus = {
-    placed: "placed",
-    preparing: "preparing",
-    completed: "completed",
-    canceled: "canceled"
-} as const;
-
-export type Order = {
-    /**
-     * Order ID. Unique identifier prefixed with `ord_`.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     * @format ulid
-     */
-    readonly id?: string;
-    /**
-     * Entity name.
-     */
-    readonly object?: "order";
-    /**
-     * Name of the customer who placed the order.
-     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-     * @minLength 1
-     * @maxLength 100
-     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-     */
-    customerName: string;
-    readonly status?: OrderStatus;
-    /**
-     * Total order price in cents.
-     * @minimum 0
-     */
-    readonly totalPrice?: number;
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt?: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt?: string;
-    /**
-     * List of items to include in the order.
-     * @minItems 1
-     */
-    orderItems: {
-        /**
-         * ID of the menu item to add to the order.
-         * @format ulid
-         */
-        menuItemId: string;
-        /**
-         * Quantity of the menu item.
-         * @minimum 1
-         */
-        quantity: number;
-        /**
-         * Discount amount in cents (absolute value).
-         * @minimum 0
-         */
-        discount?: number;
-        /**
-         * Optional comment for the order item (e.g., "No sugar").
-         * @maxLength 500
-         */
-        comment?: string;
-    }[];
-};
-
-export type OrderList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: Order[];
-};
-
-export type OrderItem = {
-    /**
-     * ID of the menu item to add to the order.
-     */
-    menuItemId: string;
-    /**
-     * Menu item that is part of the order.
-     */
-    readonly menuItem?: MenuItem;
-    /**
-     * Quantity of the menu item.
-     * @minimum 1
-     */
-    quantity: number;
-    /**
-     * Discount amount in cents (absolute value).
-     * @minimum 0
-     */
-    discount?: number;
-    /**
-     * Optional comment for the order item (e.g., "No sugar").
-     * @maxLength 500
-     */
-    comment?: string;
-};
-
-/**
- * Revenue statistics for a given date range.
- */
-export type RevenueStatistics = {
-    /**
-     * Total revenue in cents from completed orders.
-     * @minimum 0
-     * @format float
-     */
-    revenue: number;
-    /**
-     * Average order amount in cents (calculated from completed orders only).
-     * @minimum 0
-     * @format float
-     */
-    averageOrderAmount: number;
-    /**
-     * Total number of orders (all statuses) in the date range.
-     * @minimum 0
-     */
-    totalOrders: number;
-    /**
-     * Number of placed orders.
-     * @minimum 0
-     */
-    placedOrders: number;
-    /**
-     * Number of preparing orders.
-     * @minimum 0
-     */
-    preparingOrders: number;
-    /**
-     * Number of completed orders.
-     * @minimum 0
-     */
-    completedOrders: number;
-    /**
-     * Number of canceled orders.
-     * @minimum 0
-     */
-    canceledOrders: number;
-    /**
-     * Start date of the revenue calculation period.
-     * @format date
-     */
-    startDate: string;
-    /**
-     * End date of the revenue calculation period.
-     * @format date
-     */
-    endDate: string;
-};
-
-export type RegisterClientObject = {
-    /**
-     * Client name.
-     */
-    name: string;
-    /**
-     * List of redirect URIs (optional, defaults to empty array).
-     */
-    redirectUris?: string[];
-    /**
-     * List of scopes.
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types.
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-/**
- * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
- */
-export type OAuth2Client = {
-    /**
-     * Client identifier issued by the authorization server.
-     */
-    clientId: string;
-    /**
-     * Client secret issued by the authorization server.
-     */
-    clientSecret: string;
-    /**
-     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-     * @format int64
-     */
-    clientIdIssuedAt: number;
-    /**
-     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-     * @format int64
-     */
-    clientSecretExpiresAt: number;
-    /**
-     * Client name (registered metadata).
-     */
-    name?: string;
-    /**
-     * List of redirect URIs (registered metadata).
-     */
-    redirectUris?: string[];
-    /**
-     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
-     * @format uri
-     */
-    registrationClientUri: string;
-    /**
-     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-     */
-    registrationAccessToken: string;
-    /**
-     * List of scopes (registered metadata).
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types (registered metadata).
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-export type OrderNotification = {
-    /**
-     * Unique order identifier.
-     */
-    orderId: string;
-    orderStatus: OrderStatus;
-    /**
-     * When the event occurred.
-     * @format date-time
-     */
-    timestamp: string;
-};
-
-/**
- * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
- */
-export function isBeverage(value: MenuItem): value is Beverage {
-    return (value as Record<string, unknown>)["category"] === "beverage";
-}
-
-/**
- * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
- */
-export function isDessert(value: MenuItem): value is Dessert {
-    return (value as Record<string, unknown>)["category"] === "dessert";
-}
-
-export type ListMenuItemsResult = MenuItemList;
-
-export type ListMenuItemsParams = {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-};
-
-export type ListMenuItemsVariables = {
-    params?: ListMenuItemsParams;
-};
-
-export type CreateMenuItemResult = MenuItem;
-
-export type CreateMenuItemBody = FormData;
-
-export type CreateMenuItemVariables = {
-    body: CreateMenuItemBody;
-};
-
-export type DeleteMenuItemResult = void;
-
-export type DeleteMenuItemVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-};
-
-export type GetMenuItemPhotoResult = Blob | string;
-
-export type GetMenuItemPhotoParams = {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-};
-
-export type GetMenuItemPhotoVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-    params?: GetMenuItemPhotoParams;
-};
-
-export type ListOrdersResult = OrderList;
-
-export type ListOrdersParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-};
-
-export type ListOrdersVariables = {
-    params?: ListOrdersParams;
-};
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    headers?: GetOrderByIdHeaders;
-};
-
-export type DeleteOrderResult = void;
-
-export type DeleteOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-};
-
-export type UpdateOrderResult = Order;
-
-export type UpdateOrderBody = {
-    status: OrderStatus;
-};
-
-export type UpdateOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    body?: UpdateOrderBody;
-};
-
-export type ListOrderItemsResult = OrderItem[];
-
-export type ListOrderItemsParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-};
-
-export type ListOrderItemsVariables = {
-    params?: ListOrderItemsParams;
-};
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    listMenuItems: {
-        args: {
-            params?: ListMenuItemsParams;
-        };
-        result: ListMenuItemsResult;
-    };
-    createMenuItem: {
-        args: {
-            body: CreateMenuItemBody;
-        };
-        result: CreateMenuItemResult;
-    };
-    deleteMenuItem: {
-        args: {
-            /**
-             * ID of the menu item to retrieve.
-             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            menuItemId: string;
-        };
-        result: DeleteMenuItemResult;
-    };
-    getMenuItemPhoto: {
-        args: {
-            /**
-             * ID of the menu item to retrieve.
-             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            menuItemId: string;
-            params?: GetMenuItemPhotoParams;
-        };
-        result: GetMenuItemPhotoResult;
-    };
-    listOrders: {
-        args: {
-            params?: ListOrdersParams;
-        };
-        result: ListOrdersResult;
-    };
-    createOrder: {
-        args: {
-            body: CreateOrderBody;
-        };
-        result: CreateOrderResult;
-    };
-    getOrderById: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-            headers?: GetOrderByIdHeaders;
-        };
-        result: GetOrderByIdResult;
-    };
-    deleteOrder: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-        };
-        result: DeleteOrderResult;
-    };
-    updateOrder: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-            body?: UpdateOrderBody;
-        };
-        result: UpdateOrderResult;
-    };
-    listOrderItems: {
-        args: {
-            params?: ListOrderItemsParams;
-        };
-        result: ListOrderItemsResult;
-    };
-    getRevenue: {
-        args: {
-            params?: GetRevenueParams;
-        };
-        result: GetRevenueResult;
-    };
-    registerOAuth2Client: {
-        args: {
-            body: RegisterOAuth2ClientBody;
-        };
-        result: RegisterOAuth2ClientResult;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
-    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
-    tags: readonly string[];
-}>["tags"][number];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — `@redocly/client-generator`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits `OPERATIONS` literals typed
- * `satisfies Record<string, OperationDescriptor>` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
- * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to `'json'` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
- * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real `ApiError` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call `parseAs` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of `data`/`error` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
- * streams and, for paginated operations, `item` (the page's element type) and — on
- * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
- * iteration unwraps the `Result` envelope the one-shot `result` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: `{}` has no required members, so
- * `{} extends A` is true exactly when every member of `A` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type `.pages()` yields: the RAW page declared by `page` (the generator
- * writes it only on result-mode paginated entries, whose `result` is the envelope),
- * or the method's own `result` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares `item` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
- * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
- * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
- * `onError` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(`Request failed with status ${status}`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
- * `filter=a/b` survives instead of `filter=a%2Fb`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
- * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
- * `deepObject` brackets, and `null`/`undefined` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(`${key}[${subKey}]`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. `%20` (not `+`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-      }
-    } else if (Object(value) === value) {
-      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
-          else params.append(`${key}[${subKey}]`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(`${key}=${encodeReserved(String(value))}`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? `${url}?${qs}` : url;
-}
-
-/**
- * Read the response body per `kind`. `'auto'` negotiates from the content type
- * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom `retryOn` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
- * unless `jitter === false`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/** Resolve a credential: a literal passes through; a function is awaited per request. */
-async function resolveToken(provider: TokenProvider): Promise<string> {
-  return typeof provider === 'function' ? await provider() : provider;
-}
-
-/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
-function encodeBase64(text: string): string {
-  let binary = '';
-  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
-  return btoa(binary);
-}
-
-/** Whether a credential for this scheme is configured on the instance. */
-function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
-  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
-  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
-  return config.auth?.basic !== undefined;
-}
-
-/**
- * Build the auth headers/query for one operation's `security` OR-alternatives from the
- * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * The first alternative whose schemes (an AND-set) are all configured is applied, so
- * "bearer OR apiKey" works with either credential and never sends both. When none is
- * fully configured, the first alternative's configured schemes are still sent (the
- * server rejects the request, mirroring the previous behavior).
- * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
- */
-async function resolveAuth(
-  security: readonly (readonly SecuritySpec[])[],
-  config: ClientConfig
-): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
-  const alternative =
-    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
-    security[0] ??
-    [];
-  const headers: Record<string, string> = {};
-  const query: Record<string, string> = {};
-  const cookies: string[] = [];
-  for (const scheme of alternative) {
-    if (scheme.kind === 'apiKey') {
-      const provider = config.auth?.apiKey?.[scheme.scheme];
-      if (provider === undefined) continue;
-      const value = await resolveToken(provider);
-      if (scheme.in === 'header') headers[scheme.name] = value;
-      else if (scheme.in === 'query') query[scheme.name] = value;
-      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
-      // so the credential can't break the `Cookie` header syntax.
-      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
-    } else if (scheme.kind === 'bearer') {
-      const provider = config.auth?.bearer;
-      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
-    } else {
-      const basic = config.auth?.basic;
-      if (basic !== undefined) {
-        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
-      }
-    }
-  }
-  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
-  return { headers, query };
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * `createClient` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
- * to a plain record — spreading a `Headers` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
- * `onResponse` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * The optional behaviors `createClientCore` can dispatch to but never statically
- * imports. The package's public `createClient` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
- * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
- * are honored, and an omitted `explode` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller `init.headers` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
- * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's `error` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (`errorMode` is fixed at construction — `configure()`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
-    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
-    // basic/apiKey. `apiKey` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: `createClientCore` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
- * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
-}
-
-export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe.redocly.com" });
-
-export const { configure, use } = client;
-export const setBearer = client.auth.bearer;
-export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
-export const listMenuItems = (params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
-export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
-export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
-export const getMenuItemPhoto = (menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
-export const listOrders = (params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
-export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
-export const getOrderById = (orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
-export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
-export const updateOrder = (orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
-export const listOrderItems = (params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
-export const getRevenue = (params: {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
-export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
diff --git a/tests/e2e/generate-client/examples/fetch-functions/.gitignore b/tests/e2e/generate-client/examples/fetch-functions/.gitignore
index f06235c460..6eb23affb8 100644
--- a/tests/e2e/generate-client/examples/fetch-functions/.gitignore
+++ b/tests/e2e/generate-client/examples/fetch-functions/.gitignore
@@ -1,2 +1,4 @@
 node_modules
 dist
+src/api/
+package-lock.json
diff --git a/tests/e2e/generate-client/examples/fetch-functions/README.md b/tests/e2e/generate-client/examples/fetch-functions/README.md
index 456892f49a..e90c7e2b89 100644
--- a/tests/e2e/generate-client/examples/fetch-functions/README.md
+++ b/tests/e2e/generate-client/examples/fetch-functions/README.md
@@ -7,9 +7,9 @@ functions (`configure()`, `listMenuItems()`), with `ApiError` handling.
 
 ```bash
 npm install
-npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
+npm run generate   # generate src/api (the client is gitignored)
 npm run dev        # open the printed local URL
 ```
 
-The generated client under `src/api/` is committed and drift-checked against the generator in CI.
+The generated client under `src/api/` is gitignored; CI regenerates it and type-checks this example.
 Point `configure({ serverUrl })` at your own server or a mock as needed.
diff --git a/tests/e2e/generate-client/examples/fetch-functions/openapi.yaml b/tests/e2e/generate-client/examples/fetch-functions/openapi.yaml
deleted file mode 100644
index a255b72a20..0000000000
--- a/tests/e2e/generate-client/examples/fetch-functions/openapi.yaml
+++ /dev/null
@@ -1,1163 +0,0 @@
-openapi: 3.2.0
-info:
-  title: Redocly Cafe
-  description: |
-    Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
-    Create API credentials and try it yourself in a realistic OpenAPI workflow.
-  version: 1.0.0
-  contact:
-    email: team@redocly.com
-    url: https://redocly.com/contact-us/
-  license:
-    name: MIT
-    url: https://opensource.org/licenses/MIT
-  termsOfService: https://redocly.com/subscription-agreement
-servers:
-  - url: https://api.cafe.redocly.com
-    description: Live server.
-tags:
-  - name: Authorization
-    description: Create a client to demo the API.
-  - name: Products
-    description: Operations related to products.
-  - name: Orders
-    description: Order management operations.
-  - name: Statistics
-    description: Statistics operations.
-paths:
-  /menu:
-    get:
-      tags:
-        - Products
-      summary: List all menu items
-      description: Retrieve a collection of menu items with optional filtering and pagination.
-      operationId: listMenuItems
-      security: []
-      parameters:
-        - $ref: '#/components/parameters/After'
-        - $ref: '#/components/parameters/Before'
-        - $ref: '#/components/parameters/Sort'
-        - $ref: '#/components/parameters/Filter'
-        - $ref: '#/components/parameters/Search'
-        - $ref: '#/components/parameters/Limit'
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/MenuItemList'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    post:
-      tags:
-        - Products
-      summary: Create menu item
-      description: Create a new menu item.
-      operationId: createMenuItem
-      security:
-        - OAuth2:
-            - menu:write
-      requestBody:
-        required: true
-        content:
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/MenuItem'
-      responses:
-        '201':
-          description: Menu item created successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/MenuItem'
-              examples:
-                MenuItemResponse:
-                  value:
-                    id: prd_01khr487f7qm7p44xn427m43vb
-                    object: menuItem
-                    name: coffee
-                    price: 4000
-                    category: beverage
-                    createdAt: '2026-02-18T10:20:38.228Z'
-                    updatedAt: '2026-02-18T10:20:38.228Z'
-                    volume: 600
-                    containsCaffeine: false
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '409':
-          $ref: '#/components/responses/Conflict'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /menu/{menuItemId}:
-    parameters:
-      - $ref: '#/components/parameters/MenuItemId'
-    delete:
-      tags:
-        - Products
-      summary: Delete a menu item
-      description: Delete an existing menu item.
-      operationId: deleteMenuItem
-      security:
-        - OAuth2:
-            - menu:write
-      responses:
-        '204':
-          description: Menu item deleted successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /menu-item-images/{menuItemId}:
-    parameters:
-      - $ref: '#/components/parameters/MenuItemId'
-    get:
-      operationId: getMenuItemPhoto
-      summary: Retrieve a menu item photo
-      description: Retrieve the product photo image for a specific menu item.
-      security: []
-      tags:
-        - Products
-      parameters:
-        - $ref: '#/components/parameters/PhotoSize'
-      responses:
-        '200':
-          description: Menu item photo retrieved successfully.
-          content:
-            image/png:
-              schema:
-                type: string
-                format: binary
-            text/plain:
-              schema:
-                description: Alternative image text.
-                type: string
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /orders:
-    get:
-      tags:
-        - Orders
-      summary: List all orders
-      description: Retrieve a collection of orders with optional filtering and pagination.
-      operationId: listOrders
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/Filter'
-        - $ref: '#/components/parameters/Sort'
-        - $ref: '#/components/parameters/Limit'
-        - $ref: '#/components/parameters/After'
-        - $ref: '#/components/parameters/Before'
-        - $ref: '#/components/parameters/Search'
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/OrderList'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    post:
-      tags:
-        - Orders
-      summary: Create order
-      description: |
-        Create a new order.
-        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
-      operationId: createOrder
-      security:
-        - OAuth2:
-            - orders:write
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Order'
-            examples:
-              OrderRequest:
-                dataValue:
-                  customerName: Mary Ann
-                  orderItems:
-                    - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                      quantity: 2
-                      comment: No sugar!
-                      discount: 0
-      responses:
-        '201':
-          description: Order placed successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: placed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /orders/{orderId}:
-    get:
-      tags:
-        - Orders
-      summary: Retrieve an order
-      description: Retrieve a single order by its ID.
-      operationId: getOrderById
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-        - name: X-Request-Id
-          in: header
-          required: false
-          description: |
-            Optional client-supplied correlation ID, echoed in logs and traces.
-          schema:
-            type: string
-            format: uuid
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: placed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    patch:
-      tags:
-        - Orders
-      summary: Partially update an order
-      description: |
-        Update an existing order status.
-        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
-      operationId: updateOrder
-      security:
-        - OAuth2:
-            - orders:write
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-      requestBody:
-        content:
-          application/json:
-            schema:
-              type: object
-              description: |
-                Partial order update using JSON Merge Patch - only include fields to update.
-              properties:
-                status:
-                  $ref: '#/components/schemas/OrderStatus'
-              required:
-                - status
-      responses:
-        '200':
-          description: Order updated successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: completed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    delete:
-      tags:
-        - Orders
-      summary: Delete an order
-      description: |
-        Delete the order.
-        To keep the order history, the order should be canceled instead of deleted.
-      operationId: deleteOrder
-      security:
-        - OAuth2:
-            - orders:write
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-      responses:
-        '204':
-          description: Order deleted successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /order-items:
-    get:
-      tags:
-        - Orders
-      summary: List all order items with menu item details
-      description: |
-        Returns an array of order items for a specific order.
-        Use the `filter` parameter to filter by order ID.
-      operationId: listOrderItems
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/Filter'
-          required: true
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                type: array
-                description: List of menu items that are part of the order.
-                items:
-                  $ref: '#/components/schemas/OrderItem'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /revenue:
-    get:
-      tags:
-        - Statistics
-      summary: Get revenue statistics
-      description: |
-        Retrieve revenue statistics for a configurable date range.
-        Returns revenue, order counts, average order amount, and other useful statistics.
-      operationId: getRevenue
-      security:
-        - ApiKey: []
-      parameters:
-        - name: startDate
-          in: query
-          required: false
-          description: |
-            Start date for the revenue calculation period (ISO 8601 datetime format).
-            Defaults to 30 days ago if not provided.
-          schema:
-            type: string
-            format: date
-          example: '2026-01-01'
-        - name: endDate
-          in: query
-          required: false
-          description: |
-            End date for the revenue calculation period (ISO 8601 datetime format).
-            Defaults to current time if not provided.
-          schema:
-            type: string
-            format: date
-          example: '2026-01-31'
-      responses:
-        '200':
-          description: Revenue statistics retrieved successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RevenueStatistics'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /oauth2/register:
-    post:
-      tags:
-        - Authorization
-      summary: Create OAuth2 client
-      description: |
-        Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
-        - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type, 
-          `redirectUris` must be provided (per RFC 7591 Section 2).
-        - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
-        Returns the registered client information per RFC 7591, including:
-        - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
-      operationId: registerOAuth2Client
-      security: []
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/RegisterClientObject'
-      responses:
-        '201':
-          description: OAuth2 client registered successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/OAuth2Client'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-webhooks:
-  order-notification:
-    post:
-      tags:
-        - Orders
-      operationId: orderNotificationWebhook
-      security: []
-      summary: Order notification webhook
-      description: Webhook triggered when a new order is placed.
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/OrderNotification'
-      responses:
-        '200':
-          description: Webhook received successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-components:
-  securitySchemes:
-    OAuth2:
-      type: oauth2
-      description: OAuth2 authorization for API access.
-      flows:
-        authorizationCode:
-          authorizationUrl: https://api.cafe.redocly.com/oauth2/authorize
-          tokenUrl: https://api.cafe.redocly.com/oauth2/token
-          scopes:
-            menu:read: Read access to menu items and images
-            menu:write: Write access to menu items (create, delete)
-            orders:read: Read access to orders
-            orders:write: Write access to orders (create, update, delete)
-        clientCredentials:
-          tokenUrl: https://api.cafe.redocly.com/oauth2/token
-          scopes:
-            menu:read: Read access to menu items and images
-            menu:write: Write access to menu items (create, delete)
-            orders:read: Read access to orders
-            orders:write: Write access to orders (create, update, delete)
-    ApiKey:
-      type: apiKey
-      name: X-API-Key
-      in: header
-      description: API key for internal operations.
-  parameters:
-    After:
-      name: after
-      in: query
-      required: false
-      description: Use the `endCursor` as a value for the `after` parameter to get the next page.
-      schema:
-        type: string
-      example: a25fgaksjf23la==
-    Before:
-      name: before
-      in: query
-      required: false
-      description: |
-        Use the `startCursor` as a value for the `before` parameter to get the next page.
-      schema:
-        type: string
-      example: bfg23aksjf23zb1==
-    Sort:
-      name: sort
-      description: |-
-        To sort by id in descending order use `-id`.
-        To sort by id in ascending order use `id`.
-      in: query
-      required: false
-      schema:
-        type: string
-      example: '-name'
-    Filter:
-      name: filter
-      description: |-
-        Filters the collection items using space-separated `field:value` pairs.
-
-        **Format:** `field1:value1 field2:value2`
-
-        **Supported operators:**
-        - `field:value` - Exact match
-        - `field:value1,value2` - Match any of the comma-separated values (OR)
-        - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-
-        **Examples:**
-        - `status:placed` - Filter by single status.
-        - `status:placed,completed` - Filter by multiple statuses.
-        - `createdAt:30d` - Filter orders created in the last 30 days.
-        - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-        - `status:placed createdAt:7d` - Combine multiple filters.
-      in: query
-      required: false
-      schema:
-        type: string
-      example: orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7
-    Search:
-      name: search
-      in: query
-      description: |-
-        Performs a case-insensitive text search across relevant fields in the collection.
-
-        **Fields searched depend on the endpoint:**
-        - **Menu items:** `name`, `photoTextDescription`
-        - **Orders:** `customerName`, `id`
-
-        Returns items where any of the searchable fields contain the search term as a substring.
-      required: false
-      schema:
-        type: string
-      example: coffee
-    Limit:
-      name: limit
-      description: |
-        Use to return a number of results per page.
-        If there is more data, use in combination with `after` to page through the data.
-      in: query
-      required: false
-      schema:
-        type: integer
-        minimum: 1
-        maximum: 100
-        default: 10
-      example: 10
-    MenuItemId:
-      name: menuItemId
-      in: path
-      description: ID of the menu item to retrieve.
-      required: true
-      schema:
-        type: string
-        pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-      example: prd_01h1s5z6vf2mm1mz3hevnn9va7
-    PhotoSize:
-      name: photoSize
-      in: query
-      description: Photo size to retrieve.
-      required: false
-      schema:
-        type: string
-        enum:
-          - thumbnail
-          - medium
-          - large
-        default: medium
-    OrderId:
-      name: orderId
-      in: path
-      description: ID of the order to retrieve.
-      required: true
-      schema:
-        type: string
-        pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-      example: ord_01h1s5z6vf2mm1mz3hevnn9va7
-  schemas:
-    Page:
-      type: object
-      properties:
-        endCursor:
-          type:
-            - string
-            - 'null'
-          description: |-
-            Use with the `after` query parameter to load the next page of data.
-            When `null`, there is no data.
-            The cursor is opaque and internal structure is subject to change.
-        startCursor:
-          type:
-            - string
-            - 'null'
-          description: |-
-            Use with the `before` query parameter to load the previous page of data.
-            When `null`, there is no data.
-            The cursor is opaque and internal structure is subject to change.
-        hasNextPage:
-          type: boolean
-          description: Indicates if there is a next page with items.
-        hasPrevPage:
-          type: boolean
-          description: Indicates if there is a previous page with items.
-        limit:
-          type: integer
-          minimum: 1
-          maximum: 100
-          default: 10
-          description: Value showing how many items are in the page limit.
-        total:
-          type: integer
-          description: Count of items across all pages.
-          minimum: 0
-      required:
-        - endCursor
-        - startCursor
-        - hasNextPage
-        - hasPrevPage
-        - limit
-        - total
-    MenuBaseItem:
-      type: object
-      properties:
-        createdAt:
-          description: Created date.
-          type: string
-          format: date-time
-          readOnly: true
-        updatedAt:
-          description: Updated date.
-          type: string
-          format: date-time
-          readOnly: true
-        id:
-          description: Menu item ID. Unique identifier prefixed with `prd_`.
-          type: string
-          readOnly: true
-          pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-          example: prd_01h1s5z6vf2mm1mz3hevnn9va7
-        object:
-          description: Entity name.
-          type: string
-          const: menuItem
-          readOnly: true
-        name:
-          description: Menu item name.
-          type: string
-          minLength: 1
-          maxLength: 50
-        price:
-          description: Price in cents.
-          type: integer
-          minimum: 0
-        photo:
-          writeOnly: true
-          type:
-            - string
-            - 'null'
-          format: binary
-          description: Photo of the menu item. Must be a PNG image and less than 1MB.
-        photoUrl:
-          readOnly: true
-          type: string
-          format: uri
-          description: Photo URL of the menu item.
-        photoTextDescription:
-          type:
-            - string
-            - 'null'
-      required:
-        - id
-        - name
-        - price
-        - createdAt
-        - updatedAt
-        - object
-    Beverage:
-      allOf:
-        - type: object
-          properties:
-            category:
-              description: Menu item category.
-              type: string
-              const: beverage
-            volume:
-              type: number
-              description: Size of the beverage in milliliters.
-              exclusiveMinimum: 0
-            containsCaffeine:
-              type: boolean
-              description: Indicates if the beverage contains caffeine.
-          required:
-            - category
-            - volume
-            - containsCaffeine
-        - $ref: '#/components/schemas/MenuBaseItem'
-    Dessert:
-      allOf:
-        - type: object
-          properties:
-            category:
-              description: Menu item category.
-              type: string
-              const: dessert
-            calories:
-              type: number
-              exclusiveMinimum: 0
-              description: Amount of calories.
-          required:
-            - category
-            - calories
-        - $ref: '#/components/schemas/MenuBaseItem'
-    MenuItem:
-      discriminator:
-        propertyName: category
-        mapping:
-          beverage: '#/components/schemas/Beverage'
-          dessert: '#/components/schemas/Dessert'
-      oneOf:
-        - $ref: '#/components/schemas/Beverage'
-        - $ref: '#/components/schemas/Dessert'
-      required:
-        - category
-    MenuItemList:
-      type: object
-      properties:
-        object:
-          type: string
-          const: list
-          description: Entity name.
-        page:
-          $ref: '#/components/schemas/Page'
-        items:
-          type: array
-          items:
-            $ref: '#/components/schemas/MenuItem'
-      required:
-        - object
-        - page
-        - items
-    Error:
-      type: object
-      properties:
-        type:
-          type: string
-          format: uri-reference
-          description: URI reference that identifies the problem type.
-          default: about:blank
-        title:
-          type: string
-          description: Short summary of the problem type.
-        status:
-          type: integer
-          format: int32
-          description: |
-            HTTP status code generated by the origin server for this occurrence of the problem.
-          minimum: 100
-          exclusiveMaximum: 600
-        instance:
-          type: string
-          format: uri-reference
-          description: |
-            URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-            May be used to locate the root of this problem in the source code.
-          example: /some/uri-reference#specific-occurrence-context
-        details:
-          description: Additional error details.
-          type: object
-          additionalProperties: true
-      required:
-        - type
-        - title
-        - status
-    OrderStatus:
-      type: string
-      description: Order status.
-      enum:
-        - placed
-        - preparing
-        - completed
-        - canceled
-    Order:
-      type: object
-      title: Order
-      properties:
-        id:
-          description: Order ID. Unique identifier prefixed with `ord_`.
-          type: string
-          format: ulid
-          readOnly: true
-          pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-          example: ord_01h1s5z6vf2mm1mz3hevnn9va7
-        object:
-          description: Entity name.
-          type: string
-          const: order
-          readOnly: true
-        customerName:
-          description: |
-            Name of the customer who placed the order.
-            Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-          type: string
-          pattern: ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-          minLength: 1
-          maxLength: 100
-        status:
-          allOf:
-            - $ref: '#/components/schemas/OrderStatus'
-          readOnly: true
-        totalPrice:
-          description: Total order price in cents.
-          type: integer
-          minimum: 0
-          readOnly: true
-        createdAt:
-          description: Created date.
-          type: string
-          format: date-time
-          readOnly: true
-        updatedAt:
-          description: Updated date.
-          type: string
-          format: date-time
-          readOnly: true
-        orderItems:
-          type: array
-          description: List of items to include in the order.
-          minItems: 1
-          items:
-            type: object
-            properties:
-              menuItemId:
-                type: string
-                format: ulid
-                description: ID of the menu item to add to the order.
-              quantity:
-                type: integer
-                minimum: 1
-                description: Quantity of the menu item.
-              discount:
-                type: integer
-                minimum: 0
-                description: Discount amount in cents (absolute value).
-                default: 0
-              comment:
-                type: string
-                maxLength: 500
-                description: Optional comment for the order item (e.g., "No sugar").
-            required:
-              - menuItemId
-              - quantity
-      required:
-        - customerName
-        - orderItems
-    OrderList:
-      type: object
-      properties:
-        object:
-          type: string
-          const: list
-          description: Entity name.
-        page:
-          $ref: '#/components/schemas/Page'
-        items:
-          type: array
-          items:
-            $ref: '#/components/schemas/Order'
-      required:
-        - object
-        - page
-        - items
-    OrderItem:
-      type: object
-      properties:
-        menuItemId:
-          type: string
-          description: ID of the menu item to add to the order.
-          writeOnly: true
-        menuItem:
-          allOf:
-            - $ref: '#/components/schemas/MenuItem'
-          description: Menu item that is part of the order.
-          readOnly: true
-        quantity:
-          type: integer
-          minimum: 1
-          description: Quantity of the menu item.
-        discount:
-          type: integer
-          minimum: 0
-          description: Discount amount in cents (absolute value).
-          default: 0
-        comment:
-          type: string
-          maxLength: 500
-          description: Optional comment for the order item (e.g., "No sugar").
-      required:
-        - menuItemId
-        - quantity
-    RevenueStatistics:
-      type: object
-      description: Revenue statistics for a given date range.
-      properties:
-        revenue:
-          type: number
-          format: float
-          description: Total revenue in cents from completed orders.
-          minimum: 0
-        averageOrderAmount:
-          type: number
-          format: float
-          description: Average order amount in cents (calculated from completed orders only).
-          minimum: 0
-        totalOrders:
-          type: integer
-          description: Total number of orders (all statuses) in the date range.
-          minimum: 0
-        placedOrders:
-          type: integer
-          description: Number of placed orders.
-          minimum: 0
-        preparingOrders:
-          type: integer
-          description: Number of preparing orders.
-          minimum: 0
-        completedOrders:
-          type: integer
-          description: Number of completed orders.
-          minimum: 0
-        canceledOrders:
-          type: integer
-          description: Number of canceled orders.
-          minimum: 0
-        startDate:
-          type: string
-          format: date
-          description: Start date of the revenue calculation period.
-        endDate:
-          type: string
-          format: date
-          description: End date of the revenue calculation period.
-      required:
-        - revenue
-        - averageOrderAmount
-        - totalOrders
-        - placedOrders
-        - preparingOrders
-        - completedOrders
-        - canceledOrders
-        - startDate
-        - endDate
-    RegisterClientObject:
-      type: object
-      properties:
-        name:
-          type: string
-          description: Client name.
-        redirectUris:
-          type: array
-          items:
-            type: string
-            format: uri
-          description: List of redirect URIs (optional, defaults to empty array).
-        scopes:
-          type: array
-          items:
-            type: string
-            enum:
-              - menu:read
-              - menu:write
-              - orders:read
-              - orders:write
-          description: List of scopes.
-        grantTypes:
-          type: array
-          items:
-            type: string
-            enum:
-              - authorization_code
-              - client_credentials
-          description: List of grant types.
-      required:
-        - name
-    OAuth2Client:
-      type: object
-      description: OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
-      properties:
-        clientId:
-          type: string
-          description: Client identifier issued by the authorization server.
-        clientSecret:
-          type: string
-          description: Client secret issued by the authorization server.
-        clientIdIssuedAt:
-          type: integer
-          format: int64
-          description: Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-        clientSecretExpiresAt:
-          type: integer
-          format: int64
-          description: Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-        name:
-          type: string
-          description: Client name (registered metadata).
-        redirectUris:
-          type: array
-          items:
-            type: string
-            format: uri
-          description: List of redirect URIs (registered metadata).
-        registrationClientUri:
-          type: string
-          format: uri
-          description: URL of the client configuration endpoint for managing this client registration (RFC 7592).
-        registrationAccessToken:
-          type: string
-          description: Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-        scopes:
-          type: array
-          items:
-            type: string
-            enum:
-              - menu:read
-              - menu:write
-              - orders:read
-              - orders:write
-          description: List of scopes (registered metadata).
-        grantTypes:
-          type: array
-          items:
-            type: string
-            enum:
-              - authorization_code
-              - client_credentials
-          description: List of grant types (registered metadata).
-      required:
-        - clientId
-        - clientSecret
-        - clientIdIssuedAt
-        - clientSecretExpiresAt
-        - registrationClientUri
-        - registrationAccessToken
-    OrderNotification:
-      type: object
-      required:
-        - orderId
-        - orderStatus
-        - timestamp
-      properties:
-        orderId:
-          type: string
-          description: Unique order identifier.
-        orderStatus:
-          $ref: '#/components/schemas/OrderStatus'
-        timestamp:
-          type: string
-          format: date-time
-          description: When the event occurred.
-  responses:
-    BadRequest:
-      description: Bad request - invalid input parameters.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    InternalServerError:
-      description: Internal server error.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Unauthorized:
-      description: Unauthorized - authorization required.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Forbidden:
-      description: Forbidden - insufficient permissions.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Conflict:
-      description: Conflict - entity already exists.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    NotFound:
-      description: Resource not found.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
diff --git a/tests/e2e/generate-client/examples/fetch-functions/redocly.yaml b/tests/e2e/generate-client/examples/fetch-functions/redocly.yaml
index b611920264..0e7e6b995e 100644
--- a/tests/e2e/generate-client/examples/fetch-functions/redocly.yaml
+++ b/tests/e2e/generate-client/examples/fetch-functions/redocly.yaml
@@ -3,7 +3,7 @@
 # (run `redocly generate-client` with no args to build every such api).
 apis:
   fetch-functions:
-    root: ./openapi.yaml
+    root: ../_shared/cafe.yaml
     clientOutput: ./src/api/client.ts
     client:
       generators:
diff --git a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts b/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
deleted file mode 100644
index 550cd946cd..0000000000
--- a/tests/e2e/generate-client/examples/fetch-functions/src/api/client.ts
+++ /dev/null
@@ -1,1968 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Redocly Cafe (v1.0.0)
- * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
- * Create API credentials and try it yourself in a realistic OpenAPI workflow.
- * 
- */
-
-export type Page = {
-    /**
-     * Use with the `after` query parameter to load the next page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    endCursor: string | null;
-    /**
-     * Use with the `before` query parameter to load the previous page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    startCursor: string | null;
-    /**
-     * Indicates if there is a next page with items.
-     */
-    hasNextPage: boolean;
-    /**
-     * Indicates if there is a previous page with items.
-     */
-    hasPrevPage: boolean;
-    /**
-     * Value showing how many items are in the page limit.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit: number;
-    /**
-     * Count of items across all pages.
-     * @minimum 0
-     */
-    total: number;
-};
-
-export type MenuBaseItem = {
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt: string;
-    /**
-     * Menu item ID. Unique identifier prefixed with `prd_`.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    readonly id: string;
-    /**
-     * Entity name.
-     */
-    readonly object: "menuItem";
-    /**
-     * Menu item name.
-     * @minLength 1
-     * @maxLength 50
-     */
-    name: string;
-    /**
-     * Price in cents.
-     * @minimum 0
-     */
-    price: number;
-    /**
-     * Photo of the menu item. Must be a PNG image and less than 1MB.
-     * @format binary
-     */
-    photo?: Blob | null;
-    /**
-     * Photo URL of the menu item.
-     * @format uri
-     */
-    readonly photoUrl?: string;
-    photoTextDescription?: string | null;
-};
-
-export type Beverage = {
-    /**
-     * Menu item category.
-     */
-    category: "beverage";
-    /**
-     * Size of the beverage in milliliters.
-     * @exclusiveMinimum 0
-     */
-    volume: number;
-    /**
-     * Indicates if the beverage contains caffeine.
-     */
-    containsCaffeine: boolean;
-} & MenuBaseItem;
-
-export type Dessert = {
-    /**
-     * Menu item category.
-     */
-    category: "dessert";
-    /**
-     * Amount of calories.
-     * @exclusiveMinimum 0
-     */
-    calories: number;
-} & MenuBaseItem;
-
-export type MenuItem = Beverage | Dessert;
-
-export type MenuItemList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: MenuItem[];
-};
-
-export type Error = {
-    /**
-     * URI reference that identifies the problem type.
-     * @format uri-reference
-     */
-    type: string;
-    /**
-     * Short summary of the problem type.
-     */
-    title: string;
-    /**
-     * HTTP status code generated by the origin server for this occurrence of the problem.
-     * @minimum 100
-     * @exclusiveMaximum 600
-     * @format int32
-     */
-    status: number;
-    /**
-     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-     * May be used to locate the root of this problem in the source code.
-     * @format uri-reference
-     */
-    instance?: string;
-    /**
-     * Additional error details.
-     */
-    details?: Record<string, unknown>;
-};
-
-/**
- * Order status.
- */
-export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
-
-export const OrderStatus = {
-    placed: "placed",
-    preparing: "preparing",
-    completed: "completed",
-    canceled: "canceled"
-} as const;
-
-export type Order = {
-    /**
-     * Order ID. Unique identifier prefixed with `ord_`.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     * @format ulid
-     */
-    readonly id?: string;
-    /**
-     * Entity name.
-     */
-    readonly object?: "order";
-    /**
-     * Name of the customer who placed the order.
-     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-     * @minLength 1
-     * @maxLength 100
-     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-     */
-    customerName: string;
-    readonly status?: OrderStatus;
-    /**
-     * Total order price in cents.
-     * @minimum 0
-     */
-    readonly totalPrice?: number;
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt?: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt?: string;
-    /**
-     * List of items to include in the order.
-     * @minItems 1
-     */
-    orderItems: {
-        /**
-         * ID of the menu item to add to the order.
-         * @format ulid
-         */
-        menuItemId: string;
-        /**
-         * Quantity of the menu item.
-         * @minimum 1
-         */
-        quantity: number;
-        /**
-         * Discount amount in cents (absolute value).
-         * @minimum 0
-         */
-        discount?: number;
-        /**
-         * Optional comment for the order item (e.g., "No sugar").
-         * @maxLength 500
-         */
-        comment?: string;
-    }[];
-};
-
-export type OrderList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: Order[];
-};
-
-export type OrderItem = {
-    /**
-     * ID of the menu item to add to the order.
-     */
-    menuItemId: string;
-    /**
-     * Menu item that is part of the order.
-     */
-    readonly menuItem?: MenuItem;
-    /**
-     * Quantity of the menu item.
-     * @minimum 1
-     */
-    quantity: number;
-    /**
-     * Discount amount in cents (absolute value).
-     * @minimum 0
-     */
-    discount?: number;
-    /**
-     * Optional comment for the order item (e.g., "No sugar").
-     * @maxLength 500
-     */
-    comment?: string;
-};
-
-/**
- * Revenue statistics for a given date range.
- */
-export type RevenueStatistics = {
-    /**
-     * Total revenue in cents from completed orders.
-     * @minimum 0
-     * @format float
-     */
-    revenue: number;
-    /**
-     * Average order amount in cents (calculated from completed orders only).
-     * @minimum 0
-     * @format float
-     */
-    averageOrderAmount: number;
-    /**
-     * Total number of orders (all statuses) in the date range.
-     * @minimum 0
-     */
-    totalOrders: number;
-    /**
-     * Number of placed orders.
-     * @minimum 0
-     */
-    placedOrders: number;
-    /**
-     * Number of preparing orders.
-     * @minimum 0
-     */
-    preparingOrders: number;
-    /**
-     * Number of completed orders.
-     * @minimum 0
-     */
-    completedOrders: number;
-    /**
-     * Number of canceled orders.
-     * @minimum 0
-     */
-    canceledOrders: number;
-    /**
-     * Start date of the revenue calculation period.
-     * @format date
-     */
-    startDate: string;
-    /**
-     * End date of the revenue calculation period.
-     * @format date
-     */
-    endDate: string;
-};
-
-export type RegisterClientObject = {
-    /**
-     * Client name.
-     */
-    name: string;
-    /**
-     * List of redirect URIs (optional, defaults to empty array).
-     */
-    redirectUris?: string[];
-    /**
-     * List of scopes.
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types.
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-/**
- * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
- */
-export type OAuth2Client = {
-    /**
-     * Client identifier issued by the authorization server.
-     */
-    clientId: string;
-    /**
-     * Client secret issued by the authorization server.
-     */
-    clientSecret: string;
-    /**
-     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-     * @format int64
-     */
-    clientIdIssuedAt: number;
-    /**
-     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-     * @format int64
-     */
-    clientSecretExpiresAt: number;
-    /**
-     * Client name (registered metadata).
-     */
-    name?: string;
-    /**
-     * List of redirect URIs (registered metadata).
-     */
-    redirectUris?: string[];
-    /**
-     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
-     * @format uri
-     */
-    registrationClientUri: string;
-    /**
-     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-     */
-    registrationAccessToken: string;
-    /**
-     * List of scopes (registered metadata).
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types (registered metadata).
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-export type OrderNotification = {
-    /**
-     * Unique order identifier.
-     */
-    orderId: string;
-    orderStatus: OrderStatus;
-    /**
-     * When the event occurred.
-     * @format date-time
-     */
-    timestamp: string;
-};
-
-/**
- * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
- */
-export function isBeverage(value: MenuItem): value is Beverage {
-    return (value as Record<string, unknown>)["category"] === "beverage";
-}
-
-/**
- * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
- */
-export function isDessert(value: MenuItem): value is Dessert {
-    return (value as Record<string, unknown>)["category"] === "dessert";
-}
-
-export type ListMenuItemsResult = MenuItemList;
-
-export type ListMenuItemsParams = {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-};
-
-export type ListMenuItemsVariables = {
-    params?: ListMenuItemsParams;
-};
-
-export type CreateMenuItemResult = MenuItem;
-
-export type CreateMenuItemBody = FormData;
-
-export type CreateMenuItemVariables = {
-    body: CreateMenuItemBody;
-};
-
-export type DeleteMenuItemResult = void;
-
-export type DeleteMenuItemVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-};
-
-export type GetMenuItemPhotoResult = Blob | string;
-
-export type GetMenuItemPhotoParams = {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-};
-
-export type GetMenuItemPhotoVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-    params?: GetMenuItemPhotoParams;
-};
-
-export type ListOrdersResult = OrderList;
-
-export type ListOrdersParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-};
-
-export type ListOrdersVariables = {
-    params?: ListOrdersParams;
-};
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    headers?: GetOrderByIdHeaders;
-};
-
-export type DeleteOrderResult = void;
-
-export type DeleteOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-};
-
-export type UpdateOrderResult = Order;
-
-export type UpdateOrderBody = {
-    status: OrderStatus;
-};
-
-export type UpdateOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    body?: UpdateOrderBody;
-};
-
-export type ListOrderItemsResult = OrderItem[];
-
-export type ListOrderItemsParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-};
-
-export type ListOrderItemsVariables = {
-    params?: ListOrderItemsParams;
-};
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    listMenuItems: {
-        args: {
-            params?: ListMenuItemsParams;
-        };
-        result: ListMenuItemsResult;
-    };
-    createMenuItem: {
-        args: {
-            body: CreateMenuItemBody;
-        };
-        result: CreateMenuItemResult;
-    };
-    deleteMenuItem: {
-        args: {
-            /**
-             * ID of the menu item to retrieve.
-             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            menuItemId: string;
-        };
-        result: DeleteMenuItemResult;
-    };
-    getMenuItemPhoto: {
-        args: {
-            /**
-             * ID of the menu item to retrieve.
-             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            menuItemId: string;
-            params?: GetMenuItemPhotoParams;
-        };
-        result: GetMenuItemPhotoResult;
-    };
-    listOrders: {
-        args: {
-            params?: ListOrdersParams;
-        };
-        result: ListOrdersResult;
-    };
-    createOrder: {
-        args: {
-            body: CreateOrderBody;
-        };
-        result: CreateOrderResult;
-    };
-    getOrderById: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-            headers?: GetOrderByIdHeaders;
-        };
-        result: GetOrderByIdResult;
-    };
-    deleteOrder: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-        };
-        result: DeleteOrderResult;
-    };
-    updateOrder: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-            body?: UpdateOrderBody;
-        };
-        result: UpdateOrderResult;
-    };
-    listOrderItems: {
-        args: {
-            params?: ListOrderItemsParams;
-        };
-        result: ListOrderItemsResult;
-    };
-    getRevenue: {
-        args: {
-            params?: GetRevenueParams;
-        };
-        result: GetRevenueResult;
-    };
-    registerOAuth2Client: {
-        args: {
-            body: RegisterOAuth2ClientBody;
-        };
-        result: RegisterOAuth2ClientResult;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
-    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
-    tags: readonly string[];
-}>["tags"][number];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — `@redocly/client-generator`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits `OPERATIONS` literals typed
- * `satisfies Record<string, OperationDescriptor>` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
- * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to `'json'` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
- * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real `ApiError` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call `parseAs` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of `data`/`error` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
- * streams and, for paginated operations, `item` (the page's element type) and — on
- * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
- * iteration unwraps the `Result` envelope the one-shot `result` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: `{}` has no required members, so
- * `{} extends A` is true exactly when every member of `A` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type `.pages()` yields: the RAW page declared by `page` (the generator
- * writes it only on result-mode paginated entries, whose `result` is the envelope),
- * or the method's own `result` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares `item` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
- * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
- * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
- * `onError` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(`Request failed with status ${status}`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
- * `filter=a/b` survives instead of `filter=a%2Fb`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
- * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
- * `deepObject` brackets, and `null`/`undefined` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(`${key}[${subKey}]`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. `%20` (not `+`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-      }
-    } else if (Object(value) === value) {
-      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
-          else params.append(`${key}[${subKey}]`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(`${key}=${encodeReserved(String(value))}`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? `${url}?${qs}` : url;
-}
-
-/**
- * Read the response body per `kind`. `'auto'` negotiates from the content type
- * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom `retryOn` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
- * unless `jitter === false`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/** Resolve a credential: a literal passes through; a function is awaited per request. */
-async function resolveToken(provider: TokenProvider): Promise<string> {
-  return typeof provider === 'function' ? await provider() : provider;
-}
-
-/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
-function encodeBase64(text: string): string {
-  let binary = '';
-  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
-  return btoa(binary);
-}
-
-/** Whether a credential for this scheme is configured on the instance. */
-function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
-  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
-  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
-  return config.auth?.basic !== undefined;
-}
-
-/**
- * Build the auth headers/query for one operation's `security` OR-alternatives from the
- * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * The first alternative whose schemes (an AND-set) are all configured is applied, so
- * "bearer OR apiKey" works with either credential and never sends both. When none is
- * fully configured, the first alternative's configured schemes are still sent (the
- * server rejects the request, mirroring the previous behavior).
- * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
- */
-async function resolveAuth(
-  security: readonly (readonly SecuritySpec[])[],
-  config: ClientConfig
-): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
-  const alternative =
-    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
-    security[0] ??
-    [];
-  const headers: Record<string, string> = {};
-  const query: Record<string, string> = {};
-  const cookies: string[] = [];
-  for (const scheme of alternative) {
-    if (scheme.kind === 'apiKey') {
-      const provider = config.auth?.apiKey?.[scheme.scheme];
-      if (provider === undefined) continue;
-      const value = await resolveToken(provider);
-      if (scheme.in === 'header') headers[scheme.name] = value;
-      else if (scheme.in === 'query') query[scheme.name] = value;
-      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
-      // so the credential can't break the `Cookie` header syntax.
-      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
-    } else if (scheme.kind === 'bearer') {
-      const provider = config.auth?.bearer;
-      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
-    } else {
-      const basic = config.auth?.basic;
-      if (basic !== undefined) {
-        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
-      }
-    }
-  }
-  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
-  return { headers, query };
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * `createClient` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
- * to a plain record — spreading a `Headers` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
- * `onResponse` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * The optional behaviors `createClientCore` can dispatch to but never statically
- * imports. The package's public `createClient` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
- * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
- * are honored, and an omitted `explode` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller `init.headers` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
- * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's `error` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (`errorMode` is fixed at construction — `configure()`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
-    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
-    // basic/apiKey. `apiKey` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: `createClientCore` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
- * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
-}
-
-export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe.redocly.com" });
-
-export const { configure, use } = client;
-export const setBearer = client.auth.bearer;
-export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
-export const listMenuItems = (params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
-export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
-export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
-export const getMenuItemPhoto = (menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
-export const listOrders = (params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
-export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
-export const getOrderById = (orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
-export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
-export const updateOrder = (orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
-export const listOrderItems = (params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
-export const getRevenue = (params: {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
-export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
diff --git a/tests/e2e/generate-client/examples/mock/.gitignore b/tests/e2e/generate-client/examples/mock/.gitignore
index f06235c460..6eb23affb8 100644
--- a/tests/e2e/generate-client/examples/mock/.gitignore
+++ b/tests/e2e/generate-client/examples/mock/.gitignore
@@ -1,2 +1,4 @@
 node_modules
 dist
+src/api/
+package-lock.json
diff --git a/tests/e2e/generate-client/examples/mock/README.md b/tests/e2e/generate-client/examples/mock/README.md
index dfe9c89273..5cd9201929 100644
--- a/tests/e2e/generate-client/examples/mock/README.md
+++ b/tests/e2e/generate-client/examples/mock/README.md
@@ -13,11 +13,10 @@ Either way, requests are served by the mocks — no real backend required.
 
 ```bash
 npm install
-npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
+npm run generate   # generate src/api (the client is gitignored)
 npm run dev        # browser: open the printed local URL
 ```
 
 For the Node variant, import and call `loadMockedMenu()` from `src/node.ts` in your own entrypoint or test.
 
-The generated client + MSW mocks under `src/api/` are committed and drift-checked against the
-generator in CI.
+The generated client + MSW mocks under `src/api/` are gitignored; CI regenerates them and type-checks this example.
diff --git a/tests/e2e/generate-client/examples/mock/openapi.yaml b/tests/e2e/generate-client/examples/mock/openapi.yaml
deleted file mode 100644
index a255b72a20..0000000000
--- a/tests/e2e/generate-client/examples/mock/openapi.yaml
+++ /dev/null
@@ -1,1163 +0,0 @@
-openapi: 3.2.0
-info:
-  title: Redocly Cafe
-  description: |
-    Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
-    Create API credentials and try it yourself in a realistic OpenAPI workflow.
-  version: 1.0.0
-  contact:
-    email: team@redocly.com
-    url: https://redocly.com/contact-us/
-  license:
-    name: MIT
-    url: https://opensource.org/licenses/MIT
-  termsOfService: https://redocly.com/subscription-agreement
-servers:
-  - url: https://api.cafe.redocly.com
-    description: Live server.
-tags:
-  - name: Authorization
-    description: Create a client to demo the API.
-  - name: Products
-    description: Operations related to products.
-  - name: Orders
-    description: Order management operations.
-  - name: Statistics
-    description: Statistics operations.
-paths:
-  /menu:
-    get:
-      tags:
-        - Products
-      summary: List all menu items
-      description: Retrieve a collection of menu items with optional filtering and pagination.
-      operationId: listMenuItems
-      security: []
-      parameters:
-        - $ref: '#/components/parameters/After'
-        - $ref: '#/components/parameters/Before'
-        - $ref: '#/components/parameters/Sort'
-        - $ref: '#/components/parameters/Filter'
-        - $ref: '#/components/parameters/Search'
-        - $ref: '#/components/parameters/Limit'
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/MenuItemList'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    post:
-      tags:
-        - Products
-      summary: Create menu item
-      description: Create a new menu item.
-      operationId: createMenuItem
-      security:
-        - OAuth2:
-            - menu:write
-      requestBody:
-        required: true
-        content:
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/MenuItem'
-      responses:
-        '201':
-          description: Menu item created successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/MenuItem'
-              examples:
-                MenuItemResponse:
-                  value:
-                    id: prd_01khr487f7qm7p44xn427m43vb
-                    object: menuItem
-                    name: coffee
-                    price: 4000
-                    category: beverage
-                    createdAt: '2026-02-18T10:20:38.228Z'
-                    updatedAt: '2026-02-18T10:20:38.228Z'
-                    volume: 600
-                    containsCaffeine: false
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '409':
-          $ref: '#/components/responses/Conflict'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /menu/{menuItemId}:
-    parameters:
-      - $ref: '#/components/parameters/MenuItemId'
-    delete:
-      tags:
-        - Products
-      summary: Delete a menu item
-      description: Delete an existing menu item.
-      operationId: deleteMenuItem
-      security:
-        - OAuth2:
-            - menu:write
-      responses:
-        '204':
-          description: Menu item deleted successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /menu-item-images/{menuItemId}:
-    parameters:
-      - $ref: '#/components/parameters/MenuItemId'
-    get:
-      operationId: getMenuItemPhoto
-      summary: Retrieve a menu item photo
-      description: Retrieve the product photo image for a specific menu item.
-      security: []
-      tags:
-        - Products
-      parameters:
-        - $ref: '#/components/parameters/PhotoSize'
-      responses:
-        '200':
-          description: Menu item photo retrieved successfully.
-          content:
-            image/png:
-              schema:
-                type: string
-                format: binary
-            text/plain:
-              schema:
-                description: Alternative image text.
-                type: string
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /orders:
-    get:
-      tags:
-        - Orders
-      summary: List all orders
-      description: Retrieve a collection of orders with optional filtering and pagination.
-      operationId: listOrders
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/Filter'
-        - $ref: '#/components/parameters/Sort'
-        - $ref: '#/components/parameters/Limit'
-        - $ref: '#/components/parameters/After'
-        - $ref: '#/components/parameters/Before'
-        - $ref: '#/components/parameters/Search'
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/OrderList'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    post:
-      tags:
-        - Orders
-      summary: Create order
-      description: |
-        Create a new order.
-        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
-      operationId: createOrder
-      security:
-        - OAuth2:
-            - orders:write
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Order'
-            examples:
-              OrderRequest:
-                dataValue:
-                  customerName: Mary Ann
-                  orderItems:
-                    - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                      quantity: 2
-                      comment: No sugar!
-                      discount: 0
-      responses:
-        '201':
-          description: Order placed successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: placed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /orders/{orderId}:
-    get:
-      tags:
-        - Orders
-      summary: Retrieve an order
-      description: Retrieve a single order by its ID.
-      operationId: getOrderById
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-        - name: X-Request-Id
-          in: header
-          required: false
-          description: |
-            Optional client-supplied correlation ID, echoed in logs and traces.
-          schema:
-            type: string
-            format: uuid
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: placed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    patch:
-      tags:
-        - Orders
-      summary: Partially update an order
-      description: |
-        Update an existing order status.
-        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
-      operationId: updateOrder
-      security:
-        - OAuth2:
-            - orders:write
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-      requestBody:
-        content:
-          application/json:
-            schema:
-              type: object
-              description: |
-                Partial order update using JSON Merge Patch - only include fields to update.
-              properties:
-                status:
-                  $ref: '#/components/schemas/OrderStatus'
-              required:
-                - status
-      responses:
-        '200':
-          description: Order updated successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: completed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    delete:
-      tags:
-        - Orders
-      summary: Delete an order
-      description: |
-        Delete the order.
-        To keep the order history, the order should be canceled instead of deleted.
-      operationId: deleteOrder
-      security:
-        - OAuth2:
-            - orders:write
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-      responses:
-        '204':
-          description: Order deleted successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /order-items:
-    get:
-      tags:
-        - Orders
-      summary: List all order items with menu item details
-      description: |
-        Returns an array of order items for a specific order.
-        Use the `filter` parameter to filter by order ID.
-      operationId: listOrderItems
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/Filter'
-          required: true
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                type: array
-                description: List of menu items that are part of the order.
-                items:
-                  $ref: '#/components/schemas/OrderItem'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /revenue:
-    get:
-      tags:
-        - Statistics
-      summary: Get revenue statistics
-      description: |
-        Retrieve revenue statistics for a configurable date range.
-        Returns revenue, order counts, average order amount, and other useful statistics.
-      operationId: getRevenue
-      security:
-        - ApiKey: []
-      parameters:
-        - name: startDate
-          in: query
-          required: false
-          description: |
-            Start date for the revenue calculation period (ISO 8601 datetime format).
-            Defaults to 30 days ago if not provided.
-          schema:
-            type: string
-            format: date
-          example: '2026-01-01'
-        - name: endDate
-          in: query
-          required: false
-          description: |
-            End date for the revenue calculation period (ISO 8601 datetime format).
-            Defaults to current time if not provided.
-          schema:
-            type: string
-            format: date
-          example: '2026-01-31'
-      responses:
-        '200':
-          description: Revenue statistics retrieved successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RevenueStatistics'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /oauth2/register:
-    post:
-      tags:
-        - Authorization
-      summary: Create OAuth2 client
-      description: |
-        Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
-        - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type, 
-          `redirectUris` must be provided (per RFC 7591 Section 2).
-        - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
-        Returns the registered client information per RFC 7591, including:
-        - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
-      operationId: registerOAuth2Client
-      security: []
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/RegisterClientObject'
-      responses:
-        '201':
-          description: OAuth2 client registered successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/OAuth2Client'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-webhooks:
-  order-notification:
-    post:
-      tags:
-        - Orders
-      operationId: orderNotificationWebhook
-      security: []
-      summary: Order notification webhook
-      description: Webhook triggered when a new order is placed.
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/OrderNotification'
-      responses:
-        '200':
-          description: Webhook received successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-components:
-  securitySchemes:
-    OAuth2:
-      type: oauth2
-      description: OAuth2 authorization for API access.
-      flows:
-        authorizationCode:
-          authorizationUrl: https://api.cafe.redocly.com/oauth2/authorize
-          tokenUrl: https://api.cafe.redocly.com/oauth2/token
-          scopes:
-            menu:read: Read access to menu items and images
-            menu:write: Write access to menu items (create, delete)
-            orders:read: Read access to orders
-            orders:write: Write access to orders (create, update, delete)
-        clientCredentials:
-          tokenUrl: https://api.cafe.redocly.com/oauth2/token
-          scopes:
-            menu:read: Read access to menu items and images
-            menu:write: Write access to menu items (create, delete)
-            orders:read: Read access to orders
-            orders:write: Write access to orders (create, update, delete)
-    ApiKey:
-      type: apiKey
-      name: X-API-Key
-      in: header
-      description: API key for internal operations.
-  parameters:
-    After:
-      name: after
-      in: query
-      required: false
-      description: Use the `endCursor` as a value for the `after` parameter to get the next page.
-      schema:
-        type: string
-      example: a25fgaksjf23la==
-    Before:
-      name: before
-      in: query
-      required: false
-      description: |
-        Use the `startCursor` as a value for the `before` parameter to get the next page.
-      schema:
-        type: string
-      example: bfg23aksjf23zb1==
-    Sort:
-      name: sort
-      description: |-
-        To sort by id in descending order use `-id`.
-        To sort by id in ascending order use `id`.
-      in: query
-      required: false
-      schema:
-        type: string
-      example: '-name'
-    Filter:
-      name: filter
-      description: |-
-        Filters the collection items using space-separated `field:value` pairs.
-
-        **Format:** `field1:value1 field2:value2`
-
-        **Supported operators:**
-        - `field:value` - Exact match
-        - `field:value1,value2` - Match any of the comma-separated values (OR)
-        - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-
-        **Examples:**
-        - `status:placed` - Filter by single status.
-        - `status:placed,completed` - Filter by multiple statuses.
-        - `createdAt:30d` - Filter orders created in the last 30 days.
-        - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-        - `status:placed createdAt:7d` - Combine multiple filters.
-      in: query
-      required: false
-      schema:
-        type: string
-      example: orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7
-    Search:
-      name: search
-      in: query
-      description: |-
-        Performs a case-insensitive text search across relevant fields in the collection.
-
-        **Fields searched depend on the endpoint:**
-        - **Menu items:** `name`, `photoTextDescription`
-        - **Orders:** `customerName`, `id`
-
-        Returns items where any of the searchable fields contain the search term as a substring.
-      required: false
-      schema:
-        type: string
-      example: coffee
-    Limit:
-      name: limit
-      description: |
-        Use to return a number of results per page.
-        If there is more data, use in combination with `after` to page through the data.
-      in: query
-      required: false
-      schema:
-        type: integer
-        minimum: 1
-        maximum: 100
-        default: 10
-      example: 10
-    MenuItemId:
-      name: menuItemId
-      in: path
-      description: ID of the menu item to retrieve.
-      required: true
-      schema:
-        type: string
-        pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-      example: prd_01h1s5z6vf2mm1mz3hevnn9va7
-    PhotoSize:
-      name: photoSize
-      in: query
-      description: Photo size to retrieve.
-      required: false
-      schema:
-        type: string
-        enum:
-          - thumbnail
-          - medium
-          - large
-        default: medium
-    OrderId:
-      name: orderId
-      in: path
-      description: ID of the order to retrieve.
-      required: true
-      schema:
-        type: string
-        pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-      example: ord_01h1s5z6vf2mm1mz3hevnn9va7
-  schemas:
-    Page:
-      type: object
-      properties:
-        endCursor:
-          type:
-            - string
-            - 'null'
-          description: |-
-            Use with the `after` query parameter to load the next page of data.
-            When `null`, there is no data.
-            The cursor is opaque and internal structure is subject to change.
-        startCursor:
-          type:
-            - string
-            - 'null'
-          description: |-
-            Use with the `before` query parameter to load the previous page of data.
-            When `null`, there is no data.
-            The cursor is opaque and internal structure is subject to change.
-        hasNextPage:
-          type: boolean
-          description: Indicates if there is a next page with items.
-        hasPrevPage:
-          type: boolean
-          description: Indicates if there is a previous page with items.
-        limit:
-          type: integer
-          minimum: 1
-          maximum: 100
-          default: 10
-          description: Value showing how many items are in the page limit.
-        total:
-          type: integer
-          description: Count of items across all pages.
-          minimum: 0
-      required:
-        - endCursor
-        - startCursor
-        - hasNextPage
-        - hasPrevPage
-        - limit
-        - total
-    MenuBaseItem:
-      type: object
-      properties:
-        createdAt:
-          description: Created date.
-          type: string
-          format: date-time
-          readOnly: true
-        updatedAt:
-          description: Updated date.
-          type: string
-          format: date-time
-          readOnly: true
-        id:
-          description: Menu item ID. Unique identifier prefixed with `prd_`.
-          type: string
-          readOnly: true
-          pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-          example: prd_01h1s5z6vf2mm1mz3hevnn9va7
-        object:
-          description: Entity name.
-          type: string
-          const: menuItem
-          readOnly: true
-        name:
-          description: Menu item name.
-          type: string
-          minLength: 1
-          maxLength: 50
-        price:
-          description: Price in cents.
-          type: integer
-          minimum: 0
-        photo:
-          writeOnly: true
-          type:
-            - string
-            - 'null'
-          format: binary
-          description: Photo of the menu item. Must be a PNG image and less than 1MB.
-        photoUrl:
-          readOnly: true
-          type: string
-          format: uri
-          description: Photo URL of the menu item.
-        photoTextDescription:
-          type:
-            - string
-            - 'null'
-      required:
-        - id
-        - name
-        - price
-        - createdAt
-        - updatedAt
-        - object
-    Beverage:
-      allOf:
-        - type: object
-          properties:
-            category:
-              description: Menu item category.
-              type: string
-              const: beverage
-            volume:
-              type: number
-              description: Size of the beverage in milliliters.
-              exclusiveMinimum: 0
-            containsCaffeine:
-              type: boolean
-              description: Indicates if the beverage contains caffeine.
-          required:
-            - category
-            - volume
-            - containsCaffeine
-        - $ref: '#/components/schemas/MenuBaseItem'
-    Dessert:
-      allOf:
-        - type: object
-          properties:
-            category:
-              description: Menu item category.
-              type: string
-              const: dessert
-            calories:
-              type: number
-              exclusiveMinimum: 0
-              description: Amount of calories.
-          required:
-            - category
-            - calories
-        - $ref: '#/components/schemas/MenuBaseItem'
-    MenuItem:
-      discriminator:
-        propertyName: category
-        mapping:
-          beverage: '#/components/schemas/Beverage'
-          dessert: '#/components/schemas/Dessert'
-      oneOf:
-        - $ref: '#/components/schemas/Beverage'
-        - $ref: '#/components/schemas/Dessert'
-      required:
-        - category
-    MenuItemList:
-      type: object
-      properties:
-        object:
-          type: string
-          const: list
-          description: Entity name.
-        page:
-          $ref: '#/components/schemas/Page'
-        items:
-          type: array
-          items:
-            $ref: '#/components/schemas/MenuItem'
-      required:
-        - object
-        - page
-        - items
-    Error:
-      type: object
-      properties:
-        type:
-          type: string
-          format: uri-reference
-          description: URI reference that identifies the problem type.
-          default: about:blank
-        title:
-          type: string
-          description: Short summary of the problem type.
-        status:
-          type: integer
-          format: int32
-          description: |
-            HTTP status code generated by the origin server for this occurrence of the problem.
-          minimum: 100
-          exclusiveMaximum: 600
-        instance:
-          type: string
-          format: uri-reference
-          description: |
-            URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-            May be used to locate the root of this problem in the source code.
-          example: /some/uri-reference#specific-occurrence-context
-        details:
-          description: Additional error details.
-          type: object
-          additionalProperties: true
-      required:
-        - type
-        - title
-        - status
-    OrderStatus:
-      type: string
-      description: Order status.
-      enum:
-        - placed
-        - preparing
-        - completed
-        - canceled
-    Order:
-      type: object
-      title: Order
-      properties:
-        id:
-          description: Order ID. Unique identifier prefixed with `ord_`.
-          type: string
-          format: ulid
-          readOnly: true
-          pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-          example: ord_01h1s5z6vf2mm1mz3hevnn9va7
-        object:
-          description: Entity name.
-          type: string
-          const: order
-          readOnly: true
-        customerName:
-          description: |
-            Name of the customer who placed the order.
-            Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-          type: string
-          pattern: ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-          minLength: 1
-          maxLength: 100
-        status:
-          allOf:
-            - $ref: '#/components/schemas/OrderStatus'
-          readOnly: true
-        totalPrice:
-          description: Total order price in cents.
-          type: integer
-          minimum: 0
-          readOnly: true
-        createdAt:
-          description: Created date.
-          type: string
-          format: date-time
-          readOnly: true
-        updatedAt:
-          description: Updated date.
-          type: string
-          format: date-time
-          readOnly: true
-        orderItems:
-          type: array
-          description: List of items to include in the order.
-          minItems: 1
-          items:
-            type: object
-            properties:
-              menuItemId:
-                type: string
-                format: ulid
-                description: ID of the menu item to add to the order.
-              quantity:
-                type: integer
-                minimum: 1
-                description: Quantity of the menu item.
-              discount:
-                type: integer
-                minimum: 0
-                description: Discount amount in cents (absolute value).
-                default: 0
-              comment:
-                type: string
-                maxLength: 500
-                description: Optional comment for the order item (e.g., "No sugar").
-            required:
-              - menuItemId
-              - quantity
-      required:
-        - customerName
-        - orderItems
-    OrderList:
-      type: object
-      properties:
-        object:
-          type: string
-          const: list
-          description: Entity name.
-        page:
-          $ref: '#/components/schemas/Page'
-        items:
-          type: array
-          items:
-            $ref: '#/components/schemas/Order'
-      required:
-        - object
-        - page
-        - items
-    OrderItem:
-      type: object
-      properties:
-        menuItemId:
-          type: string
-          description: ID of the menu item to add to the order.
-          writeOnly: true
-        menuItem:
-          allOf:
-            - $ref: '#/components/schemas/MenuItem'
-          description: Menu item that is part of the order.
-          readOnly: true
-        quantity:
-          type: integer
-          minimum: 1
-          description: Quantity of the menu item.
-        discount:
-          type: integer
-          minimum: 0
-          description: Discount amount in cents (absolute value).
-          default: 0
-        comment:
-          type: string
-          maxLength: 500
-          description: Optional comment for the order item (e.g., "No sugar").
-      required:
-        - menuItemId
-        - quantity
-    RevenueStatistics:
-      type: object
-      description: Revenue statistics for a given date range.
-      properties:
-        revenue:
-          type: number
-          format: float
-          description: Total revenue in cents from completed orders.
-          minimum: 0
-        averageOrderAmount:
-          type: number
-          format: float
-          description: Average order amount in cents (calculated from completed orders only).
-          minimum: 0
-        totalOrders:
-          type: integer
-          description: Total number of orders (all statuses) in the date range.
-          minimum: 0
-        placedOrders:
-          type: integer
-          description: Number of placed orders.
-          minimum: 0
-        preparingOrders:
-          type: integer
-          description: Number of preparing orders.
-          minimum: 0
-        completedOrders:
-          type: integer
-          description: Number of completed orders.
-          minimum: 0
-        canceledOrders:
-          type: integer
-          description: Number of canceled orders.
-          minimum: 0
-        startDate:
-          type: string
-          format: date
-          description: Start date of the revenue calculation period.
-        endDate:
-          type: string
-          format: date
-          description: End date of the revenue calculation period.
-      required:
-        - revenue
-        - averageOrderAmount
-        - totalOrders
-        - placedOrders
-        - preparingOrders
-        - completedOrders
-        - canceledOrders
-        - startDate
-        - endDate
-    RegisterClientObject:
-      type: object
-      properties:
-        name:
-          type: string
-          description: Client name.
-        redirectUris:
-          type: array
-          items:
-            type: string
-            format: uri
-          description: List of redirect URIs (optional, defaults to empty array).
-        scopes:
-          type: array
-          items:
-            type: string
-            enum:
-              - menu:read
-              - menu:write
-              - orders:read
-              - orders:write
-          description: List of scopes.
-        grantTypes:
-          type: array
-          items:
-            type: string
-            enum:
-              - authorization_code
-              - client_credentials
-          description: List of grant types.
-      required:
-        - name
-    OAuth2Client:
-      type: object
-      description: OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
-      properties:
-        clientId:
-          type: string
-          description: Client identifier issued by the authorization server.
-        clientSecret:
-          type: string
-          description: Client secret issued by the authorization server.
-        clientIdIssuedAt:
-          type: integer
-          format: int64
-          description: Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-        clientSecretExpiresAt:
-          type: integer
-          format: int64
-          description: Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-        name:
-          type: string
-          description: Client name (registered metadata).
-        redirectUris:
-          type: array
-          items:
-            type: string
-            format: uri
-          description: List of redirect URIs (registered metadata).
-        registrationClientUri:
-          type: string
-          format: uri
-          description: URL of the client configuration endpoint for managing this client registration (RFC 7592).
-        registrationAccessToken:
-          type: string
-          description: Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-        scopes:
-          type: array
-          items:
-            type: string
-            enum:
-              - menu:read
-              - menu:write
-              - orders:read
-              - orders:write
-          description: List of scopes (registered metadata).
-        grantTypes:
-          type: array
-          items:
-            type: string
-            enum:
-              - authorization_code
-              - client_credentials
-          description: List of grant types (registered metadata).
-      required:
-        - clientId
-        - clientSecret
-        - clientIdIssuedAt
-        - clientSecretExpiresAt
-        - registrationClientUri
-        - registrationAccessToken
-    OrderNotification:
-      type: object
-      required:
-        - orderId
-        - orderStatus
-        - timestamp
-      properties:
-        orderId:
-          type: string
-          description: Unique order identifier.
-        orderStatus:
-          $ref: '#/components/schemas/OrderStatus'
-        timestamp:
-          type: string
-          format: date-time
-          description: When the event occurred.
-  responses:
-    BadRequest:
-      description: Bad request - invalid input parameters.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    InternalServerError:
-      description: Internal server error.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Unauthorized:
-      description: Unauthorized - authorization required.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Forbidden:
-      description: Forbidden - insufficient permissions.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Conflict:
-      description: Conflict - entity already exists.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    NotFound:
-      description: Resource not found.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
diff --git a/tests/e2e/generate-client/examples/mock/package-lock.json b/tests/e2e/generate-client/examples/mock/package-lock.json
deleted file mode 100644
index bc105d0ea8..0000000000
--- a/tests/e2e/generate-client/examples/mock/package-lock.json
+++ /dev/null
@@ -1,1686 +0,0 @@
-{
-  "name": "@redocly-examples/mock",
-  "version": "0.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@redocly-examples/mock",
-      "version": "0.0.0",
-      "devDependencies": {
-        "@redocly/cli": "2.34.0-local-2026-06-23.1",
-        "msw": "^2.0.0",
-        "typescript": "^5.5.0",
-        "vite": "^5.4.0"
-      }
-    },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@inquirer/ansi": {
-      "version": "2.0.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@inquirer/ansi/-/ansi-2.0.7.tgz",
-      "integrity": "sha512-3eTuUO1vH2cZm2ZKHeQxnOqlTi9EfZDGgIe3BL3I4u+rJHocr9Fz86M4fjYABPvFnQG/gGK551HqDiIcETwU6Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=23.5.0 || ^22.13.0 || ^20.17.0"
-      }
-    },
-    "node_modules/@inquirer/confirm": {
-      "version": "6.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@inquirer/confirm/-/confirm-6.1.1.tgz",
-      "integrity": "sha512-eb8DBZcz/2qHWQda4rk2JiQk5h9QV/cVHi1yjt0f69WFZMRFn0sJTye3EAP8icut8UDMjQPsaH5KbcOogefrFQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@inquirer/core": "^11.2.1",
-        "@inquirer/type": "^4.0.7"
-      },
-      "engines": {
-        "node": ">=23.5.0 || ^22.13.0 || ^20.17.0"
-      },
-      "peerDependencies": {
-        "@types/node": ">=18"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@inquirer/core": {
-      "version": "11.2.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@inquirer/core/-/core-11.2.1.tgz",
-      "integrity": "sha512-Qd6GJT1yVyrZZCfN8W2qKF5ApmqryXRhRKCuip8h01x2w/esJQ2XIYc6f9abMIHgKQdBfFTSOdbHRLAhuM09UA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@inquirer/ansi": "^2.0.7",
-        "@inquirer/figures": "^2.0.7",
-        "@inquirer/type": "^4.0.7",
-        "cli-width": "^4.1.0",
-        "fast-wrap-ansi": "^0.2.0",
-        "mute-stream": "^3.0.0",
-        "signal-exit": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=23.5.0 || ^22.13.0 || ^20.17.0"
-      },
-      "peerDependencies": {
-        "@types/node": ">=18"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@inquirer/figures": {
-      "version": "2.0.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@inquirer/figures/-/figures-2.0.7.tgz",
-      "integrity": "sha512-aJ8TBPOGB6f/2qziPfElISTCEd5XOYTFckA2SGjhNmiKzfK/u4ot3v0DUzGVdUnKjN10EqnnEPck36BkyfLnJw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=23.5.0 || ^22.13.0 || ^20.17.0"
-      }
-    },
-    "node_modules/@inquirer/type": {
-      "version": "4.0.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@inquirer/type/-/type-4.0.7.tgz",
-      "integrity": "sha512-t28inv14nMQ1PhKpsJPY+kEs/c00qzeCOS2gTNRyTjG5d6qsVA2fItxW4hkvGZ5lvanGLdtCzVIx5dwdRpN1+g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=23.5.0 || ^22.13.0 || ^20.17.0"
-      },
-      "peerDependencies": {
-        "@types/node": ">=18"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@mswjs/interceptors": {
-      "version": "0.41.9",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@mswjs/interceptors/-/interceptors-0.41.9.tgz",
-      "integrity": "sha512-VVPPgHyQ6ShqnrmDWuxjmUIsO9gWyOZFmuOfLd9LfBGQJwZfy0gvv9pbHSJuoFNIYC7ZDX9aoFwowjcdSC4E8w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@open-draft/deferred-promise": "^2.2.0",
-        "@open-draft/logger": "^0.3.0",
-        "@open-draft/until": "^2.0.0",
-        "is-node-process": "^1.2.0",
-        "outvariant": "^1.4.3",
-        "strict-event-emitter": "^0.5.1"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@mswjs/interceptors/node_modules/@open-draft/deferred-promise": {
-      "version": "2.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@open-draft/deferred-promise/-/deferred-promise-2.2.0.tgz",
-      "integrity": "sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@open-draft/deferred-promise": {
-      "version": "3.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@open-draft/deferred-promise/-/deferred-promise-3.0.0.tgz",
-      "integrity": "sha512-XW375UK8/9SqUVNVa6M0yEy8+iTi4QN5VZ7aZuRFQmy76LRwI9wy5F4YIBU6T+eTe2/DNDo8tqu8RHlwLHM6RA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@open-draft/logger": {
-      "version": "0.3.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@open-draft/logger/-/logger-0.3.0.tgz",
-      "integrity": "sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "is-node-process": "^1.2.0",
-        "outvariant": "^1.4.0"
-      }
-    },
-    "node_modules/@open-draft/until": {
-      "version": "2.1.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@open-draft/until/-/until-2.1.0.tgz",
-      "integrity": "sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@redocly/cli": {
-      "version": "2.34.0-local-2026-06-23.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/cli/-/cli-2.34.0-local-2026-06-23.1.tgz",
-      "integrity": "sha512-F3WnkO5Jn51H6hPzdH3Vde1nQq0eb0k7I7X0UEfkQ6paWGQBLnlOc4cudsU6y1Cz8unD+svmcl8SzaGMwTH6OQ==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "openapi": "bin/cli.js",
-        "redocly": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
-        "npm": ">=10"
-      }
-    },
-    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.62.2.tgz",
-      "integrity": "sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.62.2.tgz",
-      "integrity": "sha512-BaH7BllCACHoH1LguOU56UItGfUWjujlO65kS9LAodViaN4bwIKd7oeW/ZHJ/4ljr/7MIiENnNy3HJ0zXv8Zkw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.62.2.tgz",
-      "integrity": "sha512-v39RCCvj4He82I9sFmk+M1VZ0PLM9sfsLVikjfx2hYBNALhrrOR2D3JjQA6AhlaSOgcR+RzrKY7e1+bT6SUO/A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.62.2.tgz",
-      "integrity": "sha512-yl0y2vq3S3lHeuXhEdss6TWfKW8vkujImO12tn4ZkG/4oghr09LvdYm2RElVjokTQiUvDUGXLGsYeLqUMCKpGA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.62.2.tgz",
-      "integrity": "sha512-tT4pvt4qXD+vEoezupCWi+a1F0vvDiksiHc+PxRlYTOH1I6/X4id9jPxTP+Fg+545euaFT1jJVs4CEdHZAU1vw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.62.2.tgz",
-      "integrity": "sha512-6nU5F2wCW+qvCBhTn1pdIU3bzsIoF7EUwsCDRxilWGprQR6yd508YnH9+OKFCwpfS8pjZqDUmnCAr7exax0XCg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.62.2.tgz",
-      "integrity": "sha512-n1GJHPOvpIfhi3TmrCeh6S6URt9BFCt0KQE3qvexyGCTAKpR4Lg+eWvNZEqu7epxwus/8ElT3hacYEucm49SZg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.62.2.tgz",
-      "integrity": "sha512-JqgflS8wEB+UXV/vS1RpRbifGBeN4D5lz8D8oOFbFZw4vedvdOgCFAjfBmIMdW3yL10XpQQ0Ambepw6MXrhOnA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.62.2.tgz",
-      "integrity": "sha512-wnFJkogWvN4jm/hQRF2UBaeUmk20j5+DmHvoyWii2b8HJDyvz1MF2OU/6ynXt2KR63rbZLWkFpoytpdc/yBuSA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.62.2.tgz",
-      "integrity": "sha512-HVu2bp0zhvJ8xHEV9+UUs7S90VadmBSY3LcIMvozbPo4AuMGDWlz3ymHLHZPX4hR67TKTt8Qp5PJ5RBg/i+RMQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-loong64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.62.2.tgz",
-      "integrity": "sha512-mQqqAV8QaoSgr9I2fKDLY2BAVvmKjWoGiu/cSYQonsLvtqwEn1E4QYfnCOcp5zoEqNhsDYin1s6jx/VJmrxlZg==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-loong64-musl": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.62.2.tgz",
-      "integrity": "sha512-IxKLoxCQ2IWi6bT2akyDUBGsOImDKB+sPp4EsTmwFQ/fMwpCKm8uLSSgP/Kx/QYUgKis6SEZ5/Nlhup0DIA0PQ==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.62.2.tgz",
-      "integrity": "sha512-Mk5ha2RQSgyFfmYYLkBpPnUk8D8FriBxesO1u9O75X0mHgXL1UQcH5Itl2lurWL2tj0RxV9b9tJgipac0hRY9A==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-ppc64-musl": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.62.2.tgz",
-      "integrity": "sha512-CjvEnqJL/0/TQ3TXX3OPIJ/kmBellrWd4heXUmHeJlTnmwjKpSJzoehLaL6Xk0ZnMHBu9dZuFADNOrtjF4v+2w==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.62.2.tgz",
-      "integrity": "sha512-1SiZbzwdkaDURsew/tSOrooKiYy7EQGT6m8ufavAi9NEyQb/6VuIxFXAL1fqa4iZe3g4NbNk4P7J32z2tw5Mgg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.62.2.tgz",
-      "integrity": "sha512-nQts12zJ3NQRoE6uYljOH89v7szzLDvG2JD/vsX+vGXU8w/At1GowTZ5/7qeFQ8m7L55rpR8Okugnuo5bgjy2Q==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.62.2.tgz",
-      "integrity": "sha512-E9/ll019jhPIJgpzfZoIkBGhcz+kKNgVWYRY0zr9srBdPPFVpvOKW8VaJKUbeK+eZXyQF9ltME+Kk6affeaPgg==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.62.2.tgz",
-      "integrity": "sha512-5BqxR/pshjey51iliyzTD5Xi3EN0aLmQ2lZ3lvefVV9c82BvrLo2/6OT55iifpWBufs6kdwWbuOKS841DrmK9A==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.62.2.tgz",
-      "integrity": "sha512-uNN83XxQrRAh/w0/pmAfibcwyb6YWt4gP+dpnQKPVJshAloQ785ii8CT8ZCIxkGg9opVsvAlGhFitSm6D1Jjpg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-openbsd-x64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.62.2.tgz",
-      "integrity": "sha512-srjEIxSH3LRnJN6THczDHWQplqEMFiAJrTab0msUryh9kwNpkICf3Ea6q6MN/2cZwRFUNx5w+h6Hpi4QuHS6Zg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-openharmony-arm64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.62.2.tgz",
-      "integrity": "sha512-8hOJnxgbyObnCm5AlRA3A931xX19xq80RjVTKgJOvEKWqJruP/Uf12IbAOaDjjEXYRewwHLfmF0YRIdK3OwKWA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openharmony"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.62.2.tgz",
-      "integrity": "sha512-mmF4AY1i0hG/bLWUctUq59gtmgaSIRa3cu/A3JFRp/sCNEme2bgDEiDS22P9FbnJB8NJNF4jPJiSP5RHQpUTDg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.62.2.tgz",
-      "integrity": "sha512-DZgkknc6jhHrk46V25vbAM0zZkyP0nSDkJB8/dRkLTxv470dOmWDqGoEJl/9A0dFfS7yE3REOwNDxpHwSLSt0Q==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-x64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.62.2.tgz",
-      "integrity": "sha512-T6xr6ucWSFto+VGajA8YH26LdpHRuP4YLHEKAtCWvJDOlnmWcDZVCI2Jmjr+IFHDlt2zRaTAKE4tfjTaWLgJBg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.62.2.tgz",
-      "integrity": "sha512-BfzEnDJOt9T8M989/lA37EcJgat01wLRnoi5dQf3QzOH7jzpqTAzdDbVfRljVr5r+jzKqpbHeyOfAaXxAd0PAA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@types/estree": {
-      "version": "1.0.9",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/estree/-/estree-1.0.9.tgz",
-      "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/node": {
-      "version": "26.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/node/-/node-26.0.0.tgz",
-      "integrity": "sha512-vf2YFi1iY9lHGwNJMs01biZFbKJkrZR1T6/MlzjhJLPdntOHLhTrDSnSVcdtvjihi4VQNlrFRIxLsDBlQpAipA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~8.3.0"
-      }
-    },
-    "node_modules/@types/set-cookie-parser": {
-      "version": "2.4.10",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/set-cookie-parser/-/set-cookie-parser-2.4.10.tgz",
-      "integrity": "sha512-GGmQVGpQWUe5qglJozEjZV/5dyxbOOZ0LHe/lqyWssB88Y4svNfst0uqBVscdDeIKl5Jy5+aPSvy7mI9tYRguw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/statuses": {
-      "version": "2.0.6",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/statuses/-/statuses-2.0.6.tgz",
-      "integrity": "sha512-xMAgYwceFhRA2zY+XbEA7mxYbA093wdiW8Vu6gZPGWy9cmOyU9XesH1tNcEWsKFd5Vzrqx5T3D38PWx1FIIXkA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/cli-width": {
-      "version": "4.1.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/cli-width/-/cli-width-4.1.0.tgz",
-      "integrity": "sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/esbuild": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/esbuild/-/esbuild-0.21.5.tgz",
-      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.21.5",
-        "@esbuild/android-arm": "0.21.5",
-        "@esbuild/android-arm64": "0.21.5",
-        "@esbuild/android-x64": "0.21.5",
-        "@esbuild/darwin-arm64": "0.21.5",
-        "@esbuild/darwin-x64": "0.21.5",
-        "@esbuild/freebsd-arm64": "0.21.5",
-        "@esbuild/freebsd-x64": "0.21.5",
-        "@esbuild/linux-arm": "0.21.5",
-        "@esbuild/linux-arm64": "0.21.5",
-        "@esbuild/linux-ia32": "0.21.5",
-        "@esbuild/linux-loong64": "0.21.5",
-        "@esbuild/linux-mips64el": "0.21.5",
-        "@esbuild/linux-ppc64": "0.21.5",
-        "@esbuild/linux-riscv64": "0.21.5",
-        "@esbuild/linux-s390x": "0.21.5",
-        "@esbuild/linux-x64": "0.21.5",
-        "@esbuild/netbsd-x64": "0.21.5",
-        "@esbuild/openbsd-x64": "0.21.5",
-        "@esbuild/sunos-x64": "0.21.5",
-        "@esbuild/win32-arm64": "0.21.5",
-        "@esbuild/win32-ia32": "0.21.5",
-        "@esbuild/win32-x64": "0.21.5"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/escalade/-/escalade-3.2.0.tgz",
-      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/fast-string-truncated-width": {
-      "version": "3.0.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-string-truncated-width/-/fast-string-truncated-width-3.0.3.tgz",
-      "integrity": "sha512-0jjjIEL6+0jag3l2XWWizO64/aZVtpiGE3t0Zgqxv0DPuxiMjvB3M24fCyhZUO4KomJQPj3LTSUnDP3GpdwC0g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/fast-string-width": {
-      "version": "3.0.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-string-width/-/fast-string-width-3.0.2.tgz",
-      "integrity": "sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-string-truncated-width": "^3.0.2"
-      }
-    },
-    "node_modules/fast-wrap-ansi": {
-      "version": "0.2.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-wrap-ansi/-/fast-wrap-ansi-0.2.2.tgz",
-      "integrity": "sha512-7F2Fl+TjRSenLqlU3UjSH0iyqopqoZIu7eZVpEirP2g1GtWa2G/ecEmBdgz31+Mxr+ELclgg6sokpSFIQiZ02Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-string-width": "^3.0.2"
-      }
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/graphql": {
-      "version": "16.14.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/graphql/-/graphql-16.14.2.tgz",
-      "integrity": "sha512-Chq1s4CY7jmh8gO2qvLIJyfCDIN+EHLFW/9iShnp1z8FjBQMoodWP1kDC36VAMXXIvAjj4ARa7ntfAV2BrjsbA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
-      }
-    },
-    "node_modules/headers-polyfill": {
-      "version": "5.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/headers-polyfill/-/headers-polyfill-5.0.1.tgz",
-      "integrity": "sha512-1TJ6Fih/b8h5TIcv+1+Hw0PDQWJTKDKzFZzcKOiW1wJza3XoAQlkCuXLbymPYB8+ZQyw8mHvdw560e8zVFIWyA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/set-cookie-parser": "^2.4.10",
-        "set-cookie-parser": "^3.0.1"
-      }
-    },
-    "node_modules/headers-polyfill/node_modules/set-cookie-parser": {
-      "version": "3.1.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/set-cookie-parser/-/set-cookie-parser-3.1.0.tgz",
-      "integrity": "sha512-kjnC1DXBHcxaOaOXBHBeRtltsDG2nUiUni+jP92M9gYdW12rsmx92UsfpH7o5tDRs7I1ZZPSQJQGv3UaRfCiuw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-node-process": {
-      "version": "1.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/is-node-process/-/is-node-process-1.2.0.tgz",
-      "integrity": "sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/msw": {
-      "version": "2.14.6",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/msw/-/msw-2.14.6.tgz",
-      "integrity": "sha512-ALe+N10S72cyx94cMcy3Zs4HhXCj35sgeAL4c+WTvKi0zWnbd8/h0lcFqv0mb2P+aSgAdD7p9HzvA0DiUPxsyg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "@inquirer/confirm": "^6.0.11",
-        "@mswjs/interceptors": "^0.41.3",
-        "@open-draft/deferred-promise": "^3.0.0",
-        "@types/statuses": "^2.0.6",
-        "cookie": "^1.1.1",
-        "graphql": "^16.13.2",
-        "headers-polyfill": "^5.0.1",
-        "is-node-process": "^1.2.0",
-        "outvariant": "^1.4.3",
-        "path-to-regexp": "^6.3.0",
-        "picocolors": "^1.1.1",
-        "rettime": "^0.11.11",
-        "statuses": "^2.0.2",
-        "strict-event-emitter": "^0.5.1",
-        "tough-cookie": "^6.0.1",
-        "type-fest": "^5.5.0",
-        "until-async": "^3.0.2",
-        "yargs": "^17.7.2"
-      },
-      "bin": {
-        "msw": "cli/index.js"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mswjs"
-      },
-      "peerDependencies": {
-        "typescript": ">= 4.8.x"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/msw/node_modules/cliui": {
-      "version": "8.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/cliui/-/cliui-8.0.1.tgz",
-      "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/msw/node_modules/cookie": {
-      "version": "1.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/cookie/-/cookie-1.1.1.tgz",
-      "integrity": "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
-      }
-    },
-    "node_modules/msw/node_modules/yargs": {
-      "version": "17.7.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/yargs/-/yargs-17.7.3.tgz",
-      "integrity": "sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cliui": "^8.0.1",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.3",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^21.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/msw/node_modules/yargs-parser": {
-      "version": "21.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/yargs-parser/-/yargs-parser-21.1.1.tgz",
-      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/mute-stream": {
-      "version": "3.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/mute-stream/-/mute-stream-3.0.0.tgz",
-      "integrity": "sha512-dkEJPVvun4FryqBmZ5KhDo0K9iDXAwn08tMLDinNdRBNPcYEDiWYysLcc6k3mjTMlbP9KyylvRpd4wFtwrT9rw==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "^20.17.0 || >=22.9.0"
-      }
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.15",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/nanoid/-/nanoid-3.3.15.tgz",
-      "integrity": "sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/outvariant": {
-      "version": "1.4.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/outvariant/-/outvariant-1.4.3.tgz",
-      "integrity": "sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/path-to-regexp": {
-      "version": "6.3.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
-      "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/picocolors": {
-      "version": "1.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/postcss": {
-      "version": "8.5.15",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/postcss/-/postcss-8.5.15.tgz",
-      "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "nanoid": "^3.3.12",
-        "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rettime": {
-      "version": "0.11.11",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/rettime/-/rettime-0.11.11.tgz",
-      "integrity": "sha512-ILJRqVWBCTlg9r42fFgwVZx1gnFAcQF8mRoMkbgQfIrjEDf9nbBFDFx00oloOa+Q869FUtaYDXZvEfnecQSCoQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/rollup": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/rollup/-/rollup-4.62.2.tgz",
-      "integrity": "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "1.0.9"
-      },
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=18.0.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.62.2",
-        "@rollup/rollup-android-arm64": "4.62.2",
-        "@rollup/rollup-darwin-arm64": "4.62.2",
-        "@rollup/rollup-darwin-x64": "4.62.2",
-        "@rollup/rollup-freebsd-arm64": "4.62.2",
-        "@rollup/rollup-freebsd-x64": "4.62.2",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.62.2",
-        "@rollup/rollup-linux-arm-musleabihf": "4.62.2",
-        "@rollup/rollup-linux-arm64-gnu": "4.62.2",
-        "@rollup/rollup-linux-arm64-musl": "4.62.2",
-        "@rollup/rollup-linux-loong64-gnu": "4.62.2",
-        "@rollup/rollup-linux-loong64-musl": "4.62.2",
-        "@rollup/rollup-linux-ppc64-gnu": "4.62.2",
-        "@rollup/rollup-linux-ppc64-musl": "4.62.2",
-        "@rollup/rollup-linux-riscv64-gnu": "4.62.2",
-        "@rollup/rollup-linux-riscv64-musl": "4.62.2",
-        "@rollup/rollup-linux-s390x-gnu": "4.62.2",
-        "@rollup/rollup-linux-x64-gnu": "4.62.2",
-        "@rollup/rollup-linux-x64-musl": "4.62.2",
-        "@rollup/rollup-openbsd-x64": "4.62.2",
-        "@rollup/rollup-openharmony-arm64": "4.62.2",
-        "@rollup/rollup-win32-arm64-msvc": "4.62.2",
-        "@rollup/rollup-win32-ia32-msvc": "4.62.2",
-        "@rollup/rollup-win32-x64-gnu": "4.62.2",
-        "@rollup/rollup-win32-x64-msvc": "4.62.2",
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.2.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/statuses": {
-      "version": "2.0.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/statuses/-/statuses-2.0.2.tgz",
-      "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/strict-event-emitter": {
-      "version": "0.5.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/strict-event-emitter/-/strict-event-emitter-0.5.1.tgz",
-      "integrity": "sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/tagged-tag": {
-      "version": "1.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/tagged-tag/-/tagged-tag-1.0.0.tgz",
-      "integrity": "sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/tldts": {
-      "version": "7.4.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/tldts/-/tldts-7.4.4.tgz",
-      "integrity": "sha512-kFXFK7O4WPextIUAOk8qtnw9dxR9UIXP9CjuH1cTBVBZMDeQcUPgr/IazGiw1B0Yiw5L75gHLWeW4iD793r90g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tldts-core": "^7.4.4"
-      },
-      "bin": {
-        "tldts": "bin/cli.js"
-      }
-    },
-    "node_modules/tldts-core": {
-      "version": "7.4.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/tldts-core/-/tldts-core-7.4.4.tgz",
-      "integrity": "sha512-vwVLJVvvpslm7vqAH7+XNj/neA/Ynq7DT2EEcMuwc5YzN5XaMyRAqxwU+uX3azZ1FQtB2gvrvnLnAEkvYlVdfg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/tough-cookie": {
-      "version": "6.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/tough-cookie/-/tough-cookie-6.0.1.tgz",
-      "integrity": "sha512-LktZQb3IeoUWB9lqR5EWTHgW/VTITCXg4D21M+lvybRVdylLrRMnqaIONLVb5mav8vM19m44HIcGq4qASeu2Qw==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "tldts": "^7.0.5"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "5.7.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/type-fest/-/type-fest-5.7.0.tgz",
-      "integrity": "sha512-1URUxUqfHFM1c+zfSPsa3gnkO7Aq21qyH75SIduNYz4SzY964rn1X2vCMQaHSHhktiw+0kPa2iyb6PUpXqB6Vg==",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "dependencies": {
-        "tagged-tag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "5.9.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
-    "node_modules/undici-types": {
-      "version": "8.3.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/undici-types/-/undici-types-8.3.0.tgz",
-      "integrity": "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/until-async": {
-      "version": "3.0.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/until-async/-/until-async-3.0.2.tgz",
-      "integrity": "sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/kettanaito"
-      }
-    },
-    "node_modules/vite": {
-      "version": "5.4.21",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/vite/-/vite-5.4.21.tgz",
-      "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "esbuild": "^0.21.3",
-        "postcss": "^8.4.43",
-        "rollup": "^4.20.0"
-      },
-      "bin": {
-        "vite": "bin/vite.js"
-      },
-      "engines": {
-        "node": "^18.0.0 || >=20.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/vitejs/vite?sponsor=1"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
-      },
-      "peerDependencies": {
-        "@types/node": "^18.0.0 || >=20.0.0",
-        "less": "*",
-        "lightningcss": "^1.21.0",
-        "sass": "*",
-        "sass-embedded": "*",
-        "stylus": "*",
-        "sugarss": "*",
-        "terser": "^5.4.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "less": {
-          "optional": true
-        },
-        "lightningcss": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "sass-embedded": {
-          "optional": true
-        },
-        "stylus": {
-          "optional": true
-        },
-        "sugarss": {
-          "optional": true
-        },
-        "terser": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=10"
-      }
-    }
-  }
-}
diff --git a/tests/e2e/generate-client/examples/mock/redocly.yaml b/tests/e2e/generate-client/examples/mock/redocly.yaml
index d8b154dff0..8a37c931fa 100644
--- a/tests/e2e/generate-client/examples/mock/redocly.yaml
+++ b/tests/e2e/generate-client/examples/mock/redocly.yaml
@@ -3,7 +3,7 @@
 # (run `redocly generate-client` with no args to build every such api).
 apis:
   mock:
-    root: ./openapi.yaml
+    root: ../_shared/cafe.yaml
     clientOutput: ./src/api/client.ts
     client:
       generators:
diff --git a/tests/e2e/generate-client/examples/mock/src/api/client.mocks.ts b/tests/e2e/generate-client/examples/mock/src/api/client.mocks.ts
deleted file mode 100644
index 7bfb6a9796..0000000000
--- a/tests/e2e/generate-client/examples/mock/src/api/client.mocks.ts
+++ /dev/null
@@ -1,442 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-import { http, HttpResponse } from 'msw';
-
-import type { Beverage, Dessert, Error, MenuBaseItem, MenuItem, MenuItemList, OAuth2Client, Order, OrderItem, OrderList, OrderNotification, OrderStatus, Page, RegisterClientObject, RevenueStatistics } from "./client.js";
-
-export function createPage(overrides?: Partial<Page>): Page {
-    return {
-        endCursor: "string",
-        startCursor: "string",
-        hasNextPage: true,
-        hasPrevPage: true,
-        limit: 10,
-        total: 0,
-        ...overrides
-    };
-}
-
-export function createMenuBaseItem(overrides?: Partial<MenuBaseItem>): MenuBaseItem {
-    return {
-        createdAt: "2024-01-01T00:00:00Z",
-        updatedAt: "2024-01-01T00:00:00Z",
-        id: "prd_01h1s5z6vf2mm1mz3hevnn9va7",
-        object: "menuItem",
-        name: "string",
-        price: 0,
-        photo: new Blob([]),
-        photoUrl: "https://example.com",
-        photoTextDescription: "string",
-        ...overrides
-    };
-}
-
-export function createBeverage(overrides?: Partial<Beverage>): Beverage {
-    return {
-        category: "beverage",
-        volume: 0,
-        containsCaffeine: true,
-        createdAt: "2024-01-01T00:00:00Z",
-        updatedAt: "2024-01-01T00:00:00Z",
-        id: "prd_01h1s5z6vf2mm1mz3hevnn9va7",
-        object: "menuItem",
-        name: "string",
-        price: 0,
-        photo: new Blob([]),
-        photoUrl: "https://example.com",
-        photoTextDescription: "string",
-        ...overrides
-    };
-}
-
-export function createDessert(overrides?: Partial<Dessert>): Dessert {
-    return {
-        category: "dessert",
-        calories: 0,
-        createdAt: "2024-01-01T00:00:00Z",
-        updatedAt: "2024-01-01T00:00:00Z",
-        id: "prd_01h1s5z6vf2mm1mz3hevnn9va7",
-        object: "menuItem",
-        name: "string",
-        price: 0,
-        photo: new Blob([]),
-        photoUrl: "https://example.com",
-        photoTextDescription: "string",
-        ...overrides
-    };
-}
-
-export function createMenuItem(overrides?: Partial<MenuItem>): MenuItem {
-    return {
-        category: "beverage",
-        volume: 0,
-        containsCaffeine: true,
-        createdAt: "2024-01-01T00:00:00Z",
-        updatedAt: "2024-01-01T00:00:00Z",
-        id: "prd_01h1s5z6vf2mm1mz3hevnn9va7",
-        object: "menuItem",
-        name: "string",
-        price: 0,
-        photo: new Blob([]),
-        photoUrl: "https://example.com",
-        photoTextDescription: "string",
-        ...overrides
-    } as MenuItem;
-}
-
-export function createMenuItemList(overrides?: Partial<MenuItemList>): MenuItemList {
-    return {
-        object: "list",
-        page: {
-            endCursor: "string",
-            startCursor: "string",
-            hasNextPage: true,
-            hasPrevPage: true,
-            limit: 10,
-            total: 0
-        },
-        items: [
-            {
-                category: "beverage",
-                volume: 0,
-                containsCaffeine: true,
-                createdAt: "2024-01-01T00:00:00Z",
-                updatedAt: "2024-01-01T00:00:00Z",
-                id: "prd_01h1s5z6vf2mm1mz3hevnn9va7",
-                object: "menuItem",
-                name: "string",
-                price: 0,
-                photo: new Blob([]),
-                photoUrl: "https://example.com",
-                photoTextDescription: "string"
-            }
-        ],
-        ...overrides
-    };
-}
-
-export function createError(overrides?: Partial<Error>): Error {
-    return {
-        type: "about:blank",
-        title: "string",
-        status: 0,
-        instance: "/some/uri-reference#specific-occurrence-context",
-        details: {
-            key: null
-        },
-        ...overrides
-    };
-}
-
-export function createOrderStatus(overrides?: Partial<OrderStatus>): OrderStatus {
-    return "placed";
-}
-
-export function createOrder(overrides?: Partial<Order>): Order {
-    return {
-        id: "ord_01h1s5z6vf2mm1mz3hevnn9va7",
-        object: "order",
-        customerName: "string",
-        status: "placed",
-        totalPrice: 0,
-        createdAt: "2024-01-01T00:00:00Z",
-        updatedAt: "2024-01-01T00:00:00Z",
-        orderItems: [
-            {
-                menuItemId: "string",
-                quantity: 0,
-                discount: 0,
-                comment: "string"
-            }
-        ],
-        ...overrides
-    };
-}
-
-export function createOrderList(overrides?: Partial<OrderList>): OrderList {
-    return {
-        object: "list",
-        page: {
-            endCursor: "string",
-            startCursor: "string",
-            hasNextPage: true,
-            hasPrevPage: true,
-            limit: 10,
-            total: 0
-        },
-        items: [
-            {
-                id: "ord_01h1s5z6vf2mm1mz3hevnn9va7",
-                object: "order",
-                customerName: "string",
-                status: "placed",
-                totalPrice: 0,
-                createdAt: "2024-01-01T00:00:00Z",
-                updatedAt: "2024-01-01T00:00:00Z",
-                orderItems: [
-                    {
-                        menuItemId: "string",
-                        quantity: 0,
-                        discount: 0,
-                        comment: "string"
-                    }
-                ]
-            }
-        ],
-        ...overrides
-    };
-}
-
-export function createOrderItem(overrides?: Partial<OrderItem>): OrderItem {
-    return {
-        menuItemId: "string",
-        menuItem: {
-            category: "beverage",
-            volume: 0,
-            containsCaffeine: true,
-            createdAt: "2024-01-01T00:00:00Z",
-            updatedAt: "2024-01-01T00:00:00Z",
-            id: "prd_01h1s5z6vf2mm1mz3hevnn9va7",
-            object: "menuItem",
-            name: "string",
-            price: 0,
-            photo: new Blob([]),
-            photoUrl: "https://example.com",
-            photoTextDescription: "string"
-        },
-        quantity: 0,
-        discount: 0,
-        comment: "string",
-        ...overrides
-    };
-}
-
-export function createRevenueStatistics(overrides?: Partial<RevenueStatistics>): RevenueStatistics {
-    return {
-        revenue: 0,
-        averageOrderAmount: 0,
-        totalOrders: 0,
-        placedOrders: 0,
-        preparingOrders: 0,
-        completedOrders: 0,
-        canceledOrders: 0,
-        startDate: "2024-01-01",
-        endDate: "2024-01-01",
-        ...overrides
-    };
-}
-
-export function createRegisterClientObject(overrides?: Partial<RegisterClientObject>): RegisterClientObject {
-    return {
-        name: "string",
-        redirectUris: [
-            "https://example.com"
-        ],
-        scopes: [
-            "menu:read"
-        ],
-        grantTypes: [
-            "authorization_code"
-        ],
-        ...overrides
-    };
-}
-
-export function createOAuth2Client(overrides?: Partial<OAuth2Client>): OAuth2Client {
-    return {
-        clientId: "string",
-        clientSecret: "string",
-        clientIdIssuedAt: 0,
-        clientSecretExpiresAt: 0,
-        name: "string",
-        redirectUris: [
-            "https://example.com"
-        ],
-        registrationClientUri: "https://example.com",
-        registrationAccessToken: "string",
-        scopes: [
-            "menu:read"
-        ],
-        grantTypes: [
-            "authorization_code"
-        ],
-        ...overrides
-    };
-}
-
-export function createOrderNotification(overrides?: Partial<OrderNotification>): OrderNotification {
-    return {
-        orderId: "string",
-        orderStatus: "placed",
-        timestamp: "2024-01-01T00:00:00Z",
-        ...overrides
-    };
-}
-
-export const listMenuItemsHandler = (override?: Partial<MenuItemList>) => http.get("*/menu", () => HttpResponse.json(createMenuItemList(override)));
-
-export const listMenuItemsErrorHandler = (status: 400 | 500, body?: Error) => http.get("*/menu", () => HttpResponse.json(body ?? {
-    type: "about:blank",
-    title: "string",
-    status: 0,
-    instance: "/some/uri-reference#specific-occurrence-context",
-    details: {
-        key: null
-    }
-}, { status }));
-
-export const createMenuItemHandler = (override?: Partial<MenuItem>) => http.post("*/menu", () => HttpResponse.json(createMenuItem(override), { status: 201 }));
-
-export const createMenuItemErrorHandler = (status: 400 | 401 | 403 | 409 | 500, body?: Error) => http.post("*/menu", () => HttpResponse.json(body ?? {
-    type: "about:blank",
-    title: "string",
-    status: 0,
-    instance: "/some/uri-reference#specific-occurrence-context",
-    details: {
-        key: null
-    }
-}, { status }));
-
-export const deleteMenuItemHandler = (override?: Record<string, unknown>) => http.delete("*/menu/:menuItemId", () => new HttpResponse(null, { status: 200 }));
-
-export const deleteMenuItemErrorHandler = (status: 400 | 401 | 403 | 404 | 500, body?: Error) => http.delete("*/menu/:menuItemId", () => HttpResponse.json(body ?? {
-    type: "about:blank",
-    title: "string",
-    status: 0,
-    instance: "/some/uri-reference#specific-occurrence-context",
-    details: {
-        key: null
-    }
-}, { status }));
-
-export const getMenuItemPhotoHandler = (override?: Record<string, unknown>) => http.get("*/menu-item-images/:menuItemId", () => HttpResponse.json(new Blob([])));
-
-export const getMenuItemPhotoErrorHandler = (status: 404 | 500, body?: Error) => http.get("*/menu-item-images/:menuItemId", () => HttpResponse.json(body ?? {
-    type: "about:blank",
-    title: "string",
-    status: 0,
-    instance: "/some/uri-reference#specific-occurrence-context",
-    details: {
-        key: null
-    }
-}, { status }));
-
-export const listOrdersHandler = (override?: Partial<OrderList>) => http.get("*/orders", () => HttpResponse.json(createOrderList(override)));
-
-export const listOrdersErrorHandler = (status: 400 | 401 | 403 | 500, body?: Error) => http.get("*/orders", () => HttpResponse.json(body ?? {
-    type: "about:blank",
-    title: "string",
-    status: 0,
-    instance: "/some/uri-reference#specific-occurrence-context",
-    details: {
-        key: null
-    }
-}, { status }));
-
-export const createOrderHandler = (override?: Partial<Order>) => http.post("*/orders", () => HttpResponse.json(createOrder(override), { status: 201 }));
-
-export const createOrderErrorHandler = (status: 400 | 401 | 403 | 500, body?: Error) => http.post("*/orders", () => HttpResponse.json(body ?? {
-    type: "about:blank",
-    title: "string",
-    status: 0,
-    instance: "/some/uri-reference#specific-occurrence-context",
-    details: {
-        key: null
-    }
-}, { status }));
-
-export const getOrderByIdHandler = (override?: Partial<Order>) => http.get("*/orders/:orderId", () => HttpResponse.json(createOrder(override)));
-
-export const getOrderByIdErrorHandler = (status: 400 | 401 | 403 | 404 | 500, body?: Error) => http.get("*/orders/:orderId", () => HttpResponse.json(body ?? {
-    type: "about:blank",
-    title: "string",
-    status: 0,
-    instance: "/some/uri-reference#specific-occurrence-context",
-    details: {
-        key: null
-    }
-}, { status }));
-
-export const deleteOrderHandler = (override?: Record<string, unknown>) => http.delete("*/orders/:orderId", () => new HttpResponse(null, { status: 200 }));
-
-export const deleteOrderErrorHandler = (status: 400 | 401 | 403 | 404 | 500, body?: Error) => http.delete("*/orders/:orderId", () => HttpResponse.json(body ?? {
-    type: "about:blank",
-    title: "string",
-    status: 0,
-    instance: "/some/uri-reference#specific-occurrence-context",
-    details: {
-        key: null
-    }
-}, { status }));
-
-export const updateOrderHandler = (override?: Partial<Order>) => http.patch("*/orders/:orderId", () => HttpResponse.json(createOrder(override)));
-
-export const updateOrderErrorHandler = (status: 400 | 401 | 403 | 404 | 500, body?: Error) => http.patch("*/orders/:orderId", () => HttpResponse.json(body ?? {
-    type: "about:blank",
-    title: "string",
-    status: 0,
-    instance: "/some/uri-reference#specific-occurrence-context",
-    details: {
-        key: null
-    }
-}, { status }));
-
-export const listOrderItemsHandler = (override?: Record<string, unknown>) => http.get("*/order-items", () => HttpResponse.json([
-    {
-        menuItemId: "string",
-        menuItem: {
-            category: "beverage",
-            volume: 0,
-            containsCaffeine: true,
-            createdAt: "2024-01-01T00:00:00Z",
-            updatedAt: "2024-01-01T00:00:00Z",
-            id: "prd_01h1s5z6vf2mm1mz3hevnn9va7",
-            object: "menuItem",
-            name: "string",
-            price: 0,
-            photo: new Blob([]),
-            photoUrl: "https://example.com",
-            photoTextDescription: "string"
-        },
-        quantity: 0,
-        discount: 0,
-        comment: "string"
-    }
-]));
-
-export const listOrderItemsErrorHandler = (status: 400 | 401 | 403 | 404 | 500, body?: Error) => http.get("*/order-items", () => HttpResponse.json(body ?? {
-    type: "about:blank",
-    title: "string",
-    status: 0,
-    instance: "/some/uri-reference#specific-occurrence-context",
-    details: {
-        key: null
-    }
-}, { status }));
-
-export const getRevenueHandler = (override?: Partial<RevenueStatistics>) => http.get("*/revenue", () => HttpResponse.json(createRevenueStatistics(override)));
-
-export const getRevenueErrorHandler = (status: 400 | 401 | 403 | 500, body?: Error) => http.get("*/revenue", () => HttpResponse.json(body ?? {
-    type: "about:blank",
-    title: "string",
-    status: 0,
-    instance: "/some/uri-reference#specific-occurrence-context",
-    details: {
-        key: null
-    }
-}, { status }));
-
-export const registerOAuth2ClientHandler = (override?: Partial<OAuth2Client>) => http.post("*/oauth2/register", () => HttpResponse.json(createOAuth2Client(override), { status: 201 }));
-
-export const registerOAuth2ClientErrorHandler = (status: 400 | 401 | 500, body?: Error) => http.post("*/oauth2/register", () => HttpResponse.json(body ?? {
-    type: "about:blank",
-    title: "string",
-    status: 0,
-    instance: "/some/uri-reference#specific-occurrence-context",
-    details: {
-        key: null
-    }
-}, { status }));
-
-export const handlers = [listMenuItemsHandler(), createMenuItemHandler(), deleteMenuItemHandler(), getMenuItemPhotoHandler(), listOrdersHandler(), createOrderHandler(), getOrderByIdHandler(), deleteOrderHandler(), updateOrderHandler(), listOrderItemsHandler(), getRevenueHandler(), registerOAuth2ClientHandler()];
\ No newline at end of file
diff --git a/tests/e2e/generate-client/examples/mock/src/api/client.ts b/tests/e2e/generate-client/examples/mock/src/api/client.ts
deleted file mode 100644
index 550cd946cd..0000000000
--- a/tests/e2e/generate-client/examples/mock/src/api/client.ts
+++ /dev/null
@@ -1,1968 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Redocly Cafe (v1.0.0)
- * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
- * Create API credentials and try it yourself in a realistic OpenAPI workflow.
- * 
- */
-
-export type Page = {
-    /**
-     * Use with the `after` query parameter to load the next page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    endCursor: string | null;
-    /**
-     * Use with the `before` query parameter to load the previous page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    startCursor: string | null;
-    /**
-     * Indicates if there is a next page with items.
-     */
-    hasNextPage: boolean;
-    /**
-     * Indicates if there is a previous page with items.
-     */
-    hasPrevPage: boolean;
-    /**
-     * Value showing how many items are in the page limit.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit: number;
-    /**
-     * Count of items across all pages.
-     * @minimum 0
-     */
-    total: number;
-};
-
-export type MenuBaseItem = {
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt: string;
-    /**
-     * Menu item ID. Unique identifier prefixed with `prd_`.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    readonly id: string;
-    /**
-     * Entity name.
-     */
-    readonly object: "menuItem";
-    /**
-     * Menu item name.
-     * @minLength 1
-     * @maxLength 50
-     */
-    name: string;
-    /**
-     * Price in cents.
-     * @minimum 0
-     */
-    price: number;
-    /**
-     * Photo of the menu item. Must be a PNG image and less than 1MB.
-     * @format binary
-     */
-    photo?: Blob | null;
-    /**
-     * Photo URL of the menu item.
-     * @format uri
-     */
-    readonly photoUrl?: string;
-    photoTextDescription?: string | null;
-};
-
-export type Beverage = {
-    /**
-     * Menu item category.
-     */
-    category: "beverage";
-    /**
-     * Size of the beverage in milliliters.
-     * @exclusiveMinimum 0
-     */
-    volume: number;
-    /**
-     * Indicates if the beverage contains caffeine.
-     */
-    containsCaffeine: boolean;
-} & MenuBaseItem;
-
-export type Dessert = {
-    /**
-     * Menu item category.
-     */
-    category: "dessert";
-    /**
-     * Amount of calories.
-     * @exclusiveMinimum 0
-     */
-    calories: number;
-} & MenuBaseItem;
-
-export type MenuItem = Beverage | Dessert;
-
-export type MenuItemList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: MenuItem[];
-};
-
-export type Error = {
-    /**
-     * URI reference that identifies the problem type.
-     * @format uri-reference
-     */
-    type: string;
-    /**
-     * Short summary of the problem type.
-     */
-    title: string;
-    /**
-     * HTTP status code generated by the origin server for this occurrence of the problem.
-     * @minimum 100
-     * @exclusiveMaximum 600
-     * @format int32
-     */
-    status: number;
-    /**
-     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-     * May be used to locate the root of this problem in the source code.
-     * @format uri-reference
-     */
-    instance?: string;
-    /**
-     * Additional error details.
-     */
-    details?: Record<string, unknown>;
-};
-
-/**
- * Order status.
- */
-export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
-
-export const OrderStatus = {
-    placed: "placed",
-    preparing: "preparing",
-    completed: "completed",
-    canceled: "canceled"
-} as const;
-
-export type Order = {
-    /**
-     * Order ID. Unique identifier prefixed with `ord_`.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     * @format ulid
-     */
-    readonly id?: string;
-    /**
-     * Entity name.
-     */
-    readonly object?: "order";
-    /**
-     * Name of the customer who placed the order.
-     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-     * @minLength 1
-     * @maxLength 100
-     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-     */
-    customerName: string;
-    readonly status?: OrderStatus;
-    /**
-     * Total order price in cents.
-     * @minimum 0
-     */
-    readonly totalPrice?: number;
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt?: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt?: string;
-    /**
-     * List of items to include in the order.
-     * @minItems 1
-     */
-    orderItems: {
-        /**
-         * ID of the menu item to add to the order.
-         * @format ulid
-         */
-        menuItemId: string;
-        /**
-         * Quantity of the menu item.
-         * @minimum 1
-         */
-        quantity: number;
-        /**
-         * Discount amount in cents (absolute value).
-         * @minimum 0
-         */
-        discount?: number;
-        /**
-         * Optional comment for the order item (e.g., "No sugar").
-         * @maxLength 500
-         */
-        comment?: string;
-    }[];
-};
-
-export type OrderList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: Order[];
-};
-
-export type OrderItem = {
-    /**
-     * ID of the menu item to add to the order.
-     */
-    menuItemId: string;
-    /**
-     * Menu item that is part of the order.
-     */
-    readonly menuItem?: MenuItem;
-    /**
-     * Quantity of the menu item.
-     * @minimum 1
-     */
-    quantity: number;
-    /**
-     * Discount amount in cents (absolute value).
-     * @minimum 0
-     */
-    discount?: number;
-    /**
-     * Optional comment for the order item (e.g., "No sugar").
-     * @maxLength 500
-     */
-    comment?: string;
-};
-
-/**
- * Revenue statistics for a given date range.
- */
-export type RevenueStatistics = {
-    /**
-     * Total revenue in cents from completed orders.
-     * @minimum 0
-     * @format float
-     */
-    revenue: number;
-    /**
-     * Average order amount in cents (calculated from completed orders only).
-     * @minimum 0
-     * @format float
-     */
-    averageOrderAmount: number;
-    /**
-     * Total number of orders (all statuses) in the date range.
-     * @minimum 0
-     */
-    totalOrders: number;
-    /**
-     * Number of placed orders.
-     * @minimum 0
-     */
-    placedOrders: number;
-    /**
-     * Number of preparing orders.
-     * @minimum 0
-     */
-    preparingOrders: number;
-    /**
-     * Number of completed orders.
-     * @minimum 0
-     */
-    completedOrders: number;
-    /**
-     * Number of canceled orders.
-     * @minimum 0
-     */
-    canceledOrders: number;
-    /**
-     * Start date of the revenue calculation period.
-     * @format date
-     */
-    startDate: string;
-    /**
-     * End date of the revenue calculation period.
-     * @format date
-     */
-    endDate: string;
-};
-
-export type RegisterClientObject = {
-    /**
-     * Client name.
-     */
-    name: string;
-    /**
-     * List of redirect URIs (optional, defaults to empty array).
-     */
-    redirectUris?: string[];
-    /**
-     * List of scopes.
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types.
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-/**
- * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
- */
-export type OAuth2Client = {
-    /**
-     * Client identifier issued by the authorization server.
-     */
-    clientId: string;
-    /**
-     * Client secret issued by the authorization server.
-     */
-    clientSecret: string;
-    /**
-     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-     * @format int64
-     */
-    clientIdIssuedAt: number;
-    /**
-     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-     * @format int64
-     */
-    clientSecretExpiresAt: number;
-    /**
-     * Client name (registered metadata).
-     */
-    name?: string;
-    /**
-     * List of redirect URIs (registered metadata).
-     */
-    redirectUris?: string[];
-    /**
-     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
-     * @format uri
-     */
-    registrationClientUri: string;
-    /**
-     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-     */
-    registrationAccessToken: string;
-    /**
-     * List of scopes (registered metadata).
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types (registered metadata).
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-export type OrderNotification = {
-    /**
-     * Unique order identifier.
-     */
-    orderId: string;
-    orderStatus: OrderStatus;
-    /**
-     * When the event occurred.
-     * @format date-time
-     */
-    timestamp: string;
-};
-
-/**
- * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
- */
-export function isBeverage(value: MenuItem): value is Beverage {
-    return (value as Record<string, unknown>)["category"] === "beverage";
-}
-
-/**
- * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
- */
-export function isDessert(value: MenuItem): value is Dessert {
-    return (value as Record<string, unknown>)["category"] === "dessert";
-}
-
-export type ListMenuItemsResult = MenuItemList;
-
-export type ListMenuItemsParams = {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-};
-
-export type ListMenuItemsVariables = {
-    params?: ListMenuItemsParams;
-};
-
-export type CreateMenuItemResult = MenuItem;
-
-export type CreateMenuItemBody = FormData;
-
-export type CreateMenuItemVariables = {
-    body: CreateMenuItemBody;
-};
-
-export type DeleteMenuItemResult = void;
-
-export type DeleteMenuItemVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-};
-
-export type GetMenuItemPhotoResult = Blob | string;
-
-export type GetMenuItemPhotoParams = {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-};
-
-export type GetMenuItemPhotoVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-    params?: GetMenuItemPhotoParams;
-};
-
-export type ListOrdersResult = OrderList;
-
-export type ListOrdersParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-};
-
-export type ListOrdersVariables = {
-    params?: ListOrdersParams;
-};
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    headers?: GetOrderByIdHeaders;
-};
-
-export type DeleteOrderResult = void;
-
-export type DeleteOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-};
-
-export type UpdateOrderResult = Order;
-
-export type UpdateOrderBody = {
-    status: OrderStatus;
-};
-
-export type UpdateOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    body?: UpdateOrderBody;
-};
-
-export type ListOrderItemsResult = OrderItem[];
-
-export type ListOrderItemsParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-};
-
-export type ListOrderItemsVariables = {
-    params?: ListOrderItemsParams;
-};
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    listMenuItems: {
-        args: {
-            params?: ListMenuItemsParams;
-        };
-        result: ListMenuItemsResult;
-    };
-    createMenuItem: {
-        args: {
-            body: CreateMenuItemBody;
-        };
-        result: CreateMenuItemResult;
-    };
-    deleteMenuItem: {
-        args: {
-            /**
-             * ID of the menu item to retrieve.
-             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            menuItemId: string;
-        };
-        result: DeleteMenuItemResult;
-    };
-    getMenuItemPhoto: {
-        args: {
-            /**
-             * ID of the menu item to retrieve.
-             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            menuItemId: string;
-            params?: GetMenuItemPhotoParams;
-        };
-        result: GetMenuItemPhotoResult;
-    };
-    listOrders: {
-        args: {
-            params?: ListOrdersParams;
-        };
-        result: ListOrdersResult;
-    };
-    createOrder: {
-        args: {
-            body: CreateOrderBody;
-        };
-        result: CreateOrderResult;
-    };
-    getOrderById: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-            headers?: GetOrderByIdHeaders;
-        };
-        result: GetOrderByIdResult;
-    };
-    deleteOrder: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-        };
-        result: DeleteOrderResult;
-    };
-    updateOrder: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-            body?: UpdateOrderBody;
-        };
-        result: UpdateOrderResult;
-    };
-    listOrderItems: {
-        args: {
-            params?: ListOrderItemsParams;
-        };
-        result: ListOrderItemsResult;
-    };
-    getRevenue: {
-        args: {
-            params?: GetRevenueParams;
-        };
-        result: GetRevenueResult;
-    };
-    registerOAuth2Client: {
-        args: {
-            body: RegisterOAuth2ClientBody;
-        };
-        result: RegisterOAuth2ClientResult;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
-    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
-    tags: readonly string[];
-}>["tags"][number];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — `@redocly/client-generator`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits `OPERATIONS` literals typed
- * `satisfies Record<string, OperationDescriptor>` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
- * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to `'json'` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
- * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real `ApiError` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call `parseAs` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of `data`/`error` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
- * streams and, for paginated operations, `item` (the page's element type) and — on
- * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
- * iteration unwraps the `Result` envelope the one-shot `result` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: `{}` has no required members, so
- * `{} extends A` is true exactly when every member of `A` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type `.pages()` yields: the RAW page declared by `page` (the generator
- * writes it only on result-mode paginated entries, whose `result` is the envelope),
- * or the method's own `result` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares `item` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
- * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
- * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
- * `onError` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(`Request failed with status ${status}`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
- * `filter=a/b` survives instead of `filter=a%2Fb`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
- * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
- * `deepObject` brackets, and `null`/`undefined` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(`${key}[${subKey}]`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. `%20` (not `+`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-      }
-    } else if (Object(value) === value) {
-      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
-          else params.append(`${key}[${subKey}]`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(`${key}=${encodeReserved(String(value))}`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? `${url}?${qs}` : url;
-}
-
-/**
- * Read the response body per `kind`. `'auto'` negotiates from the content type
- * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom `retryOn` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
- * unless `jitter === false`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/** Resolve a credential: a literal passes through; a function is awaited per request. */
-async function resolveToken(provider: TokenProvider): Promise<string> {
-  return typeof provider === 'function' ? await provider() : provider;
-}
-
-/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
-function encodeBase64(text: string): string {
-  let binary = '';
-  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
-  return btoa(binary);
-}
-
-/** Whether a credential for this scheme is configured on the instance. */
-function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
-  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
-  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
-  return config.auth?.basic !== undefined;
-}
-
-/**
- * Build the auth headers/query for one operation's `security` OR-alternatives from the
- * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * The first alternative whose schemes (an AND-set) are all configured is applied, so
- * "bearer OR apiKey" works with either credential and never sends both. When none is
- * fully configured, the first alternative's configured schemes are still sent (the
- * server rejects the request, mirroring the previous behavior).
- * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
- */
-async function resolveAuth(
-  security: readonly (readonly SecuritySpec[])[],
-  config: ClientConfig
-): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
-  const alternative =
-    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
-    security[0] ??
-    [];
-  const headers: Record<string, string> = {};
-  const query: Record<string, string> = {};
-  const cookies: string[] = [];
-  for (const scheme of alternative) {
-    if (scheme.kind === 'apiKey') {
-      const provider = config.auth?.apiKey?.[scheme.scheme];
-      if (provider === undefined) continue;
-      const value = await resolveToken(provider);
-      if (scheme.in === 'header') headers[scheme.name] = value;
-      else if (scheme.in === 'query') query[scheme.name] = value;
-      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
-      // so the credential can't break the `Cookie` header syntax.
-      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
-    } else if (scheme.kind === 'bearer') {
-      const provider = config.auth?.bearer;
-      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
-    } else {
-      const basic = config.auth?.basic;
-      if (basic !== undefined) {
-        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
-      }
-    }
-  }
-  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
-  return { headers, query };
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * `createClient` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
- * to a plain record — spreading a `Headers` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
- * `onResponse` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * The optional behaviors `createClientCore` can dispatch to but never statically
- * imports. The package's public `createClient` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
- * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
- * are honored, and an omitted `explode` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller `init.headers` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
- * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's `error` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (`errorMode` is fixed at construction — `configure()`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
-    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
-    // basic/apiKey. `apiKey` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: `createClientCore` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
- * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
-}
-
-export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe.redocly.com" });
-
-export const { configure, use } = client;
-export const setBearer = client.auth.bearer;
-export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
-export const listMenuItems = (params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
-export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
-export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
-export const getMenuItemPhoto = (menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
-export const listOrders = (params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
-export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
-export const getOrderById = (orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
-export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
-export const updateOrder = (orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
-export const listOrderItems = (params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
-export const getRevenue = (params: {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
-export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
diff --git a/tests/e2e/generate-client/examples/multi-instance/.gitignore b/tests/e2e/generate-client/examples/multi-instance/.gitignore
index f06235c460..6eb23affb8 100644
--- a/tests/e2e/generate-client/examples/multi-instance/.gitignore
+++ b/tests/e2e/generate-client/examples/multi-instance/.gitignore
@@ -1,2 +1,4 @@
 node_modules
 dist
+src/api/
+package-lock.json
diff --git a/tests/e2e/generate-client/examples/multi-instance/README.md b/tests/e2e/generate-client/examples/multi-instance/README.md
index 3d66f4b351..0bf0d8b2ff 100644
--- a/tests/e2e/generate-client/examples/multi-instance/README.md
+++ b/tests/e2e/generate-client/examples/multi-instance/README.md
@@ -13,10 +13,9 @@ example uses `runtime: package` to also show the factory coming from the install
 
 ```bash
 npm install
-npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
+npm run generate   # generate src/api (the client is gitignored)
 npm run dev        # open the printed local URL
 ```
 
 The app uses a canned `fetch` that echoes the tenant host and `Authorization` header, so the
-per-instance isolation is visible offline. The generated client under `src/api/` is committed
-and drift-checked against the generator in CI.
+per-instance isolation is visible offline. The generated client under `src/api/` is gitignored; CI regenerates it and type-checks this example.
diff --git a/tests/e2e/generate-client/examples/multi-instance/src/api/client.ts b/tests/e2e/generate-client/examples/multi-instance/src/api/client.ts
deleted file mode 100644
index 3f379ea727..0000000000
--- a/tests/e2e/generate-client/examples/multi-instance/src/api/client.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Projects API (v1.0.0)
- * Demo per-tenant projects API for the multi-instance example.
- */
-
-import { createClient, type OperationDescriptor, type RequestOptions } from '@redocly/client-generator';
-
-export type Project = {
-    /**
-     * Project ID.
-     */
-    id: string;
-    /**
-     * Project name.
-     */
-    name: string;
-};
-
-export type ProjectRequest = {
-    /**
-     * Project name.
-     */
-    name: string;
-};
-
-export type ProjectList = {
-    items: Project[];
-};
-
-export type ListProjectsResult = ProjectList;
-
-export type CreateProjectResult = Project;
-
-export type CreateProjectBody = ProjectRequest;
-
-export type CreateProjectVariables = {
-    body: CreateProjectBody;
-};
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    listProjects: {
-        args: {};
-        result: ListProjectsResult;
-    };
-    createProject: {
-        args: {
-            body: CreateProjectBody;
-        };
-        result: CreateProjectResult;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    listProjects: { id: "listProjects", method: "GET", path: "/projects", tags: ["Projects"], security: [[{ scheme: "BearerAuth", kind: "bearer" }]] },
-    createProject: { id: "createProject", method: "POST", path: "/projects", tags: ["Projects"], body: { contentType: "application/json" }, security: [[{ scheme: "BearerAuth", kind: "bearer" }]] }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
-    tags: readonly string[];
-}>["tags"][number];
-
-export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://acme.api.example.com" });
-
-export const { configure, use } = client;
-export const setBearer = client.auth.bearer;
-export const listProjects = (init: RequestOptions = {}) => client.listProjects({}, init);
-export const createProject = (body: ProjectRequest, init: RequestOptions = {}) => client.createProject({ body }, init);
-
-export { ApiError, createClient } from '@redocly/client-generator';
-export type { ClientConfig, Middleware, RequestOptions } from '@redocly/client-generator';
diff --git a/tests/e2e/generate-client/examples/nested-facade/.gitignore b/tests/e2e/generate-client/examples/nested-facade/.gitignore
new file mode 100644
index 0000000000..33d6b355f6
--- /dev/null
+++ b/tests/e2e/generate-client/examples/nested-facade/.gitignore
@@ -0,0 +1,2 @@
+src/api/
+package-lock.json
diff --git a/tests/e2e/generate-client/examples/nested-facade/src/api/client.facade.ts b/tests/e2e/generate-client/examples/nested-facade/src/api/client.facade.ts
deleted file mode 100644
index 9982c6a80b..0000000000
--- a/tests/e2e/generate-client/examples/nested-facade/src/api/client.facade.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-// Generated by the nested-facade custom generator. Do not edit by hand.
-import { getOrder, listMenuItems, listOrders } from './client.js';
-
-export const orders = { listOrders, getOrder } as const;
-export const menu = { listMenuItems } as const;
-
-export const api = { orders, menu } as const;
diff --git a/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts b/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
deleted file mode 100644
index a693878260..0000000000
--- a/tests/e2e/generate-client/examples/nested-facade/src/api/client.ts
+++ /dev/null
@@ -1,1017 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Cafe API (v1.0.0)
- * A small tagged API for the nested-facade example.
- */
-
-export type Order = {
-    id: string;
-    drink: string;
-};
-
-export type MenuItem = {
-    name: string;
-    price: number;
-};
-
-export type ListOrdersResult = Order[];
-
-export type GetOrderResult = Order;
-
-export type GetOrderVariables = {
-    orderId: string;
-};
-
-export type ListMenuItemsResult = MenuItem[];
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    listOrders: {
-        args: {};
-        result: ListOrdersResult;
-    };
-    getOrder: {
-        args: {
-            orderId: string;
-        };
-        result: GetOrderResult;
-    };
-    listMenuItems: {
-        args: {};
-        result: ListMenuItemsResult;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"] },
-    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }] },
-    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Menu"] }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
-    tags: readonly string[];
-}>["tags"][number];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — `@redocly/client-generator`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits `OPERATIONS` literals typed
- * `satisfies Record<string, OperationDescriptor>` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
- * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to `'json'` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
- * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real `ApiError` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call `parseAs` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of `data`/`error` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
- * streams and, for paginated operations, `item` (the page's element type) and — on
- * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
- * iteration unwraps the `Result` envelope the one-shot `result` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: `{}` has no required members, so
- * `{} extends A` is true exactly when every member of `A` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type `.pages()` yields: the RAW page declared by `page` (the generator
- * writes it only on result-mode paginated entries, whose `result` is the envelope),
- * or the method's own `result` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares `item` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
- * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
- * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
- * `onError` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(`Request failed with status ${status}`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
- * `filter=a/b` survives instead of `filter=a%2Fb`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
- * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
- * `deepObject` brackets, and `null`/`undefined` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(`${key}[${subKey}]`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. `%20` (not `+`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-      }
-    } else if (Object(value) === value) {
-      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
-          else params.append(`${key}[${subKey}]`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(`${key}=${encodeReserved(String(value))}`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? `${url}?${qs}` : url;
-}
-
-/**
- * Read the response body per `kind`. `'auto'` negotiates from the content type
- * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom `retryOn` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
- * unless `jitter === false`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * `createClient` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
- * to a plain record — spreading a `Headers` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
- * `onResponse` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * The optional behaviors `createClientCore` can dispatch to but never statically
- * imports. The package's public `createClient` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
- * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
- * are honored, and an omitted `explode` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller `init.headers` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
- * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's `error` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (`errorMode` is fixed at construction — `configure()`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
-    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
-    // basic/apiKey. `apiKey` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: `createClientCore` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
- * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, {});
-}
-
-export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe-orders.example.com" });
-
-export const { configure, use } = client;
-export const listOrders = (init: RequestOptions = {}) => client.listOrders({}, init);
-export const getOrder = (orderId: string, init: RequestOptions = {}) => client.getOrder({ orderId }, init);
-export const listMenuItems = (init: RequestOptions = {}) => client.listMenuItems({}, init);
diff --git a/tests/e2e/generate-client/examples/package-runtime/.gitignore b/tests/e2e/generate-client/examples/package-runtime/.gitignore
index f06235c460..6eb23affb8 100644
--- a/tests/e2e/generate-client/examples/package-runtime/.gitignore
+++ b/tests/e2e/generate-client/examples/package-runtime/.gitignore
@@ -1,2 +1,4 @@
 node_modules
 dist
+src/api/
+package-lock.json
diff --git a/tests/e2e/generate-client/examples/package-runtime/README.md b/tests/e2e/generate-client/examples/package-runtime/README.md
index 85dd09919b..25c941bf3d 100644
--- a/tests/e2e/generate-client/examples/package-runtime/README.md
+++ b/tests/e2e/generate-client/examples/package-runtime/README.md
@@ -10,10 +10,10 @@ regeneration; regenerate only when the API contract changes.
 
 ```bash
 npm install
-npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
+npm run generate   # generate src/api (the client is gitignored)
 npm run dev        # open the printed local URL
 ```
 
-The generated client under `src/api/` is committed and drift-checked against the generator in CI.
+The generated client under `src/api/` is gitignored; CI regenerates it and type-checks this example.
 The app code is the same as the inline examples — `configure()`, `use()` middleware, free
 functions, the `client` instance, `ApiError` — only the runtime's distribution differs.
diff --git a/tests/e2e/generate-client/examples/package-runtime/openapi.yaml b/tests/e2e/generate-client/examples/package-runtime/openapi.yaml
deleted file mode 100644
index a255b72a20..0000000000
--- a/tests/e2e/generate-client/examples/package-runtime/openapi.yaml
+++ /dev/null
@@ -1,1163 +0,0 @@
-openapi: 3.2.0
-info:
-  title: Redocly Cafe
-  description: |
-    Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
-    Create API credentials and try it yourself in a realistic OpenAPI workflow.
-  version: 1.0.0
-  contact:
-    email: team@redocly.com
-    url: https://redocly.com/contact-us/
-  license:
-    name: MIT
-    url: https://opensource.org/licenses/MIT
-  termsOfService: https://redocly.com/subscription-agreement
-servers:
-  - url: https://api.cafe.redocly.com
-    description: Live server.
-tags:
-  - name: Authorization
-    description: Create a client to demo the API.
-  - name: Products
-    description: Operations related to products.
-  - name: Orders
-    description: Order management operations.
-  - name: Statistics
-    description: Statistics operations.
-paths:
-  /menu:
-    get:
-      tags:
-        - Products
-      summary: List all menu items
-      description: Retrieve a collection of menu items with optional filtering and pagination.
-      operationId: listMenuItems
-      security: []
-      parameters:
-        - $ref: '#/components/parameters/After'
-        - $ref: '#/components/parameters/Before'
-        - $ref: '#/components/parameters/Sort'
-        - $ref: '#/components/parameters/Filter'
-        - $ref: '#/components/parameters/Search'
-        - $ref: '#/components/parameters/Limit'
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/MenuItemList'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    post:
-      tags:
-        - Products
-      summary: Create menu item
-      description: Create a new menu item.
-      operationId: createMenuItem
-      security:
-        - OAuth2:
-            - menu:write
-      requestBody:
-        required: true
-        content:
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/MenuItem'
-      responses:
-        '201':
-          description: Menu item created successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/MenuItem'
-              examples:
-                MenuItemResponse:
-                  value:
-                    id: prd_01khr487f7qm7p44xn427m43vb
-                    object: menuItem
-                    name: coffee
-                    price: 4000
-                    category: beverage
-                    createdAt: '2026-02-18T10:20:38.228Z'
-                    updatedAt: '2026-02-18T10:20:38.228Z'
-                    volume: 600
-                    containsCaffeine: false
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '409':
-          $ref: '#/components/responses/Conflict'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /menu/{menuItemId}:
-    parameters:
-      - $ref: '#/components/parameters/MenuItemId'
-    delete:
-      tags:
-        - Products
-      summary: Delete a menu item
-      description: Delete an existing menu item.
-      operationId: deleteMenuItem
-      security:
-        - OAuth2:
-            - menu:write
-      responses:
-        '204':
-          description: Menu item deleted successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /menu-item-images/{menuItemId}:
-    parameters:
-      - $ref: '#/components/parameters/MenuItemId'
-    get:
-      operationId: getMenuItemPhoto
-      summary: Retrieve a menu item photo
-      description: Retrieve the product photo image for a specific menu item.
-      security: []
-      tags:
-        - Products
-      parameters:
-        - $ref: '#/components/parameters/PhotoSize'
-      responses:
-        '200':
-          description: Menu item photo retrieved successfully.
-          content:
-            image/png:
-              schema:
-                type: string
-                format: binary
-            text/plain:
-              schema:
-                description: Alternative image text.
-                type: string
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /orders:
-    get:
-      tags:
-        - Orders
-      summary: List all orders
-      description: Retrieve a collection of orders with optional filtering and pagination.
-      operationId: listOrders
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/Filter'
-        - $ref: '#/components/parameters/Sort'
-        - $ref: '#/components/parameters/Limit'
-        - $ref: '#/components/parameters/After'
-        - $ref: '#/components/parameters/Before'
-        - $ref: '#/components/parameters/Search'
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/OrderList'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    post:
-      tags:
-        - Orders
-      summary: Create order
-      description: |
-        Create a new order.
-        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
-      operationId: createOrder
-      security:
-        - OAuth2:
-            - orders:write
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Order'
-            examples:
-              OrderRequest:
-                dataValue:
-                  customerName: Mary Ann
-                  orderItems:
-                    - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                      quantity: 2
-                      comment: No sugar!
-                      discount: 0
-      responses:
-        '201':
-          description: Order placed successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: placed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /orders/{orderId}:
-    get:
-      tags:
-        - Orders
-      summary: Retrieve an order
-      description: Retrieve a single order by its ID.
-      operationId: getOrderById
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-        - name: X-Request-Id
-          in: header
-          required: false
-          description: |
-            Optional client-supplied correlation ID, echoed in logs and traces.
-          schema:
-            type: string
-            format: uuid
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: placed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    patch:
-      tags:
-        - Orders
-      summary: Partially update an order
-      description: |
-        Update an existing order status.
-        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
-      operationId: updateOrder
-      security:
-        - OAuth2:
-            - orders:write
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-      requestBody:
-        content:
-          application/json:
-            schema:
-              type: object
-              description: |
-                Partial order update using JSON Merge Patch - only include fields to update.
-              properties:
-                status:
-                  $ref: '#/components/schemas/OrderStatus'
-              required:
-                - status
-      responses:
-        '200':
-          description: Order updated successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: completed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    delete:
-      tags:
-        - Orders
-      summary: Delete an order
-      description: |
-        Delete the order.
-        To keep the order history, the order should be canceled instead of deleted.
-      operationId: deleteOrder
-      security:
-        - OAuth2:
-            - orders:write
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-      responses:
-        '204':
-          description: Order deleted successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /order-items:
-    get:
-      tags:
-        - Orders
-      summary: List all order items with menu item details
-      description: |
-        Returns an array of order items for a specific order.
-        Use the `filter` parameter to filter by order ID.
-      operationId: listOrderItems
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/Filter'
-          required: true
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                type: array
-                description: List of menu items that are part of the order.
-                items:
-                  $ref: '#/components/schemas/OrderItem'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /revenue:
-    get:
-      tags:
-        - Statistics
-      summary: Get revenue statistics
-      description: |
-        Retrieve revenue statistics for a configurable date range.
-        Returns revenue, order counts, average order amount, and other useful statistics.
-      operationId: getRevenue
-      security:
-        - ApiKey: []
-      parameters:
-        - name: startDate
-          in: query
-          required: false
-          description: |
-            Start date for the revenue calculation period (ISO 8601 datetime format).
-            Defaults to 30 days ago if not provided.
-          schema:
-            type: string
-            format: date
-          example: '2026-01-01'
-        - name: endDate
-          in: query
-          required: false
-          description: |
-            End date for the revenue calculation period (ISO 8601 datetime format).
-            Defaults to current time if not provided.
-          schema:
-            type: string
-            format: date
-          example: '2026-01-31'
-      responses:
-        '200':
-          description: Revenue statistics retrieved successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RevenueStatistics'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /oauth2/register:
-    post:
-      tags:
-        - Authorization
-      summary: Create OAuth2 client
-      description: |
-        Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
-        - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type, 
-          `redirectUris` must be provided (per RFC 7591 Section 2).
-        - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
-        Returns the registered client information per RFC 7591, including:
-        - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
-      operationId: registerOAuth2Client
-      security: []
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/RegisterClientObject'
-      responses:
-        '201':
-          description: OAuth2 client registered successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/OAuth2Client'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-webhooks:
-  order-notification:
-    post:
-      tags:
-        - Orders
-      operationId: orderNotificationWebhook
-      security: []
-      summary: Order notification webhook
-      description: Webhook triggered when a new order is placed.
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/OrderNotification'
-      responses:
-        '200':
-          description: Webhook received successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-components:
-  securitySchemes:
-    OAuth2:
-      type: oauth2
-      description: OAuth2 authorization for API access.
-      flows:
-        authorizationCode:
-          authorizationUrl: https://api.cafe.redocly.com/oauth2/authorize
-          tokenUrl: https://api.cafe.redocly.com/oauth2/token
-          scopes:
-            menu:read: Read access to menu items and images
-            menu:write: Write access to menu items (create, delete)
-            orders:read: Read access to orders
-            orders:write: Write access to orders (create, update, delete)
-        clientCredentials:
-          tokenUrl: https://api.cafe.redocly.com/oauth2/token
-          scopes:
-            menu:read: Read access to menu items and images
-            menu:write: Write access to menu items (create, delete)
-            orders:read: Read access to orders
-            orders:write: Write access to orders (create, update, delete)
-    ApiKey:
-      type: apiKey
-      name: X-API-Key
-      in: header
-      description: API key for internal operations.
-  parameters:
-    After:
-      name: after
-      in: query
-      required: false
-      description: Use the `endCursor` as a value for the `after` parameter to get the next page.
-      schema:
-        type: string
-      example: a25fgaksjf23la==
-    Before:
-      name: before
-      in: query
-      required: false
-      description: |
-        Use the `startCursor` as a value for the `before` parameter to get the next page.
-      schema:
-        type: string
-      example: bfg23aksjf23zb1==
-    Sort:
-      name: sort
-      description: |-
-        To sort by id in descending order use `-id`.
-        To sort by id in ascending order use `id`.
-      in: query
-      required: false
-      schema:
-        type: string
-      example: '-name'
-    Filter:
-      name: filter
-      description: |-
-        Filters the collection items using space-separated `field:value` pairs.
-
-        **Format:** `field1:value1 field2:value2`
-
-        **Supported operators:**
-        - `field:value` - Exact match
-        - `field:value1,value2` - Match any of the comma-separated values (OR)
-        - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-
-        **Examples:**
-        - `status:placed` - Filter by single status.
-        - `status:placed,completed` - Filter by multiple statuses.
-        - `createdAt:30d` - Filter orders created in the last 30 days.
-        - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-        - `status:placed createdAt:7d` - Combine multiple filters.
-      in: query
-      required: false
-      schema:
-        type: string
-      example: orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7
-    Search:
-      name: search
-      in: query
-      description: |-
-        Performs a case-insensitive text search across relevant fields in the collection.
-
-        **Fields searched depend on the endpoint:**
-        - **Menu items:** `name`, `photoTextDescription`
-        - **Orders:** `customerName`, `id`
-
-        Returns items where any of the searchable fields contain the search term as a substring.
-      required: false
-      schema:
-        type: string
-      example: coffee
-    Limit:
-      name: limit
-      description: |
-        Use to return a number of results per page.
-        If there is more data, use in combination with `after` to page through the data.
-      in: query
-      required: false
-      schema:
-        type: integer
-        minimum: 1
-        maximum: 100
-        default: 10
-      example: 10
-    MenuItemId:
-      name: menuItemId
-      in: path
-      description: ID of the menu item to retrieve.
-      required: true
-      schema:
-        type: string
-        pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-      example: prd_01h1s5z6vf2mm1mz3hevnn9va7
-    PhotoSize:
-      name: photoSize
-      in: query
-      description: Photo size to retrieve.
-      required: false
-      schema:
-        type: string
-        enum:
-          - thumbnail
-          - medium
-          - large
-        default: medium
-    OrderId:
-      name: orderId
-      in: path
-      description: ID of the order to retrieve.
-      required: true
-      schema:
-        type: string
-        pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-      example: ord_01h1s5z6vf2mm1mz3hevnn9va7
-  schemas:
-    Page:
-      type: object
-      properties:
-        endCursor:
-          type:
-            - string
-            - 'null'
-          description: |-
-            Use with the `after` query parameter to load the next page of data.
-            When `null`, there is no data.
-            The cursor is opaque and internal structure is subject to change.
-        startCursor:
-          type:
-            - string
-            - 'null'
-          description: |-
-            Use with the `before` query parameter to load the previous page of data.
-            When `null`, there is no data.
-            The cursor is opaque and internal structure is subject to change.
-        hasNextPage:
-          type: boolean
-          description: Indicates if there is a next page with items.
-        hasPrevPage:
-          type: boolean
-          description: Indicates if there is a previous page with items.
-        limit:
-          type: integer
-          minimum: 1
-          maximum: 100
-          default: 10
-          description: Value showing how many items are in the page limit.
-        total:
-          type: integer
-          description: Count of items across all pages.
-          minimum: 0
-      required:
-        - endCursor
-        - startCursor
-        - hasNextPage
-        - hasPrevPage
-        - limit
-        - total
-    MenuBaseItem:
-      type: object
-      properties:
-        createdAt:
-          description: Created date.
-          type: string
-          format: date-time
-          readOnly: true
-        updatedAt:
-          description: Updated date.
-          type: string
-          format: date-time
-          readOnly: true
-        id:
-          description: Menu item ID. Unique identifier prefixed with `prd_`.
-          type: string
-          readOnly: true
-          pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-          example: prd_01h1s5z6vf2mm1mz3hevnn9va7
-        object:
-          description: Entity name.
-          type: string
-          const: menuItem
-          readOnly: true
-        name:
-          description: Menu item name.
-          type: string
-          minLength: 1
-          maxLength: 50
-        price:
-          description: Price in cents.
-          type: integer
-          minimum: 0
-        photo:
-          writeOnly: true
-          type:
-            - string
-            - 'null'
-          format: binary
-          description: Photo of the menu item. Must be a PNG image and less than 1MB.
-        photoUrl:
-          readOnly: true
-          type: string
-          format: uri
-          description: Photo URL of the menu item.
-        photoTextDescription:
-          type:
-            - string
-            - 'null'
-      required:
-        - id
-        - name
-        - price
-        - createdAt
-        - updatedAt
-        - object
-    Beverage:
-      allOf:
-        - type: object
-          properties:
-            category:
-              description: Menu item category.
-              type: string
-              const: beverage
-            volume:
-              type: number
-              description: Size of the beverage in milliliters.
-              exclusiveMinimum: 0
-            containsCaffeine:
-              type: boolean
-              description: Indicates if the beverage contains caffeine.
-          required:
-            - category
-            - volume
-            - containsCaffeine
-        - $ref: '#/components/schemas/MenuBaseItem'
-    Dessert:
-      allOf:
-        - type: object
-          properties:
-            category:
-              description: Menu item category.
-              type: string
-              const: dessert
-            calories:
-              type: number
-              exclusiveMinimum: 0
-              description: Amount of calories.
-          required:
-            - category
-            - calories
-        - $ref: '#/components/schemas/MenuBaseItem'
-    MenuItem:
-      discriminator:
-        propertyName: category
-        mapping:
-          beverage: '#/components/schemas/Beverage'
-          dessert: '#/components/schemas/Dessert'
-      oneOf:
-        - $ref: '#/components/schemas/Beverage'
-        - $ref: '#/components/schemas/Dessert'
-      required:
-        - category
-    MenuItemList:
-      type: object
-      properties:
-        object:
-          type: string
-          const: list
-          description: Entity name.
-        page:
-          $ref: '#/components/schemas/Page'
-        items:
-          type: array
-          items:
-            $ref: '#/components/schemas/MenuItem'
-      required:
-        - object
-        - page
-        - items
-    Error:
-      type: object
-      properties:
-        type:
-          type: string
-          format: uri-reference
-          description: URI reference that identifies the problem type.
-          default: about:blank
-        title:
-          type: string
-          description: Short summary of the problem type.
-        status:
-          type: integer
-          format: int32
-          description: |
-            HTTP status code generated by the origin server for this occurrence of the problem.
-          minimum: 100
-          exclusiveMaximum: 600
-        instance:
-          type: string
-          format: uri-reference
-          description: |
-            URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-            May be used to locate the root of this problem in the source code.
-          example: /some/uri-reference#specific-occurrence-context
-        details:
-          description: Additional error details.
-          type: object
-          additionalProperties: true
-      required:
-        - type
-        - title
-        - status
-    OrderStatus:
-      type: string
-      description: Order status.
-      enum:
-        - placed
-        - preparing
-        - completed
-        - canceled
-    Order:
-      type: object
-      title: Order
-      properties:
-        id:
-          description: Order ID. Unique identifier prefixed with `ord_`.
-          type: string
-          format: ulid
-          readOnly: true
-          pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-          example: ord_01h1s5z6vf2mm1mz3hevnn9va7
-        object:
-          description: Entity name.
-          type: string
-          const: order
-          readOnly: true
-        customerName:
-          description: |
-            Name of the customer who placed the order.
-            Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-          type: string
-          pattern: ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-          minLength: 1
-          maxLength: 100
-        status:
-          allOf:
-            - $ref: '#/components/schemas/OrderStatus'
-          readOnly: true
-        totalPrice:
-          description: Total order price in cents.
-          type: integer
-          minimum: 0
-          readOnly: true
-        createdAt:
-          description: Created date.
-          type: string
-          format: date-time
-          readOnly: true
-        updatedAt:
-          description: Updated date.
-          type: string
-          format: date-time
-          readOnly: true
-        orderItems:
-          type: array
-          description: List of items to include in the order.
-          minItems: 1
-          items:
-            type: object
-            properties:
-              menuItemId:
-                type: string
-                format: ulid
-                description: ID of the menu item to add to the order.
-              quantity:
-                type: integer
-                minimum: 1
-                description: Quantity of the menu item.
-              discount:
-                type: integer
-                minimum: 0
-                description: Discount amount in cents (absolute value).
-                default: 0
-              comment:
-                type: string
-                maxLength: 500
-                description: Optional comment for the order item (e.g., "No sugar").
-            required:
-              - menuItemId
-              - quantity
-      required:
-        - customerName
-        - orderItems
-    OrderList:
-      type: object
-      properties:
-        object:
-          type: string
-          const: list
-          description: Entity name.
-        page:
-          $ref: '#/components/schemas/Page'
-        items:
-          type: array
-          items:
-            $ref: '#/components/schemas/Order'
-      required:
-        - object
-        - page
-        - items
-    OrderItem:
-      type: object
-      properties:
-        menuItemId:
-          type: string
-          description: ID of the menu item to add to the order.
-          writeOnly: true
-        menuItem:
-          allOf:
-            - $ref: '#/components/schemas/MenuItem'
-          description: Menu item that is part of the order.
-          readOnly: true
-        quantity:
-          type: integer
-          minimum: 1
-          description: Quantity of the menu item.
-        discount:
-          type: integer
-          minimum: 0
-          description: Discount amount in cents (absolute value).
-          default: 0
-        comment:
-          type: string
-          maxLength: 500
-          description: Optional comment for the order item (e.g., "No sugar").
-      required:
-        - menuItemId
-        - quantity
-    RevenueStatistics:
-      type: object
-      description: Revenue statistics for a given date range.
-      properties:
-        revenue:
-          type: number
-          format: float
-          description: Total revenue in cents from completed orders.
-          minimum: 0
-        averageOrderAmount:
-          type: number
-          format: float
-          description: Average order amount in cents (calculated from completed orders only).
-          minimum: 0
-        totalOrders:
-          type: integer
-          description: Total number of orders (all statuses) in the date range.
-          minimum: 0
-        placedOrders:
-          type: integer
-          description: Number of placed orders.
-          minimum: 0
-        preparingOrders:
-          type: integer
-          description: Number of preparing orders.
-          minimum: 0
-        completedOrders:
-          type: integer
-          description: Number of completed orders.
-          minimum: 0
-        canceledOrders:
-          type: integer
-          description: Number of canceled orders.
-          minimum: 0
-        startDate:
-          type: string
-          format: date
-          description: Start date of the revenue calculation period.
-        endDate:
-          type: string
-          format: date
-          description: End date of the revenue calculation period.
-      required:
-        - revenue
-        - averageOrderAmount
-        - totalOrders
-        - placedOrders
-        - preparingOrders
-        - completedOrders
-        - canceledOrders
-        - startDate
-        - endDate
-    RegisterClientObject:
-      type: object
-      properties:
-        name:
-          type: string
-          description: Client name.
-        redirectUris:
-          type: array
-          items:
-            type: string
-            format: uri
-          description: List of redirect URIs (optional, defaults to empty array).
-        scopes:
-          type: array
-          items:
-            type: string
-            enum:
-              - menu:read
-              - menu:write
-              - orders:read
-              - orders:write
-          description: List of scopes.
-        grantTypes:
-          type: array
-          items:
-            type: string
-            enum:
-              - authorization_code
-              - client_credentials
-          description: List of grant types.
-      required:
-        - name
-    OAuth2Client:
-      type: object
-      description: OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
-      properties:
-        clientId:
-          type: string
-          description: Client identifier issued by the authorization server.
-        clientSecret:
-          type: string
-          description: Client secret issued by the authorization server.
-        clientIdIssuedAt:
-          type: integer
-          format: int64
-          description: Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-        clientSecretExpiresAt:
-          type: integer
-          format: int64
-          description: Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-        name:
-          type: string
-          description: Client name (registered metadata).
-        redirectUris:
-          type: array
-          items:
-            type: string
-            format: uri
-          description: List of redirect URIs (registered metadata).
-        registrationClientUri:
-          type: string
-          format: uri
-          description: URL of the client configuration endpoint for managing this client registration (RFC 7592).
-        registrationAccessToken:
-          type: string
-          description: Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-        scopes:
-          type: array
-          items:
-            type: string
-            enum:
-              - menu:read
-              - menu:write
-              - orders:read
-              - orders:write
-          description: List of scopes (registered metadata).
-        grantTypes:
-          type: array
-          items:
-            type: string
-            enum:
-              - authorization_code
-              - client_credentials
-          description: List of grant types (registered metadata).
-      required:
-        - clientId
-        - clientSecret
-        - clientIdIssuedAt
-        - clientSecretExpiresAt
-        - registrationClientUri
-        - registrationAccessToken
-    OrderNotification:
-      type: object
-      required:
-        - orderId
-        - orderStatus
-        - timestamp
-      properties:
-        orderId:
-          type: string
-          description: Unique order identifier.
-        orderStatus:
-          $ref: '#/components/schemas/OrderStatus'
-        timestamp:
-          type: string
-          format: date-time
-          description: When the event occurred.
-  responses:
-    BadRequest:
-      description: Bad request - invalid input parameters.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    InternalServerError:
-      description: Internal server error.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Unauthorized:
-      description: Unauthorized - authorization required.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Forbidden:
-      description: Forbidden - insufficient permissions.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Conflict:
-      description: Conflict - entity already exists.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    NotFound:
-      description: Resource not found.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
diff --git a/tests/e2e/generate-client/examples/package-runtime/redocly.yaml b/tests/e2e/generate-client/examples/package-runtime/redocly.yaml
index e07f153912..5aa5ec8bbd 100644
--- a/tests/e2e/generate-client/examples/package-runtime/redocly.yaml
+++ b/tests/e2e/generate-client/examples/package-runtime/redocly.yaml
@@ -4,7 +4,7 @@
 # via `npm update @redocly/client-generator`, no regeneration needed.
 apis:
   package-runtime:
-    root: ./openapi.yaml
+    root: ../_shared/cafe.yaml
     clientOutput: ./src/api/client.ts
     client:
       generators:
diff --git a/tests/e2e/generate-client/examples/package-runtime/src/api/client.ts b/tests/e2e/generate-client/examples/package-runtime/src/api/client.ts
deleted file mode 100644
index cdab8f9c8f..0000000000
--- a/tests/e2e/generate-client/examples/package-runtime/src/api/client.ts
+++ /dev/null
@@ -1,967 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Redocly Cafe (v1.0.0)
- * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
- * Create API credentials and try it yourself in a realistic OpenAPI workflow.
- * 
- */
-
-import { createClient, type OperationDescriptor, type RequestOptions, type TokenProvider } from '@redocly/client-generator';
-
-export type Page = {
-    /**
-     * Use with the `after` query parameter to load the next page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    endCursor: string | null;
-    /**
-     * Use with the `before` query parameter to load the previous page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    startCursor: string | null;
-    /**
-     * Indicates if there is a next page with items.
-     */
-    hasNextPage: boolean;
-    /**
-     * Indicates if there is a previous page with items.
-     */
-    hasPrevPage: boolean;
-    /**
-     * Value showing how many items are in the page limit.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit: number;
-    /**
-     * Count of items across all pages.
-     * @minimum 0
-     */
-    total: number;
-};
-
-export type MenuBaseItem = {
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt: string;
-    /**
-     * Menu item ID. Unique identifier prefixed with `prd_`.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    readonly id: string;
-    /**
-     * Entity name.
-     */
-    readonly object: "menuItem";
-    /**
-     * Menu item name.
-     * @minLength 1
-     * @maxLength 50
-     */
-    name: string;
-    /**
-     * Price in cents.
-     * @minimum 0
-     */
-    price: number;
-    /**
-     * Photo of the menu item. Must be a PNG image and less than 1MB.
-     * @format binary
-     */
-    photo?: Blob | null;
-    /**
-     * Photo URL of the menu item.
-     * @format uri
-     */
-    readonly photoUrl?: string;
-    photoTextDescription?: string | null;
-};
-
-export type Beverage = {
-    /**
-     * Menu item category.
-     */
-    category: "beverage";
-    /**
-     * Size of the beverage in milliliters.
-     * @exclusiveMinimum 0
-     */
-    volume: number;
-    /**
-     * Indicates if the beverage contains caffeine.
-     */
-    containsCaffeine: boolean;
-} & MenuBaseItem;
-
-export type Dessert = {
-    /**
-     * Menu item category.
-     */
-    category: "dessert";
-    /**
-     * Amount of calories.
-     * @exclusiveMinimum 0
-     */
-    calories: number;
-} & MenuBaseItem;
-
-export type MenuItem = Beverage | Dessert;
-
-export type MenuItemList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: MenuItem[];
-};
-
-export type Error = {
-    /**
-     * URI reference that identifies the problem type.
-     * @format uri-reference
-     */
-    type: string;
-    /**
-     * Short summary of the problem type.
-     */
-    title: string;
-    /**
-     * HTTP status code generated by the origin server for this occurrence of the problem.
-     * @minimum 100
-     * @exclusiveMaximum 600
-     * @format int32
-     */
-    status: number;
-    /**
-     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-     * May be used to locate the root of this problem in the source code.
-     * @format uri-reference
-     */
-    instance?: string;
-    /**
-     * Additional error details.
-     */
-    details?: Record<string, unknown>;
-};
-
-/**
- * Order status.
- */
-export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
-
-export const OrderStatus = {
-    placed: "placed",
-    preparing: "preparing",
-    completed: "completed",
-    canceled: "canceled"
-} as const;
-
-export type Order = {
-    /**
-     * Order ID. Unique identifier prefixed with `ord_`.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     * @format ulid
-     */
-    readonly id?: string;
-    /**
-     * Entity name.
-     */
-    readonly object?: "order";
-    /**
-     * Name of the customer who placed the order.
-     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-     * @minLength 1
-     * @maxLength 100
-     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-     */
-    customerName: string;
-    readonly status?: OrderStatus;
-    /**
-     * Total order price in cents.
-     * @minimum 0
-     */
-    readonly totalPrice?: number;
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt?: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt?: string;
-    /**
-     * List of items to include in the order.
-     * @minItems 1
-     */
-    orderItems: {
-        /**
-         * ID of the menu item to add to the order.
-         * @format ulid
-         */
-        menuItemId: string;
-        /**
-         * Quantity of the menu item.
-         * @minimum 1
-         */
-        quantity: number;
-        /**
-         * Discount amount in cents (absolute value).
-         * @minimum 0
-         */
-        discount?: number;
-        /**
-         * Optional comment for the order item (e.g., "No sugar").
-         * @maxLength 500
-         */
-        comment?: string;
-    }[];
-};
-
-export type OrderList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: Order[];
-};
-
-export type OrderItem = {
-    /**
-     * ID of the menu item to add to the order.
-     */
-    menuItemId: string;
-    /**
-     * Menu item that is part of the order.
-     */
-    readonly menuItem?: MenuItem;
-    /**
-     * Quantity of the menu item.
-     * @minimum 1
-     */
-    quantity: number;
-    /**
-     * Discount amount in cents (absolute value).
-     * @minimum 0
-     */
-    discount?: number;
-    /**
-     * Optional comment for the order item (e.g., "No sugar").
-     * @maxLength 500
-     */
-    comment?: string;
-};
-
-/**
- * Revenue statistics for a given date range.
- */
-export type RevenueStatistics = {
-    /**
-     * Total revenue in cents from completed orders.
-     * @minimum 0
-     * @format float
-     */
-    revenue: number;
-    /**
-     * Average order amount in cents (calculated from completed orders only).
-     * @minimum 0
-     * @format float
-     */
-    averageOrderAmount: number;
-    /**
-     * Total number of orders (all statuses) in the date range.
-     * @minimum 0
-     */
-    totalOrders: number;
-    /**
-     * Number of placed orders.
-     * @minimum 0
-     */
-    placedOrders: number;
-    /**
-     * Number of preparing orders.
-     * @minimum 0
-     */
-    preparingOrders: number;
-    /**
-     * Number of completed orders.
-     * @minimum 0
-     */
-    completedOrders: number;
-    /**
-     * Number of canceled orders.
-     * @minimum 0
-     */
-    canceledOrders: number;
-    /**
-     * Start date of the revenue calculation period.
-     * @format date
-     */
-    startDate: string;
-    /**
-     * End date of the revenue calculation period.
-     * @format date
-     */
-    endDate: string;
-};
-
-export type RegisterClientObject = {
-    /**
-     * Client name.
-     */
-    name: string;
-    /**
-     * List of redirect URIs (optional, defaults to empty array).
-     */
-    redirectUris?: string[];
-    /**
-     * List of scopes.
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types.
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-/**
- * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
- */
-export type OAuth2Client = {
-    /**
-     * Client identifier issued by the authorization server.
-     */
-    clientId: string;
-    /**
-     * Client secret issued by the authorization server.
-     */
-    clientSecret: string;
-    /**
-     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-     * @format int64
-     */
-    clientIdIssuedAt: number;
-    /**
-     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-     * @format int64
-     */
-    clientSecretExpiresAt: number;
-    /**
-     * Client name (registered metadata).
-     */
-    name?: string;
-    /**
-     * List of redirect URIs (registered metadata).
-     */
-    redirectUris?: string[];
-    /**
-     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
-     * @format uri
-     */
-    registrationClientUri: string;
-    /**
-     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-     */
-    registrationAccessToken: string;
-    /**
-     * List of scopes (registered metadata).
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types (registered metadata).
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-export type OrderNotification = {
-    /**
-     * Unique order identifier.
-     */
-    orderId: string;
-    orderStatus: OrderStatus;
-    /**
-     * When the event occurred.
-     * @format date-time
-     */
-    timestamp: string;
-};
-
-/**
- * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
- */
-export function isBeverage(value: MenuItem): value is Beverage {
-    return (value as Record<string, unknown>)["category"] === "beverage";
-}
-
-/**
- * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
- */
-export function isDessert(value: MenuItem): value is Dessert {
-    return (value as Record<string, unknown>)["category"] === "dessert";
-}
-
-export type ListMenuItemsResult = MenuItemList;
-
-export type ListMenuItemsParams = {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-};
-
-export type ListMenuItemsVariables = {
-    params?: ListMenuItemsParams;
-};
-
-export type CreateMenuItemResult = MenuItem;
-
-export type CreateMenuItemBody = FormData;
-
-export type CreateMenuItemVariables = {
-    body: CreateMenuItemBody;
-};
-
-export type DeleteMenuItemResult = void;
-
-export type DeleteMenuItemVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-};
-
-export type GetMenuItemPhotoResult = Blob | string;
-
-export type GetMenuItemPhotoParams = {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-};
-
-export type GetMenuItemPhotoVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-    params?: GetMenuItemPhotoParams;
-};
-
-export type ListOrdersResult = OrderList;
-
-export type ListOrdersParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-};
-
-export type ListOrdersVariables = {
-    params?: ListOrdersParams;
-};
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    headers?: GetOrderByIdHeaders;
-};
-
-export type DeleteOrderResult = void;
-
-export type DeleteOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-};
-
-export type UpdateOrderResult = Order;
-
-export type UpdateOrderBody = {
-    status: OrderStatus;
-};
-
-export type UpdateOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    body?: UpdateOrderBody;
-};
-
-export type ListOrderItemsResult = OrderItem[];
-
-export type ListOrderItemsParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-};
-
-export type ListOrderItemsVariables = {
-    params?: ListOrderItemsParams;
-};
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    listMenuItems: {
-        args: {
-            params?: ListMenuItemsParams;
-        };
-        result: ListMenuItemsResult;
-    };
-    createMenuItem: {
-        args: {
-            body: CreateMenuItemBody;
-        };
-        result: CreateMenuItemResult;
-    };
-    deleteMenuItem: {
-        args: {
-            /**
-             * ID of the menu item to retrieve.
-             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            menuItemId: string;
-        };
-        result: DeleteMenuItemResult;
-    };
-    getMenuItemPhoto: {
-        args: {
-            /**
-             * ID of the menu item to retrieve.
-             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            menuItemId: string;
-            params?: GetMenuItemPhotoParams;
-        };
-        result: GetMenuItemPhotoResult;
-    };
-    listOrders: {
-        args: {
-            params?: ListOrdersParams;
-        };
-        result: ListOrdersResult;
-    };
-    createOrder: {
-        args: {
-            body: CreateOrderBody;
-        };
-        result: CreateOrderResult;
-    };
-    getOrderById: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-            headers?: GetOrderByIdHeaders;
-        };
-        result: GetOrderByIdResult;
-    };
-    deleteOrder: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-        };
-        result: DeleteOrderResult;
-    };
-    updateOrder: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-            body?: UpdateOrderBody;
-        };
-        result: UpdateOrderResult;
-    };
-    listOrderItems: {
-        args: {
-            params?: ListOrderItemsParams;
-        };
-        result: ListOrderItemsResult;
-    };
-    getRevenue: {
-        args: {
-            params?: GetRevenueParams;
-        };
-        result: GetRevenueResult;
-    };
-    registerOAuth2Client: {
-        args: {
-            body: RegisterOAuth2ClientBody;
-        };
-        result: RegisterOAuth2ClientResult;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
-    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
-    tags: readonly string[];
-}>["tags"][number];
-
-export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe.redocly.com" });
-
-export const { configure, use } = client;
-export const setBearer = client.auth.bearer;
-export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
-export const listMenuItems = (params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
-export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
-export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
-export const getMenuItemPhoto = (menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
-export const listOrders = (params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
-export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
-export const getOrderById = (orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
-export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
-export const updateOrder = (orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
-export const listOrderItems = (params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
-export const getRevenue = (params: {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
-export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
-
-export { ApiError, createClient } from '@redocly/client-generator';
-export type { ClientConfig, Middleware, RequestOptions } from '@redocly/client-generator';
diff --git a/tests/e2e/generate-client/examples/pagination/.gitignore b/tests/e2e/generate-client/examples/pagination/.gitignore
index 3c3629e647..612acc5cae 100644
--- a/tests/e2e/generate-client/examples/pagination/.gitignore
+++ b/tests/e2e/generate-client/examples/pagination/.gitignore
@@ -1 +1,3 @@
 node_modules
+src/api/
+package-lock.json
diff --git a/tests/e2e/generate-client/examples/pagination/README.md b/tests/e2e/generate-client/examples/pagination/README.md
index 799cbc4689..9935ec5aff 100644
--- a/tests/e2e/generate-client/examples/pagination/README.md
+++ b/tests/e2e/generate-client/examples/pagination/README.md
@@ -9,8 +9,8 @@ unchanged one-shot call. Item types are computed statically from the response sc
 
 ```bash
 npm install        # dev tooling only (the CLI + tsx); the client itself needs nothing
-npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
+npm run generate   # generate src/api (the client is gitignored)
 npm start          # iterates two canned pages of orders and prints them
 ```
 
-The generated client under `src/api/` is committed and drift-checked against the generator in CI.
+The generated client under `src/api/` is gitignored; CI regenerates it and type-checks this example.
diff --git a/tests/e2e/generate-client/examples/pagination/src/api/client.ts b/tests/e2e/generate-client/examples/pagination/src/api/client.ts
deleted file mode 100644
index 4917b1a967..0000000000
--- a/tests/e2e/generate-client/examples/pagination/src/api/client.ts
+++ /dev/null
@@ -1,1139 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Cafe Orders API (v1.0.0)
- * A tiny cursor-paginated orders API for the auto-pagination example.
- */
-
-export type Order = {
-    id: string;
-    drink: string;
-    status: "pending" | "ready" | "delivered";
-};
-
-export type ListOrdersResult = {
-    orders: Order[];
-    /**
-     * Cursor of the next page; absent on the last page.
-     */
-    nextCursor?: string;
-};
-
-export type ListOrdersParams = {
-    /**
-     * Opaque cursor of the page to fetch; omit for the first page.
-     */
-    cursor?: string;
-    /**
-     * Page size.
-     */
-    limit?: number;
-};
-
-export type ListOrdersVariables = {
-    params?: ListOrdersParams;
-};
-
-export type GetOrderResult = Order;
-
-export type GetOrderVariables = {
-    orderId: string;
-};
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    listOrders: {
-        args: {
-            params?: ListOrdersParams;
-        };
-        result: ListOrdersResult;
-        item: Order;
-    };
-    getOrder: {
-        args: {
-            orderId: string;
-        };
-        result: GetOrderResult;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", params: [{ name: "cursor", in: "query" }, { name: "limit", in: "query" }], pagination: { style: "cursor", param: "cursor", limitParam: "limit", nextCursor: "/nextCursor", items: "/orders" } },
-    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", params: [{ name: "orderId", in: "path" }] }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — `@redocly/client-generator`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits `OPERATIONS` literals typed
- * `satisfies Record<string, OperationDescriptor>` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
- * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to `'json'` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
- * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real `ApiError` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call `parseAs` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of `data`/`error` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
- * streams and, for paginated operations, `item` (the page's element type) and — on
- * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
- * iteration unwraps the `Result` envelope the one-shot `result` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: `{}` has no required members, so
- * `{} extends A` is true exactly when every member of `A` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type `.pages()` yields: the RAW page declared by `page` (the generator
- * writes it only on result-mode paginated entries, whose `result` is the envelope),
- * or the method's own `result` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares `item` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
- * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
- * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
- * `onError` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(`Request failed with status ${status}`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
- * `filter=a/b` survives instead of `filter=a%2Fb`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
- * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
- * `deepObject` brackets, and `null`/`undefined` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(`${key}[${subKey}]`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. `%20` (not `+`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-      }
-    } else if (Object(value) === value) {
-      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
-          else params.append(`${key}[${subKey}]`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(`${key}=${encodeReserved(String(value))}`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? `${url}?${qs}` : url;
-}
-
-/**
- * Read the response body per `kind`. `'auto'` negotiates from the content type
- * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom `retryOn` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
- * unless `jitter === false`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/**
- * Auto-pagination (capability module — wired into `createClient`, dispatched by the
- * method's `.pages()`/`.items()`): walk an operation's pages by advancing the descriptor's
- * `param` query parameter, per its `style`. The caller's args are never mutated — each
- * request gets a fresh `params` clone — and `init` is forwarded to every call.
- *
- * Iteration is error-mode-agnostic: `call` always resolves to the RAW page (on a
- * result-mode client the attachment unwraps the envelope first), so a failed page
- * aborts iteration by throwing `ApiError`, even on result-mode clients; the `onError`
- * middleware hook (throw-mode-only) is not invoked.
- */
-
-/**
- * Resolve an RFC 6901 JSON pointer (`~1` → `/`, `~0` → `~`) against a value.
- * The empty pointer is the whole document; anything else must start with `/`.
- * Returns `undefined` on any miss (bad token, absent key, non-object step) — never throws.
- */
-function resolvePointer(value: unknown, pointer: string): unknown {
-  if (pointer === '') return value;
-  if (!pointer.startsWith('/')) return undefined;
-  let current = value;
-  for (const token of pointer.slice(1).split('/')) {
-    const key = token.replaceAll('~1', '/').replaceAll('~0', '~');
-    if (Array.isArray(current)) {
-      if (!/^(0|[1-9]\d*)$/.test(key)) return undefined;
-      current = current[Number(key)];
-    } else if (Object(current) === current && key in (current as object)) {
-      current = (current as Record<string, unknown>)[key];
-    } else {
-      return undefined;
-    }
-  }
-  return current;
-}
-
-/**
- * Iterate an operation's full page results. Every page is yielded before the stop
- * condition is evaluated, so the last page always arrives. Cursor style resumes from a
- * caller-provided `params[spec.param]`, stops when `nextCursor` resolves to
- * `undefined`/`null`/`''`, and throws if the next cursor is not a string or number, or
- * if the same cursor comes back twice in a row (infinite-loop guards). Offset/page
- * styles advance by item count / by one and stop when
- * the `items` pointer misses or the array is empty.
- */
-async function* pages<TPage>(
-  call: (args?: OperationArgs, init?: RequestOptions) => Promise<TPage>,
-  spec: PaginationSpec,
-  args: OperationArgs = {},
-  init?: RequestOptions
-): AsyncGenerator<TPage> {
-  if (spec.style === 'cursor') {
-    let cursor: unknown = args.params?.[spec.param];
-    while (true) {
-      const params = { ...args.params };
-      if (cursor !== undefined) params[spec.param] = cursor as QueryValue;
-      const page = await call({ ...args, params }, init);
-      yield page;
-      const next = resolvePointer(page, spec.nextCursor!);
-      if (next === undefined || next === null || next === '') return;
-      if (typeof next !== 'string' && typeof next !== 'number') {
-        // A fresh non-scalar cursor never compares equal, so without this guard a lying
-        // server would slip past the did-not-advance check into an infinite loop.
-        throw new Error(`Pagination cursor at ${spec.nextCursor} is not a string or number`);
-      }
-      if (next === cursor) {
-        throw new Error('Pagination did not advance: operation returned the same cursor twice');
-      }
-      cursor = next;
-    }
-  } else {
-    // Coerce the starting position to a number: a caller may pass `params[spec.param]` as a
-    // string (common from URL/form input), and `+=` on a string would concatenate.
-    const start = args.params?.[spec.param];
-    const fallback = spec.style === 'page' ? 1 : 0;
-    let position = start === undefined || Number.isNaN(Number(start)) ? fallback : Number(start);
-    while (true) {
-      const page = await call(
-        { ...args, params: { ...args.params, [spec.param]: position } },
-        init
-      );
-      yield page;
-      const pageItems = resolvePointer(page, spec.items);
-      if (!Array.isArray(pageItems) || pageItems.length === 0) return;
-      position += spec.style === 'page' ? 1 : pageItems.length;
-    }
-  }
-}
-
-/**
- * Iterate the operation's individual items: each page's `items` pointer, flattened.
- * A cursor-style page whose pointer misses yields nothing but pagination continues;
- * for offset/page styles a miss has already stopped `pages`.
- */
-async function* items<TItem>(
-  call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  spec: PaginationSpec,
-  args?: OperationArgs,
-  init?: RequestOptions
-): AsyncGenerator<TItem> {
-  for await (const page of pages(call, spec, args, init)) {
-    const pageItems = resolvePointer(page, spec.items);
-    if (Array.isArray(pageItems)) yield* pageItems as TItem[];
-  }
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * `createClient` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
- * to a plain record — spreading a `Headers` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
- * `onResponse` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * The optional behaviors `createClientCore` can dispatch to but never statically
- * imports. The package's public `createClient` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
- * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
- * are honored, and an omitted `explode` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller `init.headers` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
- * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's `error` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (`errorMode` is fixed at construction — `configure()`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
-    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
-    // basic/apiKey. `apiKey` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: `createClientCore` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
- * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, { paginate: { pages, items } });
-}
-
-export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS, { serverUrl: "https://api.cafe-orders.example.com" });
-
-export const { configure, use } = client;
-export const listOrders = Object.assign((params: {
-    /**
-     * Opaque cursor of the page to fetch; omit for the first page.
-     */
-    cursor?: string;
-    /**
-     * Page size.
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init), { pages: client.listOrders.pages, items: client.listOrders.items });
-export const getOrder = (orderId: string, init: RequestOptions = {}) => client.getOrder({ orderId }, init);
diff --git a/tests/e2e/generate-client/examples/programmatic/.gitignore b/tests/e2e/generate-client/examples/programmatic/.gitignore
index f06235c460..6eb23affb8 100644
--- a/tests/e2e/generate-client/examples/programmatic/.gitignore
+++ b/tests/e2e/generate-client/examples/programmatic/.gitignore
@@ -1,2 +1,4 @@
 node_modules
 dist
+src/api/
+package-lock.json
diff --git a/tests/e2e/generate-client/examples/programmatic/README.md b/tests/e2e/generate-client/examples/programmatic/README.md
index 8b50ca4abf..eb877c5307 100644
--- a/tests/e2e/generate-client/examples/programmatic/README.md
+++ b/tests/e2e/generate-client/examples/programmatic/README.md
@@ -12,5 +12,5 @@ npm install
 npm run generate   # runs generate.ts → writes src/api/client.ts
 ```
 
-The generated client under `src/api/` is committed and drift-checked against the generator in CI.
+The generated client under `src/api/` is gitignored; CI regenerates it and type-checks this example.
 `generateClient(...)` returns `{ outputPath, bytes, files }`.
diff --git a/tests/e2e/generate-client/examples/programmatic/generate.ts b/tests/e2e/generate-client/examples/programmatic/generate.ts
index 9b46228176..2984185f0f 100644
--- a/tests/e2e/generate-client/examples/programmatic/generate.ts
+++ b/tests/e2e/generate-client/examples/programmatic/generate.ts
@@ -8,7 +8,7 @@ import { fileURLToPath } from 'node:url';
 const here = dirname(fileURLToPath(import.meta.url));
 
 const result = await generateClient({
-  api: join(here, 'openapi.yaml'),
+  api: join(here, '../_shared/cafe.yaml'),
   output: process.env.OUT ?? join(here, 'src/api/client.ts'),
   outputMode: 'single', // 'single' | 'split'
   argsStyle: 'flat', // 'flat' | 'grouped'
diff --git a/tests/e2e/generate-client/examples/programmatic/openapi.yaml b/tests/e2e/generate-client/examples/programmatic/openapi.yaml
deleted file mode 100644
index a255b72a20..0000000000
--- a/tests/e2e/generate-client/examples/programmatic/openapi.yaml
+++ /dev/null
@@ -1,1163 +0,0 @@
-openapi: 3.2.0
-info:
-  title: Redocly Cafe
-  description: |
-    Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
-    Create API credentials and try it yourself in a realistic OpenAPI workflow.
-  version: 1.0.0
-  contact:
-    email: team@redocly.com
-    url: https://redocly.com/contact-us/
-  license:
-    name: MIT
-    url: https://opensource.org/licenses/MIT
-  termsOfService: https://redocly.com/subscription-agreement
-servers:
-  - url: https://api.cafe.redocly.com
-    description: Live server.
-tags:
-  - name: Authorization
-    description: Create a client to demo the API.
-  - name: Products
-    description: Operations related to products.
-  - name: Orders
-    description: Order management operations.
-  - name: Statistics
-    description: Statistics operations.
-paths:
-  /menu:
-    get:
-      tags:
-        - Products
-      summary: List all menu items
-      description: Retrieve a collection of menu items with optional filtering and pagination.
-      operationId: listMenuItems
-      security: []
-      parameters:
-        - $ref: '#/components/parameters/After'
-        - $ref: '#/components/parameters/Before'
-        - $ref: '#/components/parameters/Sort'
-        - $ref: '#/components/parameters/Filter'
-        - $ref: '#/components/parameters/Search'
-        - $ref: '#/components/parameters/Limit'
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/MenuItemList'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    post:
-      tags:
-        - Products
-      summary: Create menu item
-      description: Create a new menu item.
-      operationId: createMenuItem
-      security:
-        - OAuth2:
-            - menu:write
-      requestBody:
-        required: true
-        content:
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/MenuItem'
-      responses:
-        '201':
-          description: Menu item created successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/MenuItem'
-              examples:
-                MenuItemResponse:
-                  value:
-                    id: prd_01khr487f7qm7p44xn427m43vb
-                    object: menuItem
-                    name: coffee
-                    price: 4000
-                    category: beverage
-                    createdAt: '2026-02-18T10:20:38.228Z'
-                    updatedAt: '2026-02-18T10:20:38.228Z'
-                    volume: 600
-                    containsCaffeine: false
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '409':
-          $ref: '#/components/responses/Conflict'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /menu/{menuItemId}:
-    parameters:
-      - $ref: '#/components/parameters/MenuItemId'
-    delete:
-      tags:
-        - Products
-      summary: Delete a menu item
-      description: Delete an existing menu item.
-      operationId: deleteMenuItem
-      security:
-        - OAuth2:
-            - menu:write
-      responses:
-        '204':
-          description: Menu item deleted successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /menu-item-images/{menuItemId}:
-    parameters:
-      - $ref: '#/components/parameters/MenuItemId'
-    get:
-      operationId: getMenuItemPhoto
-      summary: Retrieve a menu item photo
-      description: Retrieve the product photo image for a specific menu item.
-      security: []
-      tags:
-        - Products
-      parameters:
-        - $ref: '#/components/parameters/PhotoSize'
-      responses:
-        '200':
-          description: Menu item photo retrieved successfully.
-          content:
-            image/png:
-              schema:
-                type: string
-                format: binary
-            text/plain:
-              schema:
-                description: Alternative image text.
-                type: string
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /orders:
-    get:
-      tags:
-        - Orders
-      summary: List all orders
-      description: Retrieve a collection of orders with optional filtering and pagination.
-      operationId: listOrders
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/Filter'
-        - $ref: '#/components/parameters/Sort'
-        - $ref: '#/components/parameters/Limit'
-        - $ref: '#/components/parameters/After'
-        - $ref: '#/components/parameters/Before'
-        - $ref: '#/components/parameters/Search'
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/OrderList'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    post:
-      tags:
-        - Orders
-      summary: Create order
-      description: |
-        Create a new order.
-        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
-      operationId: createOrder
-      security:
-        - OAuth2:
-            - orders:write
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Order'
-            examples:
-              OrderRequest:
-                dataValue:
-                  customerName: Mary Ann
-                  orderItems:
-                    - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                      quantity: 2
-                      comment: No sugar!
-                      discount: 0
-      responses:
-        '201':
-          description: Order placed successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: placed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /orders/{orderId}:
-    get:
-      tags:
-        - Orders
-      summary: Retrieve an order
-      description: Retrieve a single order by its ID.
-      operationId: getOrderById
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-        - name: X-Request-Id
-          in: header
-          required: false
-          description: |
-            Optional client-supplied correlation ID, echoed in logs and traces.
-          schema:
-            type: string
-            format: uuid
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: placed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    patch:
-      tags:
-        - Orders
-      summary: Partially update an order
-      description: |
-        Update an existing order status.
-        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
-      operationId: updateOrder
-      security:
-        - OAuth2:
-            - orders:write
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-      requestBody:
-        content:
-          application/json:
-            schema:
-              type: object
-              description: |
-                Partial order update using JSON Merge Patch - only include fields to update.
-              properties:
-                status:
-                  $ref: '#/components/schemas/OrderStatus'
-              required:
-                - status
-      responses:
-        '200':
-          description: Order updated successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: completed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    delete:
-      tags:
-        - Orders
-      summary: Delete an order
-      description: |
-        Delete the order.
-        To keep the order history, the order should be canceled instead of deleted.
-      operationId: deleteOrder
-      security:
-        - OAuth2:
-            - orders:write
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-      responses:
-        '204':
-          description: Order deleted successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /order-items:
-    get:
-      tags:
-        - Orders
-      summary: List all order items with menu item details
-      description: |
-        Returns an array of order items for a specific order.
-        Use the `filter` parameter to filter by order ID.
-      operationId: listOrderItems
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/Filter'
-          required: true
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                type: array
-                description: List of menu items that are part of the order.
-                items:
-                  $ref: '#/components/schemas/OrderItem'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /revenue:
-    get:
-      tags:
-        - Statistics
-      summary: Get revenue statistics
-      description: |
-        Retrieve revenue statistics for a configurable date range.
-        Returns revenue, order counts, average order amount, and other useful statistics.
-      operationId: getRevenue
-      security:
-        - ApiKey: []
-      parameters:
-        - name: startDate
-          in: query
-          required: false
-          description: |
-            Start date for the revenue calculation period (ISO 8601 datetime format).
-            Defaults to 30 days ago if not provided.
-          schema:
-            type: string
-            format: date
-          example: '2026-01-01'
-        - name: endDate
-          in: query
-          required: false
-          description: |
-            End date for the revenue calculation period (ISO 8601 datetime format).
-            Defaults to current time if not provided.
-          schema:
-            type: string
-            format: date
-          example: '2026-01-31'
-      responses:
-        '200':
-          description: Revenue statistics retrieved successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RevenueStatistics'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /oauth2/register:
-    post:
-      tags:
-        - Authorization
-      summary: Create OAuth2 client
-      description: |
-        Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
-        - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type, 
-          `redirectUris` must be provided (per RFC 7591 Section 2).
-        - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
-        Returns the registered client information per RFC 7591, including:
-        - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
-      operationId: registerOAuth2Client
-      security: []
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/RegisterClientObject'
-      responses:
-        '201':
-          description: OAuth2 client registered successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/OAuth2Client'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-webhooks:
-  order-notification:
-    post:
-      tags:
-        - Orders
-      operationId: orderNotificationWebhook
-      security: []
-      summary: Order notification webhook
-      description: Webhook triggered when a new order is placed.
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/OrderNotification'
-      responses:
-        '200':
-          description: Webhook received successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-components:
-  securitySchemes:
-    OAuth2:
-      type: oauth2
-      description: OAuth2 authorization for API access.
-      flows:
-        authorizationCode:
-          authorizationUrl: https://api.cafe.redocly.com/oauth2/authorize
-          tokenUrl: https://api.cafe.redocly.com/oauth2/token
-          scopes:
-            menu:read: Read access to menu items and images
-            menu:write: Write access to menu items (create, delete)
-            orders:read: Read access to orders
-            orders:write: Write access to orders (create, update, delete)
-        clientCredentials:
-          tokenUrl: https://api.cafe.redocly.com/oauth2/token
-          scopes:
-            menu:read: Read access to menu items and images
-            menu:write: Write access to menu items (create, delete)
-            orders:read: Read access to orders
-            orders:write: Write access to orders (create, update, delete)
-    ApiKey:
-      type: apiKey
-      name: X-API-Key
-      in: header
-      description: API key for internal operations.
-  parameters:
-    After:
-      name: after
-      in: query
-      required: false
-      description: Use the `endCursor` as a value for the `after` parameter to get the next page.
-      schema:
-        type: string
-      example: a25fgaksjf23la==
-    Before:
-      name: before
-      in: query
-      required: false
-      description: |
-        Use the `startCursor` as a value for the `before` parameter to get the next page.
-      schema:
-        type: string
-      example: bfg23aksjf23zb1==
-    Sort:
-      name: sort
-      description: |-
-        To sort by id in descending order use `-id`.
-        To sort by id in ascending order use `id`.
-      in: query
-      required: false
-      schema:
-        type: string
-      example: '-name'
-    Filter:
-      name: filter
-      description: |-
-        Filters the collection items using space-separated `field:value` pairs.
-
-        **Format:** `field1:value1 field2:value2`
-
-        **Supported operators:**
-        - `field:value` - Exact match
-        - `field:value1,value2` - Match any of the comma-separated values (OR)
-        - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-
-        **Examples:**
-        - `status:placed` - Filter by single status.
-        - `status:placed,completed` - Filter by multiple statuses.
-        - `createdAt:30d` - Filter orders created in the last 30 days.
-        - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-        - `status:placed createdAt:7d` - Combine multiple filters.
-      in: query
-      required: false
-      schema:
-        type: string
-      example: orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7
-    Search:
-      name: search
-      in: query
-      description: |-
-        Performs a case-insensitive text search across relevant fields in the collection.
-
-        **Fields searched depend on the endpoint:**
-        - **Menu items:** `name`, `photoTextDescription`
-        - **Orders:** `customerName`, `id`
-
-        Returns items where any of the searchable fields contain the search term as a substring.
-      required: false
-      schema:
-        type: string
-      example: coffee
-    Limit:
-      name: limit
-      description: |
-        Use to return a number of results per page.
-        If there is more data, use in combination with `after` to page through the data.
-      in: query
-      required: false
-      schema:
-        type: integer
-        minimum: 1
-        maximum: 100
-        default: 10
-      example: 10
-    MenuItemId:
-      name: menuItemId
-      in: path
-      description: ID of the menu item to retrieve.
-      required: true
-      schema:
-        type: string
-        pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-      example: prd_01h1s5z6vf2mm1mz3hevnn9va7
-    PhotoSize:
-      name: photoSize
-      in: query
-      description: Photo size to retrieve.
-      required: false
-      schema:
-        type: string
-        enum:
-          - thumbnail
-          - medium
-          - large
-        default: medium
-    OrderId:
-      name: orderId
-      in: path
-      description: ID of the order to retrieve.
-      required: true
-      schema:
-        type: string
-        pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-      example: ord_01h1s5z6vf2mm1mz3hevnn9va7
-  schemas:
-    Page:
-      type: object
-      properties:
-        endCursor:
-          type:
-            - string
-            - 'null'
-          description: |-
-            Use with the `after` query parameter to load the next page of data.
-            When `null`, there is no data.
-            The cursor is opaque and internal structure is subject to change.
-        startCursor:
-          type:
-            - string
-            - 'null'
-          description: |-
-            Use with the `before` query parameter to load the previous page of data.
-            When `null`, there is no data.
-            The cursor is opaque and internal structure is subject to change.
-        hasNextPage:
-          type: boolean
-          description: Indicates if there is a next page with items.
-        hasPrevPage:
-          type: boolean
-          description: Indicates if there is a previous page with items.
-        limit:
-          type: integer
-          minimum: 1
-          maximum: 100
-          default: 10
-          description: Value showing how many items are in the page limit.
-        total:
-          type: integer
-          description: Count of items across all pages.
-          minimum: 0
-      required:
-        - endCursor
-        - startCursor
-        - hasNextPage
-        - hasPrevPage
-        - limit
-        - total
-    MenuBaseItem:
-      type: object
-      properties:
-        createdAt:
-          description: Created date.
-          type: string
-          format: date-time
-          readOnly: true
-        updatedAt:
-          description: Updated date.
-          type: string
-          format: date-time
-          readOnly: true
-        id:
-          description: Menu item ID. Unique identifier prefixed with `prd_`.
-          type: string
-          readOnly: true
-          pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-          example: prd_01h1s5z6vf2mm1mz3hevnn9va7
-        object:
-          description: Entity name.
-          type: string
-          const: menuItem
-          readOnly: true
-        name:
-          description: Menu item name.
-          type: string
-          minLength: 1
-          maxLength: 50
-        price:
-          description: Price in cents.
-          type: integer
-          minimum: 0
-        photo:
-          writeOnly: true
-          type:
-            - string
-            - 'null'
-          format: binary
-          description: Photo of the menu item. Must be a PNG image and less than 1MB.
-        photoUrl:
-          readOnly: true
-          type: string
-          format: uri
-          description: Photo URL of the menu item.
-        photoTextDescription:
-          type:
-            - string
-            - 'null'
-      required:
-        - id
-        - name
-        - price
-        - createdAt
-        - updatedAt
-        - object
-    Beverage:
-      allOf:
-        - type: object
-          properties:
-            category:
-              description: Menu item category.
-              type: string
-              const: beverage
-            volume:
-              type: number
-              description: Size of the beverage in milliliters.
-              exclusiveMinimum: 0
-            containsCaffeine:
-              type: boolean
-              description: Indicates if the beverage contains caffeine.
-          required:
-            - category
-            - volume
-            - containsCaffeine
-        - $ref: '#/components/schemas/MenuBaseItem'
-    Dessert:
-      allOf:
-        - type: object
-          properties:
-            category:
-              description: Menu item category.
-              type: string
-              const: dessert
-            calories:
-              type: number
-              exclusiveMinimum: 0
-              description: Amount of calories.
-          required:
-            - category
-            - calories
-        - $ref: '#/components/schemas/MenuBaseItem'
-    MenuItem:
-      discriminator:
-        propertyName: category
-        mapping:
-          beverage: '#/components/schemas/Beverage'
-          dessert: '#/components/schemas/Dessert'
-      oneOf:
-        - $ref: '#/components/schemas/Beverage'
-        - $ref: '#/components/schemas/Dessert'
-      required:
-        - category
-    MenuItemList:
-      type: object
-      properties:
-        object:
-          type: string
-          const: list
-          description: Entity name.
-        page:
-          $ref: '#/components/schemas/Page'
-        items:
-          type: array
-          items:
-            $ref: '#/components/schemas/MenuItem'
-      required:
-        - object
-        - page
-        - items
-    Error:
-      type: object
-      properties:
-        type:
-          type: string
-          format: uri-reference
-          description: URI reference that identifies the problem type.
-          default: about:blank
-        title:
-          type: string
-          description: Short summary of the problem type.
-        status:
-          type: integer
-          format: int32
-          description: |
-            HTTP status code generated by the origin server for this occurrence of the problem.
-          minimum: 100
-          exclusiveMaximum: 600
-        instance:
-          type: string
-          format: uri-reference
-          description: |
-            URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-            May be used to locate the root of this problem in the source code.
-          example: /some/uri-reference#specific-occurrence-context
-        details:
-          description: Additional error details.
-          type: object
-          additionalProperties: true
-      required:
-        - type
-        - title
-        - status
-    OrderStatus:
-      type: string
-      description: Order status.
-      enum:
-        - placed
-        - preparing
-        - completed
-        - canceled
-    Order:
-      type: object
-      title: Order
-      properties:
-        id:
-          description: Order ID. Unique identifier prefixed with `ord_`.
-          type: string
-          format: ulid
-          readOnly: true
-          pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-          example: ord_01h1s5z6vf2mm1mz3hevnn9va7
-        object:
-          description: Entity name.
-          type: string
-          const: order
-          readOnly: true
-        customerName:
-          description: |
-            Name of the customer who placed the order.
-            Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-          type: string
-          pattern: ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-          minLength: 1
-          maxLength: 100
-        status:
-          allOf:
-            - $ref: '#/components/schemas/OrderStatus'
-          readOnly: true
-        totalPrice:
-          description: Total order price in cents.
-          type: integer
-          minimum: 0
-          readOnly: true
-        createdAt:
-          description: Created date.
-          type: string
-          format: date-time
-          readOnly: true
-        updatedAt:
-          description: Updated date.
-          type: string
-          format: date-time
-          readOnly: true
-        orderItems:
-          type: array
-          description: List of items to include in the order.
-          minItems: 1
-          items:
-            type: object
-            properties:
-              menuItemId:
-                type: string
-                format: ulid
-                description: ID of the menu item to add to the order.
-              quantity:
-                type: integer
-                minimum: 1
-                description: Quantity of the menu item.
-              discount:
-                type: integer
-                minimum: 0
-                description: Discount amount in cents (absolute value).
-                default: 0
-              comment:
-                type: string
-                maxLength: 500
-                description: Optional comment for the order item (e.g., "No sugar").
-            required:
-              - menuItemId
-              - quantity
-      required:
-        - customerName
-        - orderItems
-    OrderList:
-      type: object
-      properties:
-        object:
-          type: string
-          const: list
-          description: Entity name.
-        page:
-          $ref: '#/components/schemas/Page'
-        items:
-          type: array
-          items:
-            $ref: '#/components/schemas/Order'
-      required:
-        - object
-        - page
-        - items
-    OrderItem:
-      type: object
-      properties:
-        menuItemId:
-          type: string
-          description: ID of the menu item to add to the order.
-          writeOnly: true
-        menuItem:
-          allOf:
-            - $ref: '#/components/schemas/MenuItem'
-          description: Menu item that is part of the order.
-          readOnly: true
-        quantity:
-          type: integer
-          minimum: 1
-          description: Quantity of the menu item.
-        discount:
-          type: integer
-          minimum: 0
-          description: Discount amount in cents (absolute value).
-          default: 0
-        comment:
-          type: string
-          maxLength: 500
-          description: Optional comment for the order item (e.g., "No sugar").
-      required:
-        - menuItemId
-        - quantity
-    RevenueStatistics:
-      type: object
-      description: Revenue statistics for a given date range.
-      properties:
-        revenue:
-          type: number
-          format: float
-          description: Total revenue in cents from completed orders.
-          minimum: 0
-        averageOrderAmount:
-          type: number
-          format: float
-          description: Average order amount in cents (calculated from completed orders only).
-          minimum: 0
-        totalOrders:
-          type: integer
-          description: Total number of orders (all statuses) in the date range.
-          minimum: 0
-        placedOrders:
-          type: integer
-          description: Number of placed orders.
-          minimum: 0
-        preparingOrders:
-          type: integer
-          description: Number of preparing orders.
-          minimum: 0
-        completedOrders:
-          type: integer
-          description: Number of completed orders.
-          minimum: 0
-        canceledOrders:
-          type: integer
-          description: Number of canceled orders.
-          minimum: 0
-        startDate:
-          type: string
-          format: date
-          description: Start date of the revenue calculation period.
-        endDate:
-          type: string
-          format: date
-          description: End date of the revenue calculation period.
-      required:
-        - revenue
-        - averageOrderAmount
-        - totalOrders
-        - placedOrders
-        - preparingOrders
-        - completedOrders
-        - canceledOrders
-        - startDate
-        - endDate
-    RegisterClientObject:
-      type: object
-      properties:
-        name:
-          type: string
-          description: Client name.
-        redirectUris:
-          type: array
-          items:
-            type: string
-            format: uri
-          description: List of redirect URIs (optional, defaults to empty array).
-        scopes:
-          type: array
-          items:
-            type: string
-            enum:
-              - menu:read
-              - menu:write
-              - orders:read
-              - orders:write
-          description: List of scopes.
-        grantTypes:
-          type: array
-          items:
-            type: string
-            enum:
-              - authorization_code
-              - client_credentials
-          description: List of grant types.
-      required:
-        - name
-    OAuth2Client:
-      type: object
-      description: OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
-      properties:
-        clientId:
-          type: string
-          description: Client identifier issued by the authorization server.
-        clientSecret:
-          type: string
-          description: Client secret issued by the authorization server.
-        clientIdIssuedAt:
-          type: integer
-          format: int64
-          description: Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-        clientSecretExpiresAt:
-          type: integer
-          format: int64
-          description: Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-        name:
-          type: string
-          description: Client name (registered metadata).
-        redirectUris:
-          type: array
-          items:
-            type: string
-            format: uri
-          description: List of redirect URIs (registered metadata).
-        registrationClientUri:
-          type: string
-          format: uri
-          description: URL of the client configuration endpoint for managing this client registration (RFC 7592).
-        registrationAccessToken:
-          type: string
-          description: Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-        scopes:
-          type: array
-          items:
-            type: string
-            enum:
-              - menu:read
-              - menu:write
-              - orders:read
-              - orders:write
-          description: List of scopes (registered metadata).
-        grantTypes:
-          type: array
-          items:
-            type: string
-            enum:
-              - authorization_code
-              - client_credentials
-          description: List of grant types (registered metadata).
-      required:
-        - clientId
-        - clientSecret
-        - clientIdIssuedAt
-        - clientSecretExpiresAt
-        - registrationClientUri
-        - registrationAccessToken
-    OrderNotification:
-      type: object
-      required:
-        - orderId
-        - orderStatus
-        - timestamp
-      properties:
-        orderId:
-          type: string
-          description: Unique order identifier.
-        orderStatus:
-          $ref: '#/components/schemas/OrderStatus'
-        timestamp:
-          type: string
-          format: date-time
-          description: When the event occurred.
-  responses:
-    BadRequest:
-      description: Bad request - invalid input parameters.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    InternalServerError:
-      description: Internal server error.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Unauthorized:
-      description: Unauthorized - authorization required.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Forbidden:
-      description: Forbidden - insufficient permissions.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Conflict:
-      description: Conflict - entity already exists.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    NotFound:
-      description: Resource not found.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
diff --git a/tests/e2e/generate-client/examples/programmatic/package-lock.json b/tests/e2e/generate-client/examples/programmatic/package-lock.json
deleted file mode 100644
index d3256a21f1..0000000000
--- a/tests/e2e/generate-client/examples/programmatic/package-lock.json
+++ /dev/null
@@ -1,809 +0,0 @@
-{
-  "name": "@redocly-examples/programmatic",
-  "version": "0.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@redocly-examples/programmatic",
-      "version": "0.0.0",
-      "devDependencies": {
-        "@redocly/openapi-typescript": "0.1.0-local-local",
-        "tsx": "^4.0.0",
-        "typescript": "^5.5.0"
-      }
-    },
-    "node_modules/@babel/runtime": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/runtime/-/runtime-7.29.7.tgz",
-      "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/aix-ppc64/-/aix-ppc64-0.28.1.tgz",
-      "integrity": "sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-arm/-/android-arm-0.28.1.tgz",
-      "integrity": "sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-arm64/-/android-arm64-0.28.1.tgz",
-      "integrity": "sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-x64/-/android-x64-0.28.1.tgz",
-      "integrity": "sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/darwin-arm64/-/darwin-arm64-0.28.1.tgz",
-      "integrity": "sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/darwin-x64/-/darwin-x64-0.28.1.tgz",
-      "integrity": "sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/freebsd-arm64/-/freebsd-arm64-0.28.1.tgz",
-      "integrity": "sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/freebsd-x64/-/freebsd-x64-0.28.1.tgz",
-      "integrity": "sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-arm/-/linux-arm-0.28.1.tgz",
-      "integrity": "sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-arm64/-/linux-arm64-0.28.1.tgz",
-      "integrity": "sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-ia32/-/linux-ia32-0.28.1.tgz",
-      "integrity": "sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-loong64/-/linux-loong64-0.28.1.tgz",
-      "integrity": "sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-mips64el/-/linux-mips64el-0.28.1.tgz",
-      "integrity": "sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-ppc64/-/linux-ppc64-0.28.1.tgz",
-      "integrity": "sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-riscv64/-/linux-riscv64-0.28.1.tgz",
-      "integrity": "sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-s390x/-/linux-s390x-0.28.1.tgz",
-      "integrity": "sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-x64/-/linux-x64-0.28.1.tgz",
-      "integrity": "sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/netbsd-arm64/-/netbsd-arm64-0.28.1.tgz",
-      "integrity": "sha512-oks0DYbLwWMmaakTsCb+zL4E+aHRVLom9IJZOAthMQEPiQmydXHkziYEsGYRx0uNV/IjEKGAV941JzH02pflqw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/netbsd-x64/-/netbsd-x64-0.28.1.tgz",
-      "integrity": "sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/openbsd-arm64/-/openbsd-arm64-0.28.1.tgz",
-      "integrity": "sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/openbsd-x64/-/openbsd-x64-0.28.1.tgz",
-      "integrity": "sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openharmony-arm64": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/openharmony-arm64/-/openharmony-arm64-0.28.1.tgz",
-      "integrity": "sha512-ge+Z7EXFNt2BO1oAMsVpiQ8EwndV9i1xXerAeTIK7AtPs3bKFXQM7nlRxDSIUIMeueR1CNXxqztLzdNeReKBJg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openharmony"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/sunos-x64/-/sunos-x64-0.28.1.tgz",
-      "integrity": "sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-arm64/-/win32-arm64-0.28.1.tgz",
-      "integrity": "sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-ia32/-/win32-ia32-0.28.1.tgz",
-      "integrity": "sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-x64/-/win32-x64-0.28.1.tgz",
-      "integrity": "sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@redocly/ajv": {
-      "version": "8.18.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/ajv/-/ajv-8.18.3.tgz",
-      "integrity": "sha512-l42u0of3hY98sN2A+M4qTX1O/KrpgGH32Hu9kP2GtHyD5Dfqq86PKFLe5dwaD8DEnNmlOlll2BAmeEtf0DaySg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "fast-uri": "^3.0.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@redocly/config": {
-      "version": "0.49.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/config/-/config-0.49.0.tgz",
-      "integrity": "sha512-OI/rpEffX3fKUuy+OuBHPRspRI/S30b9aiqxfZLMpSWZzDncEGPxSEP1O2LrBVshnDX4hLjVjLvCZ4YT85+1rw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "json-schema-to-ts": "2.7.2"
-      }
-    },
-    "node_modules/@redocly/openapi-core": {
-      "version": "2.31.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/openapi-core/-/openapi-core-2.31.4.tgz",
-      "integrity": "sha512-ne2e5NduK9MHnu42LoPXgfKhyCFG5Mc2Cwh3wNfLdoieYvhKtl37rW7p4p+GDMEJmlI9t6fagQbGPAKic2+3Pw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@redocly/ajv": "^8.18.1",
-        "@redocly/config": "^0.49.0",
-        "ajv": "npm:@redocly/ajv@8.18.1",
-        "ajv-formats": "^3.0.1",
-        "colorette": "^1.2.0",
-        "js-levenshtein": "^1.1.6",
-        "js-yaml": "^4.1.0",
-        "picomatch": "^4.0.4",
-        "pluralize": "^8.0.0",
-        "yaml-ast-parser": "0.0.43"
-      },
-      "engines": {
-        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
-        "npm": ">=10"
-      }
-    },
-    "node_modules/@redocly/openapi-typescript": {
-      "version": "0.1.0-local-local",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/openapi-typescript/-/openapi-typescript-0.1.0-local-local.tgz",
-      "integrity": "sha512-BJRV89BoYdEyECFGRB8t2dzWnOGNe1/oQ7DZoC662kv4NRJhxz5qw3exl24+M+1WCpGdRtPps5GIy+vPqauJUA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@redocly/openapi-core": "2.31.4"
-      },
-      "engines": {
-        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
-        "npm": ">=10"
-      },
-      "peerDependencies": {
-        "typescript": ">=5.5.0"
-      }
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.15",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/ajv": {
-      "name": "@redocly/ajv",
-      "version": "8.18.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/ajv/-/ajv-8.18.1.tgz",
-      "integrity": "sha512-Ifm/pP/tul1qmAecpbVxCBluVE32rKfjf8gYXH4xI2gCv9mRWFhJMHzkPDM4TXlxwPQYIFegymlsy8lXz7optA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "fast-uri": "^3.0.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-formats": {
-      "version": "3.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ajv-formats/-/ajv-formats-3.0.1.tgz",
-      "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true,
-      "license": "Python-2.0"
-    },
-    "node_modules/colorette": {
-      "version": "1.4.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/colorette/-/colorette-1.4.0.tgz",
-      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/esbuild": {
-      "version": "0.28.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/esbuild/-/esbuild-0.28.1.tgz",
-      "integrity": "sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.28.1",
-        "@esbuild/android-arm": "0.28.1",
-        "@esbuild/android-arm64": "0.28.1",
-        "@esbuild/android-x64": "0.28.1",
-        "@esbuild/darwin-arm64": "0.28.1",
-        "@esbuild/darwin-x64": "0.28.1",
-        "@esbuild/freebsd-arm64": "0.28.1",
-        "@esbuild/freebsd-x64": "0.28.1",
-        "@esbuild/linux-arm": "0.28.1",
-        "@esbuild/linux-arm64": "0.28.1",
-        "@esbuild/linux-ia32": "0.28.1",
-        "@esbuild/linux-loong64": "0.28.1",
-        "@esbuild/linux-mips64el": "0.28.1",
-        "@esbuild/linux-ppc64": "0.28.1",
-        "@esbuild/linux-riscv64": "0.28.1",
-        "@esbuild/linux-s390x": "0.28.1",
-        "@esbuild/linux-x64": "0.28.1",
-        "@esbuild/netbsd-arm64": "0.28.1",
-        "@esbuild/netbsd-x64": "0.28.1",
-        "@esbuild/openbsd-arm64": "0.28.1",
-        "@esbuild/openbsd-x64": "0.28.1",
-        "@esbuild/openharmony-arm64": "0.28.1",
-        "@esbuild/sunos-x64": "0.28.1",
-        "@esbuild/win32-arm64": "0.28.1",
-        "@esbuild/win32-ia32": "0.28.1",
-        "@esbuild/win32-x64": "0.28.1"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/fast-uri": {
-      "version": "3.1.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-uri/-/fast-uri-3.1.2.tgz",
-      "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fastify"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/fastify"
-        }
-      ],
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/js-levenshtein": {
-      "version": "1.1.6",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
-      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/js-yaml": {
-      "version": "4.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/js-yaml/-/js-yaml-4.2.0.tgz",
-      "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/puzrin"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/nodeca"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/json-schema-to-ts": {
-      "version": "2.7.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/json-schema-to-ts/-/json-schema-to-ts-2.7.2.tgz",
-      "integrity": "sha512-R1JfqKqbBR4qE8UyBR56Ms30LL62/nlhoz+1UkfI/VE7p54Awu919FZ6ZUPG8zIa3XB65usPJgr1ONVncUGSaQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.18.3",
-        "@types/json-schema": "^7.0.9",
-        "ts-algebra": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/picomatch": {
-      "version": "4.0.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/picomatch/-/picomatch-4.0.4.tgz",
-      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pluralize": {
-      "version": "8.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/pluralize/-/pluralize-8.0.0.tgz",
-      "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ts-algebra": {
-      "version": "1.2.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ts-algebra/-/ts-algebra-1.2.2.tgz",
-      "integrity": "sha512-kloPhf1hq3JbCPOTYoOWDKxebWjNb2o/LKnNfkWhxVVisFFmMJPPdJeGoGmM+iRLyoXAR61e08Pb+vUXINg8aA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/tsx": {
-      "version": "4.22.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/tsx/-/tsx-4.22.4.tgz",
-      "integrity": "sha512-X8EX+XV4QR5xCsrgxaED954zTDfY8KqlDtskKEL0cHhyS/P8b4IFOvGDQpsC9Q1XnLq915wEfwwY/zzskCtmhg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "esbuild": "~0.28.0"
-      },
-      "bin": {
-        "tsx": "dist/cli.mjs"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "5.9.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
-    "node_modules/yaml-ast-parser": {
-      "version": "0.0.43",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz",
-      "integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==",
-      "dev": true,
-      "license": "Apache-2.0"
-    }
-  }
-}
diff --git a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts b/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
deleted file mode 100644
index 550cd946cd..0000000000
--- a/tests/e2e/generate-client/examples/programmatic/src/api/client.ts
+++ /dev/null
@@ -1,1968 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Redocly Cafe (v1.0.0)
- * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
- * Create API credentials and try it yourself in a realistic OpenAPI workflow.
- * 
- */
-
-export type Page = {
-    /**
-     * Use with the `after` query parameter to load the next page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    endCursor: string | null;
-    /**
-     * Use with the `before` query parameter to load the previous page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    startCursor: string | null;
-    /**
-     * Indicates if there is a next page with items.
-     */
-    hasNextPage: boolean;
-    /**
-     * Indicates if there is a previous page with items.
-     */
-    hasPrevPage: boolean;
-    /**
-     * Value showing how many items are in the page limit.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit: number;
-    /**
-     * Count of items across all pages.
-     * @minimum 0
-     */
-    total: number;
-};
-
-export type MenuBaseItem = {
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt: string;
-    /**
-     * Menu item ID. Unique identifier prefixed with `prd_`.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    readonly id: string;
-    /**
-     * Entity name.
-     */
-    readonly object: "menuItem";
-    /**
-     * Menu item name.
-     * @minLength 1
-     * @maxLength 50
-     */
-    name: string;
-    /**
-     * Price in cents.
-     * @minimum 0
-     */
-    price: number;
-    /**
-     * Photo of the menu item. Must be a PNG image and less than 1MB.
-     * @format binary
-     */
-    photo?: Blob | null;
-    /**
-     * Photo URL of the menu item.
-     * @format uri
-     */
-    readonly photoUrl?: string;
-    photoTextDescription?: string | null;
-};
-
-export type Beverage = {
-    /**
-     * Menu item category.
-     */
-    category: "beverage";
-    /**
-     * Size of the beverage in milliliters.
-     * @exclusiveMinimum 0
-     */
-    volume: number;
-    /**
-     * Indicates if the beverage contains caffeine.
-     */
-    containsCaffeine: boolean;
-} & MenuBaseItem;
-
-export type Dessert = {
-    /**
-     * Menu item category.
-     */
-    category: "dessert";
-    /**
-     * Amount of calories.
-     * @exclusiveMinimum 0
-     */
-    calories: number;
-} & MenuBaseItem;
-
-export type MenuItem = Beverage | Dessert;
-
-export type MenuItemList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: MenuItem[];
-};
-
-export type Error = {
-    /**
-     * URI reference that identifies the problem type.
-     * @format uri-reference
-     */
-    type: string;
-    /**
-     * Short summary of the problem type.
-     */
-    title: string;
-    /**
-     * HTTP status code generated by the origin server for this occurrence of the problem.
-     * @minimum 100
-     * @exclusiveMaximum 600
-     * @format int32
-     */
-    status: number;
-    /**
-     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-     * May be used to locate the root of this problem in the source code.
-     * @format uri-reference
-     */
-    instance?: string;
-    /**
-     * Additional error details.
-     */
-    details?: Record<string, unknown>;
-};
-
-/**
- * Order status.
- */
-export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
-
-export const OrderStatus = {
-    placed: "placed",
-    preparing: "preparing",
-    completed: "completed",
-    canceled: "canceled"
-} as const;
-
-export type Order = {
-    /**
-     * Order ID. Unique identifier prefixed with `ord_`.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     * @format ulid
-     */
-    readonly id?: string;
-    /**
-     * Entity name.
-     */
-    readonly object?: "order";
-    /**
-     * Name of the customer who placed the order.
-     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-     * @minLength 1
-     * @maxLength 100
-     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-     */
-    customerName: string;
-    readonly status?: OrderStatus;
-    /**
-     * Total order price in cents.
-     * @minimum 0
-     */
-    readonly totalPrice?: number;
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt?: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt?: string;
-    /**
-     * List of items to include in the order.
-     * @minItems 1
-     */
-    orderItems: {
-        /**
-         * ID of the menu item to add to the order.
-         * @format ulid
-         */
-        menuItemId: string;
-        /**
-         * Quantity of the menu item.
-         * @minimum 1
-         */
-        quantity: number;
-        /**
-         * Discount amount in cents (absolute value).
-         * @minimum 0
-         */
-        discount?: number;
-        /**
-         * Optional comment for the order item (e.g., "No sugar").
-         * @maxLength 500
-         */
-        comment?: string;
-    }[];
-};
-
-export type OrderList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: Order[];
-};
-
-export type OrderItem = {
-    /**
-     * ID of the menu item to add to the order.
-     */
-    menuItemId: string;
-    /**
-     * Menu item that is part of the order.
-     */
-    readonly menuItem?: MenuItem;
-    /**
-     * Quantity of the menu item.
-     * @minimum 1
-     */
-    quantity: number;
-    /**
-     * Discount amount in cents (absolute value).
-     * @minimum 0
-     */
-    discount?: number;
-    /**
-     * Optional comment for the order item (e.g., "No sugar").
-     * @maxLength 500
-     */
-    comment?: string;
-};
-
-/**
- * Revenue statistics for a given date range.
- */
-export type RevenueStatistics = {
-    /**
-     * Total revenue in cents from completed orders.
-     * @minimum 0
-     * @format float
-     */
-    revenue: number;
-    /**
-     * Average order amount in cents (calculated from completed orders only).
-     * @minimum 0
-     * @format float
-     */
-    averageOrderAmount: number;
-    /**
-     * Total number of orders (all statuses) in the date range.
-     * @minimum 0
-     */
-    totalOrders: number;
-    /**
-     * Number of placed orders.
-     * @minimum 0
-     */
-    placedOrders: number;
-    /**
-     * Number of preparing orders.
-     * @minimum 0
-     */
-    preparingOrders: number;
-    /**
-     * Number of completed orders.
-     * @minimum 0
-     */
-    completedOrders: number;
-    /**
-     * Number of canceled orders.
-     * @minimum 0
-     */
-    canceledOrders: number;
-    /**
-     * Start date of the revenue calculation period.
-     * @format date
-     */
-    startDate: string;
-    /**
-     * End date of the revenue calculation period.
-     * @format date
-     */
-    endDate: string;
-};
-
-export type RegisterClientObject = {
-    /**
-     * Client name.
-     */
-    name: string;
-    /**
-     * List of redirect URIs (optional, defaults to empty array).
-     */
-    redirectUris?: string[];
-    /**
-     * List of scopes.
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types.
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-/**
- * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
- */
-export type OAuth2Client = {
-    /**
-     * Client identifier issued by the authorization server.
-     */
-    clientId: string;
-    /**
-     * Client secret issued by the authorization server.
-     */
-    clientSecret: string;
-    /**
-     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-     * @format int64
-     */
-    clientIdIssuedAt: number;
-    /**
-     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-     * @format int64
-     */
-    clientSecretExpiresAt: number;
-    /**
-     * Client name (registered metadata).
-     */
-    name?: string;
-    /**
-     * List of redirect URIs (registered metadata).
-     */
-    redirectUris?: string[];
-    /**
-     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
-     * @format uri
-     */
-    registrationClientUri: string;
-    /**
-     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-     */
-    registrationAccessToken: string;
-    /**
-     * List of scopes (registered metadata).
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types (registered metadata).
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-export type OrderNotification = {
-    /**
-     * Unique order identifier.
-     */
-    orderId: string;
-    orderStatus: OrderStatus;
-    /**
-     * When the event occurred.
-     * @format date-time
-     */
-    timestamp: string;
-};
-
-/**
- * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
- */
-export function isBeverage(value: MenuItem): value is Beverage {
-    return (value as Record<string, unknown>)["category"] === "beverage";
-}
-
-/**
- * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
- */
-export function isDessert(value: MenuItem): value is Dessert {
-    return (value as Record<string, unknown>)["category"] === "dessert";
-}
-
-export type ListMenuItemsResult = MenuItemList;
-
-export type ListMenuItemsParams = {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-};
-
-export type ListMenuItemsVariables = {
-    params?: ListMenuItemsParams;
-};
-
-export type CreateMenuItemResult = MenuItem;
-
-export type CreateMenuItemBody = FormData;
-
-export type CreateMenuItemVariables = {
-    body: CreateMenuItemBody;
-};
-
-export type DeleteMenuItemResult = void;
-
-export type DeleteMenuItemVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-};
-
-export type GetMenuItemPhotoResult = Blob | string;
-
-export type GetMenuItemPhotoParams = {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-};
-
-export type GetMenuItemPhotoVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-    params?: GetMenuItemPhotoParams;
-};
-
-export type ListOrdersResult = OrderList;
-
-export type ListOrdersParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-};
-
-export type ListOrdersVariables = {
-    params?: ListOrdersParams;
-};
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    headers?: GetOrderByIdHeaders;
-};
-
-export type DeleteOrderResult = void;
-
-export type DeleteOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-};
-
-export type UpdateOrderResult = Order;
-
-export type UpdateOrderBody = {
-    status: OrderStatus;
-};
-
-export type UpdateOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    body?: UpdateOrderBody;
-};
-
-export type ListOrderItemsResult = OrderItem[];
-
-export type ListOrderItemsParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-};
-
-export type ListOrderItemsVariables = {
-    params?: ListOrderItemsParams;
-};
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    listMenuItems: {
-        args: {
-            params?: ListMenuItemsParams;
-        };
-        result: ListMenuItemsResult;
-    };
-    createMenuItem: {
-        args: {
-            body: CreateMenuItemBody;
-        };
-        result: CreateMenuItemResult;
-    };
-    deleteMenuItem: {
-        args: {
-            /**
-             * ID of the menu item to retrieve.
-             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            menuItemId: string;
-        };
-        result: DeleteMenuItemResult;
-    };
-    getMenuItemPhoto: {
-        args: {
-            /**
-             * ID of the menu item to retrieve.
-             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            menuItemId: string;
-            params?: GetMenuItemPhotoParams;
-        };
-        result: GetMenuItemPhotoResult;
-    };
-    listOrders: {
-        args: {
-            params?: ListOrdersParams;
-        };
-        result: ListOrdersResult;
-    };
-    createOrder: {
-        args: {
-            body: CreateOrderBody;
-        };
-        result: CreateOrderResult;
-    };
-    getOrderById: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-            headers?: GetOrderByIdHeaders;
-        };
-        result: GetOrderByIdResult;
-    };
-    deleteOrder: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-        };
-        result: DeleteOrderResult;
-    };
-    updateOrder: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-            body?: UpdateOrderBody;
-        };
-        result: UpdateOrderResult;
-    };
-    listOrderItems: {
-        args: {
-            params?: ListOrderItemsParams;
-        };
-        result: ListOrderItemsResult;
-    };
-    getRevenue: {
-        args: {
-            params?: GetRevenueParams;
-        };
-        result: GetRevenueResult;
-    };
-    registerOAuth2Client: {
-        args: {
-            body: RegisterOAuth2ClientBody;
-        };
-        result: RegisterOAuth2ClientResult;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
-    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
-    tags: readonly string[];
-}>["tags"][number];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — `@redocly/client-generator`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits `OPERATIONS` literals typed
- * `satisfies Record<string, OperationDescriptor>` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
- * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to `'json'` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
- * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real `ApiError` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call `parseAs` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of `data`/`error` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
- * streams and, for paginated operations, `item` (the page's element type) and — on
- * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
- * iteration unwraps the `Result` envelope the one-shot `result` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: `{}` has no required members, so
- * `{} extends A` is true exactly when every member of `A` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type `.pages()` yields: the RAW page declared by `page` (the generator
- * writes it only on result-mode paginated entries, whose `result` is the envelope),
- * or the method's own `result` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares `item` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
- * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
- * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
- * `onError` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(`Request failed with status ${status}`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
- * `filter=a/b` survives instead of `filter=a%2Fb`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
- * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
- * `deepObject` brackets, and `null`/`undefined` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(`${key}[${subKey}]`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. `%20` (not `+`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-      }
-    } else if (Object(value) === value) {
-      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
-          else params.append(`${key}[${subKey}]`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(`${key}=${encodeReserved(String(value))}`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? `${url}?${qs}` : url;
-}
-
-/**
- * Read the response body per `kind`. `'auto'` negotiates from the content type
- * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom `retryOn` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
- * unless `jitter === false`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/** Resolve a credential: a literal passes through; a function is awaited per request. */
-async function resolveToken(provider: TokenProvider): Promise<string> {
-  return typeof provider === 'function' ? await provider() : provider;
-}
-
-/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
-function encodeBase64(text: string): string {
-  let binary = '';
-  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
-  return btoa(binary);
-}
-
-/** Whether a credential for this scheme is configured on the instance. */
-function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
-  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
-  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
-  return config.auth?.basic !== undefined;
-}
-
-/**
- * Build the auth headers/query for one operation's `security` OR-alternatives from the
- * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * The first alternative whose schemes (an AND-set) are all configured is applied, so
- * "bearer OR apiKey" works with either credential and never sends both. When none is
- * fully configured, the first alternative's configured schemes are still sent (the
- * server rejects the request, mirroring the previous behavior).
- * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
- */
-async function resolveAuth(
-  security: readonly (readonly SecuritySpec[])[],
-  config: ClientConfig
-): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
-  const alternative =
-    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
-    security[0] ??
-    [];
-  const headers: Record<string, string> = {};
-  const query: Record<string, string> = {};
-  const cookies: string[] = [];
-  for (const scheme of alternative) {
-    if (scheme.kind === 'apiKey') {
-      const provider = config.auth?.apiKey?.[scheme.scheme];
-      if (provider === undefined) continue;
-      const value = await resolveToken(provider);
-      if (scheme.in === 'header') headers[scheme.name] = value;
-      else if (scheme.in === 'query') query[scheme.name] = value;
-      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
-      // so the credential can't break the `Cookie` header syntax.
-      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
-    } else if (scheme.kind === 'bearer') {
-      const provider = config.auth?.bearer;
-      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
-    } else {
-      const basic = config.auth?.basic;
-      if (basic !== undefined) {
-        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
-      }
-    }
-  }
-  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
-  return { headers, query };
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * `createClient` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
- * to a plain record — spreading a `Headers` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
- * `onResponse` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * The optional behaviors `createClientCore` can dispatch to but never statically
- * imports. The package's public `createClient` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
- * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
- * are honored, and an omitted `explode` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller `init.headers` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
- * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's `error` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (`errorMode` is fixed at construction — `configure()`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
-    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
-    // basic/apiKey. `apiKey` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: `createClientCore` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
- * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
-}
-
-export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe.redocly.com" });
-
-export const { configure, use } = client;
-export const setBearer = client.auth.bearer;
-export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
-export const listMenuItems = (params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
-export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
-export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
-export const getMenuItemPhoto = (menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
-export const listOrders = (params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
-export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
-export const getOrderById = (orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
-export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
-export const updateOrder = (orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
-export const listOrderItems = (params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
-export const getRevenue = (params: {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
-export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
diff --git a/tests/e2e/generate-client/examples/sse-streaming/.gitignore b/tests/e2e/generate-client/examples/sse-streaming/.gitignore
index f06235c460..6eb23affb8 100644
--- a/tests/e2e/generate-client/examples/sse-streaming/.gitignore
+++ b/tests/e2e/generate-client/examples/sse-streaming/.gitignore
@@ -1,2 +1,4 @@
 node_modules
 dist
+src/api/
+package-lock.json
diff --git a/tests/e2e/generate-client/examples/sse-streaming/README.md b/tests/e2e/generate-client/examples/sse-streaming/README.md
index 02cda6deb3..7809a3e5ae 100644
--- a/tests/e2e/generate-client/examples/sse-streaming/README.md
+++ b/tests/e2e/generate-client/examples/sse-streaming/README.md
@@ -9,10 +9,10 @@ spec's `itemSchema`. Shows auto-reconnect resuming via `Last-Event-ID` (tuned wi
 
 ```bash
 npm install
-npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
+npm run generate   # generate src/api (the client is gitignored)
 npm run dev        # open the printed local URL
 ```
 
 The app uses a canned SSE `fetch` so it runs offline and the reconnect is deterministic:
 connection 1 drops mid-stream, connection 2 resumes from the last event id. The generated
-client under `src/api/` is committed and drift-checked against the generator in CI.
+client under `src/api/` is gitignored; CI regenerates it and type-checks this example.
diff --git a/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts b/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
deleted file mode 100644
index 686152857f..0000000000
--- a/tests/e2e/generate-client/examples/sse-streaming/src/api/client.ts
+++ /dev/null
@@ -1,1166 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Cafe Order Events (v1.0.0)
- * Demo event-stream API for the sse-streaming example.
- */
-
-export type OrderEvent = {
-    /**
-     * Order ID.
-     */
-    orderId: string;
-    /**
-     * New order status.
-     */
-    status: "placed" | "preparing" | "ready" | "completed";
-    /**
-     * Monotonic event sequence number.
-     */
-    seq: number;
-};
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    streamOrderEvents: {
-        args: {};
-        result: OrderEvent;
-        kind: "sse";
-    };
-    streamKitchenTicker: {
-        args: {};
-        result: string;
-        kind: "sse";
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    streamOrderEvents: { id: "streamOrderEvents", method: "GET", path: "/order-events", tags: ["Events"], responseKind: "sse", sseDataKind: "json" },
-    streamKitchenTicker: { id: "streamKitchenTicker", method: "GET", path: "/kitchen-ticker", tags: ["Events"], responseKind: "sse", sseDataKind: "text" }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
-    tags: readonly string[];
-}>["tags"][number];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — `@redocly/client-generator`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits `OPERATIONS` literals typed
- * `satisfies Record<string, OperationDescriptor>` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
- * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to `'json'` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
- * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real `ApiError` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call `parseAs` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of `data`/`error` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
- * streams and, for paginated operations, `item` (the page's element type) and — on
- * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
- * iteration unwraps the `Result` envelope the one-shot `result` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: `{}` has no required members, so
- * `{} extends A` is true exactly when every member of `A` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type `.pages()` yields: the RAW page declared by `page` (the generator
- * writes it only on result-mode paginated entries, whose `result` is the envelope),
- * or the method's own `result` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares `item` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
- * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
- * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
- * `onError` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(`Request failed with status ${status}`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
- * `filter=a/b` survives instead of `filter=a%2Fb`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
- * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
- * `deepObject` brackets, and `null`/`undefined` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(`${key}[${subKey}]`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. `%20` (not `+`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-      }
-    } else if (Object(value) === value) {
-      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
-          else params.append(`${key}[${subKey}]`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(`${key}=${encodeReserved(String(value))}`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? `${url}?${qs}` : url;
-}
-
-/**
- * Read the response body per `kind`. `'auto'` negotiates from the content type
- * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom `retryOn` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
- * unless `jitter === false`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * `createClient` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
- * to a plain record — spreading a `Headers` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
- * `onResponse` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * A frame delimiter: two consecutive line terminators (each CR, LF, or CRLF, per the SSE
- * spec — so mixed endings like `\n\r\n` are valid boundaries, not just matching pairs).
- */
-const FRAME_DELIMITER = /(?:\r\n|\r|\n){2}/;
-
-/**
- * A terminally malformed event stream — unparseable JSON `data` or an unbounded frame.
- * A stable bad payload, not a dropped connection, so the stream never reconnects on it.
- */
-class SseParseError extends Error {}
-
-/**
- * Consume a `text/event-stream` operation as typed events (capability module — wired
- * into `createClient`). Auto-reconnects on dropped connections, resuming from the last
- * seen event id via `Last-Event-ID` (backoff: the server's `retry:` value, then
- * `reconnectDelay`, then 1s — exponential with jitter, capped at 30s). A clean stream
- * end flushes a trailing frame and finishes; `break`/abort end the iterator cleanly.
- */
-async function* sse<T>(
-  config: ClientConfig,
-  op: OperationContext,
-  prepare: () => Promise<{ url: string; init: SseOptions }>,
-  dataKind: 'json' | 'text' = 'text'
-): AsyncGenerator<ServerSentEvent<T>> {
-  let lastEventId: string | undefined;
-  let serverRetry: number | undefined;
-  let failures = 0;
-  while (true) {
-    // Re-prepare each attempt so a refresh-style TokenProvider yields a fresh credential
-    // on reconnect (the auth is baked into `url` query + `init.headers`). `reconnect`,
-    // `reconnectDelay`, and `signal` come from the caller's original options unchanged.
-    const { url, init } = await prepare();
-    const { reconnect = true, reconnectDelay, ...rest } = init;
-    const signal = rest.signal ?? undefined;
-    if (signal?.aborted) return;
-    const headers: Record<string, string> = {
-      Accept: 'text/event-stream',
-      ...toHeaderRecord(rest.headers),
-    };
-    const sendHeaders =
-      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
-    try {
-      const { response } = await send(
-        config,
-        op,
-        url,
-        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },
-        undefined,
-        false,
-        {}
-      );
-      if (!response.ok) {
-        const errorBody = await readError(response);
-        throw new ApiError(url, response.status, response.statusText, errorBody);
-      }
-      failures = 0;
-      const body = response.body;
-      if (!body) return;
-      const reader = body.getReader();
-      const decoder = new TextDecoder();
-      let buffer = '';
-      try {
-        while (true) {
-          const { done, value } = await reader.read();
-          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });
-          let match: RegExpMatchArray | null;
-          while ((match = buffer.match(FRAME_DELIMITER)) !== null) {
-            const index = match.index!;
-            const raw = buffer.slice(0, index);
-            buffer = buffer.slice(index + match[0].length);
-            const event = parseSseFrame(raw, dataKind);
-            if (event) {
-              if (event.id !== undefined) lastEventId = event.id;
-              if (event.retry !== undefined) serverRetry = event.retry;
-              yield event as ServerSentEvent<T>;
-            }
-          }
-          if (done) {
-            // Stream closed cleanly. Flush a final event that arrived without a trailing
-            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.
-            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;
-            if (event) {
-              if (event.id !== undefined) lastEventId = event.id;
-              if (event.retry !== undefined) serverRetry = event.retry;
-              yield event as ServerSentEvent<T>;
-            }
-            return;
-          }
-          // Bound memory: a server that never sends a frame delimiter would otherwise
-          // grow `buffer` without limit. 1 MiB is far above any real SSE frame.
-          if (buffer.length > 1048576) {
-            throw new SseParseError('SSE frame exceeded 1048576 characters without a delimiter');
-          }
-        }
-      } finally {
-        await reader.cancel().catch(() => undefined);
-      }
-    } catch (error) {
-      if (signal?.aborted) return;
-      // A non-OK HTTP response (4xx/5xx) or an unparseable JSON payload is a definitive
-      // error, not a transient drop — surface it instead of reconnecting in a loop (a
-      // stable bad payload would otherwise reconnect forever).
-      if (error instanceof ApiError || error instanceof SseParseError) throw error;
-      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream
-      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.
-      if (!reconnect) throw error;
-    }
-    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.
-    failures++;
-    const base = serverRetry ?? reconnectDelay ?? 1000;
-    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);
-    try {
-      await sleep(Math.random() * delay, signal);
-    } catch {
-      return; // sleep rejects only on abort — end the iterator cleanly
-    }
-  }
-}
-
-/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */
-function parseSseFrame(
-  raw: string,
-  dataKind: 'json' | 'text'
-): ServerSentEvent<unknown> | undefined {
-  let event: string | undefined;
-  const dataLines: string[] = [];
-  let id: string | undefined;
-  let retry: number | undefined;
-  let sawField = false;
-  for (const line of raw.split(/\r\n|\n|\r/)) {
-    if (line === '' || line.startsWith(':')) continue;
-    const colon = line.indexOf(':');
-    const field = colon === -1 ? line : line.slice(0, colon);
-    let val = colon === -1 ? '' : line.slice(colon + 1);
-    if (val.startsWith(' ')) val = val.slice(1);
-    sawField = true;
-    if (field === 'event') event = val;
-    else if (field === 'data') dataLines.push(val);
-    else if (field === 'id') id = val;
-    else if (field === 'retry') {
-      const n = Number(val);
-      if (!Number.isNaN(n)) retry = n;
-    }
-  }
-  if (!sawField) return undefined;
-  const dataText = dataLines.join('\n');
-  let data: unknown = dataText;
-  if (dataKind === 'json' && dataText !== '') {
-    try {
-      data = JSON.parse(dataText);
-    } catch (error) {
-      throw new SseParseError(
-        `Failed to parse SSE event data as JSON: ${error instanceof Error ? error.message : String(error)}`
-      );
-    }
-  }
-  return { event, data, id, retry };
-}
-
-/**
- * The optional behaviors `createClientCore` can dispatch to but never statically
- * imports. The package's public `createClient` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
- * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
- * are honored, and an omitted `explode` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller `init.headers` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
- * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's `error` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (`errorMode` is fixed at construction — `configure()`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
-    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
-    // basic/apiKey. `apiKey` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: `createClientCore` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
- * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, { sse });
-}
-
-export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://events.cafe.example.com" });
-
-export const { configure, use } = client;
-export const streamOrderEvents = (init: SseOptions = {}) => client.streamOrderEvents({}, init);
-export const streamKitchenTicker = (init: SseOptions = {}) => client.streamKitchenTicker({}, init);
diff --git a/tests/e2e/generate-client/examples/tanstack-query/.gitignore b/tests/e2e/generate-client/examples/tanstack-query/.gitignore
index f06235c460..6eb23affb8 100644
--- a/tests/e2e/generate-client/examples/tanstack-query/.gitignore
+++ b/tests/e2e/generate-client/examples/tanstack-query/.gitignore
@@ -1,2 +1,4 @@
 node_modules
 dist
+src/api/
+package-lock.json
diff --git a/tests/e2e/generate-client/examples/tanstack-query/README.md b/tests/e2e/generate-client/examples/tanstack-query/README.md
index 4c7f068188..19fbc36c6b 100644
--- a/tests/e2e/generate-client/examples/tanstack-query/README.md
+++ b/tests/e2e/generate-client/examples/tanstack-query/README.md
@@ -8,9 +8,8 @@ Generated TypeScript client plus **TanStack Query** (React) factories
 
 ```bash
 npm install
-npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
+npm run generate   # generate src/api (the client is gitignored)
 npm run dev        # open the printed local URL
 ```
 
-The generated client + TanStack factories under `src/api/` are committed and drift-checked against the
-generator in CI.
+The generated client + TanStack factories under `src/api/` are gitignored; CI regenerates them and type-checks this example.
diff --git a/tests/e2e/generate-client/examples/tanstack-query/openapi.yaml b/tests/e2e/generate-client/examples/tanstack-query/openapi.yaml
deleted file mode 100644
index a255b72a20..0000000000
--- a/tests/e2e/generate-client/examples/tanstack-query/openapi.yaml
+++ /dev/null
@@ -1,1163 +0,0 @@
-openapi: 3.2.0
-info:
-  title: Redocly Cafe
-  description: |
-    Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
-    Create API credentials and try it yourself in a realistic OpenAPI workflow.
-  version: 1.0.0
-  contact:
-    email: team@redocly.com
-    url: https://redocly.com/contact-us/
-  license:
-    name: MIT
-    url: https://opensource.org/licenses/MIT
-  termsOfService: https://redocly.com/subscription-agreement
-servers:
-  - url: https://api.cafe.redocly.com
-    description: Live server.
-tags:
-  - name: Authorization
-    description: Create a client to demo the API.
-  - name: Products
-    description: Operations related to products.
-  - name: Orders
-    description: Order management operations.
-  - name: Statistics
-    description: Statistics operations.
-paths:
-  /menu:
-    get:
-      tags:
-        - Products
-      summary: List all menu items
-      description: Retrieve a collection of menu items with optional filtering and pagination.
-      operationId: listMenuItems
-      security: []
-      parameters:
-        - $ref: '#/components/parameters/After'
-        - $ref: '#/components/parameters/Before'
-        - $ref: '#/components/parameters/Sort'
-        - $ref: '#/components/parameters/Filter'
-        - $ref: '#/components/parameters/Search'
-        - $ref: '#/components/parameters/Limit'
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/MenuItemList'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    post:
-      tags:
-        - Products
-      summary: Create menu item
-      description: Create a new menu item.
-      operationId: createMenuItem
-      security:
-        - OAuth2:
-            - menu:write
-      requestBody:
-        required: true
-        content:
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/MenuItem'
-      responses:
-        '201':
-          description: Menu item created successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/MenuItem'
-              examples:
-                MenuItemResponse:
-                  value:
-                    id: prd_01khr487f7qm7p44xn427m43vb
-                    object: menuItem
-                    name: coffee
-                    price: 4000
-                    category: beverage
-                    createdAt: '2026-02-18T10:20:38.228Z'
-                    updatedAt: '2026-02-18T10:20:38.228Z'
-                    volume: 600
-                    containsCaffeine: false
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '409':
-          $ref: '#/components/responses/Conflict'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /menu/{menuItemId}:
-    parameters:
-      - $ref: '#/components/parameters/MenuItemId'
-    delete:
-      tags:
-        - Products
-      summary: Delete a menu item
-      description: Delete an existing menu item.
-      operationId: deleteMenuItem
-      security:
-        - OAuth2:
-            - menu:write
-      responses:
-        '204':
-          description: Menu item deleted successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /menu-item-images/{menuItemId}:
-    parameters:
-      - $ref: '#/components/parameters/MenuItemId'
-    get:
-      operationId: getMenuItemPhoto
-      summary: Retrieve a menu item photo
-      description: Retrieve the product photo image for a specific menu item.
-      security: []
-      tags:
-        - Products
-      parameters:
-        - $ref: '#/components/parameters/PhotoSize'
-      responses:
-        '200':
-          description: Menu item photo retrieved successfully.
-          content:
-            image/png:
-              schema:
-                type: string
-                format: binary
-            text/plain:
-              schema:
-                description: Alternative image text.
-                type: string
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /orders:
-    get:
-      tags:
-        - Orders
-      summary: List all orders
-      description: Retrieve a collection of orders with optional filtering and pagination.
-      operationId: listOrders
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/Filter'
-        - $ref: '#/components/parameters/Sort'
-        - $ref: '#/components/parameters/Limit'
-        - $ref: '#/components/parameters/After'
-        - $ref: '#/components/parameters/Before'
-        - $ref: '#/components/parameters/Search'
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/OrderList'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    post:
-      tags:
-        - Orders
-      summary: Create order
-      description: |
-        Create a new order.
-        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
-      operationId: createOrder
-      security:
-        - OAuth2:
-            - orders:write
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Order'
-            examples:
-              OrderRequest:
-                dataValue:
-                  customerName: Mary Ann
-                  orderItems:
-                    - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                      quantity: 2
-                      comment: No sugar!
-                      discount: 0
-      responses:
-        '201':
-          description: Order placed successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: placed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /orders/{orderId}:
-    get:
-      tags:
-        - Orders
-      summary: Retrieve an order
-      description: Retrieve a single order by its ID.
-      operationId: getOrderById
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-        - name: X-Request-Id
-          in: header
-          required: false
-          description: |
-            Optional client-supplied correlation ID, echoed in logs and traces.
-          schema:
-            type: string
-            format: uuid
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: placed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    patch:
-      tags:
-        - Orders
-      summary: Partially update an order
-      description: |
-        Update an existing order status.
-        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
-      operationId: updateOrder
-      security:
-        - OAuth2:
-            - orders:write
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-      requestBody:
-        content:
-          application/json:
-            schema:
-              type: object
-              description: |
-                Partial order update using JSON Merge Patch - only include fields to update.
-              properties:
-                status:
-                  $ref: '#/components/schemas/OrderStatus'
-              required:
-                - status
-      responses:
-        '200':
-          description: Order updated successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: completed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    delete:
-      tags:
-        - Orders
-      summary: Delete an order
-      description: |
-        Delete the order.
-        To keep the order history, the order should be canceled instead of deleted.
-      operationId: deleteOrder
-      security:
-        - OAuth2:
-            - orders:write
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-      responses:
-        '204':
-          description: Order deleted successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /order-items:
-    get:
-      tags:
-        - Orders
-      summary: List all order items with menu item details
-      description: |
-        Returns an array of order items for a specific order.
-        Use the `filter` parameter to filter by order ID.
-      operationId: listOrderItems
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/Filter'
-          required: true
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                type: array
-                description: List of menu items that are part of the order.
-                items:
-                  $ref: '#/components/schemas/OrderItem'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /revenue:
-    get:
-      tags:
-        - Statistics
-      summary: Get revenue statistics
-      description: |
-        Retrieve revenue statistics for a configurable date range.
-        Returns revenue, order counts, average order amount, and other useful statistics.
-      operationId: getRevenue
-      security:
-        - ApiKey: []
-      parameters:
-        - name: startDate
-          in: query
-          required: false
-          description: |
-            Start date for the revenue calculation period (ISO 8601 datetime format).
-            Defaults to 30 days ago if not provided.
-          schema:
-            type: string
-            format: date
-          example: '2026-01-01'
-        - name: endDate
-          in: query
-          required: false
-          description: |
-            End date for the revenue calculation period (ISO 8601 datetime format).
-            Defaults to current time if not provided.
-          schema:
-            type: string
-            format: date
-          example: '2026-01-31'
-      responses:
-        '200':
-          description: Revenue statistics retrieved successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RevenueStatistics'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /oauth2/register:
-    post:
-      tags:
-        - Authorization
-      summary: Create OAuth2 client
-      description: |
-        Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
-        - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type, 
-          `redirectUris` must be provided (per RFC 7591 Section 2).
-        - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
-        Returns the registered client information per RFC 7591, including:
-        - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
-      operationId: registerOAuth2Client
-      security: []
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/RegisterClientObject'
-      responses:
-        '201':
-          description: OAuth2 client registered successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/OAuth2Client'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-webhooks:
-  order-notification:
-    post:
-      tags:
-        - Orders
-      operationId: orderNotificationWebhook
-      security: []
-      summary: Order notification webhook
-      description: Webhook triggered when a new order is placed.
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/OrderNotification'
-      responses:
-        '200':
-          description: Webhook received successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-components:
-  securitySchemes:
-    OAuth2:
-      type: oauth2
-      description: OAuth2 authorization for API access.
-      flows:
-        authorizationCode:
-          authorizationUrl: https://api.cafe.redocly.com/oauth2/authorize
-          tokenUrl: https://api.cafe.redocly.com/oauth2/token
-          scopes:
-            menu:read: Read access to menu items and images
-            menu:write: Write access to menu items (create, delete)
-            orders:read: Read access to orders
-            orders:write: Write access to orders (create, update, delete)
-        clientCredentials:
-          tokenUrl: https://api.cafe.redocly.com/oauth2/token
-          scopes:
-            menu:read: Read access to menu items and images
-            menu:write: Write access to menu items (create, delete)
-            orders:read: Read access to orders
-            orders:write: Write access to orders (create, update, delete)
-    ApiKey:
-      type: apiKey
-      name: X-API-Key
-      in: header
-      description: API key for internal operations.
-  parameters:
-    After:
-      name: after
-      in: query
-      required: false
-      description: Use the `endCursor` as a value for the `after` parameter to get the next page.
-      schema:
-        type: string
-      example: a25fgaksjf23la==
-    Before:
-      name: before
-      in: query
-      required: false
-      description: |
-        Use the `startCursor` as a value for the `before` parameter to get the next page.
-      schema:
-        type: string
-      example: bfg23aksjf23zb1==
-    Sort:
-      name: sort
-      description: |-
-        To sort by id in descending order use `-id`.
-        To sort by id in ascending order use `id`.
-      in: query
-      required: false
-      schema:
-        type: string
-      example: '-name'
-    Filter:
-      name: filter
-      description: |-
-        Filters the collection items using space-separated `field:value` pairs.
-
-        **Format:** `field1:value1 field2:value2`
-
-        **Supported operators:**
-        - `field:value` - Exact match
-        - `field:value1,value2` - Match any of the comma-separated values (OR)
-        - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-
-        **Examples:**
-        - `status:placed` - Filter by single status.
-        - `status:placed,completed` - Filter by multiple statuses.
-        - `createdAt:30d` - Filter orders created in the last 30 days.
-        - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-        - `status:placed createdAt:7d` - Combine multiple filters.
-      in: query
-      required: false
-      schema:
-        type: string
-      example: orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7
-    Search:
-      name: search
-      in: query
-      description: |-
-        Performs a case-insensitive text search across relevant fields in the collection.
-
-        **Fields searched depend on the endpoint:**
-        - **Menu items:** `name`, `photoTextDescription`
-        - **Orders:** `customerName`, `id`
-
-        Returns items where any of the searchable fields contain the search term as a substring.
-      required: false
-      schema:
-        type: string
-      example: coffee
-    Limit:
-      name: limit
-      description: |
-        Use to return a number of results per page.
-        If there is more data, use in combination with `after` to page through the data.
-      in: query
-      required: false
-      schema:
-        type: integer
-        minimum: 1
-        maximum: 100
-        default: 10
-      example: 10
-    MenuItemId:
-      name: menuItemId
-      in: path
-      description: ID of the menu item to retrieve.
-      required: true
-      schema:
-        type: string
-        pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-      example: prd_01h1s5z6vf2mm1mz3hevnn9va7
-    PhotoSize:
-      name: photoSize
-      in: query
-      description: Photo size to retrieve.
-      required: false
-      schema:
-        type: string
-        enum:
-          - thumbnail
-          - medium
-          - large
-        default: medium
-    OrderId:
-      name: orderId
-      in: path
-      description: ID of the order to retrieve.
-      required: true
-      schema:
-        type: string
-        pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-      example: ord_01h1s5z6vf2mm1mz3hevnn9va7
-  schemas:
-    Page:
-      type: object
-      properties:
-        endCursor:
-          type:
-            - string
-            - 'null'
-          description: |-
-            Use with the `after` query parameter to load the next page of data.
-            When `null`, there is no data.
-            The cursor is opaque and internal structure is subject to change.
-        startCursor:
-          type:
-            - string
-            - 'null'
-          description: |-
-            Use with the `before` query parameter to load the previous page of data.
-            When `null`, there is no data.
-            The cursor is opaque and internal structure is subject to change.
-        hasNextPage:
-          type: boolean
-          description: Indicates if there is a next page with items.
-        hasPrevPage:
-          type: boolean
-          description: Indicates if there is a previous page with items.
-        limit:
-          type: integer
-          minimum: 1
-          maximum: 100
-          default: 10
-          description: Value showing how many items are in the page limit.
-        total:
-          type: integer
-          description: Count of items across all pages.
-          minimum: 0
-      required:
-        - endCursor
-        - startCursor
-        - hasNextPage
-        - hasPrevPage
-        - limit
-        - total
-    MenuBaseItem:
-      type: object
-      properties:
-        createdAt:
-          description: Created date.
-          type: string
-          format: date-time
-          readOnly: true
-        updatedAt:
-          description: Updated date.
-          type: string
-          format: date-time
-          readOnly: true
-        id:
-          description: Menu item ID. Unique identifier prefixed with `prd_`.
-          type: string
-          readOnly: true
-          pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-          example: prd_01h1s5z6vf2mm1mz3hevnn9va7
-        object:
-          description: Entity name.
-          type: string
-          const: menuItem
-          readOnly: true
-        name:
-          description: Menu item name.
-          type: string
-          minLength: 1
-          maxLength: 50
-        price:
-          description: Price in cents.
-          type: integer
-          minimum: 0
-        photo:
-          writeOnly: true
-          type:
-            - string
-            - 'null'
-          format: binary
-          description: Photo of the menu item. Must be a PNG image and less than 1MB.
-        photoUrl:
-          readOnly: true
-          type: string
-          format: uri
-          description: Photo URL of the menu item.
-        photoTextDescription:
-          type:
-            - string
-            - 'null'
-      required:
-        - id
-        - name
-        - price
-        - createdAt
-        - updatedAt
-        - object
-    Beverage:
-      allOf:
-        - type: object
-          properties:
-            category:
-              description: Menu item category.
-              type: string
-              const: beverage
-            volume:
-              type: number
-              description: Size of the beverage in milliliters.
-              exclusiveMinimum: 0
-            containsCaffeine:
-              type: boolean
-              description: Indicates if the beverage contains caffeine.
-          required:
-            - category
-            - volume
-            - containsCaffeine
-        - $ref: '#/components/schemas/MenuBaseItem'
-    Dessert:
-      allOf:
-        - type: object
-          properties:
-            category:
-              description: Menu item category.
-              type: string
-              const: dessert
-            calories:
-              type: number
-              exclusiveMinimum: 0
-              description: Amount of calories.
-          required:
-            - category
-            - calories
-        - $ref: '#/components/schemas/MenuBaseItem'
-    MenuItem:
-      discriminator:
-        propertyName: category
-        mapping:
-          beverage: '#/components/schemas/Beverage'
-          dessert: '#/components/schemas/Dessert'
-      oneOf:
-        - $ref: '#/components/schemas/Beverage'
-        - $ref: '#/components/schemas/Dessert'
-      required:
-        - category
-    MenuItemList:
-      type: object
-      properties:
-        object:
-          type: string
-          const: list
-          description: Entity name.
-        page:
-          $ref: '#/components/schemas/Page'
-        items:
-          type: array
-          items:
-            $ref: '#/components/schemas/MenuItem'
-      required:
-        - object
-        - page
-        - items
-    Error:
-      type: object
-      properties:
-        type:
-          type: string
-          format: uri-reference
-          description: URI reference that identifies the problem type.
-          default: about:blank
-        title:
-          type: string
-          description: Short summary of the problem type.
-        status:
-          type: integer
-          format: int32
-          description: |
-            HTTP status code generated by the origin server for this occurrence of the problem.
-          minimum: 100
-          exclusiveMaximum: 600
-        instance:
-          type: string
-          format: uri-reference
-          description: |
-            URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-            May be used to locate the root of this problem in the source code.
-          example: /some/uri-reference#specific-occurrence-context
-        details:
-          description: Additional error details.
-          type: object
-          additionalProperties: true
-      required:
-        - type
-        - title
-        - status
-    OrderStatus:
-      type: string
-      description: Order status.
-      enum:
-        - placed
-        - preparing
-        - completed
-        - canceled
-    Order:
-      type: object
-      title: Order
-      properties:
-        id:
-          description: Order ID. Unique identifier prefixed with `ord_`.
-          type: string
-          format: ulid
-          readOnly: true
-          pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-          example: ord_01h1s5z6vf2mm1mz3hevnn9va7
-        object:
-          description: Entity name.
-          type: string
-          const: order
-          readOnly: true
-        customerName:
-          description: |
-            Name of the customer who placed the order.
-            Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-          type: string
-          pattern: ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-          minLength: 1
-          maxLength: 100
-        status:
-          allOf:
-            - $ref: '#/components/schemas/OrderStatus'
-          readOnly: true
-        totalPrice:
-          description: Total order price in cents.
-          type: integer
-          minimum: 0
-          readOnly: true
-        createdAt:
-          description: Created date.
-          type: string
-          format: date-time
-          readOnly: true
-        updatedAt:
-          description: Updated date.
-          type: string
-          format: date-time
-          readOnly: true
-        orderItems:
-          type: array
-          description: List of items to include in the order.
-          minItems: 1
-          items:
-            type: object
-            properties:
-              menuItemId:
-                type: string
-                format: ulid
-                description: ID of the menu item to add to the order.
-              quantity:
-                type: integer
-                minimum: 1
-                description: Quantity of the menu item.
-              discount:
-                type: integer
-                minimum: 0
-                description: Discount amount in cents (absolute value).
-                default: 0
-              comment:
-                type: string
-                maxLength: 500
-                description: Optional comment for the order item (e.g., "No sugar").
-            required:
-              - menuItemId
-              - quantity
-      required:
-        - customerName
-        - orderItems
-    OrderList:
-      type: object
-      properties:
-        object:
-          type: string
-          const: list
-          description: Entity name.
-        page:
-          $ref: '#/components/schemas/Page'
-        items:
-          type: array
-          items:
-            $ref: '#/components/schemas/Order'
-      required:
-        - object
-        - page
-        - items
-    OrderItem:
-      type: object
-      properties:
-        menuItemId:
-          type: string
-          description: ID of the menu item to add to the order.
-          writeOnly: true
-        menuItem:
-          allOf:
-            - $ref: '#/components/schemas/MenuItem'
-          description: Menu item that is part of the order.
-          readOnly: true
-        quantity:
-          type: integer
-          minimum: 1
-          description: Quantity of the menu item.
-        discount:
-          type: integer
-          minimum: 0
-          description: Discount amount in cents (absolute value).
-          default: 0
-        comment:
-          type: string
-          maxLength: 500
-          description: Optional comment for the order item (e.g., "No sugar").
-      required:
-        - menuItemId
-        - quantity
-    RevenueStatistics:
-      type: object
-      description: Revenue statistics for a given date range.
-      properties:
-        revenue:
-          type: number
-          format: float
-          description: Total revenue in cents from completed orders.
-          minimum: 0
-        averageOrderAmount:
-          type: number
-          format: float
-          description: Average order amount in cents (calculated from completed orders only).
-          minimum: 0
-        totalOrders:
-          type: integer
-          description: Total number of orders (all statuses) in the date range.
-          minimum: 0
-        placedOrders:
-          type: integer
-          description: Number of placed orders.
-          minimum: 0
-        preparingOrders:
-          type: integer
-          description: Number of preparing orders.
-          minimum: 0
-        completedOrders:
-          type: integer
-          description: Number of completed orders.
-          minimum: 0
-        canceledOrders:
-          type: integer
-          description: Number of canceled orders.
-          minimum: 0
-        startDate:
-          type: string
-          format: date
-          description: Start date of the revenue calculation period.
-        endDate:
-          type: string
-          format: date
-          description: End date of the revenue calculation period.
-      required:
-        - revenue
-        - averageOrderAmount
-        - totalOrders
-        - placedOrders
-        - preparingOrders
-        - completedOrders
-        - canceledOrders
-        - startDate
-        - endDate
-    RegisterClientObject:
-      type: object
-      properties:
-        name:
-          type: string
-          description: Client name.
-        redirectUris:
-          type: array
-          items:
-            type: string
-            format: uri
-          description: List of redirect URIs (optional, defaults to empty array).
-        scopes:
-          type: array
-          items:
-            type: string
-            enum:
-              - menu:read
-              - menu:write
-              - orders:read
-              - orders:write
-          description: List of scopes.
-        grantTypes:
-          type: array
-          items:
-            type: string
-            enum:
-              - authorization_code
-              - client_credentials
-          description: List of grant types.
-      required:
-        - name
-    OAuth2Client:
-      type: object
-      description: OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
-      properties:
-        clientId:
-          type: string
-          description: Client identifier issued by the authorization server.
-        clientSecret:
-          type: string
-          description: Client secret issued by the authorization server.
-        clientIdIssuedAt:
-          type: integer
-          format: int64
-          description: Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-        clientSecretExpiresAt:
-          type: integer
-          format: int64
-          description: Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-        name:
-          type: string
-          description: Client name (registered metadata).
-        redirectUris:
-          type: array
-          items:
-            type: string
-            format: uri
-          description: List of redirect URIs (registered metadata).
-        registrationClientUri:
-          type: string
-          format: uri
-          description: URL of the client configuration endpoint for managing this client registration (RFC 7592).
-        registrationAccessToken:
-          type: string
-          description: Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-        scopes:
-          type: array
-          items:
-            type: string
-            enum:
-              - menu:read
-              - menu:write
-              - orders:read
-              - orders:write
-          description: List of scopes (registered metadata).
-        grantTypes:
-          type: array
-          items:
-            type: string
-            enum:
-              - authorization_code
-              - client_credentials
-          description: List of grant types (registered metadata).
-      required:
-        - clientId
-        - clientSecret
-        - clientIdIssuedAt
-        - clientSecretExpiresAt
-        - registrationClientUri
-        - registrationAccessToken
-    OrderNotification:
-      type: object
-      required:
-        - orderId
-        - orderStatus
-        - timestamp
-      properties:
-        orderId:
-          type: string
-          description: Unique order identifier.
-        orderStatus:
-          $ref: '#/components/schemas/OrderStatus'
-        timestamp:
-          type: string
-          format: date-time
-          description: When the event occurred.
-  responses:
-    BadRequest:
-      description: Bad request - invalid input parameters.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    InternalServerError:
-      description: Internal server error.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Unauthorized:
-      description: Unauthorized - authorization required.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Forbidden:
-      description: Forbidden - insufficient permissions.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Conflict:
-      description: Conflict - entity already exists.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    NotFound:
-      description: Resource not found.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
diff --git a/tests/e2e/generate-client/examples/tanstack-query/package-lock.json b/tests/e2e/generate-client/examples/tanstack-query/package-lock.json
deleted file mode 100644
index 7b87ce37ac..0000000000
--- a/tests/e2e/generate-client/examples/tanstack-query/package-lock.json
+++ /dev/null
@@ -1,1814 +0,0 @@
-{
-  "name": "@redocly-examples/tanstack-query",
-  "version": "0.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@redocly-examples/tanstack-query",
-      "version": "0.0.0",
-      "dependencies": {
-        "@tanstack/react-query": "^5.0.0",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0"
-      },
-      "devDependencies": {
-        "@redocly/cli": "2.34.0-local-2026-06-23.1",
-        "@types/react": "^18.2.0",
-        "@types/react-dom": "^18.2.0",
-        "@vitejs/plugin-react": "^4.3.0",
-        "typescript": "^5.5.0",
-        "vite": "^5.4.0"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/code-frame/-/code-frame-7.29.7.tgz",
-      "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.29.7",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.1.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/compat-data": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/compat-data/-/compat-data-7.29.7.tgz",
-      "integrity": "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/core": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/core/-/core-7.29.7.tgz",
-      "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.29.7",
-        "@babel/generator": "^7.29.7",
-        "@babel/helper-compilation-targets": "^7.29.7",
-        "@babel/helper-module-transforms": "^7.29.7",
-        "@babel/helpers": "^7.29.7",
-        "@babel/parser": "^7.29.7",
-        "@babel/template": "^7.29.7",
-        "@babel/traverse": "^7.29.7",
-        "@babel/types": "^7.29.7",
-        "@jridgewell/remapping": "^2.3.5",
-        "convert-source-map": "^2.0.0",
-        "debug": "^4.1.0",
-        "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.3",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/babel"
-      }
-    },
-    "node_modules/@babel/generator": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/generator/-/generator-7.29.7.tgz",
-      "integrity": "sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/parser": "^7.29.7",
-        "@babel/types": "^7.29.7",
-        "@jridgewell/gen-mapping": "^0.3.12",
-        "@jridgewell/trace-mapping": "^0.3.28",
-        "jsesc": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz",
-      "integrity": "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/compat-data": "^7.29.7",
-        "@babel/helper-validator-option": "^7.29.7",
-        "browserslist": "^4.24.0",
-        "lru-cache": "^5.1.1",
-        "semver": "^6.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-globals": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helper-globals/-/helper-globals-7.29.7.tgz",
-      "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-imports": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz",
-      "integrity": "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/traverse": "^7.29.7",
-        "@babel/types": "^7.29.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-module-transforms": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz",
-      "integrity": "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.29.7",
-        "@babel/helper-validator-identifier": "^7.29.7",
-        "@babel/traverse": "^7.29.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
-      }
-    },
-    "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helper-plugin-utils/-/helper-plugin-utils-7.29.7.tgz",
-      "integrity": "sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-string-parser": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz",
-      "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
-      "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-option": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz",
-      "integrity": "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helpers": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helpers/-/helpers-7.29.7.tgz",
-      "integrity": "sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/template": "^7.29.7",
-        "@babel/types": "^7.29.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/parser": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/parser/-/parser-7.29.7.tgz",
-      "integrity": "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/types": "^7.29.7"
-      },
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-jsx-self": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.29.7.tgz",
-      "integrity": "sha512-TL0hMc9xzy86VD31nUiwzd5otRAcyEPcsegCxolO0PvcXuH1v0kECe/UIznYFihpkvU5wg/jk4v0TTEFfm53fw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.29.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-react-jsx-source": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.29.7.tgz",
-      "integrity": "sha512-06IyK09H3wi4cGbhDBwp5gUGo0IKtnYa8tyTiephirPCK6fbobVGiXMMI5zLQ4aKEYP3wZ3ArU44o+8KMrSG/Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.29.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/template": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/template/-/template-7.29.7.tgz",
-      "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.29.7",
-        "@babel/parser": "^7.29.7",
-        "@babel/types": "^7.29.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/traverse": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/traverse/-/traverse-7.29.7.tgz",
-      "integrity": "sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "^7.29.7",
-        "@babel/generator": "^7.29.7",
-        "@babel/helper-globals": "^7.29.7",
-        "@babel/parser": "^7.29.7",
-        "@babel/template": "^7.29.7",
-        "@babel/types": "^7.29.7",
-        "debug": "^4.3.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/types": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/types/-/types-7.29.7.tgz",
-      "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-string-parser": "^7.29.7",
-        "@babel/helper-validator-identifier": "^7.29.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.13",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
-      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.0",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      }
-    },
-    "node_modules/@jridgewell/remapping": {
-      "version": "2.3.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@jridgewell/remapping/-/remapping-2.3.5.tgz",
-      "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.24"
-      }
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
-      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
-      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.31",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
-      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.1.0",
-        "@jridgewell/sourcemap-codec": "^1.4.14"
-      }
-    },
-    "node_modules/@redocly/cli": {
-      "version": "2.34.0-local-2026-06-23.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/cli/-/cli-2.34.0-local-2026-06-23.1.tgz",
-      "integrity": "sha512-F3WnkO5Jn51H6hPzdH3Vde1nQq0eb0k7I7X0UEfkQ6paWGQBLnlOc4cudsU6y1Cz8unD+svmcl8SzaGMwTH6OQ==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "openapi": "bin/cli.js",
-        "redocly": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
-        "npm": ">=10"
-      }
-    },
-    "node_modules/@rolldown/pluginutils": {
-      "version": "1.0.0-beta.27",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.27.tgz",
-      "integrity": "sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.62.2.tgz",
-      "integrity": "sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.62.2.tgz",
-      "integrity": "sha512-BaH7BllCACHoH1LguOU56UItGfUWjujlO65kS9LAodViaN4bwIKd7oeW/ZHJ/4ljr/7MIiENnNy3HJ0zXv8Zkw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.62.2.tgz",
-      "integrity": "sha512-v39RCCvj4He82I9sFmk+M1VZ0PLM9sfsLVikjfx2hYBNALhrrOR2D3JjQA6AhlaSOgcR+RzrKY7e1+bT6SUO/A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.62.2.tgz",
-      "integrity": "sha512-yl0y2vq3S3lHeuXhEdss6TWfKW8vkujImO12tn4ZkG/4oghr09LvdYm2RElVjokTQiUvDUGXLGsYeLqUMCKpGA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.62.2.tgz",
-      "integrity": "sha512-tT4pvt4qXD+vEoezupCWi+a1F0vvDiksiHc+PxRlYTOH1I6/X4id9jPxTP+Fg+545euaFT1jJVs4CEdHZAU1vw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.62.2.tgz",
-      "integrity": "sha512-6nU5F2wCW+qvCBhTn1pdIU3bzsIoF7EUwsCDRxilWGprQR6yd508YnH9+OKFCwpfS8pjZqDUmnCAr7exax0XCg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.62.2.tgz",
-      "integrity": "sha512-n1GJHPOvpIfhi3TmrCeh6S6URt9BFCt0KQE3qvexyGCTAKpR4Lg+eWvNZEqu7epxwus/8ElT3hacYEucm49SZg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.62.2.tgz",
-      "integrity": "sha512-JqgflS8wEB+UXV/vS1RpRbifGBeN4D5lz8D8oOFbFZw4vedvdOgCFAjfBmIMdW3yL10XpQQ0Ambepw6MXrhOnA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.62.2.tgz",
-      "integrity": "sha512-wnFJkogWvN4jm/hQRF2UBaeUmk20j5+DmHvoyWii2b8HJDyvz1MF2OU/6ynXt2KR63rbZLWkFpoytpdc/yBuSA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.62.2.tgz",
-      "integrity": "sha512-HVu2bp0zhvJ8xHEV9+UUs7S90VadmBSY3LcIMvozbPo4AuMGDWlz3ymHLHZPX4hR67TKTt8Qp5PJ5RBg/i+RMQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-loong64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.62.2.tgz",
-      "integrity": "sha512-mQqqAV8QaoSgr9I2fKDLY2BAVvmKjWoGiu/cSYQonsLvtqwEn1E4QYfnCOcp5zoEqNhsDYin1s6jx/VJmrxlZg==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-loong64-musl": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.62.2.tgz",
-      "integrity": "sha512-IxKLoxCQ2IWi6bT2akyDUBGsOImDKB+sPp4EsTmwFQ/fMwpCKm8uLSSgP/Kx/QYUgKis6SEZ5/Nlhup0DIA0PQ==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.62.2.tgz",
-      "integrity": "sha512-Mk5ha2RQSgyFfmYYLkBpPnUk8D8FriBxesO1u9O75X0mHgXL1UQcH5Itl2lurWL2tj0RxV9b9tJgipac0hRY9A==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-ppc64-musl": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.62.2.tgz",
-      "integrity": "sha512-CjvEnqJL/0/TQ3TXX3OPIJ/kmBellrWd4heXUmHeJlTnmwjKpSJzoehLaL6Xk0ZnMHBu9dZuFADNOrtjF4v+2w==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.62.2.tgz",
-      "integrity": "sha512-1SiZbzwdkaDURsew/tSOrooKiYy7EQGT6m8ufavAi9NEyQb/6VuIxFXAL1fqa4iZe3g4NbNk4P7J32z2tw5Mgg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.62.2.tgz",
-      "integrity": "sha512-nQts12zJ3NQRoE6uYljOH89v7szzLDvG2JD/vsX+vGXU8w/At1GowTZ5/7qeFQ8m7L55rpR8Okugnuo5bgjy2Q==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.62.2.tgz",
-      "integrity": "sha512-E9/ll019jhPIJgpzfZoIkBGhcz+kKNgVWYRY0zr9srBdPPFVpvOKW8VaJKUbeK+eZXyQF9ltME+Kk6affeaPgg==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.62.2.tgz",
-      "integrity": "sha512-5BqxR/pshjey51iliyzTD5Xi3EN0aLmQ2lZ3lvefVV9c82BvrLo2/6OT55iifpWBufs6kdwWbuOKS841DrmK9A==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.62.2.tgz",
-      "integrity": "sha512-uNN83XxQrRAh/w0/pmAfibcwyb6YWt4gP+dpnQKPVJshAloQ785ii8CT8ZCIxkGg9opVsvAlGhFitSm6D1Jjpg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-openbsd-x64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.62.2.tgz",
-      "integrity": "sha512-srjEIxSH3LRnJN6THczDHWQplqEMFiAJrTab0msUryh9kwNpkICf3Ea6q6MN/2cZwRFUNx5w+h6Hpi4QuHS6Zg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-openharmony-arm64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.62.2.tgz",
-      "integrity": "sha512-8hOJnxgbyObnCm5AlRA3A931xX19xq80RjVTKgJOvEKWqJruP/Uf12IbAOaDjjEXYRewwHLfmF0YRIdK3OwKWA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openharmony"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.62.2.tgz",
-      "integrity": "sha512-mmF4AY1i0hG/bLWUctUq59gtmgaSIRa3cu/A3JFRp/sCNEme2bgDEiDS22P9FbnJB8NJNF4jPJiSP5RHQpUTDg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.62.2.tgz",
-      "integrity": "sha512-DZgkknc6jhHrk46V25vbAM0zZkyP0nSDkJB8/dRkLTxv470dOmWDqGoEJl/9A0dFfS7yE3REOwNDxpHwSLSt0Q==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-x64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.62.2.tgz",
-      "integrity": "sha512-T6xr6ucWSFto+VGajA8YH26LdpHRuP4YLHEKAtCWvJDOlnmWcDZVCI2Jmjr+IFHDlt2zRaTAKE4tfjTaWLgJBg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.62.2.tgz",
-      "integrity": "sha512-BfzEnDJOt9T8M989/lA37EcJgat01wLRnoi5dQf3QzOH7jzpqTAzdDbVfRljVr5r+jzKqpbHeyOfAaXxAd0PAA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@tanstack/query-core": {
-      "version": "5.101.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@tanstack/query-core/-/query-core-5.101.1.tgz",
-      "integrity": "sha512-Y6Y92dkXtNqx67m2pMSxUsA3zOCwv862JexZRP8/EPwvKXMPu9m8rv43spiXWzOUIggQ3SQApttALStzhA8B4g==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/tannerlinsley"
-      }
-    },
-    "node_modules/@tanstack/react-query": {
-      "version": "5.101.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@tanstack/react-query/-/react-query-5.101.1.tgz",
-      "integrity": "sha512-ZnONUuQKJe1bJMStXUL1s5uKN9FcfC28j5cK+iDZcdSHtUv1wtin1cGc/Oewhf2Oc4eKY7lggtpvT/AbMmhHew==",
-      "license": "MIT",
-      "dependencies": {
-        "@tanstack/query-core": "5.101.1"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/tannerlinsley"
-      },
-      "peerDependencies": {
-        "react": "^18 || ^19"
-      }
-    },
-    "node_modules/@types/babel__core": {
-      "version": "7.20.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/babel__core/-/babel__core-7.20.5.tgz",
-      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
-      }
-    },
-    "node_modules/@types/babel__generator": {
-      "version": "7.27.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/babel__generator/-/babel__generator-7.27.0.tgz",
-      "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "node_modules/@types/babel__template": {
-      "version": "7.4.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/babel__template/-/babel__template-7.4.4.tgz",
-      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "node_modules/@types/babel__traverse": {
-      "version": "7.28.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/babel__traverse/-/babel__traverse-7.28.0.tgz",
-      "integrity": "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/types": "^7.28.2"
-      }
-    },
-    "node_modules/@types/estree": {
-      "version": "1.0.9",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/estree/-/estree-1.0.9.tgz",
-      "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/prop-types": {
-      "version": "15.7.15",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/prop-types/-/prop-types-15.7.15.tgz",
-      "integrity": "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/react": {
-      "version": "18.3.31",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/react/-/react-18.3.31.tgz",
-      "integrity": "sha512-vfEqpXTvwT91yhmwdfouStN2hSKwTvyRs8qpLfADyrq/kxDw0hZM7Wk9Ug1FELj8hIby+S/+kQCSRFF32nv2Qw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/prop-types": "*",
-        "csstype": "^3.2.2"
-      }
-    },
-    "node_modules/@types/react-dom": {
-      "version": "18.3.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/react-dom/-/react-dom-18.3.7.tgz",
-      "integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "@types/react": "^18.0.0"
-      }
-    },
-    "node_modules/@vitejs/plugin-react": {
-      "version": "4.7.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@vitejs/plugin-react/-/plugin-react-4.7.0.tgz",
-      "integrity": "sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/core": "^7.28.0",
-        "@babel/plugin-transform-react-jsx-self": "^7.27.1",
-        "@babel/plugin-transform-react-jsx-source": "^7.27.1",
-        "@rolldown/pluginutils": "1.0.0-beta.27",
-        "@types/babel__core": "^7.20.5",
-        "react-refresh": "^0.17.0"
-      },
-      "engines": {
-        "node": "^14.18.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0"
-      }
-    },
-    "node_modules/baseline-browser-mapping": {
-      "version": "2.10.38",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/baseline-browser-mapping/-/baseline-browser-mapping-2.10.38.tgz",
-      "integrity": "sha512-31/02mVB4yuQU6adKk5SlY6m+mxDwUq5KZkyYgnLrrKl7TEm1+3PyDtDBz2kOv/wxZz41GHsvV1A/u6RmiyBvw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "baseline-browser-mapping": "dist/cli.cjs"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/browserslist": {
-      "version": "4.28.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/browserslist/-/browserslist-4.28.4.tgz",
-      "integrity": "sha512-MTc8i/x9jBQd1iMw2CFGS+rwMa07eYjLR0CCTLDACl9xhxy+nIs3KeML/biicXtk9JrZ6dnnTatmc7ErPXIxqw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "baseline-browser-mapping": "^2.10.38",
-        "caniuse-lite": "^1.0.30001799",
-        "electron-to-chromium": "^1.5.376",
-        "node-releases": "^2.0.48",
-        "update-browserslist-db": "^1.2.3"
-      },
-      "bin": {
-        "browserslist": "cli.js"
-      },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
-      }
-    },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001799",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/caniuse-lite/-/caniuse-lite-1.0.30001799.tgz",
-      "integrity": "sha512-hG1bReV+OUU+MOqK4t/ZWI0tZOyz3rqS9XuhOUz1cIcbwBKjOyJEJuw9ER5JuNyqxNk8u/JUVbGibBOL1yrjFw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "CC-BY-4.0"
-    },
-    "node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/csstype": {
-      "version": "3.2.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/csstype/-/csstype-3.2.3.tgz",
-      "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/debug": {
-      "version": "4.4.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/debug/-/debug-4.4.3.tgz",
-      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.3"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.5.377",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/electron-to-chromium/-/electron-to-chromium-1.5.377.tgz",
-      "integrity": "sha512-cH1jZgJHoezfTnKfKwnScpHywTFVnJUNITDPREFdhNjiuD502+QFpG0Qk7G8jhsV/f+CEAFlIrzP1fT+IMb92g==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/esbuild": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/esbuild/-/esbuild-0.21.5.tgz",
-      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.21.5",
-        "@esbuild/android-arm": "0.21.5",
-        "@esbuild/android-arm64": "0.21.5",
-        "@esbuild/android-x64": "0.21.5",
-        "@esbuild/darwin-arm64": "0.21.5",
-        "@esbuild/darwin-x64": "0.21.5",
-        "@esbuild/freebsd-arm64": "0.21.5",
-        "@esbuild/freebsd-x64": "0.21.5",
-        "@esbuild/linux-arm": "0.21.5",
-        "@esbuild/linux-arm64": "0.21.5",
-        "@esbuild/linux-ia32": "0.21.5",
-        "@esbuild/linux-loong64": "0.21.5",
-        "@esbuild/linux-mips64el": "0.21.5",
-        "@esbuild/linux-ppc64": "0.21.5",
-        "@esbuild/linux-riscv64": "0.21.5",
-        "@esbuild/linux-s390x": "0.21.5",
-        "@esbuild/linux-x64": "0.21.5",
-        "@esbuild/netbsd-x64": "0.21.5",
-        "@esbuild/openbsd-x64": "0.21.5",
-        "@esbuild/sunos-x64": "0.21.5",
-        "@esbuild/win32-arm64": "0.21.5",
-        "@esbuild/win32-ia32": "0.21.5",
-        "@esbuild/win32-x64": "0.21.5"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/escalade/-/escalade-3.2.0.tgz",
-      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "license": "MIT"
-    },
-    "node_modules/jsesc": {
-      "version": "3.1.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/jsesc/-/jsesc-3.1.0.tgz",
-      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/json5": {
-      "version": "2.2.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "license": "MIT",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "yallist": "^3.0.2"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.15",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/nanoid/-/nanoid-3.3.15.tgz",
-      "integrity": "sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.48",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/node-releases/-/node-releases-2.0.48.tgz",
-      "integrity": "sha512-1uz8041X6LoI6ZSdZacM9lVY28vuzDlSKitnpbSNK0RfKoIJkX29NBPVEFXhnuSuEOA9Ww0xnPJ+ILWbGAv8DA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/picocolors": {
-      "version": "1.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/postcss": {
-      "version": "8.5.15",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/postcss/-/postcss-8.5.15.tgz",
-      "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "nanoid": "^3.3.12",
-        "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/react": {
-      "version": "18.3.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/react/-/react-18.3.1.tgz",
-      "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-dom": {
-      "version": "18.3.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/react-dom/-/react-dom-18.3.1.tgz",
-      "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.2"
-      },
-      "peerDependencies": {
-        "react": "^18.3.1"
-      }
-    },
-    "node_modules/react-refresh": {
-      "version": "0.17.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/react-refresh/-/react-refresh-0.17.0.tgz",
-      "integrity": "sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rollup": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/rollup/-/rollup-4.62.2.tgz",
-      "integrity": "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "1.0.9"
-      },
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=18.0.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.62.2",
-        "@rollup/rollup-android-arm64": "4.62.2",
-        "@rollup/rollup-darwin-arm64": "4.62.2",
-        "@rollup/rollup-darwin-x64": "4.62.2",
-        "@rollup/rollup-freebsd-arm64": "4.62.2",
-        "@rollup/rollup-freebsd-x64": "4.62.2",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.62.2",
-        "@rollup/rollup-linux-arm-musleabihf": "4.62.2",
-        "@rollup/rollup-linux-arm64-gnu": "4.62.2",
-        "@rollup/rollup-linux-arm64-musl": "4.62.2",
-        "@rollup/rollup-linux-loong64-gnu": "4.62.2",
-        "@rollup/rollup-linux-loong64-musl": "4.62.2",
-        "@rollup/rollup-linux-ppc64-gnu": "4.62.2",
-        "@rollup/rollup-linux-ppc64-musl": "4.62.2",
-        "@rollup/rollup-linux-riscv64-gnu": "4.62.2",
-        "@rollup/rollup-linux-riscv64-musl": "4.62.2",
-        "@rollup/rollup-linux-s390x-gnu": "4.62.2",
-        "@rollup/rollup-linux-x64-gnu": "4.62.2",
-        "@rollup/rollup-linux-x64-musl": "4.62.2",
-        "@rollup/rollup-openbsd-x64": "4.62.2",
-        "@rollup/rollup-openharmony-arm64": "4.62.2",
-        "@rollup/rollup-win32-arm64-msvc": "4.62.2",
-        "@rollup/rollup-win32-ia32-msvc": "4.62.2",
-        "@rollup/rollup-win32-x64-gnu": "4.62.2",
-        "@rollup/rollup-win32-x64-msvc": "4.62.2",
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/scheduler": {
-      "version": "0.23.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/scheduler/-/scheduler-0.23.2.tgz",
-      "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
-      }
-    },
-    "node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.2.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "5.9.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
-    "node_modules/update-browserslist-db": {
-      "version": "1.2.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz",
-      "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "escalade": "^3.2.0",
-        "picocolors": "^1.1.1"
-      },
-      "bin": {
-        "update-browserslist-db": "cli.js"
-      },
-      "peerDependencies": {
-        "browserslist": ">= 4.21.0"
-      }
-    },
-    "node_modules/vite": {
-      "version": "5.4.21",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/vite/-/vite-5.4.21.tgz",
-      "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "esbuild": "^0.21.3",
-        "postcss": "^8.4.43",
-        "rollup": "^4.20.0"
-      },
-      "bin": {
-        "vite": "bin/vite.js"
-      },
-      "engines": {
-        "node": "^18.0.0 || >=20.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/vitejs/vite?sponsor=1"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
-      },
-      "peerDependencies": {
-        "@types/node": "^18.0.0 || >=20.0.0",
-        "less": "*",
-        "lightningcss": "^1.21.0",
-        "sass": "*",
-        "sass-embedded": "*",
-        "stylus": "*",
-        "sugarss": "*",
-        "terser": "^5.4.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "less": {
-          "optional": true
-        },
-        "lightningcss": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "sass-embedded": {
-          "optional": true
-        },
-        "stylus": {
-          "optional": true
-        },
-        "sugarss": {
-          "optional": true
-        },
-        "terser": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/yallist": {
-      "version": "3.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true,
-      "license": "ISC"
-    }
-  }
-}
diff --git a/tests/e2e/generate-client/examples/tanstack-query/redocly.yaml b/tests/e2e/generate-client/examples/tanstack-query/redocly.yaml
index fa97995191..7572c29f9d 100644
--- a/tests/e2e/generate-client/examples/tanstack-query/redocly.yaml
+++ b/tests/e2e/generate-client/examples/tanstack-query/redocly.yaml
@@ -3,7 +3,7 @@
 # (run `redocly generate-client` with no args to build every such api).
 apis:
   tanstack-query:
-    root: ./openapi.yaml
+    root: ../_shared/cafe.yaml
     clientOutput: ./src/api/client.ts
     client:
       generators:
diff --git a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.tanstack.ts b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.tanstack.ts
deleted file mode 100644
index 700d8138fc..0000000000
--- a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.tanstack.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-import { queryOptions } from "@tanstack/react-query";
-
-import { createMenuItem, createOrder, deleteMenuItem, deleteOrder, getMenuItemPhoto, getOrderById, getRevenue, listMenuItems, listOrderItems, listOrders, registerOAuth2Client, updateOrder, type CreateMenuItemVariables, type CreateOrderVariables, type DeleteMenuItemVariables, type DeleteOrderVariables, type GetMenuItemPhotoVariables, type GetOrderByIdVariables, type GetRevenueVariables, type ListMenuItemsVariables, type ListOrderItemsVariables, type ListOrdersVariables, type RegisterOAuth2ClientVariables, type UpdateOrderVariables, type RequestOptions } from "./client.js";
-
-export const listMenuItemsQueryKey = (vars: ListMenuItemsVariables) => ["listMenuItems", vars] as const;
-
-export const listMenuItemsOptions = (vars: ListMenuItemsVariables, init?: RequestOptions) => queryOptions({
-    queryKey: listMenuItemsQueryKey(vars),
-    queryFn: () => listMenuItems(vars.params, init)
-});
-
-export const createMenuItemMutation = () => ({
-    mutationKey: ["createMenuItem"] as const,
-    mutationFn: (vars: CreateMenuItemVariables) => createMenuItem(vars.body)
-});
-
-export const deleteMenuItemMutation = () => ({
-    mutationKey: ["deleteMenuItem"] as const,
-    mutationFn: (vars: DeleteMenuItemVariables) => deleteMenuItem(vars.menuItemId)
-});
-
-export const getMenuItemPhotoQueryKey = (vars: GetMenuItemPhotoVariables) => ["getMenuItemPhoto", vars] as const;
-
-export const getMenuItemPhotoOptions = (vars: GetMenuItemPhotoVariables, init?: RequestOptions) => queryOptions({
-    queryKey: getMenuItemPhotoQueryKey(vars),
-    queryFn: () => getMenuItemPhoto(vars.menuItemId, vars.params, init)
-});
-
-export const listOrdersQueryKey = (vars: ListOrdersVariables) => ["listOrders", vars] as const;
-
-export const listOrdersOptions = (vars: ListOrdersVariables, init?: RequestOptions) => queryOptions({
-    queryKey: listOrdersQueryKey(vars),
-    queryFn: () => listOrders(vars.params, init)
-});
-
-export const createOrderMutation = () => ({
-    mutationKey: ["createOrder"] as const,
-    mutationFn: (vars: CreateOrderVariables) => createOrder(vars.body)
-});
-
-export const getOrderByIdQueryKey = (vars: GetOrderByIdVariables) => ["getOrderById", vars] as const;
-
-export const getOrderByIdOptions = (vars: GetOrderByIdVariables, init?: RequestOptions) => queryOptions({
-    queryKey: getOrderByIdQueryKey(vars),
-    queryFn: () => getOrderById(vars.orderId, vars.headers, init)
-});
-
-export const deleteOrderMutation = () => ({
-    mutationKey: ["deleteOrder"] as const,
-    mutationFn: (vars: DeleteOrderVariables) => deleteOrder(vars.orderId)
-});
-
-export const updateOrderMutation = () => ({
-    mutationKey: ["updateOrder"] as const,
-    mutationFn: (vars: UpdateOrderVariables) => updateOrder(vars.orderId, vars.body)
-});
-
-export const listOrderItemsQueryKey = (vars: ListOrderItemsVariables) => ["listOrderItems", vars] as const;
-
-export const listOrderItemsOptions = (vars: ListOrderItemsVariables, init?: RequestOptions) => queryOptions({
-    queryKey: listOrderItemsQueryKey(vars),
-    queryFn: () => listOrderItems(vars.params, init)
-});
-
-export const getRevenueQueryKey = (vars: GetRevenueVariables) => ["getRevenue", vars] as const;
-
-export const getRevenueOptions = (vars: GetRevenueVariables, init?: RequestOptions) => queryOptions({
-    queryKey: getRevenueQueryKey(vars),
-    queryFn: () => getRevenue(vars.params, init)
-});
-
-export const registerOAuth2ClientMutation = () => ({
-    mutationKey: ["registerOAuth2Client"] as const,
-    mutationFn: (vars: RegisterOAuth2ClientVariables) => registerOAuth2Client(vars.body)
-});
\ No newline at end of file
diff --git a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts b/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
deleted file mode 100644
index 550cd946cd..0000000000
--- a/tests/e2e/generate-client/examples/tanstack-query/src/api/client.ts
+++ /dev/null
@@ -1,1968 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Redocly Cafe (v1.0.0)
- * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
- * Create API credentials and try it yourself in a realistic OpenAPI workflow.
- * 
- */
-
-export type Page = {
-    /**
-     * Use with the `after` query parameter to load the next page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    endCursor: string | null;
-    /**
-     * Use with the `before` query parameter to load the previous page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    startCursor: string | null;
-    /**
-     * Indicates if there is a next page with items.
-     */
-    hasNextPage: boolean;
-    /**
-     * Indicates if there is a previous page with items.
-     */
-    hasPrevPage: boolean;
-    /**
-     * Value showing how many items are in the page limit.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit: number;
-    /**
-     * Count of items across all pages.
-     * @minimum 0
-     */
-    total: number;
-};
-
-export type MenuBaseItem = {
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt: string;
-    /**
-     * Menu item ID. Unique identifier prefixed with `prd_`.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    readonly id: string;
-    /**
-     * Entity name.
-     */
-    readonly object: "menuItem";
-    /**
-     * Menu item name.
-     * @minLength 1
-     * @maxLength 50
-     */
-    name: string;
-    /**
-     * Price in cents.
-     * @minimum 0
-     */
-    price: number;
-    /**
-     * Photo of the menu item. Must be a PNG image and less than 1MB.
-     * @format binary
-     */
-    photo?: Blob | null;
-    /**
-     * Photo URL of the menu item.
-     * @format uri
-     */
-    readonly photoUrl?: string;
-    photoTextDescription?: string | null;
-};
-
-export type Beverage = {
-    /**
-     * Menu item category.
-     */
-    category: "beverage";
-    /**
-     * Size of the beverage in milliliters.
-     * @exclusiveMinimum 0
-     */
-    volume: number;
-    /**
-     * Indicates if the beverage contains caffeine.
-     */
-    containsCaffeine: boolean;
-} & MenuBaseItem;
-
-export type Dessert = {
-    /**
-     * Menu item category.
-     */
-    category: "dessert";
-    /**
-     * Amount of calories.
-     * @exclusiveMinimum 0
-     */
-    calories: number;
-} & MenuBaseItem;
-
-export type MenuItem = Beverage | Dessert;
-
-export type MenuItemList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: MenuItem[];
-};
-
-export type Error = {
-    /**
-     * URI reference that identifies the problem type.
-     * @format uri-reference
-     */
-    type: string;
-    /**
-     * Short summary of the problem type.
-     */
-    title: string;
-    /**
-     * HTTP status code generated by the origin server for this occurrence of the problem.
-     * @minimum 100
-     * @exclusiveMaximum 600
-     * @format int32
-     */
-    status: number;
-    /**
-     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-     * May be used to locate the root of this problem in the source code.
-     * @format uri-reference
-     */
-    instance?: string;
-    /**
-     * Additional error details.
-     */
-    details?: Record<string, unknown>;
-};
-
-/**
- * Order status.
- */
-export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
-
-export const OrderStatus = {
-    placed: "placed",
-    preparing: "preparing",
-    completed: "completed",
-    canceled: "canceled"
-} as const;
-
-export type Order = {
-    /**
-     * Order ID. Unique identifier prefixed with `ord_`.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     * @format ulid
-     */
-    readonly id?: string;
-    /**
-     * Entity name.
-     */
-    readonly object?: "order";
-    /**
-     * Name of the customer who placed the order.
-     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-     * @minLength 1
-     * @maxLength 100
-     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-     */
-    customerName: string;
-    readonly status?: OrderStatus;
-    /**
-     * Total order price in cents.
-     * @minimum 0
-     */
-    readonly totalPrice?: number;
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt?: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt?: string;
-    /**
-     * List of items to include in the order.
-     * @minItems 1
-     */
-    orderItems: {
-        /**
-         * ID of the menu item to add to the order.
-         * @format ulid
-         */
-        menuItemId: string;
-        /**
-         * Quantity of the menu item.
-         * @minimum 1
-         */
-        quantity: number;
-        /**
-         * Discount amount in cents (absolute value).
-         * @minimum 0
-         */
-        discount?: number;
-        /**
-         * Optional comment for the order item (e.g., "No sugar").
-         * @maxLength 500
-         */
-        comment?: string;
-    }[];
-};
-
-export type OrderList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: Order[];
-};
-
-export type OrderItem = {
-    /**
-     * ID of the menu item to add to the order.
-     */
-    menuItemId: string;
-    /**
-     * Menu item that is part of the order.
-     */
-    readonly menuItem?: MenuItem;
-    /**
-     * Quantity of the menu item.
-     * @minimum 1
-     */
-    quantity: number;
-    /**
-     * Discount amount in cents (absolute value).
-     * @minimum 0
-     */
-    discount?: number;
-    /**
-     * Optional comment for the order item (e.g., "No sugar").
-     * @maxLength 500
-     */
-    comment?: string;
-};
-
-/**
- * Revenue statistics for a given date range.
- */
-export type RevenueStatistics = {
-    /**
-     * Total revenue in cents from completed orders.
-     * @minimum 0
-     * @format float
-     */
-    revenue: number;
-    /**
-     * Average order amount in cents (calculated from completed orders only).
-     * @minimum 0
-     * @format float
-     */
-    averageOrderAmount: number;
-    /**
-     * Total number of orders (all statuses) in the date range.
-     * @minimum 0
-     */
-    totalOrders: number;
-    /**
-     * Number of placed orders.
-     * @minimum 0
-     */
-    placedOrders: number;
-    /**
-     * Number of preparing orders.
-     * @minimum 0
-     */
-    preparingOrders: number;
-    /**
-     * Number of completed orders.
-     * @minimum 0
-     */
-    completedOrders: number;
-    /**
-     * Number of canceled orders.
-     * @minimum 0
-     */
-    canceledOrders: number;
-    /**
-     * Start date of the revenue calculation period.
-     * @format date
-     */
-    startDate: string;
-    /**
-     * End date of the revenue calculation period.
-     * @format date
-     */
-    endDate: string;
-};
-
-export type RegisterClientObject = {
-    /**
-     * Client name.
-     */
-    name: string;
-    /**
-     * List of redirect URIs (optional, defaults to empty array).
-     */
-    redirectUris?: string[];
-    /**
-     * List of scopes.
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types.
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-/**
- * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
- */
-export type OAuth2Client = {
-    /**
-     * Client identifier issued by the authorization server.
-     */
-    clientId: string;
-    /**
-     * Client secret issued by the authorization server.
-     */
-    clientSecret: string;
-    /**
-     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-     * @format int64
-     */
-    clientIdIssuedAt: number;
-    /**
-     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-     * @format int64
-     */
-    clientSecretExpiresAt: number;
-    /**
-     * Client name (registered metadata).
-     */
-    name?: string;
-    /**
-     * List of redirect URIs (registered metadata).
-     */
-    redirectUris?: string[];
-    /**
-     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
-     * @format uri
-     */
-    registrationClientUri: string;
-    /**
-     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-     */
-    registrationAccessToken: string;
-    /**
-     * List of scopes (registered metadata).
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types (registered metadata).
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-export type OrderNotification = {
-    /**
-     * Unique order identifier.
-     */
-    orderId: string;
-    orderStatus: OrderStatus;
-    /**
-     * When the event occurred.
-     * @format date-time
-     */
-    timestamp: string;
-};
-
-/**
- * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
- */
-export function isBeverage(value: MenuItem): value is Beverage {
-    return (value as Record<string, unknown>)["category"] === "beverage";
-}
-
-/**
- * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
- */
-export function isDessert(value: MenuItem): value is Dessert {
-    return (value as Record<string, unknown>)["category"] === "dessert";
-}
-
-export type ListMenuItemsResult = MenuItemList;
-
-export type ListMenuItemsParams = {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-};
-
-export type ListMenuItemsVariables = {
-    params?: ListMenuItemsParams;
-};
-
-export type CreateMenuItemResult = MenuItem;
-
-export type CreateMenuItemBody = FormData;
-
-export type CreateMenuItemVariables = {
-    body: CreateMenuItemBody;
-};
-
-export type DeleteMenuItemResult = void;
-
-export type DeleteMenuItemVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-};
-
-export type GetMenuItemPhotoResult = Blob | string;
-
-export type GetMenuItemPhotoParams = {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-};
-
-export type GetMenuItemPhotoVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-    params?: GetMenuItemPhotoParams;
-};
-
-export type ListOrdersResult = OrderList;
-
-export type ListOrdersParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-};
-
-export type ListOrdersVariables = {
-    params?: ListOrdersParams;
-};
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    headers?: GetOrderByIdHeaders;
-};
-
-export type DeleteOrderResult = void;
-
-export type DeleteOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-};
-
-export type UpdateOrderResult = Order;
-
-export type UpdateOrderBody = {
-    status: OrderStatus;
-};
-
-export type UpdateOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    body?: UpdateOrderBody;
-};
-
-export type ListOrderItemsResult = OrderItem[];
-
-export type ListOrderItemsParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-};
-
-export type ListOrderItemsVariables = {
-    params?: ListOrderItemsParams;
-};
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    listMenuItems: {
-        args: {
-            params?: ListMenuItemsParams;
-        };
-        result: ListMenuItemsResult;
-    };
-    createMenuItem: {
-        args: {
-            body: CreateMenuItemBody;
-        };
-        result: CreateMenuItemResult;
-    };
-    deleteMenuItem: {
-        args: {
-            /**
-             * ID of the menu item to retrieve.
-             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            menuItemId: string;
-        };
-        result: DeleteMenuItemResult;
-    };
-    getMenuItemPhoto: {
-        args: {
-            /**
-             * ID of the menu item to retrieve.
-             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            menuItemId: string;
-            params?: GetMenuItemPhotoParams;
-        };
-        result: GetMenuItemPhotoResult;
-    };
-    listOrders: {
-        args: {
-            params?: ListOrdersParams;
-        };
-        result: ListOrdersResult;
-    };
-    createOrder: {
-        args: {
-            body: CreateOrderBody;
-        };
-        result: CreateOrderResult;
-    };
-    getOrderById: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-            headers?: GetOrderByIdHeaders;
-        };
-        result: GetOrderByIdResult;
-    };
-    deleteOrder: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-        };
-        result: DeleteOrderResult;
-    };
-    updateOrder: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-            body?: UpdateOrderBody;
-        };
-        result: UpdateOrderResult;
-    };
-    listOrderItems: {
-        args: {
-            params?: ListOrderItemsParams;
-        };
-        result: ListOrderItemsResult;
-    };
-    getRevenue: {
-        args: {
-            params?: GetRevenueParams;
-        };
-        result: GetRevenueResult;
-    };
-    registerOAuth2Client: {
-        args: {
-            body: RegisterOAuth2ClientBody;
-        };
-        result: RegisterOAuth2ClientResult;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
-    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
-    tags: readonly string[];
-}>["tags"][number];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — `@redocly/client-generator`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits `OPERATIONS` literals typed
- * `satisfies Record<string, OperationDescriptor>` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
- * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to `'json'` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
- * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real `ApiError` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call `parseAs` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of `data`/`error` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
- * streams and, for paginated operations, `item` (the page's element type) and — on
- * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
- * iteration unwraps the `Result` envelope the one-shot `result` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: `{}` has no required members, so
- * `{} extends A` is true exactly when every member of `A` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type `.pages()` yields: the RAW page declared by `page` (the generator
- * writes it only on result-mode paginated entries, whose `result` is the envelope),
- * or the method's own `result` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares `item` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
- * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
- * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
- * `onError` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(`Request failed with status ${status}`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
- * `filter=a/b` survives instead of `filter=a%2Fb`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
- * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
- * `deepObject` brackets, and `null`/`undefined` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(`${key}[${subKey}]`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. `%20` (not `+`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-      }
-    } else if (Object(value) === value) {
-      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
-          else params.append(`${key}[${subKey}]`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(`${key}=${encodeReserved(String(value))}`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? `${url}?${qs}` : url;
-}
-
-/**
- * Read the response body per `kind`. `'auto'` negotiates from the content type
- * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom `retryOn` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
- * unless `jitter === false`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/** Resolve a credential: a literal passes through; a function is awaited per request. */
-async function resolveToken(provider: TokenProvider): Promise<string> {
-  return typeof provider === 'function' ? await provider() : provider;
-}
-
-/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
-function encodeBase64(text: string): string {
-  let binary = '';
-  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
-  return btoa(binary);
-}
-
-/** Whether a credential for this scheme is configured on the instance. */
-function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
-  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
-  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
-  return config.auth?.basic !== undefined;
-}
-
-/**
- * Build the auth headers/query for one operation's `security` OR-alternatives from the
- * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * The first alternative whose schemes (an AND-set) are all configured is applied, so
- * "bearer OR apiKey" works with either credential and never sends both. When none is
- * fully configured, the first alternative's configured schemes are still sent (the
- * server rejects the request, mirroring the previous behavior).
- * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
- */
-async function resolveAuth(
-  security: readonly (readonly SecuritySpec[])[],
-  config: ClientConfig
-): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
-  const alternative =
-    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
-    security[0] ??
-    [];
-  const headers: Record<string, string> = {};
-  const query: Record<string, string> = {};
-  const cookies: string[] = [];
-  for (const scheme of alternative) {
-    if (scheme.kind === 'apiKey') {
-      const provider = config.auth?.apiKey?.[scheme.scheme];
-      if (provider === undefined) continue;
-      const value = await resolveToken(provider);
-      if (scheme.in === 'header') headers[scheme.name] = value;
-      else if (scheme.in === 'query') query[scheme.name] = value;
-      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
-      // so the credential can't break the `Cookie` header syntax.
-      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
-    } else if (scheme.kind === 'bearer') {
-      const provider = config.auth?.bearer;
-      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
-    } else {
-      const basic = config.auth?.basic;
-      if (basic !== undefined) {
-        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
-      }
-    }
-  }
-  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
-  return { headers, query };
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * `createClient` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
- * to a plain record — spreading a `Headers` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
- * `onResponse` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * The optional behaviors `createClientCore` can dispatch to but never statically
- * imports. The package's public `createClient` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
- * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
- * are honored, and an omitted `explode` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller `init.headers` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
- * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's `error` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (`errorMode` is fixed at construction — `configure()`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
-    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
-    // basic/apiKey. `apiKey` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: `createClientCore` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
- * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
-}
-
-export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe.redocly.com" });
-
-export const { configure, use } = client;
-export const setBearer = client.auth.bearer;
-export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
-export const listMenuItems = (params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
-export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
-export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
-export const getMenuItemPhoto = (menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
-export const listOrders = (params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
-export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
-export const getOrderById = (orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
-export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
-export const updateOrder = (orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
-export const listOrderItems = (params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
-export const getRevenue = (params: {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
-export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
diff --git a/tests/e2e/generate-client/examples/vendored-edge/.gitignore b/tests/e2e/generate-client/examples/vendored-edge/.gitignore
index 3c3629e647..612acc5cae 100644
--- a/tests/e2e/generate-client/examples/vendored-edge/.gitignore
+++ b/tests/e2e/generate-client/examples/vendored-edge/.gitignore
@@ -1 +1,3 @@
 node_modules
+src/api/
+package-lock.json
diff --git a/tests/e2e/generate-client/examples/vendored-edge/README.md b/tests/e2e/generate-client/examples/vendored-edge/README.md
index a084c6c5c1..76e2de6fe2 100644
--- a/tests/e2e/generate-client/examples/vendored-edge/README.md
+++ b/tests/e2e/generate-client/examples/vendored-edge/README.md
@@ -10,6 +10,7 @@ no npm install, no node_modules at runtime. `worker.ts` is an edge-style handler
 
 ```bash
 npm install         # typescript only — and only to type-check
+npm run generate    # generate src/api (the client is gitignored)
 npm run typecheck
 ```
 
diff --git a/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts b/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
deleted file mode 100644
index fcbbc32010..0000000000
--- a/tests/e2e/generate-client/examples/vendored-edge/src/api/client.ts
+++ /dev/null
@@ -1,1056 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Cafe Menu Upstream (v1.0.0)
- * The upstream API the vendored-edge worker proxies.
- */
-
-export type MenuItem = {
-    /**
-     * Menu item ID.
-     */
-    id: string;
-    /**
-     * Menu item name.
-     */
-    name: string;
-    /**
-     * Price in cents.
-     */
-    price: number;
-};
-
-export type MenuItemList = {
-    items: MenuItem[];
-};
-
-export type ListMenuItemsResult = MenuItemList;
-
-export type ListMenuItemsParams = {
-    /**
-     * Case-insensitive substring match on item names.
-     */
-    search?: string;
-};
-
-export type ListMenuItemsVariables = {
-    params?: ListMenuItemsParams;
-};
-
-export type GetMenuItemPhotoResult = Blob | string;
-
-export type GetMenuItemPhotoParams = {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-};
-
-export type GetMenuItemPhotoVariables = {
-    /**
-     * ID of the menu item.
-     */
-    menuItemId: string;
-    params?: GetMenuItemPhotoParams;
-};
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    listMenuItems: {
-        args: {
-            params?: ListMenuItemsParams;
-        };
-        result: ListMenuItemsResult;
-    };
-    getMenuItemPhoto: {
-        args: {
-            /**
-             * ID of the menu item.
-             */
-            menuItemId: string;
-            params?: GetMenuItemPhotoParams;
-        };
-        result: GetMenuItemPhotoResult;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "search", in: "query" }] },
-    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
-    tags: readonly string[];
-}>["tags"][number];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — `@redocly/client-generator`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits `OPERATIONS` literals typed
- * `satisfies Record<string, OperationDescriptor>` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
- * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to `'json'` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
- * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real `ApiError` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call `parseAs` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of `data`/`error` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
- * streams and, for paginated operations, `item` (the page's element type) and — on
- * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
- * iteration unwraps the `Result` envelope the one-shot `result` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: `{}` has no required members, so
- * `{} extends A` is true exactly when every member of `A` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type `.pages()` yields: the RAW page declared by `page` (the generator
- * writes it only on result-mode paginated entries, whose `result` is the envelope),
- * or the method's own `result` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares `item` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
- * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
- * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
- * `onError` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(`Request failed with status ${status}`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
- * `filter=a/b` survives instead of `filter=a%2Fb`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
- * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
- * `deepObject` brackets, and `null`/`undefined` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(`${key}[${subKey}]`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. `%20` (not `+`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-      }
-    } else if (Object(value) === value) {
-      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
-          else params.append(`${key}[${subKey}]`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(`${key}=${encodeReserved(String(value))}`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? `${url}?${qs}` : url;
-}
-
-/**
- * Read the response body per `kind`. `'auto'` negotiates from the content type
- * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom `retryOn` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
- * unless `jitter === false`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * `createClient` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
- * to a plain record — spreading a `Headers` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
- * `onResponse` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * The optional behaviors `createClientCore` can dispatch to but never statically
- * imports. The package's public `createClient` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
- * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
- * are honored, and an omitted `explode` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller `init.headers` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
- * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's `error` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (`errorMode` is fixed at construction — `configure()`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
-    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
-    // basic/apiKey. `apiKey` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: `createClientCore` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
- * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, {});
-}
-
-export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe.redocly.com" });
-
-export const { configure, use } = client;
-export const listMenuItems = (params: {
-    /**
-     * Case-insensitive substring match on item names.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
-export const getMenuItemPhoto = (menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
diff --git a/tests/e2e/generate-client/examples/zero-install-quickstart/.gitignore b/tests/e2e/generate-client/examples/zero-install-quickstart/.gitignore
index 3c3629e647..d5f19d89b3 100644
--- a/tests/e2e/generate-client/examples/zero-install-quickstart/.gitignore
+++ b/tests/e2e/generate-client/examples/zero-install-quickstart/.gitignore
@@ -1 +1,2 @@
 node_modules
+package-lock.json
diff --git a/tests/e2e/generate-client/examples/zod/.gitignore b/tests/e2e/generate-client/examples/zod/.gitignore
index f06235c460..6eb23affb8 100644
--- a/tests/e2e/generate-client/examples/zod/.gitignore
+++ b/tests/e2e/generate-client/examples/zod/.gitignore
@@ -1,2 +1,4 @@
 node_modules
 dist
+src/api/
+package-lock.json
diff --git a/tests/e2e/generate-client/examples/zod/README.md b/tests/e2e/generate-client/examples/zod/README.md
index 0c61576c5f..bbac00272b 100644
--- a/tests/e2e/generate-client/examples/zod/README.md
+++ b/tests/e2e/generate-client/examples/zod/README.md
@@ -8,9 +8,8 @@ against the generated schemas on every call — and also uses a schema directly.
 
 ```bash
 npm install
-npm run generate   # regenerate src/api from openapi.yaml (optional; client is checked in)
+npm run generate   # generate src/api (the client is gitignored)
 npm run dev        # open the printed local URL
 ```
 
-The generated client + zod schemas under `src/api/` are committed and drift-checked against the
-generator in CI.
+The generated client + zod schemas under `src/api/` are gitignored; CI regenerates them and type-checks this example.
diff --git a/tests/e2e/generate-client/examples/zod/openapi.yaml b/tests/e2e/generate-client/examples/zod/openapi.yaml
deleted file mode 100644
index a255b72a20..0000000000
--- a/tests/e2e/generate-client/examples/zod/openapi.yaml
+++ /dev/null
@@ -1,1163 +0,0 @@
-openapi: 3.2.0
-info:
-  title: Redocly Cafe
-  description: |
-    Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
-    Create API credentials and try it yourself in a realistic OpenAPI workflow.
-  version: 1.0.0
-  contact:
-    email: team@redocly.com
-    url: https://redocly.com/contact-us/
-  license:
-    name: MIT
-    url: https://opensource.org/licenses/MIT
-  termsOfService: https://redocly.com/subscription-agreement
-servers:
-  - url: https://api.cafe.redocly.com
-    description: Live server.
-tags:
-  - name: Authorization
-    description: Create a client to demo the API.
-  - name: Products
-    description: Operations related to products.
-  - name: Orders
-    description: Order management operations.
-  - name: Statistics
-    description: Statistics operations.
-paths:
-  /menu:
-    get:
-      tags:
-        - Products
-      summary: List all menu items
-      description: Retrieve a collection of menu items with optional filtering and pagination.
-      operationId: listMenuItems
-      security: []
-      parameters:
-        - $ref: '#/components/parameters/After'
-        - $ref: '#/components/parameters/Before'
-        - $ref: '#/components/parameters/Sort'
-        - $ref: '#/components/parameters/Filter'
-        - $ref: '#/components/parameters/Search'
-        - $ref: '#/components/parameters/Limit'
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/MenuItemList'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    post:
-      tags:
-        - Products
-      summary: Create menu item
-      description: Create a new menu item.
-      operationId: createMenuItem
-      security:
-        - OAuth2:
-            - menu:write
-      requestBody:
-        required: true
-        content:
-          multipart/form-data:
-            schema:
-              $ref: '#/components/schemas/MenuItem'
-      responses:
-        '201':
-          description: Menu item created successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/MenuItem'
-              examples:
-                MenuItemResponse:
-                  value:
-                    id: prd_01khr487f7qm7p44xn427m43vb
-                    object: menuItem
-                    name: coffee
-                    price: 4000
-                    category: beverage
-                    createdAt: '2026-02-18T10:20:38.228Z'
-                    updatedAt: '2026-02-18T10:20:38.228Z'
-                    volume: 600
-                    containsCaffeine: false
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '409':
-          $ref: '#/components/responses/Conflict'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /menu/{menuItemId}:
-    parameters:
-      - $ref: '#/components/parameters/MenuItemId'
-    delete:
-      tags:
-        - Products
-      summary: Delete a menu item
-      description: Delete an existing menu item.
-      operationId: deleteMenuItem
-      security:
-        - OAuth2:
-            - menu:write
-      responses:
-        '204':
-          description: Menu item deleted successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /menu-item-images/{menuItemId}:
-    parameters:
-      - $ref: '#/components/parameters/MenuItemId'
-    get:
-      operationId: getMenuItemPhoto
-      summary: Retrieve a menu item photo
-      description: Retrieve the product photo image for a specific menu item.
-      security: []
-      tags:
-        - Products
-      parameters:
-        - $ref: '#/components/parameters/PhotoSize'
-      responses:
-        '200':
-          description: Menu item photo retrieved successfully.
-          content:
-            image/png:
-              schema:
-                type: string
-                format: binary
-            text/plain:
-              schema:
-                description: Alternative image text.
-                type: string
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /orders:
-    get:
-      tags:
-        - Orders
-      summary: List all orders
-      description: Retrieve a collection of orders with optional filtering and pagination.
-      operationId: listOrders
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/Filter'
-        - $ref: '#/components/parameters/Sort'
-        - $ref: '#/components/parameters/Limit'
-        - $ref: '#/components/parameters/After'
-        - $ref: '#/components/parameters/Before'
-        - $ref: '#/components/parameters/Search'
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/OrderList'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    post:
-      tags:
-        - Orders
-      summary: Create order
-      description: |
-        Create a new order.
-        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
-      operationId: createOrder
-      security:
-        - OAuth2:
-            - orders:write
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/Order'
-            examples:
-              OrderRequest:
-                dataValue:
-                  customerName: Mary Ann
-                  orderItems:
-                    - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                      quantity: 2
-                      comment: No sugar!
-                      discount: 0
-      responses:
-        '201':
-          description: Order placed successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: placed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /orders/{orderId}:
-    get:
-      tags:
-        - Orders
-      summary: Retrieve an order
-      description: Retrieve a single order by its ID.
-      operationId: getOrderById
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-        - name: X-Request-Id
-          in: header
-          required: false
-          description: |
-            Optional client-supplied correlation ID, echoed in logs and traces.
-          schema:
-            type: string
-            format: uuid
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: placed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    patch:
-      tags:
-        - Orders
-      summary: Partially update an order
-      description: |
-        Update an existing order status.
-        Order items cannot be changed - if they need to be updated, the order should be canceled and a new one placed.
-      operationId: updateOrder
-      security:
-        - OAuth2:
-            - orders:write
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-      requestBody:
-        content:
-          application/json:
-            schema:
-              type: object
-              description: |
-                Partial order update using JSON Merge Patch - only include fields to update.
-              properties:
-                status:
-                  $ref: '#/components/schemas/OrderStatus'
-              required:
-                - status
-      responses:
-        '200':
-          description: Order updated successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Order'
-              examples:
-                OrderResponse:
-                  dataValue:
-                    id: ord_01h1s5z6vf2mm1mz3hevnn9va7
-                    customerName: Mary Ann
-                    orderItems:
-                      - menuItemId: prd_01h1s5z6vf2mm1mz3hevnn9va7
-                        quantity: 2
-                        comment: No sugar!
-                        discount: 0
-                    object: order
-                    status: completed
-                    totalPrice: 200
-                    createdAt: '2026-08-24T14:15:22Z'
-                    updatedAt: '2026-08-24T14:15:22Z'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-    delete:
-      tags:
-        - Orders
-      summary: Delete an order
-      description: |
-        Delete the order.
-        To keep the order history, the order should be canceled instead of deleted.
-      operationId: deleteOrder
-      security:
-        - OAuth2:
-            - orders:write
-      parameters:
-        - $ref: '#/components/parameters/OrderId'
-      responses:
-        '204':
-          description: Order deleted successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /order-items:
-    get:
-      tags:
-        - Orders
-      summary: List all order items with menu item details
-      description: |
-        Returns an array of order items for a specific order.
-        Use the `filter` parameter to filter by order ID.
-      operationId: listOrderItems
-      security:
-        - OAuth2:
-            - orders:read
-      parameters:
-        - $ref: '#/components/parameters/Filter'
-          required: true
-      responses:
-        '200':
-          description: Successful operation.
-          content:
-            application/json:
-              schema:
-                type: array
-                description: List of menu items that are part of the order.
-                items:
-                  $ref: '#/components/schemas/OrderItem'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '404':
-          $ref: '#/components/responses/NotFound'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /revenue:
-    get:
-      tags:
-        - Statistics
-      summary: Get revenue statistics
-      description: |
-        Retrieve revenue statistics for a configurable date range.
-        Returns revenue, order counts, average order amount, and other useful statistics.
-      operationId: getRevenue
-      security:
-        - ApiKey: []
-      parameters:
-        - name: startDate
-          in: query
-          required: false
-          description: |
-            Start date for the revenue calculation period (ISO 8601 datetime format).
-            Defaults to 30 days ago if not provided.
-          schema:
-            type: string
-            format: date
-          example: '2026-01-01'
-        - name: endDate
-          in: query
-          required: false
-          description: |
-            End date for the revenue calculation period (ISO 8601 datetime format).
-            Defaults to current time if not provided.
-          schema:
-            type: string
-            format: date
-          example: '2026-01-31'
-      responses:
-        '200':
-          description: Revenue statistics retrieved successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RevenueStatistics'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '403':
-          $ref: '#/components/responses/Forbidden'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-  /oauth2/register:
-    post:
-      tags:
-        - Authorization
-      summary: Create OAuth2 client
-      description: |
-        Register a new OAuth2 client for dynamic client registration.  This endpoint implements the Dynamic Client Registration Protocol (RFC 7591), using camelCase field names instead of the RFC's snake_case convention (e.g., `redirectUris` instead of `redirect_uris`, `grantTypes` instead of `grant_types`). The `name` field is required. Other fields are optional. If not provided:
-        - `redirectUris` defaults to an empty array. Note: When using the `authorization_code` grant type, 
-          `redirectUris` must be provided (per RFC 7591 Section 2).
-        - `scopes` defaults to all available scopes (menu:read, menu:write, orders:read, orders:write) - `grantTypes` defaults to both supported grant types (authorization_code, client_credentials)
-        Returns the registered client information per RFC 7591, including:
-        - `clientId` and `clientSecret` (must be stored securely) - `clientIdIssuedAt` and `clientSecretExpiresAt` timestamps - All registered client metadata (name, redirectUris, scopes, grantTypes)
-      operationId: registerOAuth2Client
-      security: []
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/RegisterClientObject'
-      responses:
-        '201':
-          description: OAuth2 client registered successfully.
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/OAuth2Client'
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '401':
-          $ref: '#/components/responses/Unauthorized'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-webhooks:
-  order-notification:
-    post:
-      tags:
-        - Orders
-      operationId: orderNotificationWebhook
-      security: []
-      summary: Order notification webhook
-      description: Webhook triggered when a new order is placed.
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/OrderNotification'
-      responses:
-        '200':
-          description: Webhook received successfully.
-        '400':
-          $ref: '#/components/responses/BadRequest'
-        '500':
-          $ref: '#/components/responses/InternalServerError'
-components:
-  securitySchemes:
-    OAuth2:
-      type: oauth2
-      description: OAuth2 authorization for API access.
-      flows:
-        authorizationCode:
-          authorizationUrl: https://api.cafe.redocly.com/oauth2/authorize
-          tokenUrl: https://api.cafe.redocly.com/oauth2/token
-          scopes:
-            menu:read: Read access to menu items and images
-            menu:write: Write access to menu items (create, delete)
-            orders:read: Read access to orders
-            orders:write: Write access to orders (create, update, delete)
-        clientCredentials:
-          tokenUrl: https://api.cafe.redocly.com/oauth2/token
-          scopes:
-            menu:read: Read access to menu items and images
-            menu:write: Write access to menu items (create, delete)
-            orders:read: Read access to orders
-            orders:write: Write access to orders (create, update, delete)
-    ApiKey:
-      type: apiKey
-      name: X-API-Key
-      in: header
-      description: API key for internal operations.
-  parameters:
-    After:
-      name: after
-      in: query
-      required: false
-      description: Use the `endCursor` as a value for the `after` parameter to get the next page.
-      schema:
-        type: string
-      example: a25fgaksjf23la==
-    Before:
-      name: before
-      in: query
-      required: false
-      description: |
-        Use the `startCursor` as a value for the `before` parameter to get the next page.
-      schema:
-        type: string
-      example: bfg23aksjf23zb1==
-    Sort:
-      name: sort
-      description: |-
-        To sort by id in descending order use `-id`.
-        To sort by id in ascending order use `id`.
-      in: query
-      required: false
-      schema:
-        type: string
-      example: '-name'
-    Filter:
-      name: filter
-      description: |-
-        Filters the collection items using space-separated `field:value` pairs.
-
-        **Format:** `field1:value1 field2:value2`
-
-        **Supported operators:**
-        - `field:value` - Exact match
-        - `field:value1,value2` - Match any of the comma-separated values (OR)
-        - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-
-        **Examples:**
-        - `status:placed` - Filter by single status.
-        - `status:placed,completed` - Filter by multiple statuses.
-        - `createdAt:30d` - Filter orders created in the last 30 days.
-        - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-        - `status:placed createdAt:7d` - Combine multiple filters.
-      in: query
-      required: false
-      schema:
-        type: string
-      example: orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7
-    Search:
-      name: search
-      in: query
-      description: |-
-        Performs a case-insensitive text search across relevant fields in the collection.
-
-        **Fields searched depend on the endpoint:**
-        - **Menu items:** `name`, `photoTextDescription`
-        - **Orders:** `customerName`, `id`
-
-        Returns items where any of the searchable fields contain the search term as a substring.
-      required: false
-      schema:
-        type: string
-      example: coffee
-    Limit:
-      name: limit
-      description: |
-        Use to return a number of results per page.
-        If there is more data, use in combination with `after` to page through the data.
-      in: query
-      required: false
-      schema:
-        type: integer
-        minimum: 1
-        maximum: 100
-        default: 10
-      example: 10
-    MenuItemId:
-      name: menuItemId
-      in: path
-      description: ID of the menu item to retrieve.
-      required: true
-      schema:
-        type: string
-        pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-      example: prd_01h1s5z6vf2mm1mz3hevnn9va7
-    PhotoSize:
-      name: photoSize
-      in: query
-      description: Photo size to retrieve.
-      required: false
-      schema:
-        type: string
-        enum:
-          - thumbnail
-          - medium
-          - large
-        default: medium
-    OrderId:
-      name: orderId
-      in: path
-      description: ID of the order to retrieve.
-      required: true
-      schema:
-        type: string
-        pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-      example: ord_01h1s5z6vf2mm1mz3hevnn9va7
-  schemas:
-    Page:
-      type: object
-      properties:
-        endCursor:
-          type:
-            - string
-            - 'null'
-          description: |-
-            Use with the `after` query parameter to load the next page of data.
-            When `null`, there is no data.
-            The cursor is opaque and internal structure is subject to change.
-        startCursor:
-          type:
-            - string
-            - 'null'
-          description: |-
-            Use with the `before` query parameter to load the previous page of data.
-            When `null`, there is no data.
-            The cursor is opaque and internal structure is subject to change.
-        hasNextPage:
-          type: boolean
-          description: Indicates if there is a next page with items.
-        hasPrevPage:
-          type: boolean
-          description: Indicates if there is a previous page with items.
-        limit:
-          type: integer
-          minimum: 1
-          maximum: 100
-          default: 10
-          description: Value showing how many items are in the page limit.
-        total:
-          type: integer
-          description: Count of items across all pages.
-          minimum: 0
-      required:
-        - endCursor
-        - startCursor
-        - hasNextPage
-        - hasPrevPage
-        - limit
-        - total
-    MenuBaseItem:
-      type: object
-      properties:
-        createdAt:
-          description: Created date.
-          type: string
-          format: date-time
-          readOnly: true
-        updatedAt:
-          description: Updated date.
-          type: string
-          format: date-time
-          readOnly: true
-        id:
-          description: Menu item ID. Unique identifier prefixed with `prd_`.
-          type: string
-          readOnly: true
-          pattern: ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-          example: prd_01h1s5z6vf2mm1mz3hevnn9va7
-        object:
-          description: Entity name.
-          type: string
-          const: menuItem
-          readOnly: true
-        name:
-          description: Menu item name.
-          type: string
-          minLength: 1
-          maxLength: 50
-        price:
-          description: Price in cents.
-          type: integer
-          minimum: 0
-        photo:
-          writeOnly: true
-          type:
-            - string
-            - 'null'
-          format: binary
-          description: Photo of the menu item. Must be a PNG image and less than 1MB.
-        photoUrl:
-          readOnly: true
-          type: string
-          format: uri
-          description: Photo URL of the menu item.
-        photoTextDescription:
-          type:
-            - string
-            - 'null'
-      required:
-        - id
-        - name
-        - price
-        - createdAt
-        - updatedAt
-        - object
-    Beverage:
-      allOf:
-        - type: object
-          properties:
-            category:
-              description: Menu item category.
-              type: string
-              const: beverage
-            volume:
-              type: number
-              description: Size of the beverage in milliliters.
-              exclusiveMinimum: 0
-            containsCaffeine:
-              type: boolean
-              description: Indicates if the beverage contains caffeine.
-          required:
-            - category
-            - volume
-            - containsCaffeine
-        - $ref: '#/components/schemas/MenuBaseItem'
-    Dessert:
-      allOf:
-        - type: object
-          properties:
-            category:
-              description: Menu item category.
-              type: string
-              const: dessert
-            calories:
-              type: number
-              exclusiveMinimum: 0
-              description: Amount of calories.
-          required:
-            - category
-            - calories
-        - $ref: '#/components/schemas/MenuBaseItem'
-    MenuItem:
-      discriminator:
-        propertyName: category
-        mapping:
-          beverage: '#/components/schemas/Beverage'
-          dessert: '#/components/schemas/Dessert'
-      oneOf:
-        - $ref: '#/components/schemas/Beverage'
-        - $ref: '#/components/schemas/Dessert'
-      required:
-        - category
-    MenuItemList:
-      type: object
-      properties:
-        object:
-          type: string
-          const: list
-          description: Entity name.
-        page:
-          $ref: '#/components/schemas/Page'
-        items:
-          type: array
-          items:
-            $ref: '#/components/schemas/MenuItem'
-      required:
-        - object
-        - page
-        - items
-    Error:
-      type: object
-      properties:
-        type:
-          type: string
-          format: uri-reference
-          description: URI reference that identifies the problem type.
-          default: about:blank
-        title:
-          type: string
-          description: Short summary of the problem type.
-        status:
-          type: integer
-          format: int32
-          description: |
-            HTTP status code generated by the origin server for this occurrence of the problem.
-          minimum: 100
-          exclusiveMaximum: 600
-        instance:
-          type: string
-          format: uri-reference
-          description: |
-            URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-            May be used to locate the root of this problem in the source code.
-          example: /some/uri-reference#specific-occurrence-context
-        details:
-          description: Additional error details.
-          type: object
-          additionalProperties: true
-      required:
-        - type
-        - title
-        - status
-    OrderStatus:
-      type: string
-      description: Order status.
-      enum:
-        - placed
-        - preparing
-        - completed
-        - canceled
-    Order:
-      type: object
-      title: Order
-      properties:
-        id:
-          description: Order ID. Unique identifier prefixed with `ord_`.
-          type: string
-          format: ulid
-          readOnly: true
-          pattern: ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-          example: ord_01h1s5z6vf2mm1mz3hevnn9va7
-        object:
-          description: Entity name.
-          type: string
-          const: order
-          readOnly: true
-        customerName:
-          description: |
-            Name of the customer who placed the order.
-            Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-          type: string
-          pattern: ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-          minLength: 1
-          maxLength: 100
-        status:
-          allOf:
-            - $ref: '#/components/schemas/OrderStatus'
-          readOnly: true
-        totalPrice:
-          description: Total order price in cents.
-          type: integer
-          minimum: 0
-          readOnly: true
-        createdAt:
-          description: Created date.
-          type: string
-          format: date-time
-          readOnly: true
-        updatedAt:
-          description: Updated date.
-          type: string
-          format: date-time
-          readOnly: true
-        orderItems:
-          type: array
-          description: List of items to include in the order.
-          minItems: 1
-          items:
-            type: object
-            properties:
-              menuItemId:
-                type: string
-                format: ulid
-                description: ID of the menu item to add to the order.
-              quantity:
-                type: integer
-                minimum: 1
-                description: Quantity of the menu item.
-              discount:
-                type: integer
-                minimum: 0
-                description: Discount amount in cents (absolute value).
-                default: 0
-              comment:
-                type: string
-                maxLength: 500
-                description: Optional comment for the order item (e.g., "No sugar").
-            required:
-              - menuItemId
-              - quantity
-      required:
-        - customerName
-        - orderItems
-    OrderList:
-      type: object
-      properties:
-        object:
-          type: string
-          const: list
-          description: Entity name.
-        page:
-          $ref: '#/components/schemas/Page'
-        items:
-          type: array
-          items:
-            $ref: '#/components/schemas/Order'
-      required:
-        - object
-        - page
-        - items
-    OrderItem:
-      type: object
-      properties:
-        menuItemId:
-          type: string
-          description: ID of the menu item to add to the order.
-          writeOnly: true
-        menuItem:
-          allOf:
-            - $ref: '#/components/schemas/MenuItem'
-          description: Menu item that is part of the order.
-          readOnly: true
-        quantity:
-          type: integer
-          minimum: 1
-          description: Quantity of the menu item.
-        discount:
-          type: integer
-          minimum: 0
-          description: Discount amount in cents (absolute value).
-          default: 0
-        comment:
-          type: string
-          maxLength: 500
-          description: Optional comment for the order item (e.g., "No sugar").
-      required:
-        - menuItemId
-        - quantity
-    RevenueStatistics:
-      type: object
-      description: Revenue statistics for a given date range.
-      properties:
-        revenue:
-          type: number
-          format: float
-          description: Total revenue in cents from completed orders.
-          minimum: 0
-        averageOrderAmount:
-          type: number
-          format: float
-          description: Average order amount in cents (calculated from completed orders only).
-          minimum: 0
-        totalOrders:
-          type: integer
-          description: Total number of orders (all statuses) in the date range.
-          minimum: 0
-        placedOrders:
-          type: integer
-          description: Number of placed orders.
-          minimum: 0
-        preparingOrders:
-          type: integer
-          description: Number of preparing orders.
-          minimum: 0
-        completedOrders:
-          type: integer
-          description: Number of completed orders.
-          minimum: 0
-        canceledOrders:
-          type: integer
-          description: Number of canceled orders.
-          minimum: 0
-        startDate:
-          type: string
-          format: date
-          description: Start date of the revenue calculation period.
-        endDate:
-          type: string
-          format: date
-          description: End date of the revenue calculation period.
-      required:
-        - revenue
-        - averageOrderAmount
-        - totalOrders
-        - placedOrders
-        - preparingOrders
-        - completedOrders
-        - canceledOrders
-        - startDate
-        - endDate
-    RegisterClientObject:
-      type: object
-      properties:
-        name:
-          type: string
-          description: Client name.
-        redirectUris:
-          type: array
-          items:
-            type: string
-            format: uri
-          description: List of redirect URIs (optional, defaults to empty array).
-        scopes:
-          type: array
-          items:
-            type: string
-            enum:
-              - menu:read
-              - menu:write
-              - orders:read
-              - orders:write
-          description: List of scopes.
-        grantTypes:
-          type: array
-          items:
-            type: string
-            enum:
-              - authorization_code
-              - client_credentials
-          description: List of grant types.
-      required:
-        - name
-    OAuth2Client:
-      type: object
-      description: OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
-      properties:
-        clientId:
-          type: string
-          description: Client identifier issued by the authorization server.
-        clientSecret:
-          type: string
-          description: Client secret issued by the authorization server.
-        clientIdIssuedAt:
-          type: integer
-          format: int64
-          description: Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-        clientSecretExpiresAt:
-          type: integer
-          format: int64
-          description: Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-        name:
-          type: string
-          description: Client name (registered metadata).
-        redirectUris:
-          type: array
-          items:
-            type: string
-            format: uri
-          description: List of redirect URIs (registered metadata).
-        registrationClientUri:
-          type: string
-          format: uri
-          description: URL of the client configuration endpoint for managing this client registration (RFC 7592).
-        registrationAccessToken:
-          type: string
-          description: Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-        scopes:
-          type: array
-          items:
-            type: string
-            enum:
-              - menu:read
-              - menu:write
-              - orders:read
-              - orders:write
-          description: List of scopes (registered metadata).
-        grantTypes:
-          type: array
-          items:
-            type: string
-            enum:
-              - authorization_code
-              - client_credentials
-          description: List of grant types (registered metadata).
-      required:
-        - clientId
-        - clientSecret
-        - clientIdIssuedAt
-        - clientSecretExpiresAt
-        - registrationClientUri
-        - registrationAccessToken
-    OrderNotification:
-      type: object
-      required:
-        - orderId
-        - orderStatus
-        - timestamp
-      properties:
-        orderId:
-          type: string
-          description: Unique order identifier.
-        orderStatus:
-          $ref: '#/components/schemas/OrderStatus'
-        timestamp:
-          type: string
-          format: date-time
-          description: When the event occurred.
-  responses:
-    BadRequest:
-      description: Bad request - invalid input parameters.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    InternalServerError:
-      description: Internal server error.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Unauthorized:
-      description: Unauthorized - authorization required.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Forbidden:
-      description: Forbidden - insufficient permissions.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    Conflict:
-      description: Conflict - entity already exists.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
-    NotFound:
-      description: Resource not found.
-      content:
-        application/problem+json:
-          schema:
-            $ref: '#/components/schemas/Error'
diff --git a/tests/e2e/generate-client/examples/zod/package-lock.json b/tests/e2e/generate-client/examples/zod/package-lock.json
deleted file mode 100644
index 00b943dae3..0000000000
--- a/tests/e2e/generate-client/examples/zod/package-lock.json
+++ /dev/null
@@ -1,3515 +0,0 @@
-{
-  "name": "@redocly-examples/zod",
-  "version": "0.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@redocly-examples/zod",
-      "version": "0.0.0",
-      "devDependencies": {
-        "@redocly/cli": "2.31.4-local-06-22",
-        "typescript": "^5.5.0",
-        "vite": "^5.4.0",
-        "zod": "^4.0.0"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/code-frame/-/code-frame-7.29.7.tgz",
-      "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.29.7",
-        "js-tokens": "^4.0.0",
-        "picocolors": "^1.1.1"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz",
-      "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/runtime": {
-      "version": "7.29.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@babel/runtime/-/runtime-7.29.7.tgz",
-      "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@emotion/is-prop-valid": {
-      "version": "1.4.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@emotion/is-prop-valid/-/is-prop-valid-1.4.0.tgz",
-      "integrity": "sha512-QgD4fyscGcbbKwJmqNvUMSE02OsHUa+lAWKdEUIJKgqe5IwRSKd7+KhibEWdaKwgjLj0DRSHA9biAIqGBk05lw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@emotion/memoize": "^0.9.0"
-      }
-    },
-    "node_modules/@emotion/memoize": {
-      "version": "0.9.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@emotion/memoize/-/memoize-0.9.0.tgz",
-      "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-      "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-      "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-      "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-      "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-      "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-      "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-      "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-      "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-      "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-      "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-      "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-      "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-      "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-      "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-      "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-      "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-      "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-      "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-      "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-      "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-      "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@exodus/schemasafe": {
-      "version": "1.3.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@exodus/schemasafe/-/schemasafe-1.3.0.tgz",
-      "integrity": "sha512-5Aap/GaRupgNx/feGBwLLTVv8OQFfv3pq2lPRzPg9R+IOBnDgghTGW7l7EuVXOvg5cc/xSAlRW8rBrjIC3Nvqw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@faker-js/faker": {
-      "version": "7.6.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@faker-js/faker/-/faker-7.6.0.tgz",
-      "integrity": "sha512-XK6BTq1NDMo9Xqw/YkYyGjSsg44fbNwYRx7QK2CuoQgyy+f1rrTDHoExVM5PsyXCtfl2vs2vVJ0MN0yN6LppRw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.0.0",
-        "npm": ">=6.0.0"
-      }
-    },
-    "node_modules/@humanwhocodes/momoa": {
-      "version": "2.0.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@humanwhocodes/momoa/-/momoa-2.0.4.tgz",
-      "integrity": "sha512-RE815I4arJFtt+FVeU1Tgp9/Xvecacji8w/V6XtXsWWH/wz/eNkNbhb+ny/+PlVZjV0rxQpRSQKNKE3lcktHEA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=10.10.0"
-      }
-    },
-    "node_modules/@noble/hashes": {
-      "version": "1.8.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@noble/hashes/-/hashes-1.8.0.tgz",
-      "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^14.21.3 || >=16"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/@nodable/entities": {
-      "version": "2.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@nodable/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-9uGyhaQavEUMC8AIddIjau4NsnsXhou+j5sBAGojCM1oxmQpVKTWR/9JxABD6UAv12vpIms55fPZKFQEhG6uBg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/nodable"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/@opentelemetry/api": {
-      "version": "1.9.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/api/-/api-1.9.1.tgz",
-      "integrity": "sha512-gLyJlPHPZYdAk1JENA9LeHejZe1Ti77/pTeFm/nMXmQH/HFZlcS/O2XJB+L8fkbrNSqhdtlvjBVjxwUYanNH5Q==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@opentelemetry/api-logs": {
-      "version": "0.214.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/api-logs/-/api-logs-0.214.0.tgz",
-      "integrity": "sha512-40lSJeqYO8Uz2Yj7u94/SJWE/wONa7rmMKjI1ZcIjgf3MHNHv1OZUCrCETGuaRF62d5pQD1wKIW+L4lmSMTzZA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/@opentelemetry/context-async-hooks": {
-      "version": "2.6.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/context-async-hooks/-/context-async-hooks-2.6.1.tgz",
-      "integrity": "sha512-XHzhwRNkBpeP8Fs/qjGrAf9r9PRv67wkJQ/7ZPaBQQ68DYlTBBx5MF9LvPx7mhuXcDessKK2b+DcxqwpgkcivQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.0.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/core": {
-      "version": "2.6.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/core/-/core-2.6.1.tgz",
-      "integrity": "sha512-8xHSGWpJP9wBxgBpnqGL0R3PbdWQndL1Qp50qrg71+B28zK5OQmUgcDKLJgzyAAV38t4tOyLMGDD60LneR5W8g==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/semantic-conventions": "^1.29.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.0.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/exporter-trace-otlp-http": {
-      "version": "0.214.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.214.0.tgz",
-      "integrity": "sha512-kIN8nTBMgV2hXzV/a20BCFilPZdAIMYYJGSgfMMRm/Xa+07y5hRDS2Vm12A/z8Cdu3Sq++ZvJfElokX2rkgGgw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/core": "2.6.1",
-        "@opentelemetry/otlp-exporter-base": "0.214.0",
-        "@opentelemetry/otlp-transformer": "0.214.0",
-        "@opentelemetry/resources": "2.6.1",
-        "@opentelemetry/sdk-trace-base": "2.6.1"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      }
-    },
-    "node_modules/@opentelemetry/otlp-exporter-base": {
-      "version": "0.214.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.214.0.tgz",
-      "integrity": "sha512-u1Gdv0/E9wP+apqWf7Wv2npXmgJtxsW2XL0TEv9FZloTZRuMBKmu8cYVXwS4Hm3q/f/3FuCnPTgiwYvIqRSpRg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/core": "2.6.1",
-        "@opentelemetry/otlp-transformer": "0.214.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      }
-    },
-    "node_modules/@opentelemetry/otlp-transformer": {
-      "version": "0.214.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/otlp-transformer/-/otlp-transformer-0.214.0.tgz",
-      "integrity": "sha512-DSaYcuBRh6uozfsWN3R8HsN0yDhCuWP7tOFdkUOVaWD1KVJg8m4qiLUsg/tNhTLS9HUYUcwNpwL2eroLtsZZ/w==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/api-logs": "0.214.0",
-        "@opentelemetry/core": "2.6.1",
-        "@opentelemetry/resources": "2.6.1",
-        "@opentelemetry/sdk-logs": "0.214.0",
-        "@opentelemetry/sdk-metrics": "2.6.1",
-        "@opentelemetry/sdk-trace-base": "2.6.1",
-        "protobufjs": "^7.0.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": "^1.3.0"
-      }
-    },
-    "node_modules/@opentelemetry/resources": {
-      "version": "2.6.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/resources/-/resources-2.6.1.tgz",
-      "integrity": "sha512-lID/vxSuKWXM55XhAKNoYXu9Cutoq5hFdkbTdI/zDKQktXzcWBVhNsOkiZFTMU9UtEWuGRNe0HUgmsFldIdxVA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/core": "2.6.1",
-        "@opentelemetry/semantic-conventions": "^1.29.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.3.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/sdk-logs": {
-      "version": "0.214.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/sdk-logs/-/sdk-logs-0.214.0.tgz",
-      "integrity": "sha512-zf6acnScjhsaBUU22zXZ/sLWim1dfhUAbGXdMmHmNG3LfBnQ3DKsOCITb2IZwoUsNNMTogqFKBnlIPPftUgGwA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/api-logs": "0.214.0",
-        "@opentelemetry/core": "2.6.1",
-        "@opentelemetry/resources": "2.6.1",
-        "@opentelemetry/semantic-conventions": "^1.29.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.4.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/sdk-metrics": {
-      "version": "2.6.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/sdk-metrics/-/sdk-metrics-2.6.1.tgz",
-      "integrity": "sha512-9t9hJHX15meBy2NmTJxL+NJfXmnausR2xUDvE19XQce0Qi/GBtDGamU8nS1RMbdgDmhgpm3VaOu2+fiS/SfTpQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/core": "2.6.1",
-        "@opentelemetry/resources": "2.6.1"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.9.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/sdk-trace-base": {
-      "version": "2.6.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.6.1.tgz",
-      "integrity": "sha512-r86ut4T1e8vNwB35CqCcKd45yzqH6/6Wzvpk2/cZB8PsPLlZFTvrh8yfOS3CYZYcUmAx4hHTZJ8AO8Dj8nrdhw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/core": "2.6.1",
-        "@opentelemetry/resources": "2.6.1",
-        "@opentelemetry/semantic-conventions": "^1.29.0"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.3.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/sdk-trace-node": {
-      "version": "2.6.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/sdk-trace-node/-/sdk-trace-node-2.6.1.tgz",
-      "integrity": "sha512-Hh2i4FwHWRFhnO2Q/p6svMxy8MPsNCG0uuzUY3glqm0rwM0nQvbTO1dXSp9OqQoTKXcQzaz9q1f65fsurmOhNw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@opentelemetry/context-async-hooks": "2.6.1",
-        "@opentelemetry/core": "2.6.1",
-        "@opentelemetry/sdk-trace-base": "2.6.1"
-      },
-      "engines": {
-        "node": "^18.19.0 || >=20.6.0"
-      },
-      "peerDependencies": {
-        "@opentelemetry/api": ">=1.0.0 <1.10.0"
-      }
-    },
-    "node_modules/@opentelemetry/semantic-conventions": {
-      "version": "1.40.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@opentelemetry/semantic-conventions/-/semantic-conventions-1.40.0.tgz",
-      "integrity": "sha512-cifvXDhcqMwwTlTK04GBNeIe7yyo28Mfby85QXFe1Yk8nmi36Ab/5UQwptOx84SsoGNRg+EVSjwzfSZMy6pmlw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/@protobufjs/aspromise": {
-      "version": "1.1.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
-      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/base64": {
-      "version": "1.1.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/base64/-/base64-1.1.2.tgz",
-      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/codegen": {
-      "version": "2.0.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/codegen/-/codegen-2.0.5.tgz",
-      "integrity": "sha512-zgXFLzW3Ap33e6d0Wlj4MGIm6Ce8O89n/apUaGNB/jx+hw+ruWEp7EwGUshdLKVRCxZW12fp9r40E1mQrf/34g==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/eventemitter": {
-      "version": "1.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/eventemitter/-/eventemitter-1.1.1.tgz",
-      "integrity": "sha512-vW1GmwMZNnL+gMRaovlh9yZX74kc+TTU3FObkkurpMaRtBfLP3ldjS9KQWlwZgraRE0+dheEEoAxdzcJQ8eXZg==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/fetch": {
-      "version": "1.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/fetch/-/fetch-1.1.1.tgz",
-      "integrity": "sha512-GpptLrs57adMSuHi3VNj0mAF8dwh36LMaYF6XyJ6JMWlVsc+t42tm1HSEDmOs3A8fC9yyeisgLhsTVQokOZ0zw==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@protobufjs/aspromise": "^1.1.1"
-      }
-    },
-    "node_modules/@protobufjs/float": {
-      "version": "1.0.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/float/-/float-1.0.2.tgz",
-      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/path": {
-      "version": "1.1.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/path/-/path-1.1.2.tgz",
-      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/pool": {
-      "version": "1.1.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/pool/-/pool-1.1.0.tgz",
-      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@protobufjs/utf8": {
-      "version": "1.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@protobufjs/utf8/-/utf8-1.1.1.tgz",
-      "integrity": "sha512-oOAWABowe8EAbMyWKM0tYDKi8Yaox52D+HWZhAIJqQXbqe0xI/GV7FhLWqlEKreMkfDjshR5FKgi3mnle0h6Eg==",
-      "dev": true,
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@redocly/ajv": {
-      "version": "8.18.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/ajv/-/ajv-8.18.3.tgz",
-      "integrity": "sha512-l42u0of3hY98sN2A+M4qTX1O/KrpgGH32Hu9kP2GtHyD5Dfqq86PKFLe5dwaD8DEnNmlOlll2BAmeEtf0DaySg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "fast-uri": "^3.0.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@redocly/cli": {
-      "version": "2.31.4-local-06-22",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/cli/-/cli-2.31.4-local-06-22.tgz",
-      "integrity": "sha512-VZrw8d0vCWNll6ZWnG7Iwp5yeuesWRUb8WCc+KFNnQxpxeJZ4WwPvOyMlb+wOeC5wHWNDwhHRteOaflA+yT6Dg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@opentelemetry/exporter-trace-otlp-http": "0.214.0",
-        "@opentelemetry/resources": "2.6.1",
-        "@opentelemetry/sdk-trace-node": "2.6.1",
-        "@opentelemetry/semantic-conventions": "1.40.0",
-        "@redocly/cli-otel": "0.3.1",
-        "@redocly/openapi-core": "2.31.4",
-        "@redocly/openapi-typescript": "0.1.0-local-local",
-        "@redocly/respect-core": "2.31.4",
-        "ajv": "npm:@redocly/ajv@8.18.1",
-        "ajv-formats": "^3.0.1",
-        "colorette": "^1.2.0",
-        "cookie": "^0.7.2",
-        "dotenv": "16.4.7",
-        "glob": "^13.0.5",
-        "handlebars": "^4.7.9",
-        "https-proxy-agent": "^7.0.5",
-        "mobx": "^6.0.4",
-        "picomatch": "^4.0.4",
-        "pluralize": "^8.0.0",
-        "react": "^17.0.0 || ^18.2.0 || ^19.2.1",
-        "react-dom": "^17.0.0 || ^18.2.0 || ^19.2.1",
-        "redoc": "2.5.1",
-        "semver": "^7.5.2",
-        "set-cookie-parser": "^2.3.5",
-        "simple-websocket": "^9.0.0",
-        "styled-components": "6.4.1",
-        "typescript": "6.0.2",
-        "ulid": "^3.0.1",
-        "undici": "6.24.0",
-        "yargs": "17.0.1"
-      },
-      "bin": {
-        "openapi": "bin/cli.js",
-        "redocly": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
-        "npm": ">=10"
-      }
-    },
-    "node_modules/@redocly/cli-otel": {
-      "version": "0.3.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/cli-otel/-/cli-otel-0.3.1.tgz",
-      "integrity": "sha512-TbC4bK2zLtU/O9I2pszHPP0rtJOvFhQmEwQ/FHxERPu71fgKG8POUDP2jSiGmsXE7NdGSHBKqnf+y9Acn2jq5g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ulid": "^2.3.0"
-      }
-    },
-    "node_modules/@redocly/cli-otel/node_modules/ulid": {
-      "version": "2.4.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ulid/-/ulid-2.4.0.tgz",
-      "integrity": "sha512-fIRiVTJNcSRmXKPZtGzFQv9WRrZ3M9eoptl/teFJvjOzmpU+/K/JH6HZ8deBfb5vMEpicJcLn7JmvdknlMq7Zg==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "ulid": "bin/cli.js"
-      }
-    },
-    "node_modules/@redocly/cli/node_modules/typescript": {
-      "version": "6.0.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/typescript/-/typescript-6.0.2.tgz",
-      "integrity": "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
-    "node_modules/@redocly/config": {
-      "version": "0.49.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/config/-/config-0.49.0.tgz",
-      "integrity": "sha512-OI/rpEffX3fKUuy+OuBHPRspRI/S30b9aiqxfZLMpSWZzDncEGPxSEP1O2LrBVshnDX4hLjVjLvCZ4YT85+1rw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "json-schema-to-ts": "2.7.2"
-      }
-    },
-    "node_modules/@redocly/openapi-core": {
-      "version": "2.31.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/openapi-core/-/openapi-core-2.31.4.tgz",
-      "integrity": "sha512-ne2e5NduK9MHnu42LoPXgfKhyCFG5Mc2Cwh3wNfLdoieYvhKtl37rW7p4p+GDMEJmlI9t6fagQbGPAKic2+3Pw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@redocly/ajv": "^8.18.1",
-        "@redocly/config": "^0.49.0",
-        "ajv": "npm:@redocly/ajv@8.18.1",
-        "ajv-formats": "^3.0.1",
-        "colorette": "^1.2.0",
-        "js-levenshtein": "^1.1.6",
-        "js-yaml": "^4.1.0",
-        "picomatch": "^4.0.4",
-        "pluralize": "^8.0.0",
-        "yaml-ast-parser": "0.0.43"
-      },
-      "engines": {
-        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
-        "npm": ">=10"
-      }
-    },
-    "node_modules/@redocly/openapi-typescript": {
-      "version": "0.1.0-local-local",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/openapi-typescript/-/openapi-typescript-0.1.0-local-local.tgz",
-      "integrity": "sha512-BJRV89BoYdEyECFGRB8t2dzWnOGNe1/oQ7DZoC662kv4NRJhxz5qw3exl24+M+1WCpGdRtPps5GIy+vPqauJUA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@redocly/openapi-core": "2.31.4"
-      },
-      "engines": {
-        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
-        "npm": ">=10"
-      },
-      "peerDependencies": {
-        "typescript": ">=5.5.0"
-      }
-    },
-    "node_modules/@redocly/respect-core": {
-      "version": "2.31.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/respect-core/-/respect-core-2.31.4.tgz",
-      "integrity": "sha512-ezdsZap+vmwkv94Gf7a5j+SVcxGDRWm78hxKh7Xb4XNYUxHfAqmC0eDpEfkiJU61LP7tOQeZcckxdFCIVEqI8w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@faker-js/faker": "^7.6.0",
-        "@noble/hashes": "^1.8.0",
-        "@redocly/ajv": "^8.18.1",
-        "@redocly/openapi-core": "2.31.4",
-        "ajv": "npm:@redocly/ajv@8.18.1",
-        "better-ajv-errors": "^2.0.3",
-        "colorette": "^2.0.20",
-        "json-pointer": "^0.6.2",
-        "jsonpath-rfc9535": "1.3.0",
-        "openapi-sampler": "^1.7.1",
-        "outdent": "^0.8.0",
-        "picomatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=22.12.0 || >=20.19.0 <21.0.0",
-        "npm": ">=10"
-      }
-    },
-    "node_modules/@redocly/respect-core/node_modules/colorette": {
-      "version": "2.0.20",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/colorette/-/colorette-2.0.20.tgz",
-      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.62.2.tgz",
-      "integrity": "sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.62.2.tgz",
-      "integrity": "sha512-BaH7BllCACHoH1LguOU56UItGfUWjujlO65kS9LAodViaN4bwIKd7oeW/ZHJ/4ljr/7MIiENnNy3HJ0zXv8Zkw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.62.2.tgz",
-      "integrity": "sha512-v39RCCvj4He82I9sFmk+M1VZ0PLM9sfsLVikjfx2hYBNALhrrOR2D3JjQA6AhlaSOgcR+RzrKY7e1+bT6SUO/A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.62.2.tgz",
-      "integrity": "sha512-yl0y2vq3S3lHeuXhEdss6TWfKW8vkujImO12tn4ZkG/4oghr09LvdYm2RElVjokTQiUvDUGXLGsYeLqUMCKpGA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.62.2.tgz",
-      "integrity": "sha512-tT4pvt4qXD+vEoezupCWi+a1F0vvDiksiHc+PxRlYTOH1I6/X4id9jPxTP+Fg+545euaFT1jJVs4CEdHZAU1vw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.62.2.tgz",
-      "integrity": "sha512-6nU5F2wCW+qvCBhTn1pdIU3bzsIoF7EUwsCDRxilWGprQR6yd508YnH9+OKFCwpfS8pjZqDUmnCAr7exax0XCg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.62.2.tgz",
-      "integrity": "sha512-n1GJHPOvpIfhi3TmrCeh6S6URt9BFCt0KQE3qvexyGCTAKpR4Lg+eWvNZEqu7epxwus/8ElT3hacYEucm49SZg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.62.2.tgz",
-      "integrity": "sha512-JqgflS8wEB+UXV/vS1RpRbifGBeN4D5lz8D8oOFbFZw4vedvdOgCFAjfBmIMdW3yL10XpQQ0Ambepw6MXrhOnA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.62.2.tgz",
-      "integrity": "sha512-wnFJkogWvN4jm/hQRF2UBaeUmk20j5+DmHvoyWii2b8HJDyvz1MF2OU/6ynXt2KR63rbZLWkFpoytpdc/yBuSA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.62.2.tgz",
-      "integrity": "sha512-HVu2bp0zhvJ8xHEV9+UUs7S90VadmBSY3LcIMvozbPo4AuMGDWlz3ymHLHZPX4hR67TKTt8Qp5PJ5RBg/i+RMQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-loong64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.62.2.tgz",
-      "integrity": "sha512-mQqqAV8QaoSgr9I2fKDLY2BAVvmKjWoGiu/cSYQonsLvtqwEn1E4QYfnCOcp5zoEqNhsDYin1s6jx/VJmrxlZg==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-loong64-musl": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.62.2.tgz",
-      "integrity": "sha512-IxKLoxCQ2IWi6bT2akyDUBGsOImDKB+sPp4EsTmwFQ/fMwpCKm8uLSSgP/Kx/QYUgKis6SEZ5/Nlhup0DIA0PQ==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.62.2.tgz",
-      "integrity": "sha512-Mk5ha2RQSgyFfmYYLkBpPnUk8D8FriBxesO1u9O75X0mHgXL1UQcH5Itl2lurWL2tj0RxV9b9tJgipac0hRY9A==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-ppc64-musl": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.62.2.tgz",
-      "integrity": "sha512-CjvEnqJL/0/TQ3TXX3OPIJ/kmBellrWd4heXUmHeJlTnmwjKpSJzoehLaL6Xk0ZnMHBu9dZuFADNOrtjF4v+2w==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.62.2.tgz",
-      "integrity": "sha512-1SiZbzwdkaDURsew/tSOrooKiYy7EQGT6m8ufavAi9NEyQb/6VuIxFXAL1fqa4iZe3g4NbNk4P7J32z2tw5Mgg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-musl": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.62.2.tgz",
-      "integrity": "sha512-nQts12zJ3NQRoE6uYljOH89v7szzLDvG2JD/vsX+vGXU8w/At1GowTZ5/7qeFQ8m7L55rpR8Okugnuo5bgjy2Q==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.62.2.tgz",
-      "integrity": "sha512-E9/ll019jhPIJgpzfZoIkBGhcz+kKNgVWYRY0zr9srBdPPFVpvOKW8VaJKUbeK+eZXyQF9ltME+Kk6affeaPgg==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.62.2.tgz",
-      "integrity": "sha512-5BqxR/pshjey51iliyzTD5Xi3EN0aLmQ2lZ3lvefVV9c82BvrLo2/6OT55iifpWBufs6kdwWbuOKS841DrmK9A==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "libc": [
-        "glibc"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.62.2.tgz",
-      "integrity": "sha512-uNN83XxQrRAh/w0/pmAfibcwyb6YWt4gP+dpnQKPVJshAloQ785ii8CT8ZCIxkGg9opVsvAlGhFitSm6D1Jjpg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "libc": [
-        "musl"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-openbsd-x64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.62.2.tgz",
-      "integrity": "sha512-srjEIxSH3LRnJN6THczDHWQplqEMFiAJrTab0msUryh9kwNpkICf3Ea6q6MN/2cZwRFUNx5w+h6Hpi4QuHS6Zg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-openharmony-arm64": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.62.2.tgz",
-      "integrity": "sha512-8hOJnxgbyObnCm5AlRA3A931xX19xq80RjVTKgJOvEKWqJruP/Uf12IbAOaDjjEXYRewwHLfmF0YRIdK3OwKWA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openharmony"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.62.2.tgz",
-      "integrity": "sha512-mmF4AY1i0hG/bLWUctUq59gtmgaSIRa3cu/A3JFRp/sCNEme2bgDEiDS22P9FbnJB8NJNF4jPJiSP5RHQpUTDg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.62.2.tgz",
-      "integrity": "sha512-DZgkknc6jhHrk46V25vbAM0zZkyP0nSDkJB8/dRkLTxv470dOmWDqGoEJl/9A0dFfS7yE3REOwNDxpHwSLSt0Q==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-x64-gnu": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.62.2.tgz",
-      "integrity": "sha512-T6xr6ucWSFto+VGajA8YH26LdpHRuP4YLHEKAtCWvJDOlnmWcDZVCI2Jmjr+IFHDlt2zRaTAKE4tfjTaWLgJBg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.62.2.tgz",
-      "integrity": "sha512-BfzEnDJOt9T8M989/lA37EcJgat01wLRnoi5dQf3QzOH7jzpqTAzdDbVfRljVr5r+jzKqpbHeyOfAaXxAd0PAA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@types/estree": {
-      "version": "1.0.9",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/estree/-/estree-1.0.9.tgz",
-      "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.15",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/json-schema/-/json-schema-7.0.15.tgz",
-      "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/node": {
-      "version": "26.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/node/-/node-26.0.0.tgz",
-      "integrity": "sha512-vf2YFi1iY9lHGwNJMs01biZFbKJkrZR1T6/MlzjhJLPdntOHLhTrDSnSVcdtvjihi4VQNlrFRIxLsDBlQpAipA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~8.3.0"
-      }
-    },
-    "node_modules/@types/trusted-types": {
-      "version": "2.0.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@types/trusted-types/-/trusted-types-2.0.7.tgz",
-      "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true
-    },
-    "node_modules/agent-base": {
-      "version": "7.1.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/agent-base/-/agent-base-7.1.4.tgz",
-      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/ajv": {
-      "name": "@redocly/ajv",
-      "version": "8.18.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/ajv/-/ajv-8.18.1.tgz",
-      "integrity": "sha512-Ifm/pP/tul1qmAecpbVxCBluVE32rKfjf8gYXH4xI2gCv9mRWFhJMHzkPDM4TXlxwPQYIFegymlsy8lXz7optA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "fast-uri": "^3.0.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ajv-formats": {
-      "version": "3.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ajv-formats/-/ajv-formats-3.0.1.tgz",
-      "integrity": "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/anynum": {
-      "version": "1.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/anynum/-/anynum-1.0.1.tgz",
-      "integrity": "sha512-N6//FLET/tXYNM/F6ABca1oH6fWB+KlTt909Le28WMDBk8oaT4vY17DCrwg2MvmuqUKt3Ni4N5dGJ/EoBgcO6A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true,
-      "license": "Python-2.0"
-    },
-    "node_modules/balanced-match": {
-      "version": "4.0.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/balanced-match/-/balanced-match-4.0.4.tgz",
-      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "18 || 20 || >=22"
-      }
-    },
-    "node_modules/better-ajv-errors": {
-      "version": "2.0.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/better-ajv-errors/-/better-ajv-errors-2.0.3.tgz",
-      "integrity": "sha512-t1vxUP+vYKsaYi/BbKo2K98nEAZmfi4sjwvmRT8aOPDzPJeAtLurfoIDazVkLILxO4K+Sw4YrLYnBQ46l6pePg==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@babel/code-frame": "^7.27.1",
-        "@humanwhocodes/momoa": "^2.0.4",
-        "chalk": "^4.1.2",
-        "jsonpointer": "^5.0.1",
-        "leven": "^3.1.0 < 4"
-      },
-      "engines": {
-        "node": ">= 18.20.6"
-      },
-      "peerDependencies": {
-        "ajv": "4.11.8 - 8"
-      }
-    },
-    "node_modules/brace-expansion": {
-      "version": "5.0.6",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/brace-expansion/-/brace-expansion-5.0.6.tgz",
-      "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^4.0.2"
-      },
-      "engines": {
-        "node": "18 || 20 || >=22"
-      }
-    },
-    "node_modules/call-me-maybe": {
-      "version": "1.0.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/call-me-maybe/-/call-me-maybe-1.0.2.tgz",
-      "integrity": "sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/camelize": {
-      "version": "1.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/camelize/-/camelize-1.0.1.tgz",
-      "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/classnames": {
-      "version": "2.5.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/classnames/-/classnames-2.5.1.tgz",
-      "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/cliui": {
-      "version": "7.0.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/cliui/-/cliui-7.0.4.tgz",
-      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "node_modules/clsx": {
-      "version": "2.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/clsx/-/clsx-2.1.1.tgz",
-      "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/colorette": {
-      "version": "1.4.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/colorette/-/colorette-1.4.0.tgz",
-      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/cookie": {
-      "version": "0.7.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/cookie/-/cookie-0.7.2.tgz",
-      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/core-js": {
-      "version": "3.49.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/core-js/-/core-js-3.49.0.tgz",
-      "integrity": "sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "peer": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/css-color-keywords": {
-      "version": "1.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
-      "integrity": "sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/css-to-react-native": {
-      "version": "3.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/css-to-react-native/-/css-to-react-native-3.2.0.tgz",
-      "integrity": "sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "camelize": "^1.0.0",
-        "css-color-keywords": "^1.0.0",
-        "postcss-value-parser": "^4.0.2"
-      }
-    },
-    "node_modules/csstype": {
-      "version": "3.2.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/csstype/-/csstype-3.2.3.tgz",
-      "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/debug": {
-      "version": "4.4.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/debug/-/debug-4.4.3.tgz",
-      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.3"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/decko": {
-      "version": "1.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/decko/-/decko-1.2.0.tgz",
-      "integrity": "sha512-m8FnyHXV1QX+S1cl+KPFDIl6NMkxtKsy6+U/aYyjrOqWMuwAwYWu7ePqrsUHtDR5Y8Yk2pi/KIDSgF+vT4cPOQ==",
-      "dev": true
-    },
-    "node_modules/dompurify": {
-      "version": "3.4.11",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/dompurify/-/dompurify-3.4.11.tgz",
-      "integrity": "sha512-zhlUV12GsaRzMsf9q5M254YhA4+VuF0fG+QFqu6aYpoGlKtz+w8//jBcGVYBgQkR5GHjUomejY84AV+/uPbWdw==",
-      "dev": true,
-      "license": "(MPL-2.0 OR Apache-2.0)",
-      "optionalDependencies": {
-        "@types/trusted-types": "^2.0.7"
-      }
-    },
-    "node_modules/dotenv": {
-      "version": "16.4.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/dotenv/-/dotenv-16.4.7.tgz",
-      "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://dotenvx.com"
-      }
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/es6-promise": {
-      "version": "3.3.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/es6-promise/-/es6-promise-3.3.1.tgz",
-      "integrity": "sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/esbuild": {
-      "version": "0.21.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/esbuild/-/esbuild-0.21.5.tgz",
-      "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "bin": {
-        "esbuild": "bin/esbuild"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.21.5",
-        "@esbuild/android-arm": "0.21.5",
-        "@esbuild/android-arm64": "0.21.5",
-        "@esbuild/android-x64": "0.21.5",
-        "@esbuild/darwin-arm64": "0.21.5",
-        "@esbuild/darwin-x64": "0.21.5",
-        "@esbuild/freebsd-arm64": "0.21.5",
-        "@esbuild/freebsd-x64": "0.21.5",
-        "@esbuild/linux-arm": "0.21.5",
-        "@esbuild/linux-arm64": "0.21.5",
-        "@esbuild/linux-ia32": "0.21.5",
-        "@esbuild/linux-loong64": "0.21.5",
-        "@esbuild/linux-mips64el": "0.21.5",
-        "@esbuild/linux-ppc64": "0.21.5",
-        "@esbuild/linux-riscv64": "0.21.5",
-        "@esbuild/linux-s390x": "0.21.5",
-        "@esbuild/linux-x64": "0.21.5",
-        "@esbuild/netbsd-x64": "0.21.5",
-        "@esbuild/openbsd-x64": "0.21.5",
-        "@esbuild/sunos-x64": "0.21.5",
-        "@esbuild/win32-arm64": "0.21.5",
-        "@esbuild/win32-ia32": "0.21.5",
-        "@esbuild/win32-x64": "0.21.5"
-      }
-    },
-    "node_modules/escalade": {
-      "version": "3.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/escalade/-/escalade-3.2.0.tgz",
-      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/eventemitter3": {
-      "version": "5.0.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/eventemitter3/-/eventemitter3-5.0.4.tgz",
-      "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/fast-safe-stringify": {
-      "version": "2.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
-      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/fast-uri": {
-      "version": "3.1.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-uri/-/fast-uri-3.1.2.tgz",
-      "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fastify"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/fastify"
-        }
-      ],
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/fast-xml-builder": {
-      "version": "1.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-xml-builder/-/fast-xml-builder-1.2.0.tgz",
-      "integrity": "sha512-00aAWieqff+ZJhsXA4g1g7M8k+7AYoMUUHF+/zFb5U6Uv/P0Vl4QZo84/IcufzYalLuEj9928bXN9PbbFzMF0Q==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "path-expression-matcher": "^1.5.0",
-        "xml-naming": "^0.1.0"
-      }
-    },
-    "node_modules/fast-xml-parser": {
-      "version": "5.9.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/fast-xml-parser/-/fast-xml-parser-5.9.3.tgz",
-      "integrity": "sha512-brCNCeScma/kqa54J4PIDriSSSLssRkuYaUCpvHJulGc3HGI/xxKUCTDcYkAdqJsyb//ydpbxecjC3hB9+tb/g==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "@nodable/entities": "^2.2.0",
-        "fast-xml-builder": "^1.2.0",
-        "is-unsafe": "^1.0.1",
-        "path-expression-matcher": "^1.5.0",
-        "strnum": "^2.4.1",
-        "xml-naming": "^0.1.0"
-      },
-      "bin": {
-        "fxparser": "src/cli/cli.js"
-      }
-    },
-    "node_modules/foreach": {
-      "version": "2.0.6",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/foreach/-/foreach-2.0.6.tgz",
-      "integrity": "sha512-k6GAGDyqLe9JaebCsFCoudPPWfihKu8pylYXRlqP1J7ms39iPoTtk2fviNglIeQEwdh0bQeKJ01ZPyuyQvKzwg==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
-    },
-    "node_modules/glob": {
-      "version": "13.0.6",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/glob/-/glob-13.0.6.tgz",
-      "integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "minimatch": "^10.2.2",
-        "minipass": "^7.1.3",
-        "path-scurry": "^2.0.2"
-      },
-      "engines": {
-        "node": "18 || 20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/handlebars": {
-      "version": "4.7.9",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/handlebars/-/handlebars-4.7.9.tgz",
-      "integrity": "sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minimist": "^1.2.5",
-        "neo-async": "^2.6.2",
-        "source-map": "^0.6.1",
-        "wordwrap": "^1.0.0"
-      },
-      "bin": {
-        "handlebars": "bin/handlebars"
-      },
-      "engines": {
-        "node": ">=0.4.7"
-      },
-      "optionalDependencies": {
-        "uglify-js": "^3.1.4"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/http2-client": {
-      "version": "1.3.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/http2-client/-/http2-client-1.3.5.tgz",
-      "integrity": "sha512-EC2utToWl4RKfs5zd36Mxq7nzHHBuomZboI0yYL6Y0RmBgT7Sgkq4rQ0ezFTYoIsSs7Tm9SJe+o2FcAg6GBhGA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "7.0.6",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
-      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "agent-base": "^7.1.2",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 14"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-unsafe": {
-      "version": "1.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/is-unsafe/-/is-unsafe-1.0.1.tgz",
-      "integrity": "sha512-CLK2+VdgERgD96EYm5lUQssZYlRg2tkZnbsxZoacmSiRxiFJ4Nk4SzjCl+Ur+v3kXIY9dTIdb3IH22y1mZ56LA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/js-levenshtein": {
-      "version": "1.1.6",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
-      "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/js-yaml": {
-      "version": "4.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/js-yaml/-/js-yaml-4.2.0.tgz",
-      "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/puzrin"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/nodeca"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/json-pointer": {
-      "version": "0.6.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/json-pointer/-/json-pointer-0.6.2.tgz",
-      "integrity": "sha512-vLWcKbOaXlO+jvRy4qNd+TI1QUPZzfJj1tpJ3vAXDych5XJf93ftpUKe5pKCrzyIIwgBJcOcCVRUfqQP25afBw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "foreach": "^2.0.4"
-      }
-    },
-    "node_modules/json-schema-to-ts": {
-      "version": "2.7.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/json-schema-to-ts/-/json-schema-to-ts-2.7.2.tgz",
-      "integrity": "sha512-R1JfqKqbBR4qE8UyBR56Ms30LL62/nlhoz+1UkfI/VE7p54Awu919FZ6ZUPG8zIa3XB65usPJgr1ONVncUGSaQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.18.3",
-        "@types/json-schema": "^7.0.9",
-        "ts-algebra": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=16"
-      }
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jsonpath-rfc9535": {
-      "version": "1.3.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/jsonpath-rfc9535/-/jsonpath-rfc9535-1.3.0.tgz",
-      "integrity": "sha512-3jFHya7oZ45aDxIIdx+/zQARahHXxFSMWBkcBUldfXpLS9VCXDJyTKt35kQfEXLqh0K3Ixw/9xFnvcDStaxh7Q==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=20"
-      }
-    },
-    "node_modules/jsonpointer": {
-      "version": "5.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/jsonpointer/-/jsonpointer-5.0.1.tgz",
-      "integrity": "sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/leven": {
-      "version": "3.1.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/long": {
-      "version": "5.3.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/long/-/long-5.3.2.tgz",
-      "integrity": "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/lru-cache": {
-      "version": "11.5.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/lru-cache/-/lru-cache-11.5.1.tgz",
-      "integrity": "sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "engines": {
-        "node": "20 || >=22"
-      }
-    },
-    "node_modules/lunr": {
-      "version": "2.3.9",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/lunr/-/lunr-2.3.9.tgz",
-      "integrity": "sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/mark.js": {
-      "version": "8.11.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/mark.js/-/mark.js-8.11.1.tgz",
-      "integrity": "sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/marked": {
-      "version": "4.3.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/marked/-/marked-4.3.0.tgz",
-      "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "marked": "bin/marked.js"
-      },
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "10.2.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/minimatch/-/minimatch-10.2.5.tgz",
-      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "brace-expansion": "^5.0.5"
-      },
-      "engines": {
-        "node": "18 || 20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/minipass": {
-      "version": "7.1.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/minipass/-/minipass-7.1.3.tgz",
-      "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
-    },
-    "node_modules/mobx": {
-      "version": "6.16.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/mobx/-/mobx-6.16.1.tgz",
-      "integrity": "sha512-syNcDdX3KT+Jq3je6eGjBhuc24Z68td2VG0zNFqRswaE433D9SNH5VRy/xrGbJsUixfppLLccXhAW9JSf6n+SQ==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mobx"
-      }
-    },
-    "node_modules/mobx-react": {
-      "version": "9.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/mobx-react/-/mobx-react-9.2.0.tgz",
-      "integrity": "sha512-dkGWCx+S0/1mfiuFfHRH8D9cplmwhxOV5CkXMp38u6rQGG2Pv3FWYztS0M7ncR6TyPRQKaTG/pnitInoYE9Vrw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mobx-react-lite": "^4.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mobx"
-      },
-      "peerDependencies": {
-        "mobx": "^6.9.0",
-        "react": "^16.8.0 || ^17 || ^18 || ^19"
-      },
-      "peerDependenciesMeta": {
-        "react-dom": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/mobx-react-lite": {
-      "version": "4.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/mobx-react-lite/-/mobx-react-lite-4.1.1.tgz",
-      "integrity": "sha512-iUxiMpsvNraCKXU+yPotsOncNNmyeS2B5DKL+TL6Tar/xm+wwNJAubJmtRSeAoYawdZqwv8Z/+5nPRHeQxTiXg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "use-sync-external-store": "^1.4.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/mobx"
-      },
-      "peerDependencies": {
-        "mobx": "^6.9.0",
-        "react": "^16.8.0 || ^17 || ^18 || ^19"
-      },
-      "peerDependenciesMeta": {
-        "react-dom": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.15",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/nanoid/-/nanoid-3.3.15.tgz",
-      "integrity": "sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/node-fetch": {
-      "version": "2.7.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/node-fetch/-/node-fetch-2.7.0.tgz",
-      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/node-fetch-h2": {
-      "version": "2.3.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/node-fetch-h2/-/node-fetch-h2-2.3.0.tgz",
-      "integrity": "sha512-ofRW94Ab0T4AOh5Fk8t0h8OBWrmjb0SSB20xh1H8YnPV9EJ+f5AMoYSUQ2zgJ4Iq2HAK0I2l5/Nequ8YzFS3Hg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "http2-client": "^1.2.5"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      }
-    },
-    "node_modules/node-readfiles": {
-      "version": "0.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/node-readfiles/-/node-readfiles-0.2.0.tgz",
-      "integrity": "sha512-SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "es6-promise": "^3.2.1"
-      }
-    },
-    "node_modules/oas-kit-common": {
-      "version": "1.0.8",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/oas-kit-common/-/oas-kit-common-1.0.8.tgz",
-      "integrity": "sha512-pJTS2+T0oGIwgjGpw7sIRU8RQMcUoKCDWFLdBqKB2BNmGpbBMH2sdqAaOXUg8OzonZHU0L7vfJu1mJFEiYDWOQ==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "fast-safe-stringify": "^2.0.7"
-      }
-    },
-    "node_modules/oas-linter": {
-      "version": "3.2.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/oas-linter/-/oas-linter-3.2.2.tgz",
-      "integrity": "sha512-KEGjPDVoU5K6swgo9hJVA/qYGlwfbFx+Kg2QB/kd7rzV5N8N5Mg6PlsoCMohVnQmo+pzJap/F610qTodKzecGQ==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@exodus/schemasafe": "^1.0.0-rc.2",
-        "should": "^13.2.1",
-        "yaml": "^1.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
-      }
-    },
-    "node_modules/oas-resolver": {
-      "version": "2.5.6",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/oas-resolver/-/oas-resolver-2.5.6.tgz",
-      "integrity": "sha512-Yx5PWQNZomfEhPPOphFbZKi9W93CocQj18NlD2Pa4GWZzdZpSJvYwoiuurRI7m3SpcChrnO08hkuQDL3FGsVFQ==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "node-fetch-h2": "^2.3.0",
-        "oas-kit-common": "^1.0.8",
-        "reftools": "^1.1.9",
-        "yaml": "^1.10.0",
-        "yargs": "^17.0.1"
-      },
-      "bin": {
-        "resolve": "resolve.js"
-      },
-      "funding": {
-        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
-      }
-    },
-    "node_modules/oas-schema-walker": {
-      "version": "1.1.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/oas-schema-walker/-/oas-schema-walker-1.1.5.tgz",
-      "integrity": "sha512-2yucenq1a9YPmeNExoUa9Qwrt9RFkjqaMAA1X+U7sbb0AqBeTIdMHky9SQQ6iN94bO5NW0W4TRYXerG+BdAvAQ==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "funding": {
-        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
-      }
-    },
-    "node_modules/oas-validator": {
-      "version": "5.0.8",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/oas-validator/-/oas-validator-5.0.8.tgz",
-      "integrity": "sha512-cu20/HE5N5HKqVygs3dt94eYJfBi0TsZvPVXDhbXQHiEityDN+RROTleefoKRKKJ9dFAF2JBkDHgvWj0sjKGmw==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "call-me-maybe": "^1.0.1",
-        "oas-kit-common": "^1.0.8",
-        "oas-linter": "^3.2.2",
-        "oas-resolver": "^2.5.6",
-        "oas-schema-walker": "^1.1.5",
-        "reftools": "^1.1.9",
-        "should": "^13.2.1",
-        "yaml": "^1.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
-      }
-    },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/openapi-sampler": {
-      "version": "1.7.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/openapi-sampler/-/openapi-sampler-1.7.4.tgz",
-      "integrity": "sha512-CKS/rd5ucPCuEDbJnjGDXZTsuGWcmv53aCmQx7soZlPEONUGN4af0/dY5+THRFZraSEjeA78nlfzdFswC/N5SA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/json-schema": "^7.0.7",
-        "fast-xml-parser": "^5.5.1",
-        "json-pointer": "0.6.2"
-      }
-    },
-    "node_modules/outdent": {
-      "version": "0.8.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/outdent/-/outdent-0.8.0.tgz",
-      "integrity": "sha512-KiOAIsdpUTcAXuykya5fnVVT+/5uS0Q1mrkRHcF89tpieSmY33O/tmc54CqwA+bfhbtEfZUNLHaPUiB9X3jt1A==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/path-browserify": {
-      "version": "1.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/path-browserify/-/path-browserify-1.0.1.tgz",
-      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/path-expression-matcher": {
-      "version": "1.6.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/path-expression-matcher/-/path-expression-matcher-1.6.1.tgz",
-      "integrity": "sha512-h7bxdzhHk8Knyc4Tj+jMaa7fEEoUJy7p1qtbVgkYg1Uhpe5Np5VuGXCRZnkZvU+Q42M1vStt0ifa3ueykRJPmQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/path-scurry": {
-      "version": "2.0.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/path-scurry/-/path-scurry-2.0.2.tgz",
-      "integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
-      "dev": true,
-      "license": "BlueOak-1.0.0",
-      "dependencies": {
-        "lru-cache": "^11.0.0",
-        "minipass": "^7.1.2"
-      },
-      "engines": {
-        "node": "18 || 20 || >=22"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/perfect-scrollbar": {
-      "version": "1.5.6",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/perfect-scrollbar/-/perfect-scrollbar-1.5.6.tgz",
-      "integrity": "sha512-rixgxw3SxyJbCaSpo1n35A/fwI1r2rdwMKOTCg/AcG+xOEyZcE8UHVjpZMFCVImzsFoCZeJTT+M/rdEIQYO2nw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/picocolors": {
-      "version": "1.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/picomatch": {
-      "version": "4.0.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/picomatch/-/picomatch-4.0.4.tgz",
-      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/pluralize": {
-      "version": "8.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/pluralize/-/pluralize-8.0.0.tgz",
-      "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/polished": {
-      "version": "4.3.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/polished/-/polished-4.3.1.tgz",
-      "integrity": "sha512-OBatVyC/N7SCW/FaDHrSd+vn0o5cS855TOmYi4OkdWUMSJCET/xip//ch8xGUvtr3i44X9LVyWwQlRMTN3pwSA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.17.8"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/postcss": {
-      "version": "8.5.15",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/postcss/-/postcss-8.5.15.tgz",
-      "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "nanoid": "^3.3.12",
-        "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/prismjs": {
-      "version": "1.30.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/prismjs/-/prismjs-1.30.0.tgz",
-      "integrity": "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/prop-types": {
-      "version": "15.8.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/prop-types/-/prop-types-15.8.1.tgz",
-      "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "node_modules/protobufjs": {
-      "version": "7.6.4",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/protobufjs/-/protobufjs-7.6.4.tgz",
-      "integrity": "sha512-RJJPTTpvFfHcWLkIa2JFWK4XvtSzS0yEWDmunqHXli1h3JlkbcQZXDZdcWxv+JK3Xsl5/UFDPZ0iGm7DAengYw==",
-      "dev": true,
-      "hasInstallScript": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@protobufjs/aspromise": "^1.1.2",
-        "@protobufjs/base64": "^1.1.2",
-        "@protobufjs/codegen": "^2.0.5",
-        "@protobufjs/eventemitter": "^1.1.1",
-        "@protobufjs/fetch": "^1.1.1",
-        "@protobufjs/float": "^1.0.2",
-        "@protobufjs/path": "^1.1.2",
-        "@protobufjs/pool": "^1.1.0",
-        "@protobufjs/utf8": "^1.1.1",
-        "@types/node": ">=13.7.0",
-        "long": "^5.3.2"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/randombytes/-/randombytes-2.1.0.tgz",
-      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "^5.1.0"
-      }
-    },
-    "node_modules/react": {
-      "version": "19.2.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/react/-/react-19.2.7.tgz",
-      "integrity": "sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-dom": {
-      "version": "19.2.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/react-dom/-/react-dom-19.2.7.tgz",
-      "integrity": "sha512-t0BRVXvbiE/o20Hfw669rLbMCDWtYZLvmJigy2f0MxsXF+71pxhR3xOkspmsO8h3ZlNzyibAmtCa3l4lYKk6gQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "scheduler": "^0.27.0"
-      },
-      "peerDependencies": {
-        "react": "^19.2.7"
-      }
-    },
-    "node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/react-tabs": {
-      "version": "6.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/react-tabs/-/react-tabs-6.1.1.tgz",
-      "integrity": "sha512-CPiuKoMFf89B7QlbFfdBD9XmUWiE3qudQputMVZB8GQvPJZRX/gqjDaDWOPDwGinEfpJKEuBCkGt83Tt4efeyA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "clsx": "^2.0.0",
-        "prop-types": "^15.5.0"
-      },
-      "peerDependencies": {
-        "react": "^18.0.0 || ^19.0.0"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/redoc": {
-      "version": "2.5.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/redoc/-/redoc-2.5.1.tgz",
-      "integrity": "sha512-LmqA+4A3CmhTllGG197F0arUpmChukAj9klfSdxNRemT9Hr07xXr7OGKu4PHzBs359sgrJ+4JwmOlM7nxLPGMg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@redocly/openapi-core": "^1.4.0",
-        "classnames": "^2.3.2",
-        "decko": "^1.2.0",
-        "dompurify": "^3.2.4",
-        "eventemitter3": "^5.0.1",
-        "json-pointer": "^0.6.2",
-        "lunr": "^2.3.9",
-        "mark.js": "^8.11.1",
-        "marked": "^4.3.0",
-        "mobx-react": "9.2.0",
-        "openapi-sampler": "^1.5.0",
-        "path-browserify": "^1.0.1",
-        "perfect-scrollbar": "^1.5.5",
-        "polished": "^4.2.2",
-        "prismjs": "^1.29.0",
-        "prop-types": "^15.8.1",
-        "react-tabs": "^6.0.2",
-        "slugify": "~1.4.7",
-        "stickyfill": "^1.1.1",
-        "swagger2openapi": "^7.0.8",
-        "url-template": "^2.0.8"
-      },
-      "engines": {
-        "node": ">=6.9",
-        "npm": ">=3.0.0"
-      },
-      "peerDependencies": {
-        "core-js": "^3.1.4",
-        "mobx": "^6.0.4",
-        "react": "^16.8.4 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "react-dom": "^16.8.4 || ^17.0.0 || ^18.0.0 || ^19.0.0",
-        "styled-components": "^4.1.1 || ^5.1.1 || ^6.0.5"
-      }
-    },
-    "node_modules/redoc/node_modules/@redocly/ajv": {
-      "version": "8.11.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/ajv/-/ajv-8.11.2.tgz",
-      "integrity": "sha512-io1JpnwtIcvojV7QKDUSIuMN/ikdOUd1ReEnUnMKGfDVridQZ31J0MmIuqwuRjWDZfmvr+Q0MqCcfHM2gTivOg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js-replace": "^1.0.1"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/redoc/node_modules/@redocly/config": {
-      "version": "0.22.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/config/-/config-0.22.0.tgz",
-      "integrity": "sha512-gAy93Ddo01Z3bHuVdPWfCwzgfaYgMdaZPcfL7JZ7hWJoK9V0lXDbigTWkhiPFAaLWzbOJ+kbUQG1+XwIm0KRGQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/redoc/node_modules/@redocly/openapi-core": {
-      "version": "1.34.15",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/@redocly/openapi-core/-/openapi-core-1.34.15.tgz",
-      "integrity": "sha512-HAwCnNyKcs5XGQqms+9t7OdAPM/5TDstmhF+0i7tdCFato2QKuYIlyWETwkXd8c5zbltr1oB+6y9NTeQLr2d6Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@redocly/ajv": "8.11.2",
-        "@redocly/config": "0.22.0",
-        "colorette": "1.4.0",
-        "https-proxy-agent": "7.0.6",
-        "js-levenshtein": "1.1.6",
-        "js-yaml": "4.1.1",
-        "minimatch": "5.1.9",
-        "pluralize": "8.0.0",
-        "yaml-ast-parser": "0.0.43"
-      },
-      "engines": {
-        "node": ">=18.17.0",
-        "npm": ">=9.5.0"
-      }
-    },
-    "node_modules/redoc/node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/redoc/node_modules/brace-expansion": {
-      "version": "2.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/brace-expansion/-/brace-expansion-2.1.1.tgz",
-      "integrity": "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/redoc/node_modules/js-yaml": {
-      "version": "4.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/js-yaml/-/js-yaml-4.1.1.tgz",
-      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/redoc/node_modules/minimatch": {
-      "version": "5.1.9",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/minimatch/-/minimatch-5.1.9.tgz",
-      "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/reftools": {
-      "version": "1.1.9",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/reftools/-/reftools-1.1.9.tgz",
-      "integrity": "sha512-OVede/NQE13xBQ+ob5CKd5KyeJYU2YInb1bmV4nRoOfquZPkAkxuOXicSe1PvqIuZZ4kD13sPKBbR7UFDmli6w==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "funding": {
-        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
-      }
-    },
-    "node_modules/require-directory": {
-      "version": "2.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rollup": {
-      "version": "4.62.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/rollup/-/rollup-4.62.2.tgz",
-      "integrity": "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/estree": "1.0.9"
-      },
-      "bin": {
-        "rollup": "dist/bin/rollup"
-      },
-      "engines": {
-        "node": ">=18.0.0",
-        "npm": ">=8.0.0"
-      },
-      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.62.2",
-        "@rollup/rollup-android-arm64": "4.62.2",
-        "@rollup/rollup-darwin-arm64": "4.62.2",
-        "@rollup/rollup-darwin-x64": "4.62.2",
-        "@rollup/rollup-freebsd-arm64": "4.62.2",
-        "@rollup/rollup-freebsd-x64": "4.62.2",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.62.2",
-        "@rollup/rollup-linux-arm-musleabihf": "4.62.2",
-        "@rollup/rollup-linux-arm64-gnu": "4.62.2",
-        "@rollup/rollup-linux-arm64-musl": "4.62.2",
-        "@rollup/rollup-linux-loong64-gnu": "4.62.2",
-        "@rollup/rollup-linux-loong64-musl": "4.62.2",
-        "@rollup/rollup-linux-ppc64-gnu": "4.62.2",
-        "@rollup/rollup-linux-ppc64-musl": "4.62.2",
-        "@rollup/rollup-linux-riscv64-gnu": "4.62.2",
-        "@rollup/rollup-linux-riscv64-musl": "4.62.2",
-        "@rollup/rollup-linux-s390x-gnu": "4.62.2",
-        "@rollup/rollup-linux-x64-gnu": "4.62.2",
-        "@rollup/rollup-linux-x64-musl": "4.62.2",
-        "@rollup/rollup-openbsd-x64": "4.62.2",
-        "@rollup/rollup-openharmony-arm64": "4.62.2",
-        "@rollup/rollup-win32-arm64-msvc": "4.62.2",
-        "@rollup/rollup-win32-ia32-msvc": "4.62.2",
-        "@rollup/rollup-win32-x64-gnu": "4.62.2",
-        "@rollup/rollup-win32-x64-msvc": "4.62.2",
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/scheduler": {
-      "version": "0.27.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/scheduler/-/scheduler-0.27.0.tgz",
-      "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/semver": {
-      "version": "7.8.5",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/semver/-/semver-7.8.5.tgz",
-      "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/set-cookie-parser": {
-      "version": "2.7.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz",
-      "integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/should": {
-      "version": "13.2.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/should/-/should-13.2.3.tgz",
-      "integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "should-equal": "^2.0.0",
-        "should-format": "^3.0.3",
-        "should-type": "^1.4.0",
-        "should-type-adaptors": "^1.0.1",
-        "should-util": "^1.0.0"
-      }
-    },
-    "node_modules/should-equal": {
-      "version": "2.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/should-equal/-/should-equal-2.0.0.tgz",
-      "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "should-type": "^1.4.0"
-      }
-    },
-    "node_modules/should-format": {
-      "version": "3.0.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/should-format/-/should-format-3.0.3.tgz",
-      "integrity": "sha512-hZ58adtulAk0gKtua7QxevgUaXTTXxIi8t41L3zo9AHvjXO1/7sdLECuHeIN2SRtYXpNkmhoUP2pdeWgricQ+Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "should-type": "^1.3.0",
-        "should-type-adaptors": "^1.0.1"
-      }
-    },
-    "node_modules/should-type": {
-      "version": "1.4.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/should-type/-/should-type-1.4.0.tgz",
-      "integrity": "sha512-MdAsTu3n25yDbIe1NeN69G4n6mUnJGtSJHygX3+oN0ZbO3DTiATnf7XnYJdGT42JCXurTb1JI0qOBR65shvhPQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/should-type-adaptors": {
-      "version": "1.1.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz",
-      "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "should-type": "^1.3.0",
-        "should-util": "^1.0.0"
-      }
-    },
-    "node_modules/should-util": {
-      "version": "1.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/should-util/-/should-util-1.0.1.tgz",
-      "integrity": "sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/simple-websocket": {
-      "version": "9.1.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/simple-websocket/-/simple-websocket-9.1.0.tgz",
-      "integrity": "sha512-8MJPnjRN6A8UCp1I+H/dSFyjwJhp6wta4hsVRhjf8w9qBHRzxYt14RaOcjvQnhD1N4yKOddEjflwMnQM4VtXjQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "debug": "^4.3.1",
-        "queue-microtask": "^1.2.2",
-        "randombytes": "^2.1.0",
-        "readable-stream": "^3.6.0",
-        "ws": "^7.4.2"
-      }
-    },
-    "node_modules/slugify": {
-      "version": "1.4.7",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/slugify/-/slugify-1.4.7.tgz",
-      "integrity": "sha512-tf+h5W1IrjNm/9rKKj0JU2MDMruiopx0jjVA5zCdBtcGjfp0+c5rHw/zADLC3IeKlGHtVbHtpfzvYA0OYT+HKg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/source-map-js": {
-      "version": "1.2.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/source-map-js/-/source-map-js-1.2.1.tgz",
-      "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/stickyfill": {
-      "version": "1.1.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/stickyfill/-/stickyfill-1.1.1.tgz",
-      "integrity": "sha512-GCp7vHAfpao+Qh/3Flh9DXEJ/qSi0KJwJw6zYlZOtRYXWUIpMM6mC2rIep/dK8RQqwW0KxGJIllmjPIBOGN8AA==",
-      "dev": true
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strnum": {
-      "version": "2.4.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/strnum/-/strnum-2.4.1.tgz",
-      "integrity": "sha512-M9eUSMT2dCB2cTNPG7UYj6KuK7RJR2SN2+yCV/fTW3xzTCS6EaGZ5pSMgDIjB7r8zSfTGk+dvvn9rTjpVS9Mwg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "anynum": "^1.0.1"
-      }
-    },
-    "node_modules/styled-components": {
-      "version": "6.4.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/styled-components/-/styled-components-6.4.1.tgz",
-      "integrity": "sha512-ADu2dF53esUzzM4I0ewxhxFtsDd6v4V6dNkg3vG0iFKhnt06sJneTZnRvujAosZwW0XD58IKgGMQoqri4wHRqg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@emotion/is-prop-valid": "1.4.0",
-        "css-to-react-native": "3.2.0",
-        "csstype": "3.2.3",
-        "stylis": "4.3.6"
-      },
-      "engines": {
-        "node": ">= 16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/styled-components"
-      },
-      "peerDependencies": {
-        "css-to-react-native": ">= 3.2.0",
-        "react": ">= 16.8.0",
-        "react-dom": ">= 16.8.0",
-        "react-native": ">= 0.68.0"
-      },
-      "peerDependenciesMeta": {
-        "css-to-react-native": {
-          "optional": true
-        },
-        "react-dom": {
-          "optional": true
-        },
-        "react-native": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/stylis": {
-      "version": "4.3.6",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/stylis/-/stylis-4.3.6.tgz",
-      "integrity": "sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/swagger2openapi": {
-      "version": "7.0.8",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/swagger2openapi/-/swagger2openapi-7.0.8.tgz",
-      "integrity": "sha512-upi/0ZGkYgEcLeGieoz8gT74oWHA0E7JivX7aN9mAf+Tc7BQoRBvnIGHoPDw+f9TXTW4s6kGYCZJtauP6OYp7g==",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "call-me-maybe": "^1.0.1",
-        "node-fetch": "^2.6.1",
-        "node-fetch-h2": "^2.3.0",
-        "node-readfiles": "^0.2.0",
-        "oas-kit-common": "^1.0.8",
-        "oas-resolver": "^2.5.6",
-        "oas-schema-walker": "^1.1.5",
-        "oas-validator": "^5.0.8",
-        "reftools": "^1.1.9",
-        "yaml": "^1.10.0",
-        "yargs": "^17.0.1"
-      },
-      "bin": {
-        "boast": "boast.js",
-        "oas-validate": "oas-validate.js",
-        "swagger2openapi": "swagger2openapi.js"
-      },
-      "funding": {
-        "url": "https://github.com/Mermade/oas-kit?sponsor=1"
-      }
-    },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/ts-algebra": {
-      "version": "1.2.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ts-algebra/-/ts-algebra-1.2.2.tgz",
-      "integrity": "sha512-kloPhf1hq3JbCPOTYoOWDKxebWjNb2o/LKnNfkWhxVVisFFmMJPPdJeGoGmM+iRLyoXAR61e08Pb+vUXINg8aA==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/typescript": {
-      "version": "5.9.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=14.17"
-      }
-    },
-    "node_modules/uglify-js": {
-      "version": "3.19.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/uglify-js/-/uglify-js-3.19.3.tgz",
-      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "optional": true,
-      "bin": {
-        "uglifyjs": "bin/uglifyjs"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/ulid": {
-      "version": "3.0.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ulid/-/ulid-3.0.2.tgz",
-      "integrity": "sha512-yu26mwteFYzBAot7KVMqFGCVpsF6g8wXfJzQUHvu1no3+rRRSFcSV2nKeYvNPLD2J4b08jYBDhHUjeH0ygIl9w==",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "ulid": "dist/cli.js"
-      }
-    },
-    "node_modules/undici": {
-      "version": "6.24.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/undici/-/undici-6.24.0.tgz",
-      "integrity": "sha512-lVLNosgqo5EkGqh5XUDhGfsMSoO8K0BAN0TyJLvwNRSl4xWGZlCVYsAIpa/OpA3TvmnM01GWcoKmc3ZWo5wKKA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18.17"
-      }
-    },
-    "node_modules/undici-types": {
-      "version": "8.3.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/undici-types/-/undici-types-8.3.0.tgz",
-      "integrity": "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/uri-js-replace": {
-      "version": "1.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/uri-js-replace/-/uri-js-replace-1.0.1.tgz",
-      "integrity": "sha512-W+C9NWNLFOoBI2QWDp4UT9pv65r2w5Cx+3sTYFvtMdDBxkKt1syCqsUdSFAChbEe1uK5TfS04wt/nGwmaeIQ0g==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/url-template": {
-      "version": "2.0.8",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/url-template/-/url-template-2.0.8.tgz",
-      "integrity": "sha512-XdVKMF4SJ0nP/O7XIPB0JwAEuT9lDIYnNsK8yGVe43y0AWoKeJNdv3ZNWh7ksJ6KqQFjOO6ox/VEitLnaVNufw==",
-      "dev": true,
-      "license": "BSD"
-    },
-    "node_modules/use-sync-external-store": {
-      "version": "1.6.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
-      "integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/vite": {
-      "version": "5.4.21",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/vite/-/vite-5.4.21.tgz",
-      "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "esbuild": "^0.21.3",
-        "postcss": "^8.4.43",
-        "rollup": "^4.20.0"
-      },
-      "bin": {
-        "vite": "bin/vite.js"
-      },
-      "engines": {
-        "node": "^18.0.0 || >=20.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/vitejs/vite?sponsor=1"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
-      },
-      "peerDependencies": {
-        "@types/node": "^18.0.0 || >=20.0.0",
-        "less": "*",
-        "lightningcss": "^1.21.0",
-        "sass": "*",
-        "sass-embedded": "*",
-        "stylus": "*",
-        "sugarss": "*",
-        "terser": "^5.4.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "less": {
-          "optional": true
-        },
-        "lightningcss": {
-          "optional": true
-        },
-        "sass": {
-          "optional": true
-        },
-        "sass-embedded": {
-          "optional": true
-        },
-        "stylus": {
-          "optional": true
-        },
-        "sugarss": {
-          "optional": true
-        },
-        "terser": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
-      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
-      "dev": true,
-      "license": "BSD-2-Clause"
-    },
-    "node_modules/whatwg-url": {
-      "version": "5.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/whatwg-url/-/whatwg-url-5.0.0.tgz",
-      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
-      }
-    },
-    "node_modules/wordwrap": {
-      "version": "1.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/ws": {
-      "version": "7.5.11",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/ws/-/ws-7.5.11.tgz",
-      "integrity": "sha512-zS54Oen9bITtp7kp2XM3AydrCIq1D+HwJOuH+c+e4LfpL/lotP5osijd+UoMnxwAam1GN8R4KtLAyIrIcBNpiA==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/xml-naming": {
-      "version": "0.1.0",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/xml-naming/-/xml-naming-0.1.0.tgz",
-      "integrity": "sha512-k8KO9hrMyNk6tUWqUfkTEZbezRRpONVOzUTnc97VnCvyj6Tf9lyUR9EDAIeiVLv56jsMcoXEwjW8Kv5yPY52lw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=16.0.0"
-      }
-    },
-    "node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yaml": {
-      "version": "1.10.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/yaml/-/yaml-1.10.3.tgz",
-      "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/yaml-ast-parser": {
-      "version": "0.0.43",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz",
-      "integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
-    "node_modules/yargs": {
-      "version": "17.0.1",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/yargs/-/yargs-17.0.1.tgz",
-      "integrity": "sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "cliui": "^7.0.2",
-        "escalade": "^3.1.1",
-        "get-caller-file": "^2.0.5",
-        "require-directory": "^2.1.1",
-        "string-width": "^4.2.0",
-        "y18n": "^5.0.5",
-        "yargs-parser": "^20.2.2"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/zod": {
-      "version": "4.4.3",
-      "resolved": "http://dev-verdaccio.redocly.host:8000/zod/-/zod-4.4.3.tgz",
-      "integrity": "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/colinhacks"
-      }
-    }
-  }
-}
diff --git a/tests/e2e/generate-client/examples/zod/redocly.yaml b/tests/e2e/generate-client/examples/zod/redocly.yaml
index fcc2d58b8f..fe808914ae 100644
--- a/tests/e2e/generate-client/examples/zod/redocly.yaml
+++ b/tests/e2e/generate-client/examples/zod/redocly.yaml
@@ -3,7 +3,7 @@
 # (run `redocly generate-client` with no args to build every such api).
 apis:
   zod:
-    root: ./openapi.yaml
+    root: ../_shared/cafe.yaml
     clientOutput: ./src/api/client.ts
     client:
       generators:
diff --git a/tests/e2e/generate-client/examples/zod/src/api/client.ts b/tests/e2e/generate-client/examples/zod/src/api/client.ts
deleted file mode 100644
index 550cd946cd..0000000000
--- a/tests/e2e/generate-client/examples/zod/src/api/client.ts
+++ /dev/null
@@ -1,1968 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Redocly Cafe (v1.0.0)
- * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
- * Create API credentials and try it yourself in a realistic OpenAPI workflow.
- * 
- */
-
-export type Page = {
-    /**
-     * Use with the `after` query parameter to load the next page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    endCursor: string | null;
-    /**
-     * Use with the `before` query parameter to load the previous page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    startCursor: string | null;
-    /**
-     * Indicates if there is a next page with items.
-     */
-    hasNextPage: boolean;
-    /**
-     * Indicates if there is a previous page with items.
-     */
-    hasPrevPage: boolean;
-    /**
-     * Value showing how many items are in the page limit.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit: number;
-    /**
-     * Count of items across all pages.
-     * @minimum 0
-     */
-    total: number;
-};
-
-export type MenuBaseItem = {
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt: string;
-    /**
-     * Menu item ID. Unique identifier prefixed with `prd_`.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    readonly id: string;
-    /**
-     * Entity name.
-     */
-    readonly object: "menuItem";
-    /**
-     * Menu item name.
-     * @minLength 1
-     * @maxLength 50
-     */
-    name: string;
-    /**
-     * Price in cents.
-     * @minimum 0
-     */
-    price: number;
-    /**
-     * Photo of the menu item. Must be a PNG image and less than 1MB.
-     * @format binary
-     */
-    photo?: Blob | null;
-    /**
-     * Photo URL of the menu item.
-     * @format uri
-     */
-    readonly photoUrl?: string;
-    photoTextDescription?: string | null;
-};
-
-export type Beverage = {
-    /**
-     * Menu item category.
-     */
-    category: "beverage";
-    /**
-     * Size of the beverage in milliliters.
-     * @exclusiveMinimum 0
-     */
-    volume: number;
-    /**
-     * Indicates if the beverage contains caffeine.
-     */
-    containsCaffeine: boolean;
-} & MenuBaseItem;
-
-export type Dessert = {
-    /**
-     * Menu item category.
-     */
-    category: "dessert";
-    /**
-     * Amount of calories.
-     * @exclusiveMinimum 0
-     */
-    calories: number;
-} & MenuBaseItem;
-
-export type MenuItem = Beverage | Dessert;
-
-export type MenuItemList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: MenuItem[];
-};
-
-export type Error = {
-    /**
-     * URI reference that identifies the problem type.
-     * @format uri-reference
-     */
-    type: string;
-    /**
-     * Short summary of the problem type.
-     */
-    title: string;
-    /**
-     * HTTP status code generated by the origin server for this occurrence of the problem.
-     * @minimum 100
-     * @exclusiveMaximum 600
-     * @format int32
-     */
-    status: number;
-    /**
-     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-     * May be used to locate the root of this problem in the source code.
-     * @format uri-reference
-     */
-    instance?: string;
-    /**
-     * Additional error details.
-     */
-    details?: Record<string, unknown>;
-};
-
-/**
- * Order status.
- */
-export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
-
-export const OrderStatus = {
-    placed: "placed",
-    preparing: "preparing",
-    completed: "completed",
-    canceled: "canceled"
-} as const;
-
-export type Order = {
-    /**
-     * Order ID. Unique identifier prefixed with `ord_`.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     * @format ulid
-     */
-    readonly id?: string;
-    /**
-     * Entity name.
-     */
-    readonly object?: "order";
-    /**
-     * Name of the customer who placed the order.
-     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-     * @minLength 1
-     * @maxLength 100
-     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-     */
-    customerName: string;
-    readonly status?: OrderStatus;
-    /**
-     * Total order price in cents.
-     * @minimum 0
-     */
-    readonly totalPrice?: number;
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt?: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt?: string;
-    /**
-     * List of items to include in the order.
-     * @minItems 1
-     */
-    orderItems: {
-        /**
-         * ID of the menu item to add to the order.
-         * @format ulid
-         */
-        menuItemId: string;
-        /**
-         * Quantity of the menu item.
-         * @minimum 1
-         */
-        quantity: number;
-        /**
-         * Discount amount in cents (absolute value).
-         * @minimum 0
-         */
-        discount?: number;
-        /**
-         * Optional comment for the order item (e.g., "No sugar").
-         * @maxLength 500
-         */
-        comment?: string;
-    }[];
-};
-
-export type OrderList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: Order[];
-};
-
-export type OrderItem = {
-    /**
-     * ID of the menu item to add to the order.
-     */
-    menuItemId: string;
-    /**
-     * Menu item that is part of the order.
-     */
-    readonly menuItem?: MenuItem;
-    /**
-     * Quantity of the menu item.
-     * @minimum 1
-     */
-    quantity: number;
-    /**
-     * Discount amount in cents (absolute value).
-     * @minimum 0
-     */
-    discount?: number;
-    /**
-     * Optional comment for the order item (e.g., "No sugar").
-     * @maxLength 500
-     */
-    comment?: string;
-};
-
-/**
- * Revenue statistics for a given date range.
- */
-export type RevenueStatistics = {
-    /**
-     * Total revenue in cents from completed orders.
-     * @minimum 0
-     * @format float
-     */
-    revenue: number;
-    /**
-     * Average order amount in cents (calculated from completed orders only).
-     * @minimum 0
-     * @format float
-     */
-    averageOrderAmount: number;
-    /**
-     * Total number of orders (all statuses) in the date range.
-     * @minimum 0
-     */
-    totalOrders: number;
-    /**
-     * Number of placed orders.
-     * @minimum 0
-     */
-    placedOrders: number;
-    /**
-     * Number of preparing orders.
-     * @minimum 0
-     */
-    preparingOrders: number;
-    /**
-     * Number of completed orders.
-     * @minimum 0
-     */
-    completedOrders: number;
-    /**
-     * Number of canceled orders.
-     * @minimum 0
-     */
-    canceledOrders: number;
-    /**
-     * Start date of the revenue calculation period.
-     * @format date
-     */
-    startDate: string;
-    /**
-     * End date of the revenue calculation period.
-     * @format date
-     */
-    endDate: string;
-};
-
-export type RegisterClientObject = {
-    /**
-     * Client name.
-     */
-    name: string;
-    /**
-     * List of redirect URIs (optional, defaults to empty array).
-     */
-    redirectUris?: string[];
-    /**
-     * List of scopes.
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types.
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-/**
- * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
- */
-export type OAuth2Client = {
-    /**
-     * Client identifier issued by the authorization server.
-     */
-    clientId: string;
-    /**
-     * Client secret issued by the authorization server.
-     */
-    clientSecret: string;
-    /**
-     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-     * @format int64
-     */
-    clientIdIssuedAt: number;
-    /**
-     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-     * @format int64
-     */
-    clientSecretExpiresAt: number;
-    /**
-     * Client name (registered metadata).
-     */
-    name?: string;
-    /**
-     * List of redirect URIs (registered metadata).
-     */
-    redirectUris?: string[];
-    /**
-     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
-     * @format uri
-     */
-    registrationClientUri: string;
-    /**
-     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-     */
-    registrationAccessToken: string;
-    /**
-     * List of scopes (registered metadata).
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types (registered metadata).
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-export type OrderNotification = {
-    /**
-     * Unique order identifier.
-     */
-    orderId: string;
-    orderStatus: OrderStatus;
-    /**
-     * When the event occurred.
-     * @format date-time
-     */
-    timestamp: string;
-};
-
-/**
- * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
- */
-export function isBeverage(value: MenuItem): value is Beverage {
-    return (value as Record<string, unknown>)["category"] === "beverage";
-}
-
-/**
- * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
- */
-export function isDessert(value: MenuItem): value is Dessert {
-    return (value as Record<string, unknown>)["category"] === "dessert";
-}
-
-export type ListMenuItemsResult = MenuItemList;
-
-export type ListMenuItemsParams = {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-};
-
-export type ListMenuItemsVariables = {
-    params?: ListMenuItemsParams;
-};
-
-export type CreateMenuItemResult = MenuItem;
-
-export type CreateMenuItemBody = FormData;
-
-export type CreateMenuItemVariables = {
-    body: CreateMenuItemBody;
-};
-
-export type DeleteMenuItemResult = void;
-
-export type DeleteMenuItemVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-};
-
-export type GetMenuItemPhotoResult = Blob | string;
-
-export type GetMenuItemPhotoParams = {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-};
-
-export type GetMenuItemPhotoVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-    params?: GetMenuItemPhotoParams;
-};
-
-export type ListOrdersResult = OrderList;
-
-export type ListOrdersParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-};
-
-export type ListOrdersVariables = {
-    params?: ListOrdersParams;
-};
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    headers?: GetOrderByIdHeaders;
-};
-
-export type DeleteOrderResult = void;
-
-export type DeleteOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-};
-
-export type UpdateOrderResult = Order;
-
-export type UpdateOrderBody = {
-    status: OrderStatus;
-};
-
-export type UpdateOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    body?: UpdateOrderBody;
-};
-
-export type ListOrderItemsResult = OrderItem[];
-
-export type ListOrderItemsParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-};
-
-export type ListOrderItemsVariables = {
-    params?: ListOrderItemsParams;
-};
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    listMenuItems: {
-        args: {
-            params?: ListMenuItemsParams;
-        };
-        result: ListMenuItemsResult;
-    };
-    createMenuItem: {
-        args: {
-            body: CreateMenuItemBody;
-        };
-        result: CreateMenuItemResult;
-    };
-    deleteMenuItem: {
-        args: {
-            /**
-             * ID of the menu item to retrieve.
-             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            menuItemId: string;
-        };
-        result: DeleteMenuItemResult;
-    };
-    getMenuItemPhoto: {
-        args: {
-            /**
-             * ID of the menu item to retrieve.
-             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            menuItemId: string;
-            params?: GetMenuItemPhotoParams;
-        };
-        result: GetMenuItemPhotoResult;
-    };
-    listOrders: {
-        args: {
-            params?: ListOrdersParams;
-        };
-        result: ListOrdersResult;
-    };
-    createOrder: {
-        args: {
-            body: CreateOrderBody;
-        };
-        result: CreateOrderResult;
-    };
-    getOrderById: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-            headers?: GetOrderByIdHeaders;
-        };
-        result: GetOrderByIdResult;
-    };
-    deleteOrder: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-        };
-        result: DeleteOrderResult;
-    };
-    updateOrder: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-            body?: UpdateOrderBody;
-        };
-        result: UpdateOrderResult;
-    };
-    listOrderItems: {
-        args: {
-            params?: ListOrderItemsParams;
-        };
-        result: ListOrderItemsResult;
-    };
-    getRevenue: {
-        args: {
-            params?: GetRevenueParams;
-        };
-        result: GetRevenueResult;
-    };
-    registerOAuth2Client: {
-        args: {
-            body: RegisterOAuth2ClientBody;
-        };
-        result: RegisterOAuth2ClientResult;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
-    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
-    tags: readonly string[];
-}>["tags"][number];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — `@redocly/client-generator`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits `OPERATIONS` literals typed
- * `satisfies Record<string, OperationDescriptor>` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
- * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to `'json'` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
- * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real `ApiError` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call `parseAs` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of `data`/`error` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
- * streams and, for paginated operations, `item` (the page's element type) and — on
- * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
- * iteration unwraps the `Result` envelope the one-shot `result` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: `{}` has no required members, so
- * `{} extends A` is true exactly when every member of `A` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type `.pages()` yields: the RAW page declared by `page` (the generator
- * writes it only on result-mode paginated entries, whose `result` is the envelope),
- * or the method's own `result` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares `item` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
- * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
- * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
- * `onError` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(`Request failed with status ${status}`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
- * `filter=a/b` survives instead of `filter=a%2Fb`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
- * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
- * `deepObject` brackets, and `null`/`undefined` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(`${key}[${subKey}]`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. `%20` (not `+`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-      }
-    } else if (Object(value) === value) {
-      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
-          else params.append(`${key}[${subKey}]`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(`${key}=${encodeReserved(String(value))}`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? `${url}?${qs}` : url;
-}
-
-/**
- * Read the response body per `kind`. `'auto'` negotiates from the content type
- * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom `retryOn` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
- * unless `jitter === false`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/** Resolve a credential: a literal passes through; a function is awaited per request. */
-async function resolveToken(provider: TokenProvider): Promise<string> {
-  return typeof provider === 'function' ? await provider() : provider;
-}
-
-/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
-function encodeBase64(text: string): string {
-  let binary = '';
-  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
-  return btoa(binary);
-}
-
-/** Whether a credential for this scheme is configured on the instance. */
-function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
-  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
-  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
-  return config.auth?.basic !== undefined;
-}
-
-/**
- * Build the auth headers/query for one operation's `security` OR-alternatives from the
- * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * The first alternative whose schemes (an AND-set) are all configured is applied, so
- * "bearer OR apiKey" works with either credential and never sends both. When none is
- * fully configured, the first alternative's configured schemes are still sent (the
- * server rejects the request, mirroring the previous behavior).
- * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
- */
-async function resolveAuth(
-  security: readonly (readonly SecuritySpec[])[],
-  config: ClientConfig
-): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
-  const alternative =
-    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
-    security[0] ??
-    [];
-  const headers: Record<string, string> = {};
-  const query: Record<string, string> = {};
-  const cookies: string[] = [];
-  for (const scheme of alternative) {
-    if (scheme.kind === 'apiKey') {
-      const provider = config.auth?.apiKey?.[scheme.scheme];
-      if (provider === undefined) continue;
-      const value = await resolveToken(provider);
-      if (scheme.in === 'header') headers[scheme.name] = value;
-      else if (scheme.in === 'query') query[scheme.name] = value;
-      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
-      // so the credential can't break the `Cookie` header syntax.
-      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
-    } else if (scheme.kind === 'bearer') {
-      const provider = config.auth?.bearer;
-      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
-    } else {
-      const basic = config.auth?.basic;
-      if (basic !== undefined) {
-        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
-      }
-    }
-  }
-  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
-  return { headers, query };
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * `createClient` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
- * to a plain record — spreading a `Headers` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
- * `onResponse` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * The optional behaviors `createClientCore` can dispatch to but never statically
- * imports. The package's public `createClient` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
- * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
- * are honored, and an omitted `explode` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller `init.headers` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
- * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's `error` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (`errorMode` is fixed at construction — `configure()`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
-    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
-    // basic/apiKey. `apiKey` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: `createClientCore` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
- * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
-}
-
-export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.cafe.redocly.com" });
-
-export const { configure, use } = client;
-export const setBearer = client.auth.bearer;
-export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
-export const listMenuItems = (params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
-export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
-export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
-export const getMenuItemPhoto = (menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
-export const listOrders = (params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
-export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
-export const getOrderById = (orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
-export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
-export const updateOrder = (orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
-export const listOrderItems = (params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
-export const getRevenue = (params: {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
-export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
diff --git a/tests/e2e/generate-client/examples/zod/src/api/client.zod.ts b/tests/e2e/generate-client/examples/zod/src/api/client.zod.ts
deleted file mode 100644
index be229a08eb..0000000000
--- a/tests/e2e/generate-client/examples/zod/src/api/client.zod.ts
+++ /dev/null
@@ -1,222 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-import { z } from "zod";
-
-export const PageSchema = z.object({
-    endCursor: z.union([z.string(), z.null()]),
-    startCursor: z.union([z.string(), z.null()]),
-    hasNextPage: z.boolean(),
-    hasPrevPage: z.boolean(),
-    limit: z.number().int().min(1).max(100),
-    total: z.number().int().min(0)
-});
-
-export const MenuBaseItemSchema = z.object({
-    createdAt: z.string(),
-    updatedAt: z.string(),
-    id: z.string().regex(new RegExp("^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$")),
-    object: z.literal("menuItem"),
-    name: z.string().min(1).max(50),
-    price: z.number().int().min(0),
-    photo: z.union([z.instanceof(Blob), z.null()]).optional(),
-    photoUrl: z.string().optional(),
-    photoTextDescription: z.union([z.string(), z.null()]).optional()
-});
-
-export const BeverageSchema = z.object({
-    category: z.literal("beverage"),
-    volume: z.number().gt(0),
-    containsCaffeine: z.boolean()
-}).and(z.lazy(() => MenuBaseItemSchema));
-
-export const DessertSchema = z.object({
-    category: z.literal("dessert"),
-    calories: z.number().gt(0)
-}).and(z.lazy(() => MenuBaseItemSchema));
-
-export const MenuItemSchema = z.union([z.lazy(() => BeverageSchema), z.lazy(() => DessertSchema)]);
-
-export const MenuItemListSchema = z.object({
-    object: z.literal("list"),
-    page: z.lazy(() => PageSchema),
-    items: z.array(z.lazy(() => MenuItemSchema))
-});
-
-export const ErrorSchema = z.object({
-    type: z.string(),
-    title: z.string(),
-    status: z.number().int().min(100).lt(600),
-    instance: z.string().optional(),
-    details: z.record(z.string(), z.unknown()).optional()
-});
-
-export const OrderStatusSchema = z.enum(["placed", "preparing", "completed", "canceled"]);
-
-export const OrderSchema = z.object({
-    id: z.string().regex(new RegExp("^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$")).optional(),
-    object: z.literal("order").optional(),
-    customerName: z.string().min(1).max(100).regex(new RegExp("^[A-Za-z]+(?:[\\s'-][A-Za-z]+)*$")),
-    status: z.lazy(() => OrderStatusSchema).optional(),
-    totalPrice: z.number().int().min(0).optional(),
-    createdAt: z.string().optional(),
-    updatedAt: z.string().optional(),
-    orderItems: z.array(z.object({
-        menuItemId: z.string(),
-        quantity: z.number().int().min(1),
-        discount: z.number().int().min(0).optional(),
-        comment: z.string().max(500).optional()
-    })).min(1)
-});
-
-export const OrderListSchema = z.object({
-    object: z.literal("list"),
-    page: z.lazy(() => PageSchema),
-    items: z.array(z.lazy(() => OrderSchema))
-});
-
-export const OrderItemSchema = z.object({
-    menuItemId: z.string(),
-    menuItem: z.lazy(() => MenuItemSchema).optional(),
-    quantity: z.number().int().min(1),
-    discount: z.number().int().min(0).optional(),
-    comment: z.string().max(500).optional()
-});
-
-export const RevenueStatisticsSchema = z.object({
-    revenue: z.number().min(0),
-    averageOrderAmount: z.number().min(0),
-    totalOrders: z.number().int().min(0),
-    placedOrders: z.number().int().min(0),
-    preparingOrders: z.number().int().min(0),
-    completedOrders: z.number().int().min(0),
-    canceledOrders: z.number().int().min(0),
-    startDate: z.string(),
-    endDate: z.string()
-});
-
-export const RegisterClientObjectSchema = z.object({
-    name: z.string(),
-    redirectUris: z.array(z.string()).optional(),
-    scopes: z.array(z.enum(["menu:read", "menu:write", "orders:read", "orders:write"])).optional(),
-    grantTypes: z.array(z.enum(["authorization_code", "client_credentials"])).optional()
-});
-
-export const OAuth2ClientSchema = z.object({
-    clientId: z.string(),
-    clientSecret: z.string(),
-    clientIdIssuedAt: z.number().int(),
-    clientSecretExpiresAt: z.number().int(),
-    name: z.string().optional(),
-    redirectUris: z.array(z.string()).optional(),
-    registrationClientUri: z.string(),
-    registrationAccessToken: z.string(),
-    scopes: z.array(z.enum(["menu:read", "menu:write", "orders:read", "orders:write"])).optional(),
-    grantTypes: z.array(z.enum(["authorization_code", "client_credentials"])).optional()
-});
-
-export const OrderNotificationSchema = z.object({
-    orderId: z.string(),
-    orderStatus: z.lazy(() => OrderStatusSchema),
-    timestamp: z.string()
-});
-
-/**
- * Request/response validators by operationId — powers `zodValidation`, or import one directly.
- */
-export const operationSchemas: {
-    listMenuItems: {
-        response: z.ZodType;
-    };
-    createMenuItem: {
-        response: z.ZodType;
-    };
-    listOrders: {
-        response: z.ZodType;
-    };
-    createOrder: {
-        request: z.ZodType;
-        response: z.ZodType;
-    };
-    getOrderById: {
-        response: z.ZodType;
-    };
-    updateOrder: {
-        request: z.ZodType;
-        response: z.ZodType;
-    };
-    listOrderItems: {
-        response: z.ZodType;
-    };
-    getRevenue: {
-        response: z.ZodType;
-    };
-    registerOAuth2Client: {
-        request: z.ZodType;
-        response: z.ZodType;
-    };
-} = {
-    listMenuItems: { response: z.lazy(() => MenuItemListSchema) },
-    createMenuItem: { response: z.lazy(() => MenuItemSchema) },
-    listOrders: { response: z.lazy(() => OrderListSchema) },
-    createOrder: { request: OrderSchema.omit({ id: true, object: true, status: true, totalPrice: true, createdAt: true, updatedAt: true }), response: z.lazy(() => OrderSchema) },
-    getOrderById: { response: z.lazy(() => OrderSchema) },
-    updateOrder: { request: z.object({
-            status: z.lazy(() => OrderStatusSchema)
-        }), response: z.lazy(() => OrderSchema) },
-    listOrderItems: { response: z.array(z.lazy(() => OrderItemSchema)) },
-    getRevenue: { response: z.lazy(() => RevenueStatisticsSchema) },
-    registerOAuth2Client: { request: z.lazy(() => RegisterClientObjectSchema), response: z.lazy(() => OAuth2ClientSchema) }
-};
-/** `request`/`response` validators for one operation (an absent side is not validated). */
-export type OperationSchemaSet = { request?: z.ZodType; response?: z.ZodType };
-
-const schemaIndex: Partial<Record<string, OperationSchemaSet>> = operationSchemas;
-
-/** A request or response payload failed validation. Always thrown, even on result-mode clients. */
-export class ZodValidationError extends Error {
-    constructor(
-        readonly operationId: string,
-        readonly direction: "request" | "response",
-        readonly issues: z.ZodError["issues"]
-    ) {
-        const detail = issues
-            .map((issue) => `${issue.path.join(".") || "(root)"}: ${issue.message}`)
-            .join("; ");
-        super(`${direction === "request" ? "Request" : "Response"} validation failed for operation "${operationId}": ${detail}`);
-        this.name = "ZodValidationError";
-    }
-}
-
-/**
- * Schema-validation middleware for the generated client: `use(zodValidation())`.
- * Request bodies are validated before any network call; successful JSON responses are
- * validated against the operation's response schema. Payloads are never mutated, and
- * operations without a schema pass through untouched. A failure throws
- * `ZodValidationError` — always, even on result-mode clients.
- */
-export function zodValidation(options: { request?: boolean; response?: boolean } = {}) {
-    const { request = true, response = true } = options;
-    return {
-        onRequest(context: { body?: unknown; operation: { id: string } }): void {
-            if (!request || context.body === undefined) return;
-            const schema = schemaIndex[context.operation.id]?.request;
-            if (!schema) return;
-            const result = schema.safeParse(context.body);
-            if (!result.success) {
-                throw new ZodValidationError(context.operation.id, "request", result.error.issues);
-            }
-        },
-        async onResponse(incoming: Response, context: { operation: { id: string } }): Promise<void> {
-            if (!response || !incoming.ok) return;
-            const schema = schemaIndex[context.operation.id]?.response;
-            if (!schema) return;
-            const contentType = (incoming.headers.get("content-type") ?? "").toLowerCase();
-            if (!contentType.includes("json")) return;
-            const result = schema.safeParse(await incoming.clone().json());
-            if (!result.success) {
-                throw new ZodValidationError(context.operation.id, "response", result.error.issues);
-            }
-        },
-    };
-}

From de9b41f29ff9bfc089722edc77fcbf17e77cf3fb Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Fri, 17 Jul 2026 14:30:07 +0300
Subject: [PATCH 115/134] test(client-generator): extract shared e2e helpers
 and stop committing consumer clients

---
 .../e2e/generate-client/args-grouped.test.ts  |   14 +-
 tests/e2e/generate-client/auth.test.ts        |   83 +-
 .../generate-client/base-consumer/.gitignore  |    2 +
 .../e2e/generate-client/base-consumer/api.ts  | 1168 ----------
 tests/e2e/generate-client/base.test.ts        |   72 +-
 .../generate-client/cafe-consumer/.gitignore  |    2 +
 .../e2e/generate-client/cafe-consumer/api.ts  | 1968 -----------------
 tests/e2e/generate-client/cafe.test.ts        |   65 +-
 tests/e2e/generate-client/error-mode.test.ts  |   75 +-
 tests/e2e/generate-client/extension.test.ts   |   38 +-
 .../generator-contract.test.ts                |   10 +-
 tests/e2e/generate-client/helpers.ts          |  134 ++
 .../identifier-injection.test.ts              |   10 +-
 tests/e2e/generate-client/middleware.test.ts  |   44 +-
 tests/e2e/generate-client/mock.test.ts        |   64 +-
 tests/e2e/generate-client/multipart.test.ts   |   48 +-
 .../generate-client/name-collision.test.ts    |   14 +-
 .../generate-client/operation-types.test.ts   |   20 +-
 .../e2e/generate-client/package-mode.test.ts  |   77 +-
 .../package-runtime-cjs.test.ts               |   12 +-
 .../package-runtime-consumer/.gitignore       |    2 +
 .../package-runtime-consumer/api.ts           |  102 -
 .../pagination-consumer/.gitignore            |    4 +
 .../pagination-consumer/api-offset.ts         | 1180 ----------
 .../pagination-consumer/api-package.ts        |  136 --
 .../pagination-consumer/api.ts                | 1179 ----------
 tests/e2e/generate-client/pagination.test.ts  |   67 +-
 tests/e2e/generate-client/parse-as.test.ts    |   35 +-
 .../generate-client/path-param-idents.test.ts |   25 +-
 .../generate-client/per-instance-auth.test.ts |   27 +-
 tests/e2e/generate-client/plugin.test.ts      |    8 +-
 .../e2e/generate-client/query-styles.test.ts  |   33 +-
 .../generate-client/redocly-config.test.ts    |   17 +-
 tests/e2e/generate-client/retry.test.ts       |   34 +-
 tests/e2e/generate-client/setup.test.ts       |   14 +-
 .../e2e/generate-client/spec-versions.test.ts |   37 +-
 tests/e2e/generate-client/split.test.ts       |   14 +-
 .../generate-client/sse-consumer/.gitignore   |    2 +
 tests/e2e/generate-client/sse-consumer/api.ts | 1174 ----------
 tests/e2e/generate-client/sse.runtime.test.ts |   81 +-
 tests/e2e/generate-client/sse.test.ts         |   41 +-
 tests/e2e/generate-client/swr.test.ts         |   29 +-
 .../tanstack-query.runtime.test.ts            |   29 +-
 .../generate-client/tanstack-query.test.ts    |   85 +-
 .../e2e/generate-client/transformers.test.ts  |   38 +-
 tests/e2e/generate-client/zod.test.ts         |   51 +-
 tsconfig.json                                 |    2 +-
 47 files changed, 424 insertions(+), 7942 deletions(-)
 create mode 100644 tests/e2e/generate-client/base-consumer/.gitignore
 delete mode 100644 tests/e2e/generate-client/base-consumer/api.ts
 create mode 100644 tests/e2e/generate-client/cafe-consumer/.gitignore
 delete mode 100644 tests/e2e/generate-client/cafe-consumer/api.ts
 create mode 100644 tests/e2e/generate-client/helpers.ts
 create mode 100644 tests/e2e/generate-client/package-runtime-consumer/.gitignore
 delete mode 100644 tests/e2e/generate-client/package-runtime-consumer/api.ts
 create mode 100644 tests/e2e/generate-client/pagination-consumer/.gitignore
 delete mode 100644 tests/e2e/generate-client/pagination-consumer/api-offset.ts
 delete mode 100644 tests/e2e/generate-client/pagination-consumer/api-package.ts
 delete mode 100644 tests/e2e/generate-client/pagination-consumer/api.ts
 create mode 100644 tests/e2e/generate-client/sse-consumer/.gitignore
 delete mode 100644 tests/e2e/generate-client/sse-consumer/api.ts

diff --git a/tests/e2e/generate-client/args-grouped.test.ts b/tests/e2e/generate-client/args-grouped.test.ts
index 34db9ff56a..0ec1662d3e 100644
--- a/tests/e2e/generate-client/args-grouped.test.ts
+++ b/tests/e2e/generate-client/args-grouped.test.ts
@@ -13,12 +13,12 @@
 import { spawnSync } from 'node:child_process';
 import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
+import { generate, tscBin } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
 const fixture = join(__dirname, 'fixtures/cafe.yaml');
 
 describe('generate-client end-to-end (--args-style grouped)', () => {
@@ -37,12 +37,7 @@ describe('generate-client end-to-end (--args-style grouped)', () => {
   });
 
   test('exports the operations by destructuring the client (grouped args = client methods)', () => {
-    const result = spawnSync(
-      'node',
-      [cliEntry, 'generate-client', fixture, '--output', entry, '--args-style', 'grouped'],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(result.status, `generate-client stderr:\n${result.stderr}`).toBe(0);
+    generate(fixture, entry, ['--args-style', 'grouped']);
     expect(existsSync(entry)).toBe(true);
 
     const src = readFileSync(entry, 'utf-8');
@@ -61,7 +56,6 @@ describe('generate-client end-to-end (--args-style grouped)', () => {
   test('the grouped-style client type-checks under strict mode with no unused locals', () => {
     expect(existsSync(entry), 'generation test must run first').toBe(true);
 
-    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
     const tsc = spawnSync(
       tscBin,
       [
diff --git a/tests/e2e/generate-client/auth.test.ts b/tests/e2e/generate-client/auth.test.ts
index f3e44dbd51..22acd8a1b2 100644
--- a/tests/e2e/generate-client/auth.test.ts
+++ b/tests/e2e/generate-client/auth.test.ts
@@ -1,47 +1,22 @@
-import { spawnSync } from 'node:child_process';
-import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { outdent } from 'outdent';
 
+import { generate, runConsumer, strictTypecheck } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
-const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
 const fixture = join(__dirname, 'fixtures', 'auth.yaml');
 
-const STRICT_TSCONFIG = {
-  compilerOptions: {
-    module: 'nodenext',
-    moduleResolution: 'nodenext',
-    target: 'es2022',
-    lib: ['ES2022', 'DOM'],
-    strict: true,
-    noEmit: true,
-    skipLibCheck: true,
-    types: [],
-  },
-};
-
 /** Generate a single-file client and assert strict `tsc` accepts it. */
 function generateSingleFile(): string {
   const dir = mkdtempSync(join(tmpdir(), 'ots-auth-'));
   const out = join(dir, 'client.ts');
-  const res = spawnSync('node', [cli, 'generate-client', fixture, '--output', out], {
-    encoding: 'utf-8',
-    cwd: repoRoot,
-  });
-  expect(res.status, res.stderr).toBe(0);
+  generate(fixture, out);
   expect(existsSync(out)).toBe(true);
   const generated = readFileSync(out, 'utf-8');
-  writeFileSync(
-    join(dir, 'tsconfig.json'),
-    JSON.stringify({ ...STRICT_TSCONFIG, include: ['client.ts'] }),
-    'utf-8'
-  );
-  const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
-  expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+  strictTypecheck(dir, ['client.ts']);
   rmSync(dir, { recursive: true, force: true });
   return generated;
 }
@@ -101,27 +76,8 @@ describe('generate-client auth breadth (auth.yaml)', () => {
     // Split mode derives its folder from a `.ts` entry path, so --output
     // must still point at a file; the generator emits the schemas file beside it.
     const dir = mkdtempSync(join(tmpdir(), 'ots-auth-split-'));
-    const res = spawnSync(
-      'node',
-      [
-        cli,
-        'generate-client',
-        fixture,
-        '--output',
-        join(dir, 'client.ts'),
-        '--output-mode',
-        'split',
-      ],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(res.status, res.stderr).toBe(0);
-    writeFileSync(
-      join(dir, 'tsconfig.json'),
-      JSON.stringify({ ...STRICT_TSCONFIG, include: ['**/*.ts'] }),
-      'utf-8'
-    );
-    const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
-    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+    generate(fixture, join(dir, 'client.ts'), ['--output-mode', 'split']);
+    strictTypecheck(dir);
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
@@ -132,19 +88,14 @@ describe('generate-client auth breadth (auth.yaml)', () => {
   // `Authorization` header and (b) a query-key scheme lands `api_key=` in the URL.
   it('async setBearer resolves onto Authorization and query-key lands in the URL', () => {
     // The driver owns its own throwaway http server (and points the client at it
-    // via configure({ serverUrl })), so a single `spawnSync` runs the whole behavioral
+    // via configure({ serverUrl })), so a single `runConsumer` runs the whole behavioral
     // probe — the server can't be starved by the test process's blocking spawn.
     const dir = mkdtempSync(join(tmpdir(), 'ots-auth-run-'));
     const out = join(dir, 'client.ts');
-    const gen = spawnSync('node', [cli, 'generate-client', fixture, '--output', out], {
-      encoding: 'utf-8',
-      cwd: repoRoot,
-    });
-    expect(gen.status, gen.stderr).toBe(0);
-
-    const driver = join(dir, 'driver.ts');
-    writeFileSync(
-      driver,
+    generate(fixture, out);
+
+    const captured = runConsumer(
+      dir,
       outdent`
         import * as http from 'node:http';
         import { configure, getBearer, getQuery, setBearer, setApiKeyQueryKey } from './client.js';
@@ -168,12 +119,8 @@ describe('generate-client auth breadth (auth.yaml)', () => {
           process.stdout.write(JSON.stringify(captured));
         }
         main().then(() => process.exit(0)).catch((e) => { console.error(e); process.exit(1); });
-      `,
-      'utf-8'
-    );
-    const run = spawnSync('npx', ['tsx', driver], { encoding: 'utf-8', cwd: repoRoot });
-    expect(run.status, `driver failed:\nstdout:\n${run.stdout}\nstderr:\n${run.stderr}`).toBe(0);
-    const captured = JSON.parse(run.stdout.trim()) as Array<{ url: string; auth?: string }>;
+      `
+    ) as Array<{ url: string; auth?: string }>;
     rmSync(dir, { recursive: true, force: true });
 
     const bearerReq = captured.find((c) => c.url.startsWith('/bearer'));
diff --git a/tests/e2e/generate-client/base-consumer/.gitignore b/tests/e2e/generate-client/base-consumer/.gitignore
new file mode 100644
index 0000000000..35d9162694
--- /dev/null
+++ b/tests/e2e/generate-client/base-consumer/.gitignore
@@ -0,0 +1,2 @@
+# Generated fresh by the owning suite in beforeAll; excluded from the root typecheck.
+api.ts
diff --git a/tests/e2e/generate-client/base-consumer/api.ts b/tests/e2e/generate-client/base-consumer/api.ts
deleted file mode 100644
index 4131ef1771..0000000000
--- a/tests/e2e/generate-client/base-consumer/api.ts
+++ /dev/null
@@ -1,1168 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Base Consumer (v1.0.0)
- * Minimal spec that exercises core runtime behavior (real call, cancellation)
- * plus edge cases discovered against the real Redocly API (reunite.yaml):
- * OAS 3.1 `enum` containing `null`, and `style: deepObject` object query params.
- * 
- */
-
-export type Pet = {
-    /**
-     * Server-assigned id; readOnly, so it is dropped from request bodies.
-     */
-    readonly id?: number;
-    name: string;
-    /**
-     * Lifecycle status; OAS 3.1 enum that includes null.
-     */
-    status?: ("available" | "pending" | "sold") | null;
-    /**
-     * Free-form object (no declared properties) — a record of unknown, not `{}`.
-     */
-    metadata?: Record<string, unknown>;
-    /**
-     * oneOf with an empty branch — must stay `string`, not collapse to `unknown`.
-     */
-    owner?: string;
-    /**
-     * OAS 3.1 single null type — must render as `null`, not `unknown`.
-     */
-    deletedAt?: null;
-};
-
-/**
- * Discriminated-union member (status=ok) — a nested-union guard target.
- */
-export type PetBulkSuccessItem = {
-    status: "ok";
-    resource: Pet;
-};
-
-/**
- * Discriminated-union member (status=error).
- */
-export type PetBulkErrorItem = {
-    status: "error";
-    error: string;
-};
-
-/**
- * Array of an inline discriminated union — guards must narrow the items.
- */
-export type PetBulkResult = (PetBulkSuccessItem | PetBulkErrorItem)[];
-
-/**
- * Unrelated schema whose name collides with the `getStatus` op result alias.
- */
-export type GetStatusResult = {
-    ready?: boolean;
-};
-
-export type PetFilter = {
-    name?: string;
-    status?: string;
-};
-
-/**
- * Result alias for `search` collides with this schema name (regression guard).
- */
-export type SearchResult = {
-    total?: number;
-    items?: Pet[];
-};
-
-/**
- * Own discriminant property AND allOf — the own property must survive the intersection.
- */
-export type ExtendedPet = {
-    kind: "extended";
-} & Pet;
-
-/**
- * Narrow a `PetBulkSuccessItem | PetBulkErrorItem` to `PetBulkSuccessItem` via its `status` discriminant.
- */
-export function isPetBulkSuccessItem(value: PetBulkSuccessItem | PetBulkErrorItem): value is PetBulkSuccessItem {
-    return (value as Record<string, unknown>)["status"] === "ok";
-}
-
-/**
- * Narrow a `PetBulkSuccessItem | PetBulkErrorItem` to `PetBulkErrorItem` via its `status` discriminant.
- */
-export function isPetBulkErrorItem(value: PetBulkSuccessItem | PetBulkErrorItem): value is PetBulkErrorItem {
-    return (value as Record<string, unknown>)["status"] === "error";
-}
-
-export type GetPetByIdResult = Pet;
-
-export type GetPetByIdVariables = {
-    id: number;
-};
-
-export type ListPetsResult = Pet[];
-
-export type ListPetsParams = {
-    /**
-     * Object-valued filter serialized as deepObject.
-     */
-    filter?: PetFilter;
-};
-
-export type ListPetsVariables = {
-    params?: ListPetsParams;
-};
-
-export type CreatePetResult = Pet;
-
-export type CreatePetBody = Omit<Pet, "id">;
-
-export type CreatePetVariables = {
-    body: CreatePetBody;
-};
-
-export type GetSlowPetResult = Pet;
-
-export type GetSlowPetVariables = {
-    id: number;
-};
-
-export type SearchBody = PetFilter;
-
-export type SearchVariables = {
-    body: SearchBody;
-};
-
-export type BulkUpsertPetsResult = PetBulkResult;
-
-export type BulkUpsertPetsBody = Pet[];
-
-export type BulkUpsertPetsVariables = {
-    body: BulkUpsertPetsBody;
-};
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    getPetById: {
-        args: {
-            id: number;
-        };
-        result: GetPetByIdResult;
-    };
-    listPets: {
-        args: {
-            params?: ListPetsParams;
-        };
-        result: ListPetsResult;
-    };
-    createPet: {
-        args: {
-            body: CreatePetBody;
-        };
-        result: CreatePetResult;
-    };
-    getSlowPet: {
-        args: {
-            id: number;
-        };
-        result: GetSlowPetResult;
-    };
-    search: {
-        args: {
-            body: SearchBody;
-        };
-        result: SearchResult;
-    };
-    bulkUpsertPets: {
-        args: {
-            body: BulkUpsertPetsBody;
-        };
-        result: BulkUpsertPetsResult;
-    };
-    getStatus: {
-        args: {};
-        result: Pet;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    getPetById: { id: "getPetById", method: "GET", path: "/pets/{id}", params: [{ name: "id", in: "path" }] },
-    listPets: { id: "listPets", method: "GET", path: "/pets", params: [{ name: "filter", in: "query", style: "deepObject", explode: true }] },
-    createPet: { id: "createPet", method: "POST", path: "/pets", body: { contentType: "application/json" } },
-    getSlowPet: { id: "getSlowPet", method: "GET", path: "/pets/{id}/cancel-test", params: [{ name: "id", in: "path" }] },
-    search: { id: "search", method: "POST", path: "/search", body: { contentType: "application/json" } },
-    bulkUpsertPets: { id: "bulkUpsertPets", method: "POST", path: "/pets/bulk", body: { contentType: "application/json" } },
-    getStatus: { id: "getStatus", method: "GET", path: "/status" }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — `@redocly/client-generator`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits `OPERATIONS` literals typed
- * `satisfies Record<string, OperationDescriptor>` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
- * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to `'json'` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
- * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real `ApiError` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call `parseAs` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of `data`/`error` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
- * streams and, for paginated operations, `item` (the page's element type) and — on
- * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
- * iteration unwraps the `Result` envelope the one-shot `result` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: `{}` has no required members, so
- * `{} extends A` is true exactly when every member of `A` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type `.pages()` yields: the RAW page declared by `page` (the generator
- * writes it only on result-mode paginated entries, whose `result` is the envelope),
- * or the method's own `result` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares `item` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
- * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
- * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
- * `onError` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(`Request failed with status ${status}`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
- * `filter=a/b` survives instead of `filter=a%2Fb`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
- * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
- * `deepObject` brackets, and `null`/`undefined` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(`${key}[${subKey}]`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. `%20` (not `+`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-      }
-    } else if (Object(value) === value) {
-      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
-          else params.append(`${key}[${subKey}]`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(`${key}=${encodeReserved(String(value))}`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? `${url}?${qs}` : url;
-}
-
-/**
- * Read the response body per `kind`. `'auto'` negotiates from the content type
- * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom `retryOn` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
- * unless `jitter === false`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * `createClient` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
- * to a plain record — spreading a `Headers` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
- * `onResponse` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * The optional behaviors `createClientCore` can dispatch to but never statically
- * imports. The package's public `createClient` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
- * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
- * are honored, and an omitted `explode` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller `init.headers` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
- * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's `error` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (`errorMode` is fixed at construction — `configure()`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
-    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
-    // basic/apiKey. `apiKey` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: `createClientCore` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
- * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, {});
-}
-
-export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS, { serverUrl: "http://localhost:3102" });
-
-export const { configure, use } = client;
-export const getPetById = (id: number, init: RequestOptions = {}) => client.getPetById({ id }, init);
-export const listPets = (params: {
-    /**
-     * Object-valued filter serialized as deepObject.
-     */
-    filter?: PetFilter;
-} = {}, init: RequestOptions = {}) => client.listPets({ params }, init);
-export const createPet = (body: Omit<Pet, "id">, init: RequestOptions = {}) => client.createPet({ body }, init);
-export const getSlowPet = (id: number, init: RequestOptions = {}) => client.getSlowPet({ id }, init);
-export const search = (body: PetFilter, init: RequestOptions = {}) => client.search({ body }, init);
-export const bulkUpsertPets = (body: Pet[], init: RequestOptions = {}) => client.bulkUpsertPets({ body }, init);
-export const getStatus = (init: RequestOptions = {}) => client.getStatus({}, init);
diff --git a/tests/e2e/generate-client/base.test.ts b/tests/e2e/generate-client/base.test.ts
index 895dd02de1..d5973551c9 100644
--- a/tests/e2e/generate-client/base.test.ts
+++ b/tests/e2e/generate-client/base.test.ts
@@ -1,11 +1,11 @@
-import { spawn, spawnSync, type ChildProcess } from 'node:child_process';
+import { spawnSync, type ChildProcess } from 'node:child_process';
 import { existsSync, readFileSync, rmSync } from 'node:fs';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
+import { generate, killServer, repoRoot, startServer } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const indexEntryPoint = join(repoRoot, 'packages/cli/lib/index.js');
 const fixture = join(__dirname, 'fixtures/base.yaml');
 const consumerDir = join(__dirname, 'base-consumer');
 const generatedFile = join(consumerDir, 'api.ts');
@@ -16,45 +16,6 @@ const cancelScript = join(consumerDir, 'index-cancel.ts');
 const SERVER_PORT = 3102;
 const SERVER_BASE = `http://127.0.0.1:${SERVER_PORT}`;
 
-async function waitForServerReady(timeoutMs: number): Promise<void> {
-  const deadline = Date.now() + timeoutMs;
-  let lastError: unknown;
-  while (Date.now() < deadline) {
-    try {
-      const response = await fetch(`${SERVER_BASE}/__test__/ready`);
-      if (response.ok) return;
-      lastError = `readiness probe returned HTTP ${response.status}`;
-    } catch (error) {
-      lastError = error;
-    }
-    await new Promise((r) => setTimeout(r, 100));
-  }
-  throw new Error(
-    `Base server did not become ready within ${timeoutMs}ms: ${
-      lastError instanceof Error ? lastError.message : String(lastError)
-    }`
-  );
-}
-
-function killServer(server: ChildProcess): Promise<void> {
-  return new Promise((resolveFn) => {
-    if (!server.pid || server.exitCode !== null) {
-      resolveFn();
-      return;
-    }
-    const onExit = (): void => resolveFn();
-    server.once('exit', onExit);
-    server.kill('SIGTERM');
-    setTimeout(() => {
-      server.removeListener('exit', onExit);
-      if (server.exitCode === null) {
-        server.kill('SIGKILL');
-      }
-      resolveFn();
-    }, 2_000);
-  });
-}
-
 describe('generate-client base consumer (single-file output)', () => {
   let serverProcess: ChildProcess | undefined;
 
@@ -63,17 +24,13 @@ describe('generate-client base consumer (single-file output)', () => {
       rmSync(generatedFile, { force: true });
     }
 
-    serverProcess = spawn('npx', ['tsx', serverScript], {
-      cwd: consumerDir,
-      env: { ...process.env, BASE_SERVER_PORT: String(SERVER_PORT) },
-      stdio: ['ignore', 'pipe', 'pipe'],
-    });
-
-    serverProcess.stderr?.on('data', (chunk: Buffer) => {
-      process.stderr.write(`[base-server stderr] ${chunk.toString()}`);
-    });
-
-    await waitForServerReady(15_000);
+    serverProcess = await startServer(
+      serverScript,
+      consumerDir,
+      { BASE_SERVER_PORT: String(SERVER_PORT) },
+      SERVER_BASE,
+      'base-server'
+    );
   }, 30_000);
 
   afterAll(async () => {
@@ -83,12 +40,7 @@ describe('generate-client base consumer (single-file output)', () => {
   });
 
   test('end-to-end: generate single file, type-check, run, assert real call', async () => {
-    const generateResult = spawnSync(
-      'node',
-      [indexEntryPoint, 'generate-client', fixture, '--output', generatedFile],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(generateResult.status, `generate-client stderr:\n${generateResult.stderr}`).toBe(0);
+    generate(fixture, generatedFile);
 
     expect(existsSync(generatedFile)).toBe(true);
     const generated = readFileSync(generatedFile, 'utf-8');
diff --git a/tests/e2e/generate-client/cafe-consumer/.gitignore b/tests/e2e/generate-client/cafe-consumer/.gitignore
new file mode 100644
index 0000000000..35d9162694
--- /dev/null
+++ b/tests/e2e/generate-client/cafe-consumer/.gitignore
@@ -0,0 +1,2 @@
+# Generated fresh by the owning suite in beforeAll; excluded from the root typecheck.
+api.ts
diff --git a/tests/e2e/generate-client/cafe-consumer/api.ts b/tests/e2e/generate-client/cafe-consumer/api.ts
deleted file mode 100644
index f981f39ff6..0000000000
--- a/tests/e2e/generate-client/cafe-consumer/api.ts
+++ /dev/null
@@ -1,1968 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Redocly Cafe (v1.0.0)
- * Demo API for cafe operators (not customers) to manage menus, orders, and revenue.
- * Create API credentials and try it yourself in a realistic OpenAPI workflow.
- * 
- */
-
-export type Page = {
-    /**
-     * Use with the `after` query parameter to load the next page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    endCursor: string | null;
-    /**
-     * Use with the `before` query parameter to load the previous page of data.
-     * When `null`, there is no data.
-     * The cursor is opaque and internal structure is subject to change.
-     */
-    startCursor: string | null;
-    /**
-     * Indicates if there is a next page with items.
-     */
-    hasNextPage: boolean;
-    /**
-     * Indicates if there is a previous page with items.
-     */
-    hasPrevPage: boolean;
-    /**
-     * Value showing how many items are in the page limit.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit: number;
-    /**
-     * Count of items across all pages.
-     * @minimum 0
-     */
-    total: number;
-};
-
-export type MenuBaseItem = {
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt: string;
-    /**
-     * Menu item ID. Unique identifier prefixed with `prd_`.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    readonly id: string;
-    /**
-     * Entity name.
-     */
-    readonly object: "menuItem";
-    /**
-     * Menu item name.
-     * @minLength 1
-     * @maxLength 50
-     */
-    name: string;
-    /**
-     * Price in cents.
-     * @minimum 0
-     */
-    price: number;
-    /**
-     * Photo of the menu item. Must be a PNG image and less than 1MB.
-     * @format binary
-     */
-    photo?: Blob | null;
-    /**
-     * Photo URL of the menu item.
-     * @format uri
-     */
-    readonly photoUrl?: string;
-    photoTextDescription?: string | null;
-};
-
-export type Beverage = {
-    /**
-     * Menu item category.
-     */
-    category: "beverage";
-    /**
-     * Size of the beverage in milliliters.
-     * @exclusiveMinimum 0
-     */
-    volume: number;
-    /**
-     * Indicates if the beverage contains caffeine.
-     */
-    containsCaffeine: boolean;
-} & MenuBaseItem;
-
-export type Dessert = {
-    /**
-     * Menu item category.
-     */
-    category: "dessert";
-    /**
-     * Amount of calories.
-     * @exclusiveMinimum 0
-     */
-    calories: number;
-} & MenuBaseItem;
-
-export type MenuItem = Beverage | Dessert;
-
-export type MenuItemList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: MenuItem[];
-};
-
-export type Error = {
-    /**
-     * URI reference that identifies the problem type.
-     * @format uri-reference
-     */
-    type: string;
-    /**
-     * Short summary of the problem type.
-     */
-    title: string;
-    /**
-     * HTTP status code generated by the origin server for this occurrence of the problem.
-     * @minimum 100
-     * @exclusiveMaximum 600
-     * @format int32
-     */
-    status: number;
-    /**
-     * URI reference that identifies the specific occurrence of the problem, e.g. by adding a fragment identifier or sub-path to the problem type.
-     * May be used to locate the root of this problem in the source code.
-     * @format uri-reference
-     */
-    instance?: string;
-    /**
-     * Additional error details.
-     */
-    details?: Record<string, unknown>;
-};
-
-/**
- * Order status.
- */
-export type OrderStatus = "placed" | "preparing" | "completed" | "canceled";
-
-export const OrderStatus = {
-    placed: "placed",
-    preparing: "preparing",
-    completed: "completed",
-    canceled: "canceled"
-} as const;
-
-export type Order = {
-    /**
-     * Order ID. Unique identifier prefixed with `ord_`.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     * @format ulid
-     */
-    readonly id?: string;
-    /**
-     * Entity name.
-     */
-    readonly object?: "order";
-    /**
-     * Name of the customer who placed the order.
-     * Must start and end with a letter, and can contain letters, spaces, hyphens, and apostrophes (e.g., "John Doe", "Mary-Jane", "O'Brien").
-     * @minLength 1
-     * @maxLength 100
-     * @pattern ^[A-Za-z]+(?:[\s'-][A-Za-z]+)*$
-     */
-    customerName: string;
-    readonly status?: OrderStatus;
-    /**
-     * Total order price in cents.
-     * @minimum 0
-     */
-    readonly totalPrice?: number;
-    /**
-     * Created date.
-     * @format date-time
-     */
-    readonly createdAt?: string;
-    /**
-     * Updated date.
-     * @format date-time
-     */
-    readonly updatedAt?: string;
-    /**
-     * List of items to include in the order.
-     * @minItems 1
-     */
-    orderItems: {
-        /**
-         * ID of the menu item to add to the order.
-         * @format ulid
-         */
-        menuItemId: string;
-        /**
-         * Quantity of the menu item.
-         * @minimum 1
-         */
-        quantity: number;
-        /**
-         * Discount amount in cents (absolute value).
-         * @minimum 0
-         */
-        discount?: number;
-        /**
-         * Optional comment for the order item (e.g., "No sugar").
-         * @maxLength 500
-         */
-        comment?: string;
-    }[];
-};
-
-export type OrderList = {
-    /**
-     * Entity name.
-     */
-    object: "list";
-    page: Page;
-    items: Order[];
-};
-
-export type OrderItem = {
-    /**
-     * ID of the menu item to add to the order.
-     */
-    menuItemId: string;
-    /**
-     * Menu item that is part of the order.
-     */
-    readonly menuItem?: MenuItem;
-    /**
-     * Quantity of the menu item.
-     * @minimum 1
-     */
-    quantity: number;
-    /**
-     * Discount amount in cents (absolute value).
-     * @minimum 0
-     */
-    discount?: number;
-    /**
-     * Optional comment for the order item (e.g., "No sugar").
-     * @maxLength 500
-     */
-    comment?: string;
-};
-
-/**
- * Revenue statistics for a given date range.
- */
-export type RevenueStatistics = {
-    /**
-     * Total revenue in cents from completed orders.
-     * @minimum 0
-     * @format float
-     */
-    revenue: number;
-    /**
-     * Average order amount in cents (calculated from completed orders only).
-     * @minimum 0
-     * @format float
-     */
-    averageOrderAmount: number;
-    /**
-     * Total number of orders (all statuses) in the date range.
-     * @minimum 0
-     */
-    totalOrders: number;
-    /**
-     * Number of placed orders.
-     * @minimum 0
-     */
-    placedOrders: number;
-    /**
-     * Number of preparing orders.
-     * @minimum 0
-     */
-    preparingOrders: number;
-    /**
-     * Number of completed orders.
-     * @minimum 0
-     */
-    completedOrders: number;
-    /**
-     * Number of canceled orders.
-     * @minimum 0
-     */
-    canceledOrders: number;
-    /**
-     * Start date of the revenue calculation period.
-     * @format date
-     */
-    startDate: string;
-    /**
-     * End date of the revenue calculation period.
-     * @format date
-     */
-    endDate: string;
-};
-
-export type RegisterClientObject = {
-    /**
-     * Client name.
-     */
-    name: string;
-    /**
-     * List of redirect URIs (optional, defaults to empty array).
-     */
-    redirectUris?: string[];
-    /**
-     * List of scopes.
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types.
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-/**
- * OAuth2 client registration response. Per RFC 7591, includes the client identifier, secret, timestamps, and all registered client metadata.
- */
-export type OAuth2Client = {
-    /**
-     * Client identifier issued by the authorization server.
-     */
-    clientId: string;
-    /**
-     * Client secret issued by the authorization server.
-     */
-    clientSecret: string;
-    /**
-     * Time when the client_id is issued, represented as seconds since epoch (RFC7591).
-     * @format int64
-     */
-    clientIdIssuedAt: number;
-    /**
-     * Time at which the client_secret expires, represented as seconds since epoch. 0 indicates the secret does not expire (RFC 7591).
-     * @format int64
-     */
-    clientSecretExpiresAt: number;
-    /**
-     * Client name (registered metadata).
-     */
-    name?: string;
-    /**
-     * List of redirect URIs (registered metadata).
-     */
-    redirectUris?: string[];
-    /**
-     * URL of the client configuration endpoint for managing this client registration (RFC 7592).
-     * @format uri
-     */
-    registrationClientUri: string;
-    /**
-     * Access token to be used at the client configuration endpoint for managing this client registration (RFC 7592).
-     */
-    registrationAccessToken: string;
-    /**
-     * List of scopes (registered metadata).
-     */
-    scopes?: ("menu:read" | "menu:write" | "orders:read" | "orders:write")[];
-    /**
-     * List of grant types (registered metadata).
-     */
-    grantTypes?: ("authorization_code" | "client_credentials")[];
-};
-
-export type OrderNotification = {
-    /**
-     * Unique order identifier.
-     */
-    orderId: string;
-    orderStatus: OrderStatus;
-    /**
-     * When the event occurred.
-     * @format date-time
-     */
-    timestamp: string;
-};
-
-/**
- * Narrow a `MenuItem` to `Beverage` via its `category` discriminant.
- */
-export function isBeverage(value: MenuItem): value is Beverage {
-    return (value as Record<string, unknown>)["category"] === "beverage";
-}
-
-/**
- * Narrow a `MenuItem` to `Dessert` via its `category` discriminant.
- */
-export function isDessert(value: MenuItem): value is Dessert {
-    return (value as Record<string, unknown>)["category"] === "dessert";
-}
-
-export type ListMenuItemsResult = MenuItemList;
-
-export type ListMenuItemsParams = {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-};
-
-export type ListMenuItemsVariables = {
-    params?: ListMenuItemsParams;
-};
-
-export type CreateMenuItemResult = MenuItem;
-
-export type CreateMenuItemBody = FormData;
-
-export type CreateMenuItemVariables = {
-    body: CreateMenuItemBody;
-};
-
-export type DeleteMenuItemResult = void;
-
-export type DeleteMenuItemVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-};
-
-export type GetMenuItemPhotoResult = Blob | string;
-
-export type GetMenuItemPhotoParams = {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-};
-
-export type GetMenuItemPhotoVariables = {
-    /**
-     * ID of the menu item to retrieve.
-     * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    menuItemId: string;
-    params?: GetMenuItemPhotoParams;
-};
-
-export type ListOrdersResult = OrderList;
-
-export type ListOrdersParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-};
-
-export type ListOrdersVariables = {
-    params?: ListOrdersParams;
-};
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-export type GetOrderByIdResult = Order;
-
-export type GetOrderByIdHeaders = {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-};
-
-export type GetOrderByIdVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    headers?: GetOrderByIdHeaders;
-};
-
-export type DeleteOrderResult = void;
-
-export type DeleteOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-};
-
-export type UpdateOrderResult = Order;
-
-export type UpdateOrderBody = {
-    status: OrderStatus;
-};
-
-export type UpdateOrderVariables = {
-    /**
-     * ID of the order to retrieve.
-     * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-     */
-    orderId: string;
-    body?: UpdateOrderBody;
-};
-
-export type ListOrderItemsResult = OrderItem[];
-
-export type ListOrderItemsParams = {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-};
-
-export type ListOrderItemsVariables = {
-    params?: ListOrderItemsParams;
-};
-
-export type GetRevenueResult = RevenueStatistics;
-
-export type GetRevenueParams = {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-};
-
-export type GetRevenueVariables = {
-    params?: GetRevenueParams;
-};
-
-export type RegisterOAuth2ClientResult = OAuth2Client;
-
-export type RegisterOAuth2ClientBody = RegisterClientObject;
-
-export type RegisterOAuth2ClientVariables = {
-    body: RegisterOAuth2ClientBody;
-};
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    listMenuItems: {
-        args: {
-            params?: ListMenuItemsParams;
-        };
-        result: ListMenuItemsResult;
-    };
-    createMenuItem: {
-        args: {
-            body: CreateMenuItemBody;
-        };
-        result: CreateMenuItemResult;
-    };
-    deleteMenuItem: {
-        args: {
-            /**
-             * ID of the menu item to retrieve.
-             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            menuItemId: string;
-        };
-        result: DeleteMenuItemResult;
-    };
-    getMenuItemPhoto: {
-        args: {
-            /**
-             * ID of the menu item to retrieve.
-             * @pattern ^prd_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            menuItemId: string;
-            params?: GetMenuItemPhotoParams;
-        };
-        result: GetMenuItemPhotoResult;
-    };
-    listOrders: {
-        args: {
-            params?: ListOrdersParams;
-        };
-        result: ListOrdersResult;
-    };
-    createOrder: {
-        args: {
-            body: CreateOrderBody;
-        };
-        result: CreateOrderResult;
-    };
-    getOrderById: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-            headers?: GetOrderByIdHeaders;
-        };
-        result: GetOrderByIdResult;
-    };
-    deleteOrder: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-        };
-        result: DeleteOrderResult;
-    };
-    updateOrder: {
-        args: {
-            /**
-             * ID of the order to retrieve.
-             * @pattern ^ord_[0-9abcdefghjkmnpqrstvwxyz]{26}$
-             */
-            orderId: string;
-            body?: UpdateOrderBody;
-        };
-        result: UpdateOrderResult;
-    };
-    listOrderItems: {
-        args: {
-            params?: ListOrderItemsParams;
-        };
-        result: ListOrderItemsResult;
-    };
-    getRevenue: {
-        args: {
-            params?: GetRevenueParams;
-        };
-        result: GetRevenueResult;
-    };
-    registerOAuth2Client: {
-        args: {
-            body: RegisterOAuth2ClientBody;
-        };
-        result: RegisterOAuth2ClientResult;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", tags: ["Products"], params: [{ name: "after", in: "query" }, { name: "before", in: "query" }, { name: "sort", in: "query" }, { name: "filter", in: "query" }, { name: "search", in: "query" }, { name: "limit", in: "query" }] },
-    createMenuItem: { id: "createMenuItem", method: "POST", path: "/menu", tags: ["Products"], body: { contentType: "multipart/form-data" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    deleteMenuItem: { id: "deleteMenuItem", method: "DELETE", path: "/menu/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getMenuItemPhoto: { id: "getMenuItemPhoto", method: "GET", path: "/menu-item-images/{menuItemId}", tags: ["Products"], params: [{ name: "menuItemId", in: "path" }, { name: "photoSize", in: "query" }], responseKind: "blob" },
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", tags: ["Orders"], params: [{ name: "filter", in: "query" }, { name: "sort", in: "query" }, { name: "limit", in: "query" }, { name: "after", in: "query" }, { name: "before", in: "query" }, { name: "search", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", tags: ["Orders"], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getOrderById: { id: "getOrderById", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "X-Request-Id", in: "header" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    deleteOrder: { id: "deleteOrder", method: "DELETE", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], responseKind: "void", security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    updateOrder: { id: "updateOrder", method: "PATCH", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }], body: { contentType: "application/json" }, security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    listOrderItems: { id: "listOrderItems", method: "GET", path: "/order-items", tags: ["Orders"], params: [{ name: "filter", in: "query" }], security: [[{ scheme: "OAuth2", kind: "bearer" }]] },
-    getRevenue: { id: "getRevenue", method: "GET", path: "/revenue", tags: ["Statistics"], params: [{ name: "startDate", in: "query" }, { name: "endDate", in: "query" }], security: [[{ scheme: "ApiKey", kind: "apiKey", name: "X-API-Key", in: "header" }]] },
-    registerOAuth2Client: { id: "registerOAuth2Client", method: "POST", path: "/oauth2/register", tags: ["Authorization"], body: { contentType: "application/json" } }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
-    tags: readonly string[];
-}>["tags"][number];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — `@redocly/client-generator`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits `OPERATIONS` literals typed
- * `satisfies Record<string, OperationDescriptor>` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
- * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to `'json'` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
- * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real `ApiError` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call `parseAs` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of `data`/`error` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
- * streams and, for paginated operations, `item` (the page's element type) and — on
- * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
- * iteration unwraps the `Result` envelope the one-shot `result` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: `{}` has no required members, so
- * `{} extends A` is true exactly when every member of `A` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type `.pages()` yields: the RAW page declared by `page` (the generator
- * writes it only on result-mode paginated entries, whose `result` is the envelope),
- * or the method's own `result` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares `item` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
- * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
- * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
- * `onError` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(`Request failed with status ${status}`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
- * `filter=a/b` survives instead of `filter=a%2Fb`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
- * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
- * `deepObject` brackets, and `null`/`undefined` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(`${key}[${subKey}]`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. `%20` (not `+`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-      }
-    } else if (Object(value) === value) {
-      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
-          else params.append(`${key}[${subKey}]`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(`${key}=${encodeReserved(String(value))}`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? `${url}?${qs}` : url;
-}
-
-/**
- * Read the response body per `kind`. `'auto'` negotiates from the content type
- * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom `retryOn` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
- * unless `jitter === false`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/** Resolve a credential: a literal passes through; a function is awaited per request. */
-async function resolveToken(provider: TokenProvider): Promise<string> {
-  return typeof provider === 'function' ? await provider() : provider;
-}
-
-/** UTF-8-safe base64: bare `btoa` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
-function encodeBase64(text: string): string {
-  let binary = '';
-  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
-  return btoa(binary);
-}
-
-/** Whether a credential for this scheme is configured on the instance. */
-function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
-  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
-  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
-  return config.auth?.basic !== undefined;
-}
-
-/**
- * Build the auth headers/query for one operation's `security` OR-alternatives from the
- * instance credentials (`config.auth`) — capability module, wired into `createClient`.
- * The first alternative whose schemes (an AND-set) are all configured is applied, so
- * "bearer OR apiKey" works with either credential and never sends both. When none is
- * fully configured, the first alternative's configured schemes are still sent (the
- * server rejects the request, mirroring the previous behavior).
- * Cookie-borne apiKeys fold into a single `Cookie` header joined with `; `.
- */
-async function resolveAuth(
-  security: readonly (readonly SecuritySpec[])[],
-  config: ClientConfig
-): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
-  const alternative =
-    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
-    security[0] ??
-    [];
-  const headers: Record<string, string> = {};
-  const query: Record<string, string> = {};
-  const cookies: string[] = [];
-  for (const scheme of alternative) {
-    if (scheme.kind === 'apiKey') {
-      const provider = config.auth?.apiKey?.[scheme.scheme];
-      if (provider === undefined) continue;
-      const value = await resolveToken(provider);
-      if (scheme.in === 'header') headers[scheme.name] = value;
-      else if (scheme.in === 'query') query[scheme.name] = value;
-      // Cookie values may contain reserved characters (`;`, `=`, space, …); percent-encode
-      // so the credential can't break the `Cookie` header syntax.
-      else cookies.push(`${scheme.name}=${encodeURIComponent(value)}`);
-    } else if (scheme.kind === 'bearer') {
-      const provider = config.auth?.bearer;
-      if (provider !== undefined) headers.Authorization = `Bearer ${await resolveToken(provider)}`;
-    } else {
-      const basic = config.auth?.basic;
-      if (basic !== undefined) {
-        headers.Authorization = `Basic ${encodeBase64(`${basic.username}:${basic.password}`)}`;
-      }
-    }
-  }
-  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
-  return { headers, query };
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * `createClient` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
- * to a plain record — spreading a `Headers` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
- * `onResponse` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * The optional behaviors `createClientCore` can dispatch to but never statically
- * imports. The package's public `createClient` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
- * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
- * are honored, and an omitted `explode` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller `init.headers` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
- * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's `error` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (`errorMode` is fixed at construction — `configure()`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
-    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
-    // basic/apiKey. `apiKey` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: `createClientCore` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
- * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth });
-}
-
-export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "http://127.0.0.1:3101" });
-
-export const { configure, use } = client;
-export const setBearer = client.auth.bearer;
-export const setApiKey = (value: TokenProvider) => client.auth.apiKey("ApiKey", value);
-export const listMenuItems = (params: {
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
-export const createMenuItem = (body: FormData, init: RequestOptions = {}) => client.createMenuItem({ body }, init);
-export const deleteMenuItem = (menuItemId: string, init: RequestOptions = {}) => client.deleteMenuItem({ menuItemId }, init);
-export const getMenuItemPhoto = (menuItemId: string, params: {
-    /**
-     * Photo size to retrieve.
-     */
-    photoSize?: "thumbnail" | "medium" | "large";
-} = {}, init: RequestOptions = {}) => client.getMenuItemPhoto({ menuItemId, params }, init);
-export const listOrders = (params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-    /**
-     * To sort by id in descending order use `-id`.
-     * To sort by id in ascending order use `id`.
-     */
-    sort?: string;
-    /**
-     * Use to return a number of results per page.
-     * If there is more data, use in combination with `after` to page through the data.
-     * @minimum 1
-     * @maximum 100
-     */
-    limit?: number;
-    /**
-     * Use the `endCursor` as a value for the `after` parameter to get the next page.
-     */
-    after?: string;
-    /**
-     * Use the `startCursor` as a value for the `before` parameter to get the next page.
-     */
-    before?: string;
-    /**
-     * Performs a case-insensitive text search across relevant fields in the collection.
-     *
-     * **Fields searched depend on the endpoint:**
-     * - **Menu items:** `name`, `photoTextDescription`
-     * - **Orders:** `customerName`, `id`
-     *
-     * Returns items where any of the searchable fields contain the search term as a substring.
-     */
-    search?: string;
-} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init);
-export const createOrder = (body: Omit<Order, "id" | "object" | "status" | "totalPrice" | "createdAt" | "updatedAt">, init: RequestOptions = {}) => client.createOrder({ body }, init);
-export const getOrderById = (orderId: string, headers: {
-    /**
-     * Optional client-supplied correlation ID, echoed in logs and traces.
-     * @format uuid
-     */
-    "X-Request-Id"?: string;
-} = {}, init: RequestOptions = {}) => client.getOrderById({ orderId, headers }, init);
-export const deleteOrder = (orderId: string, init: RequestOptions = {}) => client.deleteOrder({ orderId }, init);
-export const updateOrder = (orderId: string, body?: {
-    status: OrderStatus;
-}, init: RequestOptions = {}) => client.updateOrder({ orderId, body }, init);
-export const listOrderItems = (params: {
-    /**
-     * Filters the collection items using space-separated `field:value` pairs.
-     *
-     * **Format:** `field1:value1 field2:value2`
-     *
-     * **Supported operators:**
-     * - `field:value` - Exact match
-     * - `field:value1,value2` - Match any of the comma-separated values (OR)
-     * - Time ranges: Use `30d` (30 days), `7d` (7 days), `1h` (1 hour), etc.
-     *
-     * **Examples:**
-     * - `status:placed` - Filter by single status.
-     * - `status:placed,completed` - Filter by multiple statuses.
-     * - `createdAt:30d` - Filter orders created in the last 30 days.
-     * - `orderId:ord_01h1s5z6vf2mm1mz3hevnn9va7` - Filter by specific order ID.
-     * - `status:placed createdAt:7d` - Combine multiple filters.
-     */
-    filter?: string;
-} = {}, init: RequestOptions = {}) => client.listOrderItems({ params }, init);
-export const getRevenue = (params: {
-    /**
-     * Start date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to 30 days ago if not provided.
-     * @format date
-     */
-    startDate?: string;
-    /**
-     * End date for the revenue calculation period (ISO 8601 datetime format).
-     * Defaults to current time if not provided.
-     * @format date
-     */
-    endDate?: string;
-} = {}, init: RequestOptions = {}) => client.getRevenue({ params }, init);
-export const registerOAuth2Client = (body: RegisterClientObject, init: RequestOptions = {}) => client.registerOAuth2Client({ body }, init);
diff --git a/tests/e2e/generate-client/cafe.test.ts b/tests/e2e/generate-client/cafe.test.ts
index f0f959edcc..b409f5cb3f 100644
--- a/tests/e2e/generate-client/cafe.test.ts
+++ b/tests/e2e/generate-client/cafe.test.ts
@@ -1,11 +1,11 @@
-import { spawn, spawnSync, type ChildProcess } from 'node:child_process';
+import { spawnSync, type ChildProcess } from 'node:child_process';
 import { existsSync, readFileSync, rmSync } from 'node:fs';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
+import { cliEntry, killServer, repoRoot, startServer } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
 const fixture = join(__dirname, 'fixtures/cafe.yaml');
 const consumerDir = join(__dirname, 'cafe-consumer');
 const generatedFile = join(consumerDir, 'api.ts');
@@ -16,45 +16,6 @@ const configureScript = join(consumerDir, 'index-configure.ts');
 const SERVER_PORT = 3101;
 const SERVER_BASE = `http://127.0.0.1:${SERVER_PORT}`;
 
-async function waitForServerReady(timeoutMs: number): Promise<void> {
-  const deadline = Date.now() + timeoutMs;
-  let lastError: unknown;
-  while (Date.now() < deadline) {
-    try {
-      const response = await fetch(`${SERVER_BASE}/__test__/ready`);
-      if (response.ok) return;
-      lastError = `readiness probe returned HTTP ${response.status}`;
-    } catch (error) {
-      lastError = error;
-    }
-    await new Promise((r) => setTimeout(r, 100));
-  }
-  throw new Error(
-    `Cafe mock server did not become ready within ${timeoutMs}ms: ${
-      lastError instanceof Error ? lastError.message : String(lastError)
-    }`
-  );
-}
-
-function killServer(server: ChildProcess): Promise<void> {
-  return new Promise((resolveFn) => {
-    if (!server.pid || server.exitCode !== null) {
-      resolveFn();
-      return;
-    }
-    const onExit = (): void => resolveFn();
-    server.once('exit', onExit);
-    server.kill('SIGTERM');
-    setTimeout(() => {
-      server.removeListener('exit', onExit);
-      if (server.exitCode === null) {
-        server.kill('SIGKILL');
-      }
-      resolveFn();
-    }, 2_000);
-  });
-}
-
 type LogEntry = {
   method: string;
   url: string;
@@ -82,17 +43,13 @@ describe('generate-client end-to-end (cafe.yaml)', () => {
       rmSync(generatedFile, { force: true });
     }
 
-    serverProcess = spawn('npx', ['tsx', serverScript], {
-      cwd: consumerDir,
-      env: { ...process.env, CAFE_SERVER_PORT: String(SERVER_PORT) },
-      stdio: ['ignore', 'pipe', 'pipe'],
-    });
-
-    serverProcess.stderr?.on('data', (chunk: Buffer) => {
-      process.stderr.write(`[cafe-server stderr] ${chunk.toString()}`);
-    });
-
-    await waitForServerReady(15_000);
+    serverProcess = await startServer(
+      serverScript,
+      consumerDir,
+      { CAFE_SERVER_PORT: String(SERVER_PORT) },
+      SERVER_BASE,
+      'cafe-server'
+    );
 
     // First pass: capture the *canonical* output (spec-derived serverUrl) for the file snapshot.
     // We don't keep this on disk — the consumer needs the mock-targeted variant.
diff --git a/tests/e2e/generate-client/error-mode.test.ts b/tests/e2e/generate-client/error-mode.test.ts
index 2238952239..e06ffb4bb5 100644
--- a/tests/e2e/generate-client/error-mode.test.ts
+++ b/tests/e2e/generate-client/error-mode.test.ts
@@ -10,36 +10,14 @@
 // and covered by the existing throw-mode base e2e. The split case guards that
 // the entry bakes `errorMode: "result"` into the client config too.
 import { spawnSync } from 'node:child_process';
-import {
-  existsSync,
-  mkdtempSync,
-  readdirSync,
-  readFileSync,
-  rmSync,
-  statSync,
-  writeFileSync,
-} from 'node:fs';
+import { existsSync, mkdtempSync, readdirSync, readFileSync, rmSync, statSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
-const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+import { generate, strictTypecheck, tscBin } from './helpers.js';
 
-const TSCONFIG = {
-  compilerOptions: {
-    module: 'nodenext',
-    moduleResolution: 'nodenext',
-    target: 'es2022',
-    lib: ['ES2022', 'DOM'],
-    strict: true,
-    noEmit: true,
-    skipLibCheck: true,
-    types: [],
-  },
-};
+const __dirname = dirname(fileURLToPath(import.meta.url));
 
 /** Recursively collect every generated `.ts` file under `dir`. */
 function collectTsFiles(dir: string): string[] {
@@ -56,20 +34,7 @@ describe('generate-client error mode', () => {
   it('single-file result mode: typed error alias + Result terminal, strict tsc passes', () => {
     const dir = mkdtempSync(join(tmpdir(), 'ots-errmode-single-'));
     const out = join(dir, 'client.ts');
-    const res = spawnSync(
-      'node',
-      [
-        cli,
-        'generate-client',
-        join(__dirname, 'fixtures', 'error-mode.yaml'),
-        '--output',
-        out,
-        '--error-mode',
-        'result',
-      ],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(res.status, res.stderr).toBe(0);
+    generate(join(__dirname, 'fixtures', 'error-mode.yaml'), out, ['--error-mode', 'result']);
     expect(existsSync(out)).toBe(true);
 
     const generated = readFileSync(out, 'utf-8');
@@ -79,13 +44,7 @@ describe('generate-client error mode', () => {
     // The mode is baked into the client instance config (configure() cannot flip it).
     expect(generated).toContain('errorMode: "result"');
 
-    writeFileSync(
-      join(dir, 'tsconfig.json'),
-      JSON.stringify({ ...TSCONFIG, include: ['client.ts'] }),
-      'utf-8'
-    );
-    const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
-    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+    strictTypecheck(dir, ['client.ts']);
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
@@ -93,22 +52,12 @@ describe('generate-client error mode', () => {
     const dir = mkdtempSync(join(tmpdir(), 'ots-errmode-split-'));
     // Split mode takes a `.ts` entry path; the schemas file is written beside it.
     const entry = join(dir, 'client.ts');
-    const res = spawnSync(
-      'node',
-      [
-        cli,
-        'generate-client',
-        join(__dirname, 'fixtures', 'error-mode.yaml'),
-        '--output',
-        entry,
-        '--error-mode',
-        'result',
-        '--output-mode',
-        'split',
-      ],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(res.status, res.stderr).toBe(0);
+    generate(join(__dirname, 'fixtures', 'error-mode.yaml'), entry, [
+      '--error-mode',
+      'result',
+      '--output-mode',
+      'split',
+    ]);
     expect(existsSync(entry)).toBe(true);
 
     const files = collectTsFiles(dir);
diff --git a/tests/e2e/generate-client/extension.test.ts b/tests/e2e/generate-client/extension.test.ts
index 7e4cfd3901..7a32f992b1 100644
--- a/tests/e2e/generate-client/extension.test.ts
+++ b/tests/e2e/generate-client/extension.test.ts
@@ -4,48 +4,22 @@
  * the generated runtime actually produced — proving that `serverUrl`, `config.headers`,
  * `onRequest`, transport-swap, and per-instance config observably take effect.
  */
-import { spawnSync } from 'node:child_process';
-import { existsSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { existsSync, mkdtempSync, rmSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { outdent } from 'outdent';
 
+import { generateInto, runConsumer } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
 const fixture = join(__dirname, 'fixtures/base.yaml');
-const tsxBin = join(repoRoot, 'node_modules/.bin/tsx');
-
-function generate(dir: string, extraArgs: string[] = []): void {
-  // Mark the temp dir as ESM so tsx runs the consumer with top-level await support.
-  writeFileSync(join(dir, 'package.json'), JSON.stringify({ type: 'module' }), 'utf-8');
-  const out = join(dir, 'client.ts');
-  const result = spawnSync(
-    'node',
-    [cliEntry, 'generate-client', fixture, '--output', out, ...extraArgs],
-    { encoding: 'utf-8', cwd: repoRoot }
-  );
-  if (result.status !== 0) throw new Error(`generate-client failed:\n${result.stderr}`);
-}
-
-function runConsumer(dir: string, script: string): unknown {
-  writeFileSync(join(dir, 'consumer.ts'), script, 'utf-8');
-  const result = spawnSync(tsxBin, [join(dir, 'consumer.ts')], {
-    encoding: 'utf-8',
-    cwd: repoRoot,
-  });
-  if (result.status !== 0) {
-    throw new Error(`consumer failed:\nstdout:\n${result.stdout}\nstderr:\n${result.stderr}`);
-  }
-  return JSON.parse(result.stdout.trim());
-}
 
 describe('extension contract — flat surface (configure)', () => {
   let dir = '';
   beforeAll(() => {
     dir = mkdtempSync(join(tmpdir(), 'ext-fn-'));
-    generate(dir);
+    generateInto(dir, fixture);
   }, 60_000);
   afterAll(() => {
     if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
@@ -115,7 +89,7 @@ describe('extension contract — per-instance config (createClient)', () => {
     // The temp dir lives INSIDE the repo so the consumer's import of
     // `@redocly/client-generator` resolves through the workspace node_modules symlink.
     dir = mkdtempSync(join(__dirname, '.tmp-ext-instance-'));
-    generate(dir, ['--runtime', 'package']);
+    generateInto(dir, fixture, ['--runtime', 'package']);
   }, 60_000);
   afterAll(() => {
     if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
diff --git a/tests/e2e/generate-client/generator-contract.test.ts b/tests/e2e/generate-client/generator-contract.test.ts
index eb17073793..1c7b982bcb 100644
--- a/tests/e2e/generate-client/generator-contract.test.ts
+++ b/tests/e2e/generate-client/generator-contract.test.ts
@@ -4,18 +4,18 @@
 import { spawnSync } from 'node:child_process';
 import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { outdent } from 'outdent';
 
+import { cliEntry, repoRoot, tscBin } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
 const cafe = join(__dirname, 'fixtures', 'cafe.yaml');
 const sse = join(__dirname, 'fixtures', 'sse.yaml');
 
 function run(args: string[]): { status: number | null; out: string } {
-  const res = spawnSync('node', [cli, 'generate-client', ...args], {
+  const res = spawnSync('node', [cliEntry, 'generate-client', ...args], {
     encoding: 'utf-8',
     cwd: repoRoot,
   });
@@ -148,7 +148,7 @@ describe('generate-client generator compatibility contract', () => {
     // The whole tree compiles (no import of the suppressed alias).
     const files = [join(dir, 'c.ts'), join(dir, 'c.tanstack.ts')];
     const tsc = spawnSync(
-      join(repoRoot, 'node_modules/.bin/tsc'),
+      tscBin,
       [
         '--noEmit',
         '--strict',
diff --git a/tests/e2e/generate-client/helpers.ts b/tests/e2e/generate-client/helpers.ts
new file mode 100644
index 0000000000..00ac8fd48b
--- /dev/null
+++ b/tests/e2e/generate-client/helpers.ts
@@ -0,0 +1,134 @@
+import { spawn, spawnSync, type ChildProcess } from 'node:child_process';
+import { writeFileSync } from 'node:fs';
+import { dirname, join, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+export const repoRoot = resolve(__dirname, '../../..');
+export const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
+export const tsxBin = join(repoRoot, 'node_modules/.bin/tsx');
+export const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+
+export const STRICT_TSCONFIG = {
+  compilerOptions: {
+    module: 'nodenext',
+    moduleResolution: 'nodenext',
+    target: 'es2022',
+    lib: ['ES2022', 'DOM'],
+    strict: true,
+    noEmit: true,
+    skipLibCheck: true,
+    types: [],
+  },
+};
+
+/** Run `generate-client` on a fixture; throws with the CLI's stderr on failure. */
+export function generate(fixture: string, outFile: string, extraArgs: string[] = []): void {
+  const result = spawnSync(
+    'node',
+    [cliEntry, 'generate-client', fixture, '--output', outFile, ...extraArgs],
+    { encoding: 'utf-8', cwd: repoRoot }
+  );
+  if (result.status !== 0) throw new Error(`generate-client failed:\n${result.stderr}`);
+}
+
+/**
+ * Generate `dir/client.ts` from a fixture and mark the dir as an ES module so `tsx`
+ * can run consumer scripts written next to it. Returns the generated entry path.
+ */
+export function generateInto(dir: string, fixture: string, extraArgs: string[] = []): string {
+  writeFileSync(join(dir, 'package.json'), JSON.stringify({ type: 'module' }), 'utf-8');
+  const outFile = join(dir, 'client.ts');
+  generate(fixture, outFile, extraArgs);
+  return outFile;
+}
+
+/** Write a strict tsconfig into `dir` and type-check it; throws with the tsc output on failure. */
+export function strictTypecheck(dir: string, include: string[] = ['**/*.ts']): void {
+  writeFileSync(
+    join(dir, 'tsconfig.json'),
+    JSON.stringify({ ...STRICT_TSCONFIG, include }),
+    'utf-8'
+  );
+  const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
+  if (tsc.status !== 0) throw new Error(`tsc failed:\n${tsc.stdout}\n${tsc.stderr}`);
+}
+
+/** Write `dir/consumer.ts` and run it with tsx; returns its parsed JSON stdout. */
+export function runConsumer(dir: string, script: string): unknown {
+  writeFileSync(join(dir, 'consumer.ts'), script, 'utf-8');
+  const result = spawnSync(tsxBin, [join(dir, 'consumer.ts')], {
+    encoding: 'utf-8',
+    cwd: repoRoot,
+  });
+  if (result.status !== 0) {
+    throw new Error(`consumer failed:\nstdout:\n${result.stdout}\nstderr:\n${result.stderr}`);
+  }
+  return JSON.parse(result.stdout.trim());
+}
+
+/**
+ * Spawn a consumer mock server (a tsx script exposing `GET /__test__/ready`) and wait
+ * until it answers. The caller owns the returned process — stop it with `killServer`.
+ */
+export async function startServer(
+  serverScript: string,
+  cwd: string,
+  env: Record<string, string>,
+  baseUrl: string,
+  label: string
+): Promise<ChildProcess> {
+  const server = spawn('npx', ['tsx', serverScript], {
+    cwd,
+    env: { ...process.env, ...env },
+    stdio: ['ignore', 'pipe', 'pipe'],
+  });
+  server.stderr?.on('data', (chunk: Buffer) => {
+    process.stderr.write(`[${label} stderr] ${chunk.toString()}`);
+  });
+  await waitForServerReady(baseUrl, 15_000, label);
+  return server;
+}
+
+export async function waitForServerReady(
+  baseUrl: string,
+  timeoutMs: number,
+  label: string
+): Promise<void> {
+  const deadline = Date.now() + timeoutMs;
+  let lastError: unknown;
+  while (Date.now() < deadline) {
+    try {
+      const response = await fetch(`${baseUrl}/__test__/ready`);
+      if (response.ok) return;
+      lastError = `readiness probe returned HTTP ${response.status}`;
+    } catch (error) {
+      lastError = error;
+    }
+    await new Promise((resolveFn) => setTimeout(resolveFn, 100));
+  }
+  throw new Error(
+    `${label} did not become ready within ${timeoutMs}ms: ${
+      lastError instanceof Error ? lastError.message : String(lastError)
+    }`
+  );
+}
+
+export function killServer(server: ChildProcess): Promise<void> {
+  return new Promise((resolveFn) => {
+    if (!server.pid || server.exitCode !== null) {
+      resolveFn();
+      return;
+    }
+    const onExit = (): void => resolveFn();
+    server.once('exit', onExit);
+    server.kill('SIGTERM');
+    setTimeout(() => {
+      server.removeListener('exit', onExit);
+      if (server.exitCode === null) {
+        server.kill('SIGKILL');
+      }
+      resolveFn();
+    }, 2_000);
+  });
+}
diff --git a/tests/e2e/generate-client/identifier-injection.test.ts b/tests/e2e/generate-client/identifier-injection.test.ts
index f26ee8f172..af9abed7e4 100644
--- a/tests/e2e/generate-client/identifier-injection.test.ts
+++ b/tests/e2e/generate-client/identifier-injection.test.ts
@@ -7,14 +7,10 @@
 import { spawnSync } from 'node:child_process';
 import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
+import { join } from 'node:path';
 import { outdent } from 'outdent';
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
-const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+import { cliEntry, repoRoot, tscBin } from './helpers.js';
 
 const HOSTILE_SPEC = outdent`
   openapi: 3.1.0
@@ -60,7 +56,7 @@ describe('generate-client identifier / comment injection', () => {
     const entry = join(dir, 'client.ts');
     const res = spawnSync(
       'node',
-      [cli, 'generate-client', join(dir, 'openapi.yaml'), '--output', entry],
+      [cliEntry, 'generate-client', join(dir, 'openapi.yaml'), '--output', entry],
       {
         encoding: 'utf-8',
         cwd: repoRoot,
diff --git a/tests/e2e/generate-client/middleware.test.ts b/tests/e2e/generate-client/middleware.test.ts
index 342e6f323d..efcf88d897 100644
--- a/tests/e2e/generate-client/middleware.test.ts
+++ b/tests/e2e/generate-client/middleware.test.ts
@@ -4,44 +4,16 @@
  * that `use()` registers middleware, `onRequest` runs in order, `onResponse` runs in
  * reverse (onion), `onError` chains, and configured middleware precedes `use()`.
  */
-import { spawnSync } from 'node:child_process';
-import { existsSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { existsSync, mkdtempSync, rmSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { outdent } from 'outdent';
 
+import { generateInto, runConsumer } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
 const fixture = join(__dirname, 'fixtures/base.yaml');
-const tsxBin = join(repoRoot, 'node_modules/.bin/tsx');
-
-function generate(dir: string, extraArgs: string[] = []): void {
-  writeFileSync(join(dir, 'package.json'), JSON.stringify({ type: 'module' }), 'utf-8');
-  const out = join(dir, 'client.ts');
-  const result = spawnSync(
-    'node',
-    [cliEntry, 'generate-client', fixture, '--output', out, ...extraArgs],
-    {
-      encoding: 'utf-8',
-      cwd: repoRoot,
-    }
-  );
-  if (result.status !== 0) throw new Error(`generate-client failed:\n${result.stderr}`);
-}
-
-function runConsumer(dir: string, script: string): unknown {
-  writeFileSync(join(dir, 'consumer.ts'), script, 'utf-8');
-  const result = spawnSync(tsxBin, [join(dir, 'consumer.ts')], {
-    encoding: 'utf-8',
-    cwd: repoRoot,
-  });
-  if (result.status !== 0) {
-    throw new Error(`consumer failed:\nstdout:\n${result.stdout}\nstderr:\n${result.stderr}`);
-  }
-  return JSON.parse(result.stdout.trim());
-}
 
 const OK = `new Response('[]', { status: 200, headers: { 'content-type': 'application/json' } })`;
 
@@ -49,7 +21,7 @@ describe('middleware — flat surface (use)', () => {
   let dir = '';
   beforeAll(() => {
     dir = mkdtempSync(join(tmpdir(), 'mw-fn-'));
-    generate(dir);
+    generateInto(dir, fixture);
   }, 60_000);
   afterAll(() => {
     if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
@@ -190,7 +162,7 @@ describe('middleware — multi-file output (split)', () => {
   let dir = '';
   beforeAll(() => {
     dir = mkdtempSync(join(tmpdir(), 'mw-split-'));
-    generate(dir, ['--output-mode', 'split']);
+    generateInto(dir, fixture, ['--output-mode', 'split']);
   }, 60_000);
   afterAll(() => {
     if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
@@ -217,7 +189,7 @@ describe('middleware — result error mode', () => {
   let dir = '';
   beforeAll(() => {
     dir = mkdtempSync(join(tmpdir(), 'mw-result-'));
-    generate(dir, ['--error-mode', 'result']);
+    generateInto(dir, fixture, ['--error-mode', 'result']);
   }, 60_000);
   afterAll(() => {
     if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
@@ -254,7 +226,7 @@ describe('middleware — configured chain precedes use()', () => {
   let dir = '';
   beforeAll(() => {
     dir = mkdtempSync(join(tmpdir(), 'mw-cfg-'));
-    generate(dir);
+    generateInto(dir, fixture);
   }, 60_000);
   afterAll(() => {
     if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
diff --git a/tests/e2e/generate-client/mock.test.ts b/tests/e2e/generate-client/mock.test.ts
index 03e56a769d..986e7487ed 100644
--- a/tests/e2e/generate-client/mock.test.ts
+++ b/tests/e2e/generate-client/mock.test.ts
@@ -8,46 +8,19 @@
  */
 import { spawnSync } from 'node:child_process';
 import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { outdent } from 'outdent';
 
+import { generateInto, repoRoot, runConsumer, tscBin } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
 const fixture = join(__dirname, 'fixtures/base.yaml');
 // `@faker-js/faker` is hoisted to the repo root node_modules (a repo devDependency);
 // map it explicitly so tsc resolves the faker-mode module's `import { faker }` from the temp dir.
 const fakerPath = join(repoRoot, 'node_modules/@faker-js/faker');
 // A date-bearing fixture for the `--date-type Date` regression (mock + transformers).
 const dateFixture = join(__dirname, 'fixtures/transformers.yaml');
-const tsxBin = join(repoRoot, 'node_modules/.bin/tsx');
-
-function generate(dir: string, extraArgs: string[] = [], spec: string = fixture): void {
-  writeFileSync(join(dir, 'package.json'), JSON.stringify({ type: 'module' }), 'utf-8');
-  const out = join(dir, 'client.ts');
-  const result = spawnSync(
-    'node',
-    [cliEntry, 'generate-client', spec, '--output', out, ...extraArgs],
-    {
-      encoding: 'utf-8',
-      cwd: repoRoot,
-    }
-  );
-  if (result.status !== 0) throw new Error(`generate-client failed:\n${result.stderr}`);
-}
-
-function runConsumer(dir: string, script: string): unknown {
-  writeFileSync(join(dir, 'consumer.ts'), script, 'utf-8');
-  const result = spawnSync(tsxBin, [join(dir, 'consumer.ts')], {
-    encoding: 'utf-8',
-    cwd: repoRoot,
-  });
-  if (result.status !== 0) {
-    throw new Error(`consumer failed:\nstdout:\n${result.stdout}\nstderr:\n${result.stderr}`);
-  }
-  return JSON.parse(result.stdout.trim());
-}
 
 describe('mock generator — generated client through MSW', () => {
   let dir = '';
@@ -56,7 +29,7 @@ describe('mock generator — generated client through MSW', () => {
     // relative to the importing file, so the temp dir must live inside the repo
     // tree to walk up to the root node_modules — `os.tmpdir()` would not resolve it.
     dir = mkdtempSync(join(__dirname, 'mock-consumer-'));
-    generate(dir, ['--generator', 'sdk', '--generator', 'mock']);
+    generateInto(dir, fixture, ['--generator', 'sdk', '--generator', 'mock']);
   }, 60_000);
   afterAll(() => {
     if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
@@ -95,7 +68,6 @@ describe('mock generator — generated client through MSW', () => {
   test('the generated client + mocks type-check together under strict mode', () => {
     expect(existsSync(join(dir, 'client.mocks.ts')), 'generation must run first').toBe(true);
 
-    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
     const tsc = spawnSync(
       tscBin,
       [
@@ -128,20 +100,16 @@ describe('mock generator — mock + transformers + --date-type Date compile toge
     dir = mkdtempSync(join(__dirname, 'mock-date-'));
     // transformers REQUIRES --date-type Date; the sdk then types date fields `Date`,
     // so the mock sampler must bake `new Date(...)` to type-check (BUG 1 regression).
-    generate(
-      dir,
-      [
-        '--generator',
-        'sdk',
-        '--generator',
-        'mock',
-        '--generator',
-        'transformers',
-        '--date-type',
-        'Date',
-      ],
-      dateFixture
-    );
+    generateInto(dir, dateFixture, [
+      '--generator',
+      'sdk',
+      '--generator',
+      'mock',
+      '--generator',
+      'transformers',
+      '--date-type',
+      'Date',
+    ]);
   }, 60_000);
   afterAll(() => {
     if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
@@ -150,7 +118,6 @@ describe('mock generator — mock + transformers + --date-type Date compile toge
   test('strict-tsc-checks client + mocks + transformers together with 0 errors', () => {
     expect(existsSync(join(dir, 'client.mocks.ts')), 'generation must run first').toBe(true);
 
-    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
     const tsc = spawnSync(
       tscBin,
       [
@@ -179,7 +146,7 @@ describe('mock generator — faker mode strict-tsc-checks against real @faker-js
   let dir = '';
   beforeAll(() => {
     dir = mkdtempSync(join(__dirname, 'mock-faker-'));
-    generate(dir, [
+    generateInto(dir, fixture, [
       '--generator',
       'sdk',
       '--generator',
@@ -204,7 +171,6 @@ describe('mock generator — faker mode strict-tsc-checks against real @faker-js
   test('the faker-mode client + mocks strict-tsc-check against real faker with 0 errors', () => {
     expect(existsSync(join(dir, 'client.mocks.ts')), 'generation must run first').toBe(true);
 
-    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
     // A real-tsconfig run (not `--ignoreConfig`) so `paths` maps `@faker-js/faker` to the
     // hoisted package — type-checking the emitted faker calls against faker's real v9 API.
     writeFileSync(
diff --git a/tests/e2e/generate-client/multipart.test.ts b/tests/e2e/generate-client/multipart.test.ts
index 7430582775..1dd24bbcee 100644
--- a/tests/e2e/generate-client/multipart.test.ts
+++ b/tests/e2e/generate-client/multipart.test.ts
@@ -7,15 +7,10 @@
 import { spawnSync } from 'node:child_process';
 import { existsSync, mkdtempSync, readdirSync, rmSync, statSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
+import { join } from 'node:path';
 import { outdent } from 'outdent';
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
-const tsxBin = join(repoRoot, 'node_modules/.bin/tsx');
-const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+import { generate, generateInto, repoRoot, tscBin, tsxBin } from './helpers.js';
 
 function collectTsFiles(d: string): string[] {
   return readdirSync(d).flatMap((e) => {
@@ -54,18 +49,8 @@ describe('generate-client typed multipart body (#5)', () => {
 
   it('types the fields (binary→Blob) and serializes the object to FormData', () => {
     dir = mkdtempSync(join(tmpdir(), 'ots-multipart-'));
-    writeFileSync(join(dir, 'package.json'), JSON.stringify({ type: 'module' }), 'utf-8');
     writeFileSync(join(dir, 'api.yaml'), SPEC, 'utf-8');
-    const out = join(dir, 'client.ts');
-    const gen = spawnSync(
-      'node',
-      [cli, 'generate-client', join(dir, 'api.yaml'), '--output', out],
-      {
-        encoding: 'utf-8',
-        cwd: repoRoot,
-      }
-    );
-    expect(gen.status, gen.stderr).toBe(0);
+    generateInto(dir, join(dir, 'api.yaml'));
 
     writeFileSync(
       join(dir, 'consumer.ts'),
@@ -107,18 +92,8 @@ describe('generate-client typed multipart body (#5)', () => {
 
   it('serializes the multipart body AFTER onRequest, so middleware can mutate it', () => {
     dir = mkdtempSync(join(tmpdir(), 'ots-multipart-mw-'));
-    writeFileSync(join(dir, 'package.json'), JSON.stringify({ type: 'module' }), 'utf-8');
     writeFileSync(join(dir, 'api.yaml'), SPEC, 'utf-8');
-    const out = join(dir, 'client.ts');
-    const gen = spawnSync(
-      'node',
-      [cli, 'generate-client', join(dir, 'api.yaml'), '--output', out],
-      {
-        encoding: 'utf-8',
-        cwd: repoRoot,
-      }
-    );
-    expect(gen.status, gen.stderr).toBe(0);
+    generateInto(dir, join(dir, 'api.yaml'));
 
     writeFileSync(
       join(dir, 'consumer.ts'),
@@ -155,20 +130,7 @@ describe('generate-client typed multipart body (#5)', () => {
   it('compiles in split output (multipart serialization lives in the embedded runtime)', () => {
     dir = mkdtempSync(join(tmpdir(), 'ots-multipart-split-'));
     writeFileSync(join(dir, 'api.yaml'), SPEC, 'utf-8');
-    const gen = spawnSync(
-      'node',
-      [
-        cli,
-        'generate-client',
-        join(dir, 'api.yaml'),
-        '--output',
-        join(dir, 'client.ts'),
-        '--output-mode',
-        'split',
-      ],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(gen.status, gen.stderr).toBe(0);
+    generate(join(dir, 'api.yaml'), join(dir, 'client.ts'), ['--output-mode', 'split']);
     const files = collectTsFiles(dir);
     const tsc = spawnSync(
       tscBin,
diff --git a/tests/e2e/generate-client/name-collision.test.ts b/tests/e2e/generate-client/name-collision.test.ts
index fe96bce707..66e484413f 100644
--- a/tests/e2e/generate-client/name-collision.test.ts
+++ b/tests/e2e/generate-client/name-collision.test.ts
@@ -8,13 +8,12 @@
 import { spawnSync } from 'node:child_process';
 import { mkdtempSync, readdirSync, readFileSync, rmSync, statSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
+import { generate, tscBin } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
-const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
 const fixture = join(__dirname, 'fixtures', 'base.yaml');
 
 /** Recursively collect every generated `.ts` file under `dir`. */
@@ -32,12 +31,7 @@ describe('generate-client operation/schema name collision', () => {
   it('does not emit a self-referential *Result alias; strict tsc passes over the split set', () => {
     const dir = mkdtempSync(join(tmpdir(), 'ots-collision-'));
     const entry = join(dir, 'client.ts');
-    const res = spawnSync(
-      'node',
-      [cli, 'generate-client', fixture, '--output', entry, '--output-mode', 'split'],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(res.status, res.stderr).toBe(0);
+    generate(fixture, entry, ['--output-mode', 'split']);
 
     const files = collectTsFiles(dir);
     const allSource = files.map((f) => readFileSync(f, 'utf-8'));
diff --git a/tests/e2e/generate-client/operation-types.test.ts b/tests/e2e/generate-client/operation-types.test.ts
index 0b1f8cfc80..02d6a4c39a 100644
--- a/tests/e2e/generate-client/operation-types.test.ts
+++ b/tests/e2e/generate-client/operation-types.test.ts
@@ -10,26 +10,17 @@
 import { spawnSync } from 'node:child_process';
 import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { outdent } from 'outdent';
 
+import { generate, tscBin } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
-const tsc = join(repoRoot, 'node_modules/.bin/tsc');
 const fixture = join(__dirname, 'fixtures/base.yaml');
 
 function gen(dir: string): void {
-  const r = spawnSync(
-    'node',
-    [cli, 'generate-client', fixture, '--output', join(dir, 'client.ts')],
-    {
-      cwd: repoRoot,
-      encoding: 'utf-8',
-    }
-  );
-  if (r.status !== 0) throw new Error(r.stderr);
+  generate(fixture, join(dir, 'client.ts'));
   writeFileSync(
     join(dir, 'tsconfig.json'),
     JSON.stringify({
@@ -51,7 +42,8 @@ function gen(dir: string): void {
 function typechecks(dir: string, consumer: string): boolean {
   writeFileSync(join(dir, 'consumer.ts'), consumer, 'utf-8');
   return (
-    spawnSync(tsc, ['-p', join(dir, 'tsconfig.json')], { cwd: dir, encoding: 'utf-8' }).status === 0
+    spawnSync(tscBin, ['-p', join(dir, 'tsconfig.json')], { cwd: dir, encoding: 'utf-8' })
+      .status === 0
   );
 }
 
diff --git a/tests/e2e/generate-client/package-mode.test.ts b/tests/e2e/generate-client/package-mode.test.ts
index a69e080262..2ae4fb4d76 100644
--- a/tests/e2e/generate-client/package-mode.test.ts
+++ b/tests/e2e/generate-client/package-mode.test.ts
@@ -1,9 +1,11 @@
-import { spawn, spawnSync, type ChildProcess } from 'node:child_process';
+import { spawnSync, type ChildProcess } from 'node:child_process';
 import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 
+import { cliEntry, generate, killServer, repoRoot, startServer } from './helpers.js';
+
 // The `runtime: package` output: instead of inlining the runtime, the generated
 // client imports `createClient` from `@redocly/client-generator` (resolved through
 // the workspace's own node_modules symlink — the spec's symlinked-consumer setup).
@@ -11,9 +13,7 @@ import { fileURLToPath, pathToFileURL } from 'node:url';
 // exercises the `--runtime` flag wired in stage ③a.
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
 const generatorLib = join(repoRoot, 'packages/client-generator/lib/index.js');
-const cliEntryPoint = join(repoRoot, 'packages/cli/lib/index.js');
 const fixture = join(__dirname, 'fixtures/package-runtime.yaml');
 const consumerDir = join(__dirname, 'package-runtime-consumer');
 const generatedFile = join(consumerDir, 'api.ts');
@@ -32,67 +32,21 @@ async function loadGenerateClient(): Promise<GenerateClient> {
   return mod.generateClient;
 }
 
-async function waitForServerReady(timeoutMs: number): Promise<void> {
-  const deadline = Date.now() + timeoutMs;
-  let lastError: unknown;
-  while (Date.now() < deadline) {
-    try {
-      const response = await fetch(`${SERVER_BASE}/__test__/ready`);
-      if (response.ok) return;
-      lastError = `readiness probe returned HTTP ${response.status}`;
-    } catch (error) {
-      lastError = error;
-    }
-    await new Promise((r) => setTimeout(r, 100));
-  }
-  throw new Error(
-    `package-runtime server did not become ready within ${timeoutMs}ms: ${
-      lastError instanceof Error ? lastError.message : String(lastError)
-    }`
-  );
-}
-
-function killServer(server: ChildProcess): Promise<void> {
-  return new Promise((resolveFn) => {
-    if (!server.pid || server.exitCode !== null) {
-      resolveFn();
-      return;
-    }
-    const onExit = (): void => resolveFn();
-    server.once('exit', onExit);
-    server.kill('SIGTERM');
-    setTimeout(() => {
-      server.removeListener('exit', onExit);
-      if (server.exitCode === null) {
-        server.kill('SIGKILL');
-      }
-      resolveFn();
-    }, 2_000);
-  });
-}
-
 describe('generate-client package-runtime consumer', () => {
   let serverProcess: ChildProcess | undefined;
 
   beforeAll(async () => {
-    // api.ts is regenerated by this suite but must stay COMMITTED: the consumer's
-    // index.ts imports it, and the repo-root `tsc --noEmit` typechecks tests/ on a
-    // fresh checkout before any e2e run could produce it.
     if (existsSync(generatedFile)) {
       rmSync(generatedFile, { force: true });
     }
 
-    serverProcess = spawn('npx', ['tsx', serverScript], {
-      cwd: consumerDir,
-      env: { ...process.env, PKG_SERVER_PORT: String(SERVER_PORT) },
-      stdio: ['ignore', 'pipe', 'pipe'],
-    });
-
-    serverProcess.stderr?.on('data', (chunk: Buffer) => {
-      process.stderr.write(`[package-runtime-server stderr] ${chunk.toString()}`);
-    });
-
-    await waitForServerReady(15_000);
+    serverProcess = await startServer(
+      serverScript,
+      consumerDir,
+      { PKG_SERVER_PORT: String(SERVER_PORT) },
+      SERVER_BASE,
+      'package-runtime-server'
+    );
   }, 30_000);
 
   afterAll(async () => {
@@ -221,12 +175,7 @@ describe('generate-client package-runtime consumer', () => {
   test('CLI --runtime package emits a runtime import', () => {
     const tmpDir = mkdtempSync(join(tmpdir(), 'ots-cli-runtime-'));
     const output = join(tmpDir, 'cli.ts');
-    const result = spawnSync(
-      'node',
-      [cliEntryPoint, 'generate-client', fixture, '--output', output, '--runtime', 'package'],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(result.status, `generate-client stderr:\n${result.stderr}`).toBe(0);
+    generate(fixture, output, ['--runtime', 'package']);
     const generated = readFileSync(output, 'utf-8');
     expect(generated).toContain("from '@redocly/client-generator'");
     expect(generated).not.toContain('__send');
@@ -238,7 +187,7 @@ describe('generate-client package-runtime consumer', () => {
     const output = join(tmpDir, 'cli.ts');
     const result = spawnSync(
       'node',
-      [cliEntryPoint, 'generate-client', fixture, '--output', output, '--runtime', 'bogus'],
+      [cliEntry, 'generate-client', fixture, '--output', output, '--runtime', 'bogus'],
       { encoding: 'utf-8', cwd: repoRoot }
     );
     expect(result.status).not.toBe(0);
diff --git a/tests/e2e/generate-client/package-runtime-cjs.test.ts b/tests/e2e/generate-client/package-runtime-cjs.test.ts
index 313e4232d3..853b75969e 100644
--- a/tests/e2e/generate-client/package-runtime-cjs.test.ts
+++ b/tests/e2e/generate-client/package-runtime-cjs.test.ts
@@ -1,20 +1,16 @@
 import { spawnSync } from 'node:child_process';
 import { mkdirSync, mkdtempSync, rmSync, symlinkSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
+import { join } from 'node:path';
 import { outdent } from 'outdent';
 
+import { cliEntry, repoRoot, tscBin } from './helpers.js';
+
 // A CommonJS project (e.g. a NestJS backend) consuming a `runtime: package` client emits
 // `require('@redocly/client-generator')`. That resolves through the `default` export
 // condition and loads the ESM entry via Node's require(esm) — supported by every Node
 // version the package's `engines` allow.
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
-const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
-
 describe('generate-client package runtime in a CommonJS project', () => {
   it('require()s the generated client and completes a call', () => {
     const dir = mkdtempSync(join(tmpdir(), 'ots-cjs-'));
@@ -46,7 +42,7 @@ describe('generate-client package runtime in a CommonJS project', () => {
     );
     const generated = spawnSync(
       'node',
-      [cli, 'generate-client', 'openapi.yaml', '--output', 'api.ts', '--runtime', 'package'],
+      [cliEntry, 'generate-client', 'openapi.yaml', '--output', 'api.ts', '--runtime', 'package'],
       { cwd: dir, encoding: 'utf-8' }
     );
     expect(generated.status, generated.stderr).toBe(0);
diff --git a/tests/e2e/generate-client/package-runtime-consumer/.gitignore b/tests/e2e/generate-client/package-runtime-consumer/.gitignore
new file mode 100644
index 0000000000..35d9162694
--- /dev/null
+++ b/tests/e2e/generate-client/package-runtime-consumer/.gitignore
@@ -0,0 +1,2 @@
+# Generated fresh by the owning suite in beforeAll; excluded from the root typecheck.
+api.ts
diff --git a/tests/e2e/generate-client/package-runtime-consumer/api.ts b/tests/e2e/generate-client/package-runtime-consumer/api.ts
deleted file mode 100644
index ecfd720c6a..0000000000
--- a/tests/e2e/generate-client/package-runtime-consumer/api.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Package Runtime API (v1.0.0)
- */
-
-import { createClient, type OperationDescriptor, type RequestOptions, type SseOptions } from '@redocly/client-generator';
-
-export type Order = {
-    id: string;
-    status: string;
-};
-
-export type NewOrder = {
-    status: string;
-};
-
-export type OrderEvent = {
-    seq: number;
-    text?: string;
-};
-
-export type GetOrderResult = Order;
-
-export type GetOrderParams = {
-    expand?: string;
-};
-
-export type GetOrderVariables = {
-    "order-id": string;
-    params?: GetOrderParams;
-};
-
-export type CreateOrderResult = Order;
-
-export type CreateOrderBody = NewOrder;
-
-export type CreateOrderVariables = {
-    body: CreateOrderBody;
-};
-
-export type ConfigureResult = string;
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    getOrder: {
-        args: {
-            "order-id": string;
-            params?: GetOrderParams;
-        };
-        result: GetOrderResult;
-    };
-    createOrder: {
-        args: {
-            body: CreateOrderBody;
-        };
-        result: CreateOrderResult;
-    };
-    configure_2: {
-        args: {};
-        result: ConfigureResult;
-    };
-    streamEvents: {
-        args: {};
-        result: OrderEvent;
-        kind: "sse";
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    getOrder: { id: "getOrder", method: "GET", path: "/orders/{order-id}", params: [{ name: "order-id", in: "path" }, { name: "expand", in: "query" }], security: [[{ scheme: "bearerAuth", kind: "bearer" }]] },
-    createOrder: { id: "createOrder", method: "POST", path: "/orders", body: { contentType: "application/json" } },
-    configure_2: { id: "configure", method: "GET", path: "/configure-op" },
-    streamEvents: { id: "streamEvents", method: "GET", path: "/events", responseKind: "sse", sseDataKind: "json" }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS, { serverUrl: "http://localhost:3123" });
-
-export const { configure, use } = client;
-export const setBearer = client.auth.bearer;
-export const getOrder = (order_id: string, params: {
-    expand?: string;
-} = {}, init: RequestOptions = {}) => client.getOrder({ "order-id": order_id, params }, init);
-export const createOrder = (body: NewOrder, init: RequestOptions = {}) => client.createOrder({ body }, init);
-export const configure_2 = (init: RequestOptions = {}) => client.configure_2({}, init);
-export const streamEvents = (init: SseOptions = {}) => client.streamEvents({}, init);
-
-export { ApiError, createClient } from '@redocly/client-generator';
-export type { ClientConfig, Middleware, RequestOptions, ServerSentEvent, SseOptions } from '@redocly/client-generator';
diff --git a/tests/e2e/generate-client/pagination-consumer/.gitignore b/tests/e2e/generate-client/pagination-consumer/.gitignore
new file mode 100644
index 0000000000..14356b8214
--- /dev/null
+++ b/tests/e2e/generate-client/pagination-consumer/.gitignore
@@ -0,0 +1,4 @@
+# Generated fresh by pagination.test.ts in beforeAll; excluded from the root typecheck.
+api.ts
+api-offset.ts
+api-package.ts
diff --git a/tests/e2e/generate-client/pagination-consumer/api-offset.ts b/tests/e2e/generate-client/pagination-consumer/api-offset.ts
deleted file mode 100644
index 75991e15fa..0000000000
--- a/tests/e2e/generate-client/pagination-consumer/api-offset.ts
+++ /dev/null
@@ -1,1180 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Cafe Orders Pagination API (v1.0.0)
- */
-
-export type Order = {
-    id: string;
-    status: string;
-};
-
-export type MenuItem = {
-    id: string;
-    name: string;
-};
-
-export type ListOrdersResult = {
-    orders: Order[];
-    /**
-     * Cursor of the next page; absent on the last page.
-     */
-    nextCursor?: string;
-};
-
-export type ListOrdersParams = {
-    /**
-     * Opaque cursor of the page to fetch; omit for the first page.
-     */
-    cursor?: string;
-    /**
-     * Page size.
-     */
-    limit?: number;
-};
-
-export type ListOrdersVariables = {
-    params?: ListOrdersParams;
-};
-
-export type ListMenuItemsResult = {
-    items: MenuItem[];
-    total: number;
-};
-
-export type ListMenuItemsParams = {
-    /**
-     * Index of the first item to return.
-     */
-    offset?: number;
-    /**
-     * Page size.
-     */
-    limit?: number;
-};
-
-export type ListMenuItemsVariables = {
-    params?: ListMenuItemsParams;
-};
-
-export type GetOrderResult = Order;
-
-export type GetOrderVariables = {
-    orderId: string;
-};
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    listOrders: {
-        args: {
-            params?: ListOrdersParams;
-        };
-        result: ListOrdersResult;
-        item: Order;
-    };
-    listMenuItems: {
-        args: {
-            params?: ListMenuItemsParams;
-        };
-        result: ListMenuItemsResult;
-        item: MenuItem;
-    };
-    getOrder: {
-        args: {
-            orderId: string;
-        };
-        result: GetOrderResult;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", params: [{ name: "cursor", in: "query" }, { name: "limit", in: "query" }], pagination: { style: "cursor", param: "cursor", limitParam: "limit", nextCursor: "/nextCursor", items: "/orders" } },
-    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", params: [{ name: "offset", in: "query" }, { name: "limit", in: "query" }], pagination: { style: "offset", param: "offset", limitParam: "limit", items: "/items" } },
-    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", params: [{ name: "orderId", in: "path" }] }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — `@redocly/client-generator`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits `OPERATIONS` literals typed
- * `satisfies Record<string, OperationDescriptor>` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
- * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to `'json'` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
- * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real `ApiError` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call `parseAs` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of `data`/`error` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
- * streams and, for paginated operations, `item` (the page's element type) and — on
- * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
- * iteration unwraps the `Result` envelope the one-shot `result` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: `{}` has no required members, so
- * `{} extends A` is true exactly when every member of `A` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type `.pages()` yields: the RAW page declared by `page` (the generator
- * writes it only on result-mode paginated entries, whose `result` is the envelope),
- * or the method's own `result` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares `item` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
- * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
- * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
- * `onError` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(`Request failed with status ${status}`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
- * `filter=a/b` survives instead of `filter=a%2Fb`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
- * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
- * `deepObject` brackets, and `null`/`undefined` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(`${key}[${subKey}]`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. `%20` (not `+`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-      }
-    } else if (Object(value) === value) {
-      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
-          else params.append(`${key}[${subKey}]`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(`${key}=${encodeReserved(String(value))}`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? `${url}?${qs}` : url;
-}
-
-/**
- * Read the response body per `kind`. `'auto'` negotiates from the content type
- * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom `retryOn` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
- * unless `jitter === false`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/**
- * Auto-pagination (capability module — wired into `createClient`, dispatched by the
- * method's `.pages()`/`.items()`): walk an operation's pages by advancing the descriptor's
- * `param` query parameter, per its `style`. The caller's args are never mutated — each
- * request gets a fresh `params` clone — and `init` is forwarded to every call.
- *
- * Iteration is error-mode-agnostic: `call` always resolves to the RAW page (on a
- * result-mode client the attachment unwraps the envelope first), so a failed page
- * aborts iteration by throwing `ApiError`, even on result-mode clients; the `onError`
- * middleware hook (throw-mode-only) is not invoked.
- */
-
-/**
- * Resolve an RFC 6901 JSON pointer (`~1` → `/`, `~0` → `~`) against a value.
- * The empty pointer is the whole document; anything else must start with `/`.
- * Returns `undefined` on any miss (bad token, absent key, non-object step) — never throws.
- */
-function resolvePointer(value: unknown, pointer: string): unknown {
-  if (pointer === '') return value;
-  if (!pointer.startsWith('/')) return undefined;
-  let current = value;
-  for (const token of pointer.slice(1).split('/')) {
-    const key = token.replaceAll('~1', '/').replaceAll('~0', '~');
-    if (Array.isArray(current)) {
-      if (!/^(0|[1-9]\d*)$/.test(key)) return undefined;
-      current = current[Number(key)];
-    } else if (Object(current) === current && key in (current as object)) {
-      current = (current as Record<string, unknown>)[key];
-    } else {
-      return undefined;
-    }
-  }
-  return current;
-}
-
-/**
- * Iterate an operation's full page results. Every page is yielded before the stop
- * condition is evaluated, so the last page always arrives. Cursor style resumes from a
- * caller-provided `params[spec.param]`, stops when `nextCursor` resolves to
- * `undefined`/`null`/`''`, and throws if the next cursor is not a string or number, or
- * if the same cursor comes back twice in a row (infinite-loop guards). Offset/page
- * styles advance by item count / by one and stop when
- * the `items` pointer misses or the array is empty.
- */
-async function* pages<TPage>(
-  call: (args?: OperationArgs, init?: RequestOptions) => Promise<TPage>,
-  spec: PaginationSpec,
-  args: OperationArgs = {},
-  init?: RequestOptions
-): AsyncGenerator<TPage> {
-  if (spec.style === 'cursor') {
-    let cursor: unknown = args.params?.[spec.param];
-    while (true) {
-      const params = { ...args.params };
-      if (cursor !== undefined) params[spec.param] = cursor as QueryValue;
-      const page = await call({ ...args, params }, init);
-      yield page;
-      const next = resolvePointer(page, spec.nextCursor!);
-      if (next === undefined || next === null || next === '') return;
-      if (typeof next !== 'string' && typeof next !== 'number') {
-        // A fresh non-scalar cursor never compares equal, so without this guard a lying
-        // server would slip past the did-not-advance check into an infinite loop.
-        throw new Error(`Pagination cursor at ${spec.nextCursor} is not a string or number`);
-      }
-      if (next === cursor) {
-        throw new Error('Pagination did not advance: operation returned the same cursor twice');
-      }
-      cursor = next;
-    }
-  } else {
-    // Coerce the starting position to a number: a caller may pass `params[spec.param]` as a
-    // string (common from URL/form input), and `+=` on a string would concatenate.
-    const start = args.params?.[spec.param];
-    const fallback = spec.style === 'page' ? 1 : 0;
-    let position = start === undefined || Number.isNaN(Number(start)) ? fallback : Number(start);
-    while (true) {
-      const page = await call(
-        { ...args, params: { ...args.params, [spec.param]: position } },
-        init
-      );
-      yield page;
-      const pageItems = resolvePointer(page, spec.items);
-      if (!Array.isArray(pageItems) || pageItems.length === 0) return;
-      position += spec.style === 'page' ? 1 : pageItems.length;
-    }
-  }
-}
-
-/**
- * Iterate the operation's individual items: each page's `items` pointer, flattened.
- * A cursor-style page whose pointer misses yields nothing but pagination continues;
- * for offset/page styles a miss has already stopped `pages`.
- */
-async function* items<TItem>(
-  call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  spec: PaginationSpec,
-  args?: OperationArgs,
-  init?: RequestOptions
-): AsyncGenerator<TItem> {
-  for await (const page of pages(call, spec, args, init)) {
-    const pageItems = resolvePointer(page, spec.items);
-    if (Array.isArray(pageItems)) yield* pageItems as TItem[];
-  }
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * `createClient` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
- * to a plain record — spreading a `Headers` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
- * `onResponse` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * The optional behaviors `createClientCore` can dispatch to but never statically
- * imports. The package's public `createClient` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
- * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
- * are honored, and an omitted `explode` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller `init.headers` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
- * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's `error` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (`errorMode` is fixed at construction — `configure()`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
-    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
-    // basic/apiKey. `apiKey` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: `createClientCore` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
- * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, { paginate: { pages, items } });
-}
-
-export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS, { serverUrl: "http://localhost:3131" });
-
-export const { configure, use } = client;
-export const listOrders = Object.assign((params: {
-    /**
-     * Opaque cursor of the page to fetch; omit for the first page.
-     */
-    cursor?: string;
-    /**
-     * Page size.
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init), { pages: client.listOrders.pages, items: client.listOrders.items });
-export const listMenuItems = Object.assign((params: {
-    /**
-     * Index of the first item to return.
-     */
-    offset?: number;
-    /**
-     * Page size.
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init), { pages: client.listMenuItems.pages, items: client.listMenuItems.items });
-export const getOrder = (orderId: string, init: RequestOptions = {}) => client.getOrder({ orderId }, init);
diff --git a/tests/e2e/generate-client/pagination-consumer/api-package.ts b/tests/e2e/generate-client/pagination-consumer/api-package.ts
deleted file mode 100644
index 03fc650f64..0000000000
--- a/tests/e2e/generate-client/pagination-consumer/api-package.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Cafe Orders Pagination API (v1.0.0)
- */
-
-import { createClient, type OperationDescriptor, type RequestOptions } from '@redocly/client-generator';
-
-export type Order = {
-    id: string;
-    status: string;
-};
-
-export type MenuItem = {
-    id: string;
-    name: string;
-};
-
-export type ListOrdersResult = {
-    orders: Order[];
-    /**
-     * Cursor of the next page; absent on the last page.
-     */
-    nextCursor?: string;
-};
-
-export type ListOrdersParams = {
-    /**
-     * Opaque cursor of the page to fetch; omit for the first page.
-     */
-    cursor?: string;
-    /**
-     * Page size.
-     */
-    limit?: number;
-};
-
-export type ListOrdersVariables = {
-    params?: ListOrdersParams;
-};
-
-export type ListMenuItemsResult = {
-    items: MenuItem[];
-    total: number;
-};
-
-export type ListMenuItemsParams = {
-    /**
-     * Index of the first item to return.
-     */
-    offset?: number;
-    /**
-     * Page size.
-     */
-    limit?: number;
-};
-
-export type ListMenuItemsVariables = {
-    params?: ListMenuItemsParams;
-};
-
-export type GetOrderResult = Order;
-
-export type GetOrderVariables = {
-    orderId: string;
-};
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    listOrders: {
-        args: {
-            params?: ListOrdersParams;
-        };
-        result: ListOrdersResult;
-        item: Order;
-    };
-    listMenuItems: {
-        args: {
-            params?: ListMenuItemsParams;
-        };
-        result: ListMenuItemsResult;
-    };
-    getOrder: {
-        args: {
-            orderId: string;
-        };
-        result: GetOrderResult;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", params: [{ name: "cursor", in: "query" }, { name: "limit", in: "query" }], pagination: { style: "cursor", param: "cursor", limitParam: "limit", nextCursor: "/nextCursor", items: "/orders" } },
-    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", params: [{ name: "offset", in: "query" }, { name: "limit", in: "query" }] },
-    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", params: [{ name: "orderId", in: "path" }] }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS, { serverUrl: "http://localhost:3131" });
-
-export const { configure, use } = client;
-export const listOrders = Object.assign((params: {
-    /**
-     * Opaque cursor of the page to fetch; omit for the first page.
-     */
-    cursor?: string;
-    /**
-     * Page size.
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init), { pages: client.listOrders.pages, items: client.listOrders.items });
-export const listMenuItems = (params: {
-    /**
-     * Index of the first item to return.
-     */
-    offset?: number;
-    /**
-     * Page size.
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
-export const getOrder = (orderId: string, init: RequestOptions = {}) => client.getOrder({ orderId }, init);
-
-export { ApiError, createClient } from '@redocly/client-generator';
-export type { ClientConfig, Middleware, RequestOptions } from '@redocly/client-generator';
diff --git a/tests/e2e/generate-client/pagination-consumer/api.ts b/tests/e2e/generate-client/pagination-consumer/api.ts
deleted file mode 100644
index 735f1c082d..0000000000
--- a/tests/e2e/generate-client/pagination-consumer/api.ts
+++ /dev/null
@@ -1,1179 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * Cafe Orders Pagination API (v1.0.0)
- */
-
-export type Order = {
-    id: string;
-    status: string;
-};
-
-export type MenuItem = {
-    id: string;
-    name: string;
-};
-
-export type ListOrdersResult = {
-    orders: Order[];
-    /**
-     * Cursor of the next page; absent on the last page.
-     */
-    nextCursor?: string;
-};
-
-export type ListOrdersParams = {
-    /**
-     * Opaque cursor of the page to fetch; omit for the first page.
-     */
-    cursor?: string;
-    /**
-     * Page size.
-     */
-    limit?: number;
-};
-
-export type ListOrdersVariables = {
-    params?: ListOrdersParams;
-};
-
-export type ListMenuItemsResult = {
-    items: MenuItem[];
-    total: number;
-};
-
-export type ListMenuItemsParams = {
-    /**
-     * Index of the first item to return.
-     */
-    offset?: number;
-    /**
-     * Page size.
-     */
-    limit?: number;
-};
-
-export type ListMenuItemsVariables = {
-    params?: ListMenuItemsParams;
-};
-
-export type GetOrderResult = Order;
-
-export type GetOrderVariables = {
-    orderId: string;
-};
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    listOrders: {
-        args: {
-            params?: ListOrdersParams;
-        };
-        result: ListOrdersResult;
-        item: Order;
-    };
-    listMenuItems: {
-        args: {
-            params?: ListMenuItemsParams;
-        };
-        result: ListMenuItemsResult;
-    };
-    getOrder: {
-        args: {
-            orderId: string;
-        };
-        result: GetOrderResult;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", params: [{ name: "cursor", in: "query" }, { name: "limit", in: "query" }], pagination: { style: "cursor", param: "cursor", limitParam: "limit", nextCursor: "/nextCursor", items: "/orders" } },
-    listMenuItems: { id: "listMenuItems", method: "GET", path: "/menu", params: [{ name: "offset", in: "query" }, { name: "limit", in: "query" }] },
-    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", params: [{ name: "orderId", in: "path" }] }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — `@redocly/client-generator`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits `OPERATIONS` literals typed
- * `satisfies Record<string, OperationDescriptor>` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
- * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to `'json'` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
- * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real `ApiError` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call `parseAs` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of `data`/`error` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
- * streams and, for paginated operations, `item` (the page's element type) and — on
- * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
- * iteration unwraps the `Result` envelope the one-shot `result` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: `{}` has no required members, so
- * `{} extends A` is true exactly when every member of `A` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type `.pages()` yields: the RAW page declared by `page` (the generator
- * writes it only on result-mode paginated entries, whose `result` is the envelope),
- * or the method's own `result` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares `item` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
- * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
- * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
- * `onError` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(`Request failed with status ${status}`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
- * `filter=a/b` survives instead of `filter=a%2Fb`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
- * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
- * `deepObject` brackets, and `null`/`undefined` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(`${key}[${subKey}]`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. `%20` (not `+`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-      }
-    } else if (Object(value) === value) {
-      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
-          else params.append(`${key}[${subKey}]`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(`${key}=${encodeReserved(String(value))}`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? `${url}?${qs}` : url;
-}
-
-/**
- * Read the response body per `kind`. `'auto'` negotiates from the content type
- * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom `retryOn` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
- * unless `jitter === false`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/**
- * Auto-pagination (capability module — wired into `createClient`, dispatched by the
- * method's `.pages()`/`.items()`): walk an operation's pages by advancing the descriptor's
- * `param` query parameter, per its `style`. The caller's args are never mutated — each
- * request gets a fresh `params` clone — and `init` is forwarded to every call.
- *
- * Iteration is error-mode-agnostic: `call` always resolves to the RAW page (on a
- * result-mode client the attachment unwraps the envelope first), so a failed page
- * aborts iteration by throwing `ApiError`, even on result-mode clients; the `onError`
- * middleware hook (throw-mode-only) is not invoked.
- */
-
-/**
- * Resolve an RFC 6901 JSON pointer (`~1` → `/`, `~0` → `~`) against a value.
- * The empty pointer is the whole document; anything else must start with `/`.
- * Returns `undefined` on any miss (bad token, absent key, non-object step) — never throws.
- */
-function resolvePointer(value: unknown, pointer: string): unknown {
-  if (pointer === '') return value;
-  if (!pointer.startsWith('/')) return undefined;
-  let current = value;
-  for (const token of pointer.slice(1).split('/')) {
-    const key = token.replaceAll('~1', '/').replaceAll('~0', '~');
-    if (Array.isArray(current)) {
-      if (!/^(0|[1-9]\d*)$/.test(key)) return undefined;
-      current = current[Number(key)];
-    } else if (Object(current) === current && key in (current as object)) {
-      current = (current as Record<string, unknown>)[key];
-    } else {
-      return undefined;
-    }
-  }
-  return current;
-}
-
-/**
- * Iterate an operation's full page results. Every page is yielded before the stop
- * condition is evaluated, so the last page always arrives. Cursor style resumes from a
- * caller-provided `params[spec.param]`, stops when `nextCursor` resolves to
- * `undefined`/`null`/`''`, and throws if the next cursor is not a string or number, or
- * if the same cursor comes back twice in a row (infinite-loop guards). Offset/page
- * styles advance by item count / by one and stop when
- * the `items` pointer misses or the array is empty.
- */
-async function* pages<TPage>(
-  call: (args?: OperationArgs, init?: RequestOptions) => Promise<TPage>,
-  spec: PaginationSpec,
-  args: OperationArgs = {},
-  init?: RequestOptions
-): AsyncGenerator<TPage> {
-  if (spec.style === 'cursor') {
-    let cursor: unknown = args.params?.[spec.param];
-    while (true) {
-      const params = { ...args.params };
-      if (cursor !== undefined) params[spec.param] = cursor as QueryValue;
-      const page = await call({ ...args, params }, init);
-      yield page;
-      const next = resolvePointer(page, spec.nextCursor!);
-      if (next === undefined || next === null || next === '') return;
-      if (typeof next !== 'string' && typeof next !== 'number') {
-        // A fresh non-scalar cursor never compares equal, so without this guard a lying
-        // server would slip past the did-not-advance check into an infinite loop.
-        throw new Error(`Pagination cursor at ${spec.nextCursor} is not a string or number`);
-      }
-      if (next === cursor) {
-        throw new Error('Pagination did not advance: operation returned the same cursor twice');
-      }
-      cursor = next;
-    }
-  } else {
-    // Coerce the starting position to a number: a caller may pass `params[spec.param]` as a
-    // string (common from URL/form input), and `+=` on a string would concatenate.
-    const start = args.params?.[spec.param];
-    const fallback = spec.style === 'page' ? 1 : 0;
-    let position = start === undefined || Number.isNaN(Number(start)) ? fallback : Number(start);
-    while (true) {
-      const page = await call(
-        { ...args, params: { ...args.params, [spec.param]: position } },
-        init
-      );
-      yield page;
-      const pageItems = resolvePointer(page, spec.items);
-      if (!Array.isArray(pageItems) || pageItems.length === 0) return;
-      position += spec.style === 'page' ? 1 : pageItems.length;
-    }
-  }
-}
-
-/**
- * Iterate the operation's individual items: each page's `items` pointer, flattened.
- * A cursor-style page whose pointer misses yields nothing but pagination continues;
- * for offset/page styles a miss has already stopped `pages`.
- */
-async function* items<TItem>(
-  call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  spec: PaginationSpec,
-  args?: OperationArgs,
-  init?: RequestOptions
-): AsyncGenerator<TItem> {
-  for await (const page of pages(call, spec, args, init)) {
-    const pageItems = resolvePointer(page, spec.items);
-    if (Array.isArray(pageItems)) yield* pageItems as TItem[];
-  }
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * `createClient` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
- * to a plain record — spreading a `Headers` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
- * `onResponse` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * The optional behaviors `createClientCore` can dispatch to but never statically
- * imports. The package's public `createClient` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
- * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
- * are honored, and an omitted `explode` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller `init.headers` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
- * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's `error` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (`errorMode` is fixed at construction — `configure()`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
-    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
-    // basic/apiKey. `apiKey` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: `createClientCore` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
- * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, { paginate: { pages, items } });
-}
-
-export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS, { serverUrl: "http://localhost:3131" });
-
-export const { configure, use } = client;
-export const listOrders = Object.assign((params: {
-    /**
-     * Opaque cursor of the page to fetch; omit for the first page.
-     */
-    cursor?: string;
-    /**
-     * Page size.
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init), { pages: client.listOrders.pages, items: client.listOrders.items });
-export const listMenuItems = (params: {
-    /**
-     * Index of the first item to return.
-     */
-    offset?: number;
-    /**
-     * Page size.
-     */
-    limit?: number;
-} = {}, init: RequestOptions = {}) => client.listMenuItems({ params }, init);
-export const getOrder = (orderId: string, init: RequestOptions = {}) => client.getOrder({ orderId }, init);
diff --git a/tests/e2e/generate-client/pagination.test.ts b/tests/e2e/generate-client/pagination.test.ts
index 5e9d00516d..430fac40f8 100644
--- a/tests/e2e/generate-client/pagination.test.ts
+++ b/tests/e2e/generate-client/pagination.test.ts
@@ -1,8 +1,10 @@
-import { spawn, spawnSync, type ChildProcess } from 'node:child_process';
+import { spawnSync, type ChildProcess } from 'node:child_process';
 import { existsSync, readFileSync, rmSync } from 'node:fs';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 
+import { killServer, repoRoot, startServer } from './helpers.js';
+
 // Auto-pagination end to end, over a live server: the `x-pagination` extension arm
 // (cursor style — three pages, resume, abort) generated with NO config, the
 // config-convention arm (offset style, applied only where it structurally fits), and a
@@ -11,7 +13,6 @@ import { fileURLToPath, pathToFileURL } from 'node:url';
 // programmatic `generateClient`.
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
 const generatorLib = join(repoRoot, 'packages/client-generator/lib/index.js');
 const fixture = join(__dirname, 'fixtures/pagination.yaml');
 const consumerDir = join(__dirname, 'pagination-consumer');
@@ -32,45 +33,6 @@ async function loadGenerateClient(): Promise<GenerateClient> {
   return mod.generateClient;
 }
 
-async function waitForServerReady(timeoutMs: number): Promise<void> {
-  const deadline = Date.now() + timeoutMs;
-  let lastError: unknown;
-  while (Date.now() < deadline) {
-    try {
-      const response = await fetch(`${SERVER_BASE}/__test__/ready`);
-      if (response.ok) return;
-      lastError = `readiness probe returned HTTP ${response.status}`;
-    } catch (error) {
-      lastError = error;
-    }
-    await new Promise((r) => setTimeout(r, 100));
-  }
-  throw new Error(
-    `pagination server did not become ready within ${timeoutMs}ms: ${
-      lastError instanceof Error ? lastError.message : String(lastError)
-    }`
-  );
-}
-
-function killServer(server: ChildProcess): Promise<void> {
-  return new Promise((resolveFn) => {
-    if (!server.pid || server.exitCode !== null) {
-      resolveFn();
-      return;
-    }
-    const onExit = (): void => resolveFn();
-    server.once('exit', onExit);
-    server.kill('SIGTERM');
-    setTimeout(() => {
-      server.removeListener('exit', onExit);
-      if (server.exitCode === null) {
-        server.kill('SIGKILL');
-      }
-      resolveFn();
-    }, 2_000);
-  });
-}
-
 /** Clear the server's request log, then return a fetcher for the run's own slice. */
 async function resetLog(): Promise<void> {
   const response = await fetch(`${SERVER_BASE}/__test__/reset`, { method: 'POST' });
@@ -96,24 +58,17 @@ describe('generate-client pagination consumer', () => {
   let serverProcess: ChildProcess | undefined;
 
   beforeAll(async () => {
-    // The generated files are regenerated by this suite but must stay COMMITTED: the
-    // consumer scripts import them, and the repo-root `tsc --noEmit` typechecks tests/
-    // on a fresh checkout before any e2e run could produce them.
     for (const file of [apiFile, apiOffsetFile, apiPackageFile]) {
       if (existsSync(file)) rmSync(file, { force: true });
     }
 
-    serverProcess = spawn('npx', ['tsx', serverScript], {
-      cwd: consumerDir,
-      env: { ...process.env, PAGINATION_SERVER_PORT: String(SERVER_PORT) },
-      stdio: ['ignore', 'pipe', 'pipe'],
-    });
-
-    serverProcess.stderr?.on('data', (chunk: Buffer) => {
-      process.stderr.write(`[pagination-server stderr] ${chunk.toString()}`);
-    });
-
-    await waitForServerReady(15_000);
+    serverProcess = await startServer(
+      serverScript,
+      consumerDir,
+      { PAGINATION_SERVER_PORT: String(SERVER_PORT) },
+      SERVER_BASE,
+      'pagination-server'
+    );
   }, 30_000);
 
   afterAll(async () => {
diff --git a/tests/e2e/generate-client/parse-as.test.ts b/tests/e2e/generate-client/parse-as.test.ts
index 253ccca4a9..dddaa793bd 100644
--- a/tests/e2e/generate-client/parse-as.test.ts
+++ b/tests/e2e/generate-client/parse-as.test.ts
@@ -10,27 +10,20 @@
 // the runtime's `parse` (covered by the client-generator unit suite) and the
 // cafe-consumer harness already exercises the default decoding path. Strict-tsc +
 // string + type-usage assertions are sufficient and keep this test process-light.
-import { spawnSync } from 'node:child_process';
 import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
+import { generate, strictTypecheck } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
-const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
 
 describe('generate-client parseAs', () => {
   it('emits ParseAs + parseAs option, decodes every kind, and accepts parseAs per call', () => {
     const dir = mkdtempSync(join(tmpdir(), 'ots-parseas-'));
     const out = join(dir, 'client.ts');
-    const res = spawnSync(
-      'node',
-      [cli, 'generate-client', join(__dirname, 'fixtures', 'no-operationid.yaml'), '--output', out],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(res.status, res.stderr).toBe(0);
+    generate(join(__dirname, 'fixtures', 'no-operationid.yaml'), out);
     expect(existsSync(out)).toBe(true);
     const generated = readFileSync(out, 'utf-8');
 
@@ -65,25 +58,7 @@ describe('generate-client parseAs', () => {
       ].join('\n'),
       'utf-8'
     );
-    writeFileSync(
-      join(dir, 'tsconfig.json'),
-      JSON.stringify({
-        compilerOptions: {
-          module: 'nodenext',
-          moduleResolution: 'nodenext',
-          target: 'es2022',
-          lib: ['ES2022', 'DOM'],
-          strict: true,
-          noEmit: true,
-          skipLibCheck: true,
-          types: [],
-        },
-        include: ['client.ts', 'usage.ts'],
-      }),
-      'utf-8'
-    );
-    const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
-    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+    strictTypecheck(dir, ['client.ts', 'usage.ts']);
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 });
diff --git a/tests/e2e/generate-client/path-param-idents.test.ts b/tests/e2e/generate-client/path-param-idents.test.ts
index 6b48d66825..3b0f84df81 100644
--- a/tests/e2e/generate-client/path-param-idents.test.ts
+++ b/tests/e2e/generate-client/path-param-idents.test.ts
@@ -13,15 +13,10 @@
 import { spawnSync } from 'node:child_process';
 import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
+import { join } from 'node:path';
 import { outdent } from 'outdent';
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
-const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
-const tsxBin = join(repoRoot, 'node_modules/.bin/tsx');
+import { generateInto, repoRoot, runConsumer, tscBin } from './helpers.js';
 
 const SPEC = outdent`
   openapi: 3.0.3
@@ -91,14 +86,8 @@ describe('non-identifier path parameters', () => {
   let dir = '';
   beforeAll(() => {
     dir = mkdtempSync(join(tmpdir(), 'oddnames-'));
-    writeFileSync(join(dir, 'package.json'), JSON.stringify({ type: 'module' }), 'utf-8');
     writeFileSync(join(dir, 'openapi.yaml'), SPEC, 'utf-8');
-    const result = spawnSync(
-      'node',
-      [cliEntry, 'generate-client', join(dir, 'openapi.yaml'), '--output', join(dir, 'client.ts')],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    if (result.status !== 0) throw new Error(`generate-client failed:\n${result.stderr}`);
+    generateInto(dir, join(dir, 'openapi.yaml'));
   }, 60_000);
   afterAll(() => {
     if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
@@ -143,13 +132,7 @@ describe('non-identifier path parameters', () => {
       await getItem('xyz');
       console.log(JSON.stringify(urls));
     `;
-    writeFileSync(join(dir, 'consumer.ts'), consumer, 'utf-8');
-    const result = spawnSync(tsxBin, [join(dir, 'consumer.ts')], {
-      encoding: 'utf-8',
-      cwd: repoRoot,
-    });
-    expect(result.status, `consumer failed:\n${result.stdout}\n${result.stderr}`).toBe(0);
-    const urls = JSON.parse(result.stdout.trim()) as string[];
+    const urls = runConsumer(dir, consumer) as string[];
     expect(urls[0]).toBe('https://api.example.com/widgets/abc');
     expect(urls[1]).toBe('https://api.example.com/items/xyz');
   }, 60_000);
diff --git a/tests/e2e/generate-client/per-instance-auth.test.ts b/tests/e2e/generate-client/per-instance-auth.test.ts
index 24a3da97e1..72d3e5ab62 100644
--- a/tests/e2e/generate-client/per-instance-auth.test.ts
+++ b/tests/e2e/generate-client/per-instance-auth.test.ts
@@ -5,14 +5,13 @@
 // header via an injected `config.fetch`, so no mock server is needed.
 import { spawnSync } from 'node:child_process';
 import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { outdent } from 'outdent';
 
+import { generateInto, tsxBin } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
-const tsx = join(repoRoot, 'node_modules/.bin/tsx');
 
 const SPEC = outdent`
   openapi: 3.1.0
@@ -61,26 +60,10 @@ describe('per-instance auth (createClient config.auth)', () => {
     const dir = mkdtempSync(join(__dirname, '.tmp-perinstance-'));
     try {
       writeFileSync(join(dir, 'openapi.yaml'), SPEC, 'utf-8');
-      // Mark the temp dir as ESM so tsx imports the generated `./client.js` and the
-      // driver's top-level structure resolve as modules.
-      writeFileSync(join(dir, 'package.json'), '{ "type": "module" }', 'utf-8');
-      const gen = spawnSync(
-        'node',
-        [
-          cli,
-          'generate-client',
-          join(dir, 'openapi.yaml'),
-          '--output',
-          join(dir, 'client.ts'),
-          '--runtime',
-          'package',
-        ],
-        { encoding: 'utf-8', cwd: repoRoot }
-      );
-      expect(gen.status, gen.stderr).toBe(0);
+      generateInto(dir, join(dir, 'openapi.yaml'), ['--runtime', 'package']);
 
       writeFileSync(join(dir, 'driver.ts'), DRIVER, 'utf-8');
-      const run = spawnSync(tsx, [join(dir, 'driver.ts')], { encoding: 'utf-8', cwd: dir });
+      const run = spawnSync(tsxBin, [join(dir, 'driver.ts')], { encoding: 'utf-8', cwd: dir });
       expect(run.status, run.stderr).toBe(0);
 
       const calls = JSON.parse(run.stdout.trim()) as (string | null)[];
diff --git a/tests/e2e/generate-client/plugin.test.ts b/tests/e2e/generate-client/plugin.test.ts
index 3d73a816de..76901489a1 100644
--- a/tests/e2e/generate-client/plugin.test.ts
+++ b/tests/e2e/generate-client/plugin.test.ts
@@ -3,17 +3,17 @@
 import { spawnSync } from 'node:child_process';
 import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
+import { cliEntry, repoRoot } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
 const cafe = join(__dirname, 'fixtures', 'cafe.yaml');
 const plugin = join(__dirname, 'fixtures', 'route-map-plugin.mjs');
 
 function run(args: string[]): { status: number | null; out: string } {
-  const res = spawnSync('node', [cli, 'generate-client', ...args], {
+  const res = spawnSync('node', [cliEntry, 'generate-client', ...args], {
     encoding: 'utf-8',
     cwd: repoRoot,
   });
diff --git a/tests/e2e/generate-client/query-styles.test.ts b/tests/e2e/generate-client/query-styles.test.ts
index e35f64ea69..054d053d47 100644
--- a/tests/e2e/generate-client/query-styles.test.ts
+++ b/tests/e2e/generate-client/query-styles.test.ts
@@ -11,13 +11,12 @@
 import { spawnSync } from 'node:child_process';
 import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
+import { generate, strictTypecheck } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
-const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
 const fixture = join(__dirname, 'fixtures', 'query-styles.yaml');
 
 describe('generate-client query serialization styles', () => {
@@ -27,11 +26,7 @@ describe('generate-client query serialization styles', () => {
   beforeAll(() => {
     dir = mkdtempSync(join(tmpdir(), 'ots-qstyles-'));
     const out = join(dir, 'client.ts');
-    const res = spawnSync('node', [cli, 'generate-client', fixture, '--output', out], {
-      encoding: 'utf-8',
-      cwd: repoRoot,
-    });
-    expect(res.status, res.stderr).toBe(0);
+    generate(fixture, out);
     expect(existsSync(out)).toBe(true);
     generated = readFileSync(out, 'utf-8');
   }, 60_000);
@@ -56,25 +51,7 @@ describe('generate-client query serialization styles', () => {
   });
 
   it('strict-tsc type-checks the generated client', () => {
-    writeFileSync(
-      join(dir, 'tsconfig.json'),
-      JSON.stringify({
-        compilerOptions: {
-          module: 'nodenext',
-          moduleResolution: 'nodenext',
-          target: 'es2022',
-          lib: ['ES2022', 'DOM'],
-          strict: true,
-          noEmit: true,
-          skipLibCheck: true,
-          types: [],
-        },
-        include: ['client.ts'],
-      }),
-      'utf-8'
-    );
-    const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
-    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+    strictTypecheck(dir, ['client.ts']);
   }, 60_000);
 
   it('serializes the wire format: literal delimiters + allowReserved', () => {
diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
index 247de6a5a2..8b353b86c2 100644
--- a/tests/e2e/generate-client/redocly-config.test.ts
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -12,12 +12,12 @@ import {
   copyFileSync,
 } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
+import { cliEntry, repoRoot } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
 const fixture = join(__dirname, 'fixtures', 'cafe.yaml');
 
 /** Write a temp project: the cafe spec + a redocly.yaml with the given contents. */
@@ -28,7 +28,7 @@ function project(redoclyYaml: string): string {
   return dir;
 }
 const run = (dir: string, args: string[] = []) =>
-  spawnSync('node', [cli, 'generate-client', ...args], { cwd: dir, encoding: 'utf-8' });
+  spawnSync('node', [cliEntry, 'generate-client', ...args], { cwd: dir, encoding: 'utf-8' });
 
 describe('generate-client redocly.yaml config', () => {
   it('fan-out (no arg) builds every api with a `client` block or `clientOutput`', () => {
@@ -411,10 +411,11 @@ describe('generate-client redocly.yaml config', () => {
       ].join('\n') + '\n'
     );
     // Run from the repo root, pointing at the config elsewhere via --config.
-    const res = spawnSync('node', [cli, 'generate-client', '--config', join(dir, 'redocly.yaml')], {
-      cwd: repoRoot,
-      encoding: 'utf-8',
-    });
+    const res = spawnSync(
+      'node',
+      [cliEntry, 'generate-client', '--config', join(dir, 'redocly.yaml')],
+      { cwd: repoRoot, encoding: 'utf-8' }
+    );
     expect(res.status, res.stderr).toBe(0);
     expect(existsSync(join(dir, 'out/client.ts'))).toBe(true);
     rmSync(dir, { recursive: true, force: true });
diff --git a/tests/e2e/generate-client/retry.test.ts b/tests/e2e/generate-client/retry.test.ts
index 04c63cea4d..b4c9eb87e0 100644
--- a/tests/e2e/generate-client/retry.test.ts
+++ b/tests/e2e/generate-client/retry.test.ts
@@ -2,46 +2,22 @@
  * Behavioral e2e for retry. Injects a fake `fetch` via `configure()` so we can
  * script transient failures and count attempts deterministically — no live server.
  */
-import { spawnSync } from 'node:child_process';
-import { existsSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { existsSync, mkdtempSync, rmSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { outdent } from 'outdent';
 
+import { generateInto, runConsumer } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
 const fixture = join(__dirname, 'fixtures/base.yaml');
-const tsxBin = join(repoRoot, 'node_modules/.bin/tsx');
-
-function generate(dir: string): void {
-  writeFileSync(join(dir, 'package.json'), JSON.stringify({ type: 'module' }), 'utf-8');
-  const out = join(dir, 'client.ts');
-  const result = spawnSync('node', [cliEntry, 'generate-client', fixture, '--output', out], {
-    encoding: 'utf-8',
-    cwd: repoRoot,
-  });
-  if (result.status !== 0) throw new Error(`generate-client failed:\n${result.stderr}`);
-}
-
-function runConsumer(dir: string, script: string): unknown {
-  writeFileSync(join(dir, 'consumer.ts'), script, 'utf-8');
-  const result = spawnSync(tsxBin, [join(dir, 'consumer.ts')], {
-    encoding: 'utf-8',
-    cwd: repoRoot,
-  });
-  if (result.status !== 0) {
-    throw new Error(`consumer failed:\nstdout:\n${result.stdout}\nstderr:\n${result.stderr}`);
-  }
-  return JSON.parse(result.stdout.trim());
-}
 
 describe('retry behavior', () => {
   let dir = '';
   beforeAll(() => {
     dir = mkdtempSync(join(tmpdir(), 'retry-'));
-    generate(dir);
+    generateInto(dir, fixture);
   }, 60_000);
   afterAll(() => {
     if (dir && existsSync(dir)) rmSync(dir, { recursive: true, force: true });
diff --git a/tests/e2e/generate-client/setup.test.ts b/tests/e2e/generate-client/setup.test.ts
index fb37284d0e..74354f1cf0 100644
--- a/tests/e2e/generate-client/setup.test.ts
+++ b/tests/e2e/generate-client/setup.test.ts
@@ -7,15 +7,14 @@
 import { spawnSync } from 'node:child_process';
 import { existsSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { outdent } from 'outdent';
 
+import { cliEntry, repoRoot, runConsumer } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
 const fixture = join(__dirname, 'fixtures/base.yaml');
-const tsxBin = join(repoRoot, 'node_modules/.bin/tsx');
 
 const SETUP = outdent`
   import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
@@ -47,13 +46,6 @@ function generate(
   );
 }
 
-function runConsumer(dir: string, script: string): unknown {
-  writeFileSync(join(dir, 'consumer.ts'), script, 'utf-8');
-  const r = spawnSync(tsxBin, [join(dir, 'consumer.ts')], { encoding: 'utf-8', cwd: repoRoot });
-  if (r.status !== 0) throw new Error(`consumer failed:\n${r.stdout}\n${r.stderr}`);
-  return JSON.parse(r.stdout.trim());
-}
-
 describe('--setup bakes publisher defaults into the single-file client', () => {
   let dir = '';
   beforeAll(() => {
diff --git a/tests/e2e/generate-client/spec-versions.test.ts b/tests/e2e/generate-client/spec-versions.test.ts
index 8c757b2474..7561331d5e 100644
--- a/tests/e2e/generate-client/spec-versions.test.ts
+++ b/tests/e2e/generate-client/spec-versions.test.ts
@@ -1,44 +1,19 @@
-import { spawnSync } from 'node:child_process';
-import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
+import { generate, strictTypecheck } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
-const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
 
 function generateAndTypecheck(fixture: string): { generated: string } {
   const dir = mkdtempSync(join(tmpdir(), 'ots-specver-'));
   const out = join(dir, 'client.ts');
-  const res = spawnSync(
-    'node',
-    [cli, 'generate-client', join(__dirname, 'fixtures', fixture), '--output', out],
-    { encoding: 'utf-8', cwd: repoRoot }
-  );
-  expect(res.status, res.stderr).toBe(0);
+  generate(join(__dirname, 'fixtures', fixture), out);
   expect(existsSync(out)).toBe(true);
   const generated = readFileSync(out, 'utf-8');
-  writeFileSync(
-    join(dir, 'tsconfig.json'),
-    JSON.stringify({
-      compilerOptions: {
-        module: 'nodenext',
-        moduleResolution: 'nodenext',
-        target: 'es2022',
-        lib: ['ES2022', 'DOM'],
-        strict: true,
-        noEmit: true,
-        skipLibCheck: true,
-        types: [],
-      },
-      include: ['client.ts'],
-    }),
-    'utf-8'
-  );
-  const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
-  expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+  strictTypecheck(dir, ['client.ts']);
   rmSync(dir, { recursive: true, force: true });
   return { generated };
 }
diff --git a/tests/e2e/generate-client/split.test.ts b/tests/e2e/generate-client/split.test.ts
index 284c50fe63..fa1480efb3 100644
--- a/tests/e2e/generate-client/split.test.ts
+++ b/tests/e2e/generate-client/split.test.ts
@@ -9,12 +9,12 @@
 import { spawnSync } from 'node:child_process';
 import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
+import { generate, tscBin } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cliEntry = join(repoRoot, 'packages/cli/lib/index.js');
 const fixture = join(__dirname, 'fixtures/cafe.yaml');
 
 describe('generate-client end-to-end (--output-mode split)', () => {
@@ -35,12 +35,7 @@ describe('generate-client end-to-end (--output-mode split)', () => {
   });
 
   test('writes two sibling files derived from --output', () => {
-    const result = spawnSync(
-      'node',
-      [cliEntry, 'generate-client', fixture, '--output', entry, '--output-mode', 'split'],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(result.status, `generate-client stderr:\n${result.stderr}`).toBe(0);
+    generate(fixture, entry, ['--output-mode', 'split']);
     expect(existsSync(entry)).toBe(true);
     expect(existsSync(schemasFile)).toBe(true);
     // Split is exactly two files: no `.http.ts` module anymore.
@@ -68,7 +63,6 @@ describe('generate-client end-to-end (--output-mode split)', () => {
   test('the two-file set type-checks under strict mode with no unused imports', () => {
     expect(existsSync(entry), 'generation test must run first').toBe(true);
 
-    const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
     const tsc = spawnSync(
       tscBin,
       [
diff --git a/tests/e2e/generate-client/sse-consumer/.gitignore b/tests/e2e/generate-client/sse-consumer/.gitignore
new file mode 100644
index 0000000000..35d9162694
--- /dev/null
+++ b/tests/e2e/generate-client/sse-consumer/.gitignore
@@ -0,0 +1,2 @@
+# Generated fresh by the owning suite in beforeAll; excluded from the root typecheck.
+api.ts
diff --git a/tests/e2e/generate-client/sse-consumer/api.ts b/tests/e2e/generate-client/sse-consumer/api.ts
deleted file mode 100644
index 414996c1f4..0000000000
--- a/tests/e2e/generate-client/sse-consumer/api.ts
+++ /dev/null
@@ -1,1174 +0,0 @@
-// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run `redocly generate-client` to update.
-
-/**
- * SSE API (v1.0.0)
- */
-
-export type Health = {
-    status: string;
-};
-
-export type Message = {
-    text: string;
-    seq: number;
-};
-
-export type GetHealthResult = Health;
-
-/**
- * Per-operation `args`/`result` shapes (plus `kind: 'sse'` for event streams) — the
- * type-level companion of `OPERATIONS` that gives `createClient<Ops>` its typed methods.
- */
-export type Ops = {
-    getHealth: {
-        args: {};
-        result: GetHealthResult;
-    };
-    streamMessages: {
-        args: {};
-        result: Message;
-        kind: "sse";
-    };
-    streamAbort: {
-        args: {};
-        result: Message;
-        kind: "sse";
-    };
-    streamTicks: {
-        args: {};
-        result: string;
-        kind: "sse";
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    getHealth: { id: "getHealth", method: "GET", path: "/health", tags: ["Health"] },
-    streamMessages: { id: "streamMessages", method: "GET", path: "/messages", tags: ["Messages"], responseKind: "sse", sseDataKind: "json" },
-    streamAbort: { id: "streamAbort", method: "GET", path: "/abort-messages", tags: ["Messages"], responseKind: "sse", sseDataKind: "json" },
-    streamTicks: { id: "streamTicks", method: "GET", path: "/ticks", tags: ["Ticks"], responseKind: "sse", sseDataKind: "text" }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
-    tags: readonly string[];
-}>["tags"][number];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — `@redocly/client-generator`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits `OPERATIONS` literals typed
- * `satisfies Record<string, OperationDescriptor>` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).
- * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to `'json'` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (`ctx.operation`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working
- * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real `ApiError` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call `parseAs` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of `data`/`error` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for
- * streams and, for paginated operations, `item` (the page's element type) and — on
- * result-mode clients only — `page` (the RAW page type `.pages()` yields, since
- * iteration unwraps the `Result` envelope the one-shot `result` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: `{}` has no required members, so
- * `{} extends A` is true exactly when every member of `A` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type `.pages()` yields: the RAW page declared by `page` (the generator
- * writes it only on result-mode paginated entries, whose `result` is the envelope),
- * or the method's own `result` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares `item` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).
- * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a
- * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the
- * `onError` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(`Request failed with status ${status}`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (`style: 'form'`, `explode: true`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for `allowReserved: true` params —
- * `filter=a/b` survives instead of `filter=a%2Fb`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute `{name}` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\{([^{}]+)\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(`Missing path parameter "${name}"`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: `serverUrl` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI `style`/`explode`/`allowReserved` (from `styles`);
- * without a spec, arrays repeat the key (`form`+`explode`), objects serialize as
- * `deepObject` brackets, and `null`/`undefined` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not `/\/+$/` — an anchored `+` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use `deepObject` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(`${key}[${subKey}]`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(`${key}=${encodeReserved(v)}`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. `%20` (not `+`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(`${encodeURIComponent(key)}=${items.map(enc).join(delim)}`);
-      }
-    } else if (Object(value) === value) {
-      // `deepObject` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(`${key}[${subKey}]=${encodeReserved(String(subValue))}`);
-          else params.append(`${key}[${subKey}]`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(`${key}=${encodeReserved(String(value))}`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? `${url}?${qs}` : url;
-}
-
-/**
- * Read the response body per `kind`. `'auto'` negotiates from the content type
- * (JSON, then `text/*`, then Blob); `'void'` and `204` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // `Text/Plain` and `application/JSON` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom `retryOn` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a `Retry-After` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over `retryDelay`, with full jitter
- * unless `jitter === false`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after `ms`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * `createClient` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's `HeadersInit` (plain record, `Headers` instance, or entry pairs)
- * to a plain record — spreading a `Headers` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single `onRequest`/`onResponse`/
- * `onError` config hooks as one implicit first middleware, then `config.middleware`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * `onRequest` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, `Retry-After`, abandoned-body drain), and the reverse
- * `onResponse` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * A frame delimiter: two consecutive line terminators (each CR, LF, or CRLF, per the SSE
- * spec — so mixed endings like `\n\r\n` are valid boundaries, not just matching pairs).
- */
-const FRAME_DELIMITER = /(?:\r\n|\r|\n){2}/;
-
-/**
- * A terminally malformed event stream — unparseable JSON `data` or an unbounded frame.
- * A stable bad payload, not a dropped connection, so the stream never reconnects on it.
- */
-class SseParseError extends Error {}
-
-/**
- * Consume a `text/event-stream` operation as typed events (capability module — wired
- * into `createClient`). Auto-reconnects on dropped connections, resuming from the last
- * seen event id via `Last-Event-ID` (backoff: the server's `retry:` value, then
- * `reconnectDelay`, then 1s — exponential with jitter, capped at 30s). A clean stream
- * end flushes a trailing frame and finishes; `break`/abort end the iterator cleanly.
- */
-async function* sse<T>(
-  config: ClientConfig,
-  op: OperationContext,
-  prepare: () => Promise<{ url: string; init: SseOptions }>,
-  dataKind: 'json' | 'text' = 'text'
-): AsyncGenerator<ServerSentEvent<T>> {
-  let lastEventId: string | undefined;
-  let serverRetry: number | undefined;
-  let failures = 0;
-  while (true) {
-    // Re-prepare each attempt so a refresh-style TokenProvider yields a fresh credential
-    // on reconnect (the auth is baked into `url` query + `init.headers`). `reconnect`,
-    // `reconnectDelay`, and `signal` come from the caller's original options unchanged.
-    const { url, init } = await prepare();
-    const { reconnect = true, reconnectDelay, ...rest } = init;
-    const signal = rest.signal ?? undefined;
-    if (signal?.aborted) return;
-    const headers: Record<string, string> = {
-      Accept: 'text/event-stream',
-      ...toHeaderRecord(rest.headers),
-    };
-    const sendHeaders =
-      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
-    try {
-      const { response } = await send(
-        config,
-        op,
-        url,
-        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },
-        undefined,
-        false,
-        {}
-      );
-      if (!response.ok) {
-        const errorBody = await readError(response);
-        throw new ApiError(url, response.status, response.statusText, errorBody);
-      }
-      failures = 0;
-      const body = response.body;
-      if (!body) return;
-      const reader = body.getReader();
-      const decoder = new TextDecoder();
-      let buffer = '';
-      try {
-        while (true) {
-          const { done, value } = await reader.read();
-          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });
-          let match: RegExpMatchArray | null;
-          while ((match = buffer.match(FRAME_DELIMITER)) !== null) {
-            const index = match.index!;
-            const raw = buffer.slice(0, index);
-            buffer = buffer.slice(index + match[0].length);
-            const event = parseSseFrame(raw, dataKind);
-            if (event) {
-              if (event.id !== undefined) lastEventId = event.id;
-              if (event.retry !== undefined) serverRetry = event.retry;
-              yield event as ServerSentEvent<T>;
-            }
-          }
-          if (done) {
-            // Stream closed cleanly. Flush a final event that arrived without a trailing
-            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.
-            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;
-            if (event) {
-              if (event.id !== undefined) lastEventId = event.id;
-              if (event.retry !== undefined) serverRetry = event.retry;
-              yield event as ServerSentEvent<T>;
-            }
-            return;
-          }
-          // Bound memory: a server that never sends a frame delimiter would otherwise
-          // grow `buffer` without limit. 1 MiB is far above any real SSE frame.
-          if (buffer.length > 1048576) {
-            throw new SseParseError('SSE frame exceeded 1048576 characters without a delimiter');
-          }
-        }
-      } finally {
-        await reader.cancel().catch(() => undefined);
-      }
-    } catch (error) {
-      if (signal?.aborted) return;
-      // A non-OK HTTP response (4xx/5xx) or an unparseable JSON payload is a definitive
-      // error, not a transient drop — surface it instead of reconnecting in a loop (a
-      // stable bad payload would otherwise reconnect forever).
-      if (error instanceof ApiError || error instanceof SseParseError) throw error;
-      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream
-      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.
-      if (!reconnect) throw error;
-    }
-    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.
-    failures++;
-    const base = serverRetry ?? reconnectDelay ?? 1000;
-    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);
-    try {
-      await sleep(Math.random() * delay, signal);
-    } catch {
-      return; // sleep rejects only on abort — end the iterator cleanly
-    }
-  }
-}
-
-/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */
-function parseSseFrame(
-  raw: string,
-  dataKind: 'json' | 'text'
-): ServerSentEvent<unknown> | undefined {
-  let event: string | undefined;
-  const dataLines: string[] = [];
-  let id: string | undefined;
-  let retry: number | undefined;
-  let sawField = false;
-  for (const line of raw.split(/\r\n|\n|\r/)) {
-    if (line === '' || line.startsWith(':')) continue;
-    const colon = line.indexOf(':');
-    const field = colon === -1 ? line : line.slice(0, colon);
-    let val = colon === -1 ? '' : line.slice(colon + 1);
-    if (val.startsWith(' ')) val = val.slice(1);
-    sawField = true;
-    if (field === 'event') event = val;
-    else if (field === 'data') dataLines.push(val);
-    else if (field === 'id') id = val;
-    else if (field === 'retry') {
-      const n = Number(val);
-      if (!Number.isNaN(n)) retry = n;
-    }
-  }
-  if (!sawField) return undefined;
-  const dataText = dataLines.join('\n');
-  let data: unknown = dataText;
-  if (dataKind === 'json' && dataText !== '') {
-    try {
-      data = JSON.parse(dataText);
-    } catch (error) {
-      throw new SseParseError(
-        `Failed to parse SSE event data as JSON: ${error instanceof Error ? error.message : String(error)}`
-      );
-    }
-  }
-  return { event, data, id, retry };
-}
-
-/**
- * The optional behaviors `createClientCore` can dispatch to but never statically
- * imports. The package's public `createClient` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call `parseAs` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),
- * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)
- * are honored, and an omitted `explode` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller `init.headers` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(`Pagination capability not wired: cannot iterate operation "${op.id}"`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is
- * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's `error` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (`errorMode` is fixed at construction — `configure()`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // `auth` merges into existing credentials (like the `auth.*` setters) rather than
-    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set
-    // basic/apiKey. `apiKey` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: `createClientCore` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same `OPERATIONS`/`Ops`. The trailing string params carry the wiring's literal
- * unions (`OperationId`/`OperationPath`/`OperationTag`) into `ctx.operation`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, { sse });
-}
-
-export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "http://localhost:3104" });
-
-export const { configure, use } = client;
-export const getHealth = (init: RequestOptions = {}) => client.getHealth({}, init);
-export const streamMessages = (init: SseOptions = {}) => client.streamMessages({}, init);
-export const streamAbort = (init: SseOptions = {}) => client.streamAbort({}, init);
-export const streamTicks = (init: SseOptions = {}) => client.streamTicks({}, init);
diff --git a/tests/e2e/generate-client/sse.runtime.test.ts b/tests/e2e/generate-client/sse.runtime.test.ts
index 74637d7c4e..76740f60ae 100644
--- a/tests/e2e/generate-client/sse.runtime.test.ts
+++ b/tests/e2e/generate-client/sse.runtime.test.ts
@@ -2,14 +2,14 @@
 // `text/event-stream` frames, drops mid-stream, and the generated client
 // auto-reconnects (resuming via `Last-Event-ID`). A second scenario aborts the
 // stream mid-flight and asserts the loop completes WITHOUT throwing.
-import { spawn, spawnSync, type ChildProcess } from 'node:child_process';
+import { spawnSync, type ChildProcess } from 'node:child_process';
 import { existsSync, rmSync } from 'node:fs';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
+import { generate, killServer, repoRoot, startServer } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const indexEntryPoint = join(repoRoot, 'packages/cli/lib/index.js');
 const fixture = join(__dirname, 'fixtures/sse.yaml');
 const consumerDir = join(__dirname, 'sse-consumer');
 const generatedFile = join(consumerDir, 'api.ts');
@@ -22,44 +22,6 @@ const connectRetryScript = join(consumerDir, 'index-connect-retry.ts');
 const SERVER_PORT = 3104;
 const SERVER_BASE = `http://127.0.0.1:${SERVER_PORT}`;
 
-async function waitForServerReady(timeoutMs: number): Promise<void> {
-  const deadline = Date.now() + timeoutMs;
-  let lastError: unknown;
-  while (Date.now() < deadline) {
-    try {
-      const response = await fetch(`${SERVER_BASE}/__test__/ready`);
-      if (response.ok) return;
-    } catch (error) {
-      lastError = error;
-    }
-    await new Promise((r) => setTimeout(r, 100));
-  }
-  throw new Error(
-    `SSE server did not become ready within ${timeoutMs}ms: ${
-      lastError instanceof Error ? lastError.message : String(lastError)
-    }`
-  );
-}
-
-function killServer(server: ChildProcess): Promise<void> {
-  return new Promise((resolveFn) => {
-    if (!server.pid || server.exitCode !== null) {
-      resolveFn();
-      return;
-    }
-    const onExit = (): void => resolveFn();
-    server.once('exit', onExit);
-    server.kill('SIGTERM');
-    setTimeout(() => {
-      server.removeListener('exit', onExit);
-      if (server.exitCode === null) {
-        server.kill('SIGKILL');
-      }
-      resolveFn();
-    }, 2_000);
-  });
-}
-
 describe('generate-client SSE consumer (reconnect + abort)', () => {
   let serverProcess: ChildProcess | undefined;
 
@@ -68,34 +30,33 @@ describe('generate-client SSE consumer (reconnect + abort)', () => {
       rmSync(generatedFile, { force: true });
     }
 
-    const generateResult = spawnSync(
-      'node',
-      [indexEntryPoint, 'generate-client', fixture, '--output', generatedFile],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(generateResult.status, `generate-client stderr:\n${generateResult.stderr}`).toBe(0);
+    generate(fixture, generatedFile);
     expect(existsSync(generatedFile)).toBe(true);
 
-    serverProcess = spawn('npx', ['tsx', serverScript], {
-      cwd: consumerDir,
-      env: { ...process.env, SSE_SERVER_PORT: String(SERVER_PORT) },
-      stdio: ['ignore', 'pipe', 'pipe'],
-    });
-
-    serverProcess.stderr?.on('data', (chunk: Buffer) => {
-      process.stderr.write(`[sse-server stderr] ${chunk.toString()}`);
+    // The consumer dir is excluded from the root typecheck (api.ts is gitignored),
+    // so type-check it here against the fresh generation.
+    const typecheckResult = spawnSync('npx', ['tsc', '--noEmit', '-p', consumerDir], {
+      encoding: 'utf-8',
+      cwd: repoRoot,
     });
+    expect(
+      typecheckResult.status,
+      `tsc stdout:\n${typecheckResult.stdout}\nstderr:\n${typecheckResult.stderr}`
+    ).toBe(0);
 
-    await waitForServerReady(15_000);
+    serverProcess = await startServer(
+      serverScript,
+      consumerDir,
+      { SSE_SERVER_PORT: String(SERVER_PORT) },
+      SERVER_BASE,
+      'sse-server'
+    );
   }, 30_000);
 
   afterAll(async () => {
     if (serverProcess) {
       await killServer(serverProcess);
     }
-    // The generated `api.ts` is intentionally left in place, matching the other
-    // consumer harnesses — it's committed (regeneration is deterministic) so the
-    // repo-wide `tsc --noEmit` typecheck finds it present on a fresh checkout.
   });
 
   test('reconnect: events stream across a dropped connection, resuming via Last-Event-ID', () => {
diff --git a/tests/e2e/generate-client/sse.test.ts b/tests/e2e/generate-client/sse.test.ts
index 62a36fdc4d..367dfa2a2d 100644
--- a/tests/e2e/generate-client/sse.test.ts
+++ b/tests/e2e/generate-client/sse.test.ts
@@ -15,26 +15,12 @@ import {
   writeFileSync,
 } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
-const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
+import { generate, strictTypecheck, tscBin } from './helpers.js';
 
-const TSCONFIG = {
-  compilerOptions: {
-    module: 'nodenext',
-    moduleResolution: 'nodenext',
-    target: 'es2022',
-    lib: ['ES2022', 'DOM'],
-    strict: true,
-    noEmit: true,
-    skipLibCheck: true,
-    types: [],
-  },
-};
+const __dirname = dirname(fileURLToPath(import.meta.url));
 
 /** Recursively collect every generated `.ts` file under `dir`. */
 function collectTsFiles(dir: string): string[] {
@@ -53,11 +39,7 @@ describe('generate-client SSE', () => {
   it('single-file: embedded sse capability + flat typed stream sugar, strict tsc passes', () => {
     const dir = mkdtempSync(join(tmpdir(), 'ots-sse-single-'));
     const out = join(dir, 'client.ts');
-    const res = spawnSync('node', [cli, 'generate-client', fixture, '--output', out], {
-      encoding: 'utf-8',
-      cwd: repoRoot,
-    });
-    expect(res.status, res.stderr).toBe(0);
+    generate(fixture, out);
     expect(existsSync(out)).toBe(true);
 
     const generated = readFileSync(out, 'utf-8');
@@ -96,25 +78,14 @@ describe('generate-client SSE', () => {
       'utf-8'
     );
 
-    writeFileSync(
-      join(dir, 'tsconfig.json'),
-      JSON.stringify({ ...TSCONFIG, include: ['client.ts', 'usage.ts'] }),
-      'utf-8'
-    );
-    const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
-    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+    strictTypecheck(dir, ['client.ts', 'usage.ts']);
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
   it('split: SSE ops live in the entry beside the embedded runtime, strict tsc passes over both files', () => {
     const dir = mkdtempSync(join(tmpdir(), 'ots-sse-split-'));
     const entry = join(dir, 'client.ts');
-    const res = spawnSync(
-      'node',
-      [cli, 'generate-client', fixture, '--output', entry, '--output-mode', 'split'],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(res.status, res.stderr).toBe(0);
+    generate(fixture, entry, ['--output-mode', 'split']);
     expect(existsSync(entry)).toBe(true);
 
     const entrySrc = readFileSync(entry, 'utf-8');
diff --git a/tests/e2e/generate-client/swr.test.ts b/tests/e2e/generate-client/swr.test.ts
index 1b1c9ff0ef..3790d53a3a 100644
--- a/tests/e2e/generate-client/swr.test.ts
+++ b/tests/e2e/generate-client/swr.test.ts
@@ -1,13 +1,12 @@
 import { spawnSync } from 'node:child_process';
 import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
+import { generate, repoRoot, tscBin } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
-const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
 // `swr` is hoisted to the repo root node_modules (a repo devDependency); map it
 // explicitly so tsc resolves the generated module's `import useSWR from "swr"` and
 // `import useSWRMutation from "swr/mutation"` from the temp dir.
@@ -19,22 +18,12 @@ describe('generate-client swr generator', () => {
     const out = join(dir, 'client.ts');
     const swrOut = join(dir, 'client.swr.ts');
 
-    const res = spawnSync(
-      'node',
-      [
-        cli,
-        'generate-client',
-        join(__dirname, 'fixtures', 'base.yaml'),
-        '--output',
-        out,
-        '--generator',
-        'sdk',
-        '--generator',
-        'swr',
-      ],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(res.status, res.stderr).toBe(0);
+    generate(join(__dirname, 'fixtures', 'base.yaml'), out, [
+      '--generator',
+      'sdk',
+      '--generator',
+      'swr',
+    ]);
 
     // Both the sdk client and the standalone swr module are produced.
     expect(existsSync(out)).toBe(true);
diff --git a/tests/e2e/generate-client/tanstack-query.runtime.test.ts b/tests/e2e/generate-client/tanstack-query.runtime.test.ts
index 94d43a630e..befc7b3d43 100644
--- a/tests/e2e/generate-client/tanstack-query.runtime.test.ts
+++ b/tests/e2e/generate-client/tanstack-query.runtime.test.ts
@@ -15,15 +15,14 @@
 
 import { QueryClient, QueryClientProvider, useMutation, useQuery } from '@tanstack/react-query';
 import { renderHook, waitFor } from '@testing-library/react';
-import { spawnSync } from 'node:child_process';
 import { existsSync, rmSync } from 'node:fs';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { createElement, type ReactNode } from 'react';
 
+import { generate } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
 const consumerDir = join(__dirname, 'tanstack-consumer');
 const sdkFile = join(consumerDir, 'client.ts');
 const tanstackFile = join(consumerDir, 'client.tanstack.ts');
@@ -47,22 +46,12 @@ describe('generate-client tanstack-query runtime (React hooks, jsdom)', () => {
     for (const f of [sdkFile, tanstackFile]) {
       if (existsSync(f)) rmSync(f, { force: true });
     }
-    const res = spawnSync(
-      'node',
-      [
-        cli,
-        'generate-client',
-        join(__dirname, 'fixtures', 'base.yaml'),
-        '--output',
-        sdkFile,
-        '--generator',
-        'sdk',
-        '--generator',
-        'tanstack-query',
-      ],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(res.status, res.stderr).toBe(0);
+    generate(join(__dirname, 'fixtures', 'base.yaml'), sdkFile, [
+      '--generator',
+      'sdk',
+      '--generator',
+      'tanstack-query',
+    ]);
     expect(existsSync(tanstackFile)).toBe(true);
   });
 
diff --git a/tests/e2e/generate-client/tanstack-query.test.ts b/tests/e2e/generate-client/tanstack-query.test.ts
index f953145e24..ec98ee5153 100644
--- a/tests/e2e/generate-client/tanstack-query.test.ts
+++ b/tests/e2e/generate-client/tanstack-query.test.ts
@@ -1,13 +1,12 @@
 import { spawnSync } from 'node:child_process';
 import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
+import { generate, repoRoot, tscBin } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
-const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
 // `@tanstack/react-query` is hoisted to the repo root node_modules (a repo
 // devDependency); map it explicitly so tsc resolves the generated module's
 // `import { queryOptions } from "@tanstack/react-query"` from the temp dir.
@@ -22,22 +21,12 @@ describe('generate-client tanstack-query generator', () => {
     const out = join(dir, 'client.ts');
     const tanstackOut = join(dir, 'client.tanstack.ts');
 
-    const res = spawnSync(
-      'node',
-      [
-        cli,
-        'generate-client',
-        join(__dirname, 'fixtures', 'base.yaml'),
-        '--output',
-        out,
-        '--generator',
-        'sdk',
-        '--generator',
-        'tanstack-query',
-      ],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(res.status, res.stderr).toBe(0);
+    generate(join(__dirname, 'fixtures', 'base.yaml'), out, [
+      '--generator',
+      'sdk',
+      '--generator',
+      'tanstack-query',
+    ]);
 
     // Both the sdk client and the standalone tanstack module are produced.
     expect(existsSync(out)).toBe(true);
@@ -107,26 +96,16 @@ describe('generate-client tanstack-query generator', () => {
     const out = join(dir, 'client.ts');
     const tanstackOut = join(dir, 'client.tanstack.ts');
 
-    const res = spawnSync(
-      'node',
-      [
-        cli,
-        'generate-client',
-        join(__dirname, 'fixtures', 'base.yaml'),
-        '--output',
-        out,
-        '--runtime',
-        'package',
-        '--generator',
-        'sdk',
-        '--generator',
-        'tanstack-query',
-        '--query-framework',
-        'react',
-      ],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(res.status, res.stderr).toBe(0);
+    generate(join(__dirname, 'fixtures', 'base.yaml'), out, [
+      '--runtime',
+      'package',
+      '--generator',
+      'sdk',
+      '--generator',
+      'tanstack-query',
+      '--query-framework',
+      'react',
+    ]);
 
     // The sdk entry imports the runtime instead of embedding it; the wrapper is unchanged
     // in shape — it consumes the same free functions + <Op>Variables surface.
@@ -194,24 +173,14 @@ describe('generate-client tanstack-query generator', () => {
     const out = join(dir, 'client.ts');
     const tanstackOut = join(dir, 'client.tanstack.ts');
 
-    const res = spawnSync(
-      'node',
-      [
-        cli,
-        'generate-client',
-        join(__dirname, 'fixtures', 'base.yaml'),
-        '--output',
-        out,
-        '--generator',
-        'sdk',
-        '--generator',
-        'tanstack-query',
-        '--query-framework',
-        'vue',
-      ],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(res.status, res.stderr).toBe(0);
+    generate(join(__dirname, 'fixtures', 'base.yaml'), out, [
+      '--generator',
+      'sdk',
+      '--generator',
+      'tanstack-query',
+      '--query-framework',
+      'vue',
+    ]);
 
     // No strict-tsc compile here: @tanstack/vue-query isn't a dev dependency, and the
     // react test already proves the queryOptions output type-checks against a real
diff --git a/tests/e2e/generate-client/transformers.test.ts b/tests/e2e/generate-client/transformers.test.ts
index fa1ffb9831..5f9b34793c 100644
--- a/tests/e2e/generate-client/transformers.test.ts
+++ b/tests/e2e/generate-client/transformers.test.ts
@@ -19,16 +19,14 @@
 //  - DEFAULT UNCHANGED: without `--date-type Date` the sdk date field stays
 //    typed `string` (the byte-identical default).
 
-import { spawnSync } from 'node:child_process';
-import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
+import { generate as generateClient, strictTypecheck } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
-const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
 const fixture = join(__dirname, 'fixtures', 'transformers.yaml');
 const consumerDir = join(__dirname, 'transformers-consumer');
 
@@ -36,12 +34,7 @@ function generate(out: string, args: string[]): void {
   // args[0] is a comma-separated generator list; the rest are extra flags.
   const [generators, ...rest] = args;
   const generatorFlags = generators.split(',').flatMap((g) => ['--generator', g]);
-  const res = spawnSync(
-    'node',
-    [cli, 'generate-client', fixture, '--output', out, ...generatorFlags, ...rest],
-    { encoding: 'utf-8', cwd: repoRoot }
-  );
-  expect(res.status, res.stderr).toBe(0);
+  generateClient(fixture, out, [...generatorFlags, ...rest]);
 }
 
 describe('generate-client transformers generator', () => {
@@ -67,26 +60,7 @@ describe('generate-client transformers generator', () => {
 
     // strict-tsc the sdk + transformers TOGETHER: proves transform<Name>(data:
     // <Name>): <Name> type-checks against the Date-typed sdk schema.
-    writeFileSync(
-      join(dir, 'tsconfig.json'),
-      JSON.stringify({
-        compilerOptions: {
-          module: 'nodenext',
-          moduleResolution: 'nodenext',
-          target: 'es2022',
-          lib: ['ES2022', 'DOM'],
-          strict: true,
-          noEmit: true,
-          skipLibCheck: true,
-          types: [],
-        },
-        include: ['client.ts', 'client.transformers.ts'],
-      }),
-      'utf-8'
-    );
-
-    const tsc = spawnSync(tscBin, ['--noEmit', '-p', dir], { encoding: 'utf-8', cwd: repoRoot });
-    expect(tsc.status, `tsc failed:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
+    strictTypecheck(dir, ['client.ts', 'client.transformers.ts']);
 
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
diff --git a/tests/e2e/generate-client/zod.test.ts b/tests/e2e/generate-client/zod.test.ts
index 9879d9439c..321ca66db5 100644
--- a/tests/e2e/generate-client/zod.test.ts
+++ b/tests/e2e/generate-client/zod.test.ts
@@ -9,14 +9,13 @@ import {
   writeFileSync,
 } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join, resolve } from 'node:path';
+import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { outdent } from 'outdent';
 
+import { generate, repoRoot, tscBin } from './helpers.js';
+
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const repoRoot = resolve(__dirname, '../../..');
-const cli = join(repoRoot, 'packages/cli/lib/index.js');
-const tscBin = join(repoRoot, 'node_modules/.bin/tsc');
 // `zod` is hoisted to the repo root node_modules (a repo devDependency); map it
 // explicitly so tsc resolves `import { z } from 'zod'` from the out-of-tree temp dir.
 const zodPath = join(repoRoot, 'node_modules/zod');
@@ -27,22 +26,12 @@ describe('generate-client zod generator', () => {
     const out = join(dir, 'client.ts');
     const zodOut = join(dir, 'client.zod.ts');
 
-    const res = spawnSync(
-      'node',
-      [
-        cli,
-        'generate-client',
-        join(__dirname, 'fixtures', 'cafe.yaml'),
-        '--output',
-        out,
-        '--generator',
-        'sdk',
-        '--generator',
-        'zod',
-      ],
-      { encoding: 'utf-8', cwd: repoRoot }
-    );
-    expect(res.status, res.stderr).toBe(0);
+    generate(join(__dirname, 'fixtures', 'cafe.yaml'), out, [
+      '--generator',
+      'sdk',
+      '--generator',
+      'zod',
+    ]);
 
     // Both the sdk client and the standalone zod module are produced.
     expect(existsSync(out)).toBe(true);
@@ -149,22 +138,12 @@ describe('generate-client zod generator', () => {
                     quantity: { type: integer, minimum: 1 }
       `
     );
-    const generated = spawnSync(
-      'node',
-      [
-        cli,
-        'generate-client',
-        'openapi.yaml',
-        '--output',
-        'client.ts',
-        '--generator',
-        'sdk',
-        '--generator',
-        'zod',
-      ],
-      { cwd: dir, encoding: 'utf-8' }
-    );
-    expect(generated.status, generated.stderr).toBe(0);
+    generate(join(dir, 'openapi.yaml'), join(dir, 'client.ts'), [
+      '--generator',
+      'sdk',
+      '--generator',
+      'zod',
+    ]);
 
     writeFileSync(
       join(dir, 'driver.ts'),
diff --git a/tsconfig.json b/tsconfig.json
index 15bd709c84..de6decf878 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -23,5 +23,5 @@
     "moduleResolution": "nodenext",
     "esModuleInterop": true
   },
-  "exclude": ["tests/e2e/generate-client/examples"]
+  "exclude": ["tests/e2e/generate-client/examples", "tests/e2e/generate-client/*-consumer"]
 }

From 26455fa799c0480e8870f07e92c19e2cde14479d Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Fri, 17 Jul 2026 17:04:07 +0300
Subject: [PATCH 116/134] test(client-generator): drop redundant unit tests and
 runtime-embedding golden snapshots

---
 .../__snapshots__/package-client.test.ts.snap | 2449 -----------------
 .../src/emitters/__tests__/mock.test.ts       |   77 +-
 .../emitters/__tests__/package-client.test.ts |   22 +-
 .../emitters/__tests__/sse.deletion.test.ts   |   87 -
 .../emitters/__tests__/transformers.test.ts   |  226 +-
 .../emitters/__tests__/type-guards.test.ts    |  447 +--
 .../src/generators/__tests__/index.test.ts    |   37 +-
 .../__tests__/build.test.ts                   |  281 +-
 8 files changed, 294 insertions(+), 3332 deletions(-)
 delete mode 100644 packages/client-generator/src/emitters/__tests__/sse.deletion.test.ts

diff --git a/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap b/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
index 054e0da67f..f249406058 100644
--- a/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
+++ b/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
@@ -1,1248 +1,5 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`emitClientSingleFile (embed arm) > matches the golden output for a small model 1`] = `
-"// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run \`redocly generate-client\` to update.
-
-/**
- * T (v1.0.0)
- */
-
-export type Order = {
-    id: string;
-};
-
-export type Problem = {};
-
-export type Pet = {};
-
-export type OrderEvent = {};
-
-export type GetOrderResult = Order;
-
-export type GetOrderParams = {
-    expand?: string;
-};
-
-export type GetOrderVariables = {
-    orderId: string;
-    params?: GetOrderParams;
-};
-
-/**
- * Per-operation \`args\`/\`result\` shapes (plus \`kind: 'sse'\` for event streams) — the
- * type-level companion of \`OPERATIONS\` that gives \`createClient<Ops>\` its typed methods.
- */
-export type Ops = {
-    getOrder: {
-        args: {
-            orderId: string;
-            params?: GetOrderParams;
-        };
-        result: GetOrderResult;
-    };
-    streamEvents: {
-        args: {};
-        result: OrderEvent;
-        kind: "sse";
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "expand", in: "query" }], security: [[{ scheme: "bearerAuth", kind: "bearer" }]] },
-    streamEvents: { id: "streamEvents", method: "GET", path: "/events", responseKind: "sse", sseDataKind: "json" }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
-    tags: readonly string[];
-}>["tags"][number];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — \`@redocly/client-generator\`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits \`OPERATIONS\` literals typed
- * \`satisfies Record<string, OperationDescriptor>\` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (\`scheme\` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its \`.pages()\`/\`.items()\` members).
- * \`nextCursor\` and \`items\` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (\`cursor\`) or number (\`offset\`/\`page\`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** \`multipart: true\` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to \`'json'\` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (\`ctx.operation\`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (\`OperationId\`/\`OperationPath\`/\`OperationTag\`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (\`runtime-contract.ts\`, the runtime internals) working
- * with the base shape. \`tags\` stays mutable (\`Tag[]\`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom \`retryOn\`: exactly one of \`response\`/\`error\` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real \`ApiError\` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // \`globalThis.Error\` so a spec schema named \`Error\` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (\`'throw'\` when omitted); \`configure()\` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call \`parseAs\` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard \`RequestInit\` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of \`data\`/\`error\` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated \`Ops\` type's shape: per-operation args/result, plus \`kind: 'sse'\` for
- * streams and, for paginated operations, \`item\` (the page's element type) and — on
- * result-mode clients only — \`page\` (the RAW page type \`.pages()\` yields, since
- * iteration unwraps the \`Result\` envelope the one-shot \`result\` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note \`middleware\` REPLACES the chain (use \`use()\` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: \`{}\` has no required members, so
- * \`{} extends A\` is true exactly when every member of \`A\` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type \`.pages()\` yields: the RAW page declared by \`page\` (the generator
- * writes it only on result-mode paginated entries, whose \`result\` is the envelope),
- * or the method's own \`result\` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares \`item\` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; \`unknown\` otherwise (identity under \`&\`).
- * Iteration is error-mode-agnostic: \`.pages()\`/\`.items()\` yield raw pages/items, and a
- * failed page aborts iteration by throwing \`ApiError\`, even on result-mode clients; the
- * \`onError\` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(\`Request failed with status \${status}\`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// \`globalThis.Error\` (not bare \`Error\`) so a spec schema named \`Error\` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (\`style: 'form'\`, \`explode: true\`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for \`allowReserved: true\` params —
- * \`filter=a/b\` survives instead of \`filter=a%2Fb\`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute \`{name}\` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\\{([^{}]+)\\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(\`Missing path parameter "\${name}"\`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: \`serverUrl\` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI \`style\`/\`explode\`/\`allowReserved\` (from \`styles\`);
- * without a spec, arrays repeat the key (\`form\`+\`explode\`), objects serialize as
- * \`deepObject\` brackets, and \`null\`/\`undefined\` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not \`/\\/+$/\` — an anchored \`+\` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use \`deepObject\` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(\`\${key}[\${subKey}]\`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(\`\${key}=\${encodeReserved(v)}\`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. \`%20\` (not \`+\`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(\`\${encodeURIComponent(key)}=\${items.map(enc).join(delim)}\`);
-      }
-    } else if (Object(value) === value) {
-      // \`deepObject\` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(\`\${key}[\${subKey}]=\${encodeReserved(String(subValue))}\`);
-          else params.append(\`\${key}[\${subKey}]\`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(\`\${key}=\${encodeReserved(String(value))}\`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? \`\${url}?\${qs}\` : url;
-}
-
-/**
- * Read the response body per \`kind\`. \`'auto'\` negotiates from the content type
- * (JSON, then \`text/*\`, then Blob); \`'void'\` and \`204\` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // \`Text/Plain\` and \`application/JSON\` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom \`retryOn\` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a \`Retry-After\` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over \`retryDelay\`, with full jitter
- * unless \`jitter === false\`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after \`ms\`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/** Resolve a credential: a literal passes through; a function is awaited per request. */
-async function resolveToken(provider: TokenProvider): Promise<string> {
-  return typeof provider === 'function' ? await provider() : provider;
-}
-
-/** UTF-8-safe base64: bare \`btoa\` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
-function encodeBase64(text: string): string {
-  let binary = '';
-  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
-  return btoa(binary);
-}
-
-/** Whether a credential for this scheme is configured on the instance. */
-function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
-  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
-  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
-  return config.auth?.basic !== undefined;
-}
-
-/**
- * Build the auth headers/query for one operation's \`security\` OR-alternatives from the
- * instance credentials (\`config.auth\`) — capability module, wired into \`createClient\`.
- * The first alternative whose schemes (an AND-set) are all configured is applied, so
- * "bearer OR apiKey" works with either credential and never sends both. When none is
- * fully configured, the first alternative's configured schemes are still sent (the
- * server rejects the request, mirroring the previous behavior).
- * Cookie-borne apiKeys fold into a single \`Cookie\` header joined with \`; \`.
- */
-async function resolveAuth(
-  security: readonly (readonly SecuritySpec[])[],
-  config: ClientConfig
-): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
-  const alternative =
-    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
-    security[0] ??
-    [];
-  const headers: Record<string, string> = {};
-  const query: Record<string, string> = {};
-  const cookies: string[] = [];
-  for (const scheme of alternative) {
-    if (scheme.kind === 'apiKey') {
-      const provider = config.auth?.apiKey?.[scheme.scheme];
-      if (provider === undefined) continue;
-      const value = await resolveToken(provider);
-      if (scheme.in === 'header') headers[scheme.name] = value;
-      else if (scheme.in === 'query') query[scheme.name] = value;
-      // Cookie values may contain reserved characters (\`;\`, \`=\`, space, …); percent-encode
-      // so the credential can't break the \`Cookie\` header syntax.
-      else cookies.push(\`\${scheme.name}=\${encodeURIComponent(value)}\`);
-    } else if (scheme.kind === 'bearer') {
-      const provider = config.auth?.bearer;
-      if (provider !== undefined) headers.Authorization = \`Bearer \${await resolveToken(provider)}\`;
-    } else {
-      const basic = config.auth?.basic;
-      if (basic !== undefined) {
-        headers.Authorization = \`Basic \${encodeBase64(\`\${basic.username}:\${basic.password}\`)}\`;
-      }
-    }
-  }
-  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
-  return { headers, query };
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * \`createClient\` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's \`HeadersInit\` (plain record, \`Headers\` instance, or entry pairs)
- * to a plain record — spreading a \`Headers\` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single \`onRequest\`/\`onResponse\`/
- * \`onError\` config hooks as one implicit first middleware, then \`config.middleware\`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * \`onRequest\` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, \`Retry-After\`, abandoned-body drain), and the reverse
- * \`onResponse\` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * A frame delimiter: two consecutive line terminators (each CR, LF, or CRLF, per the SSE
- * spec — so mixed endings like \`\\n\\r\\n\` are valid boundaries, not just matching pairs).
- */
-const FRAME_DELIMITER = /(?:\\r\\n|\\r|\\n){2}/;
-
-/**
- * A terminally malformed event stream — unparseable JSON \`data\` or an unbounded frame.
- * A stable bad payload, not a dropped connection, so the stream never reconnects on it.
- */
-class SseParseError extends Error {}
-
-/**
- * Consume a \`text/event-stream\` operation as typed events (capability module — wired
- * into \`createClient\`). Auto-reconnects on dropped connections, resuming from the last
- * seen event id via \`Last-Event-ID\` (backoff: the server's \`retry:\` value, then
- * \`reconnectDelay\`, then 1s — exponential with jitter, capped at 30s). A clean stream
- * end flushes a trailing frame and finishes; \`break\`/abort end the iterator cleanly.
- */
-async function* sse<T>(
-  config: ClientConfig,
-  op: OperationContext,
-  prepare: () => Promise<{ url: string; init: SseOptions }>,
-  dataKind: 'json' | 'text' = 'text'
-): AsyncGenerator<ServerSentEvent<T>> {
-  let lastEventId: string | undefined;
-  let serverRetry: number | undefined;
-  let failures = 0;
-  while (true) {
-    // Re-prepare each attempt so a refresh-style TokenProvider yields a fresh credential
-    // on reconnect (the auth is baked into \`url\` query + \`init.headers\`). \`reconnect\`,
-    // \`reconnectDelay\`, and \`signal\` come from the caller's original options unchanged.
-    const { url, init } = await prepare();
-    const { reconnect = true, reconnectDelay, ...rest } = init;
-    const signal = rest.signal ?? undefined;
-    if (signal?.aborted) return;
-    const headers: Record<string, string> = {
-      Accept: 'text/event-stream',
-      ...toHeaderRecord(rest.headers),
-    };
-    const sendHeaders =
-      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };
-    try {
-      const { response } = await send(
-        config,
-        op,
-        url,
-        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },
-        undefined,
-        false,
-        {}
-      );
-      if (!response.ok) {
-        const errorBody = await readError(response);
-        throw new ApiError(url, response.status, response.statusText, errorBody);
-      }
-      failures = 0;
-      const body = response.body;
-      if (!body) return;
-      const reader = body.getReader();
-      const decoder = new TextDecoder();
-      let buffer = '';
-      try {
-        while (true) {
-          const { done, value } = await reader.read();
-          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });
-          let match: RegExpMatchArray | null;
-          while ((match = buffer.match(FRAME_DELIMITER)) !== null) {
-            const index = match.index!;
-            const raw = buffer.slice(0, index);
-            buffer = buffer.slice(index + match[0].length);
-            const event = parseSseFrame(raw, dataKind);
-            if (event) {
-              if (event.id !== undefined) lastEventId = event.id;
-              if (event.retry !== undefined) serverRetry = event.retry;
-              yield event as ServerSentEvent<T>;
-            }
-          }
-          if (done) {
-            // Stream closed cleanly. Flush a final event that arrived without a trailing
-            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.
-            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;
-            if (event) {
-              if (event.id !== undefined) lastEventId = event.id;
-              if (event.retry !== undefined) serverRetry = event.retry;
-              yield event as ServerSentEvent<T>;
-            }
-            return;
-          }
-          // Bound memory: a server that never sends a frame delimiter would otherwise
-          // grow \`buffer\` without limit. 1 MiB is far above any real SSE frame.
-          if (buffer.length > 1048576) {
-            throw new SseParseError('SSE frame exceeded 1048576 characters without a delimiter');
-          }
-        }
-      } finally {
-        await reader.cancel().catch(() => undefined);
-      }
-    } catch (error) {
-      if (signal?.aborted) return;
-      // A non-OK HTTP response (4xx/5xx) or an unparseable JSON payload is a definitive
-      // error, not a transient drop — surface it instead of reconnecting in a loop (a
-      // stable bad payload would otherwise reconnect forever).
-      if (error instanceof ApiError || error instanceof SseParseError) throw error;
-      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream
-      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.
-      if (!reconnect) throw error;
-    }
-    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.
-    failures++;
-    const base = serverRetry ?? reconnectDelay ?? 1000;
-    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);
-    try {
-      await sleep(Math.random() * delay, signal);
-    } catch {
-      return; // sleep rejects only on abort — end the iterator cleanly
-    }
-  }
-}
-
-/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */
-function parseSseFrame(
-  raw: string,
-  dataKind: 'json' | 'text'
-): ServerSentEvent<unknown> | undefined {
-  let event: string | undefined;
-  const dataLines: string[] = [];
-  let id: string | undefined;
-  let retry: number | undefined;
-  let sawField = false;
-  for (const line of raw.split(/\\r\\n|\\n|\\r/)) {
-    if (line === '' || line.startsWith(':')) continue;
-    const colon = line.indexOf(':');
-    const field = colon === -1 ? line : line.slice(0, colon);
-    let val = colon === -1 ? '' : line.slice(colon + 1);
-    if (val.startsWith(' ')) val = val.slice(1);
-    sawField = true;
-    if (field === 'event') event = val;
-    else if (field === 'data') dataLines.push(val);
-    else if (field === 'id') id = val;
-    else if (field === 'retry') {
-      const n = Number(val);
-      if (!Number.isNaN(n)) retry = n;
-    }
-  }
-  if (!sawField) return undefined;
-  const dataText = dataLines.join('\\n');
-  let data: unknown = dataText;
-  if (dataKind === 'json' && dataText !== '') {
-    try {
-      data = JSON.parse(dataText);
-    } catch (error) {
-      throw new SseParseError(
-        \`Failed to parse SSE event data as JSON: \${error instanceof Error ? error.message : String(error)}\`
-      );
-    }
-  }
-  return { event, data, id, retry };
-}
-
-/**
- * The optional behaviors \`createClientCore\` can dispatch to but never statically
- * imports. The package's public \`createClient\` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the \`params\`/\`body\`/\`headers\` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call \`parseAs\` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (\`form\` + \`explode: true\`, encoded),
- * and always fully resolved — so \`explode: false\` or \`allowReserved\` alone (no \`style\`)
- * are honored, and an omitted \`explode\` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller \`init.headers\` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(\`Pagination capability not wired: cannot iterate operation "\${op.id}"\`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the \`{ data, error, response }\` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as \`ApiError\` (iteration is
- * error-mode-agnostic; the throw-mode-only \`onError\` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is \`!response.ok\` — NOT \`data === undefined\`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's \`error\` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (\`configure\`/\`use\`/\`auth\`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // \`ClientConfig<Narrow>\` is not assignable to \`ClientConfig\` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so \`use()\` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(\`SSE capability not wired: cannot stream operation "\${op.id}"\`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which \`prepareRequest\`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain \`.pages\`/\`.items\`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (\`errorMode\` is fixed at construction — \`configure()\`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the \`onError\` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // \`errorMode\` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from \`Client<Ops>\`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // \`auth\` merges into existing credentials (like the \`auth.*\` setters) rather than
-    // replacing wholesale — so \`configure({ auth: { bearer } })\` keeps a previously set
-    // basic/apiKey. \`apiKey\` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided \`middleware\` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: \`createClientCore\` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same \`OPERATIONS\`/\`Ops\`. The trailing string params carry the wiring's literal
- * unions (\`OperationId\`/\`OperationPath\`/\`OperationTag\`) into \`ctx.operation\`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth, sse });
-}
-
-export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://cafe.example.com" });
-
-export const { configure, use } = client;
-export const setBearer = client.auth.bearer;
-export const getOrder = (orderId: string, params: {
-    expand?: string;
-} = {}, init: RequestOptions = {}) => client.getOrder({ orderId, params }, init);
-export const streamEvents = (init: SseOptions = {}) => client.streamEvents({}, init);
-"
-`;
-
 exports[`emitClientSingleFile (package arm) > matches the golden output for a small model 1`] = `
 "// Generated by @redocly/client-generator — do not edit by hand.
 // Source: OpenAPI document. Re-run \`redocly generate-client\` to update.
@@ -1325,1212 +82,6 @@ export type { ClientConfig, Middleware, RequestOptions, ServerSentEvent, SseOpti
 "
 `;
 
-exports[`emitClientSingleFile — pagination > matches the golden output for a paginated inline client 1`] = `
-"// Generated by @redocly/client-generator — do not edit by hand.
-// Source: OpenAPI document. Re-run \`redocly generate-client\` to update.
-
-/**
- * T (v1.0.0)
- */
-
-export type Order = {};
-
-export type Problem = {};
-
-export type Pet = {};
-
-export type OrderEvent = {};
-
-export type OrderPage = {
-    orders: Order[];
-    nextCursor?: string;
-};
-
-export type ListOrdersResult = OrderPage;
-
-export type ListOrdersParams = {
-    cursor?: string;
-    limit?: string;
-};
-
-export type ListOrdersVariables = {
-    params?: ListOrdersParams;
-};
-
-export type GetOrderResult = Order;
-
-export type GetOrderParams = {
-    expand?: string;
-};
-
-export type GetOrderVariables = {
-    orderId: string;
-    params?: GetOrderParams;
-};
-
-/**
- * Per-operation \`args\`/\`result\` shapes (plus \`kind: 'sse'\` for event streams) — the
- * type-level companion of \`OPERATIONS\` that gives \`createClient<Ops>\` its typed methods.
- */
-export type Ops = {
-    listOrders: {
-        args: {
-            params?: ListOrdersParams;
-        };
-        result: ListOrdersResult;
-        item: Order;
-    };
-    getOrder: {
-        args: {
-            orderId: string;
-            params?: GetOrderParams;
-        };
-        result: GetOrderResult;
-    };
-};
-
-/**
- * The wire-shape descriptor for every operation, keyed by operationId — the data the
- * runtime routes requests by. Also minification-safe static metadata (method, path,
- * tags) for cache keys, tracing span names, and request logging.
- */
-export const OPERATIONS = {
-    listOrders: { id: "listOrders", method: "GET", path: "/orders", params: [{ name: "cursor", in: "query" }, { name: "limit", in: "query" }], pagination: { style: "cursor", param: "cursor", nextCursor: "/nextCursor", items: "/orders" } },
-    getOrder: { id: "getOrder", method: "GET", path: "/orders/{orderId}", tags: ["Orders"], params: [{ name: "orderId", in: "path" }, { name: "expand", in: "query" }] }
-} as const satisfies Record<string, OperationDescriptor>;
-
-export type OperationId = keyof typeof OPERATIONS;
-
-export type OperationPath = (typeof OPERATIONS)[OperationId]["path"];
-
-export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
-    tags: readonly string[];
-}>["tags"][number];
-
-// ─── Embedded runtime (@redocly/client-generator, assembled per this API's needs) ───
-
-/**
- * The public type surface of the client runtime — \`@redocly/client-generator\`'s
- * app-facing runtime module. Pure types, no runtime code (excluded from coverage).
- * The generator emits \`OPERATIONS\` literals typed
- * \`satisfies Record<string, OperationDescriptor>\` against this module, so an
- * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).
- */
-
-/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
-export type ParamSpec = {
-  name: string;
-  in: 'path' | 'query' | 'header';
-  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
-  explode?: boolean;
-  allowReserved?: boolean;
-};
-
-/** One security scheme, denormalized onto the operation (\`scheme\` names the spec's scheme). */
-export type SecuritySpec =
-  | { scheme: string; kind: 'bearer' | 'basic' }
-  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };
-
-/**
- * How to auto-iterate a paginated operation (drives its \`.pages()\`/\`.items()\` members).
- * \`nextCursor\` and \`items\` are RFC 6901 JSON pointers into the page (response) value.
- */
-export type PaginationSpec = {
-  style: 'cursor' | 'offset' | 'page';
-  /** The query param the iterator advances: the cursor (\`cursor\`) or number (\`offset\`/\`page\`). */
-  param: string;
-  /** Optional page-size query param (recorded for tooling; never set by the runtime). */
-  limitParam?: string;
-  /** Cursor style only: pointer to the next cursor in the page. */
-  nextCursor?: string;
-  /** Pointer to the page's item array. */
-  items: string;
-};
-
-/** The frozen data contract between generated code and the runtime: one operation's wire shape. */
-export type OperationDescriptor = {
-  id: string;
-  method: string;
-  path: string;
-  tags?: readonly string[];
-  params?: readonly ParamSpec[];
-  /** \`multipart: true\` marks a typed object body serialized to FormData by the runtime. */
-  body?: { contentType: string; multipart?: boolean };
-  /** Defaults to \`'json'\` (content-type negotiation on parse). */
-  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';
-  sseDataKind?: 'json' | 'text';
-  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */
-  security?: readonly (readonly SecuritySpec[])[];
-  pagination?: PaginationSpec;
-};
-
-/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */
-export type QueryValue =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | Array<string | number | boolean | null | undefined>
-  | Record<string, unknown>;
-
-/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */
-export type TokenProvider = string | (() => string | Promise<string>);
-
-/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */
-export type AuthCredentials = {
-  bearer?: TokenProvider;
-  basic?: { username: string; password: string };
-  apiKey?: Record<string, TokenProvider>;
-};
-
-/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */
-export type RetryStrategy = 'fixed' | 'exponential';
-
-/**
- * The operation's identity, exposed to middleware for targeting (\`ctx.operation\`).
- * Generated clients instantiate the type parameters with the spec's literal unions
- * (\`OperationId\`/\`OperationPath\`/\`OperationTag\`) so a misspelled operation id in a
- * middleware comparison fails to compile; the string defaults keep every
- * spec-independent consumer (\`runtime-contract.ts\`, the runtime internals) working
- * with the base shape. \`tags\` stays mutable (\`Tag[]\`) so setup-contract types
- * (byte-locked to generated output) remain assignable through middleware callbacks.
- */
-export type OperationContext<
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
-> = { id: Id; path: Path; tags: Tag[] };
-
-/** The mutable request context threaded through the middleware chain. */
-export type RequestContext<Op extends OperationContext = OperationContext> = {
-  url: string;
-  method: string;
-  headers: Record<string, string>;
-  body?: unknown;
-  operation: Op;
-};
-
-/** The failed attempt handed to a custom \`retryOn\`: exactly one of \`response\`/\`error\` is set. */
-export type RetryContext<Op extends OperationContext = OperationContext> = {
-  attempt: number;
-  request: RequestContext<Op>;
-  response?: Response;
-  error?: unknown;
-};
-
-/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */
-export type RetryConfig<Op extends OperationContext = OperationContext> = {
-  retries?: number;
-  retryDelay?: number;
-  retryStrategy?: RetryStrategy;
-  jitter?: boolean;
-  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;
-};
-
-/**
- * Structural stand-in for the runtime's ApiError so this module stays import-free
- * (pure types); the real \`ApiError\` class is assignable to it.
- */
-export type ApiErrorLike = globalThis.Error & {
-  url: string;
-  status: number;
-  statusText: string;
-  body: unknown;
-};
-
-/** One interceptor: any subset of the three hooks. */
-export type Middleware<Op extends OperationContext = OperationContext> = {
-  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;
-  onResponse?: (
-    response: Response,
-    ctx: RequestContext<Op>
-  ) => Response | void | Promise<Response | void>;
-  /** Throw mode only: may map/replace the error. */
-  // \`globalThis.Error\` so a spec schema named \`Error\` cannot shadow it in inline mode.
-  onError?: (
-    error: ApiErrorLike,
-    ctx: RequestContext<Op>
-  ) => globalThis.Error | Promise<globalThis.Error>;
-};
-
-/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */
-export type ClientConfig<Op extends OperationContext = OperationContext> = {
-  serverUrl?: string;
-  fetch?: typeof fetch;
-  headers?:
-    | Record<string, string>
-    | (() => Record<string, string> | Promise<Record<string, string>>);
-  retry?: RetryConfig<Op>;
-  middleware?: Middleware<Op>[];
-  auth?: AuthCredentials;
-  /** Fixed at generate time by the generator (\`'throw'\` when omitted); \`configure()\` ignores it. */
-  errorMode?: 'throw' | 'result';
-  onRequest?: Middleware<Op>['onRequest'];
-  onResponse?: Middleware<Op>['onResponse'];
-  onError?: Middleware<Op>['onError'];
-};
-
-/** Response readers for the per-call \`parseAs\` override. */
-export type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';
-
-/** Per-call options: standard \`RequestInit\` plus a retry override and a forced reader. */
-export type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };
-
-/** Per-call options for an SSE stream; reconnect defaults to true. */
-export type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };
-
-/** A single decoded Server-Sent Event with its payload typed from the spec. */
-export type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };
-
-/** Result-mode return shape: exactly one of \`data\`/\`error\` is set. */
-export type Result<TData, TError> =
-  | { data: TData; error: undefined; response: Response }
-  | { data: undefined; error: TError; response: Response };
-
-/**
- * The generated \`Ops\` type's shape: per-operation args/result, plus \`kind: 'sse'\` for
- * streams and, for paginated operations, \`item\` (the page's element type) and — on
- * result-mode clients only — \`page\` (the RAW page type \`.pages()\` yields, since
- * iteration unwraps the \`Result\` envelope the one-shot \`result\` carries).
- */
-export type OpsShape = Record<
-  string,
-  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }
->;
-
-/** The always-present client members (assigned after the operation loop — they win collisions). */
-export type ClientCore<Op extends OperationContext = OperationContext> = {
-  /** Merge into the config; note \`middleware\` REPLACES the chain (use \`use()\` to compose). */
-  configure(config: ClientConfig<Op>): void;
-  /** Append interceptors (composes with baked/publisher middleware). */
-  use(...middleware: Middleware<Op>[]): void;
-  auth: {
-    bearer(token: TokenProvider): void;
-    basic(username: string, password: string): void;
-    apiKey(scheme: string, value: TokenProvider): void;
-  };
-};
-
-/**
- * The standard TypeScript optionality probe: \`{}\` has no required members, so
- * \`{} extends A\` is true exactly when every member of \`A\` is optional.
- */
-// oxlint-disable-next-line typescript/no-empty-object-type
-type NoRequiredKeys<A> = {} extends A ? true : false;
-
-/**
- * The page type \`.pages()\` yields: the RAW page declared by \`page\` (the generator
- * writes it only on result-mode paginated entries, whose \`result\` is the envelope),
- * or the method's own \`result\` (throw mode — already the raw page).
- */
-type PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }
-  ? Entry['page']
-  : Entry['result'];
-
-/**
- * The auto-pagination members intersected onto a paginated method — present exactly when
- * the Ops entry declares \`item\` (the generator writes it only for paginated operations).
- * Args optionality mirrors the method's own; \`unknown\` otherwise (identity under \`&\`).
- * Iteration is error-mode-agnostic: \`.pages()\`/\`.items()\` yield raw pages/items, and a
- * failed page aborts iteration by throwing \`ApiError\`, even on result-mode clients; the
- * \`onError\` middleware hook (throw-mode-only) is not invoked.
- */
-type Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry
-  ? NoRequiredKeys<Entry['args']> extends true
-    ? {
-        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-    : {
-        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;
-        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;
-      }
-  : unknown;
-
-/** The typed instance client: one bound method per operation plus the core members. */
-export type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {
-  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }
-    ? NoRequiredKeys<Ops[K]['args']> extends true
-      ? (
-          args?: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-      : (
-          args: Ops[K]['args'],
-          init?: SseOptions
-        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>
-    : (NoRequiredKeys<Ops[K]['args']> extends true
-        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>
-        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &
-        Paginated<Ops[K]>;
-} & ClientCore<Op>;
-
-/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */
-export class ApiError extends Error {
-  public readonly url: string;
-  public readonly status: number;
-  public readonly statusText: string;
-  public readonly body: unknown;
-  constructor(url: string, status: number, statusText: string, body: unknown) {
-    super(\`Request failed with status \${status}\`);
-    this.name = 'ApiError';
-    this.url = url;
-    this.status = status;
-    this.statusText = statusText;
-    this.body = body;
-  }
-}
-
-/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */
-// \`globalThis.Error\` (not bare \`Error\`) so a spec schema named \`Error\` cannot shadow it
-// when this module is embedded alongside generated types (inline mode).
-function abortError(signal: AbortSignal): globalThis.Error {
-  const reason = (signal as { reason?: unknown }).reason;
-  if (reason instanceof Error) return reason;
-  return new DOMException('The operation was aborted.', 'AbortError');
-}
-
-/**
- * The RESOLVED OpenAPI serialization spec for one query parameter — callers apply the
- * OpenAPI defaults (\`style: 'form'\`, \`explode: true\`) before building one.
- */
-type QueryStyle = {
-  style: NonNullable<ParamSpec['style']>;
-  explode: boolean;
-  allowReserved?: boolean;
-};
-
-/**
- * Encode everything except the RFC-3986 reserved set, for \`allowReserved: true\` params —
- * \`filter=a/b\` survives instead of \`filter=a%2Fb\`.
- */
-function encodeReserved(value: string): string {
-  return encodeURIComponent(value).replace(
-    /%(3A|2F|3F|23|5B|5D|40|21|24|26|27|28|29|2A|2B|2C|3B|3D)/g,
-    (match) => decodeURIComponent(match)
-  );
-}
-
-/** Substitute \`{name}\` template segments with encoded values; a missing value is a caller bug. */
-function substitutePath(template: string, values: Record<string, unknown>): string {
-  return template.replace(/\\{([^{}]+)\\}/g, (_match, name: string) => {
-    const value = values[name];
-    if (value === undefined) throw new Error(\`Missing path parameter "\${name}"\`);
-    return encodeURIComponent(String(value));
-  });
-}
-
-/**
- * Build the request URL: \`serverUrl\` (trailing slash trimmed) + path + serialized query.
- * Query parameters honor their OpenAPI \`style\`/\`explode\`/\`allowReserved\` (from \`styles\`);
- * without a spec, arrays repeat the key (\`form\`+\`explode\`), objects serialize as
- * \`deepObject\` brackets, and \`null\`/\`undefined\` entries are skipped.
- */
-function buildUrl(
-  serverUrl: string,
-  path: string,
-  query?: Record<string, QueryValue>,
-  styles?: Record<string, QueryStyle>
-): string {
-  // Trim trailing slashes with a scan, not \`/\\/+$/\` — an anchored \`+\` regex is
-  // quadratic on adversarial many-slash input (the server URL is caller data).
-  let end = serverUrl.length;
-  while (end > 0 && serverUrl.charCodeAt(end - 1) === 47 /* '/' */) end--;
-  const url = serverUrl.slice(0, end) + path;
-  if (!query) return url;
-  const params = new URLSearchParams();
-  const raw: string[] = [];
-  for (const [key, value] of Object.entries(query)) {
-    if (value === undefined || value === null) continue;
-    const spec = styles?.[key];
-    if (!spec) {
-      if (Array.isArray(value)) {
-        for (const v of value) {
-          if (v !== undefined && v !== null) params.append(key, String(v));
-        }
-      } else if (Object(value) === value) {
-        // Object-valued query params use \`deepObject\` style: key[subKey]=subValue.
-        for (const [subKey, subValue] of Object.entries(value)) {
-          if (subValue !== undefined && subValue !== null) {
-            params.append(\`\${key}[\${subKey}]\`, String(subValue));
-          }
-        }
-      } else {
-        params.append(key, String(value));
-      }
-      continue;
-    }
-    if (Array.isArray(value)) {
-      const items = value.filter((v) => v !== undefined && v !== null).map(String);
-      if (spec.style === 'form' && spec.explode) {
-        for (const v of items) {
-          if (spec.allowReserved) raw.push(\`\${key}=\${encodeReserved(v)}\`);
-          else params.append(key, v);
-        }
-      } else {
-        // Delimited styles put the LITERAL delimiter on the wire; only the
-        // values are encoded. \`%20\` (not \`+\`) is the literal space delimiter.
-        const delim =
-          spec.style === 'pipeDelimited' ? '|' : spec.style === 'spaceDelimited' ? '%20' : ',';
-        const enc = spec.allowReserved ? encodeReserved : encodeURIComponent;
-        raw.push(\`\${encodeURIComponent(key)}=\${items.map(enc).join(delim)}\`);
-      }
-    } else if (Object(value) === value) {
-      // \`deepObject\` (and any object spec, for now): key[subKey]=subValue.
-      for (const [subKey, subValue] of Object.entries(value)) {
-        if (subValue !== undefined && subValue !== null) {
-          if (spec.allowReserved) raw.push(\`\${key}[\${subKey}]=\${encodeReserved(String(subValue))}\`);
-          else params.append(\`\${key}[\${subKey}]\`, String(subValue));
-        }
-      }
-    } else if (spec.allowReserved) {
-      raw.push(\`\${key}=\${encodeReserved(String(value))}\`);
-    } else {
-      params.append(key, String(value));
-    }
-  }
-  const qs = [params.toString(), ...raw].filter(Boolean).join('&');
-  return qs ? \`\${url}?\${qs}\` : url;
-}
-
-/**
- * Read the response body per \`kind\`. \`'auto'\` negotiates from the content type
- * (JSON, then \`text/*\`, then Blob); \`'void'\` and \`204\` responses read nothing.
- */
-async function parse(response: Response, kind: ParseAs | 'void'): Promise<unknown> {
-  if (kind === 'void' || response.status === 204) return undefined;
-  if (kind === 'stream') return response.body;
-  if (kind === 'blob') return response.blob();
-  if (kind === 'arrayBuffer') return response.arrayBuffer();
-  if (kind === 'formData') return response.formData();
-  if (kind === 'text') return response.text();
-  if (kind === 'json') return response.json();
-  // 'auto' — negotiate from the response's content type (case-insensitively:
-  // \`Text/Plain\` and \`application/JSON\` are valid per RFC 9110).
-  const contentType = (response.headers.get('content-type') ?? '').toLowerCase();
-  if (contentType.includes('json')) return response.json();
-  if (contentType.startsWith('text/')) return response.text();
-  return response.blob();
-}
-
-/** Best-effort decode of a non-2xx body (JSON when declared, else text; undefined on failure). */
-async function readError(response: Response): Promise<unknown> {
-  const contentType = response.headers.get('content-type') ?? '';
-  if (contentType.toLowerCase().includes('json')) {
-    return response.json().catch(() => undefined);
-  }
-  return response.text().catch(() => undefined);
-}
-
-const IDEMPOTENT_METHODS = new Set(['GET', 'HEAD', 'PUT', 'DELETE', 'OPTIONS']);
-const TRANSIENT_STATUS = new Set([408, 429, 500, 502, 503, 504]);
-
-/**
- * The default retry predicate: idempotent methods only, on a transport error or a
- * transient status. A custom \`retryOn\` fully replaces this (no method check kept).
- */
-function defaultRetryOn(ctx: RetryContext): boolean {
-  if (!IDEMPOTENT_METHODS.has(ctx.request.method.toUpperCase())) return false;
-  return ctx.response === undefined || TRANSIENT_STATUS.has(ctx.response.status);
-}
-
-/**
- * The delay before the next attempt: a \`Retry-After\` header (seconds or HTTP-date)
- * wins; otherwise fixed/exponential backoff over \`retryDelay\`, with full jitter
- * unless \`jitter === false\`.
- */
-function retryDelay(retry: RetryConfig, attempt: number, retryAfter: string | null): number {
-  if (retryAfter) {
-    const seconds = Number(retryAfter);
-    if (!Number.isNaN(seconds)) return seconds * 1000;
-    const when = Date.parse(retryAfter);
-    if (!Number.isNaN(when)) return Math.max(0, when - Date.now());
-  }
-  const base = retry.retryDelay ?? 1000;
-  const raw = retry.retryStrategy === 'fixed' ? base : base * Math.pow(2, attempt - 1);
-  return retry.jitter === false ? raw : Math.random() * raw;
-}
-
-/** Abort-aware sleep: resolves after \`ms\`, rejects with the abort reason immediately on abort. */
-function sleep(ms: number, signal?: AbortSignal): Promise<void> {
-  return new Promise((resolve, reject) => {
-    if (signal?.aborted) {
-      reject(abortError(signal));
-      return;
-    }
-    const onAbort = () => {
-      clearTimeout(timer);
-      reject(abortError(signal as AbortSignal));
-    };
-    const timer = setTimeout(() => {
-      if (signal) signal.removeEventListener('abort', onAbort);
-      resolve();
-    }, ms);
-    if (signal) signal.addEventListener('abort', onAbort, { once: true });
-  });
-}
-
-/** Resolve a credential: a literal passes through; a function is awaited per request. */
-async function resolveToken(provider: TokenProvider): Promise<string> {
-  return typeof provider === 'function' ? await provider() : provider;
-}
-
-/** UTF-8-safe base64: bare \`btoa\` throws on non-Latin-1 credentials (RFC 7617 allows UTF-8). */
-function encodeBase64(text: string): string {
-  let binary = '';
-  for (const byte of new TextEncoder().encode(text)) binary += String.fromCharCode(byte);
-  return btoa(binary);
-}
-
-/** Whether a credential for this scheme is configured on the instance. */
-function isConfigured(scheme: SecuritySpec, config: ClientConfig): boolean {
-  if (scheme.kind === 'apiKey') return config.auth?.apiKey?.[scheme.scheme] !== undefined;
-  if (scheme.kind === 'bearer') return config.auth?.bearer !== undefined;
-  return config.auth?.basic !== undefined;
-}
-
-/**
- * Build the auth headers/query for one operation's \`security\` OR-alternatives from the
- * instance credentials (\`config.auth\`) — capability module, wired into \`createClient\`.
- * The first alternative whose schemes (an AND-set) are all configured is applied, so
- * "bearer OR apiKey" works with either credential and never sends both. When none is
- * fully configured, the first alternative's configured schemes are still sent (the
- * server rejects the request, mirroring the previous behavior).
- * Cookie-borne apiKeys fold into a single \`Cookie\` header joined with \`; \`.
- */
-async function resolveAuth(
-  security: readonly (readonly SecuritySpec[])[],
-  config: ClientConfig
-): Promise<{ headers: Record<string, string>; query: Record<string, string> }> {
-  const alternative =
-    security.find((schemes) => schemes.every((scheme) => isConfigured(scheme, config))) ??
-    security[0] ??
-    [];
-  const headers: Record<string, string> = {};
-  const query: Record<string, string> = {};
-  const cookies: string[] = [];
-  for (const scheme of alternative) {
-    if (scheme.kind === 'apiKey') {
-      const provider = config.auth?.apiKey?.[scheme.scheme];
-      if (provider === undefined) continue;
-      const value = await resolveToken(provider);
-      if (scheme.in === 'header') headers[scheme.name] = value;
-      else if (scheme.in === 'query') query[scheme.name] = value;
-      // Cookie values may contain reserved characters (\`;\`, \`=\`, space, …); percent-encode
-      // so the credential can't break the \`Cookie\` header syntax.
-      else cookies.push(\`\${scheme.name}=\${encodeURIComponent(value)}\`);
-    } else if (scheme.kind === 'bearer') {
-      const provider = config.auth?.bearer;
-      if (provider !== undefined) headers.Authorization = \`Bearer \${await resolveToken(provider)}\`;
-    } else {
-      const basic = config.auth?.basic;
-      if (basic !== undefined) {
-        headers.Authorization = \`Basic \${encodeBase64(\`\${basic.username}:\${basic.password}\`)}\`;
-      }
-    }
-  }
-  if (cookies.length > 0) headers.Cookie = cookies.join('; ');
-  return { headers, query };
-}
-
-/**
- * Auto-pagination (capability module — wired into \`createClient\`, dispatched by the
- * method's \`.pages()\`/\`.items()\`): walk an operation's pages by advancing the descriptor's
- * \`param\` query parameter, per its \`style\`. The caller's args are never mutated — each
- * request gets a fresh \`params\` clone — and \`init\` is forwarded to every call.
- *
- * Iteration is error-mode-agnostic: \`call\` always resolves to the RAW page (on a
- * result-mode client the attachment unwraps the envelope first), so a failed page
- * aborts iteration by throwing \`ApiError\`, even on result-mode clients; the \`onError\`
- * middleware hook (throw-mode-only) is not invoked.
- */
-
-/**
- * Resolve an RFC 6901 JSON pointer (\`~1\` → \`/\`, \`~0\` → \`~\`) against a value.
- * The empty pointer is the whole document; anything else must start with \`/\`.
- * Returns \`undefined\` on any miss (bad token, absent key, non-object step) — never throws.
- */
-function resolvePointer(value: unknown, pointer: string): unknown {
-  if (pointer === '') return value;
-  if (!pointer.startsWith('/')) return undefined;
-  let current = value;
-  for (const token of pointer.slice(1).split('/')) {
-    const key = token.replaceAll('~1', '/').replaceAll('~0', '~');
-    if (Array.isArray(current)) {
-      if (!/^(0|[1-9]\\d*)$/.test(key)) return undefined;
-      current = current[Number(key)];
-    } else if (Object(current) === current && key in (current as object)) {
-      current = (current as Record<string, unknown>)[key];
-    } else {
-      return undefined;
-    }
-  }
-  return current;
-}
-
-/**
- * Iterate an operation's full page results. Every page is yielded before the stop
- * condition is evaluated, so the last page always arrives. Cursor style resumes from a
- * caller-provided \`params[spec.param]\`, stops when \`nextCursor\` resolves to
- * \`undefined\`/\`null\`/\`''\`, and throws if the next cursor is not a string or number, or
- * if the same cursor comes back twice in a row (infinite-loop guards). Offset/page
- * styles advance by item count / by one and stop when
- * the \`items\` pointer misses or the array is empty.
- */
-async function* pages<TPage>(
-  call: (args?: OperationArgs, init?: RequestOptions) => Promise<TPage>,
-  spec: PaginationSpec,
-  args: OperationArgs = {},
-  init?: RequestOptions
-): AsyncGenerator<TPage> {
-  if (spec.style === 'cursor') {
-    let cursor: unknown = args.params?.[spec.param];
-    while (true) {
-      const params = { ...args.params };
-      if (cursor !== undefined) params[spec.param] = cursor as QueryValue;
-      const page = await call({ ...args, params }, init);
-      yield page;
-      const next = resolvePointer(page, spec.nextCursor!);
-      if (next === undefined || next === null || next === '') return;
-      if (typeof next !== 'string' && typeof next !== 'number') {
-        // A fresh non-scalar cursor never compares equal, so without this guard a lying
-        // server would slip past the did-not-advance check into an infinite loop.
-        throw new Error(\`Pagination cursor at \${spec.nextCursor} is not a string or number\`);
-      }
-      if (next === cursor) {
-        throw new Error('Pagination did not advance: operation returned the same cursor twice');
-      }
-      cursor = next;
-    }
-  } else {
-    // Coerce the starting position to a number: a caller may pass \`params[spec.param]\` as a
-    // string (common from URL/form input), and \`+=\` on a string would concatenate.
-    const start = args.params?.[spec.param];
-    const fallback = spec.style === 'page' ? 1 : 0;
-    let position = start === undefined || Number.isNaN(Number(start)) ? fallback : Number(start);
-    while (true) {
-      const page = await call(
-        { ...args, params: { ...args.params, [spec.param]: position } },
-        init
-      );
-      yield page;
-      const pageItems = resolvePointer(page, spec.items);
-      if (!Array.isArray(pageItems) || pageItems.length === 0) return;
-      position += spec.style === 'page' ? 1 : pageItems.length;
-    }
-  }
-}
-
-/**
- * Iterate the operation's individual items: each page's \`items\` pointer, flattened.
- * A cursor-style page whose pointer misses yields nothing but pagination continues;
- * for offset/page styles a miss has already stopped \`pages\`.
- */
-async function* items<TItem>(
-  call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  spec: PaginationSpec,
-  args?: OperationArgs,
-  init?: RequestOptions
-): AsyncGenerator<TItem> {
-  for await (const page of pages(call, spec, args, init)) {
-    const pageItems = resolvePointer(page, spec.items);
-    if (Array.isArray(pageItems)) yield* pageItems as TItem[];
-  }
-}
-
-/**
- * Optional behaviors the send core can use but never statically imports — wired by
- * \`createClient\` (the same seam the future inline-mode assembler relies on).
- */
-type SendCapabilities = {
-  /** Serialize a typed multipart body (a plain object) to FormData. */
-  serializeMultipart?: (body: Record<string, unknown>) => FormData;
-};
-
-/**
- * Normalize a caller's \`HeadersInit\` (plain record, \`Headers\` instance, or entry pairs)
- * to a plain record — spreading a \`Headers\` or an array contributes no entries.
- */
-function toHeaderRecord(headers: HeadersInit | undefined): Record<string, string> {
-  if (headers === undefined) return {};
-  if (headers instanceof Headers) {
-    const record: Record<string, string> = {};
-    headers.forEach((value, key) => {
-      record[key] = value;
-    });
-    return record;
-  }
-  if (Array.isArray(headers)) return Object.fromEntries(headers);
-  return headers;
-}
-
-/**
- * The effective middleware chain for a request: the single \`onRequest\`/\`onResponse\`/
- * \`onError\` config hooks as one implicit first middleware, then \`config.middleware\`.
- */
-function middlewareChain(config: ClientConfig): Middleware[] {
-  const single =
-    config.onRequest || config.onResponse || config.onError
-      ? [{ onRequest: config.onRequest, onResponse: config.onResponse, onError: config.onError }]
-      : [];
-  return [...single, ...(config.middleware ?? [])];
-}
-
-/**
- * The fetch core shared by every operation: default + config + per-call headers, the
- * \`onRequest\` chain (BEFORE body serialization, so mutations are sent), body
- * serialization (JSON, or FormData via the multipart capability), the retry loop
- * (idempotent-only defaults, \`Retry-After\`, abandoned-body drain), and the reverse
- * \`onResponse\` onion. Returns the final response plus the request context.
- */
-async function send(
-  config: ClientConfig,
-  op: OperationContext,
-  url: string,
-  init: RequestOptions,
-  body: unknown | undefined,
-  multipart: boolean,
-  caps: SendCapabilities
-): Promise<{ response: Response; context: RequestContext }> {
-  const { retry: callRetry, ...fetchInit } = init;
-  const retry: RetryConfig = { ...config.retry, ...callRetry };
-  const extra = typeof config.headers === 'function' ? await config.headers() : config.headers;
-  const headers: Record<string, string> = {
-    Accept: 'application/json',
-    ...extra,
-    ...toHeaderRecord(fetchInit.headers),
-  };
-  const context: RequestContext = {
-    url,
-    method: fetchInit.method ?? 'GET',
-    headers,
-    body,
-    operation: op,
-  };
-  const middleware = middlewareChain(config);
-  for (const mw of middleware) if (mw.onRequest) await mw.onRequest(context);
-  // Serialize AFTER onRequest so body mutations (case conversion, enveloping, signing) take effect.
-  let payload: BodyInit | undefined;
-  if (context.body !== undefined) {
-    const value = context.body;
-    const isBinary =
-      value instanceof Blob ||
-      value instanceof ArrayBuffer ||
-      ArrayBuffer.isView(value as ArrayBufferView);
-    const isFormData = typeof FormData !== 'undefined' && value instanceof FormData;
-    const isURLSearchParams = value instanceof URLSearchParams;
-    if (isFormData || isURLSearchParams || isBinary || typeof value === 'string') {
-      payload = value as BodyInit;
-    } else if (multipart) {
-      if (!caps.serializeMultipart) {
-        throw new Error('Multipart capability not wired: cannot serialize the request body');
-      }
-      payload = caps.serializeMultipart(value as Record<string, unknown>);
-    } else {
-      payload = JSON.stringify(value);
-      if (!('Content-Type' in context.headers) && !('content-type' in context.headers)) {
-        context.headers['Content-Type'] = 'application/json';
-      }
-    }
-  }
-  const doFetch = config.fetch ?? fetch;
-  const maxAttempts = 1 + (retry.retries ?? 0);
-  const retryOn = retry.retryOn ?? defaultRetryOn;
-  const signal = fetchInit.signal ?? undefined;
-
-  let attempt = 0;
-  while (true) {
-    attempt++;
-    if (signal?.aborted) throw abortError(signal);
-    let response: Response;
-    try {
-      response = await doFetch(context.url, {
-        ...fetchInit,
-        method: context.method,
-        headers: context.headers,
-        body: payload,
-      });
-    } catch (error) {
-      if (
-        attempt < maxAttempts &&
-        !signal?.aborted &&
-        (await retryOn({ attempt, request: context, error }))
-      ) {
-        await sleep(retryDelay(retry, attempt, null), signal);
-        continue;
-      }
-      throw error;
-    }
-    // Reverse order: the last-registered middleware wraps closest to the network (onion).
-    for (let i = middleware.length - 1; i >= 0; i--) {
-      const onResponse = middleware[i].onResponse;
-      if (onResponse) {
-        const replaced = await onResponse(response, context);
-        if (replaced && replaced !== response) {
-          // Cancel the abandoned original's body — like the retry path, an unread body
-          // keeps its connection checked out under Node/undici.
-          await response.body?.cancel().catch(() => undefined);
-          response = replaced;
-        }
-      }
-    }
-    if (
-      !response.ok &&
-      attempt < maxAttempts &&
-      !signal?.aborted &&
-      (await retryOn({ attempt, request: context, response }))
-    ) {
-      const retryAfter = response.headers.get('retry-after');
-      // Drain the abandoned response body before the next attempt: an unread body
-      // keeps the connection checked out (and can stall the pool) under Node/undici
-      // and other strict HTTP clients. Ignore errors (e.g. a middleware already read it).
-      await response.body?.cancel().catch(() => undefined);
-      await sleep(retryDelay(retry, attempt, retryAfter), signal);
-      continue;
-    }
-    return { response, context };
-  }
-}
-
-/**
- * The optional behaviors \`createClientCore\` can dispatch to but never statically
- * imports. The package's public \`createClient\` wires the full set; the future
- * inline-mode assembler wires only the capabilities a spec needs.
- */
-type Capabilities = SendCapabilities & {
-  resolveAuth?: (
-    security: readonly (readonly SecuritySpec[])[],
-    config: ClientConfig
-  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;
-  sse?: (
-    config: ClientConfig,
-    op: OperationContext,
-    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style
-    // TokenProvider issue a fresh credential after a dropped stream reconnects.
-    prepare: () => Promise<{ url: string; init: SseOptions }>,
-    dataKind: 'json' | 'text'
-  ) => AsyncGenerator<ServerSentEvent<unknown>>;
-  paginate?: {
-    pages: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-    items: (
-      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-      spec: PaginationSpec,
-      args?: OperationArgs,
-      init?: RequestOptions
-    ) => AsyncGenerator<unknown>;
-  };
-};
-
-/** The grouped args wire shape: path params by name plus the \`params\`/\`body\`/\`headers\` slots. */
-type OperationArgs = {
-  params?: Record<string, QueryValue>;
-  body?: unknown;
-  headers?: Record<string, unknown>;
-} & Record<string, unknown>;
-
-/** The response reader implied by the descriptor (before any per-call \`parseAs\` override). */
-function kindFor(op: OperationDescriptor): ParseAs | 'void' {
-  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {
-    return op.responseKind;
-  }
-  return 'auto';
-}
-
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
-function splitArgs(op: OperationDescriptor, args: OperationArgs) {
-  const path: Record<string, unknown> = {};
-  for (const param of op.params ?? []) {
-    if (param.in === 'path') path[param.name] = args[param.name];
-  }
-  return { path, query: args.params, body: args.body, headers: args.headers };
-}
-
-/**
- * The query-serialization hints for the descriptor's query params. A spec is built only
- * when the param deviates from the OpenAPI defaults (\`form\` + \`explode: true\`, encoded),
- * and always fully resolved — so \`explode: false\` or \`allowReserved\` alone (no \`style\`)
- * are honored, and an omitted \`explode\` keeps the exploded default.
- */
-function queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {
-  let styles: Record<string, QueryStyle> | undefined;
-  for (const param of op.params ?? []) {
-    if (param.in !== 'query') continue;
-    const deviates =
-      (param.style !== undefined && param.style !== 'form') ||
-      param.explode === false ||
-      param.allowReserved === true;
-    if (!deviates) continue;
-    styles ??= {};
-    styles[param.name] = {
-      style: param.style ?? 'form',
-      explode: param.explode ?? true,
-      allowReserved: param.allowReserved,
-    };
-  }
-  return styles;
-}
-
-/** Stringify caller-supplied extra headers, skipping empty entries. */
-function stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {
-  const out: Record<string, string> = {};
-  for (const [key, value] of Object.entries(headers ?? {})) {
-    if (value !== undefined && value !== null) out[key] = String(value);
-  }
-  return out;
-}
-
-/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */
-async function prepareRequest(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions | SseOptions,
-  caps: Capabilities
-): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
-    op.security?.length && caps.resolveAuth
-      ? await caps.resolveAuth(op.security, config)
-      : { headers: {}, query: {} };
-  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
-  const url = buildUrl(
-    config.serverUrl ?? '',
-    substitutePath(op.path, path),
-    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,
-    queryStyles(op)
-  );
-  const mergedInit: RequestOptions = {
-    ...init,
-    method: op.method.toUpperCase(),
-    // Precedence, lowest → highest (later spreads win): injected auth → explicit
-    // header params → caller \`init.headers\` — the caller always overrides both.
-    headers: {
-      ...authed.headers,
-      ...stringHeaders(headers),
-      ...toHeaderRecord(init.headers),
-    },
-  };
-  return { url, init: mergedInit, body };
-}
-
-/** One non-SSE call: send, then branch on the configured error mode. */
-async function execute(
-  config: ClientConfig,
-  op: OperationDescriptor,
-  args: OperationArgs,
-  init: RequestOptions,
-  caps: Capabilities
-): Promise<unknown> {
-  const prepared = await prepareRequest(config, op, args, init, caps);
-  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-  const { parseAs, ...sendInit } = prepared.init;
-  const { response, context } = await send(
-    config,
-    opCtx,
-    prepared.url,
-    sendInit,
-    prepared.body,
-    op.body?.multipart === true,
-    caps
-  );
-  const readKind = parseAs ?? kindFor(op);
-  if (config.errorMode === 'result') {
-    if (!response.ok) {
-      return { data: undefined, error: await readError(response), response };
-    }
-    return { data: await parse(response, readKind), error: undefined, response };
-  }
-  if (!response.ok) {
-    let error: globalThis.Error = new ApiError(
-      context.url,
-      response.status,
-      response.statusText,
-      await readError(response)
-    );
-    // Thread the error through each middleware's onError in turn (each may replace it).
-    for (const mw of middlewareChain(config)) {
-      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);
-    }
-    throw error;
-  }
-  return parse(response, readKind);
-}
-
-/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */
-function paginateCapability(caps: Capabilities, op: OperationDescriptor) {
-  if (!caps.paginate) {
-    throw new Error(\`Pagination capability not wired: cannot iterate operation "\${op.id}"\`);
-  }
-  return caps.paginate;
-}
-
-/**
- * The per-page call the iterators drive: the method itself in throw mode; in result
- * mode a wrapper that unwraps the \`{ data, error, response }\` envelope — the page
- * pointers are data-rooted — rethrowing a failed page as \`ApiError\` (iteration is
- * error-mode-agnostic; the throw-mode-only \`onError\` middleware hook is not invoked).
- */
-function pageCall(
-  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,
-  config: ClientConfig
-) {
-  if (config.errorMode !== 'result') return method;
-  return async (args?: OperationArgs, init?: RequestOptions) => {
-    const envelope = (await method(args, init)) as {
-      data: unknown;
-      error: unknown;
-      response: Response;
-    };
-    // Failure is \`!response.ok\` — NOT \`data === undefined\`: a successful bodyless page
-    // (204/void) also parses to undefined data, and a failed page's \`error\` can be
-    // undefined too (unreadable body). The pointers then miss on the undefined data
-    // and iteration stops cleanly, which is the correct semantics for an empty page.
-    if (!envelope.response.ok) {
-      const { response } = envelope;
-      throw new ApiError(response.url, response.status, response.statusText, envelope.error);
-    }
-    return envelope.data;
-  };
-}
-
-/**
- * Build a typed instance client over operation descriptors: one real bound method per
- * operation (attached by a construction-time loop — no Proxy), plus the core members
- * (\`configure\`/\`use\`/\`auth\`), which are assigned AFTER the loop so they win any name
- * collision with an operation. All behavior dispatches through the capability seam.
- */
-function createClientCore<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},
-  caps: Capabilities = {}
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  // The literal-union narrowing is a compile-time DX contract only; internally the
-  // runtime works with the base (string-typed) context. One cast at this boundary —
-  // \`ClientConfig<Narrow>\` is not assignable to \`ClientConfig\` (middleware ctx
-  // params are contravariant).
-  const given = initial as ClientConfig;
-  // Private mutable config; the middleware array is copied so \`use()\` never mutates the caller's.
-  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };
-  const client = {} as Record<string, unknown>;
-
-  for (const [name, op] of Object.entries(operations)) {
-    if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
-        if (!caps.sse) {
-          throw new Error(\`SSE capability not wired: cannot stream operation "\${op.id}"\`);
-        }
-        const stream = caps.sse;
-        return (async function* () {
-          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };
-          // A thunk the stream re-runs on every (re)connect, so auth (which \`prepareRequest\`
-          // resolves) is refreshed per attempt rather than frozen at the first connect.
-          const prepare = async () => {
-            const prepared = await prepareRequest(config, op, args, init, caps);
-            return { url: prepared.url, init: prepared.init as SseOptions };
-          };
-          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
-        })();
-      };
-    } else {
-      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
-        execute(config, op, args, init, caps);
-      const spec = op.pagination;
-      // Paginated ops keep their one-shot call and gain \`.pages\`/\`.items\`, dispatching
-      // through the capability seam (like SSE: absent capability throws descriptively).
-      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on
-      // a result-mode client (\`errorMode\` is fixed at construction — \`configure()\`
-      // ignores it) each page's envelope is unwrapped before it reaches the capability.
-      // A failed page aborts iteration by throwing ApiError, even on result-mode
-      // clients; the \`onError\` middleware hook (throw-mode-only) is not invoked.
-      client[name] = spec
-        ? Object.assign(method, {
-            pages: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),
-            items: (args?: OperationArgs, init?: RequestOptions) =>
-              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),
-          })
-        : method;
-    }
-  }
-
-  // Core members are assigned AFTER the operation loop — they win over colliding op names.
-  client.configure = (next: ClientConfig): void => {
-    // \`errorMode\` is fixed at generate time (it shapes the static types); flipping it at
-    // runtime would silently desync return shapes from \`Client<Ops>\`, so it is ignored.
-    const { errorMode: _fixed, auth, ...rest } = next;
-    Object.assign(config, rest);
-    // \`auth\` merges into existing credentials (like the \`auth.*\` setters) rather than
-    // replacing wholesale — so \`configure({ auth: { bearer } })\` keeps a previously set
-    // basic/apiKey. \`apiKey\` merges per scheme.
-    if (auth) {
-      config.auth = {
-        ...config.auth,
-        ...auth,
-        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),
-      };
-    }
-  };
-  client.use = (...middleware: Middleware[]): void => {
-    // Reassign (don't push) so a caller-provided \`middleware\` array isn't mutated.
-    config.middleware = [...(config.middleware ?? []), ...middleware];
-  };
-  client.auth = {
-    bearer(token: TokenProvider): void {
-      config.auth = { ...config.auth, bearer: token };
-    },
-    basic(username: string, password: string): void {
-      config.auth = { ...config.auth, basic: { username, password } };
-    },
-    apiKey(scheme: string, value: TokenProvider): void {
-      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };
-    },
-  };
-
-  return client as Client<Ops, OperationContext<Id, Path, Tag>>;
-}
-
-/**
- * The client factory: \`createClientCore\` wired with the capabilities this API needs.
- * Exported so apps can build additional instances (per-tenant, per-environment) over
- * the same \`OPERATIONS\`/\`Ops\`. The trailing string params carry the wiring's literal
- * unions (\`OperationId\`/\`OperationPath\`/\`OperationTag\`) into \`ctx.operation\`.
- */
-export function createClient<
-  Ops extends OpsShape,
-  Id extends string = string,
-  Path extends string = string,
-  Tag extends string = string,
->(
-  operations: Record<string, OperationDescriptor>,
-  config?: ClientConfig<OperationContext<Id, Path, Tag>>
-): Client<Ops, OperationContext<Id, Path, Tag>> {
-  return createClientCore<Ops, Id, Path, Tag>(operations, config, { resolveAuth, paginate: { pages, items } });
-}
-
-export const client = createClient<Ops, OperationId, OperationPath, OperationTag>(OPERATIONS, { serverUrl: "https://api.example.com" });
-
-export const { configure, use } = client;
-export const listOrders = Object.assign((params: {
-    cursor?: string;
-    limit?: string;
-} = {}, init: RequestOptions = {}) => client.listOrders({ params }, init), { pages: client.listOrders.pages, items: client.listOrders.items });
-export const getOrder = (orderId: string, params: {
-    expand?: string;
-} = {}, init: RequestOptions = {}) => client.getOrder({ orderId, params }, init);
-"
-`;
-
 exports[`emitClientSingleFile — pagination > matches the golden output for a paginated package client 1`] = `
 "// Generated by @redocly/client-generator — do not edit by hand.
 // Source: OpenAPI document. Re-run \`redocly generate-client\` to update.
diff --git a/packages/client-generator/src/emitters/__tests__/mock.test.ts b/packages/client-generator/src/emitters/__tests__/mock.test.ts
index 402b78de34..b656b9a395 100644
--- a/packages/client-generator/src/emitters/__tests__/mock.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/mock.test.ts
@@ -180,8 +180,10 @@ describe('renderMockModule', () => {
       ],
     });
     const out = renderMockModule(model, { sdkModule: './client.js' });
+    // `HttpResponse.json(x)` defaults to 200, so no `{ status }` init is emitted either.
     expect(out).toContain('HttpResponse.json(0)');
     expect(out).not.toContain('...override');
+    expect(out).not.toContain('{ status:');
   });
 
   it('quotes non-identifier object keys', () => {
@@ -218,45 +220,6 @@ describe('renderMockModule', () => {
     expect(out).toContain('"x-trace-id": "string"');
   });
 
-  it('emits a `format: binary` field as `new Blob([])`, not a "string" literal', () => {
-    const model = apiModel({
-      schemas: [
-        namedSchema('Upload', {
-          kind: 'object',
-          properties: [
-            {
-              name: 'photo',
-              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'binary' } },
-              required: true,
-            },
-          ],
-        }),
-      ],
-      services: [
-        {
-          name: 'Default',
-          operations: [
-            operation({
-              name: 'getUpload',
-              method: 'get',
-              path: '/upload',
-              successResponses: [
-                {
-                  contentType: 'application/json',
-                  schema: { kind: 'ref', name: 'Upload' },
-                  status: 200,
-                },
-              ],
-            }),
-          ],
-        },
-      ],
-    });
-    const out = renderMockModule(model, { sdkModule: './client.js' });
-    expect(out).toContain('photo: new Blob([])');
-    expect(out).not.toContain('photo: "string"');
-  });
-
   it('casts a union-schema factory body `as <Type>` so the `Partial<Union>` override spread keeps narrowing', () => {
     const model = apiModel({
       schemas: [
@@ -371,34 +334,6 @@ describe('renderMockModule', () => {
     expect(out).toContain('HttpResponse.json(0, { status: 201 })');
   });
 
-  it('omits the status init for a 200 success (byte-identical to the no-status form)', () => {
-    const model = apiModel({
-      schemas: [],
-      services: [
-        {
-          name: 'Default',
-          operations: [
-            operation({
-              name: 'count',
-              method: 'get',
-              path: '/count',
-              successResponses: [
-                {
-                  contentType: 'application/json',
-                  schema: { kind: 'scalar', scalar: 'integer' },
-                  status: 200,
-                },
-              ],
-            }),
-          ],
-        },
-      ],
-    });
-    const out = renderMockModule(model, { sdkModule: './client.js' });
-    expect(out).toContain('HttpResponse.json(0)');
-    expect(out).not.toContain('{ status:');
-  });
-
   it('emits a body-less response carrying the success status (204)', () => {
     const model = apiModel({
       schemas: [],
@@ -678,14 +613,6 @@ describe('renderMockModule', () => {
       expect(out).not.toContain('faker.seed(');
     });
 
-    it('uses a faker expression for the error-handler fallback body', () => {
-      const out = renderMockModule(fakerModel(), { sdkModule: './client.js', mockData: 'faker' });
-      expect(out).toContain('export const getPetErrorHandler');
-      expect(out).toContain('body ?? {');
-      // The fallback samples the error schema via faker, not a baked literal.
-      expect(out).toMatch(/body \?\? \{[\s\S]*faker\.number\.int\(\)/);
-    });
-
     it('baked mode (default) emits no faker import or seed call', () => {
       const out = renderMockModule(fakerModel(), { sdkModule: './client.js' });
       expect(out).not.toContain('@faker-js/faker');
diff --git a/packages/client-generator/src/emitters/__tests__/package-client.test.ts b/packages/client-generator/src/emitters/__tests__/package-client.test.ts
index 1bdefc75e7..545b240c86 100644
--- a/packages/client-generator/src/emitters/__tests__/package-client.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/package-client.test.ts
@@ -454,21 +454,9 @@ describe('emitClientSingleFile (embed arm)', () => {
     );
   });
 
-  it('matches the golden output for a small model', () => {
-    const model = modelWith([getOrder, streamEvents], {
-      schemas: [
-        namedSchema('Order', {
-          kind: 'object',
-          properties: [{ name: 'id', schema: SCALAR, required: true }],
-        }),
-        ...SCHEMAS.slice(1),
-      ],
-      securitySchemes: [{ kind: 'bearer', key: 'bearerAuth' }],
-    });
-    expect(
-      emitClientSingleFile(model, { serverUrl: 'https://cafe.example.com' })
-    ).toMatchSnapshot();
-  });
+  // The full inline output is not snapshotted here: the runtime bytes are pinned by
+  // runtime-sources.test.ts, the wiring by the byte-identity test above, and a real
+  // full inline client by the e2e cafe.snapshot.ts.
 });
 
 describe('emitClientSingleFile — pagination', () => {
@@ -546,10 +534,6 @@ describe('emitClientSingleFile — pagination', () => {
     );
   });
 
-  it('matches the golden output for a paginated inline client', () => {
-    expect(emitClientSingleFile(PAGINATED, { pagination: config })).toMatchSnapshot();
-  });
-
   it('matches the golden output for a paginated package client', () => {
     expect(emit(PAGINATED, { pagination: config })).toMatchSnapshot();
   });
diff --git a/packages/client-generator/src/emitters/__tests__/sse.deletion.test.ts b/packages/client-generator/src/emitters/__tests__/sse.deletion.test.ts
deleted file mode 100644
index 7555c98975..0000000000
--- a/packages/client-generator/src/emitters/__tests__/sse.deletion.test.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-// Deletion test guarding the SSE surface of the descriptor-wired client: the old
-// template's `__sse` runtime block and the `export const sse = { … }` namespace are
-// gone for good. An SSE operation now exists as a descriptor (`responseKind: "sse"`),
-// a typed client method (`kind: "sse"` in Ops), and a flat sugar export; the runtime's
-// sse capability module is embedded ONLY when a model declares a `text/event-stream`
-// operation — a non-streaming model is byte-free of it.
-import type { ApiModel } from '../../intermediate-representation/model.js';
-import { emitClientSingleFile } from '../package-client.js';
-import { apiModel, namedSchema, operation } from './fixtures.js';
-
-/** A model with one SSE op (event-stream success + an `itemSchema` ref). */
-function sseModel(): ApiModel {
-  return apiModel({
-    schemas: [namedSchema('Message', { kind: 'object', properties: [] })],
-    services: [
-      {
-        name: 'Default',
-        operations: [
-          operation({
-            name: 'streamMessages',
-            path: '/stream',
-            successResponses: [
-              {
-                contentType: 'text/event-stream',
-                status: 200,
-                schema: { kind: 'unknown' },
-                itemSchema: { kind: 'ref', name: 'Message' },
-              },
-            ],
-          }),
-        ],
-      },
-    ],
-  });
-}
-
-/** A model with one plain JSON op (no streaming). */
-function plainModel(): ApiModel {
-  return apiModel({
-    schemas: [namedSchema('Thing', { kind: 'object', properties: [] })],
-    services: [
-      {
-        name: 'Default',
-        operations: [
-          operation({
-            name: 'getThing',
-            path: '/thing',
-            successResponses: [
-              {
-                contentType: 'application/json',
-                schema: { kind: 'ref', name: 'Thing' },
-                status: 200,
-              },
-            ],
-          }),
-        ],
-      },
-    ],
-  });
-}
-
-describe('SSE surface (deletion test)', () => {
-  it('never emits the old template surface: no __sse helper, no sse namespace', () => {
-    const out = emitClientSingleFile(sseModel());
-    expect(out).not.toContain('__sse');
-    expect(out).not.toContain('export const sse =');
-  });
-
-  it('exposes an SSE op as descriptor + typed Ops member + flat sugar', () => {
-    const out = emitClientSingleFile(sseModel());
-    expect(out).toContain('responseKind: "sse"');
-    expect(out).toContain('kind: "sse";');
-    expect(out).toContain(
-      'export const streamMessages = (init: SseOptions = {}) => client.streamMessages({}, init);'
-    );
-    // The runtime's sse capability module is embedded and wired.
-    expect(out).toContain('async function* sse');
-    expect(out).toContain('createClientCore<Ops, Id, Path, Tag>(operations, config, { sse })');
-  });
-
-  it('embeds NO sse capability when no op streams', () => {
-    const out = emitClientSingleFile(plainModel());
-    expect(out).not.toContain('async function* sse');
-    expect(out).not.toContain('responseKind: "sse"');
-    expect(out).toContain('createClientCore<Ops, Id, Path, Tag>(operations, config, {})');
-  });
-});
diff --git a/packages/client-generator/src/emitters/__tests__/transformers.test.ts b/packages/client-generator/src/emitters/__tests__/transformers.test.ts
index f29b5dc968..5e23e47325 100644
--- a/packages/client-generator/src/emitters/__tests__/transformers.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/transformers.test.ts
@@ -1,4 +1,8 @@
-import type { ApiModel, NamedSchemaModel } from '../../intermediate-representation/model.js';
+import type {
+  ApiModel,
+  NamedSchemaModel,
+  PropertyModel,
+} from '../../intermediate-representation/model.js';
 import { renderTransformersModule } from '../transformers.js';
 
 const base: Omit<ApiModel, 'schemas'> = {
@@ -34,7 +38,7 @@ describe('renderTransformersModule', () => {
     expect(render([])).toBe('');
   });
 
-  it('converts a top-level date-time scalar field, guarded', () => {
+  it('converts top-level `date-time` and `date` scalar fields, guarded', () => {
     const out = render([
       {
         name: 'Event',
@@ -46,24 +50,6 @@ describe('renderTransformersModule', () => {
               schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
               required: true,
             },
-          ],
-        },
-      },
-    ]);
-    expect(out).toContain('export const transformEvent = (data: Event): Event =>');
-    expect(out).toContain('if (typeof data["createdAt"] === "string")');
-    expect(out).toContain('data["createdAt"] = new Date(data["createdAt"]);');
-    expect(out).toContain('return data;');
-    expect(out).toContain('import type { Event } from "./client.js";');
-  });
-
-  it('converts a `date` (not just date-time) scalar field', () => {
-    const out = render([
-      {
-        name: 'Birthday',
-        schema: {
-          kind: 'object',
-          properties: [
             {
               name: 'day',
               schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date' } },
@@ -73,7 +59,12 @@ describe('renderTransformersModule', () => {
         },
       },
     ]);
+    expect(out).toContain('export const transformEvent = (data: Event): Event =>');
+    expect(out).toContain('if (typeof data["createdAt"] === "string")');
+    expect(out).toContain('data["createdAt"] = new Date(data["createdAt"]);');
     expect(out).toContain('data["day"] = new Date(data["day"]);');
+    expect(out).toContain('return data;');
+    expect(out).toContain('import type { Event } from "./client.js";');
   });
 
   it('converts an array of date scalars, guarded', () => {
@@ -99,26 +90,6 @@ describe('renderTransformersModule', () => {
     expect(out).toContain('data["timestamps"] = data["timestamps"].map(v => new Date(v));');
   });
 
-  it('quotes a non-identifier key', () => {
-    const out = render([
-      {
-        name: 'Trace',
-        schema: {
-          kind: 'object',
-          properties: [
-            {
-              name: 'x-at',
-              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
-              required: true,
-            },
-          ],
-        },
-      },
-    ]);
-    expect(out).toContain('if (typeof data["x-at"] === "string")');
-    expect(out).toContain('data["x-at"] = new Date(data["x-at"]);');
-  });
-
   it('composes via a ref to a date-bearing schema', () => {
     const out = render([
       {
@@ -149,23 +120,63 @@ describe('renderTransformersModule', () => {
     expect(out).toContain('import type { Person, Pet } from "./client.js";');
   });
 
-  it('does NOT emit a transform for a ref to a date-free schema', () => {
+  // Each date-free shape exercises its own pruning bail-out: convertRef, the
+  // ref-items branch of convertArray, convertCollection, and convertProperty.
+  it.each<{ shape: string; property: PropertyModel; absent: string }>([
+    {
+      shape: 'ref to a date-free schema',
+      property: { name: 'tag', schema: { kind: 'ref', name: 'Plain' }, required: false },
+      absent: 'transformPlain',
+    },
+    {
+      shape: 'array of refs to a date-free schema',
+      property: {
+        name: 'list',
+        schema: { kind: 'array', items: { kind: 'ref', name: 'Plain' } },
+        required: true,
+      },
+      absent: 'data["list"]',
+    },
+    {
+      shape: 'record whose values bear no dates',
+      property: {
+        name: 'tags',
+        schema: { kind: 'record', value: { kind: 'scalar', scalar: 'string' } },
+        required: true,
+      },
+      absent: 'data["tags"]',
+    },
+    {
+      shape: 'nested inline object',
+      property: {
+        name: 'meta',
+        schema: {
+          kind: 'object',
+          properties: [
+            { name: 'title', schema: { kind: 'scalar', scalar: 'string' }, required: true },
+          ],
+        },
+        required: false,
+      },
+      absent: 'data["meta"]',
+    },
+  ])('skips a date-free $shape', ({ property, absent }) => {
     const out = render([
       {
-        name: 'Tag',
+        name: 'Plain',
         schema: {
           kind: 'object',
           properties: [
-            { name: 'label', schema: { kind: 'scalar', scalar: 'string' }, required: true },
+            { name: 'id', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
           ],
         },
       },
       {
-        name: 'Post',
+        name: 'Holder',
         schema: {
           kind: 'object',
           properties: [
-            { name: 'tag', schema: { kind: 'ref', name: 'Tag' }, required: false },
+            property,
             {
               name: 'at',
               schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
@@ -175,10 +186,10 @@ describe('renderTransformersModule', () => {
         },
       },
     ]);
-    expect(out).not.toContain('transformTag');
-    expect(out).toContain('export const transformPost');
-    expect(out).not.toContain('transformTag(data["tag"])');
-    expect(out).toContain('import type { Post } from "./client.js";');
+    expect(out).not.toContain(absent);
+    expect(out).toContain('data["at"] = new Date(data["at"]);');
+    // Date-free schemas are also left out of the type import.
+    expect(out).toContain('import type { Holder } from "./client.js";');
   });
 
   it('composes via an array of refs to a date-bearing schema', () => {
@@ -567,31 +578,6 @@ describe('renderTransformersModule', () => {
     expect(out).toContain('data["days"][__k] = new Date(data["days"][__k]);');
   });
 
-  it('does not iterate a record whose values bear no dates', () => {
-    const out = render([
-      {
-        name: 'Mixed',
-        schema: {
-          kind: 'object',
-          properties: [
-            {
-              name: 'tags',
-              required: true,
-              schema: { kind: 'record', value: { kind: 'scalar', scalar: 'string' } },
-            },
-            {
-              name: 'at',
-              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
-              required: true,
-            },
-          ],
-        },
-      },
-    ]);
-    expect(out).not.toContain('Object.values(data["tags"])');
-    expect(out).toContain('data["at"] = new Date(data["at"]);');
-  });
-
   it('walks intersection members that bear dates', () => {
     const out = render([
       {
@@ -627,40 +613,6 @@ describe('renderTransformersModule', () => {
     expect(out).toContain('transformWithDate(data);');
   });
 
-  it('omits an array-of-refs to a date-free schema', () => {
-    const out = render([
-      {
-        name: 'Plain',
-        schema: {
-          kind: 'object',
-          properties: [
-            { name: 'id', schema: { kind: 'scalar', scalar: 'integer' }, required: true },
-          ],
-        },
-      },
-      {
-        name: 'Wrapper',
-        schema: {
-          kind: 'object',
-          properties: [
-            {
-              name: 'list',
-              schema: { kind: 'array', items: { kind: 'ref', name: 'Plain' } },
-              required: true,
-            },
-            {
-              name: 'at',
-              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
-              required: true,
-            },
-          ],
-        },
-      },
-    ]);
-    expect(out).not.toContain('data["list"].forEach');
-    expect(out).toContain('data["at"] = new Date(data["at"]);');
-  });
-
   it('iterates nested loop vars for arrays of arrays of dates', () => {
     const out = render([
       {
@@ -701,34 +653,6 @@ describe('renderTransformersModule', () => {
     expect(out).toContain('item1["at"] = new Date(item1["at"]);');
   });
 
-  it('maps-and-reassigns an array of arrays of date scalars', () => {
-    const out = render([
-      {
-        name: 'Matrix',
-        schema: {
-          kind: 'object',
-          properties: [
-            {
-              name: 'rows',
-              required: true,
-              schema: {
-                kind: 'array',
-                items: {
-                  kind: 'array',
-                  items: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
-                },
-              },
-            },
-          ],
-        },
-      },
-    ]);
-    // Scalar elements are replace-by-value: reassigning a loop var is lost, so we
-    // map and write back into the slot at every array level.
-    expect(out).toContain('if (Array.isArray(data["rows"]))');
-    expect(out).toContain('data["rows"] = data["rows"].map(row => row.map(v => new Date(v)));');
-  });
-
   it('maps-and-reassigns a three-level array of date scalars with distinct vars', () => {
     const out = render([
       {
@@ -829,36 +753,6 @@ describe('renderTransformersModule', () => {
     expect(out).toContain('data["b"][__k] = data["b"][__k].map(v => new Date(v));');
   });
 
-  it('skips a date-free nested inline object sibling', () => {
-    const out = render([
-      {
-        name: 'Doc',
-        schema: {
-          kind: 'object',
-          properties: [
-            {
-              name: 'meta',
-              required: false,
-              schema: {
-                kind: 'object',
-                properties: [
-                  { name: 'title', schema: { kind: 'scalar', scalar: 'string' }, required: true },
-                ],
-              },
-            },
-            {
-              name: 'at',
-              schema: { kind: 'scalar', scalar: 'string', metadata: { format: 'date-time' } },
-              required: true,
-            },
-          ],
-        },
-      },
-    ]);
-    expect(out).not.toContain('if (data["meta"])');
-    expect(out).toContain('data["at"] = new Date(data["at"]);');
-  });
-
   it('ignores a ref to a name absent from the model', () => {
     const out = render([
       {
diff --git a/packages/client-generator/src/emitters/__tests__/type-guards.test.ts b/packages/client-generator/src/emitters/__tests__/type-guards.test.ts
index 45f556410a..07d2792739 100644
--- a/packages/client-generator/src/emitters/__tests__/type-guards.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/type-guards.test.ts
@@ -1,3 +1,4 @@
+import type { NamedSchemaModel, SchemaModel } from '../../intermediate-representation/model.js';
 import { emitClientSingleFile } from '../package-client.js';
 import { apiModel, namedSchema } from './fixtures.js';
 
@@ -180,146 +181,123 @@ describe('discriminated-union type guards (C6.4)', () => {
     expect(out).toContain('(value as Record<string, unknown>)["t"] === "a"');
   });
 
-  it('emits no guards for an undiscriminated union (no shared const)', () => {
-    const out = emitPackage(
-      apiModel({
-        schemas: [
-          namedSchema('StringOrNumber', {
-            kind: 'union',
-            members: [
-              { kind: 'scalar', scalar: 'string' },
-              { kind: 'scalar', scalar: 'number' },
-            ],
-          }),
-        ],
-      })
-    );
-    expect(out).not.toContain('value is');
-  });
-
-  it('emits no implicit guard when a member is not a ref to a named schema', () => {
-    const out = emitPackage(
-      apiModel({
-        schemas: [
-          beverage,
-          namedSchema('Mixed', {
+  // One row per rejection clause in the guard collection/implicit-discriminator logic.
+  it.each<[string, NamedSchemaModel[]]>([
+    [
+      'a member is not a ref to a named schema',
+      [
+        beverage,
+        namedSchema('Mixed', {
+          kind: 'union',
+          members: [
+            { kind: 'ref', name: 'Beverage' },
+            { kind: 'scalar', scalar: 'string' },
+          ],
+        }),
+      ],
+    ],
+    [
+      'a member ref points to an unknown schema',
+      [
+        beverage,
+        namedSchema('Ghosty', {
+          kind: 'union',
+          members: [
+            { kind: 'ref', name: 'Beverage' },
+            { kind: 'ref', name: 'DoesNotExist' },
+          ],
+        }),
+      ],
+    ],
+    [
+      'the union has a single member',
+      [
+        beverage,
+        namedSchema('Solo', { kind: 'union', members: [{ kind: 'ref', name: 'Beverage' }] }),
+      ],
+    ],
+    [
+      'members pin different property names',
+      [
+        namedSchema('P', {
+          kind: 'object',
+          properties: [{ name: 'a', schema: { kind: 'literal', value: 'x' }, required: true }],
+        }),
+        namedSchema('Q', {
+          kind: 'object',
+          properties: [{ name: 'b', schema: { kind: 'literal', value: 'y' }, required: true }],
+        }),
+        namedSchema('PQ', {
+          kind: 'union',
+          members: [
+            { kind: 'ref', name: 'P' },
+            { kind: 'ref', name: 'Q' },
+          ],
+        }),
+      ],
+    ],
+    [
+      'the shared const values are not distinct',
+      [
+        namedSchema('X', {
+          kind: 'object',
+          properties: [{ name: 'k', schema: { kind: 'literal', value: 'same' }, required: true }],
+        }),
+        namedSchema('Y', {
+          kind: 'object',
+          properties: [{ name: 'k', schema: { kind: 'literal', value: 'same' }, required: true }],
+        }),
+        namedSchema('XY', {
+          kind: 'union',
+          members: [
+            { kind: 'ref', name: 'X' },
+            { kind: 'ref', name: 'Y' },
+          ],
+        }),
+      ],
+    ],
+    [
+      'the shared const is not a string',
+      [
+        namedSchema('N1', {
+          kind: 'object',
+          properties: [{ name: 'v', schema: { kind: 'literal', value: 1 }, required: true }],
+        }),
+        namedSchema('N2', {
+          kind: 'object',
+          properties: [{ name: 'v', schema: { kind: 'literal', value: 2 }, required: true }],
+        }),
+        namedSchema('N12', {
+          kind: 'union',
+          members: [
+            { kind: 'ref', name: 'N1' },
+            { kind: 'ref', name: 'N2' },
+          ],
+        }),
+      ],
+    ],
+    [
+      'a nested union mixes ref and non-ref members',
+      [
+        beverage,
+        namedSchema('Wrapper', {
+          kind: 'array',
+          items: {
             kind: 'union',
             members: [
               { kind: 'ref', name: 'Beverage' },
               { kind: 'scalar', scalar: 'string' },
             ],
-          }),
-        ],
-      })
-    );
-    expect(out).not.toContain('value is');
-  });
-
-  it('emits no implicit guard when the shared const values are not distinct', () => {
-    const out = emitPackage(
-      apiModel({
-        schemas: [
-          namedSchema('X', {
-            kind: 'object',
-            properties: [
-              {
-                name: 'k',
-                schema: { kind: 'literal', value: 'same' },
-                required: true,
-              },
-            ],
-          }),
-          namedSchema('Y', {
-            kind: 'object',
-            properties: [
-              {
-                name: 'k',
-                schema: { kind: 'literal', value: 'same' },
-                required: true,
-              },
-            ],
-          }),
-          namedSchema('XY', {
-            kind: 'union',
-            members: [
-              { kind: 'ref', name: 'X' },
-              { kind: 'ref', name: 'Y' },
-            ],
-          }),
-        ],
-      })
-    );
-    expect(out).not.toContain('value is');
-  });
-
-  it('emits no implicit guard for a single-member union', () => {
-    const out = emitPackage(
-      apiModel({
-        schemas: [
-          beverage,
-          namedSchema('Solo', {
-            kind: 'union',
-            members: [{ kind: 'ref', name: 'Beverage' }],
-          }),
-        ],
-      })
-    );
-    expect(out).not.toContain('value is');
-  });
-
-  it('emits no implicit guard when a member ref points to an unknown schema', () => {
-    const out = emitPackage(
-      apiModel({
-        schemas: [
-          beverage,
-          namedSchema('Ghosty', {
-            kind: 'union',
-            members: [
-              { kind: 'ref', name: 'Beverage' },
-              { kind: 'ref', name: 'DoesNotExist' },
-            ],
-          }),
-        ],
-      })
-    );
-    expect(out).not.toContain('value is');
-  });
-
-  it('emits no implicit guard when members pin different property names', () => {
-    const out = emitPackage(
-      apiModel({
-        schemas: [
-          namedSchema('P', {
-            kind: 'object',
-            properties: [
-              {
-                name: 'a',
-                schema: { kind: 'literal', value: 'x' },
-                required: true,
-              },
-            ],
-          }),
-          namedSchema('Q', {
-            kind: 'object',
-            properties: [
-              {
-                name: 'b',
-                schema: { kind: 'literal', value: 'y' },
-                required: true,
-              },
-            ],
-          }),
-          namedSchema('PQ', {
-            kind: 'union',
-            members: [
-              { kind: 'ref', name: 'P' },
-              { kind: 'ref', name: 'Q' },
-            ],
-          }),
-        ],
-      })
-    );
-    expect(out).not.toContain('value is');
+            discriminator: {
+              propertyName: 'category',
+              mapping: [{ value: 'beverage', schemaName: 'Beverage' }],
+            },
+          },
+        }),
+      ],
+    ],
+  ])('emits no guards when %s', (_reason, schemas) => {
+    expect(emitPackage(apiModel({ schemas }))).not.toContain('value is');
   });
 
   it('ignores non-literal properties while detecting the implicit discriminant', () => {
@@ -370,122 +348,33 @@ describe('discriminated-union type guards (C6.4)', () => {
     expect(out).toContain('(value as Record<string, unknown>)["kind"] === "one"');
   });
 
-  it('emits guards for a discriminated union nested as array items', () => {
-    const out = emitPackage(
-      apiModel({
-        schemas: [
-          namedSchema('SuccessItem', {
-            kind: 'object',
-            properties: [
-              { name: 'status', schema: { kind: 'literal', value: 'ok' }, required: true },
-            ],
-          }),
-          namedSchema('ErrorItem', {
-            kind: 'object',
-            properties: [
-              { name: 'status', schema: { kind: 'literal', value: 'error' }, required: true },
-            ],
-          }),
-          // The union is the array's *items*, not a top-level named union.
-          namedSchema('BulkResponse', {
-            kind: 'array',
-            items: {
-              kind: 'union',
-              members: [
-                { kind: 'ref', name: 'SuccessItem' },
-                { kind: 'ref', name: 'ErrorItem' },
-              ],
-              discriminator: {
-                propertyName: 'status',
-                mapping: [
-                  { value: 'ok', schemaName: 'SuccessItem' },
-                  { value: 'error', schemaName: 'ErrorItem' },
-                ],
-              },
-            },
-          }),
-        ],
-      })
-    );
-    // Param is the inline member union; predicate narrows to the named member.
-    expect(out).toContain(
-      'export function isSuccessItem(value: SuccessItem | ErrorItem): value is SuccessItem {'
-    );
-    expect(out).toContain(
-      'export function isErrorItem(value: SuccessItem | ErrorItem): value is ErrorItem {'
-    );
-    expect(out).toContain('(value as Record<string, unknown>)["status"] === "ok"');
+  const cat = namedSchema('Cat', {
+    kind: 'object',
+    properties: [{ name: 'kind', schema: { kind: 'literal', value: 'cat' }, required: true }],
   });
-
-  it('emits guards for a discriminated union nested under a record value', () => {
-    const out = emitPackage(
-      apiModel({
-        schemas: [
-          namedSchema('Cat', {
-            kind: 'object',
-            properties: [
-              { name: 'kind', schema: { kind: 'literal', value: 'cat' }, required: true },
-            ],
-          }),
-          namedSchema('Dog', {
-            kind: 'object',
-            properties: [
-              { name: 'kind', schema: { kind: 'literal', value: 'dog' }, required: true },
-            ],
-          }),
-          namedSchema('PetMap', {
-            kind: 'record',
-            value: {
-              kind: 'union',
-              members: [
-                { kind: 'ref', name: 'Cat' },
-                { kind: 'ref', name: 'Dog' },
-              ],
-            },
-          }),
-        ],
-      })
-    );
-    expect(out).toContain('export function isCat(value: Cat | Dog): value is Cat {');
-    expect(out).toContain('export function isDog(value: Cat | Dog): value is Dog {');
+  const dog = namedSchema('Dog', {
+    kind: 'object',
+    properties: [{ name: 'kind', schema: { kind: 'literal', value: 'dog' }, required: true }],
   });
+  const catOrDog: SchemaModel = {
+    kind: 'union',
+    members: [
+      { kind: 'ref', name: 'Cat' },
+      { kind: 'ref', name: 'Dog' },
+    ],
+  };
 
-  it('emits guards for a discriminated union nested under an object property', () => {
-    const out = emitPackage(
-      apiModel({
-        schemas: [
-          namedSchema('Cat', {
-            kind: 'object',
-            properties: [
-              { name: 'kind', schema: { kind: 'literal', value: 'cat' }, required: true },
-            ],
-          }),
-          namedSchema('Dog', {
-            kind: 'object',
-            properties: [
-              { name: 'kind', schema: { kind: 'literal', value: 'dog' }, required: true },
-            ],
-          }),
-          namedSchema('Envelope', {
-            kind: 'object',
-            properties: [
-              {
-                name: 'pet',
-                schema: {
-                  kind: 'union',
-                  members: [
-                    { kind: 'ref', name: 'Cat' },
-                    { kind: 'ref', name: 'Dog' },
-                  ],
-                },
-                required: true,
-              },
-            ],
-          }),
-        ],
-      })
-    );
-    // Implicit discriminator (shared distinct `kind` const) on a nested union.
+  // Each container position is a distinct branch of the nested-site walk. The
+  // guard param is the inline member union, not the (unnamed) nested union.
+  it.each<[string, SchemaModel]>([
+    ['array items', { kind: 'array', items: catOrDog }],
+    ['a record value', { kind: 'record', value: catOrDog }],
+    [
+      'an object property',
+      { kind: 'object', properties: [{ name: 'pet', schema: catOrDog, required: true }] },
+    ],
+  ])('emits guards for a discriminated union nested under %s', (_position, container) => {
+    const out = emitPackage(apiModel({ schemas: [cat, dog, namedSchema('PetBox', container)] }));
     expect(out).toContain('export function isCat(value: Cat | Dog): value is Cat {');
     expect(out).toContain('export function isDog(value: Cat | Dog): value is Dog {');
   });
@@ -573,66 +462,4 @@ describe('discriminated-union type guards (C6.4)', () => {
     expect(out.match(/export function isBeverage\(/g)).toHaveLength(1);
     expect(out).toContain('export function isBeverage(value: MenuItem): value is Beverage {');
   });
-
-  it('skips a nested union whose members are not all named refs', () => {
-    const out = emitPackage(
-      apiModel({
-        schemas: [
-          beverage,
-          namedSchema('Wrapper', {
-            kind: 'array',
-            items: {
-              kind: 'union',
-              members: [
-                { kind: 'ref', name: 'Beverage' },
-                { kind: 'scalar', scalar: 'string' },
-              ],
-              discriminator: {
-                propertyName: 'category',
-                mapping: [{ value: 'beverage', schemaName: 'Beverage' }],
-              },
-            },
-          }),
-        ],
-      })
-    );
-    expect(out).not.toContain('value is');
-  });
-
-  it('ignores non-string shared const when detecting implicit discriminators', () => {
-    const out = emitPackage(
-      apiModel({
-        schemas: [
-          namedSchema('N1', {
-            kind: 'object',
-            properties: [
-              {
-                name: 'v',
-                schema: { kind: 'literal', value: 1 },
-                required: true,
-              },
-            ],
-          }),
-          namedSchema('N2', {
-            kind: 'object',
-            properties: [
-              {
-                name: 'v',
-                schema: { kind: 'literal', value: 2 },
-                required: true,
-              },
-            ],
-          }),
-          namedSchema('N12', {
-            kind: 'union',
-            members: [
-              { kind: 'ref', name: 'N1' },
-              { kind: 'ref', name: 'N2' },
-            ],
-          }),
-        ],
-      })
-    );
-    expect(out).not.toContain('value is');
-  });
 });
diff --git a/packages/client-generator/src/generators/__tests__/index.test.ts b/packages/client-generator/src/generators/__tests__/index.test.ts
index 3ff51839df..4762636fdb 100644
--- a/packages/client-generator/src/generators/__tests__/index.test.ts
+++ b/packages/client-generator/src/generators/__tests__/index.test.ts
@@ -30,15 +30,14 @@ describe('validateGenerators', () => {
     expect(() => validateGenerators(['sdk', 'tanstack-query'], {})).not.toThrow();
   });
 
-  it('rejects tanstack-query without sdk, naming the fix', () => {
-    expect(() => validateGenerators(['tanstack-query'], {})).toThrow(
-      /requires the "sdk" generator.*--generator sdk --generator tanstack-query/
-    );
-  });
-
-  it('rejects transformers without sdk', () => {
-    expect(() => validateGenerators(['transformers'], {})).toThrow(/requires the "sdk" generator/);
-  });
+  it.each(['tanstack-query', 'transformers', 'swr', 'mock'] as const)(
+    'rejects %s without sdk, naming the fix',
+    (generator) => {
+      expect(() => validateGenerators([generator], {})).toThrow(
+        new RegExp(`requires the "sdk" generator.*--generator sdk --generator ${generator}`)
+      );
+    }
+  );
 
   it('rejects transformers without --date-type Date (would assign Date to string fields)', () => {
     expect(() => validateGenerators(['sdk', 'transformers'], {})).toThrow(
@@ -50,8 +49,8 @@ describe('validateGenerators', () => {
     expect(() => validateGenerators(['sdk', 'transformers'], { dateType: 'Date' })).not.toThrow();
   });
 
-  it('rejects tanstack-query with result error mode', () => {
-    expect(() => validateGenerators(['sdk', 'tanstack-query'], { errorMode: 'result' })).toThrow(
+  it.each(['tanstack-query', 'swr'] as const)('rejects %s with result error mode', (generator) => {
+    expect(() => validateGenerators(['sdk', generator], { errorMode: 'result' })).toThrow(
       /does not support --error-mode "result".*throw/
     );
   });
@@ -68,21 +67,9 @@ describe('swr generator', () => {
     expect(descriptor.requires).toContain('sdk');
   });
 
-  it('rejects swr without sdk, naming the fix', () => {
-    expect(() => validateGenerators(['swr'], {})).toThrow(
-      /requires the "sdk" generator.*--generator sdk --generator swr/
-    );
-  });
-
   it('accepts sdk + swr with the default error-mode', () => {
     expect(() => validateGenerators(['sdk', 'swr'], {})).not.toThrow();
   });
-
-  it('rejects swr with result error mode', () => {
-    expect(() => validateGenerators(['sdk', 'swr'], { errorMode: 'result' })).toThrow(
-      /does not support --error-mode "result".*throw/
-    );
-  });
 });
 
 describe('validateGenerators — runtime compatibility', () => {
@@ -123,10 +110,6 @@ describe('mock generator', () => {
     expect(descriptor.requires).toContain('sdk');
   });
 
-  it('validateGenerators rejects mock without sdk', () => {
-    expect(() => validateGenerators(['mock'], {})).toThrow(/requires the "sdk" generator/);
-  });
-
   it('validateGenerators accepts sdk + mock', () => {
     expect(() => validateGenerators(['sdk', 'mock'], {})).not.toThrow();
   });
diff --git a/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts b/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
index 881bdc56e2..75b17fe168 100644
--- a/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
+++ b/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
@@ -417,7 +417,7 @@ describe('buildParameter', () => {
     expect(op.queryParams[0]).toMatchObject({ description: 'desc', required: true });
   });
 
-  it('captures style/explode on a query param', () => {
+  it('captures style/explode/allowReserved on a query param', () => {
     const op = buildOpOnly({
       paths: {
         '/x': {
@@ -429,6 +429,7 @@ describe('buildParameter', () => {
                 in: 'query',
                 style: 'pipeDelimited',
                 explode: false,
+                allowReserved: true,
                 schema: { type: 'array', items: { type: 'string' } },
               },
             ] as never,
@@ -437,67 +438,22 @@ describe('buildParameter', () => {
         } as never,
       },
     });
-    expect(op.queryParams[0]).toMatchObject({ style: 'pipeDelimited', explode: false });
-  });
-
-  it('captures allowReserved on a query param', () => {
-    const op = buildOpOnly({
-      paths: {
-        '/x': {
-          get: {
-            operationId: 'op',
-            parameters: [
-              { name: 'q', in: 'query', allowReserved: true, schema: { type: 'string' } },
-            ] as never,
-            responses: {},
-          },
-        } as never,
-      },
+    expect(op.queryParams[0]).toMatchObject({
+      style: 'pipeDelimited',
+      explode: false,
+      allowReserved: true,
     });
-    expect(op.queryParams[0].allowReserved).toBe(true);
   });
 
-  it('leaves style/explode/allowReserved undefined on a plain query param', () => {
-    const op = buildOpOnly({
-      paths: {
-        '/x': {
-          get: {
-            operationId: 'op',
-            parameters: [{ name: 'q', in: 'query', schema: { type: 'string' } }] as never,
-            responses: {},
-          },
-        } as never,
-      },
-    });
-    expect(op.queryParams[0].style).toBeUndefined();
-    expect(op.queryParams[0].explode).toBeUndefined();
-    expect(op.queryParams[0].allowReserved).toBeUndefined();
-  });
-
-  it('ignores an unknown style string (leaves style undefined)', () => {
-    const op = buildOpOnly({
-      paths: {
-        '/x': {
-          get: {
-            operationId: 'op',
-            parameters: [
-              { name: 'q', in: 'query', style: 'matrix', schema: { type: 'string' } },
-            ] as never,
-            responses: {},
-          },
-        } as never,
-      },
-    });
-    expect(op.queryParams[0].style).toBeUndefined();
-  });
-
-  it('does not set style/explode/allowReserved on non-query params', () => {
+  it('leaves style/explode/allowReserved undefined on plain query params, unknown styles, and non-query params', () => {
     const op = buildOpOnly({
       paths: {
         '/x/{p}': {
           get: {
             operationId: 'op',
             parameters: [
+              { name: 'q', in: 'query', schema: { type: 'string' } },
+              { name: 'odd', in: 'query', style: 'matrix', schema: { type: 'string' } },
               {
                 name: 'p',
                 in: 'path',
@@ -520,14 +476,25 @@ describe('buildParameter', () => {
         } as never,
       },
     });
-    const p = op.pathParams[0];
-    const h = op.headerParams[0];
-    expect(p.style).toBeUndefined();
-    expect(p.explode).toBeUndefined();
-    expect(p.allowReserved).toBeUndefined();
-    expect(h.style).toBeUndefined();
-    expect(h.explode).toBeUndefined();
-    expect(h.allowReserved).toBeUndefined();
+    const params = [op.queryParams[0], op.queryParams[1], op.pathParams[0], op.headerParams[0]];
+    expect(params.map((param) => param.style)).toEqual([
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+    ]);
+    expect(params.map((param) => param.explode)).toEqual([
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+    ]);
+    expect(params.map((param) => param.allowReserved)).toEqual([
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+    ]);
   });
 });
 
@@ -564,44 +531,19 @@ describe('buildRequestBody', () => {
     expect(op.requestBody).toBeUndefined();
   });
 
-  it('prefers application/json when multiple media types are offered', () => {
-    const op = buildOpOnly(
-      makeOp({
-        'application/xml': { schema: { type: 'string' } },
-        'application/json': { schema: { type: 'number' } },
-      })
-    );
-    expect(op.requestBody?.contentType).toBe('application/json');
-  });
-
-  it('prefers merge-patch+json when JSON is not present', () => {
+  it.each([
+    ['application/json'],
+    ['application/merge-patch+json'],
+    ['application/x-www-form-urlencoded'],
+    ['multipart/form-data'],
+  ])('prefers %s when offered alongside application/xml', (contentType) => {
     const op = buildOpOnly(
       makeOp({
         'application/xml': { schema: { type: 'string' } },
-        'application/merge-patch+json': { schema: { type: 'number' } },
+        [contentType]: { schema: { type: 'object' } },
       })
     );
-    expect(op.requestBody?.contentType).toBe('application/merge-patch+json');
-  });
-
-  it('falls back to x-www-form-urlencoded', () => {
-    const op = buildOpOnly(
-      makeOp({
-        'application/xml': { schema: { type: 'string' } },
-        'application/x-www-form-urlencoded': { schema: { type: 'object' } },
-      })
-    );
-    expect(op.requestBody?.contentType).toBe('application/x-www-form-urlencoded');
-  });
-
-  it('falls back to multipart/form-data', () => {
-    const op = buildOpOnly(
-      makeOp({
-        'application/xml': { schema: { type: 'string' } },
-        'multipart/form-data': { schema: { type: 'object' } },
-      })
-    );
-    expect(op.requestBody?.contentType).toBe('multipart/form-data');
+    expect(op.requestBody?.contentType).toBe(contentType);
   });
 
   it('falls back to the first available media type when no known one matches', () => {
@@ -1054,25 +996,25 @@ describe('buildSchema — every schema kind', () => {
     });
   });
 
-  it('renders const string as literal', () => {
+  it('renders const string/number/boolean as literal', () => {
     expect(buildSchemaOnly({ const: 'hello' } as unknown as Oas3Schema)).toEqual({
       kind: 'literal',
       value: 'hello',
     });
-  });
-
-  it('renders const number as literal', () => {
     expect(buildSchemaOnly({ const: 42 } as unknown as Oas3Schema)).toEqual({
       kind: 'literal',
       value: 42,
     });
-  });
-
-  it('renders const boolean as literal', () => {
     expect(buildSchemaOnly({ const: true } as unknown as Oas3Schema)).toEqual({
       kind: 'literal',
       value: true,
     });
+    // `const: false` stays a literal even though boolean enums widen (see #4) —
+    // an explicit single-value constraint, and a falsy value the branch must not drop.
+    expect(buildSchemaOnly({ type: 'boolean', const: false } as unknown as Oas3Schema)).toEqual({
+      kind: 'literal',
+      value: false,
+    });
   });
 
   it('throws NotSupportedError for unsupported const value types (objects)', () => {
@@ -1104,6 +1046,13 @@ describe('buildSchema — every schema kind', () => {
     });
   });
 
+  it('widens a single-value boolean enum to boolean too (no over-narrowing to a literal)', () => {
+    expect(buildSchemaOnly({ type: 'boolean', enum: [false] } as Oas3Schema)).toEqual({
+      kind: 'scalar',
+      scalar: 'boolean',
+    });
+  });
+
   it('renders mixed-type enums with the fallback scalar=string', () => {
     const got = buildSchemaOnly({ enum: ['a', 1] } as Oas3Schema);
     expect(got).toMatchObject({ kind: 'enum', scalar: 'string' });
@@ -1448,61 +1397,30 @@ describe('extractMetadata — validation keywords', () => {
     expect(got).not.toHaveProperty('metadata');
   });
 
-  it('passes through numeric exclusiveMinimum / exclusiveMaximum (OAS 3.1 form)', () => {
-    const got = buildSchemaOnly({
-      type: 'integer',
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      exclusiveMinimum: 0 as any,
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      exclusiveMaximum: 600 as any,
-    } as Oas3Schema);
-    expect(got).toEqual({
-      kind: 'scalar',
-      scalar: 'integer',
-      metadata: { exclusiveMinimum: 0, exclusiveMaximum: 600 },
-    });
-  });
-
-  it('normalizes OAS 3.0 boolean exclusiveMinimum=true + minimum=X to numeric exclusiveMinimum=X', () => {
-    const got = buildSchemaOnly({
-      type: 'integer',
-      minimum: 0,
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      exclusiveMinimum: true as any,
-    } as Oas3Schema);
-    expect(got).toEqual({
-      kind: 'scalar',
-      scalar: 'integer',
-      metadata: { exclusiveMinimum: 0 },
-    });
-  });
-
-  it('normalizes OAS 3.0 boolean exclusiveMaximum=true + maximum=X to numeric exclusiveMaximum=X', () => {
-    const got = buildSchemaOnly({
-      type: 'integer',
-      maximum: 100,
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      exclusiveMaximum: true as any,
-    } as Oas3Schema);
-    expect(got).toEqual({
-      kind: 'scalar',
-      scalar: 'integer',
-      metadata: { exclusiveMaximum: 100 },
-    });
-  });
-
-  it('drops boolean exclusiveMinimum=false (3.0 form, no-op)', () => {
-    const got = buildSchemaOnly({
-      type: 'integer',
-      minimum: 5,
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      exclusiveMinimum: false as any,
-    } as Oas3Schema);
-    expect(got).toEqual({
-      kind: 'scalar',
-      scalar: 'integer',
-      metadata: { minimum: 5 },
-    });
+  it.each([
+    [
+      'passes through numeric exclusiveMinimum / exclusiveMaximum (OAS 3.1 form)',
+      { exclusiveMinimum: 0, exclusiveMaximum: 600 },
+      { exclusiveMinimum: 0, exclusiveMaximum: 600 },
+    ],
+    [
+      'normalizes OAS 3.0 boolean exclusiveMinimum=true + minimum=X to numeric exclusiveMinimum=X',
+      { minimum: 0, exclusiveMinimum: true },
+      { exclusiveMinimum: 0 },
+    ],
+    [
+      'normalizes OAS 3.0 boolean exclusiveMaximum=true + maximum=X to numeric exclusiveMaximum=X',
+      { maximum: 100, exclusiveMaximum: true },
+      { exclusiveMaximum: 100 },
+    ],
+    [
+      'drops boolean exclusiveMinimum=false (3.0 form, no-op)',
+      { minimum: 5, exclusiveMinimum: false },
+      { minimum: 5 },
+    ],
+  ])('%s', (_case, bounds, metadata) => {
+    const got = buildSchemaOnly({ type: 'integer', ...bounds } as unknown as Oas3Schema);
+    expect(got).toEqual({ kind: 'scalar', scalar: 'integer', metadata });
   });
 
   it('lifts metadata on inline object properties', () => {
@@ -1652,6 +1570,14 @@ describe('buildApiModel — enum with null (OAS 3.1)', () => {
       members: [{ kind: 'scalar', scalar: 'string' }, { kind: 'null' }],
     });
   });
+
+  it('widens a nullable boolean enum to boolean | null (see #4)', () => {
+    const schema = buildSchemaOnly({ type: ['boolean', 'null'], enum: [false, null] } as never);
+    expect(schema).toEqual({
+      kind: 'union',
+      members: [{ kind: 'scalar', scalar: 'boolean' }, { kind: 'null' }],
+    });
+  });
 });
 
 describe('buildApiModel — discriminated unions (C6.4)', () => {
@@ -2061,46 +1987,3 @@ describe('extractMetadata — example/default', () => {
     expect(got.metadata?.example).toBeUndefined();
   });
 });
-
-describe('buildSchema — boolean enum widening (#4)', () => {
-  it('widens a single-value boolean enum to `boolean` (no over-narrowing to a literal)', () => {
-    expect(buildSchemaOnly({ type: 'boolean', enum: [false] } as Oas3Schema)).toMatchObject({
-      kind: 'scalar',
-      scalar: 'boolean',
-    });
-  });
-
-  it('widens a full boolean enum to `boolean`', () => {
-    expect(buildSchemaOnly({ type: 'boolean', enum: [true, false] } as Oas3Schema)).toMatchObject({
-      kind: 'scalar',
-      scalar: 'boolean',
-    });
-  });
-
-  it('preserves a nullable boolean enum as `boolean | null`', () => {
-    const m = buildSchemaOnly({
-      type: ['boolean', 'null'],
-      enum: [false, null],
-    } as unknown as Oas3Schema);
-    expect(m.kind).toBe('union');
-    const members = (m as Extract<SchemaModel, { kind: 'union' }>).members;
-    expect(members).toContainEqual({ kind: 'scalar', scalar: 'boolean' });
-    expect(members).toContainEqual({ kind: 'null' });
-  });
-
-  it('leaves string enums as enums (literals stay meaningful there)', () => {
-    expect(buildSchemaOnly({ type: 'string', enum: ['a', 'b'] } as Oas3Schema)).toMatchObject({
-      kind: 'enum',
-      scalar: 'string',
-    });
-  });
-
-  it('leaves a boolean const as the literal (an explicit single-value constraint)', () => {
-    expect(
-      buildSchemaOnly({ type: 'boolean', const: false } as unknown as Oas3Schema)
-    ).toMatchObject({
-      kind: 'literal',
-      value: false,
-    });
-  });
-});

From 3874370e40294549326f85267af4775b630afe25 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Fri, 17 Jul 2026 17:29:11 +0300
Subject: [PATCH 117/134] refactor(client-generator): dedupe emitter helpers,
 inline the writer dispatch, and rename misleading modules

---
 .../src/__tests__/loader.test.ts              |  33 ---
 packages/client-generator/src/config.ts       |   9 +-
 ...t.ts.snap => client-assembly.test.ts.snap} |   0
 ...client.test.ts => client-assembly.test.ts} |   4 +-
 .../src/emitters/__tests__/descriptor.test.ts |  27 +--
 .../{client.test.ts => emit-options.test.ts}  |   2 +-
 .../src/emitters/__tests__/fixtures.ts        |   2 +-
 .../src/emitters/__tests__/operations.test.ts |   4 +-
 .../src/emitters/__tests__/sse.test.ts        |  14 +-
 .../src/emitters/__tests__/ts.test.ts         |  35 ++-
 .../emitters/__tests__/type-guards.test.ts    |   2 +-
 .../src/emitters/__tests__/types.test.ts      |   2 +-
 .../{package-client.ts => client-assembly.ts} |  12 +-
 .../src/emitters/descriptor.ts                |  38 +--
 .../emitters/{client.ts => emit-options.ts}   |   4 +-
 .../client-generator/src/emitters/faker.ts    |  29 +--
 .../client-generator/src/emitters/jsdoc.ts    |  12 +-
 .../client-generator/src/emitters/mock.ts     |  55 +++--
 .../src/emitters/operation-aliases.ts         |  14 +-
 .../src/emitters/operation-signature.ts       |   8 +-
 .../src/emitters/pagination.ts                |  10 +-
 packages/client-generator/src/emitters/sse.ts |  11 -
 .../client-generator/src/emitters/support.ts  |   9 +-
 packages/client-generator/src/emitters/swr.ts |  67 +-----
 .../src/emitters/tanstack-query.ts            |  66 +-----
 packages/client-generator/src/emitters/ts.ts  |  41 +++-
 .../src/emitters/type-guards.ts               |   2 +-
 .../client-generator/src/emitters/types.ts    |  15 +-
 .../src/emitters/wrapper-support.ts           |  62 +++++
 packages/client-generator/src/emitters/zod.ts |  51 ++--
 .../src/generators/__tests__/index.test.ts    |  25 +-
 .../src/generators/__tests__/sdk.test.ts      |  18 +-
 .../src/generators/__tests__/swr.test.ts      |   4 +-
 .../__tests__/tanstack-query.test.ts          |   4 +-
 .../generators/__tests__/transformers.test.ts |   4 +-
 .../client-generator/src/generators/anchor.ts |  10 +
 .../client-generator/src/generators/index.ts  |  11 +-
 .../client-generator/src/generators/mock.ts   |   4 +-
 .../client-generator/src/generators/sdk.ts    |  25 +-
 .../client-generator/src/generators/swr.ts    |   4 +-
 .../src/generators/tanstack-query.ts          |   4 +-
 .../src/generators/transformers.ts            |   4 +-
 .../client-generator/src/generators/types.ts  |  23 +-
 .../client-generator/src/generators/zod.ts    |   4 +-
 packages/client-generator/src/index.ts        |   5 +-
 .../__tests__/build.test.ts                   |  31 ++-
 .../src/intermediate-representation/build.ts  |  17 +-
 .../src/intermediate-representation/model.ts  |  12 +
 packages/client-generator/src/loader.ts       |   3 -
 packages/client-generator/src/plugin.ts       |   3 +-
 packages/client-generator/src/types.ts        |  10 +-
 .../src/writers/__tests__/index.test.ts       |  79 -------
 .../writers/__tests__/split-writer.test.ts    | 217 ------------------
 .../client-generator/src/writers/index.ts     |  15 --
 .../src/writers/single-file-writer.ts         |  11 -
 .../src/writers/split-writer.ts               |  25 --
 .../client-generator/src/writers/types.ts     |  31 ---
 packages/client-generator/src/writers/util.ts |  19 --
 58 files changed, 401 insertions(+), 861 deletions(-)
 rename packages/client-generator/src/emitters/__tests__/__snapshots__/{package-client.test.ts.snap => client-assembly.test.ts.snap} (100%)
 rename packages/client-generator/src/emitters/__tests__/{package-client.test.ts => client-assembly.test.ts} (99%)
 rename packages/client-generator/src/emitters/__tests__/{client.test.ts => emit-options.test.ts} (94%)
 rename packages/client-generator/src/emitters/{package-client.ts => client-assembly.ts} (99%)
 rename packages/client-generator/src/emitters/{client.ts => emit-options.ts} (96%)
 create mode 100644 packages/client-generator/src/generators/anchor.ts
 delete mode 100644 packages/client-generator/src/writers/__tests__/index.test.ts
 delete mode 100644 packages/client-generator/src/writers/__tests__/split-writer.test.ts
 delete mode 100644 packages/client-generator/src/writers/index.ts
 delete mode 100644 packages/client-generator/src/writers/single-file-writer.ts
 delete mode 100644 packages/client-generator/src/writers/split-writer.ts
 delete mode 100644 packages/client-generator/src/writers/types.ts
 delete mode 100644 packages/client-generator/src/writers/util.ts

diff --git a/packages/client-generator/src/__tests__/loader.test.ts b/packages/client-generator/src/__tests__/loader.test.ts
index 04520357e7..46c565caeb 100644
--- a/packages/client-generator/src/__tests__/loader.test.ts
+++ b/packages/client-generator/src/__tests__/loader.test.ts
@@ -74,39 +74,6 @@ describe('loadSpec', () => {
     expect(result.version).toBe('oas3_0');
   });
 
-  it('returns the source files read — the entry plus external $ref targets', async () => {
-    const pet = await write(
-      'pet.yaml',
-      outdent`
-        type: object
-        properties:
-          id: { type: integer }
-      `
-    );
-    const entry = await write(
-      'split.yaml',
-      outdent`
-        openapi: 3.0.3
-        info:
-          title: Split
-          version: 1.0.0
-        paths:
-          /pets:
-            get:
-              responses:
-                '200':
-                  description: ok
-                  content:
-                    application/json:
-                      schema:
-                        $ref: './pet.yaml'
-      `
-    );
-    const { fileDependencies } = await loadSpec(entry);
-    expect(fileDependencies.has(entry)).toBe(true);
-    expect(fileDependencies.has(pet)).toBe(true);
-  });
-
   it('propagates errors from bundle() for null/empty documents', async () => {
     const file = await write('null.yaml', 'null\n');
     await expect(loadSpec(file)).rejects.toThrow();
diff --git a/packages/client-generator/src/config.ts b/packages/client-generator/src/config.ts
index d186f83a05..d379b6db79 100644
--- a/packages/client-generator/src/config.ts
+++ b/packages/client-generator/src/config.ts
@@ -1,14 +1,13 @@
-import type { ArgsStyle } from './emitters/client.js';
+import type { ArgsStyle } from './emitters/emit-options.js';
 // packages/client-generator/src/config.ts
 import type { PaginationConfig } from './emitters/pagination.js';
-import type { CustomGenerator } from './generators/types.js';
-import type { OutputMode } from './writers/types.js';
+import type { CustomGenerator, OutputMode } from './generators/types.js';
 
 /**
  * The user-facing generation config: the options `generateClient()` accepts, plus the
  * `generators` list. Annotate a standalone config object with `satisfies Config` for
- * type-safe authoring. `redocly.yaml` ingestion is intentionally not modeled here
- * (roadmap P7.5).
+ * type-safe authoring. The CLI merges a `redocly.yaml` `client` block into this shape
+ * via `mergeConfig` (see config-file.ts).
  */
 export type Config = {
   /** Path or URL to the OpenAPI document (or an `apis:` alias from `redocly.yaml`). */
diff --git a/packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap b/packages/client-generator/src/emitters/__tests__/__snapshots__/client-assembly.test.ts.snap
similarity index 100%
rename from packages/client-generator/src/emitters/__tests__/__snapshots__/package-client.test.ts.snap
rename to packages/client-generator/src/emitters/__tests__/__snapshots__/client-assembly.test.ts.snap
diff --git a/packages/client-generator/src/emitters/__tests__/package-client.test.ts b/packages/client-generator/src/emitters/__tests__/client-assembly.test.ts
similarity index 99%
rename from packages/client-generator/src/emitters/__tests__/package-client.test.ts
rename to packages/client-generator/src/emitters/__tests__/client-assembly.test.ts
index 545b240c86..7fa9369fa8 100644
--- a/packages/client-generator/src/emitters/__tests__/package-client.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/client-assembly.test.ts
@@ -1,6 +1,6 @@
 import type { ApiModel, OperationModel } from '../../intermediate-representation/model.js';
-import type { EmitOptions } from '../client.js';
-import { emitClientSingleFile } from '../package-client.js';
+import { emitClientSingleFile } from '../client-assembly.js';
+import type { EmitOptions } from '../emit-options.js';
 import { ts } from '../ts.js';
 import { apiModel, namedSchema, operation, param, response, SCALAR } from './fixtures.js';
 
diff --git a/packages/client-generator/src/emitters/__tests__/descriptor.test.ts b/packages/client-generator/src/emitters/__tests__/descriptor.test.ts
index 8e7f49f44e..8b37244472 100644
--- a/packages/client-generator/src/emitters/__tests__/descriptor.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/descriptor.test.ts
@@ -3,12 +3,7 @@ import type {
   OperationModel,
   ResponseBodyModel,
 } from '../../intermediate-representation/model.js';
-import {
-  descriptorStatements,
-  literalExpr,
-  opsInterfaceStatements,
-  packageIdents,
-} from '../descriptor.js';
+import { descriptorStatements, opsInterfaceStatements, packageIdents } from '../descriptor.js';
 import type { EmitContext } from '../operations.js';
 import type { ModelPagination } from '../pagination.js';
 import { printStatements } from '../ts.js';
@@ -57,26 +52,6 @@ describe('packageIdents', () => {
   });
 });
 
-describe('literalExpr', () => {
-  function print(value: unknown): string {
-    return printStatements([literalExpr(value)]);
-  }
-
-  it('converts scalars, null, arrays, and objects to expression source', () => {
-    expect(print('x')).toBe('"x"');
-    expect(print(42)).toBe('42');
-    expect(print(true)).toBe('true');
-    expect(print(false)).toBe('false');
-    expect(print(null)).toBe('null');
-    expect(print([1, 'a'])).toBe('[1, "a"]');
-    expect(print({ a: 1, b: [true] })).toBe('{ a: 1, b: [true] }');
-  });
-
-  it('quotes object keys that are not identifier-safe', () => {
-    expect(print({ 'a-b': 1, ok: 2 })).toBe('{ "a-b": 1, ok: 2 }');
-  });
-});
-
 describe('descriptorStatements', () => {
   it('returns no statements for a model with no operations', () => {
     expect(descriptorStatements(apiModel(), new Map(), 'string')).toEqual([]);
diff --git a/packages/client-generator/src/emitters/__tests__/client.test.ts b/packages/client-generator/src/emitters/__tests__/emit-options.test.ts
similarity index 94%
rename from packages/client-generator/src/emitters/__tests__/client.test.ts
rename to packages/client-generator/src/emitters/__tests__/emit-options.test.ts
index ca4d370caf..1e2cae931f 100644
--- a/packages/client-generator/src/emitters/__tests__/client.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/emit-options.test.ts
@@ -1,4 +1,4 @@
-import { banner, HEADER, renderTitleComment } from '../client.js';
+import { banner, HEADER, renderTitleComment } from '../emit-options.js';
 import { apiModel } from './fixtures.js';
 
 describe('banner', () => {
diff --git a/packages/client-generator/src/emitters/__tests__/fixtures.ts b/packages/client-generator/src/emitters/__tests__/fixtures.ts
index 51614ba2a6..9f9821389d 100644
--- a/packages/client-generator/src/emitters/__tests__/fixtures.ts
+++ b/packages/client-generator/src/emitters/__tests__/fixtures.ts
@@ -6,7 +6,7 @@ import type {
   ResponseBodyModel,
   SchemaModel,
 } from '../../intermediate-representation/model.js';
-import { emitClientSingleFile } from '../package-client.js';
+import { emitClientSingleFile } from '../client-assembly.js';
 
 /** A plain `string` scalar — the default schema for params and the most-reused leaf. */
 export const SCALAR: SchemaModel = { kind: 'scalar', scalar: 'string' };
diff --git a/packages/client-generator/src/emitters/__tests__/operations.test.ts b/packages/client-generator/src/emitters/__tests__/operations.test.ts
index 800f76c419..bfaf613152 100644
--- a/packages/client-generator/src/emitters/__tests__/operations.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/operations.test.ts
@@ -1,9 +1,9 @@
 // The flat sugar signatures (`renderArgList`) and the `<Op>*` operation aliases as
 // they appear in the descriptor-wired single-file client. The wiring itself (Ops,
-// OPERATIONS, client, auth sugar) is covered in package-client.test.ts; here the
+// OPERATIONS, client, auth sugar) is covered in client-assembly.test.ts; here the
 // focus is one operation's developer-facing surface.
 import type { OperationModel, RequestBodyModel } from '../../intermediate-representation/model.js';
-import { emitClientSingleFile } from '../package-client.js';
+import { emitClientSingleFile } from '../client-assembly.js';
 import { SCALAR, apiModel, emitWithOp, namedSchema, operation, param } from './fixtures.js';
 
 /** Emit a result-mode single-file client whose only operation is `operation(op)`. */
diff --git a/packages/client-generator/src/emitters/__tests__/sse.test.ts b/packages/client-generator/src/emitters/__tests__/sse.test.ts
index e2b14c64ed..fb66c99588 100644
--- a/packages/client-generator/src/emitters/__tests__/sse.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/sse.test.ts
@@ -1,5 +1,5 @@
 import type { ResponseBodyModel, SchemaModel } from '../../intermediate-representation/model.js';
-import { isSseOp, partitionOps, sseDataKind, sseEventType } from '../sse.js';
+import { isSseOp, sseDataKind, sseEventType } from '../sse.js';
 import { printNodes } from '../ts.js';
 import { operation } from './fixtures.js';
 
@@ -105,15 +105,3 @@ describe('sseDataKind', () => {
     for (const itemSchema of text) expect(sseDataKind(sseOp({ itemSchema }))).toBe('text');
   });
 });
-
-describe('partitionOps', () => {
-  it('splits ops into regular and sse, preserving order', () => {
-    const a = operation({ name: 'a' });
-    const s1 = sseOp({}, 's1');
-    const b = operation({ name: 'b' });
-    const s2 = sseOp({}, 's2');
-    const { regular, sse } = partitionOps([a, s1, b, s2]);
-    expect(regular.map((o) => o.name)).toEqual(['a', 'b']);
-    expect(sse.map((o) => o.name)).toEqual(['s1', 's2']);
-  });
-});
diff --git a/packages/client-generator/src/emitters/__tests__/ts.test.ts b/packages/client-generator/src/emitters/__tests__/ts.test.ts
index ba88d7b48e..1d7ae1c86d 100644
--- a/packages/client-generator/src/emitters/__tests__/ts.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/ts.test.ts
@@ -1,4 +1,12 @@
-import { jsdoc, parseExpression, parseStatements, printNodes, printStatements, ts } from '../ts.js';
+import {
+  jsdoc,
+  literalExpression,
+  parseExpression,
+  parseStatements,
+  printNodes,
+  printStatements,
+  ts,
+} from '../ts.js';
 
 describe('emitters/ts foundation', () => {
   describe('printNodes', () => {
@@ -74,6 +82,31 @@ describe('emitters/ts foundation', () => {
     });
   });
 
+  describe('literalExpression', () => {
+    function print(value: unknown): string {
+      return printStatements([literalExpression(value)]);
+    }
+
+    it('converts scalars, null, arrays, and objects to expression source', () => {
+      expect(print('x')).toBe('"x"');
+      expect(print(42)).toBe('42');
+      expect(print(true)).toBe('true');
+      expect(print(false)).toBe('false');
+      expect(print(null)).toBe('null');
+      expect(print([1, 'a'])).toBe('[1, "a"]');
+      expect(print({ a: 1, b: [true] })).toBe('{ a: 1, b: [true] }');
+    });
+
+    it('prints a negative number as a unary minus', () => {
+      expect(print(-42)).toBe('-42');
+      expect(print({ min: -1.5 })).toBe('{ min: -1.5 }');
+    });
+
+    it('quotes object keys that are not identifier-safe', () => {
+      expect(print({ 'a-b': 1, ok: 2 })).toBe('{ "a-b": 1, ok: 2 }');
+    });
+  });
+
   describe('jsdoc', () => {
     it('prints a single-line block comment above the node', () => {
       const decl = ts.factory.createVariableStatement(
diff --git a/packages/client-generator/src/emitters/__tests__/type-guards.test.ts b/packages/client-generator/src/emitters/__tests__/type-guards.test.ts
index 07d2792739..698d044d30 100644
--- a/packages/client-generator/src/emitters/__tests__/type-guards.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/type-guards.test.ts
@@ -1,5 +1,5 @@
 import type { NamedSchemaModel, SchemaModel } from '../../intermediate-representation/model.js';
-import { emitClientSingleFile } from '../package-client.js';
+import { emitClientSingleFile } from '../client-assembly.js';
 import { apiModel, namedSchema } from './fixtures.js';
 
 // The package arm keeps the emitted text free of the embedded runtime, so the
diff --git a/packages/client-generator/src/emitters/__tests__/types.test.ts b/packages/client-generator/src/emitters/__tests__/types.test.ts
index a7672cbdec..6bcfa0976f 100644
--- a/packages/client-generator/src/emitters/__tests__/types.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/types.test.ts
@@ -1,5 +1,5 @@
 import type { PropertyModel, SchemaModel } from '../../intermediate-representation/model.js';
-import { emitClientSingleFile } from '../package-client.js';
+import { emitClientSingleFile } from '../client-assembly.js';
 import { printNodes } from '../ts.js';
 import { renderSchema, schemaToTypeNode, typesStatements } from '../types.js';
 import { SCALAR, apiModel, namedSchema } from './fixtures.js';
diff --git a/packages/client-generator/src/emitters/package-client.ts b/packages/client-generator/src/emitters/client-assembly.ts
similarity index 99%
rename from packages/client-generator/src/emitters/package-client.ts
rename to packages/client-generator/src/emitters/client-assembly.ts
index 9e6e8a4885..a9fad30a18 100644
--- a/packages/client-generator/src/emitters/package-client.ts
+++ b/packages/client-generator/src/emitters/client-assembly.ts
@@ -9,15 +9,15 @@
 // place, so the embed arm needs none. Split mode moves the schema types + guards into
 // a sibling `<stem>.schemas.ts` the entry re-exports (`emitClientSplit`).
 
-import type {
-  ApiModel,
-  OperationModel,
-  SecuritySchemeModel,
+import {
+  allOperations,
+  type ApiModel,
+  type OperationModel,
+  type SecuritySchemeModel,
 } from '../intermediate-representation/model.js';
-import { allOperations } from '../writers/util.js';
 import { apiKeySetterName } from './auth.js';
-import { banner, type EmitOptions, HEADER, renderTitleComment } from './client.js';
 import { descriptorStatements, opsInterfaceStatements, packageIdents } from './descriptor.js';
+import { banner, type EmitOptions, HEADER, renderTitleComment } from './emit-options.js';
 import { isIdentifier } from './identifier.js';
 import { assembleInlineRuntime } from './inline-runtime.js';
 import { renderOperationAliases, sseAliases } from './operation-aliases.js';
diff --git a/packages/client-generator/src/emitters/descriptor.ts b/packages/client-generator/src/emitters/descriptor.ts
index 1046e4546c..020ff30aa6 100644
--- a/packages/client-generator/src/emitters/descriptor.ts
+++ b/packages/client-generator/src/emitters/descriptor.ts
@@ -3,15 +3,15 @@
 // descriptor map (`satisfies Record<string, OperationDescriptor>` — the semver skew
 // guard against the runtime contract in src/runtime/types.ts).
 
-import type {
-  ApiModel,
-  OperationModel,
-  SecuritySchemeModel,
+import {
+  allOperations,
+  type ApiModel,
+  type OperationModel,
+  type SecuritySchemeModel,
 } from '../intermediate-representation/model.js';
 import type { SecuritySpec } from '../runtime/types.js';
-import { allOperations } from '../writers/util.js';
 import { authSetterNames } from './auth.js';
-import { isIdentifier, uniqueIdent } from './identifier.js';
+import { uniqueIdent } from './identifier.js';
 import { variablesTypeLiteral } from './operation-aliases.js';
 import { operationSignature } from './operation-signature.js';
 import { computeResponse, errorTypeNodes, isTypedMultipart } from './operation-types.js';
@@ -19,7 +19,7 @@ import type { EmitContext } from './operations.js';
 import type { ModelPagination } from './pagination.js';
 import { isSseOp, sseDataKind, sseEventType } from './sse.js';
 import { pascalCase } from './support.js';
-import { jsdoc, parseStatements, ts } from './ts.js';
+import { jsdoc, literalExpression, parseStatements, ts } from './ts.js';
 import { type DateType, schemaToTypeNode } from './types.js';
 
 const { factory } = ts;
@@ -62,28 +62,6 @@ export function packageIdents(model: ApiModel): Map<string, string> {
   return idents;
 }
 
-/** Plain JSON value → ts.Expression (strings/numbers/booleans/null/arrays/objects). */
-export function literalExpr(value: unknown): ts.Expression {
-  if (typeof value === 'string') return factory.createStringLiteral(value);
-  if (typeof value === 'number') return factory.createNumericLiteral(value);
-  if (typeof value === 'boolean') return value ? factory.createTrue() : factory.createFalse();
-  if (value === null) return factory.createNull();
-  if (Array.isArray(value)) {
-    return factory.createArrayLiteralExpression(value.map(literalExpr), false);
-  }
-  return factory.createObjectLiteralExpression(
-    // Keys quoted only when they fail the identifier GRAMMAR — reserved words
-    // (the descriptor's `in` field) are legal bare object-literal keys.
-    Object.entries(value as Record<string, unknown>).map(([k, v]) =>
-      factory.createPropertyAssignment(
-        isIdentifier(k) ? k : factory.createStringLiteral(k),
-        literalExpr(v)
-      )
-    ),
-    false
-  );
-}
-
 /** One operation's OperationDescriptor as plain data (only non-default fields present). */
 function descriptorValue(
   op: OperationModel,
@@ -151,7 +129,7 @@ export function descriptorStatements(
   const entries = ops.map((op) =>
     factory.createPropertyAssignment(
       idents.get(op.name)!,
-      literalExpr(descriptorValue(op, model.securitySchemes, dateType, pagination))
+      literalExpression(descriptorValue(op, model.securitySchemes, dateType, pagination))
     )
   );
   const operations = jsdoc(
diff --git a/packages/client-generator/src/emitters/client.ts b/packages/client-generator/src/emitters/emit-options.ts
similarity index 96%
rename from packages/client-generator/src/emitters/client.ts
rename to packages/client-generator/src/emitters/emit-options.ts
index e9b8c6d063..376ba10b3f 100644
--- a/packages/client-generator/src/emitters/client.ts
+++ b/packages/client-generator/src/emitters/emit-options.ts
@@ -5,8 +5,8 @@ import { splitLines } from './support.js';
 import { escapeJsDoc } from './ts.js';
 import type { DateType, EnumStyle } from './types.js';
 
-// The public option vocabulary is re-exported from this composition module, so
-// writers and the package barrel import the emitter surface from one place.
+// The public option vocabulary is re-exported from this module, so generators
+// and the package barrel import the emitter surface from one place.
 export type { ArgsStyle } from './operations.js';
 
 /** The generated-by banner prepended to every emitted module. */
diff --git a/packages/client-generator/src/emitters/faker.ts b/packages/client-generator/src/emitters/faker.ts
index 1d7d738cff..f290caa2e0 100644
--- a/packages/client-generator/src/emitters/faker.ts
+++ b/packages/client-generator/src/emitters/faker.ts
@@ -16,12 +16,11 @@ import type {
   SchemaModel,
 } from '../intermediate-representation/model.js';
 import { safeIdent } from './identifier.js';
-import { constArray, ts } from './ts.js';
+import { constArray, literalExpression, ts } from './ts.js';
+import type { DateType } from './types.js';
 
 const { factory } = ts;
 
-type DateType = 'string' | 'Date';
-
 /** The faker-call expression for an IR schema. Refs resolve against `schemas`;
  *  recursion is cut with a visited-set (`null` at the cycle). `dateType` mirrors
  *  the sdk's `--date-type`: under `'Date'`, date fields stay `faker.date.recent()`
@@ -80,9 +79,9 @@ function walk(
         : objectExpr([['key', value]]);
     }
     case 'enum':
-      return call('faker.helpers.arrayElement', [constArray(schema.values.map(literal))]);
+      return call('faker.helpers.arrayElement', [constArray(schema.values.map(literalExpression))]);
     case 'literal':
-      return literal(schema.value);
+      return literalExpression(schema.value);
     case 'union': {
       // First non-cyclic member; if every member cycles, propagate `CYCLE`.
       for (const member of schema.members) {
@@ -166,10 +165,10 @@ function dateExpr(dateType: DateType, dateOnly: boolean): ts.Expression {
 function boundsArg(meta: SchemaMetadata | undefined): ts.Expression[] {
   const props: ts.PropertyAssignment[] = [];
   if (meta?.minimum !== undefined) {
-    props.push(factory.createPropertyAssignment('min', numeric(meta.minimum)));
+    props.push(factory.createPropertyAssignment('min', literalExpression(meta.minimum)));
   }
   if (meta?.maximum !== undefined) {
-    props.push(factory.createPropertyAssignment('max', numeric(meta.maximum)));
+    props.push(factory.createPropertyAssignment('max', literalExpression(meta.maximum)));
   }
   return props.length > 0 ? [factory.createObjectLiteralExpression(props, false)] : [];
 }
@@ -259,19 +258,3 @@ function dotted(path: string): ts.Expression {
 function member(target: ts.Expression, name: string): ts.PropertyAccessExpression {
   return factory.createPropertyAccessExpression(target, name);
 }
-
-/** A primitive literal value as a TS expression (negatives as a unary minus). */
-function literal(value: string | number | boolean): ts.Expression {
-  if (typeof value === 'string') return factory.createStringLiteral(value);
-  if (typeof value === 'boolean') return value ? factory.createTrue() : factory.createFalse();
-  return numeric(value);
-}
-
-function numeric(value: number): ts.Expression {
-  return value < 0
-    ? factory.createPrefixUnaryExpression(
-        ts.SyntaxKind.MinusToken,
-        factory.createNumericLiteral(-value)
-      )
-    : factory.createNumericLiteral(value);
-}
diff --git a/packages/client-generator/src/emitters/jsdoc.ts b/packages/client-generator/src/emitters/jsdoc.ts
index 0ee6d2963d..1e824fc47e 100644
--- a/packages/client-generator/src/emitters/jsdoc.ts
+++ b/packages/client-generator/src/emitters/jsdoc.ts
@@ -1,5 +1,6 @@
 import type { SchemaMetadata } from '../intermediate-representation/model.js';
 import { splitLines } from './support.js';
+import { escapeJsDoc } from './ts.js';
 
 /**
  * The JSDoc body for a description + metadata as a single `\n`-joined string,
@@ -53,7 +54,7 @@ function formatMetadata(metadata: SchemaMetadata): string[] {
   if (metadata.exclusiveMaximum !== undefined) push('exclusiveMaximum', metadata.exclusiveMaximum);
   if (metadata.minLength !== undefined) push('minLength', metadata.minLength);
   if (metadata.maxLength !== undefined) push('maxLength', metadata.maxLength);
-  if (metadata.pattern !== undefined) push('pattern', escapeForJsDoc(metadata.pattern));
+  if (metadata.pattern !== undefined) push('pattern', escapeJsDoc(metadata.pattern));
   if (metadata.minItems !== undefined) push('minItems', metadata.minItems);
   if (metadata.maxItems !== undefined) push('maxItems', metadata.maxItems);
   if (metadata.uniqueItems === true) push('uniqueItems');
@@ -62,15 +63,6 @@ function formatMetadata(metadata: SchemaMetadata): string[] {
   return lines;
 }
 
-/**
- * Escape any sequence that would prematurely close a JSDoc block. Currently we
- * only need to handle `*​/` — newlines are stripped further upstream because
- * spec-supplied strings (`pattern`, `format`) are single-line by construction.
- */
-function escapeForJsDoc(value: string): string {
-  return value.replace(/\*\//g, '*\\/');
-}
-
 function trimLines(lines: string[]): string[] {
   let start = 0;
   let end = lines.length;
diff --git a/packages/client-generator/src/emitters/mock.ts b/packages/client-generator/src/emitters/mock.ts
index 791883dcfe..c65ab1f26d 100644
--- a/packages/client-generator/src/emitters/mock.ts
+++ b/packages/client-generator/src/emitters/mock.ts
@@ -5,19 +5,21 @@
 // TypeScript literals through `ts.factory`, so the generated module depends only
 // on `msw` — the real client stays zero-dependency.
 
-import type {
-  ApiModel,
-  NamedSchemaModel,
-  OperationModel,
-  ResponseBodyModel,
-  SchemaModel,
+import { isPlainObject } from '@redocly/openapi-core';
+
+import {
+  allOperations,
+  type ApiModel,
+  type NamedSchemaModel,
+  type OperationModel,
+  type ResponseBodyModel,
+  type SchemaModel,
 } from '../intermediate-representation/model.js';
-import { allOperations } from '../writers/util.js';
 import { fakerExpression } from './faker.js';
 import { safeIdent } from './identifier.js';
 import { sampleValue, SampleExpression } from './sample.js';
 import { pascalCase } from './support.js';
-import { parseExpression, printStatements, ts } from './ts.js';
+import { literalExpression, parseExpression, printStatements, ts } from './ts.js';
 import type { DateType } from './types.js';
 
 const { factory } = ts;
@@ -404,30 +406,25 @@ function mswPath(path: string): string {
   return `*${path.replace(/\{([^{}]+)\}/g, ':$1')}`;
 }
 
-/** Recursively print a sampled JS value as a TypeScript literal expression. */
+/** Recursively print a sampled JS value as a TypeScript literal expression. Containers
+ *  stay local rather than delegating to the shared `literalExpression`: sampled trees
+ *  print multiline and may nest a `SampleExpression` at any depth. */
 function literal(value: unknown): ts.Expression {
   if (value instanceof SampleExpression) return parseExpression(value.code);
-  if (value === null) return factory.createNull();
-  if (typeof value === 'string') return factory.createStringLiteral(value);
-  if (typeof value === 'boolean') return value ? factory.createTrue() : factory.createFalse();
-  if (typeof value === 'number') {
-    return value < 0
-      ? factory.createPrefixUnaryExpression(
-          ts.SyntaxKind.MinusToken,
-          factory.createNumericLiteral(-value)
-        )
-      : factory.createNumericLiteral(value);
-  }
   if (Array.isArray(value)) {
     return factory.createArrayLiteralExpression(value.map(literal), true);
   }
-  const entries = Object.entries(value as Record<string, unknown>);
-  return factory.createObjectLiteralExpression(
-    entries.map(([key, v]) => {
-      const safe = safeIdent(key);
-      const name = safe === key ? factory.createIdentifier(key) : factory.createStringLiteral(key);
-      return factory.createPropertyAssignment(name, literal(v));
-    }),
-    true
-  );
+  if (isPlainObject(value)) {
+    const entries = Object.entries(value);
+    return factory.createObjectLiteralExpression(
+      entries.map(([key, v]) => {
+        const safe = safeIdent(key);
+        const name =
+          safe === key ? factory.createIdentifier(key) : factory.createStringLiteral(key);
+        return factory.createPropertyAssignment(name, literal(v));
+      }),
+      true
+    );
+  }
+  return literalExpression(value);
 }
diff --git a/packages/client-generator/src/emitters/operation-aliases.ts b/packages/client-generator/src/emitters/operation-aliases.ts
index b24424d8ab..1aeb4c25d9 100644
--- a/packages/client-generator/src/emitters/operation-aliases.ts
+++ b/packages/client-generator/src/emitters/operation-aliases.ts
@@ -32,7 +32,7 @@ export function renderOperationAliases(
   errorMembers: ts.TypeNode[],
   ctx: EmitContext,
   // SSE ops have no one-shot response, so they omit `*Result`/`*Error` and keep only the input
-  // aliases. (Previously done by a `.slice(1)` on the result; an explicit flag is collision-safe.)
+  // aliases.
   emitResultAndError = true,
   // Threaded to the `<Op>Variables` body — see `variablesTypeLiteral`.
   pathKeys: 'ident' | 'wire' = 'ident'
@@ -159,23 +159,13 @@ function renderVariablesAlias(
   ctx: EmitContext,
   pathKeys: 'ident' | 'wire'
 ): ts.TypeAliasDeclaration | undefined {
-  if (!hasInputs(op)) return undefined;
+  if (!operationSignature(op).hasInputs) return undefined;
   return exportType(
     name + 'Variables',
     variablesTypeLiteral(op, name, orderedPathParams, pathParamIdent, ctx, pathKeys)
   );
 }
 
-/** Whether an operation accepts any input (path/query/body/header). */
-function hasInputs(op: OperationModel): boolean {
-  return (
-    operationSignature(op).pathParams.length > 0 ||
-    op.queryParams.length > 0 ||
-    Boolean(op.requestBody) ||
-    op.headerParams.length > 0
-  );
-}
-
 /**
  * The `<Op>Variables` object type literal (the body of the alias, reused inline by the grouped
  * signature when the alias name itself collides). Each `params`/`body`/`headers` property
diff --git a/packages/client-generator/src/emitters/operation-signature.ts b/packages/client-generator/src/emitters/operation-signature.ts
index 5b3fb3ae43..2aaa7a5d8e 100644
--- a/packages/client-generator/src/emitters/operation-signature.ts
+++ b/packages/client-generator/src/emitters/operation-signature.ts
@@ -1,9 +1,7 @@
 // The shared calling-convention description for an operation. Both the sdk (which
-// emits each operation's parameter list) and the wrapper generators (tanstack-query,
-// and any future framework adapter, which emit the forwarding call) derive their
-// argument *order*, slot presence, and `<Op>Variables` naming from this one source —
-// so a flat-mode signature and its call site can never drift. Previously each side
-// recomputed this independently, kept in sync only by a "matching exactly" comment.
+// emits each operation's parameter list) and the wrapper generators (which emit the
+// forwarding call) derive their argument *order*, slot presence, and `<Op>Variables`
+// naming from this one source — so a flat-mode signature and its call site can never drift.
 
 import type { OperationModel, ParamModel } from '../intermediate-representation/model.js';
 import { uniqueIdent } from './identifier.js';
diff --git a/packages/client-generator/src/emitters/pagination.ts b/packages/client-generator/src/emitters/pagination.ts
index b36070f9d6..d7e08755a0 100644
--- a/packages/client-generator/src/emitters/pagination.ts
+++ b/packages/client-generator/src/emitters/pagination.ts
@@ -8,13 +8,13 @@
 
 import { isPlainObject } from '@redocly/openapi-core';
 
-import type {
-  ApiModel,
-  OperationModel,
-  SchemaModel,
+import {
+  allOperations,
+  type ApiModel,
+  type OperationModel,
+  type SchemaModel,
 } from '../intermediate-representation/model.js';
 import type { PaginationSpec } from '../runtime/types.js';
-import { allOperations } from '../writers/util.js';
 import { isSseOp } from './sse.js';
 
 /** The pagination styles the generated runtime can drive. */
diff --git a/packages/client-generator/src/emitters/sse.ts b/packages/client-generator/src/emitters/sse.ts
index 1483f00253..b41d70159b 100644
--- a/packages/client-generator/src/emitters/sse.ts
+++ b/packages/client-generator/src/emitters/sse.ts
@@ -23,17 +23,6 @@ export function isSseOp(op: OperationModel): boolean {
   return sseResponse(op) !== undefined;
 }
 
-/** Split operations into the regular set and the SSE set, preserving order. */
-export function partitionOps(ops: OperationModel[]): {
-  regular: OperationModel[];
-  sse: OperationModel[];
-} {
-  const regular: OperationModel[] = [];
-  const sse: OperationModel[] = [];
-  for (const op of ops) (isSseOp(op) ? sse : regular).push(op);
-  return { regular, sse };
-}
-
 /** The per-event schema: `itemSchema` → the response `schema` → undefined (typeless slots skipped). */
 function eventSchema(op: OperationModel): SchemaModel | undefined {
   const r = sseResponse(op);
diff --git a/packages/client-generator/src/emitters/support.ts b/packages/client-generator/src/emitters/support.ts
index bf4f0022bc..392ec3cadb 100644
--- a/packages/client-generator/src/emitters/support.ts
+++ b/packages/client-generator/src/emitters/support.ts
@@ -1,11 +1,4 @@
-// Low-level text helpers shared by the structural emitters (types, operations,
-// auth) and the composition layer. Private to `emitters/` — never reached by
-// writers, which see only the `ClientModules` seam.
-
-/** Join non-empty code sections with blank lines and a trailing newline. */
-export function joinSections(sections: string[]): string {
-  return sections.filter((s) => s.length > 0).join('\n\n') + '\n';
-}
+// Low-level text helpers shared across the emitters. Private to `emitters/`.
 
 /**
  * Upper-case the first character of an operation name. We don't normalize the
diff --git a/packages/client-generator/src/emitters/swr.ts b/packages/client-generator/src/emitters/swr.ts
index e5e8732396..d9d0901437 100644
--- a/packages/client-generator/src/emitters/swr.ts
+++ b/packages/client-generator/src/emitters/swr.ts
@@ -9,7 +9,6 @@
 // AST-native via `ts.factory`.
 
 import type { ApiModel, OperationModel } from '../intermediate-representation/model.js';
-import { operationSignature } from './operation-signature.js';
 import { pascalCase } from './support.js';
 import {
   arrow,
@@ -22,6 +21,8 @@ import {
   hasInputs,
   initParam,
   isQuery,
+  sdkCall,
+  sdkNamedImport,
   variablesName,
   varsParam,
   wrappableOperations,
@@ -72,38 +73,6 @@ function exportHook(
   );
 }
 
-/**
- * The forwarding call to the sdk operation function. Argument order comes from the
- * shared `operationSignature`, so it lines up with the sdk's parameter list. `grouped`
- * passes the source object (when inputs); `flat` spreads `<src>.<pathIdent>` (URL-template
- * order), then `<src>.params`/`.body`/`.headers` for the slots the op has. `init` is
- * appended last for queries (the sdk function's trailing `RequestOptions`).
- */
-function sdkCall(
-  op: OperationModel,
-  opts: SwrOptions,
-  src: string,
-  withInit: boolean
-): ts.Expression {
-  const sig = operationSignature(op);
-  const source = factory.createIdentifier(src);
-  const args: ts.Expression[] = [];
-
-  if (opts.argsStyle === 'grouped') {
-    if (sig.hasInputs) args.push(source);
-  } else {
-    for (const { ident } of sig.pathParams) {
-      args.push(factory.createPropertyAccessExpression(source, ident));
-    }
-    if (sig.hasQuery) args.push(factory.createPropertyAccessExpression(source, 'params'));
-    if (sig.hasBody) args.push(factory.createPropertyAccessExpression(source, 'body'));
-    if (sig.hasHeaders) args.push(factory.createPropertyAccessExpression(source, 'headers'));
-  }
-  if (withInit) args.push(factory.createIdentifier('init'));
-
-  return factory.createCallExpression(factory.createIdentifier(op.name), undefined, args);
-}
-
 /** A query op's `<op>Key` factory + `use<Op>` hook calling `useSWR`. */
 function queryStatements(op: OperationModel, opts: SwrOptions): ts.Statement[] {
   const inputs = hasInputs(op);
@@ -119,7 +88,7 @@ function queryStatements(op: OperationModel, opts: SwrOptions): ts.Statement[] {
   );
   const useSwr = factory.createCallExpression(factory.createIdentifier('useSWR'), undefined, [
     keyCall,
-    arrow([], sdkCall(op, opts, 'vars', true)),
+    arrow([], sdkCall(op, opts.argsStyle, 'vars', true)),
   ]);
 
   const params = inputs ? [varsParam(op), initParam()] : [initParam()];
@@ -133,7 +102,9 @@ function mutationStatement(op: OperationModel, opts: SwrOptions): ts.Statement {
 
   // `(_key: string, { arg }: { arg: <Op>Variables }) => <op>(…arg)` when the op has inputs;
   // a no-arg `() => <op>()` when it has none (`arg` would be unused).
-  const trigger = inputs ? triggerWithArg(op, opts) : arrow([], sdkCall(op, opts, 'arg', false));
+  const trigger = inputs
+    ? triggerWithArg(op, opts)
+    : arrow([], sdkCall(op, opts.argsStyle, 'arg', false));
   const useSwrMutation = factory.createCallExpression(
     factory.createIdentifier('useSWRMutation'),
     undefined,
@@ -165,14 +136,12 @@ function triggerWithArg(op: OperationModel, opts: SwrOptions): ts.ArrowFunction
       ),
     ])
   );
-  return arrow([keyParam, argParam], sdkCall(op, opts, 'arg', false));
+  return arrow([keyParam, argParam], sdkCall(op, opts.argsStyle, 'arg', false));
 }
 
 /**
  * The import header: `useSWR` from `swr` (when any query op), `useSWRMutation` from
- * `swr/mutation` (when any mutation op), and the wrapped opFns + referenced
- * `<Op>Variables` types + `RequestOptions` (when any query) from the sdk module.
- * Value specifiers then `type` specifiers, each group sorted.
+ * `swr/mutation` (when any mutation op), then the shared sdk named import.
  */
 function importHeader(
   ops: OperationModel[],
@@ -183,25 +152,7 @@ function importHeader(
   const imports: ts.Statement[] = [];
   if (hasQuery) imports.push(defaultImport('useSWR', 'swr'));
   if (hasMutation) imports.push(defaultImport('useSWRMutation', 'swr/mutation'));
-
-  const values = ops.map((op) => op.name).sort();
-  const types = ops.filter(hasInputs).map(variablesName).sort();
-  if (hasQuery) types.push('RequestOptions');
-
-  const specifiers = [
-    ...values.map((name) =>
-      factory.createImportSpecifier(false, undefined, factory.createIdentifier(name))
-    ),
-    ...types.map((name) =>
-      factory.createImportSpecifier(true, undefined, factory.createIdentifier(name))
-    ),
-  ];
-  const sdkImport = factory.createImportDeclaration(
-    undefined,
-    factory.createImportClause(false, undefined, factory.createNamedImports(specifiers)),
-    factory.createStringLiteral(opts.sdkModule)
-  );
-  imports.push(sdkImport);
+  imports.push(sdkNamedImport(ops, opts.sdkModule, hasQuery));
   return imports;
 }
 
diff --git a/packages/client-generator/src/emitters/tanstack-query.ts b/packages/client-generator/src/emitters/tanstack-query.ts
index d65b9af8d9..185a2e7137 100644
--- a/packages/client-generator/src/emitters/tanstack-query.ts
+++ b/packages/client-generator/src/emitters/tanstack-query.ts
@@ -8,7 +8,6 @@
 // generated sdk. AST-native via `ts.factory`.
 
 import type { ApiModel, OperationModel } from '../intermediate-representation/model.js';
-import { operationSignature } from './operation-signature.js';
 import {
   arrow,
   constArray,
@@ -20,7 +19,8 @@ import {
   hasInputs,
   initParam,
   isQuery,
-  variablesName,
+  sdkCall,
+  sdkNamedImport,
   varsParam,
   wrappableOperations,
 } from './wrapper-support.js';
@@ -52,34 +52,6 @@ function tanstackStatements(ops: OperationModel[], opts: TanstackOptions): ts.St
   return [...importHeader(ops, opts, hasQuery), ...statements];
 }
 
-/**
- * The forwarding call to the sdk operation function. Argument order comes from the
- * shared `operationSignature`, so it lines up with the sdk's parameter list by
- * construction. `grouped` passes `vars` (when inputs) then `init` (query only); `flat`
- * spreads `vars.<pathIdent>` (URL-template order), then `vars.params` / `vars.body` /
- * `vars.headers` for the slots the op has, then `init` (query only).
- */
-function sdkCall(op: OperationModel, opts: TanstackOptions, query: boolean): ts.Expression {
-  const sig = operationSignature(op);
-  const vars = factory.createIdentifier('vars');
-  const init = factory.createIdentifier('init');
-  const args: ts.Expression[] = [];
-
-  if (opts.argsStyle === 'grouped') {
-    if (sig.hasInputs) args.push(vars);
-  } else {
-    for (const { ident } of sig.pathParams) {
-      args.push(factory.createPropertyAccessExpression(vars, ident));
-    }
-    if (sig.hasQuery) args.push(factory.createPropertyAccessExpression(vars, 'params'));
-    if (sig.hasBody) args.push(factory.createPropertyAccessExpression(vars, 'body'));
-    if (sig.hasHeaders) args.push(factory.createPropertyAccessExpression(vars, 'headers'));
-  }
-  if (query) args.push(init);
-
-  return factory.createCallExpression(factory.createIdentifier(op.name), undefined, args);
-}
-
 /** A query op's `<op>QueryKey` + `<op>Options` statements. */
 function queryStatements(op: OperationModel, opts: TanstackOptions): ts.Statement[] {
   const inputs = hasInputs(op);
@@ -101,7 +73,10 @@ function queryStatements(op: OperationModel, opts: TanstackOptions): ts.Statemen
       factory.createObjectLiteralExpression(
         [
           factory.createPropertyAssignment('queryKey', keyCall),
-          factory.createPropertyAssignment('queryFn', arrow([], sdkCall(op, opts, true))),
+          factory.createPropertyAssignment(
+            'queryFn',
+            arrow([], sdkCall(op, opts.argsStyle, 'vars', true))
+          ),
         ],
         true
       ),
@@ -116,7 +91,10 @@ function queryStatements(op: OperationModel, opts: TanstackOptions): ts.Statemen
 /** A mutation op's `<op>Mutation` statement. */
 function mutationStatement(op: OperationModel, opts: TanstackOptions): ts.Statement {
   const inputs = hasInputs(op);
-  const mutationFn = arrow(inputs ? [varsParam(op)] : [], sdkCall(op, opts, false));
+  const mutationFn = arrow(
+    inputs ? [varsParam(op)] : [],
+    sdkCall(op, opts.argsStyle, 'vars', false)
+  );
 
   const obj = factory.createObjectLiteralExpression(
     [
@@ -135,9 +113,7 @@ function mutationStatement(op: OperationModel, opts: TanstackOptions): ts.Statem
 
 /**
  * The import header: `queryOptions` from `@tanstack/${framework}-query` (when any
- * query op), and the wrapped opFns + referenced `<Op>Variables` types + `RequestOptions`
- * (when any query) from the sdk module. Value specifiers then `type` specifiers,
- * each group sorted.
+ * query op), then the shared sdk named import.
  */
 function importHeader(
   ops: OperationModel[],
@@ -155,24 +131,6 @@ function importHeader(
     ),
     factory.createStringLiteral(`@tanstack/${opts.framework}-query`)
   );
-
-  const values = ops.map((op) => op.name).sort();
-  const types = ops.filter(hasInputs).map(variablesName).sort();
-  if (hasQuery) types.push('RequestOptions');
-
-  const specifiers = [
-    ...values.map((name) =>
-      factory.createImportSpecifier(false, undefined, factory.createIdentifier(name))
-    ),
-    ...types.map((name) =>
-      factory.createImportSpecifier(true, undefined, factory.createIdentifier(name))
-    ),
-  ];
-  const sdkImport = factory.createImportDeclaration(
-    undefined,
-    factory.createImportClause(false, undefined, factory.createNamedImports(specifiers)),
-    factory.createStringLiteral(opts.sdkModule)
-  );
-
+  const sdkImport = sdkNamedImport(ops, opts.sdkModule, hasQuery);
   return hasQuery ? [tanstack, sdkImport] : [sdkImport];
 }
diff --git a/packages/client-generator/src/emitters/ts.ts b/packages/client-generator/src/emitters/ts.ts
index 539ff72bf7..63cb570fb4 100644
--- a/packages/client-generator/src/emitters/ts.ts
+++ b/packages/client-generator/src/emitters/ts.ts
@@ -6,6 +6,8 @@
 
 import ts from 'typescript';
 
+import { isIdentifier } from './identifier.js';
+
 export { ts };
 
 const printer = ts.createPrinter({
@@ -91,7 +93,6 @@ const { factory } = ts;
  * arrays). Centralizing them keeps emitters terse and their output identical.
  */
 
-/** A `const`/`let` variable statement: `[export] const|let <name>[: type] = <init>;`. */
 /** `export const <name> = <init>;` */
 export function exportConstStatement(name: string, init: ts.Expression): ts.Statement {
   return factory.createVariableStatement(
@@ -122,3 +123,41 @@ export function constArray(elements: ts.Expression[]): ts.Expression {
     factory.createTypeReferenceNode('const')
   );
 }
+
+/**
+ * A plain JS value as a printable literal expression. Negative numbers print as
+ * a unary minus over the positive literal (a `NumericLiteral` node cannot carry
+ * the sign); arrays and objects recurse and print compact, with keys quoted only
+ * when they fail the identifier GRAMMAR — reserved words (a descriptor's `in`
+ * field) are legal bare object-literal keys. The primitive overload's narrower
+ * return type fits `factory.createLiteralTypeNode`.
+ */
+export function literalExpression(
+  value: string | number | boolean | null
+): ts.LiteralExpression | ts.BooleanLiteral | ts.NullLiteral | ts.PrefixUnaryExpression;
+export function literalExpression(value: unknown): ts.Expression;
+export function literalExpression(value: unknown): ts.Expression {
+  if (typeof value === 'string') return factory.createStringLiteral(value);
+  if (typeof value === 'boolean') return value ? factory.createTrue() : factory.createFalse();
+  if (typeof value === 'number') {
+    return value < 0
+      ? factory.createPrefixUnaryExpression(
+          ts.SyntaxKind.MinusToken,
+          factory.createNumericLiteral(-value)
+        )
+      : factory.createNumericLiteral(value);
+  }
+  if (value === null) return factory.createNull();
+  if (Array.isArray(value)) {
+    return factory.createArrayLiteralExpression(value.map(literalExpression), false);
+  }
+  return factory.createObjectLiteralExpression(
+    Object.entries(value as Record<string, unknown>).map(([key, entryValue]) =>
+      factory.createPropertyAssignment(
+        isIdentifier(key) ? key : factory.createStringLiteral(key),
+        literalExpression(entryValue)
+      )
+    ),
+    false
+  );
+}
diff --git a/packages/client-generator/src/emitters/type-guards.ts b/packages/client-generator/src/emitters/type-guards.ts
index 6f273bc52e..8b5f43e47e 100644
--- a/packages/client-generator/src/emitters/type-guards.ts
+++ b/packages/client-generator/src/emitters/type-guards.ts
@@ -34,8 +34,8 @@ type UnionSite = {
  * deduped (`is<Member>`), keeping the first in document order — so a top-level
  * union wins its nicer `value: <UnionName>` parameter over a nested re-occurrence.
  * Undiscriminated unions are skipped — TypeScript can't soundly narrow them.
+ * Returns the guard declarations as nodes (empty when no union narrows).
  */
-/** The type-guard function declarations as nodes (empty when no union narrows). */
 export function typeGuardStatements(schemas: NamedSchemaModel[]): ts.FunctionDeclaration[] {
   const byName = new Map(schemas.map((s) => [s.name, s.schema] as const));
   const nodes: ts.FunctionDeclaration[] = [];
diff --git a/packages/client-generator/src/emitters/types.ts b/packages/client-generator/src/emitters/types.ts
index 62dfe9d3c6..bd97138417 100644
--- a/packages/client-generator/src/emitters/types.ts
+++ b/packages/client-generator/src/emitters/types.ts
@@ -7,7 +7,7 @@ import type {
 } from '../intermediate-representation/model.js';
 import { isIdentifier, safeIdent } from './identifier.js';
 import { jsdocText } from './jsdoc.js';
-import { jsdoc, printNodes, ts } from './ts.js';
+import { jsdoc, literalExpression, printNodes, ts } from './ts.js';
 
 const { factory } = ts;
 
@@ -168,19 +168,6 @@ function propertyName(name: string): ts.PropertyName {
   return safe === name ? factory.createIdentifier(name) : factory.createStringLiteral(name);
 }
 
-function literalExpression(
-  value: string | number | boolean
-): ts.LiteralExpression | ts.BooleanLiteral | ts.PrefixUnaryExpression {
-  if (typeof value === 'string') return factory.createStringLiteral(value);
-  if (typeof value === 'boolean') return value ? factory.createTrue() : factory.createFalse();
-  return value < 0
-    ? factory.createPrefixUnaryExpression(
-        ts.SyntaxKind.MinusToken,
-        factory.createNumericLiteral(-value)
-      )
-    : factory.createNumericLiteral(value);
-}
-
 function scalarTypeNode(
   kind: ScalarKind,
   metadata: SchemaMetadata | undefined,
diff --git a/packages/client-generator/src/emitters/wrapper-support.ts b/packages/client-generator/src/emitters/wrapper-support.ts
index 857ea4a601..4f5f2644da 100644
--- a/packages/client-generator/src/emitters/wrapper-support.ts
+++ b/packages/client-generator/src/emitters/wrapper-support.ts
@@ -89,3 +89,65 @@ export function initParam(): ts.ParameterDeclaration {
     factory.createTypeReferenceNode('RequestOptions')
   );
 }
+
+/**
+ * The forwarding call to the sdk operation function. Argument order comes from the
+ * shared `operationSignature`, so it lines up with the sdk's parameter list by
+ * construction. `grouped` passes the source object (when inputs); `flat` spreads
+ * `<source>.<pathIdent>` (URL-template order), then `<source>.params` / `.body` /
+ * `.headers` for the slots the op has. `init` is appended last when `withInit`
+ * (the sdk function's trailing `RequestOptions`).
+ */
+export function sdkCall(
+  op: OperationModel,
+  argsStyle: 'flat' | 'grouped',
+  source: string,
+  withInit: boolean
+): ts.Expression {
+  const sig = operationSignature(op);
+  const sourceIdent = factory.createIdentifier(source);
+  const args: ts.Expression[] = [];
+
+  if (argsStyle === 'grouped') {
+    if (sig.hasInputs) args.push(sourceIdent);
+  } else {
+    for (const { ident } of sig.pathParams) {
+      args.push(factory.createPropertyAccessExpression(sourceIdent, ident));
+    }
+    if (sig.hasQuery) args.push(factory.createPropertyAccessExpression(sourceIdent, 'params'));
+    if (sig.hasBody) args.push(factory.createPropertyAccessExpression(sourceIdent, 'body'));
+    if (sig.hasHeaders) args.push(factory.createPropertyAccessExpression(sourceIdent, 'headers'));
+  }
+  if (withInit) args.push(factory.createIdentifier('init'));
+
+  return factory.createCallExpression(factory.createIdentifier(op.name), undefined, args);
+}
+
+/**
+ * The named import from the sdk module: the wrapped opFns as value specifiers, then
+ * the referenced `<Op>Variables` types + `RequestOptions` (when any query op) as
+ * `type` specifiers, each group sorted.
+ */
+export function sdkNamedImport(
+  ops: OperationModel[],
+  sdkModule: string,
+  hasQuery: boolean
+): ts.Statement {
+  const values = ops.map((op) => op.name).sort();
+  const types = ops.filter(hasInputs).map(variablesName).sort();
+  if (hasQuery) types.push('RequestOptions');
+
+  const specifiers = [
+    ...values.map((name) =>
+      factory.createImportSpecifier(false, undefined, factory.createIdentifier(name))
+    ),
+    ...types.map((name) =>
+      factory.createImportSpecifier(true, undefined, factory.createIdentifier(name))
+    ),
+  ];
+  return factory.createImportDeclaration(
+    undefined,
+    factory.createImportClause(false, undefined, factory.createNamedImports(specifiers)),
+    factory.createStringLiteral(sdkModule)
+  );
+}
diff --git a/packages/client-generator/src/emitters/zod.ts b/packages/client-generator/src/emitters/zod.ts
index 713e933a95..db41643ae4 100644
--- a/packages/client-generator/src/emitters/zod.ts
+++ b/packages/client-generator/src/emitters/zod.ts
@@ -9,19 +9,19 @@
 // between major versions and are deferred. Refs become `z.lazy(() => …Schema)`,
 // which sidesteps declaration ordering and recursion uniformly.
 
-import type {
-  ApiModel,
-  NamedSchemaModel,
-  PropertyModel,
-  ScalarKind,
-  SchemaMetadata,
-  SchemaModel,
+import {
+  allOperations,
+  type ApiModel,
+  type NamedSchemaModel,
+  type PropertyModel,
+  type ScalarKind,
+  type SchemaMetadata,
+  type SchemaModel,
 } from '../intermediate-representation/model.js';
-import { allOperations } from '../writers/util.js';
 import { safeIdent } from './identifier.js';
 import { isSseOp } from './sse.js';
 import { pascalCase } from './support.js';
-import { jsdoc, printStatements, ts } from './ts.js';
+import { jsdoc, literalExpression, printStatements, ts } from './ts.js';
 
 const { factory } = ts;
 
@@ -49,21 +49,6 @@ function chain(expr: ts.Expression, method: string, args: ts.Expression[] = []):
   );
 }
 
-function numberLiteral(value: number): ts.Expression {
-  return value < 0
-    ? factory.createPrefixUnaryExpression(
-        ts.SyntaxKind.MinusToken,
-        factory.createNumericLiteral(-value)
-      )
-    : factory.createNumericLiteral(value);
-}
-
-function literalExpression(value: string | number | boolean): ts.Expression {
-  if (typeof value === 'string') return factory.createStringLiteral(value);
-  if (typeof value === 'boolean') return value ? factory.createTrue() : factory.createFalse();
-  return numberLiteral(value);
-}
-
 type SchemaByName = ReadonlyMap<string, SchemaModel>;
 
 const NO_SCHEMAS: SchemaByName = new Map();
@@ -251,26 +236,28 @@ function withRefinements(expr: ts.Expression, schema: SchemaModel): ts.Expressio
   if (!m) return expr;
   let out = expr;
   if (schema.kind === 'scalar' && schema.scalar === 'string') {
-    if (m.minLength !== undefined) out = chain(out, 'min', [numberLiteral(m.minLength)]);
-    if (m.maxLength !== undefined) out = chain(out, 'max', [numberLiteral(m.maxLength)]);
+    if (m.minLength !== undefined) out = chain(out, 'min', [literalExpression(m.minLength)]);
+    if (m.maxLength !== undefined) out = chain(out, 'max', [literalExpression(m.maxLength)]);
     if (m.pattern !== undefined) out = chain(out, 'regex', [regexExpression(m.pattern)]);
   }
   if (schema.kind === 'scalar' && (schema.scalar === 'number' || schema.scalar === 'integer')) {
     out = numericRefinements(out, m);
   }
   if (schema.kind === 'array') {
-    if (m.minItems !== undefined) out = chain(out, 'min', [numberLiteral(m.minItems)]);
-    if (m.maxItems !== undefined) out = chain(out, 'max', [numberLiteral(m.maxItems)]);
+    if (m.minItems !== undefined) out = chain(out, 'min', [literalExpression(m.minItems)]);
+    if (m.maxItems !== undefined) out = chain(out, 'max', [literalExpression(m.maxItems)]);
   }
   return out;
 }
 
 function numericRefinements(expr: ts.Expression, m: SchemaMetadata): ts.Expression {
   let out = expr;
-  if (m.minimum !== undefined) out = chain(out, 'min', [numberLiteral(m.minimum)]);
-  if (m.maximum !== undefined) out = chain(out, 'max', [numberLiteral(m.maximum)]);
-  if (m.exclusiveMinimum !== undefined) out = chain(out, 'gt', [numberLiteral(m.exclusiveMinimum)]);
-  if (m.exclusiveMaximum !== undefined) out = chain(out, 'lt', [numberLiteral(m.exclusiveMaximum)]);
+  if (m.minimum !== undefined) out = chain(out, 'min', [literalExpression(m.minimum)]);
+  if (m.maximum !== undefined) out = chain(out, 'max', [literalExpression(m.maximum)]);
+  if (m.exclusiveMinimum !== undefined)
+    out = chain(out, 'gt', [literalExpression(m.exclusiveMinimum)]);
+  if (m.exclusiveMaximum !== undefined)
+    out = chain(out, 'lt', [literalExpression(m.exclusiveMaximum)]);
   return out;
 }
 
diff --git a/packages/client-generator/src/generators/__tests__/index.test.ts b/packages/client-generator/src/generators/__tests__/index.test.ts
index 4762636fdb..3291e77510 100644
--- a/packages/client-generator/src/generators/__tests__/index.test.ts
+++ b/packages/client-generator/src/generators/__tests__/index.test.ts
@@ -1,19 +1,19 @@
 import { NotSupportedError } from '../../errors.js';
-import { builtinGenerators, getGenerator, validateGenerators } from '../index.js';
+import { builtinGenerators, validateGenerators } from '../index.js';
 import { sdkGenerator } from '../sdk.js';
 import { zodGenerator } from '../zod.js';
 
-describe('getGenerator', () => {
-  it('returns the sdk generator descriptor', () => {
-    expect(getGenerator('sdk').run).toBe(sdkGenerator);
+describe('builtinGenerators', () => {
+  it('registers the sdk generator descriptor', () => {
+    expect(builtinGenerators().get('sdk')?.run).toBe(sdkGenerator);
   });
 
-  it('returns the zod generator descriptor', () => {
-    expect(getGenerator('zod').run).toBe(zodGenerator);
+  it('registers the zod generator descriptor', () => {
+    expect(builtinGenerators().get('zod')?.run).toBe(zodGenerator);
   });
 
-  it('throws NotSupportedError for an unknown generator name', () => {
-    expect(() => getGenerator('nope' as never)).toThrow(NotSupportedError);
+  it('has no entry for an unknown generator name', () => {
+    expect(builtinGenerators().has('nope')).toBe(false);
   });
 });
 
@@ -62,9 +62,9 @@ describe('validateGenerators', () => {
 
 describe('swr generator', () => {
   it('is registered and requires sdk', () => {
-    const descriptor = getGenerator('swr');
-    expect(descriptor.run).toBeDefined();
-    expect(descriptor.requires).toContain('sdk');
+    const descriptor = builtinGenerators().get('swr');
+    expect(descriptor?.run).toBeDefined();
+    expect(descriptor?.requires).toContain('sdk');
   });
 
   it('accepts sdk + swr with the default error-mode', () => {
@@ -106,8 +106,7 @@ describe('validateGenerators — runtime compatibility', () => {
 
 describe('mock generator', () => {
   it('is registered and requires sdk', () => {
-    const descriptor = getGenerator('mock');
-    expect(descriptor.requires).toContain('sdk');
+    expect(builtinGenerators().get('mock')?.requires).toContain('sdk');
   });
 
   it('validateGenerators accepts sdk + mock', () => {
diff --git a/packages/client-generator/src/generators/__tests__/sdk.test.ts b/packages/client-generator/src/generators/__tests__/sdk.test.ts
index 38c4b2961c..2159408689 100644
--- a/packages/client-generator/src/generators/__tests__/sdk.test.ts
+++ b/packages/client-generator/src/generators/__tests__/sdk.test.ts
@@ -1,5 +1,5 @@
+import { HEADER } from '../../emitters/emit-options.js';
 import type { ApiModel } from '../../intermediate-representation/model.js';
-import { getWriter } from '../../writers/index.js';
 import { sdkGenerator } from '../sdk.js';
 
 function apiModel(): ApiModel {
@@ -32,12 +32,16 @@ function apiModel(): ApiModel {
 }
 
 describe('sdkGenerator', () => {
-  it('produces byte-identical output to the writer it wraps (single mode)', () => {
-    const model = apiModel();
-    const input = { model, outputPath: '/out/api.ts', outputMode: 'single' as const, emit: {} };
-    const viaGenerator = sdkGenerator(input);
-    const viaWriter = getWriter('single')({ model, outputPath: '/out/api.ts', emit: {} });
-    expect(viaGenerator).toEqual(viaWriter);
+  it('writes the whole client to the output path in single mode', () => {
+    const files = sdkGenerator({
+      model: apiModel(),
+      outputPath: '/out/api.ts',
+      outputMode: 'single',
+      emit: {},
+    });
+    expect(files.map((file) => file.path)).toEqual(['/out/api.ts']);
+    expect(files[0].content.startsWith(HEADER)).toBe(true);
+    expect(files[0].content).toContain('export const client =');
   });
 
   it('honors the output mode (split carves the schemas into a sibling file)', () => {
diff --git a/packages/client-generator/src/generators/__tests__/swr.test.ts b/packages/client-generator/src/generators/__tests__/swr.test.ts
index 5761ec8a30..0af00c52f6 100644
--- a/packages/client-generator/src/generators/__tests__/swr.test.ts
+++ b/packages/client-generator/src/generators/__tests__/swr.test.ts
@@ -1,5 +1,5 @@
 import { apiModel, operation } from '../../emitters/__tests__/fixtures.js';
-import { getGenerator } from '../index.js';
+import { builtinGenerators } from '../index.js';
 import { swrGenerator } from '../swr.js';
 
 const SERVICES = [
@@ -41,6 +41,6 @@ describe('swrGenerator', () => {
   });
 
   it('is registered under "swr"', () => {
-    expect(getGenerator('swr').run).toBe(swrGenerator);
+    expect(builtinGenerators().get('swr')?.run).toBe(swrGenerator);
   });
 });
diff --git a/packages/client-generator/src/generators/__tests__/tanstack-query.test.ts b/packages/client-generator/src/generators/__tests__/tanstack-query.test.ts
index e4d968d43a..6300648c26 100644
--- a/packages/client-generator/src/generators/__tests__/tanstack-query.test.ts
+++ b/packages/client-generator/src/generators/__tests__/tanstack-query.test.ts
@@ -1,5 +1,5 @@
 import { apiModel, operation } from '../../emitters/__tests__/fixtures.js';
-import { getGenerator } from '../index.js';
+import { builtinGenerators } from '../index.js';
 import { tanstackQueryGenerator } from '../tanstack-query.js';
 
 const SERVICES = [
@@ -50,6 +50,6 @@ describe('tanstackQueryGenerator', () => {
   });
 
   it('is registered under "tanstack-query"', () => {
-    expect(getGenerator('tanstack-query').run).toBe(tanstackQueryGenerator);
+    expect(builtinGenerators().get('tanstack-query')?.run).toBe(tanstackQueryGenerator);
   });
 });
diff --git a/packages/client-generator/src/generators/__tests__/transformers.test.ts b/packages/client-generator/src/generators/__tests__/transformers.test.ts
index 617c57d92c..3746089bf2 100644
--- a/packages/client-generator/src/generators/__tests__/transformers.test.ts
+++ b/packages/client-generator/src/generators/__tests__/transformers.test.ts
@@ -1,5 +1,5 @@
 import { apiModel, namedSchema } from '../../emitters/__tests__/fixtures.js';
-import { getGenerator } from '../index.js';
+import { builtinGenerators } from '../index.js';
 import { transformersGenerator } from '../transformers.js';
 
 const EVENT = namedSchema('Event', {
@@ -46,6 +46,6 @@ describe('transformersGenerator', () => {
   });
 
   it('is registered under "transformers"', () => {
-    expect(getGenerator('transformers').run).toBe(transformersGenerator);
+    expect(builtinGenerators().get('transformers')?.run).toBe(transformersGenerator);
   });
 });
diff --git a/packages/client-generator/src/generators/anchor.ts b/packages/client-generator/src/generators/anchor.ts
new file mode 100644
index 0000000000..ca629642b6
--- /dev/null
+++ b/packages/client-generator/src/generators/anchor.ts
@@ -0,0 +1,10 @@
+import { parse } from 'node:path';
+
+/**
+ * Derive the directory and base name (stem, without `.ts`) from the `--output`
+ * anchor path. Generators build sibling-file paths from these.
+ */
+export function anchor(outputPath: string): { dir: string; stem: string } {
+  const { dir, name } = parse(outputPath);
+  return { dir, stem: name };
+}
diff --git a/packages/client-generator/src/generators/index.ts b/packages/client-generator/src/generators/index.ts
index 051fed6e2a..538a321687 100644
--- a/packages/client-generator/src/generators/index.ts
+++ b/packages/client-generator/src/generators/index.ts
@@ -1,4 +1,4 @@
-import type { EmitOptions } from '../emitters/client.js';
+import type { EmitOptions } from '../emitters/emit-options.js';
 import { NotSupportedError } from '../errors.js';
 import { mockGenerator } from './mock.js';
 import { sdkGenerator } from './sdk.js';
@@ -32,15 +32,6 @@ const GENERATORS: Record<GeneratorName, GeneratorDescriptor> = {
   mock: { run: mockGenerator, requires: ['sdk'] },
 };
 
-/** Select a first-party generator by name. Mirrors `getWriter(outputMode)`. */
-export function getGenerator(name: GeneratorName): GeneratorDescriptor {
-  const generator = GENERATORS[name];
-  if (!generator) {
-    throw new NotSupportedError(`Unknown generator: ${name}`);
-  }
-  return generator;
-}
-
 /**
  * A fresh registry of the built-in generators keyed by name. The plugin resolver seeds from this
  * and adds custom generators to the copy, so mutating the result never affects the built-in table.
diff --git a/packages/client-generator/src/generators/mock.ts b/packages/client-generator/src/generators/mock.ts
index 591c2bd891..3d37f6052f 100644
--- a/packages/client-generator/src/generators/mock.ts
+++ b/packages/client-generator/src/generators/mock.ts
@@ -1,8 +1,8 @@
 import { join } from 'node:path';
 
-import { HEADER } from '../emitters/client.js';
+import { HEADER } from '../emitters/emit-options.js';
 import { renderMockModule } from '../emitters/mock.js';
-import { anchor } from '../writers/util.js';
+import { anchor } from './anchor.js';
 import type { Generator } from './types.js';
 
 /**
diff --git a/packages/client-generator/src/generators/sdk.ts b/packages/client-generator/src/generators/sdk.ts
index 1500a21b97..8e60e0a329 100644
--- a/packages/client-generator/src/generators/sdk.ts
+++ b/packages/client-generator/src/generators/sdk.ts
@@ -1,11 +1,28 @@
-import { getWriter } from '../writers/index.js';
+import { join } from 'node:path';
+
+import { emitClientSingleFile, emitClientSplit } from '../emitters/client-assembly.js';
+import { anchor } from './anchor.js';
 import type { Generator } from './types.js';
 
 /**
  * The default generator: the full typed client (model types + runtime + endpoints).
- * Delegates to the output-mode writer, so its bytes are identical to the pre-registry
- * pipeline. Other generators (zod, framework hooks) emit *additional* files alongside.
+ * Other generators (zod, framework hooks) emit *additional* files alongside.
+ *
+ * `single` mode writes the whole client to the `--output` path. `split` mode derives
+ * two sibling files from that anchor — `<stem>.schemas.ts` (model types, enums,
+ * const-objects, type guards; skipped when the document declares no schemas) and
+ * `<stem>.ts` (everything else, which `export *`s the schemas module).
  */
 export const sdkGenerator: Generator = ({ model, outputPath, outputMode, emit }) => {
-  return getWriter(outputMode)({ model, outputPath, emit });
+  if (outputMode === 'split') {
+    const { dir, stem } = anchor(outputPath);
+    const { entry, schemas } = emitClientSplit(model, emit, stem);
+    return [
+      ...(schemas === undefined
+        ? []
+        : [{ path: join(dir, `${stem}.schemas.ts`), content: schemas }]),
+      { path: outputPath, content: entry },
+    ];
+  }
+  return [{ path: outputPath, content: emitClientSingleFile(model, emit) }];
 };
diff --git a/packages/client-generator/src/generators/swr.ts b/packages/client-generator/src/generators/swr.ts
index 8dba1b06f3..6f62808867 100644
--- a/packages/client-generator/src/generators/swr.ts
+++ b/packages/client-generator/src/generators/swr.ts
@@ -1,8 +1,8 @@
 import { join } from 'node:path';
 
-import { HEADER } from '../emitters/client.js';
+import { HEADER } from '../emitters/emit-options.js';
 import { renderSwrModule } from '../emitters/swr.js';
-import { anchor } from '../writers/util.js';
+import { anchor } from './anchor.js';
 import type { Generator } from './types.js';
 
 /**
diff --git a/packages/client-generator/src/generators/tanstack-query.ts b/packages/client-generator/src/generators/tanstack-query.ts
index 124fa3954c..f080385c85 100644
--- a/packages/client-generator/src/generators/tanstack-query.ts
+++ b/packages/client-generator/src/generators/tanstack-query.ts
@@ -1,8 +1,8 @@
 import { join } from 'node:path';
 
-import { HEADER } from '../emitters/client.js';
+import { HEADER } from '../emitters/emit-options.js';
 import { renderTanstackModule } from '../emitters/tanstack-query.js';
-import { anchor } from '../writers/util.js';
+import { anchor } from './anchor.js';
 import type { Generator } from './types.js';
 
 /**
diff --git a/packages/client-generator/src/generators/transformers.ts b/packages/client-generator/src/generators/transformers.ts
index 108603dafa..13044b57c0 100644
--- a/packages/client-generator/src/generators/transformers.ts
+++ b/packages/client-generator/src/generators/transformers.ts
@@ -1,8 +1,8 @@
 import { join } from 'node:path';
 
-import { HEADER } from '../emitters/client.js';
+import { HEADER } from '../emitters/emit-options.js';
 import { renderTransformersModule } from '../emitters/transformers.js';
-import { anchor } from '../writers/util.js';
+import { anchor } from './anchor.js';
 import type { Generator } from './types.js';
 
 /**
diff --git a/packages/client-generator/src/generators/types.ts b/packages/client-generator/src/generators/types.ts
index c1f730f261..31b3ec14d4 100644
--- a/packages/client-generator/src/generators/types.ts
+++ b/packages/client-generator/src/generators/types.ts
@@ -1,11 +1,22 @@
 // packages/client-generator/src/generators/types.ts
-import type { EmitOptions } from '../emitters/client.js';
+import type { EmitOptions } from '../emitters/emit-options.js';
 import type { ErrorMode } from '../emitters/operations.js';
 import type { DateType } from '../emitters/types.js';
 import type { ApiModel } from '../intermediate-representation/model.js';
-import type { GeneratedFile, OutputMode } from '../writers/types.js';
 
-/** The first-party generators the registry knows. Extends as P5 lands (react-query, …). */
+/**
+ * How the generated client is partitioned across files.
+ *
+ * - `single` (default): one self-contained file.
+ * - `split`: schema types + guards in a sibling `<stem>.schemas.ts`; everything
+ *   else in the entry file, which re-exports the schemas module.
+ */
+export type OutputMode = 'single' | 'split';
+
+/** A single file the generator will write to disk. */
+export type GeneratedFile = { path: string; content: string };
+
+/** The first-party generators the registry knows. */
 export type GeneratorName = 'sdk' | 'zod' | 'tanstack-query' | 'swr' | 'transformers' | 'mock';
 
 /** Everything a generator needs to produce its files. */
@@ -20,9 +31,9 @@ export type GeneratorInput = {
 };
 
 /**
- * A Generator turns the IR + options into a set of files. This is the seam new
- * capabilities (zod, framework hooks) plug into — each is a deep module behind a
- * name in the registry. First-party only in P1; no public plugin API yet.
+ * A Generator turns the IR + options into a set of files. Each lives behind a
+ * name in the registry — the built-ins, plus custom generators registered
+ * through the plugin API (see `CustomGenerator`).
  */
 export type Generator = (input: GeneratorInput) => GeneratedFile[];
 
diff --git a/packages/client-generator/src/generators/zod.ts b/packages/client-generator/src/generators/zod.ts
index 9f8bd8be65..2c93b5fa97 100644
--- a/packages/client-generator/src/generators/zod.ts
+++ b/packages/client-generator/src/generators/zod.ts
@@ -1,8 +1,8 @@
 import { join } from 'node:path';
 
-import { HEADER } from '../emitters/client.js';
+import { HEADER } from '../emitters/emit-options.js';
 import { renderZodModule } from '../emitters/zod.js';
-import { anchor } from '../writers/util.js';
+import { anchor } from './anchor.js';
 import type { Generator } from './types.js';
 
 /**
diff --git a/packages/client-generator/src/index.ts b/packages/client-generator/src/index.ts
index 4a4ea32814..c1822480c5 100644
--- a/packages/client-generator/src/index.ts
+++ b/packages/client-generator/src/index.ts
@@ -1,18 +1,17 @@
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import { dirname, resolve } from 'node:path';
 
-import type { EmitOptions } from './emitters/client.js';
+import type { EmitOptions } from './emitters/emit-options.js';
 import { bakeSetup } from './emitters/setup-bake.js';
 import { NotSupportedError } from './errors.js';
 import { builtinGenerators, validateGenerators } from './generators/index.js';
 import { resolveGenerators } from './generators/resolve.js';
-import type { GeneratorDescriptor } from './generators/types.js';
+import type { GeneratedFile, GeneratorDescriptor, OutputMode } from './generators/types.js';
 import { buildApiModel } from './intermediate-representation/build.js';
 import type { ApiModel } from './intermediate-representation/model.js';
 import { normalizeSwagger2 } from './intermediate-representation/normalize-swagger2.js';
 import { loadSpec } from './loader.js';
 import type { GenerateClientOptions, GenerateClientResult } from './types.js';
-import type { GeneratedFile, OutputMode } from './writers/types.js';
 
 export { NotSupportedError } from './errors.js';
 export { defineClientSetup } from './runtime-contract.js';
diff --git a/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts b/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
index 75b17fe168..b787a0340a 100644
--- a/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
+++ b/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
@@ -1,4 +1,4 @@
-import type { Oas3Definition, Oas3Schema } from '@redocly/openapi-core';
+import { logger, type Oas3Definition, type Oas3Schema } from '@redocly/openapi-core';
 
 import { NotSupportedError } from '../../errors.js';
 import { buildApiModel } from '../build.js';
@@ -278,7 +278,6 @@ describe('buildOperation — param paths', () => {
               { name: 'p', in: 'path', required: true, schema: { type: 'string' } },
               { name: 'q', in: 'query', schema: { type: 'string' } },
               { name: 'X-Tok', in: 'header', schema: { type: 'string' } },
-              { name: 'c', in: 'cookie', schema: { type: 'string' } },
             ] as never,
             responses: {},
           },
@@ -290,6 +289,34 @@ describe('buildOperation — param paths', () => {
     expect(op.headerParams.map((p) => p.name)).toEqual(['X-Tok']);
   });
 
+  it('drops cookie parameters with a warning naming the operation and parameter', () => {
+    const warn = vi.spyOn(logger, 'warn').mockImplementation(() => {});
+    try {
+      const op = buildOpOnly({
+        paths: {
+          '/orders/{id}': {
+            get: {
+              operationId: 'getOrder',
+              parameters: [
+                { name: 'id', in: 'path', required: true, schema: { type: 'string' } },
+                { name: 'sid', in: 'cookie', schema: { type: 'string' } },
+              ] as never,
+              responses: {},
+            },
+          } as never,
+        },
+      });
+      expect(op.pathParams.map((p) => p.name)).toEqual(['id']);
+      expect(op.queryParams).toEqual([]);
+      expect(op.headerParams).toEqual([]);
+      expect(warn).toHaveBeenCalledWith(
+        'generate-client: skipped cookie parameter(s) "sid" on operation "getOrder" — cookie parameters are not supported.\n'
+      );
+    } finally {
+      warn.mockRestore();
+    }
+  });
+
   it('resolves a $ref requestBody', () => {
     const op = buildOpOnly({
       paths: {
diff --git a/packages/client-generator/src/intermediate-representation/build.ts b/packages/client-generator/src/intermediate-representation/build.ts
index 95106157e0..b046a2a14e 100644
--- a/packages/client-generator/src/intermediate-representation/build.ts
+++ b/packages/client-generator/src/intermediate-representation/build.ts
@@ -1,5 +1,7 @@
 import {
   isPlainObject,
+  isRef,
+  logger,
   type Oas3Definition,
   type Oas3MediaType,
   type Oas3Operation,
@@ -46,10 +48,6 @@ type HttpMethod = (typeof HTTP_METHODS)[number];
 
 type Referenced<T> = T | { $ref: string };
 
-function isRef<T>(value: Referenced<T> | undefined | null): value is { $ref: string } {
-  return isPlainObject(value) && '$ref' in value;
-}
-
 function resolveRef<T>(doc: Oas3Definition, ref: string): T {
   if (!ref.startsWith('#/')) {
     throw new NotSupportedError(`External $ref not supported: ${ref}`);
@@ -492,6 +490,17 @@ function buildOperation(
   const queryParams = allParams.filter((p) => p.in === 'query');
   const headerParams = allParams.filter((p) => p.in === 'header');
 
+  // Browsers own the Cookie header, so the generated client cannot set cookie
+  // params — drop them, but tell the user instead of vanishing them silently.
+  const cookieParams = allParams.filter((p) => p.in === 'cookie');
+  if (cookieParams.length > 0) {
+    logger.warn(
+      `generate-client: skipped cookie parameter(s) ${cookieParams
+        .map((p) => `"${p.name}"`)
+        .join(', ')} on operation "${name}" — cookie parameters are not supported.\n`
+    );
+  }
+
   const requestBody = operation.requestBody
     ? buildRequestBody(deref(doc, operation.requestBody), `${method} ${path}`, doc)
     : undefined;
diff --git a/packages/client-generator/src/intermediate-representation/model.ts b/packages/client-generator/src/intermediate-representation/model.ts
index 50eb47bde3..46d45affd0 100644
--- a/packages/client-generator/src/intermediate-representation/model.ts
+++ b/packages/client-generator/src/intermediate-representation/model.ts
@@ -110,6 +110,11 @@ export type PropertyModel = {
 
 export type ParamModel = {
   name: string;
+  /**
+   * `'cookie'` exists only inside the builder: cookie parameters are dropped
+   * (with a warning) before the operation model is assembled, so a built
+   * `ApiModel` never carries one.
+   */
   in: 'path' | 'query' | 'header' | 'cookie';
   schema: SchemaModel;
   required: boolean;
@@ -232,3 +237,10 @@ export type ApiModel = {
   schemas: NamedSchemaModel[];
   securitySchemes: SecuritySchemeModel[];
 };
+
+/** All operations across the model's services, flattened. */
+export function allOperations(
+  operationsByService: { operations: OperationModel[] }[]
+): OperationModel[] {
+  return operationsByService.flatMap((service) => service.operations);
+}
diff --git a/packages/client-generator/src/loader.ts b/packages/client-generator/src/loader.ts
index 65566ed61f..74d8f27ea3 100644
--- a/packages/client-generator/src/loader.ts
+++ b/packages/client-generator/src/loader.ts
@@ -18,8 +18,5 @@ export async function loadSpec(ref: string, config?: Config): Promise<LoadResult
   return {
     document: parsed as unknown as Oas3Definition,
     version: detectSpec(parsed),
-    // The entry plus every external `$ref` target the resolver read (absolute fs paths;
-    // remote refs appear as URLs).
-    fileDependencies: result.fileDependencies,
   };
 }
diff --git a/packages/client-generator/src/plugin.ts b/packages/client-generator/src/plugin.ts
index a408b54933..59ab79dff2 100644
--- a/packages/client-generator/src/plugin.ts
+++ b/packages/client-generator/src/plugin.ts
@@ -39,11 +39,12 @@ export function defineGenerator(generator: CustomGenerator): CustomGenerator {
 // --- The authoring contract + the data a generator receives -----------------------------------
 export type {
   CustomGenerator,
+  GeneratedFile,
   Generator,
   GeneratorInput,
   GeneratorName,
+  OutputMode,
 } from './generators/types.js';
-export type { GeneratedFile, OutputMode } from './writers/types.js';
 export type { ArgsStyle, ErrorMode } from './emitters/operations.js';
 export type { DateType } from './emitters/types.js';
 
diff --git a/packages/client-generator/src/types.ts b/packages/client-generator/src/types.ts
index af8831ac38..ae1306e162 100644
--- a/packages/client-generator/src/types.ts
+++ b/packages/client-generator/src/types.ts
@@ -1,9 +1,8 @@
 import type { Config as RedoclyConfig, Oas3Definition, detectSpec } from '@redocly/openapi-core';
 
-import type { ArgsStyle } from './emitters/client.js';
+import type { ArgsStyle } from './emitters/emit-options.js';
 import type { PaginationConfig } from './emitters/pagination.js';
-import type { CustomGenerator } from './generators/types.js';
-import type { OutputMode } from './writers/types.js';
+import type { CustomGenerator, OutputMode } from './generators/types.js';
 
 export type GenerateClientOptions = {
   /** Path or URL to the OpenAPI document (or an `apis:` alias from `redocly.yaml`). */
@@ -116,9 +115,4 @@ export type LoadResult = {
   document: Oas3Definition;
   /** The detected input spec version (e.g. 'oas2', 'oas3_0', 'oas3_1', 'oas3_2'). */
   version: ReturnType<typeof detectSpec>;
-  /**
-   * Every source that contributed to the bundle — the entry document plus all external `$ref`
-   * targets, as absolute filesystem paths (remote `$ref`s appear as `http(s)://` URLs).
-   */
-  fileDependencies: Set<string>;
 };
diff --git a/packages/client-generator/src/writers/__tests__/index.test.ts b/packages/client-generator/src/writers/__tests__/index.test.ts
deleted file mode 100644
index 71c861ae70..0000000000
--- a/packages/client-generator/src/writers/__tests__/index.test.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import type { ApiModel } from '../../intermediate-representation/model.js';
-import { getWriter } from '../index.js';
-import { singleFileWriter } from '../single-file-writer.js';
-import { splitWriter } from '../split-writer.js';
-
-const model: ApiModel = {
-  title: 'Tiny',
-  version: '1.0.0',
-  serverUrl: 'https://api.example.com',
-  services: [
-    {
-      name: 'Default',
-      operations: [
-        {
-          name: 'ping',
-          method: 'get',
-          path: '/ping',
-          pathParams: [],
-          queryParams: [],
-          headerParams: [],
-          successResponses: [],
-          errorResponses: [],
-          security: [],
-          tags: [],
-        },
-      ],
-    },
-  ],
-  schemas: [],
-  securitySchemes: [],
-};
-
-describe('getWriter', () => {
-  it('returns the single-file writer for the `single` mode', () => {
-    expect(getWriter('single')).toBe(singleFileWriter);
-  });
-
-  it('returns the split writer for the `split` mode', () => {
-    expect(getWriter('split')).toBe(splitWriter);
-  });
-});
-
-describe('singleFileWriter', () => {
-  it('produces exactly one file at the output path containing the client', () => {
-    const files = singleFileWriter({
-      model,
-      outputPath: '/out/api.ts',
-      emit: {},
-    });
-    expect(files).toHaveLength(1);
-    expect(files[0].path).toBe('/out/api.ts');
-    expect(files[0].content).toContain('// Generated by @redocly/client-generator');
-    // The default (inline) arm embeds the runtime and wires the descriptor client.
-    expect(files[0].content).toContain('// ─── Embedded runtime');
-    expect(files[0].content).toContain(
-      'export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS,'
-    );
-    expect(files[0].content).toContain('export const ping = (init: RequestOptions = {})');
-  });
-
-  it('emits the package import instead of the embedded runtime for runtime: package', () => {
-    const files = singleFileWriter({
-      model,
-      outputPath: '/out/api.ts',
-      emit: { runtime: 'package' },
-    });
-    expect(files).toHaveLength(1);
-    expect(files[0].content).toContain("from '@redocly/client-generator'");
-    expect(files[0].content).not.toContain('// ─── Embedded runtime');
-    // An explicit `inline` embeds.
-    const inline = singleFileWriter({
-      model,
-      outputPath: '/out/api.ts',
-      emit: { runtime: 'inline' },
-    });
-    expect(inline[0].content).toContain('// ─── Embedded runtime');
-    expect(inline[0].content).not.toContain("from '@redocly/client-generator'");
-  });
-});
diff --git a/packages/client-generator/src/writers/__tests__/split-writer.test.ts b/packages/client-generator/src/writers/__tests__/split-writer.test.ts
deleted file mode 100644
index 38cc989124..0000000000
--- a/packages/client-generator/src/writers/__tests__/split-writer.test.ts
+++ /dev/null
@@ -1,217 +0,0 @@
-import type { EmitOptions } from '../../emitters/client.js';
-import type { ApiModel, OperationModel } from '../../intermediate-representation/model.js';
-import { splitWriter } from '../split-writer.js';
-
-function operation(overrides: Partial<OperationModel> = {}): OperationModel {
-  return {
-    name: 'op',
-    method: 'get',
-    path: '/p',
-    pathParams: [],
-    queryParams: [],
-    headerParams: [],
-    successResponses: [],
-    errorResponses: [],
-    security: [],
-    tags: [],
-    ...overrides,
-  };
-}
-
-function model(overrides: Partial<ApiModel> = {}): ApiModel {
-  return {
-    title: 'Tiny',
-    version: '1.0.0',
-    serverUrl: 'https://api.example.com',
-    services: [{ name: 'Default', operations: [] }],
-    schemas: [],
-    securitySchemes: [],
-    ...overrides,
-  };
-}
-
-const PET_MODEL = model({
-  schemas: [
-    {
-      name: 'Pet',
-      schema: {
-        kind: 'object',
-        properties: [{ name: 'id', schema: { kind: 'scalar', scalar: 'integer' }, required: true }],
-      },
-    },
-    // Never referenced by an operation — must NOT be imported by the entry.
-    { name: 'Unreferenced', schema: { kind: 'object', properties: [] } },
-  ],
-  services: [
-    {
-      name: 'Default',
-      operations: [
-        operation({
-          name: 'getPet',
-          path: '/pets/{id}',
-          pathParams: [
-            {
-              name: 'id',
-              in: 'path',
-              schema: { kind: 'scalar', scalar: 'string' },
-              required: true,
-            },
-          ],
-          successResponses: [
-            { contentType: 'application/json', status: 200, schema: { kind: 'ref', name: 'Pet' } },
-          ],
-        }),
-      ],
-    },
-  ],
-});
-
-function run(m: ApiModel, emit: EmitOptions = {}) {
-  const files = splitWriter({ model: m, outputPath: '/out/client.ts', emit });
-  return {
-    files,
-    schemas: files.find((f) => f.path === '/out/client.schemas.ts'),
-    entry: files.find((f) => f.path === '/out/client.ts')!,
-  };
-}
-
-describe('splitWriter — file set & paths', () => {
-  it('emits exactly the schemas file and the entry file', () => {
-    const { files } = run(PET_MODEL);
-    expect(files.map((f) => f.path)).toEqual(['/out/client.schemas.ts', '/out/client.ts']);
-  });
-
-  it('omits the schemas file entirely when the document declares no schemas', () => {
-    const { files, entry } = run(
-      model({ services: [{ name: 'Default', operations: [operation()] }] })
-    );
-    expect(files.map((f) => f.path)).toEqual(['/out/client.ts']);
-    expect(entry.content).not.toContain('.schemas.js');
-  });
-});
-
-describe('splitWriter — schemas module', () => {
-  it('contains the model types + type guards and nothing runtime-related', () => {
-    const withUnion = run(
-      model({
-        schemas: [
-          {
-            name: 'Cat',
-            schema: {
-              kind: 'object',
-              properties: [
-                { name: 'type', schema: { kind: 'literal', value: 'cat' }, required: true },
-              ],
-            },
-          },
-          {
-            name: 'Dog',
-            schema: {
-              kind: 'object',
-              properties: [
-                { name: 'type', schema: { kind: 'literal', value: 'dog' }, required: true },
-              ],
-            },
-          },
-          {
-            name: 'Animal',
-            schema: {
-              kind: 'union',
-              members: [
-                { kind: 'ref', name: 'Cat' },
-                { kind: 'ref', name: 'Dog' },
-              ],
-            },
-          },
-        ],
-      })
-    );
-    const schemas = withUnion.schemas!.content;
-    expect(schemas).toContain('// Generated by @redocly/client-generator');
-    expect(schemas).toContain('export type Cat = {');
-    expect(schemas).toContain('export function isCat(');
-    expect(schemas).not.toContain('createClient');
-    expect(schemas).not.toContain('OPERATIONS');
-  });
-});
-
-describe('splitWriter — entry (inline runtime, the default)', () => {
-  it('embeds the runtime, re-exports the schemas module, and imports only referenced schema types', () => {
-    const { entry } = run(PET_MODEL);
-    expect(entry.content).toContain("import type { Pet } from './client.schemas.js';");
-    expect(entry.content).toContain("export * from './client.schemas.js';");
-    // `Unreferenced` is exported via the `export *` but never imported by name.
-    expect(entry.content).not.toContain('Unreferenced }');
-    expect(entry.content).toContain('// ─── Embedded runtime');
-    expect(entry.content).toContain(
-      'export const client = createClient<Ops, OperationId, OperationPath, string>(OPERATIONS,'
-    );
-    expect(entry.content).toContain('export const { configure, use } = client;');
-    expect(entry.content).toContain(
-      'export const getPet = (id: string, init: RequestOptions = {}) => client.getPet({ id }, init);'
-    );
-    // The schema types themselves live only in the schemas module.
-    expect(entry.content).not.toContain('export type Pet = {');
-  });
-
-  it('skips the type import when no schema name is referenced by the entry code', () => {
-    const { entry, schemas } = run(
-      model({
-        schemas: [{ name: 'Orphan', schema: { kind: 'object', properties: [] } }],
-        services: [{ name: 'Default', operations: [operation({ name: 'ping' })] }],
-      })
-    );
-    expect(schemas!.content).toContain('export type Orphan');
-    expect(entry.content).toContain("export * from './client.schemas.js';");
-    expect(entry.content).not.toContain('import type {');
-  });
-});
-
-describe('splitWriter — entry (package runtime)', () => {
-  it('imports the runtime from the package and keeps the schemas linkage + re-export tail', () => {
-    const { entry, schemas } = run(PET_MODEL, { runtime: 'package' });
-    expect(schemas!.content).toContain('export type Pet = {');
-    expect(entry.content).toContain("import type { Pet } from './client.schemas.js';");
-    expect(entry.content).toContain("export * from './client.schemas.js';");
-    expect(entry.content).toContain("from '@redocly/client-generator';");
-    expect(entry.content).not.toContain('// ─── Embedded runtime');
-    expect(entry.content).toContain(
-      "export { ApiError, createClient } from '@redocly/client-generator';"
-    );
-  });
-});
-
-describe('splitWriter — SSE', () => {
-  it('keeps SSE descriptors + flat sugar in the entry file', () => {
-    const { entry } = run(
-      model({
-        schemas: [{ name: 'Message', schema: { kind: 'object', properties: [] } }],
-        services: [
-          {
-            name: 'Default',
-            operations: [
-              operation({
-                name: 'streamMessages',
-                path: '/stream',
-                successResponses: [
-                  {
-                    contentType: 'text/event-stream',
-                    status: 200,
-                    schema: { kind: 'unknown' },
-                    itemSchema: { kind: 'ref', name: 'Message' },
-                  },
-                ],
-              }),
-            ],
-          },
-        ],
-      })
-    );
-    expect(entry.content).toContain('responseKind: "sse"');
-    expect(entry.content).toContain(
-      'export const streamMessages = (init: SseOptions = {}) => client.streamMessages({}, init);'
-    );
-    // The streamed event type is imported from the schemas module (Ops references it).
-    expect(entry.content).toContain("import type { Message } from './client.schemas.js';");
-  });
-});
diff --git a/packages/client-generator/src/writers/index.ts b/packages/client-generator/src/writers/index.ts
deleted file mode 100644
index 5af3ea70d0..0000000000
--- a/packages/client-generator/src/writers/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { singleFileWriter } from './single-file-writer.js';
-import { splitWriter } from './split-writer.js';
-import type { OutputMode, Writer } from './types.js';
-
-export type { GeneratedFile, OutputMode, Writer, WriterInput } from './types.js';
-
-const WRITERS: Record<OutputMode, Writer> = {
-  single: singleFileWriter,
-  split: splitWriter,
-};
-
-/** Select the writer for an output mode. */
-export function getWriter(mode: OutputMode): Writer {
-  return WRITERS[mode];
-}
diff --git a/packages/client-generator/src/writers/single-file-writer.ts b/packages/client-generator/src/writers/single-file-writer.ts
deleted file mode 100644
index 2cd55c7a67..0000000000
--- a/packages/client-generator/src/writers/single-file-writer.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { emitClientSingleFile } from '../emitters/package-client.js';
-import type { Writer } from './types.js';
-
-/**
- * The default writer: the whole client in one file at the `--output` path. The shared
- * emitter branches on `emit.runtime` internally — `inline` (the default) embeds the
- * runtime sources, `package` imports them from `@redocly/client-generator`.
- */
-export const singleFileWriter: Writer = ({ model, outputPath, emit }) => [
-  { path: outputPath, content: emitClientSingleFile(model, emit) },
-];
diff --git a/packages/client-generator/src/writers/split-writer.ts b/packages/client-generator/src/writers/split-writer.ts
deleted file mode 100644
index b46307ae75..0000000000
--- a/packages/client-generator/src/writers/split-writer.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { join } from 'node:path';
-
-import { emitClientSplit } from '../emitters/package-client.js';
-import type { Writer } from './types.js';
-import { anchor } from './util.js';
-
-/**
- * `split` mode: two sibling files derived from the `--output` anchor, for both
- * runtime distributions.
- *
- *   <stem>.schemas.ts  model types, enums, const-objects, and type guards
- *   <stem>.ts          everything else (runtime, wiring, client, sugar), which
- *                      `export *`s the schemas module and type-imports exactly
- *                      the schema names it references
- *
- * The schemas file is skipped entirely when the document declares no schemas.
- */
-export const splitWriter: Writer = ({ model, outputPath, emit }) => {
-  const { dir, stem } = anchor(outputPath);
-  const { entry, schemas } = emitClientSplit(model, emit, stem);
-  return [
-    ...(schemas === undefined ? [] : [{ path: join(dir, `${stem}.schemas.ts`), content: schemas }]),
-    { path: outputPath, content: entry },
-  ];
-};
diff --git a/packages/client-generator/src/writers/types.ts b/packages/client-generator/src/writers/types.ts
deleted file mode 100644
index e20c6b3d6c..0000000000
--- a/packages/client-generator/src/writers/types.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import type { EmitOptions } from '../emitters/client.js';
-import type { ApiModel } from '../intermediate-representation/model.js';
-
-/**
- * How the generated client is partitioned across files.
- *
- * - `single` (default): one self-contained file.
- * - `split`: schema types + guards in a sibling `<stem>.schemas.ts`; everything
- *   else in the entry file, which re-exports the schemas module.
- */
-export type OutputMode = 'single' | 'split';
-
-/** A single file the generator will write to disk. */
-export type GeneratedFile = { path: string; content: string };
-
-export type WriterInput = {
-  model: ApiModel;
-  /**
-   * The `--output` anchor path (ends in `.ts`). Multi-file writers derive sibling
-   * and per-tag-folder paths from its directory and base name (stem).
-   */
-  outputPath: string;
-  emit: EmitOptions;
-};
-
-/**
- * A Writer turns the IR + emit options into the set of files to write. This is
- * the one seam output modes vary at; the emitter (which renders code) stays
- * mode-agnostic.
- */
-export type Writer = (input: WriterInput) => GeneratedFile[];
diff --git a/packages/client-generator/src/writers/util.ts b/packages/client-generator/src/writers/util.ts
deleted file mode 100644
index 95549811ca..0000000000
--- a/packages/client-generator/src/writers/util.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { parse } from 'node:path';
-
-import type { OperationModel } from '../intermediate-representation/model.js';
-
-/**
- * Derive the directory and base name (stem, without `.ts`) from the `--output`
- * anchor path. Multi-file writers build sibling/per-tag paths from these.
- */
-export function anchor(outputPath: string): { dir: string; stem: string } {
-  const { dir, name } = parse(outputPath);
-  return { dir, stem: name };
-}
-
-/** All operations across the model's services, flattened. */
-export function allOperations(
-  operationsByService: { operations: OperationModel[] }[]
-): OperationModel[] {
-  return operationsByService.flatMap((service) => service.operations);
-}

From 1970eb74f81f19f0315e134f65511e0b7a4d7eea Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Fri, 17 Jul 2026 17:35:07 +0300
Subject: [PATCH 118/134] fix(cli): validate the --setup flag like the config
 setup and complete the generate-client docs

---
 .oxfmtrc.json                                 |  2 +-
 .oxlintrc.json                                |  3 +++
 docs/@v2/commands/index.md                    |  2 +-
 docs/@v2/configuration/reference/apis.md      | 12 ++++++++++
 packages/cli/src/commands/generate-client.ts  | 13 +++++------
 packages/cli/src/index.ts                     | 13 ++---------
 .../docs/adr/0008-redocly-yaml-config.md      |  2 +-
 .../adr/0019-first-class-client-config.md     | 22 +++++++++++++++++++
 packages/client-generator/docs/adr/README.md  |  3 ++-
 tests/e2e/generate-client/setup.test.ts       | 20 +++++++++++++++++
 10 files changed, 70 insertions(+), 22 deletions(-)
 create mode 100644 packages/client-generator/docs/adr/0019-first-class-client-config.md

diff --git a/.oxfmtrc.json b/.oxfmtrc.json
index 752a2f3e6a..fc6793d2c6 100644
--- a/.oxfmtrc.json
+++ b/.oxfmtrc.json
@@ -14,7 +14,7 @@
     "tests/e2e/generate-client/*-consumer/api*.ts",
     "tests/smoke/**/*.yaml",
     "snapshot*.txt",
-    "*.snapshot.ts",
+    "tests/e2e/generate-client/*.snapshot.ts",
     "*.html",
     "*.hbs",
     "*.toml",
diff --git a/.oxlintrc.json b/.oxlintrc.json
index 6e742f05f3..c6904b20a1 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -35,6 +35,7 @@
         "caughtErrors": "none"
       }
     ],
+
     "typescript/ban-ts-comment": "error",
     "typescript/no-empty-object-type": "error",
     "typescript/no-explicit-any": "warn",
@@ -49,6 +50,7 @@
         "fixStyle": "inline-type-imports"
       }
     ],
+
     "import/no-cycle": ["warn"],
     "import/no-duplicates": [
       "error",
@@ -56,6 +58,7 @@
         "preferInline": true
       }
     ],
+
     "oxlint-redocly-plugin/no-typeof-object": "error"
   },
   "overrides": [
diff --git a/docs/@v2/commands/index.md b/docs/@v2/commands/index.md
index d95d7b5e2e..424f18f0f1 100644
--- a/docs/@v2/commands/index.md
+++ b/docs/@v2/commands/index.md
@@ -14,7 +14,7 @@ Documentation commands:
 API management commands:
 
 - [`bundle`](bundle.md) Bundle API description.
-- [`generate-client`](generate-client.md) Generate a typed TypeScript client from an OpenAPI description.
+- [`generate-client`](generate-client.md) Generate a typed TypeScript client from an OpenAPI description [experimental feature].
 - [`join`](join.md) Join API descriptions [experimental feature].
 - [`score`](score.md) Score an API for integration simplicity and AI agent readiness.
 - [`split`](split.md) Split API description into a multi-file structure.
diff --git a/docs/@v2/configuration/reference/apis.md b/docs/@v2/configuration/reference/apis.md
index ae94b8cbe1..614dbb34ad 100644
--- a/docs/@v2/configuration/reference/apis.md
+++ b/docs/@v2/configuration/reference/apis.md
@@ -58,6 +58,18 @@ If your project contains multiple APIs, the `apis` configuration section allows
 - Output file path
 - When running `bundle` without specifying an API, the bundled API description is saved to this location.
 
+---
+
+- client
+- [Client object](./client.md)
+- Additional TypeScript client generation configuration for this API, used by the experimental `generate-client` command.
+
+---
+
+- clientOutput
+- Output file path
+- When running `generate-client` without specifying an API, the generated TypeScript client is saved to this location.
+
 {% /table %}
 
 ## Examples
diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index 54a1542f79..20fab6a61e 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -89,7 +89,10 @@ export async function handleGenerateClient({
     mockData: argv['mock-data'],
     mockSeed: argv['mock-seed'],
     generators: argv.generator,
-    setup: argv.setup === undefined ? undefined : resolvePath(argv.setup),
+    setup:
+      argv.setup === undefined
+        ? undefined
+        : resolveSetup({ setup: argv.setup }, process.cwd()).setup,
   };
 
   const optedIn = Object.keys(apisCfg).filter(
@@ -154,9 +157,7 @@ export async function handleGenerateClient({
     }
 
     try {
-      logger.info(
-        gray(`\n  Generating TypeScript client${job.name ? ` for ${job.name}` : ''}... \n`)
-      );
+      logger.info(gray(`\n  Generating TypeScript client for ${job.name}... \n`));
       const result = await generateClient({
         ...merged,
         api: job.api,
@@ -172,9 +173,7 @@ export async function handleGenerateClient({
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       throw new HandledError(
-        `\n❌  Failed to generate TypeScript client${
-          job.name ? ` for ${job.name}` : ''
-        }.\n   ${message}\n`
+        `\n❌  Failed to generate TypeScript client for ${job.name}.\n   ${message}\n`
       );
     }
   }
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index ec31eea51d..088aea9bd4 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -233,12 +233,7 @@ yargs(hideBin(process.argv))
             required: true,
             alias: 'p',
           },
-          domain: {
-            description: 'Specify a domain.',
-            alias: 'd',
-            type: 'string',
-            required: false,
-          },
+          domain: { description: 'Specify a domain.', alias: 'd', type: 'string', required: false },
           wait: {
             description: 'Wait for build to finish.',
             type: 'boolean',
@@ -339,11 +334,7 @@ yargs(hideBin(process.argv))
             description: 'Commit creation date.',
             type: 'string',
           },
-          domain: {
-            description: 'Specify a domain.',
-            alias: 'd',
-            type: 'string',
-          },
+          domain: { description: 'Specify a domain.', alias: 'd', type: 'string' },
           config: {
             description: 'Path to the config file.',
             requiresArg: true,
diff --git a/packages/client-generator/docs/adr/0008-redocly-yaml-config.md b/packages/client-generator/docs/adr/0008-redocly-yaml-config.md
index 8e1bcd4d30..6c4d931da0 100644
--- a/packages/client-generator/docs/adr/0008-redocly-yaml-config.md
+++ b/packages/client-generator/docs/adr/0008-redocly-yaml-config.md
@@ -1,6 +1,6 @@
 # ADR 0008: `generate-client` config via `redocly.yaml` `x-client-generator`
 
-- Status: Superseded — the `x-client-generator` extension and the `*.config.ts` /
+- Status: Superseded by ADR-0019 — the `x-client-generator` extension and the `*.config.ts` /
   `--config-file` layer were replaced by a first-class `client` block (top-level shared
   defaults + per-API `apis.<name>.client`) with the output at `apis.<name>.clientOutput`.
 - Date: 2026-06-10
diff --git a/packages/client-generator/docs/adr/0019-first-class-client-config.md b/packages/client-generator/docs/adr/0019-first-class-client-config.md
new file mode 100644
index 0000000000..e148c7b9ea
--- /dev/null
+++ b/packages/client-generator/docs/adr/0019-first-class-client-config.md
@@ -0,0 +1,22 @@
+# ADR 0019: `generate-client` config via a first-class `client` block
+
+- Status: Accepted — supersedes ADR-0008
+- Date: 2026-07-17
+
+## Context
+
+ADR-0008 parked `generate-client` settings in an `x-client-generator` extension block plus an optional `*.config.ts` (`--config-file`) layer, explicitly as a stopgap until first-class keys could land.
+Both layers existed only because the config schema didn't model client generation yet; keeping them meant two config dialects and an extension key users had to discover.
+
+## Decision
+
+`redocly.yaml` models client generation with **typed, first-class keys**: a top-level `client` block for shared defaults and a per-API `apis.<name>.client` block layered over it field by field (the `pagination` block merges additively), with the output path at `apis.<name>.clientOutput`.
+The schema lives in `@redocly/openapi-core`'s config types, so the config is linted like any other block.
+Precedence, low → high: **top-level `client` → `apis.<name>.client` → CLI flags**.
+The `x-client-generator` extension and the `*.config.ts` / `--config-file` layer are removed.
+
+## Consequences
+
+- One config dialect: everything is declared in `redocly.yaml` and validated by the config schema.
+- A no-arg `redocly generate-client` fans out over every API that declares a `client` block or `clientOutput`.
+- Programmatic use passes the same vocabulary to `generateClient(...)` directly; there is no separate config-file loader to maintain.
diff --git a/packages/client-generator/docs/adr/README.md b/packages/client-generator/docs/adr/README.md
index ab19ac6fdb..9df55a34de 100644
--- a/packages/client-generator/docs/adr/README.md
+++ b/packages/client-generator/docs/adr/README.md
@@ -18,7 +18,7 @@ ARCHITECTURE.md says _what is_; these ADRs say _why_.
 | [0005](./0005-error-mode-terminals.md)                 | Error handling as a generate-time mode (throw vs result)          | Amended by 0017         |
 | [0006](./0006-sse-namespace.md)                        | SSE as a derived response kind under an `sse.*` namespace         | Superseded by 0017      |
 | [0007](./0007-call-site-auth.md)                       | Auth resolved at the call site via async `__auth`                 | Superseded by 0017      |
-| [0008](./0008-redocly-yaml-config.md)                  | `generate-client` config via `redocly.yaml` `x-client-generator`  | Accepted                |
+| [0008](./0008-redocly-yaml-config.md)                  | `generate-client` config via `redocly.yaml` `x-client-generator`  | Superseded by 0019      |
 | [0009](./0009-per-instance-auth.md)                    | Per-instance auth via `ClientConfig.auth`                         | Amended by 0017         |
 | [0010](./0010-mock-data-baked-vs-faker.md)             | Mock data: baked literals by default, faker opt-in                | Accepted                |
 | [0011](./0011-wrapper-generators.md)                   | Data-fetching wrapper generators (`swr`, `tanstack-query`)        | Accepted                |
@@ -29,6 +29,7 @@ ARCHITECTURE.md says _what is_; these ADRs say _why_.
 | [0016](./0016-msw-generator-vs-mock-server.md)         | In-process MSW mocks coexist with the out-of-process mock server  | Accepted                |
 | [0017](./0017-runtime-module-and-descriptor-client.md) | Hand-written runtime module + descriptor-driven generated clients | Accepted                |
 | [0018](./0018-auto-pagination.md)                      | Auto-pagination as declared, statically verified configuration    | Accepted                |
+| [0019](./0019-first-class-client-config.md)            | `generate-client` config via a first-class `client` block         | Accepted                |
 
 ## Template
 
diff --git a/tests/e2e/generate-client/setup.test.ts b/tests/e2e/generate-client/setup.test.ts
index 74354f1cf0..0d0d52abfc 100644
--- a/tests/e2e/generate-client/setup.test.ts
+++ b/tests/e2e/generate-client/setup.test.ts
@@ -46,6 +46,26 @@ function generate(
   );
 }
 
+describe('--setup rejects remote modules', () => {
+  test('a URL fails with the local-file-path error instead of a garbage path', () => {
+    const result = spawnSync(
+      'node',
+      [
+        cliEntry,
+        'generate-client',
+        fixture,
+        '--output',
+        join(tmpdir(), 'setup-url-client.ts'),
+        '--setup',
+        'https://evil.example/mod.ts',
+      ],
+      { encoding: 'utf-8', cwd: repoRoot }
+    );
+    expect(result.status).toBe(1);
+    expect(result.stderr).toContain('must be a local file path');
+  }, 60_000);
+});
+
 describe('--setup bakes publisher defaults into the single-file client', () => {
   let dir = '';
   beforeAll(() => {

From 617f1a131165fcb9ad322f1748e1c5aa858bd4ef Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Fri, 17 Jul 2026 17:40:48 +0300
Subject: [PATCH 119/134] docs(cli): use semantic line breaks in the
 generate-client guide and command reference

---
 docs/@v2/commands/generate-client.md    | 10 ++-
 docs/@v2/guides/use-generated-client.md | 93 ++++++++++++++++++-------
 2 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index d4cf720d8c..ada6167bef 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -56,7 +56,8 @@ CLI flags take precedence over the configuration.
 A per-API `client` block overrides the top-level `client` field by field; unspecified fields fall back to the top-level defaults.
 See [`client` configuration](../configuration/reference/client.md) for the full reference.
 
-Auto-pagination has **no CLI flag**: it's declared as structured configuration — [`client.pagination`](../configuration/reference/client.md#pagination) in `redocly.yaml`, or the equivalent `x-pagination` operation extension in the spec — and paginated operations gain typed `.pages()`/`.items()` async iterators. See [Pagination in the usage guide](../guides/use-generated-client.md#pagination).
+Auto-pagination has **no CLI flag**: it's declared as structured configuration — [`client.pagination`](../configuration/reference/client.md#pagination) in `redocly.yaml`, or the equivalent `x-pagination` operation extension in the spec — and paginated operations gain typed `.pages()`/`.items()` async iterators.
+See [Pagination in the usage guide](../guides/use-generated-client.md#pagination).
 
 ## Output modes
 
@@ -100,11 +101,14 @@ Auto-pagination has **no CLI flag**: it's declared as structured configuration 
     client.getOrderById({ orderId }, init);
   ```
 
-Choose `package` when you want engine fixes and improvements to arrive via `npm update @redocly/client-generator` — no regeneration, no diff in the generated file. The trade: the consuming app must have `@redocly/client-generator` installed as a regular dependency. Your application code is identical in both modes (same exports, same call shapes).
+Choose `package` when you want engine fixes and improvements to arrive via `npm update @redocly/client-generator` — no regeneration, no diff in the generated file.
+The trade: the consuming app must have `@redocly/client-generator` installed as a regular dependency.
+Your application code is identical in both modes (same exports, same call shapes).
 
 The `satisfies Record<string, OperationDescriptor>` line doubles as a **build-time version-skew guard**: an incompatible generated-file/runtime pair fails the consumer's `tsc` instead of misbehaving at runtime.
 
-In both modes the generated module exports **both call styles** — the `client` instance (grouped-args methods) and the free-function operations (`--args-style` shapes those). Both runtimes work with both [output modes](#output-modes) and every generator.
+In both modes the generated module exports **both call styles** — the `client` instance (grouped-args methods) and the free-function operations (`--args-style` shapes those).
+Both runtimes work with both [output modes](#output-modes) and every generator.
 
 ## Resources
 
diff --git a/docs/@v2/guides/use-generated-client.md b/docs/@v2/guides/use-generated-client.md
index 1ddf73f45f..9ecbc4469f 100644
--- a/docs/@v2/guides/use-generated-client.md
+++ b/docs/@v2/guides/use-generated-client.md
@@ -1,6 +1,7 @@
 # Use the generated client
 
-How to consume the TypeScript client produced by [`generate-client`](../commands/generate-client.md): authentication, argument styles, error handling, middleware, retries, and the optional add-on generators. For invoking the command itself (flags, output modes, config), see the [`generate-client` command reference](../commands/generate-client.md).
+How to consume the TypeScript client produced by [`generate-client`](../commands/generate-client.md): authentication, argument styles, error handling, middleware, retries, and the optional add-on generators.
+For invoking the command itself (flags, output modes, config), see the [`generate-client` command reference](../commands/generate-client.md).
 
 ## Generators
 
@@ -23,7 +24,9 @@ redocly generate-client openapi.yaml --output src/client.ts --generator sdk --ge
 
 ## Package runtime
 
-By default the runtime is embedded in the generated file, so the client is self-contained. With [`--runtime package`](../commands/generate-client.md#runtime-distribution) the generated file instead imports the runtime from `@redocly/client-generator` — your application code is **identical in both modes** (same exports, same call shapes); only where the engine lives changes. Choose `package` when you want engine fixes and improvements via `npm update @redocly/client-generator`, with no regeneration.
+By default the runtime is embedded in the generated file, so the client is self-contained.
+With [`--runtime package`](../commands/generate-client.md#runtime-distribution) the generated file instead imports the runtime from `@redocly/client-generator` — your application code is **identical in both modes** (same exports, same call shapes); only where the engine lives changes.
+Choose `package` when you want engine fixes and improvements via `npm update @redocly/client-generator`, with no regeneration.
 
 Install the runtime as a regular dependency and set the mode in `redocly.yaml`:
 
@@ -36,11 +39,14 @@ client:
   runtime: package # default: inline (self-contained)
 ```
 
-An incompatible generated-file/runtime pair fails your `tsc` build (the descriptor `satisfies` check) rather than misbehaving at runtime. Package mode works with both output modes and every generator. See the [`package-runtime` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/package-runtime).
+An incompatible generated-file/runtime pair fails your `tsc` build (the descriptor `satisfies` check) rather than misbehaving at runtime.
+Package mode works with both output modes and every generator.
+See the [`package-runtime` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/package-runtime).
 
 ## Authentication
 
-Credentials are **per instance**: they live in the client's config (`ClientConfig.auth`), and each operation automatically sends the credentials its `security` requires. A setter is generated for each `securityScheme` the runtime can apply:
+Credentials are **per instance**: they live in the client's config (`ClientConfig.auth`), and each operation automatically sends the credentials its `security` requires.
+A setter is generated for each `securityScheme` the runtime can apply:
 
 | Scheme                         | Setter                                    | Applied as                               |
 | ------------------------------ | ----------------------------------------- | ---------------------------------------- |
@@ -73,7 +79,8 @@ const publicApi = createClient<Ops>(OPERATIONS, { serverUrl: 'https://api.exampl
 
 ## Argument style
 
-By default (`--args-style flat`) each operation takes positional arguments — path params in URL order, then `params` (query), `body`, and `headers` — with the per-call `init` last. With `--args-style grouped`, every input is bundled into one `vars` object typed as the operation's `<Op>Variables`:
+By default (`--args-style flat`) each operation takes positional arguments — path params in URL order, then `params` (query), `body`, and `headers` — with the per-call `init` last.
+With `--args-style grouped`, every input is bundled into one `vars` object typed as the operation's `<Op>Variables`:
 
 ```ts
 // flat (default)
@@ -85,7 +92,8 @@ await updateOrder({ orderId: 'ord_01khr…', body: { ...orderBody } });
 
 ## Error handling
 
-By default (`--error-mode throw`) an operation throws `ApiError` on any non-2xx response and returns the success body directly. With `--error-mode result` it never throws for HTTP errors, returning a discriminated `Result<TData, TError>` whose `error` is typed from the spec's 4xx/5xx bodies:
+By default (`--error-mode throw`) an operation throws `ApiError` on any non-2xx response and returns the success body directly.
+With `--error-mode result` it never throws for HTTP errors, returning a discriminated `Result<TData, TError>` whose `error` is typed from the spec's 4xx/5xx bodies:
 
 ```ts
 // throw (default)
@@ -101,11 +109,13 @@ if (error) console.error(response.status, error.title);
 else console.log(data.id);
 ```
 
-Transport and abort failures still throw in both modes. The choice is fixed at generate time.
+Transport and abort failures still throw in both modes.
+The choice is fixed at generate time.
 
 ## Middleware
 
-Beyond the single `onRequest`/`onResponse`/`onError` hooks on `ClientConfig`, the client takes **composable middleware** for cross-cutting concerns (auth refresh, logging, tracing, request IDs). Register with `use()` (sugar for `client.use()`); it accepts several at once:
+Beyond the single `onRequest`/`onResponse`/`onError` hooks on `ClientConfig`, the client takes **composable middleware** for cross-cutting concerns (auth refresh, logging, tracing, request IDs).
+Register with `use()` (sugar for `client.use()`); it accepts several at once:
 
 ```ts
 import { use } from './client.ts';
@@ -129,7 +139,9 @@ See the [`customization` example](https://github.com/Redocly/redocly-cli/tree/ma
 
 ## Publisher defaults
 
-The middleware above is composed by the **consumer**. If you **publish an SDK**, bake defaults in at generation time with `--setup <file>`. The setup module imports its contract from `@redocly/client-generator` (so it resolves and is unit-testable) and default-exports `defineClientSetup({ config, middleware })`:
+The middleware above is composed by the **consumer**.
+If you **publish an SDK**, bake defaults in at generation time with `--setup <file>`.
+The setup module imports its contract from `@redocly/client-generator` (so it resolves and is unit-testable) and default-exports `defineClientSetup({ config, middleware })`:
 
 ```ts
 // client-setup.ts
@@ -151,7 +163,12 @@ export default defineClientSetup({
 redocly generate-client openapi.yaml --output src/api/client.ts --setup ./client-setup.ts
 ```
 
-The baked block runs before the consumer's own setup. **Config values** layer lowest → highest: the spec's defaults (e.g. `servers[0].url`) → the baked setup → the app's `configure()` — later always wins, so a consumer overrides a baked default. **Middleware composes** instead (baked first, then the consumer's). Express un-bypassable behavior as middleware, not a baked `fetch`. A setup file may import **only** from `@redocly/client-generator`. See the [`baked-setup` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/baked-setup).
+The baked block runs before the consumer's own setup.
+**Config values** layer lowest → highest: the spec's defaults (e.g. `servers[0].url`) → the baked setup → the app's `configure()` — later always wins, so a consumer overrides a baked default.
+**Middleware composes** instead (baked first, then the consumer's).
+Express un-bypassable behavior as middleware, not a baked `fetch`.
+A setup file may import **only** from `@redocly/client-generator`.
+See the [`baked-setup` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/baked-setup).
 
 ## Retries
 
@@ -163,9 +180,12 @@ const other = createClient<Ops>(OPERATIONS, { retry: { retries: 3 } }); // anoth
 await getOrderById('ord_123', {}, { retry: { retries: 5 } }); // per call
 ```
 
-By default only **idempotent** methods (`GET`, `HEAD`, `PUT`, `DELETE`, `OPTIONS`) are retried, on a network error or a transient status (`408`, `429`, `500`, `502`, `503`, `504`). `POST`/`PATCH` are not, since re-sending can duplicate side effects — opt in with a custom `retryOn` when safe. Backoff is exponential with full jitter (`retryStrategy: 'fixed'` for a constant delay); a `Retry-After` header takes precedence; an aborted `AbortSignal` stops retries immediately.
+By default only **idempotent** methods (`GET`, `HEAD`, `PUT`, `DELETE`, `OPTIONS`) are retried, on a network error or a transient status (`408`, `429`, `500`, `502`, `503`, `504`).
+`POST`/`PATCH` are not, since re-sending can duplicate side effects — opt in with a custom `retryOn` when safe.
+Backoff is exponential with full jitter (`retryStrategy: 'fixed'` for a constant delay); a `Retry-After` header takes precedence; an aborted `AbortSignal` stops retries immediately.
 
-A retry **resends the same request** — the `onRequest` chain, `config.headers()`, and body serialization run once and are reused across attempts. To refresh a token, signature, or timestamp per attempt, do it in `onResponse`/`onError` or a custom `retryOn` rather than expecting `onRequest` to re-run.
+A retry **resends the same request** — the `onRequest` chain, `config.headers()`, and body serialization run once and are reused across attempts.
+To refresh a token, signature, or timestamp per attempt, do it in `onResponse`/`onError` or a custom `retryOn` rather than expecting `onRequest` to re-run.
 
 | `RetryConfig` field | Type                                                 | Default                                            |
 | ------------------- | ---------------------------------------------------- | -------------------------------------------------- |
@@ -175,7 +195,8 @@ A retry **resends the same request** — the `onRequest` chain, `config.headers(
 | `jitter`            | `boolean`                                            | `true`                                             |
 | `retryOn`           | `(ctx: RetryContext) => boolean \| Promise<boolean>` | idempotent-only predicate                          |
 
-A custom `retryOn` receives the failed attempt's `RetryContext` (`attempt`, `request`, and exactly one of `response` / `error`) and **fully replaces** the default. To inspect a response body, read `ctx.response.clone()` — the body is a single-use stream:
+A custom `retryOn` receives the failed attempt's `RetryContext` (`attempt`, `request`, and exactly one of `response` / `error`) and **fully replaces** the default.
+To inspect a response body, read `ctx.response.clone()` — the body is a single-use stream:
 
 ```ts
 await createOrder(body, {
@@ -191,7 +212,8 @@ await createOrder(body, {
 
 ## Query serialization
 
-Query parameters follow their OpenAPI `style` / `explode` / `allowReserved`. The default (`form`, `explode: true`) repeats array values:
+Query parameters follow their OpenAPI `style` / `explode` / `allowReserved`.
+The default (`form`, `explode: true`) repeats array values:
 
 | `style`          | `explode` | `['a', 'b']` on the wire |
 | ---------------- | --------- | ------------------------ |
@@ -200,11 +222,14 @@ Query parameters follow their OpenAPI `style` / `explode` / `allowReserved`. The
 | `spaceDelimited` | `false`   | `key=a%20b`              |
 | `pipeDelimited`  | `false`   | `key=a\|b`               |
 
-Delimiters are literal (values are still percent-encoded). `allowReserved: true` leaves the RFC-3986 reserved set un-encoded. Object-valued params serialize as `deepObject` brackets (`key[sub]=val`).
+Delimiters are literal (values are still percent-encoded).
+`allowReserved: true` leaves the RFC-3986 reserved set un-encoded.
+Object-valued params serialize as `deepObject` brackets (`key[sub]=val`).
 
 ## Multipart uploads
 
-A `multipart/form-data` body whose schema is an **object** is generated as a typed object; pass a plain object and the client serializes it to `FormData` (after the `onRequest` chain, so middleware can mutate it). Binary fields (`format: binary`) are typed as `Blob`:
+A `multipart/form-data` body whose schema is an **object** is generated as a typed object; pass a plain object and the client serializes it to `FormData` (after the `onRequest` chain, so middleware can mutate it).
+Binary fields (`format: binary`) are typed as `Blob`:
 
 ```ts
 // type UploadBody = { file: Blob; orgId: string; tags?: string[] };
@@ -215,7 +240,8 @@ await upload({ file, orgId: 'org_1', tags: ['a', 'b'] });
 
 ## Response decoding
 
-The client reads each response by negotiating from its `Content-Type` (JSON, then `text/*`, then `Blob`). Force a reader per call with `parseAs`:
+The client reads each response by negotiating from its `Content-Type` (JSON, then `text/*`, then `Blob`).
+Force a reader per call with `parseAs`:
 
 ```ts
 const res = await getMenuItemPhoto('prd_123', { parseAs: 'stream' });
@@ -250,7 +276,8 @@ export const OPERATIONS = {
 } as const satisfies Record<string, OperationDescriptor>;
 ```
 
-Because keys and values are plain string literals, they survive bundling/minification — making `OPERATIONS` the stable handle for cache keys, span names, or log labels (rather than `fn.name`, which a minifier can rename). The same `OperationId` / `OperationPath` / `OperationTag` unions type `ctx.operation` in middleware.
+Because keys and values are plain string literals, they survive bundling/minification — making `OPERATIONS` the stable handle for cache keys, span names, or log labels (rather than `fn.name`, which a minifier can rename).
+The same `OperationId` / `OperationPath` / `OperationTag` unions type `ctx.operation` in middleware.
 
 ## Discriminated unions
 
@@ -261,11 +288,13 @@ export type MenuItem = Beverage | Dessert;
 export function isBeverage(value: MenuItem): value is Beverage { … }
 ```
 
-Guards are also emitted for unions nested inside another schema (array items, property values) as long as every member is a named schema. A union without a usable discriminator gets no guard.
+Guards are also emitted for unions nested inside another schema (array items, property values) as long as every member is a named schema.
+A union without a usable discriminator gets no guard.
 
 ## Server-Sent Events
 
-An operation whose `2xx` response declares `text/event-stream` is generated as a typed **async-generator function** (a client method plus the matching free function) — no flag required. Each event's `data` is typed from the OpenAPI 3.2 `itemSchema` (falling back to the media `schema`, then `string`) and `JSON.parse`d when structured:
+An operation whose `2xx` response declares `text/event-stream` is generated as a typed **async-generator function** (a client method plus the matching free function) — no flag required.
+Each event's `data` is typed from the OpenAPI 3.2 `itemSchema` (falling back to the media `schema`, then `string`) and `JSON.parse`d when structured:
 
 ```ts
 import { streamMessages } from './client.ts';
@@ -275,11 +304,15 @@ for await (const ev of streamMessages()) {
 }
 ```
 
-The stream **auto-reconnects** on a dropped connection, resuming from the last event id via `Last-Event-ID` (backoff honors the server's `retry:`, then `reconnectDelay`, then 1s; capped at 30s). Tune per call with `{ reconnect: false }` or `{ reconnectDelay: 500 }`. `break`ing the loop or aborting an `AbortSignal` ends it cleanly (no throw). SSE always throws `ApiError` on a non-2xx initial response, regardless of `--error-mode`.
+The stream **auto-reconnects** on a dropped connection, resuming from the last event id via `Last-Event-ID` (backoff honors the server's `retry:`, then `reconnectDelay`, then 1s; capped at 30s).
+Tune per call with `{ reconnect: false }` or `{ reconnectDelay: 500 }`.
+`break`ing the loop or aborting an `AbortSignal` ends it cleanly (no throw).
+SSE always throws `ApiError` on a non-2xx initial response, regardless of `--error-mode`.
 
 ## Pagination
 
-Pagination is **declared, never guessed**: describe how your API paginates in `redocly.yaml` under [`client.pagination`](../configuration/reference/client.md#pagination) (or per operation with the `x-pagination` extension in the spec — same fields), and each paginated operation keeps its one-shot call while gaining two async iterators — `.pages(args?, init?)` yielding full pages and `.items(args?, init?)` yielding individual items, typed statically from the response schema. There is no CLI flag.
+Pagination is **declared, never guessed**: describe how your API paginates in `redocly.yaml` under [`client.pagination`](../configuration/reference/client.md#pagination) (or per operation with the `x-pagination` extension in the spec — same fields), and each paginated operation keeps its one-shot call while gaining two async iterators — `.pages(args?, init?)` yielding full pages and `.items(args?, init?)` yielding individual items, typed statically from the response schema.
+There is no CLI flag.
 
 ```yaml
 client:
@@ -297,9 +330,12 @@ client:
         items: /data
 ```
 
-The convention rule is **statically verified** at generate time: it applies only to operations it structurally fits — the advance param must be a declared query parameter of the right type (string for `cursor`, numeric for `offset`/`page`) and the JSON pointers must resolve in the operation's JSON success-response schema, with `items` landing on an array. An operation the convention doesn't fit is simply not paginated; an **explicit** rule (an `operations` entry or an `x-pagination` extension) that doesn't fit **fails generation** with a per-operation error, so a wrong declaration can't silently produce a broken iterator. Per operation, precedence is `operations[id]` > `x-pagination` > the convention.
+The convention rule is **statically verified** at generate time: it applies only to operations it structurally fits — the advance param must be a declared query parameter of the right type (string for `cursor`, numeric for `offset`/`page`) and the JSON pointers must resolve in the operation's JSON success-response schema, with `items` landing on an array.
+An operation the convention doesn't fit is simply not paginated; an **explicit** rule (an `operations` entry or an `x-pagination` extension) that doesn't fit **fails generation** with a per-operation error, so a wrong declaration can't silently produce a broken iterator.
+Per operation, precedence is `operations[id]` > `x-pagination` > the convention.
 
-Three styles are supported: `cursor` (send the response's `nextCursor` back in `cursorParam`; stops when it's absent, `null`, or empty — and throws if the server returns the same cursor twice in a row), `offset` (advance `offsetParam` by each page's item count), and `page` (increment `offsetParam` by 1) — `offset`/`page` stop on an empty page. `limitParam` is optional metadata for any style: the iterator never sets it, so pass your page size in `params` yourself.
+Three styles are supported: `cursor` (send the response's `nextCursor` back in `cursorParam`; stops when it's absent, `null`, or empty — and throws if the server returns the same cursor twice in a row), `offset` (advance `offsetParam` by each page's item count), and `page` (increment `offsetParam` by 1) — `offset`/`page` stop on an empty page.
+`limitParam` is optional metadata for any style: the iterator never sets it, so pass your page size in `params` yourself.
 
 ```ts
 import { client } from './client.ts';
@@ -336,13 +372,15 @@ for await (const page of client.listOrders.pages(
 }
 ```
 
-Iteration is **error-mode-agnostic**: a failed page always aborts iteration by throwing `ApiError`, even on an `--error-mode result` client — where `.pages()` yields **raw** pages (not `{ data, error, response }` envelopes; only the one-shot call keeps the envelope) and the throw-mode-only `onError` middleware hook is not invoked. Both runtimes paginate identically; the `inline` runtime embeds the pagination module only when some operation paginates, and `package` clients receive pagination improvements via `npm update`.
+Iteration is **error-mode-agnostic**: a failed page always aborts iteration by throwing `ApiError`, even on an `--error-mode result` client — where `.pages()` yields **raw** pages (not `{ data, error, response }` envelopes; only the one-shot call keeps the envelope) and the throw-mode-only `onError` middleware hook is not invoked.
+Both runtimes paginate identically; the `inline` runtime embeds the pagination module only when some operation paginates, and `package` clients receive pagination improvements via `npm update`.
 
 For shapes the built-in styles don't cover — for example a cursor that travels in the request body or a header — page with a small hand-written helper over the generated call, which stays fully typed end to end (see the [`custom-pagination` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/custom-pagination)).
 
 ## Custom generators
 
-The built-in generators cover common targets. For anything else derived from the same description (validators in another library, a permissions map, a house-style SDK), write a **custom generator**: it reads the same spec-agnostic model the built-ins consume, so its output never drifts from the spec.
+The built-in generators cover common targets.
+For anything else derived from the same description (validators in another library, a permissions map, a house-style SDK), write a **custom generator**: it reads the same spec-agnostic model the built-ins consume, so its output never drifts from the spec.
 
 A generator is `{ name, run }` (plus optional compatibility metadata); author it with `defineGenerator`:
 
@@ -398,7 +436,8 @@ await generateClient({
 });
 ```
 
-Import-specifier generators execute at generation time — they carry the same trust level as any installed dependency you run. See the [`custom-generator` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/custom-generator).
+Import-specifier generators execute at generation time — they carry the same trust level as any installed dependency you run.
+See the [`custom-generator` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/custom-generator).
 
 ## Resources
 

From 94a73391d8f40829e43aa124537a6c540dc6bc7d Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Fri, 17 Jul 2026 17:42:38 +0300
Subject: [PATCH 120/134] test(cli): drive the redocly-config e2e suite with a
 minimal inline spec instead of cafe.yaml

---
 .../generate-client/redocly-config.test.ts    | 70 +++++++++++++++----
 1 file changed, 55 insertions(+), 15 deletions(-)

diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
index 8b353b86c2..d7692d45b5 100644
--- a/tests/e2e/generate-client/redocly-config.test.ts
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -3,27 +3,67 @@
 // fan-out (no arg, over apis with a `client` block) and an `apis:` alias or file path,
 // resolved like `bundle`/`lint`. CLI flags override the config.
 import { spawnSync } from 'node:child_process';
-import {
-  existsSync,
-  mkdtempSync,
-  readFileSync,
-  rmSync,
-  writeFileSync,
-  copyFileSync,
-} from 'node:fs';
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
-import { dirname, join } from 'node:path';
-import { fileURLToPath } from 'node:url';
+import { join } from 'node:path';
 
 import { cliEntry, repoRoot } from './helpers.js';
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const fixture = join(__dirname, 'fixtures', 'cafe.yaml');
+// The smallest spec these tests need: `listOrders` fits the cursor convention
+// (an `after` query param + `/page/endCursor` + `/items` pointers), `getRevenue`
+// does not (no `after` param), and the named schemas give `zod` something to emit.
+const SPEC =
+  [
+    'openapi: 3.1.0',
+    'info: { title: Test, version: 1.0.0 }',
+    'servers:',
+    '  - url: https://api.example.com',
+    'paths:',
+    '  /orders:',
+    '    get:',
+    '      operationId: listOrders',
+    '      tags: [Orders]',
+    '      parameters:',
+    '        - { name: after, in: query, schema: { type: string } }',
+    '        - { name: limit, in: query, schema: { type: integer } }',
+    '      responses:',
+    "        '200':",
+    '          description: ok',
+    '          content:',
+    '            application/json:',
+    "              schema: { $ref: '#/components/schemas/OrderPage' }",
+    '  /revenue:',
+    '    get:',
+    '      operationId: getRevenue',
+    '      tags: [Revenue]',
+    '      responses:',
+    "        '200':",
+    '          description: ok',
+    '          content:',
+    '            application/json:',
+    '              schema: { type: object, properties: { total: { type: number } } }',
+    'components:',
+    '  schemas:',
+    '    Order:',
+    '      type: object',
+    '      properties:',
+    '        id: { type: string }',
+    '    OrderPage:',
+    '      type: object',
+    '      properties:',
+    '        page:',
+    '          type: object',
+    '          properties:',
+    '            endCursor: { type: string }',
+    '        items:',
+    '          type: array',
+    "          items: { $ref: '#/components/schemas/Order' }",
+  ].join('\n') + '\n';
 
-/** Write a temp project: the cafe spec + a redocly.yaml with the given contents. */
+/** Write a temp project: the minimal spec + a redocly.yaml with the given contents. */
 function project(redoclyYaml: string): string {
   const dir = mkdtempSync(join(tmpdir(), 'ots-redocly-'));
-  copyFileSync(fixture, join(dir, 'openapi.yaml'));
+  writeFileSync(join(dir, 'openapi.yaml'), SPEC, 'utf-8');
   writeFileSync(join(dir, 'redocly.yaml'), redoclyYaml, 'utf-8');
   return dir;
 }
@@ -141,7 +181,7 @@ describe('generate-client redocly.yaml config', () => {
         '        exclude: [getRevenue]',
       ].join('\n') + '\n'
     );
-    copyFileSync(fixture, join(dir, 'standalone.yaml')); // not registered under `apis:`
+    writeFileSync(join(dir, 'standalone.yaml'), SPEC, 'utf-8'); // not registered under `apis:`
 
     const matched = run(dir, ['./openapi.yaml', '--output', './matched.ts']);
     expect(matched.status, matched.stderr).toBe(0);

From ed231e16c0b035185a67a8eeff4d51b07319e373 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Fri, 17 Jul 2026 17:47:41 +0300
Subject: [PATCH 121/134] docs(client-generator): fold the customization
 example into configure-and-middleware

---
 docs/@v2/guides/use-generated-client.md       |  2 +-
 packages/client-generator/README.md           |  4 +-
 tests/e2e/generate-client/examples/README.md  |  5 +-
 .../configure-and-middleware/README.md        | 16 +++--
 .../configure-and-middleware/src/main.ts      | 15 ++++-
 .../examples/customization/.gitignore         |  4 --
 .../examples/customization/README.md          | 21 ------
 .../examples/customization/index.html         | 11 ----
 .../examples/customization/package.json       | 16 -----
 .../examples/customization/redocly.yaml       | 10 ---
 .../examples/customization/src/main.ts        | 64 -------------------
 .../examples/customization/tsconfig.json      |  4 --
 .../examples/customization/vite.config.ts     |  3 -
 13 files changed, 29 insertions(+), 146 deletions(-)
 delete mode 100644 tests/e2e/generate-client/examples/customization/.gitignore
 delete mode 100644 tests/e2e/generate-client/examples/customization/README.md
 delete mode 100644 tests/e2e/generate-client/examples/customization/index.html
 delete mode 100644 tests/e2e/generate-client/examples/customization/package.json
 delete mode 100644 tests/e2e/generate-client/examples/customization/redocly.yaml
 delete mode 100644 tests/e2e/generate-client/examples/customization/src/main.ts
 delete mode 100644 tests/e2e/generate-client/examples/customization/tsconfig.json
 delete mode 100644 tests/e2e/generate-client/examples/customization/vite.config.ts

diff --git a/docs/@v2/guides/use-generated-client.md b/docs/@v2/guides/use-generated-client.md
index 9ecbc4469f..c573ead026 100644
--- a/docs/@v2/guides/use-generated-client.md
+++ b/docs/@v2/guides/use-generated-client.md
@@ -135,7 +135,7 @@ Per-request headers merge lowest → highest: injected auth credentials → type
 
 `use()` **appends** to the middleware chain (it composes with any already-registered or baked-in middleware). `configure({ middleware: [...] })` **replaces** the whole chain — use it to reset, but prefer `use()` to add to existing (including [publisher-baked](#publisher-defaults)) middleware.
 
-See the [`customization` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/customization) for a runnable version.
+See the [`configure-and-middleware` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/configure-and-middleware) for a runnable version.
 
 ## Publisher defaults
 
diff --git a/packages/client-generator/README.md b/packages/client-generator/README.md
index 2aa7c29b6c..3b1f00d77e 100644
--- a/packages/client-generator/README.md
+++ b/packages/client-generator/README.md
@@ -195,7 +195,7 @@ await listMenuItems({}, { headers: { 'X-Request-Id': '42' } });
 ```
 
 `ctx.operation` is `{ id, path, tags }` — the operationId, the path template (`{param}` placeholders intact), and the operation's tags. All three are **typed literal unions** (`OperationId` / `OperationPath` / `OperationTag`, exported alongside the `OPERATIONS` map), so `ctx.operation.id === '…'` and `ctx.operation.tags.includes('…')` autocomplete and reject typos at compile time.
-See the [`customization` example](./examples/customization) for a runnable end-to-end version, and [ADR-0014](./docs/adr/0014-request-response-customization.md) for the rationale.
+See the [`configure-and-middleware` example](../../tests/e2e/generate-client/examples/configure-and-middleware) for a runnable end-to-end version, and [ADR-0014](./docs/adr/0014-request-response-customization.md) for the rationale.
 
 ### Baking defaults into a published SDK
 
@@ -485,7 +485,7 @@ Inline output embeds the pagination module only when some operation paginates; `
 
 ## Examples
 
-Runnable examples live in [`examples/`](./examples): `zero-install-quickstart`, `fetch-functions`, `configure-and-middleware`, `customization`, `baked-setup`, `sse-streaming`, `zod`, `tanstack-query`, `mock`, `custom-generator`, `programmatic`, `vendored-edge`, `package-runtime` (`runtime: 'package'` — engine fixes via `npm update`), `multi-instance` (per-tenant `createClient` instances over one generated module), `pagination` and `custom-pagination` (the declared convention vs. a hand-written helper), and `nested-facade` (a custom generator grouping operations by tag).
+Runnable examples live in [`examples/`](../../tests/e2e/generate-client/examples): `zero-install-quickstart`, `fetch-functions`, `configure-and-middleware`, `baked-setup`, `sse-streaming`, `zod`, `tanstack-query`, `mock`, `custom-generator`, `programmatic`, `vendored-edge`, `package-runtime` (`runtime: 'package'` — engine fixes via `npm update`), `multi-instance` (per-tenant `createClient` instances over one generated module), `pagination` and `custom-pagination` (the declared convention vs. a hand-written helper), and `nested-facade` (a custom generator grouping operations by tag).
 Each is a standalone Vite app with a checked-in, drift-checked generated client.
 
 ## Documentation
diff --git a/tests/e2e/generate-client/examples/README.md b/tests/e2e/generate-client/examples/README.md
index aa357d413e..1d62682660 100644
--- a/tests/e2e/generate-client/examples/README.md
+++ b/tests/e2e/generate-client/examples/README.md
@@ -2,14 +2,13 @@
 
 Runnable examples of clients generated by `@redocly/client-generator`.
 Most are Vite apps that _consume_ a client generated via the `redocly generate-client` CLI (a `redocly.yaml`); `programmatic` _generates_ one with the `generateClient(...)` API.
-Nine examples share the cafe spec in [`_shared/cafe.yaml`](./_shared/cafe.yaml); the rest carry their own.
+Eight examples share the cafe spec in [`_shared/cafe.yaml`](./_shared/cafe.yaml); the rest carry their own.
 
 The generated client under `src/api/` is gitignored — CI regenerates every client and type-checks the consumer code against it (the `examples` job), and `zero-install-quickstart` keeps its client committed as the canonical browsable copy, drift-checked in `tests/e2e/generate-client/examples.test.ts`.
 
 | Example                                                | How it's generated             | Shows                                                                                                                                     |
 | ------------------------------------------------------ | ------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------- |
 | [fetch-functions](./fetch-functions)                   | CLI · `sdk`, functions         | free functions + `ApiError`                                                                                                               |
-| [customization](./customization)                       | CLI · `sdk`, functions         | request/response middleware, `ctx.operation` targeting, body mutation, custom transport                                                   |
 | [baked-setup](./baked-setup)                           | CLI · `sdk`, functions         | publisher defaults baked into the client via `--setup` (`defineClientSetup`)                                                              |
 | [zod](./zod)                                           | CLI · `sdk`, `zod`             | validating responses with generated zod schemas                                                                                           |
 | [tanstack-query](./tanstack-query)                     | CLI · `sdk`, `tanstack-query`  | React `useQuery(<op>Options())`                                                                                                           |
@@ -17,7 +16,7 @@ The generated client under `src/api/` is gitignored — CI regenerates every cli
 | [programmatic](./programmatic)                         | `generateClient(...)` API      | generating the client from a Node script                                                                                                  |
 | [package-runtime](./package-runtime)                   | CLI · `sdk`, package runtime   | `runtime: package` — types + descriptors only; the versioned runtime is imported from `@redocly/client-generator`, fixes via `npm update` |
 | [zero-install-quickstart](./zero-install-quickstart)   | CLI · `sdk`                    | the first-touch loop: generate → import → call; one self-contained file, zero runtime dependencies                                        |
-| [configure-and-middleware](./configure-and-middleware) | CLI · `sdk`                    | `configure({ serverUrl, retry })`, `use()` targeting `ctx.operation.id` (literal union), auth setter, typed `ApiError.body`               |
+| [configure-and-middleware](./configure-and-middleware) | CLI · `sdk`                    | `configure({ serverUrl, retry, fetch })`, `use()` targeting `ctx.operation` (literal unions), body mutation, auth setter, `ApiError.body` |
 | [multi-instance](./multi-instance)                     | CLI · `sdk`, package runtime   | per-tenant instances via `createClient(OPERATIONS)` — works in both runtimes; this example uses `runtime: package`                        |
 | [sse-streaming](./sse-streaming)                       | CLI · `sdk`                    | typed `for await` over SSE, auto-reconnect via `Last-Event-ID` (`reconnectDelay`/`reconnect: false`), clean abort                         |
 | [vendored-edge](./vendored-edge)                       | CLI · `sdk`                    | the generated file copied into a no-npm edge worker (`export default { fetch }`); `typescript` is the only dev tool                       |
diff --git a/tests/e2e/generate-client/examples/configure-and-middleware/README.md b/tests/e2e/generate-client/examples/configure-and-middleware/README.md
index 43b38262f1..62b744d93e 100644
--- a/tests/e2e/generate-client/examples/configure-and-middleware/README.md
+++ b/tests/e2e/generate-client/examples/configure-and-middleware/README.md
@@ -1,9 +1,17 @@
 # configure-and-middleware example
 
-The client's DX knobs together: `configure({ serverUrl, retry })` with an exponential,
-`Retry-After`-aware retry policy; `use()` middleware that targets `ctx.operation.id`
-(a literal union — typos fail the build); the generated `setApiKey()` auth setter; and
-`ApiError` handling with the spec's problem document on `error.body`.
+Customizing the client **without editing the generated file** — every mechanism composes
+from the hand-written `src/main.ts`, so it survives regeneration
+(see [ADR-0014](../../../../packages/client-generator/docs/adr/0014-request-response-customization.md)):
+
+- `configure({ serverUrl, retry, fetch })` — an exponential, `Retry-After`-aware retry
+  policy and a custom transport (here a canned `fetch`, so the demo runs offline).
+- `use()` middleware targeting `ctx.operation.id` / `ctx.operation.tags` (typed literal
+  unions — typos fail the build), mutating the request body (`ctx.body` edits are sent),
+  and observing each attempt's raw `Response`.
+- The generated `setApiKey()` auth setter.
+- A per-call header via the trailing `RequestOptions` argument.
+- `ApiError` handling with the spec's problem document on `error.body`.
 
 ## Run
 
diff --git a/tests/e2e/generate-client/examples/configure-and-middleware/src/main.ts b/tests/e2e/generate-client/examples/configure-and-middleware/src/main.ts
index 4f1564af57..b33ca4d3fa 100644
--- a/tests/e2e/generate-client/examples/configure-and-middleware/src/main.ts
+++ b/tests/e2e/generate-client/examples/configure-and-middleware/src/main.ts
@@ -65,21 +65,30 @@ setApiKey('demo-key-123');
 
 use({
   onRequest: (ctx) => {
-    // `ctx.operation.id` is typed 'listPayments' | 'createPayment' | 'getPayment' —
-    // misspell it and the comparison fails to compile.
+    // `ctx.operation.id` / `ctx.operation.tags` are typed literal unions —
+    // misspell 'createPayment' or 'Payments' and the comparison fails to compile.
     if (ctx.operation.id === 'createPayment') {
       ctx.headers['Idempotency-Key'] = crypto.randomUUID();
+      // Request-body mutation: edits to `ctx.body` are serialized and sent —
+      // the canned POST echoes the body back, so the `web:` prefix shows below.
+      const body = ctx.body as { reference: string };
+      body.reference = `web:${body.reference}`;
+    }
+    if (ctx.operation.tags.includes('Payments')) {
+      ctx.headers['X-Trace-Id'] = 'demo-trace';
     }
     log.push(`→ ${ctx.operation.id} ${ctx.method} ${ctx.operation.path}`);
   },
   // `onResponse` runs per ATTEMPT — watch the 503 and the retried 200 both arrive.
+  // (It can also replace the Response before parsing; here it only observes.)
   onResponse: (response, ctx) => {
     log.push(`← ${ctx.operation.id} ${response.status}`);
   },
 });
 
 async function main() {
-  const payments = await listPayments(); // 503 first, then retried to 200
+  // A header for this one call only goes in the trailing RequestOptions argument.
+  const payments = await listPayments({}, { headers: { 'X-Request-Id': '42' } }); // 503 first, then retried to 200
   const payment = await createPayment({ amount: 4200, currency: 'EUR', reference: 'INV-17' });
   try {
     await getPayment('pay_missing');
diff --git a/tests/e2e/generate-client/examples/customization/.gitignore b/tests/e2e/generate-client/examples/customization/.gitignore
deleted file mode 100644
index 6eb23affb8..0000000000
--- a/tests/e2e/generate-client/examples/customization/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-node_modules
-dist
-src/api/
-package-lock.json
diff --git a/tests/e2e/generate-client/examples/customization/README.md b/tests/e2e/generate-client/examples/customization/README.md
deleted file mode 100644
index af32d582d5..0000000000
--- a/tests/e2e/generate-client/examples/customization/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# customization
-
-Demonstrates customizing requests and responses **without editing the generated client** — every
-mechanism composes from the hand-written `src/main.ts`, so it survives regeneration
-(see [ADR-0014](../../docs/adr/0014-request-response-customization.md)):
-
-1. **Custom transport** — `configure({ fetch })` (here a canned fetch, so the demo runs offline).
-2. **Operation-targeted middleware** — `use({ onRequest })` matching on `ctx.operation.id` / `ctx.operation.tags`.
-3. **Request-body mutation** — `onRequest` edits `ctx.body`, and the mutated body is sent.
-4. **Raw-Response handling** — `onResponse` observes or replaces the `Response`.
-5. **Per-call headers** — the trailing `RequestOptions` argument.
-
-The generated client under `src/api/` is gitignored; CI regenerates it and type-checks this example.
-
-## Run
-
-```bash
-npm install
-npm run generate   # generate src/api (the client is gitignored)
-npm run dev
-```
diff --git a/tests/e2e/generate-client/examples/customization/index.html b/tests/e2e/generate-client/examples/customization/index.html
deleted file mode 100644
index 2aafd8e6e1..0000000000
--- a/tests/e2e/generate-client/examples/customization/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <title>Redocly client-generator — fetch-functions example</title>
-  </head>
-  <body>
-    <pre id="out">Loading…</pre>
-    <script type="module" src="/src/main.ts"></script>
-  </body>
-</html>
diff --git a/tests/e2e/generate-client/examples/customization/package.json b/tests/e2e/generate-client/examples/customization/package.json
deleted file mode 100644
index f0c588cedf..0000000000
--- a/tests/e2e/generate-client/examples/customization/package.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "name": "@redocly-examples/customization",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "generate": "redocly generate-client",
-    "dev": "vite",
-    "build": "vite build"
-  },
-  "devDependencies": {
-    "@redocly/cli": "latest",
-    "typescript": "^5.5.0",
-    "vite": "^5.4.0"
-  }
-}
diff --git a/tests/e2e/generate-client/examples/customization/redocly.yaml b/tests/e2e/generate-client/examples/customization/redocly.yaml
deleted file mode 100644
index 8613ade83f..0000000000
--- a/tests/e2e/generate-client/examples/customization/redocly.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-# redocly.yaml — drives `redocly generate-client` for this example.
-# The client is generated for the api that declares a `client` block
-# (run `redocly generate-client` with no args to build every such api).
-apis:
-  customization:
-    root: ../_shared/cafe.yaml
-    clientOutput: ./src/api/client.ts
-    client:
-      generators:
-        - sdk
diff --git a/tests/e2e/generate-client/examples/customization/src/main.ts b/tests/e2e/generate-client/examples/customization/src/main.ts
deleted file mode 100644
index c769461544..0000000000
--- a/tests/e2e/generate-client/examples/customization/src/main.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import {
-  configure,
-  use,
-  listMenuItems,
-  listOrders,
-  createOrder,
-  type RequestContext,
-} from './api/client.js';
-
-// `ctx.operation.{id,path,tags}` are typed literal unions (OperationId / OperationPath / OperationTag),
-// so the `id`/`tag` comparisons below autocomplete and a typo is a compile error — not a silent miss.
-
-const out = document.querySelector<HTMLPreElement>('#out')!;
-const log: string[] = [];
-
-// 1. Custom transport: a canned `fetch` so this example runs offline (and avoids the CORS
-//    preflight a browser triggers for custom request headers against the live API).
-configure({
-  fetch: (async (_url: string, init: RequestInit) => {
-    const isPost = init.method === 'POST';
-    const payload = isPost
-      ? { id: 'ord_demo', object: 'order', status: 'created', ...JSON.parse(String(init.body)) }
-      : { data: [{ id: 'prd_1', object: 'menuItem', name: 'Espresso', price: 300 }] };
-    return new Response(JSON.stringify(payload), {
-      status: isPost ? 201 : 200,
-      headers: { 'content-type': 'application/json' },
-    });
-  }) as unknown as typeof fetch,
-});
-
-// 2. Operation-targeted middleware — match by operation identity (id or tag), not brittle URL regex.
-// 3. Request-body mutation — `onRequest` may now edit `ctx.body`, and the change is sent.
-// 4. Raw-Response handling — `onResponse` observes (or could replace) the Response before parsing.
-use({
-  onRequest: (ctx: RequestContext) => {
-    if (ctx.operation.id === 'listMenuItems' || ctx.operation.tags.includes('Products')) {
-      ctx.headers['X-Trace-Id'] = 'demo-trace';
-    }
-    if (ctx.operation.id === 'createOrder') {
-      (ctx.body as { source?: string }).source = 'web';
-    }
-    // `[traced]` marks requests the guard above actually touched — untargeted operations show none.
-    const traced = 'X-Trace-Id' in ctx.headers ? ' [traced]' : '';
-    log.push(`-> ${ctx.operation.id} ${ctx.method} ${ctx.operation.path}${traced}`);
-  },
-  onResponse: (response) => {
-    log.push(`<- ${response.status}`);
-  },
-});
-
-async function main() {
-  // 5. Per-call header via the trailing `RequestOptions` argument.
-  const menu = await listMenuItems({}, { headers: { 'X-Request-Id': '42' } });
-  const order = await createOrder({
-    customerName: 'Mary Ann',
-    orderItems: [{ menuItemId: 'prd_1', quantity: 2 }],
-  });
-  // An untargeted operation (not `listMenuItems`/`Products`, not `createOrder`): the middleware
-  // only observes it — no header is added and the body is left as-is. It shows no `[traced]` mark.
-  const orders = await listOrders();
-  out.textContent = [...log, '', JSON.stringify({ menu, order, orders }, null, 2)].join('\n');
-}
-
-void main();
diff --git a/tests/e2e/generate-client/examples/customization/tsconfig.json b/tests/e2e/generate-client/examples/customization/tsconfig.json
deleted file mode 100644
index 4bd6962d40..0000000000
--- a/tests/e2e/generate-client/examples/customization/tsconfig.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "extends": "../tsconfig.base.json",
-  "include": ["src"]
-}
diff --git a/tests/e2e/generate-client/examples/customization/vite.config.ts b/tests/e2e/generate-client/examples/customization/vite.config.ts
deleted file mode 100644
index c049f46e10..0000000000
--- a/tests/e2e/generate-client/examples/customization/vite.config.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { defineConfig } from 'vite';
-
-export default defineConfig({});

From 38f807bde50cb9b85fe2baaa652fde5fb55d5f7f Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Fri, 17 Jul 2026 17:58:49 +0300
Subject: [PATCH 122/134] test(client-generator): make fixture arguments
 explicit and dedupe the modelWith helper

---
 .../__tests__/client-assembly.test.ts         |  14 +-
 .../src/emitters/__tests__/descriptor.test.ts | 162 +++++++++++-------
 .../src/emitters/__tests__/fixtures.ts        |   7 +-
 .../src/emitters/__tests__/pagination.test.ts |   4 +-
 .../__tests__/build.test.ts                   |   2 +-
 5 files changed, 111 insertions(+), 78 deletions(-)

diff --git a/packages/client-generator/src/emitters/__tests__/client-assembly.test.ts b/packages/client-generator/src/emitters/__tests__/client-assembly.test.ts
index 7fa9369fa8..2678a33502 100644
--- a/packages/client-generator/src/emitters/__tests__/client-assembly.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/client-assembly.test.ts
@@ -1,12 +1,8 @@
-import type { ApiModel, OperationModel } from '../../intermediate-representation/model.js';
+import type { ApiModel } from '../../intermediate-representation/model.js';
 import { emitClientSingleFile } from '../client-assembly.js';
 import type { EmitOptions } from '../emit-options.js';
 import { ts } from '../ts.js';
-import { apiModel, namedSchema, operation, param, response, SCALAR } from './fixtures.js';
-
-function modelWith(ops: OperationModel[], extra: Partial<ApiModel> = {}): ApiModel {
-  return apiModel({ services: [{ name: 'Default', operations: ops }], ...extra });
-}
+import { modelWith, namedSchema, operation, param, response, SCALAR } from './fixtures.js';
 
 /** The package arm of the shared emitter. */
 function emit(model: ApiModel, options: EmitOptions = {}): string {
@@ -17,7 +13,7 @@ const getOrder = operation({
   name: 'getOrder',
   path: '/orders/{orderId}',
   pathParams: [param('orderId', 'path', true)],
-  queryParams: [param('expand', 'query')],
+  queryParams: [param('expand', 'query', false)],
   successResponses: [response({ schema: { kind: 'ref', name: 'Order' } })],
   errorResponses: [response({ status: 400, schema: { kind: 'ref', name: 'Problem' } })],
   security: [['bearerAuth']],
@@ -55,7 +51,7 @@ const configureOp = operation({ name: 'configure', path: '/configure-op' });
 const listOrders = operation({
   name: 'listOrders',
   path: '/orders',
-  queryParams: [param('cursor', 'query'), param('limit', 'query')],
+  queryParams: [param('cursor', 'query', false), param('limit', 'query', false)],
   successResponses: [response({ schema: { kind: 'ref', name: 'OrderPage' } })],
 });
 const CURSOR_RULE = {
@@ -334,7 +330,7 @@ describe('emitClientSingleFile (package arm)', () => {
         operation({
           name: 'ping',
           path: '/ping',
-          headerParams: [param('X-Trace', 'header')],
+          headerParams: [param('X-Trace', 'header', false)],
           successResponses: [response()],
         }),
       ])
diff --git a/packages/client-generator/src/emitters/__tests__/descriptor.test.ts b/packages/client-generator/src/emitters/__tests__/descriptor.test.ts
index 8b37244472..52582e7d94 100644
--- a/packages/client-generator/src/emitters/__tests__/descriptor.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/descriptor.test.ts
@@ -7,15 +7,7 @@ import { descriptorStatements, opsInterfaceStatements, packageIdents } from '../
 import type { EmitContext } from '../operations.js';
 import type { ModelPagination } from '../pagination.js';
 import { printStatements } from '../ts.js';
-import { apiModel, operation, param } from './fixtures.js';
-
-function op(name: string, extra: Partial<OperationModel> = {}): OperationModel {
-  return operation({ name, ...extra });
-}
-
-function modelWith(ops: OperationModel[], extra: Partial<ApiModel> = {}): ApiModel {
-  return apiModel({ services: [{ name: 'Default', operations: ops }], ...extra });
-}
+import { apiModel, modelWith, operation, param } from './fixtures.js';
 
 function emitDescriptors(model: ApiModel): string {
   return printStatements(descriptorStatements(model, packageIdents(model), 'string'));
@@ -30,9 +22,16 @@ const JSON_OK: ResponseBodyModel = {
 
 describe('packageIdents', () => {
   it('renames colliding operation ids deterministically', () => {
-    const model = modelWith([op('configure'), op('createClient'), op('setBearer')], {
-      securitySchemes: [{ kind: 'bearer', key: 'bearerAuth' }],
-    });
+    const model = modelWith(
+      [
+        operation({ name: 'configure' }),
+        operation({ name: 'createClient' }),
+        operation({ name: 'setBearer' }),
+      ],
+      {
+        securitySchemes: [{ kind: 'bearer', key: 'bearerAuth' }],
+      }
+    );
     const idents = packageIdents(model);
     expect(idents.get('configure')).toBe('configure_2');
     expect(idents.get('createClient')).toBe('createClient_2');
@@ -40,13 +39,17 @@ describe('packageIdents', () => {
   });
 
   it('keeps non-colliding names and sanitizes non-identifier ones', () => {
-    const idents = packageIdents(modelWith([op('ping'), op('get-thing')]));
+    const idents = packageIdents(
+      modelWith([operation({ name: 'ping' }), operation({ name: 'get-thing' })])
+    );
     expect(idents.get('ping')).toBe('ping');
     expect(idents.get('get-thing')).toBe('get_thing');
   });
 
   it('reserves the TokenProvider import and the __redoclySetup const', () => {
-    const idents = packageIdents(modelWith([op('TokenProvider'), op('__redoclySetup')]));
+    const idents = packageIdents(
+      modelWith([operation({ name: 'TokenProvider' }), operation({ name: '__redoclySetup' })])
+    );
     expect(idents.get('TokenProvider')).toBe('TokenProvider_2');
     expect(idents.get('__redoclySetup')).toBe('__redoclySetup_2');
   });
@@ -59,7 +62,7 @@ describe('descriptorStatements', () => {
 
   it('emits a minimal descriptor with only the non-default fields', () => {
     const out = emitDescriptors(
-      modelWith([op('ping', { path: '/ping', successResponses: [JSON_OK] })])
+      modelWith([operation({ name: 'ping', path: '/ping', successResponses: [JSON_OK] })])
     );
     expect(out).toContain('ping: { id: "ping", method: "GET", path: "/ping" }');
     expect(out).toContain('as const satisfies Record<string, OperationDescriptor>;');
@@ -69,8 +72,11 @@ describe('descriptorStatements', () => {
   });
 
   it('matches the full minimal output', () => {
-    expect(emitDescriptors(modelWith([op('ping', { path: '/ping', successResponses: [JSON_OK] })])))
-      .toMatchInlineSnapshot(`
+    expect(
+      emitDescriptors(
+        modelWith([operation({ name: 'ping', path: '/ping', successResponses: [JSON_OK] })])
+      )
+    ).toMatchInlineSnapshot(`
         "/**
          * The wire-shape descriptor for every operation, keyed by operationId — the data the
          * runtime routes requests by. Also minification-safe static metadata (method, path,
@@ -90,7 +96,7 @@ describe('descriptorStatements', () => {
     // `id` drives middleware targeting (`ctx.operation.id`), so it stays the spec's
     // operationId — matching inline mode's `operationMetaExpr` — even when the key is renamed.
     const out = emitDescriptors(
-      modelWith([op('configure', { path: '/c', successResponses: [JSON_OK] })])
+      modelWith([operation({ name: 'configure', path: '/c', successResponses: [JSON_OK] })])
     );
     expect(out).toContain('configure_2: { id: "configure", method: "GET", path: "/c" }');
   });
@@ -99,7 +105,8 @@ describe('descriptorStatements', () => {
     const out = emitDescriptors(
       modelWith(
         [
-          op('use', {
+          operation({
+            name: 'use',
             path: '/u/{id}',
             pathParams: [param('id', 'path', true)],
             security: [['bearerAuth']],
@@ -117,7 +124,8 @@ describe('descriptorStatements', () => {
   it('records a non-identifier path param by its quoted wire name', () => {
     const out = emitDescriptors(
       modelWith([
-        op('getPet', {
+        operation({
+          name: 'getPet',
           path: '/pets/{pet-id}',
           pathParams: [param('pet-id', 'path', true)],
           successResponses: [JSON_OK],
@@ -131,15 +139,16 @@ describe('descriptorStatements', () => {
   it('emits params with in/style/explode/allowReserved only when present', () => {
     const out = emitDescriptors(
       modelWith([
-        op('getOrder', {
+        operation({
+          name: 'getOrder',
           path: '/orders/{orderId}',
           pathParams: [param('orderId', 'path', true)],
           queryParams: [
-            { ...param('tags', 'query'), style: 'pipeDelimited', explode: false },
-            { ...param('q', 'query'), allowReserved: true },
-            param('limit', 'query'),
+            { ...param('tags', 'query', false), style: 'pipeDelimited', explode: false },
+            { ...param('q', 'query', false), allowReserved: true },
+            param('limit', 'query', false),
           ],
-          headerParams: [param('X-Trace', 'header')],
+          headerParams: [param('X-Trace', 'header', false)],
         }),
       ])
     );
@@ -153,7 +162,8 @@ describe('descriptorStatements', () => {
   it('derives body.multipart, responseKind, and sseDataKind', () => {
     const multipart = emitDescriptors(
       modelWith([
-        op('upload', {
+        operation({
+          name: 'upload',
           method: 'post',
           requestBody: {
             contentType: 'multipart/form-data',
@@ -167,7 +177,8 @@ describe('descriptorStatements', () => {
 
     const json = emitDescriptors(
       modelWith([
-        op('create', {
+        operation({
+          name: 'create',
           method: 'post',
           requestBody: {
             contentType: 'application/json',
@@ -186,7 +197,8 @@ describe('descriptorStatements', () => {
 
     const text = emitDescriptors(
       modelWith([
-        op('readme', {
+        operation({
+          name: 'readme',
           successResponses: [
             {
               contentType: 'text/plain',
@@ -199,12 +211,13 @@ describe('descriptorStatements', () => {
     );
     expect(text).toContain('responseKind: "text"');
 
-    const none = emitDescriptors(modelWith([op('drop', { method: 'delete' })]));
+    const none = emitDescriptors(modelWith([operation({ name: 'drop', method: 'delete' })]));
     expect(none).toContain('responseKind: "void"');
 
     const blob = emitDescriptors(
       modelWith([
-        op('getPhoto', {
+        operation({
+          name: 'getPhoto',
           successResponses: [
             { contentType: 'image/png', schema: { kind: 'unknown' }, status: 200 },
           ],
@@ -215,7 +228,8 @@ describe('descriptorStatements', () => {
 
     const sse = emitDescriptors(
       modelWith([
-        op('streamEvents', {
+        operation({
+          name: 'streamEvents',
           successResponses: [
             {
               contentType: 'text/event-stream',
@@ -232,12 +246,15 @@ describe('descriptorStatements', () => {
 
   it('denormalizes security from the model schemes, skipping unknown keys', () => {
     const out = emitDescriptors(
-      modelWith([op('getOrder', { security: [['bearerAuth', 'apiCookie', 'ghost']] })], {
-        securitySchemes: [
-          { kind: 'bearer', key: 'bearerAuth' },
-          { kind: 'apiKeyCookie', key: 'apiCookie', cookieName: 'sid' },
-        ],
-      })
+      modelWith(
+        [operation({ name: 'getOrder', security: [['bearerAuth', 'apiCookie', 'ghost']] })],
+        {
+          securitySchemes: [
+            { kind: 'bearer', key: 'bearerAuth' },
+            { kind: 'apiKeyCookie', key: 'apiCookie', cookieName: 'sid' },
+          ],
+        }
+      )
     );
     expect(out).toContain(
       'security: [[{ scheme: "bearerAuth", kind: "bearer" }, { scheme: "apiCookie", kind: "apiKey", name: "sid", in: "cookie" }]]'
@@ -247,13 +264,16 @@ describe('descriptorStatements', () => {
 
   it('covers basic, apiKey header, and apiKey query schemes', () => {
     const out = emitDescriptors(
-      modelWith([op('getOrder', { security: [['basicAuth', 'apiHeader', 'apiQuery']] })], {
-        securitySchemes: [
-          { kind: 'basic', key: 'basicAuth' },
-          { kind: 'apiKeyHeader', key: 'apiHeader', headerName: 'X-Key' },
-          { kind: 'apiKeyQuery', key: 'apiQuery', paramName: 'api_key' },
-        ],
-      })
+      modelWith(
+        [operation({ name: 'getOrder', security: [['basicAuth', 'apiHeader', 'apiQuery']] })],
+        {
+          securitySchemes: [
+            { kind: 'basic', key: 'basicAuth' },
+            { kind: 'apiKeyHeader', key: 'apiHeader', headerName: 'X-Key' },
+            { kind: 'apiKeyQuery', key: 'apiQuery', paramName: 'api_key' },
+          ],
+        }
+      )
     );
     expect(out).toContain('{ scheme: "basicAuth", kind: "basic" }');
     expect(out).toContain('{ scheme: "apiHeader", kind: "apiKey", name: "X-Key", in: "header" }');
@@ -262,7 +282,10 @@ describe('descriptorStatements', () => {
 
   it('emits tags and the derived OperationId/OperationPath/OperationTag unions', () => {
     const out = emitDescriptors(
-      modelWith([op('listPets', { path: '/pets', tags: ['Pets'] }), op('ping', { path: '/ping' })])
+      modelWith([
+        operation({ name: 'listPets', path: '/pets', tags: ['Pets'] }),
+        operation({ name: 'ping', path: '/ping' }),
+      ])
     );
     expect(out).toContain('tags: ["Pets"]');
     expect(out).toContain('export type OperationId = keyof typeof OPERATIONS;');
@@ -277,7 +300,7 @@ describe('descriptorStatements', () => {
   });
 
   it('omits OperationTag when no operation has a tag (avoids never)', () => {
-    const out = emitDescriptors(modelWith([op('ping')]));
+    const out = emitDescriptors(modelWith([operation({ name: 'ping' })]));
     expect(out).toContain('export type OperationId');
     expect(out).toContain('export type OperationPath');
     expect(out).not.toContain('OperationTag');
@@ -285,12 +308,13 @@ describe('descriptorStatements', () => {
 
   it('emits the resolved pagination spec with stable key order, only on resolved ops', () => {
     const model = modelWith([
-      op('listOrders', {
+      operation({
+        name: 'listOrders',
         path: '/orders',
-        queryParams: [param('cursor', 'query')],
+        queryParams: [param('cursor', 'query', false)],
         successResponses: [JSON_OK],
       }),
-      op('ping', { path: '/ping', successResponses: [JSON_OK] }),
+      operation({ name: 'ping', path: '/ping', successResponses: [JSON_OK] }),
     ]);
     const pagination: ModelPagination = new Map([
       [
@@ -331,14 +355,16 @@ describe('opsInterfaceStatements', () => {
     return printStatements(opsInterfaceStatements(model, packageIdents(model), ctx));
   }
 
-  const getOrder = op('getOrder', {
+  const getOrder = operation({
+    name: 'getOrder',
     path: '/orders/{orderId}',
     pathParams: [param('orderId', 'path', true)],
     successResponses: [
       { contentType: 'application/json', schema: { kind: 'ref', name: 'Order' }, status: 200 },
     ],
   });
-  const streamOrders = op('streamOrders', {
+  const streamOrders = operation({
+    name: 'streamOrders',
     path: '/orders/stream',
     successResponses: [
       {
@@ -356,10 +382,11 @@ describe('opsInterfaceStatements', () => {
   it('emits per-operation args (via the Variables shape) and result members', () => {
     const out = emitOps(
       modelWith([
-        op('getOrder', {
+        operation({
+          name: 'getOrder',
           path: '/orders/{orderId}',
           pathParams: [param('orderId', 'path', true)],
-          queryParams: [param('include', 'query')],
+          queryParams: [param('include', 'query', false)],
           successResponses: [
             {
               contentType: 'application/json',
@@ -382,7 +409,8 @@ describe('opsInterfaceStatements', () => {
     // so the args type must key them the same way — never by the sanitized ident.
     const out = emitOps(
       modelWith([
-        op('getPet', {
+        operation({
+          name: 'getPet',
           path: '/pets/{pet-id}',
           pathParams: [param('pet-id', 'path', true)],
         }),
@@ -395,7 +423,8 @@ describe('opsInterfaceStatements', () => {
   it('keeps path params that sanitize to the same ident distinct via their wire names', () => {
     const out = emitOps(
       modelWith([
-        op('compare', {
+        operation({
+          name: 'compare',
           path: '/x/{a-b}/{a.b}',
           pathParams: [param('a-b', 'path', true), param('a.b', 'path', true)],
         }),
@@ -407,7 +436,7 @@ describe('opsInterfaceStatements', () => {
   });
 
   it('emits args: {} for a no-input operation', () => {
-    const out = emitOps(modelWith([op('ping')]));
+    const out = emitOps(modelWith([operation({ name: 'ping' })]));
     expect(out).toContain('ping: {\n        args: {};');
     expect(out).toContain('result: PingResult;');
   });
@@ -419,14 +448,14 @@ describe('opsInterfaceStatements', () => {
   });
 
   it('keys members by the collision-renamed identifier', () => {
-    const out = emitOps(modelWith([op('configure')]));
+    const out = emitOps(modelWith([operation({ name: 'configure' })]));
     expect(out).toContain('configure_2: {');
   });
 
   it('wraps the result in Result<…, <Op>Error> in result mode', () => {
     const out = emitOps(
       modelWith([
-        op('getOrder', {
+        operation({
           ...getOrder,
           errorResponses: [
             {
@@ -449,7 +478,7 @@ describe('opsInterfaceStatements', () => {
 
   it('inlines the error type when the <Op>Error alias collides with a schema', () => {
     const errored = (errorResponses: OperationModel['errorResponses']) =>
-      op('getOrder', { ...getOrder, errorResponses });
+      operation({ ...getOrder, errorResponses });
     const single = emitOps(
       modelWith([
         errored([
@@ -481,9 +510,10 @@ describe('opsInterfaceStatements', () => {
   });
 
   it('adds an item member (the page element type) only to paginated operations', () => {
-    const listOrders = op('listOrders', {
+    const listOrders = operation({
+      name: 'listOrders',
       path: '/orders',
-      queryParams: [param('cursor', 'query')],
+      queryParams: [param('cursor', 'query', false)],
       successResponses: [
         {
           contentType: 'application/json',
@@ -512,9 +542,10 @@ describe('opsInterfaceStatements', () => {
   });
 
   it('adds a page member (the RAW page type) to paginated operations in result mode only', () => {
-    const listOrders = op('listOrders', {
+    const listOrders = operation({
+      name: 'listOrders',
       path: '/orders',
-      queryParams: [param('cursor', 'query')],
+      queryParams: [param('cursor', 'query', false)],
       successResponses: [
         {
           contentType: 'application/json',
@@ -551,9 +582,10 @@ describe('opsInterfaceStatements', () => {
   });
 
   it('types item with the shared dateType handling', () => {
-    const listOrders = op('listOrders', {
+    const listOrders = operation({
+      name: 'listOrders',
       path: '/orders',
-      queryParams: [param('page', 'query')],
+      queryParams: [param('page', 'query', false)],
       successResponses: [JSON_OK],
     });
     const pagination: ModelPagination = new Map([
diff --git a/packages/client-generator/src/emitters/__tests__/fixtures.ts b/packages/client-generator/src/emitters/__tests__/fixtures.ts
index 9f9821389d..c046ac41a1 100644
--- a/packages/client-generator/src/emitters/__tests__/fixtures.ts
+++ b/packages/client-generator/src/emitters/__tests__/fixtures.ts
@@ -52,12 +52,17 @@ export function operation(overrides: Partial<OperationModel> = {}): OperationMod
 export function param(
   name: string,
   loc: ParamModel['in'],
-  required = false,
+  required: boolean,
   schema: SchemaModel = SCALAR
 ): ParamModel {
   return { name, in: loc, schema, required };
 }
 
+/** An `ApiModel` with a single `Default` service holding `ops`; spread `extra` to vary. */
+export function modelWith(ops: OperationModel[], extra: Partial<ApiModel> = {}): ApiModel {
+  return apiModel({ services: [{ name: 'Default', operations: ops }], ...extra });
+}
+
 /** A JSON `ResponseBodyModel`, defaulting to `status: 200`; spread to vary status/schema. */
 export function response(overrides: Partial<ResponseBodyModel> = {}): ResponseBodyModel {
   return { contentType: 'application/json', schema: SCALAR, status: 200, ...overrides };
diff --git a/packages/client-generator/src/emitters/__tests__/pagination.test.ts b/packages/client-generator/src/emitters/__tests__/pagination.test.ts
index d613573f92..cbab1fc97f 100644
--- a/packages/client-generator/src/emitters/__tests__/pagination.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/pagination.test.ts
@@ -39,10 +39,10 @@ function listOrders(extra: Partial<OperationModel> = {}): OperationModel {
     name: 'listOrders',
     path: '/orders',
     queryParams: [
-      param('cursor', 'query'),
+      param('cursor', 'query', false),
       param('offset', 'query', false, { kind: 'scalar', scalar: 'integer' }),
       param('page', 'query', false, { kind: 'scalar', scalar: 'number' }),
-      param('limit', 'query'),
+      param('limit', 'query', false),
     ],
     successResponses: [response({ schema: { kind: 'ref', name: 'OrderPage' } })],
     ...extra,
diff --git a/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts b/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
index b787a0340a..c16433f19f 100644
--- a/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
+++ b/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
@@ -1834,7 +1834,7 @@ describe('buildApiModel — security (C6.6)', () => {
         '/x': {
           get: {
             operationId: 'op',
-            ...(opSecurity !== undefined ? { security: opSecurity } : {}),
+            security: opSecurity,
             responses: {},
           },
         } as never,

From c6266bc37b11267197694a4dadf99abbb887cc3a Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <roman.marshevskyy@redoc.ly>
Date: Fri, 17 Jul 2026 18:32:25 +0300
Subject: [PATCH 123/134] Potential fix for pull request finding 'CodeQL /
 Workflow does not contain permissions'

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
---
 .github/workflows/tests.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 0329d16e68..fa05d472a5 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -7,6 +7,9 @@ on:
     branches:
       - main
 
+permissions:
+  contents: read
+
 env:
   CI: true
   REDOCLY_TELEMETRY: off

From 0f71a564505bc196594678cf904c088e26f862e6 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Fri, 17 Jul 2026 18:44:12 +0300
Subject: [PATCH 124/134] fix(client-generator): resolve server-URL variables,
 match pagination config by spec operationId, warn on cookie auth, drop dead
 queryAuthKeys

---
 docs/@v2/guides/use-generated-client.md       |  5 +++-
 .../src/emitters/__tests__/descriptor.test.ts |  1 -
 .../src/emitters/__tests__/pagination.test.ts | 12 +++++++++
 .../src/emitters/client-assembly.ts           |  3 ---
 .../src/emitters/operations.ts                |  2 --
 .../src/emitters/pagination.ts                |  7 ++---
 .../__tests__/build.test.ts                   | 26 ++++++++++++++++++-
 .../__tests__/sanitize-identifiers.test.ts    |  2 ++
 .../src/intermediate-representation/build.ts  | 22 +++++++++++++++-
 .../src/intermediate-representation/model.ts  |  5 ++++
 .../sanitize-identifiers.ts                   |  1 +
 11 files changed, 74 insertions(+), 12 deletions(-)

diff --git a/docs/@v2/guides/use-generated-client.md b/docs/@v2/guides/use-generated-client.md
index c573ead026..2b698d2ff4 100644
--- a/docs/@v2/guides/use-generated-client.md
+++ b/docs/@v2/guides/use-generated-client.md
@@ -54,7 +54,10 @@ A setter is generated for each `securityScheme` the runtime can apply:
 | HTTP `basic`                   | `setBasicAuth(user, pass)`                | `Authorization: Basic <base64>`          |
 | `apiKey` (header/query/cookie) | `setApiKey(key)` / `setApiKey<Name>(key)` | the named header, query param, or cookie |
 
-`setApiKey` is unsuffixed for a single apiKey scheme; otherwise each gets `setApiKey<SchemeName>`. `mutualTLS` is not injectable. Bearer and apiKey credentials accept a **`TokenProvider`** — a string or a (possibly async) function called per request, handy for refresh flows:
+`setApiKey` is unsuffixed for a single apiKey scheme; otherwise each gets `setApiKey<SchemeName>`.
+`mutualTLS` is not injectable.
+Cookie apiKey credentials travel in the `Cookie` request header, which browsers refuse to set — cookie auth works only in server-side clients (the generator warns when a spec declares one).
+Bearer and apiKey credentials accept a **`TokenProvider`** — a string or a (possibly async) function called per request, handy for refresh flows:
 
 ```ts
 import { setBearer } from './client.ts';
diff --git a/packages/client-generator/src/emitters/__tests__/descriptor.test.ts b/packages/client-generator/src/emitters/__tests__/descriptor.test.ts
index 52582e7d94..dc88b5e657 100644
--- a/packages/client-generator/src/emitters/__tests__/descriptor.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/descriptor.test.ts
@@ -348,7 +348,6 @@ describe('opsInterfaceStatements', () => {
       argsStyle: 'flat',
       errorMode: 'throw',
       dateType: 'string',
-      queryAuthKeys: new Set(),
       schemaNames: new Set(),
       ...extra,
     };
diff --git a/packages/client-generator/src/emitters/__tests__/pagination.test.ts b/packages/client-generator/src/emitters/__tests__/pagination.test.ts
index cbab1fc97f..f3a5ba74e0 100644
--- a/packages/client-generator/src/emitters/__tests__/pagination.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/pagination.test.ts
@@ -191,6 +191,18 @@ describe('resolveOperationPagination — sources and precedence', () => {
     expect(extensionWins.spec?.style).toBe('offset');
   });
 
+  it('matches exclude and operations keys against the spec operationId of a renamed op', () => {
+    const op = listOrders({ name: 'list_orders', specName: 'list-orders' });
+    expect(
+      resolveOperationPagination(op, modelWith([op]), { ...PAGE_RULE, exclude: ['list-orders'] })
+    ).toEqual({});
+    const result = resolveOperationPagination(op, modelWith([op]), {
+      operations: { 'list-orders': CURSOR_RULE },
+    });
+    expect(result.error).toBeUndefined();
+    expect(result.spec?.style).toBe('cursor');
+  });
+
   it('exclude kills every source for the operation', () => {
     const op = listOrders({ paginationExtension: OFFSET_RULE });
     const result = resolveOperationPagination(op, modelWith([op]), {
diff --git a/packages/client-generator/src/emitters/client-assembly.ts b/packages/client-generator/src/emitters/client-assembly.ts
index a9fad30a18..a5b8eb971a 100644
--- a/packages/client-generator/src/emitters/client-assembly.ts
+++ b/packages/client-generator/src/emitters/client-assembly.ts
@@ -88,9 +88,6 @@ function emitClient(
     argsStyle: options.argsStyle ?? 'flat',
     errorMode: options.errorMode ?? 'throw',
     dateType: options.dateType ?? 'string',
-    queryAuthKeys: new Set(
-      model.securitySchemes.filter((s) => s.kind === 'apiKeyQuery').map((s) => s.key)
-    ),
     schemaNames: new Set(model.schemas.map((s) => s.name)),
     pagination,
   };
diff --git a/packages/client-generator/src/emitters/operations.ts b/packages/client-generator/src/emitters/operations.ts
index 8f92506ac1..281fb37d26 100644
--- a/packages/client-generator/src/emitters/operations.ts
+++ b/packages/client-generator/src/emitters/operations.ts
@@ -31,8 +31,6 @@ export type EmitContext = {
   argsStyle: ArgsStyle;
   errorMode: ErrorMode;
   dateType: DateType;
-  /** Security-scheme keys whose credential is sent as a URL query param. */
-  queryAuthKeys: Set<string>;
   /** Names of every exported schema, used for `<Op>*` alias collision suppression. */
   schemaNames: Set<string>;
   /** Resolved auto-pagination per operation name (absent ⇒ nothing paginates). */
diff --git a/packages/client-generator/src/emitters/pagination.ts b/packages/client-generator/src/emitters/pagination.ts
index d7e08755a0..124bd90cf4 100644
--- a/packages/client-generator/src/emitters/pagination.ts
+++ b/packages/client-generator/src/emitters/pagination.ts
@@ -75,10 +75,11 @@ export function resolveOperationPagination(
   model: ApiModel,
   config: PaginationConfig | undefined
 ): ResolvedPagination {
-  if (config?.exclude?.includes(op.name)) return {};
-  const perOp = config?.operations?.[op.name];
+  const configName = op.specName ?? op.name;
+  if (config?.exclude?.includes(configName)) return {};
+  const perOp = config?.operations?.[configName];
   if (perOp !== undefined) {
-    return applyRule(op, model, perOp, `pagination.operations["${op.name}"]`, true);
+    return applyRule(op, model, perOp, `pagination.operations["${configName}"]`, true);
   }
   if (op.paginationExtension !== undefined) {
     return applyRule(op, model, op.paginationExtension, 'x-pagination', true);
diff --git a/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts b/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
index c16433f19f..cab7453e23 100644
--- a/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
+++ b/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
@@ -83,6 +83,25 @@ describe('buildApiModel — top-level metadata', () => {
     expect(model.serverUrl).toBe('https://api.example.com');
   });
 
+  it('substitutes server-URL variables with their declared defaults', () => {
+    const model = buildApiModel(
+      doc({
+        servers: [
+          {
+            url: 'https://{env}.example.com/{basePath}',
+            variables: { env: { default: 'api' }, basePath: { default: 'v2' } },
+          },
+        ],
+      })
+    );
+    expect(model.serverUrl).toBe('https://api.example.com/v2');
+  });
+
+  it('keeps an undeclared server-URL variable as its placeholder', () => {
+    const model = buildApiModel(doc({ servers: [{ url: 'https://{env}.example.com' }] }));
+    expect(model.serverUrl).toBe('https://{env}.example.com');
+  });
+
   it('falls back to defaults when info/servers are missing', () => {
     const model = buildApiModel({ openapi: '3.0.3', paths: {} } as Oas3Definition);
     expect(model.title).toBe('Api');
@@ -1887,13 +1906,18 @@ describe('buildApiModel — security (C6.6)', () => {
     ]);
   });
 
-  it('models apiKey-in-cookie schemes with their cookie name', () => {
+  it('models apiKey-in-cookie schemes with their cookie name and warns about browsers', () => {
+    const warn = vi.spyOn(logger, 'warn').mockImplementation(() => {});
     const model = buildApiModel(
       doc(withSchemes({ CookieKey: { type: 'apiKey', in: 'cookie', name: 'sid' } }))
     );
     expect(model.securitySchemes).toEqual([
       { kind: 'apiKeyCookie', key: 'CookieKey', cookieName: 'sid' },
     ]);
+    expect(warn).toHaveBeenCalledWith(
+      'generate-client: security scheme "CookieKey" sends its credential in the Cookie header, ' +
+        'which browsers ignore — cookie auth works only in server-side clients.\n'
+    );
   });
 
   it('skips non-injectable schemes (http without scheme, mutualTLS)', () => {
diff --git a/packages/client-generator/src/intermediate-representation/__tests__/sanitize-identifiers.test.ts b/packages/client-generator/src/intermediate-representation/__tests__/sanitize-identifiers.test.ts
index a8707d2cef..ffa1460e58 100644
--- a/packages/client-generator/src/intermediate-representation/__tests__/sanitize-identifiers.test.ts
+++ b/packages/client-generator/src/intermediate-representation/__tests__/sanitize-identifiers.test.ts
@@ -173,6 +173,8 @@ describe('sanitizeIdentifiers', () => {
     sanitizeIdentifiers(m);
     const o = m.services[0].operations[0];
     expect(o.name).toBe('do_thing');
+    // The spec operationId survives the rename so user config keys can still match.
+    expect(o.specName).toBe('do-thing');
     expect(o.pathParams[0].schema).toEqual(ref('A_B'));
     expect(o.queryParams[0].schema).toEqual(ref('A_B'));
     expect(o.headerParams[0].schema).toEqual(ref('A_B'));
diff --git a/packages/client-generator/src/intermediate-representation/build.ts b/packages/client-generator/src/intermediate-representation/build.ts
index b046a2a14e..570f507645 100644
--- a/packages/client-generator/src/intermediate-representation/build.ts
+++ b/packages/client-generator/src/intermediate-representation/build.ts
@@ -8,6 +8,7 @@ import {
   type Oas3Parameter,
   type Oas3PathItem,
   type Oas3Schema,
+  type Oas3Server,
   type Oas3_1Schema,
 } from '@redocly/openapi-core';
 
@@ -196,11 +197,24 @@ function mergeMetadata(
   return { ...a, ...b };
 }
 
+/**
+ * The first server's URL with `{variable}` templates substituted by their declared
+ * defaults (required by the spec). An undeclared variable keeps its placeholder —
+ * there is nothing valid to substitute, and the literal template is easier to spot.
+ */
+function resolveServerUrl(server: Oas3Server | undefined): string {
+  if (!server) return '';
+  return server.url.replace(
+    /\{([^{}]+)\}/g,
+    (template, variableName: string) => server.variables?.[variableName]?.default ?? template
+  );
+}
+
 export function buildApiModel(doc: Oas3Definition): ApiModel {
   const title = doc.info?.title ?? 'Api';
   const version = doc.info?.version ?? '0.0.0';
   const description = doc.info?.description;
-  const serverUrl = doc.servers?.[0]?.url ?? '';
+  const serverUrl = resolveServerUrl(doc.servers?.[0]);
 
   const schemas = buildNamedSchemas(doc);
   const securitySchemes = buildSecuritySchemes(doc);
@@ -320,6 +334,12 @@ function buildSecuritySchemes(doc: Oas3Definition): SecuritySchemeModel[] {
     } else if (type === 'apiKey' && scheme.in === 'query' && typeof scheme.name === 'string') {
       result.push({ kind: 'apiKeyQuery', key, paramName: scheme.name });
     } else if (type === 'apiKey' && scheme.in === 'cookie' && typeof scheme.name === 'string') {
+      // Injected via the Cookie request header, which browsers refuse to set —
+      // the credential silently goes missing there, so tell the user up front.
+      logger.warn(
+        `generate-client: security scheme "${key}" sends its credential in the Cookie header, ` +
+          `which browsers ignore — cookie auth works only in server-side clients.\n`
+      );
       result.push({ kind: 'apiKeyCookie', key, cookieName: scheme.name });
     }
     // Everything else (http schemes other than bearer/basic, mutualTLS) is not
diff --git a/packages/client-generator/src/intermediate-representation/model.ts b/packages/client-generator/src/intermediate-representation/model.ts
index 46d45affd0..19e3014418 100644
--- a/packages/client-generator/src/intermediate-representation/model.ts
+++ b/packages/client-generator/src/intermediate-representation/model.ts
@@ -181,6 +181,11 @@ export type SecuritySchemeModel =
 
 export type OperationModel = {
   name: string;
+  /**
+   * The spec's operationId when `name` was rewritten by identifier sanitization.
+   * User-facing config (pagination `exclude`/`operations` keys) matches this.
+   */
+  specName?: string;
   method: 'get' | 'post' | 'put' | 'delete' | 'patch' | 'head' | 'options';
   path: string;
   summary?: string;
diff --git a/packages/client-generator/src/intermediate-representation/sanitize-identifiers.ts b/packages/client-generator/src/intermediate-representation/sanitize-identifiers.ts
index a2e0afb53b..cb54524c08 100644
--- a/packages/client-generator/src/intermediate-representation/sanitize-identifiers.ts
+++ b/packages/client-generator/src/intermediate-representation/sanitize-identifiers.ts
@@ -60,6 +60,7 @@ export function sanitizeIdentifiers(model: ApiModel): void {
       const safe = uniqueIdent(op.name, operationNames);
       if (safe !== op.name) {
         warnRename('operation', op.name, safe);
+        op.specName = op.name;
         op.name = safe;
       }
       rewriteOperationRefs(op, fixRef);

From a8deb8048e9869eea5e84c18bac7844210e1af2e Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 20 Jul 2026 12:42:10 +0300
Subject: [PATCH 125/134] fix(client-generator): snapshot release

---
 .github/workflows/release.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index a9bd6ec2b0..41101159bb 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -218,6 +218,10 @@ jobs:
           jq ".version = \"$VERSION\"" packages/respect-core/package.json > tmp.json && mv tmp.json packages/respect-core/package.json
           jq ".dependencies[\"@redocly/openapi-core\"] = \"$VERSION\"" packages/respect-core/package.json > tmp.json && mv tmp.json packages/respect-core/package.json
 
+          # Update Client Generator package version and dependencies
+          jq ".version = \"$VERSION\"" packages/client-generator/package.json > tmp.json && mv tmp.json packages/client-generator/package.json
+          jq ".dependencies[\"@redocly/openapi-core\"] = \"$VERSION\"" packages/client-generator/package.json > tmp.json && mv tmp.json packages/client-generator/package.json
+
           # Update CLI package version
           jq ".version = \"$VERSION\"" packages/cli/package.json > tmp.json && mv tmp.json packages/cli/package.json
 
@@ -254,6 +258,10 @@ jobs:
           npm publish --tag snapshot
           sleep 10
 
+          cd ../client-generator
+          npm publish --tag snapshot
+          sleep 10
+
           cd ../cli
           npm run prepare:publish-dir
           npm publish ./.publish --tag snapshot

From d4c6f3ba902c14bb76f862533f8db3b486c96790 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 20 Jul 2026 13:00:42 +0300
Subject: [PATCH 126/134] fix(client-generator): snapshot release p2

---
 .github/workflows/release.yaml         | 8 +++++---
 package-lock.json                      | 4 ++--
 packages/cli/package.json              | 2 +-
 packages/client-generator/package.json | 5 ++++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 41101159bb..3378888720 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -206,6 +206,11 @@ jobs:
           cache: npm
           registry-url: https://registry.npmjs.org
 
+      # Install before the version bump: npm links workspace packages only while
+      # their versions still match the dependency specs in package.json files.
+      - name: Install dependencies
+        run: npm install
+
       - name: Update package versions
         run: |
           TIMESTAMP=$(date +%s)
@@ -240,9 +245,6 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PR_NUMBER: ${{ github.event.pull_request.number }}
 
-      - name: Install dependencies
-        run: npm install
-
       - name: Build packages
         run: npm run compile
 
diff --git a/package-lock.json b/package-lock.json
index 257e87399b..fe814eca22 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9877,7 +9877,7 @@
         "@opentelemetry/sdk-trace-node": "2.8.0",
         "@opentelemetry/semantic-conventions": "1.41.1",
         "@redocly/cli-otel": "0.3.4",
-        "@redocly/client-generator": "0.0.0",
+        "@redocly/client-generator": "0.1.0",
         "@redocly/openapi-core": "2.39.0",
         "@redocly/respect-core": "2.39.0",
         "@types/cookie": "0.6.0",
@@ -9912,7 +9912,7 @@
     },
     "packages/client-generator": {
       "name": "@redocly/client-generator",
-      "version": "0.0.0",
+      "version": "0.1.0",
       "license": "MIT",
       "dependencies": {
         "@redocly/openapi-core": "2.39.0"
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 436c36f4ca..8d9f250223 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -45,7 +45,7 @@
     "@opentelemetry/sdk-trace-node": "2.8.0",
     "@opentelemetry/semantic-conventions": "1.41.1",
     "@redocly/cli-otel": "0.3.4",
-    "@redocly/client-generator": "0.0.0",
+    "@redocly/client-generator": "0.1.0",
     "@redocly/openapi-core": "2.39.0",
     "@redocly/respect-core": "2.39.0",
     "@types/cookie": "0.6.0",
diff --git a/packages/client-generator/package.json b/packages/client-generator/package.json
index 9894157142..78c59c9db6 100644
--- a/packages/client-generator/package.json
+++ b/packages/client-generator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@redocly/client-generator",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "description": "Generate typed, zero-dependency TypeScript clients (fetch, auth, retries, middleware, SSE) from OpenAPI descriptions.",
   "type": "module",
   "types": "lib/index.d.ts",
@@ -18,6 +18,9 @@
     "npm": ">=10"
   },
   "engineStrict": true,
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "examples:regen": "node scripts/regenerate-examples.mjs",
     "prepare": "node scripts/generate-runtime-sources.mjs",

From c1e7ce0bed16dfc8b60e030a2db345b38d148f22 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 20 Jul 2026 14:11:55 +0300
Subject: [PATCH 127/134] chore(examples): reference the published
 client-generator snapshot instead of file specs

---
 tests/e2e/generate-client/examples/multi-instance/package.json  | 2 +-
 tests/e2e/generate-client/examples/package-runtime/package.json | 2 +-
 tests/e2e/generate-client/examples/programmatic/package.json    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/e2e/generate-client/examples/multi-instance/package.json b/tests/e2e/generate-client/examples/multi-instance/package.json
index 7a6f010319..9fa8771aca 100644
--- a/tests/e2e/generate-client/examples/multi-instance/package.json
+++ b/tests/e2e/generate-client/examples/multi-instance/package.json
@@ -9,7 +9,7 @@
     "build": "vite build"
   },
   "dependencies": {
-    "@redocly/client-generator": "file:../../../../../packages/client-generator"
+    "@redocly/client-generator": "0.0.0-snapshot.manual"
   },
   "devDependencies": {
     "@redocly/cli": "latest",
diff --git a/tests/e2e/generate-client/examples/package-runtime/package.json b/tests/e2e/generate-client/examples/package-runtime/package.json
index b272b57139..13b91e1ff7 100644
--- a/tests/e2e/generate-client/examples/package-runtime/package.json
+++ b/tests/e2e/generate-client/examples/package-runtime/package.json
@@ -9,7 +9,7 @@
     "build": "vite build"
   },
   "dependencies": {
-    "@redocly/client-generator": "file:../../../../../packages/client-generator"
+    "@redocly/client-generator": "0.0.0-snapshot.manual"
   },
   "devDependencies": {
     "@redocly/cli": "latest",
diff --git a/tests/e2e/generate-client/examples/programmatic/package.json b/tests/e2e/generate-client/examples/programmatic/package.json
index 6d7561ef41..f284e73bec 100644
--- a/tests/e2e/generate-client/examples/programmatic/package.json
+++ b/tests/e2e/generate-client/examples/programmatic/package.json
@@ -7,7 +7,7 @@
     "generate": "tsx generate.ts"
   },
   "devDependencies": {
-    "@redocly/client-generator": "latest",
+    "@redocly/client-generator": "0.0.0-snapshot.manual",
     "tsx": "^4.0.0",
     "typescript": "^5.5.0"
   }

From 75b1cd61b23f688cec8da001dbd29bfaa8495adf Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 20 Jul 2026 16:14:20 +0300
Subject: [PATCH 128/134] fix(client-generator): publish the CLI snapshot
 before client-generator

---
 .github/workflows/release.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 3378888720..fd322abf71 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -260,11 +260,11 @@ jobs:
           npm publish --tag snapshot
           sleep 10
 
-          cd ../client-generator
-          npm publish --tag snapshot
-          sleep 10
-
           cd ../cli
           npm run prepare:publish-dir
           npm publish ./.publish --tag snapshot
           npm run clean:publish-dir
+          sleep 10
+
+          cd ../client-generator
+          npm publish --tag snapshot

From f11d5af85efe80fa1093f08f443ed019985caddc Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 20 Jul 2026 16:14:28 +0300
Subject: [PATCH 129/134] test(cli): per-api runtime-only block inherits shared
 generators and outputMode

---
 .../generate-client/redocly-config.test.ts    | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/tests/e2e/generate-client/redocly-config.test.ts b/tests/e2e/generate-client/redocly-config.test.ts
index d7692d45b5..064d7f83c8 100644
--- a/tests/e2e/generate-client/redocly-config.test.ts
+++ b/tests/e2e/generate-client/redocly-config.test.ts
@@ -439,6 +439,34 @@ describe('generate-client redocly.yaml config', () => {
     rmSync(dir, { recursive: true, force: true });
   }, 60_000);
 
+  it('a per-api block holding only `runtime: package` inherits generators and outputMode', () => {
+    // The exact shape that regressed in the 0.0.0-snapshot.1784539614 publish: the api's
+    // block sets one field; `generators: [sdk, zod]` and `outputMode: split` must
+    // still arrive from the top level (3 files), with the per-api runtime layered in.
+    const dir = project(
+      [
+        'client:',
+        '  generators: [sdk, zod]',
+        '  outputMode: split',
+        'apis:',
+        '  realm:',
+        '    root: ./openapi.yaml',
+        '    clientOutput: ./out/client.ts',
+        '    client:',
+        '      runtime: package',
+      ].join('\n') + '\n'
+    );
+    const res = run(dir, ['realm']);
+    expect(res.status, res.stderr).toBe(0);
+    expect(existsSync(join(dir, 'out/client.ts'))).toBe(true);
+    expect(existsSync(join(dir, 'out/client.schemas.ts'))).toBe(true); // outputMode inherited
+    expect(existsSync(join(dir, 'out/client.zod.ts'))).toBe(true); // generators inherited
+    expect(readFileSync(join(dir, 'out/client.ts'), 'utf-8')).toContain(
+      "from '@redocly/client-generator'" // the per-api runtime applied on top
+    );
+    rmSync(dir, { recursive: true, force: true });
+  }, 60_000);
+
   it('resolves a relative clientOutput against the redocly.yaml dir (via --config)', () => {
     const dir = project(
       [

From a6c3064d942c3f50345ac148ba08627ea289d43f Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 20 Jul 2026 17:40:34 +0300
Subject: [PATCH 130/134] chore(client-generator): docs updates

---
 docs/@v2/commands/generate-client.md          | 162 +++---
 docs/@v2/configuration/reference/client.md    | 235 ++++++--
 docs/@v2/guides/use-generated-client.md       |  67 +--
 packages/client-generator/README.md           | 502 +++---------------
 .../examples/multi-instance/package.json      |   2 +-
 .../examples/package-runtime/package.json     |   2 +-
 .../examples/programmatic/package.json        |   2 +-
 7 files changed, 373 insertions(+), 599 deletions(-)

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index ada6167bef..9e4264f60a 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -1,114 +1,108 @@
----
-slug:
-  - /docs/cli/commands/generate-client
----
-
 # `generate-client`
 
 {% admonition type="warning" name="Experimental" %}
-`generate-client` is **experimental**: its flags, generated output, configuration schema, and custom-generator API may change in any minor release until it's stable.
+`generate-client` is an experimental feature: its flags, generated output, configuration schema, and custom-generator API may change in any minor release until it's stable.
 We'd love your feedback while we stabilize it.
 {% /admonition %}
 
-Generate a typed TypeScript client from an OpenAPI 3.x description.
-Swagger 2.0 descriptions are also accepted — normalized to the 3.x shape before generation.
+## Introduction
+
+The `generate-client` command generates a typed TypeScript client from an OpenAPI 3.x description.
+Swagger 2.0 descriptions are also accepted and normalized to the 3.x shape before generation.
 
-The generated client has **zero runtime dependencies** by default — it uses only web-standard APIs (`fetch`, `AbortController`, `URLSearchParams`, …), so it runs in browsers, Node, Bun, Deno, and edge runtimes.
-By default it emits a single self-contained file with inline types and one async function per operation; opt in to a versioned, npm-updatable runtime instead with [`--runtime package`](#runtime-distribution).
+The generated client has zero runtime dependencies by default — it uses only web-standard APIs (`fetch`, `AbortController`, `URLSearchParams`), so it runs in browsers, Node, Bun, Deno, and edge runtimes.
+By default it emits a single self-contained file with inline types and one async function per operation.
 
-This page covers running the command; for the generated client's runtime API (auth, error handling, middleware, retries, and the add-on generators) see [Use the generated client](../guides/use-generated-client.md).
+The `<api>` argument is a file path, a URL, or an [`apis:` alias](../configuration/index.md), resolved the same way as in other commands such as `bundle` and `lint`.
+An alias, or a path matching an api's `root`, uses that api's `client` block and `clientOutput`; an unmatched path or URL uses the top-level `client` defaults.
+With no argument, a client is generated for every api that declares a `client` block or a `clientOutput` (see [`client` configuration](../configuration/reference/client.md)).
+
+This page covers running the command; for the generated client's runtime API (auth, error handling, middleware, retries, and the add-on generators), see [Use the generated client](../guides/use-generated-client.md).
 
 ## Usage
 
-```sh
-redocly generate-client                          # every api with a `client` block or `clientOutput`
-redocly generate-client cafe                     # a single `apis:` alias from redocly.yaml
-redocly generate-client openapi.yaml -o dist/client.ts   # a file path or URL
+```bash
+redocly generate-client
+redocly generate-client <api>
+redocly generate-client <api> [--output=<path>] [--output-mode=<mode>] [--runtime=<mode>]
+redocly generate-client <api> [--generator=<name>] [--args-style=<style>] [--error-mode=<mode>]
+redocly generate-client <api> [--config=<path>]
 ```
 
-With no argument, a client is generated for every api that declares a `client` block or a `clientOutput` under `apis:` (see [`client` configuration](../configuration/reference/client.md)).
-Otherwise `<api>` is a file path, a URL, or an [`apis:` alias](../configuration/index.md), resolved the same way as in other commands such as `bundle` and `lint`: an alias — or a path matching an api's `root` — uses that api's `client` block and `clientOutput`, while an unmatched path/URL uses the top-level `client` defaults.
-
 ## Options
 
-| Option              | Type       | Description                                                                                                                                                                                                                       |
-| ------------------- | ---------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `api`               | `string`   | OpenAPI description file path, URL, or an `apis:` alias. Omit it to generate for every api that has a `client` block or `clientOutput`.                                                                                           |
-| `--output`, `-o`    | `string`   | Output path (must end in `.ts`); the entry file in multi-file modes. Defaults to the api's `clientOutput`, else `<name>.client.ts` in the config dir. Not allowed when generating for multiple apis.                              |
-| `--output-mode`     | `string`   | File layout: `single` (default) or `split`. See [Output modes](#output-modes).                                                                                                                                                    |
-| `--runtime`         | `string`   | `inline` (default, self-contained file — zero runtime dependencies) or `package` (imports the runtime from `@redocly/client-generator`; engine fixes arrive via `npm update`). See [Runtime distribution](#runtime-distribution). |
-| `--generator`       | `string[]` | Generator to run — a built-in name or a custom generator's path/package; repeat the flag to run several (default `sdk`). See [Generators](../guides/use-generated-client.md#generators).                                          |
-| `--args-style`      | `string`   | Operation inputs: `flat` (default, positional) or `grouped` (a single `vars` object). See [Argument style](../guides/use-generated-client.md#argument-style).                                                                     |
-| `--enum-style`      | `string`   | Named string enums: `const-object` (default, `as const` object + union) or `union` (union only).                                                                                                                                  |
-| `--error-mode`      | `string`   | `throw` (default, throws `ApiError`) or `result` (returns `{ data, error, response }`). See [Error handling](../guides/use-generated-client.md#error-handling).                                                                   |
-| `--date-type`       | `string`   | `date`/`date-time` fields as `string` (default) or `Date` (pair with the `transformers` generator).                                                                                                                               |
-| `--query-framework` | `string`   | TanStack Query adapter: `react` (default), `vue`, `svelte`, or `solid`.                                                                                                                                                           |
-| `--mock-data`       | `string`   | `mock` generator data: `baked` (default, deterministic literals) or `faker` (`@faker-js/faker` calls).                                                                                                                            |
-| `--mock-seed`       | `number`   | Seed for `faker`-mode mocks, for reproducible data. Ignored in `baked` mode.                                                                                                                                                      |
-| `--server-url`      | `string`   | Override the server URL inlined into the runtime. Defaults to `servers[0].url`. Accepts absolute (`https://api.example.com`) or relative (`/v1`).                                                                                 |
-| `--setup`           | `string`   | Path to a publisher setup module baked into the client. See [Publisher defaults](../guides/use-generated-client.md#publisher-defaults).                                                                                           |
-| `--config`          | `string`   | Path to the `redocly.yaml` (the `client` config and `apis:` live there). Defaults to the one in the working directory.                                                                                                            |
-
-## Configuration
-
-Instead of passing flags every time, keep the settings in `redocly.yaml` under a top-level `client` block and per-API `apis.<name>.client` / `clientOutput`.
+| Option              | Type       | Description                                                                                                                                                                                         |
+| ------------------- | ---------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `api`               | `string`   | OpenAPI description file path, URL, or an `apis:` alias. Omit it to generate for every api that has a `client` block or `clientOutput`.                                                             |
+| `--output`, `-o`    | `string`   | Output path (must end in `.ts`); the entry file in multi-file modes. Defaults to the api's `clientOutput`, else `<name>.client.ts` next to the configuration file. Single-API invocations only.     |
+| `--output-mode`     | `string`   | File layout. See [Choose an output mode](#choose-an-output-mode). <br/> **Possible values:** `single`, `split`. Default value is `single`.                                                          |
+| `--runtime`         | `string`   | Where the client's engine lives. See [Choose a runtime](#choose-a-runtime). <br/> **Possible values:** `inline`, `package`. Default value is `inline`.                                              |
+| `--generator`       | `[string]` | Generator to run — a built-in name or a custom generator's path or package; repeat the flag to run several. Default value is `sdk`. See [Generators](../guides/use-generated-client.md#generators). |
+| `--args-style`      | `string`   | How operation inputs are passed. See [Argument style](../guides/use-generated-client.md#argument-style). <br/> **Possible values:** `flat`, `grouped`. Default value is `flat`.                     |
+| `--enum-style`      | `string`   | How named string enums are emitted. <br/> **Possible values:** `const-object` (an `as const` object + union), `union` (union only). Default value is `const-object`.                                |
+| `--error-mode`      | `string`   | How operations report HTTP errors. See [Error handling](../guides/use-generated-client.md#error-handling). <br/> **Possible values:** `throw`, `result`. Default value is `throw`.                  |
+| `--date-type`       | `string`   | Type of `date`/`date-time` fields; pair `Date` with the `transformers` generator. <br/> **Possible values:** `string`, `Date`. Default value is `string`.                                           |
+| `--query-framework` | `string`   | Framework adapter for the `tanstack-query` generator. <br/> **Possible values:** `react`, `vue`, `svelte`, `solid`. Default value is `react`.                                                       |
+| `--mock-data`       | `string`   | Data mode for the `mock` generator. <br/> **Possible values:** `baked` (deterministic literals), `faker` (`@faker-js/faker` calls). Default value is `baked`.                                       |
+| `--mock-seed`       | `number`   | Seed for `faker`-mode mocks, for reproducible data. Ignored in `baked` mode.                                                                                                                        |
+| `--server-url`      | `string`   | Override the server URL baked into the client. Accepts an absolute (`https://api.example.com`) or relative (`/v1`) URL. Defaults to `servers[0].url`.                                               |
+| `--setup`           | `string`   | Path to a publisher setup module baked into the client. See [Publisher defaults](../guides/use-generated-client.md#publisher-defaults).                                                             |
+| `--config`          | `string`   | Specify path to the [configuration file](#generate-from-the-configuration-file).                                                                                                                    |
+
+## Examples
+
+### Generate from the configuration file
+
+Instead of passing flags every time, keep the settings in `redocly.yaml` under a top-level `client` block and per-API `apis.<name>.client` / `clientOutput` — see the [`client` configuration reference](../configuration/reference/client.md) for the fields and how they layer.
 CLI flags take precedence over the configuration.
-A per-API `client` block overrides the top-level `client` field by field; unspecified fields fall back to the top-level defaults.
-See [`client` configuration](../configuration/reference/client.md) for the full reference.
+Auto-pagination has no CLI flag; it's declared only as [`client.pagination`](../configuration/reference/client.md#pagination-object) configuration or the `x-pagination` operation extension.
+
+```yaml
+client:
+  generators:
+    - sdk
+apis:
+  cafe:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+```
+
+```bash
+redocly generate-client            # every api with a `client` block or `clientOutput`
+redocly generate-client cafe       # just the `cafe` api
+```
 
-Auto-pagination has **no CLI flag**: it's declared as structured configuration — [`client.pagination`](../configuration/reference/client.md#pagination) in `redocly.yaml`, or the equivalent `x-pagination` operation extension in the spec — and paginated operations gain typed `.pages()`/`.items()` async iterators.
-See [Pagination in the usage guide](../guides/use-generated-client.md#pagination).
+### Generate from a file path or URL
 
-## Output modes
+An unmatched path or URL uses the top-level `client` defaults; `--output` names the entry file:
+
+```bash
+redocly generate-client openapi.yaml --output dist/client.ts
+```
+
+### Choose an output mode
 
 `--output-mode` controls how the client is split across files:
 
 - `single` (default) — one file (self-contained with the default `inline` runtime).
-- `split` — two files: the schema types and type guards move to a sibling `<name>.schemas.ts`, and the entry file (everything else) re-exports them — so your imports are the same as in `single`.
+- `split` — two files: the schema types and type guards move to a sibling `<name>.schemas.ts`, and the entry file re-exports them, so your imports are the same as in `single`.
 
-`--output` names the entry file; the `.schemas.ts` sibling derives from its name and directory. Both modes work with both [runtimes](#runtime-distribution).
+```bash
+redocly generate-client openapi.yaml -o src/api/client.ts --output-mode split
+```
+
+Both modes work with both runtimes.
 
-## Runtime distribution
+### Choose a runtime
 
 `--runtime` controls where the client's engine (request building, auth, retries, middleware, SSE) lives:
 
-- `inline` (default) — the same runtime source is embedded in the generated output (only the parts your API needs): self-contained, zero runtime dependencies.
-- `package` — the generated file imports the runtime from `@redocly/client-generator` and contains only the types, pure-data operation descriptors, and thin call wrappers:
-
-  ```ts
-  import {
-    createClient,
-    type OperationDescriptor,
-    type RequestOptions,
-  } from '@redocly/client-generator';
-
-  export const OPERATIONS = {
-    getOrderById: {
-      id: 'getOrderById',
-      method: 'GET',
-      path: '/orders/{orderId}',
-      tags: ['Orders'],
-      params: [
-        /* … */
-      ],
-    },
-    // …
-  } as const satisfies Record<string, OperationDescriptor>;
-
-  export const client = createClient<Ops>(OPERATIONS, { serverUrl: 'https://api.example.com' });
-  export const { configure, use } = client;
-  export const getOrderById = (orderId: string, init: RequestOptions = {}) =>
-    client.getOrderById({ orderId }, init);
-  ```
-
-Choose `package` when you want engine fixes and improvements to arrive via `npm update @redocly/client-generator` — no regeneration, no diff in the generated file.
-The trade: the consuming app must have `@redocly/client-generator` installed as a regular dependency.
-Your application code is identical in both modes (same exports, same call shapes).
-
-The `satisfies Record<string, OperationDescriptor>` line doubles as a **build-time version-skew guard**: an incompatible generated-file/runtime pair fails the consumer's `tsc` instead of misbehaving at runtime.
-
-In both modes the generated module exports **both call styles** — the `client` instance (grouped-args methods) and the free-function operations (`--args-style` shapes those).
-Both runtimes work with both [output modes](#output-modes) and every generator.
+- `inline` (default) — the runtime source is embedded in the generated output (only the parts your API needs): self-contained, zero runtime dependencies.
+- `package` — the generated file imports the runtime from `@redocly/client-generator` and contains only the types, operation descriptors, and thin call wrappers.
+
+Choose `package` when you want engine fixes to arrive via `npm update @redocly/client-generator` with no regeneration; the consuming app must then have that package installed as a regular dependency.
+Your application code is identical in both modes.
+See [Package runtime](../guides/use-generated-client.md#package-runtime) in the usage guide and the [`package-runtime` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/package-runtime).
 
 ## Resources
 
diff --git a/docs/@v2/configuration/reference/client.md b/docs/@v2/configuration/reference/client.md
index 325968874b..6d83d12b70 100644
--- a/docs/@v2/configuration/reference/client.md
+++ b/docs/@v2/configuration/reference/client.md
@@ -2,45 +2,194 @@
 
 ## Introduction
 
-The [`generate-client`](../../commands/generate-client.md) command reads its settings from `redocly.yaml`.
-A top-level `client` block holds shared defaults.
-Each API under `apis:` supplies the command's input (`root`), an optional output (`clientOutput`), and any per-API overrides under `apis.<name>.client`.
+The `client` configuration provides settings for the [`generate-client`](../../commands/generate-client.md) command.
+The block can be used at the root of the configuration file, where it holds shared defaults, and inside an [API-specific section](./apis.md) (`apis.<name>.client`), where it overrides the root block field by field.
+
+The input and output are not part of the `client` block:
+
+- **input** — `apis.<name>.root`, or a path or alias passed on the command line.
+- **output** — `apis.<name>.clientOutput`; when omitted it defaults to `<name>.client.ts` next to the configuration file. The `--output` flag overrides it for single-API invocations.
+
+## Options
+
+Each scalar option mirrors the matching CLI flag and shares its default — see the [command options](../../commands/generate-client.md#options) for the full description of each value.
+The `pagination` option is config-only and has no flag.
+
+{% table %}
+
+- Option
+- Type
+- Description
+
+---
+
+- generators
+- [string]
+- Generators to run, in order. Each entry is a built-in name (`sdk`, `zod`, `tanstack-query`, `swr`, `mock`, `transformers`) or a custom generator's path or package name.
+
+---
+
+- outputMode
+- string
+- File layout: `single` or `split`.
+
+---
+
+- runtime
+- string
+- Runtime distribution: `inline` or `package`.
+
+---
+
+- argsStyle
+- string
+- How operation inputs are passed: `flat` or `grouped`.
+
+---
+
+- enumStyle
+- string
+- How named string enums are emitted: `const-object` or `union`.
+
+---
+
+- errorMode
+- string
+- How operations report HTTP errors: `throw` or `result`.
+
+---
+
+- dateType
+- string
+- Type of `date`/`date-time` fields: `string` or `Date`.
+
+---
+
+- queryFramework
+- string
+- Framework adapter for the `tanstack-query` generator: `react`, `vue`, `svelte`, or `solid`.
+
+---
+
+- mockData
+- string
+- Data mode for the `mock` generator: `baked` or `faker`.
+
+---
+
+- mockSeed
+- number
+- Seed for `faker`-mode mocks.
+
+---
+
+- serverUrl
+- string
+- Server URL baked into the client; defaults to `servers[0].url`.
+
+---
+
+- setup
+- string
+- Path to a publisher setup module baked into the client.
+
+---
+
+- pagination
+- [Pagination object](#pagination-object)
+- Declares how the API paginates, so paginated operations gain typed `.pages()`/`.items()` async iterators.
+
+{% /table %}
+
+### Pagination object
+
+The `pagination` block is an optional convention rule (the rule fields below, applied to every operation it structurally fits when `style` is set), plus per-operation `operations` overrides and an `exclude` list.
+See [Pagination in the usage guide](../../guides/use-generated-client.md#pagination) for how the generated iterators behave.
+
+{% table %}
+
+- Option
+- Type
+- Description
+
+---
+
+- style
+- string
+- How the iterator advances: `cursor` (follow a response cursor), `offset` (advance an offset by each page's item count), or `page` (increment a page number).
+
+---
+
+- cursorParam
+- string
+- The query parameter that receives the cursor. **REQUIRED** for the `cursor` style.
+
+---
+
+- nextCursor
+- string
+- JSON pointer (RFC 6901, starts with `/`) to the next cursor in the response. **REQUIRED** for the `cursor` style.
+
+---
+
+- offsetParam
+- string
+- The query parameter the iterator advances. **REQUIRED** for the `offset` and `page` styles.
+
+---
+
+- limitParam
+- string
+- Optional page-size query parameter for any style; recorded for tooling — the iterator never sets it.
+
+---
+
+- items
+- string
+- **REQUIRED**. JSON pointer to the page's item array in the response.
+
+---
+
+- exclude
+- [string]
+- operationIds that no source may paginate; wins over overrides, extensions, and the convention.
+
+---
+
+- operations
+- map of operationId → rule
+- Per-operation rules taking the same fields as the convention; each entry beats the spec's `x-pagination` and the convention.
+
+{% /table %}
+
+The rules are verified at generate time: the advance parameter must be a declared query parameter of the right type (string for `cursor`, numeric for `offset` and `page`), and the JSON pointers must resolve in the operation's JSON success-response schema, with `items` landing on an array.
+A convention that doesn't fit an operation skips it; an explicit rule that doesn't fit fails generation.
+The `x-pagination` operation extension in the API description takes the same rule fields.
+Per operation, precedence is `operations[id]`, then `x-pagination`, then the convention.
+
+## Examples
+
+### Configure shared defaults with a per-API override
+
+A per-API `client` block overrides the top-level `client` field by field; unspecified fields fall back to the top-level defaults.
+A file-path invocation matching no `apis:` entry uses only the top-level `client`, and CLI flags take precedence over the resolved configuration.
 
 ```yaml
-# redocly.yaml
-client: # shared defaults for every generated client
+client:
   generators:
     - sdk
   argsStyle: flat
 apis:
   cafe:
-    root: ./openapi.yaml # the input
-    clientOutput: ./src/api/client.ts # optional; defaults to `<api-name>.client.ts` (here `cafe.client.ts`)
-    client: # per-API overrides (optional)
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
       argsStyle: grouped
 ```
 
-```sh
-redocly generate-client              # builds every api with a `client` block or `clientOutput`
-redocly generate-client cafe         # just the `cafe` api (its client block + clientOutput)
-redocly generate-client --config ./config/redocly.yaml
-```
-
-## Options
-
-The same fields are accepted at the top level (shared defaults) and under `apis.<name>.client` (per-API overrides): `generators`, `argsStyle`, `serverUrl`, `outputMode` (`single` or `split`), `runtime`, `enumStyle`, `errorMode`, `dateType`, `queryFramework`, `mockData`, `mockSeed`, `setup`, and [`pagination`](#pagination).
-Each of the scalar fields mirrors the matching CLI flag — see the [command options](../../commands/generate-client.md#options) for what every field does.
-The `pagination` field is config-only (no flag).
-
-The input and output are **not** part of a `client` block:
-
-- **input** — `apis.<name>.root` (or a path/alias passed on the command line).
-- **output** — `apis.<name>.clientOutput`; when omitted it defaults to `<name>.client.ts` in the `redocly.yaml` directory. `--output` overrides it (single-API invocations only).
+### Declare pagination
 
-## Pagination
-
-`pagination` declares how the API paginates, so paginated operations gain typed `.pages()`/`.items()` async iterators (see [Pagination in the usage guide](../../guides/use-generated-client.md#pagination)).
-The block is an optional **convention rule** (the rule fields below, applied to every operation it structurally fits when `style` is set) plus per-operation `operations` overrides and an `exclude` list:
+The nested `pagination` block layers the same way: per-API `operations` merge by operationId, and `exclude` lists union with the top-level ones.
 
 ```yaml
 client:
@@ -58,37 +207,13 @@ client:
         items: /data
 ```
 
-Rule fields — the same set is accepted at the `pagination` level (the convention) and in each `operations` entry:
-
-| Field         | Type                             | Description                                                                                                                   |
-| ------------- | -------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
-| `style`       | `'cursor' \| 'offset' \| 'page'` | How the iterator advances: follow a response cursor, advance an offset by each page's item count, or increment a page number. |
-| `cursorParam` | `string`                         | `cursor` style: the query parameter that receives the cursor. Required for `cursor`.                                          |
-| `nextCursor`  | `string`                         | `cursor` style: JSON pointer (RFC 6901, starts with `/`) to the next cursor in the response. Required for `cursor`.           |
-| `offsetParam` | `string`                         | `offset`/`page` styles: the query parameter the iterator advances. Required for `offset` and `page`.                          |
-| `limitParam`  | `string`                         | Optional page-size query parameter (any style); recorded for tooling — the iterator never sets it.                            |
-| `items`       | `string`                         | JSON pointer to the page's item array in the response. Always required.                                                       |
-
-And the two container fields:
-
-| Field        | Type                      | Description                                                                                |
-| ------------ | ------------------------- | ------------------------------------------------------------------------------------------ |
-| `exclude`    | `string[]`                | operationIds no source may paginate (wins over overrides, extensions, and the convention). |
-| `operations` | map of operationId → rule | Per-operation rules; each entry beats the spec's `x-pagination` and the convention.        |
-
-The style-conditional requirements and the structural fit (the advance param must be a declared query parameter of the right type; the pointers must resolve in the JSON success-response schema, `items` landing on an array) are verified at generate time: a convention that doesn't fit skips the operation, while an explicit rule that doesn't fit fails generation. The `x-pagination` operation extension in the spec takes the same rule fields; per operation, precedence is `operations[id]` > `x-pagination` > the convention.
-
-## How the configuration applies
+For code-level control — including registering [custom generators](../../guides/use-generated-client.md#custom-generators) inline — use the programmatic `generateClient(...)` API instead.
 
-A per-API `client` block overrides the top-level `client` field by field; unspecified fields fall back to the top-level defaults.
-The nested `pagination` block layers the same way: per-API `operations` merge by operationId and `exclude` lists union with the top-level ones.
-A file-path invocation matching no `apis:` entry uses only the top-level `client`.
-CLI flags then take precedence over the resolved configuration — see the [command reference](../../commands/generate-client.md#configuration).
+## Related options
 
-For code-level control — including registering [custom generators](../../guides/use-generated-client.md#custom-generators) inline — use the programmatic `generateClient(...)` API instead.
+- [apis](./apis.md) settings define each API's root document, output, and per-API overrides.
 
 ## Resources
 
 - [`generate-client` command](../../commands/generate-client.md) — flags, output modes, and invocation.
 - [Use the generated client](../../guides/use-generated-client.md) — the runtime API (auth, retries, middleware, extra generators).
-- [`apis` configuration](../apis.md) — the `apis:` section and its aliases.
diff --git a/docs/@v2/guides/use-generated-client.md b/docs/@v2/guides/use-generated-client.md
index 2b698d2ff4..d84ca1b466 100644
--- a/docs/@v2/guides/use-generated-client.md
+++ b/docs/@v2/guides/use-generated-client.md
@@ -5,7 +5,9 @@ For invoking the command itself (flags, output modes, config), see the [`generat
 
 ## Generators
 
-`--generator` selects what to emit (default `sdk`). Each non-`sdk` generator adds a **standalone sibling module** next to the client; the client itself never imports it, so an add-on never adds a dependency to the client. Incompatible selections fail fast with an explanation.
+`--generator` selects what to emit (default `sdk`).
+Each non-`sdk` generator adds a standalone sibling module next to the client; the client itself never imports it, so an add-on never adds a dependency to the client.
+Incompatible selections fail fast with an explanation.
 
 | Generator        | Emits                                                                                              | App peer dependency                                      |
 | ---------------- | -------------------------------------------------------------------------------------------------- | -------------------------------------------------------- |
@@ -20,7 +22,8 @@ For invoking the command itself (flags, output modes, config), see the [`generat
 redocly generate-client openapi.yaml --output src/client.ts --generator sdk --generator zod --generator mock
 ```
 
-`tanstack-query` and `swr` wrap the **throw-mode** `sdk` functions, so they require `--error-mode throw`. `transformers` requires `--date-type Date`. See the [`zod`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/zod), [`tanstack-query`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/tanstack-query), and [`mock`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/mock) examples.
+`tanstack-query` and `swr` wrap the throw-mode `sdk` functions, so they require `--error-mode throw`; `transformers` requires `--date-type Date`.
+See the [`zod`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/zod), [`tanstack-query`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/tanstack-query), and [`mock`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/mock) examples.
 
 ## Package runtime
 
@@ -65,7 +68,8 @@ import { setBearer } from './client.ts';
 setBearer(async () => await getFreshAccessToken());
 ```
 
-Each setter is sugar over the exported `client` instance's `auth` member (`export const setBearer = client.auth.bearer;`), so it configures **that instance** — equivalently, pass credentials up front with `configure({ auth: { … } })` or set them via `client.auth.bearer(…)` / `client.auth.basic(…)` / `client.auth.apiKey(scheme, …)`.
+Each setter is sugar over the exported `client` instance's `auth` member (`export const setBearer = client.auth.bearer;`), so it configures that instance.
+Equivalently, pass credentials up front with `configure({ auth: { … } })` or set them via `client.auth.bearer(…)` / `client.auth.basic(…)` / `client.auth.apiKey(scheme, …)`.
 
 For **multiple independent instances** with different credentials, build extra clients over the same generated descriptors — the generated module exports `createClient`, the `OPERATIONS` descriptors, and the `Ops` type in both runtimes:
 
@@ -133,10 +137,15 @@ use({
 });
 ```
 
-`onRequest` runs in registration order; `onResponse` runs in reverse (onion). `onRequest` may mutate `ctx` (`url`/`method`/`headers`/`body` — body edits are serialized and sent); `onResponse` may return a replacement `Response`. `onError` (throw mode only) is threaded through each middleware. `ctx.operation`'s fields are typed as the spec's **literal unions** (`OperationId`/`OperationPath`/`OperationTag`), so `ctx.operation.id === '…'` and `ctx.operation.tags.includes('…')` autocomplete — and a misspelled operation id fails compilation instead of silently never matching. A single call's header instead goes in that operation's trailing `init` argument.
-Per-request headers merge lowest → highest: injected auth credentials → typed header parameters → the caller's `init.headers` — the caller always wins.
+`onRequest` runs in registration order; `onResponse` runs in reverse (onion).
+`onRequest` may mutate `ctx` (`url`, `method`, `headers`, and `body` — body edits are serialized and sent); `onResponse` may return a replacement `Response`.
+`onError` (throw mode only) is threaded through each middleware.
+`ctx.operation`'s fields are typed as the spec's literal unions (`OperationId`/`OperationPath`/`OperationTag`), so `ctx.operation.id === '…'` and `ctx.operation.tags.includes('…')` autocomplete, and a misspelled operation id fails compilation instead of silently never matching.
+A header for a single call instead goes in that operation's trailing `init` argument.
+Per-request headers merge lowest to highest: injected auth credentials, then typed header parameters, then the caller's `init.headers` — the caller always wins.
 
-`use()` **appends** to the middleware chain (it composes with any already-registered or baked-in middleware). `configure({ middleware: [...] })` **replaces** the whole chain — use it to reset, but prefer `use()` to add to existing (including [publisher-baked](#publisher-defaults)) middleware.
+`use()` appends to the middleware chain, composing with any already-registered or baked-in middleware.
+`configure({ middleware: [...] })` replaces the whole chain — use it to reset, but prefer `use()` to add to existing (including [publisher-baked](#publisher-defaults)) middleware.
 
 See the [`configure-and-middleware` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/configure-and-middleware) for a runnable version.
 
@@ -314,30 +323,13 @@ SSE always throws `ApiError` on a non-2xx initial response, regardless of `--err
 
 ## Pagination
 
-Pagination is **declared, never guessed**: describe how your API paginates in `redocly.yaml` under [`client.pagination`](../configuration/reference/client.md#pagination) (or per operation with the `x-pagination` extension in the spec — same fields), and each paginated operation keeps its one-shot call while gaining two async iterators — `.pages(args?, init?)` yielding full pages and `.items(args?, init?)` yielding individual items, typed statically from the response schema.
-There is no CLI flag.
+Pagination is declared, never guessed: describe how your API paginates in `redocly.yaml` under `client.pagination`, or per operation with the `x-pagination` extension in the spec.
+The rule fields, the generate-time verification, and the precedence between the convention, `x-pagination`, and per-operation overrides are documented in the [`client.pagination` reference](../configuration/reference/client.md#pagination-object); there is no CLI flag.
+Each paginated operation keeps its one-shot call and gains two async iterators — `.pages(args?, init?)` yielding full pages and `.items(args?, init?)` yielding individual items, typed statically from the response schema.
 
-```yaml
-client:
-  pagination: # convention: applied to every operation it structurally fits
-    style: cursor
-    cursorParam: cursor # query param that receives the cursor
-    nextCursor: /nextCursor # JSON pointer to the next cursor in the response
-    items: /orders # JSON pointer to the page's item array
-    exclude:
-      - listOrderEvents # never paginate this operation
-    operations: # per-operation overrides (beat x-pagination and the convention)
-      listMenuItems:
-        style: page
-        offsetParam: page
-        items: /data
-```
-
-The convention rule is **statically verified** at generate time: it applies only to operations it structurally fits — the advance param must be a declared query parameter of the right type (string for `cursor`, numeric for `offset`/`page`) and the JSON pointers must resolve in the operation's JSON success-response schema, with `items` landing on an array.
-An operation the convention doesn't fit is simply not paginated; an **explicit** rule (an `operations` entry or an `x-pagination` extension) that doesn't fit **fails generation** with a per-operation error, so a wrong declaration can't silently produce a broken iterator.
-Per operation, precedence is `operations[id]` > `x-pagination` > the convention.
-
-Three styles are supported: `cursor` (send the response's `nextCursor` back in `cursorParam`; stops when it's absent, `null`, or empty — and throws if the server returns the same cursor twice in a row), `offset` (advance `offsetParam` by each page's item count), and `page` (increment `offsetParam` by 1) — `offset`/`page` stop on an empty page.
+Three styles are supported:
+`cursor` sends the response's `nextCursor` back in `cursorParam`, stops when it's absent, `null`, or empty, and throws if the server returns the same cursor twice in a row.
+`offset` advances `offsetParam` by each page's item count, and `page` increments `offsetParam` by 1; both stop on an empty page.
 `limitParam` is optional metadata for any style: the iterator never sets it, so pass your page size in `params` yourself.
 
 ```ts
@@ -352,18 +344,10 @@ for await (const page of client.listOrders.pages()) {
 }
 ```
 
-The flat free functions keep both iterators, with one asymmetry to note: the flat function itself takes **positional** arguments, but its `.pages`/`.items` always take the **grouped** shape (they are the client method's iterators):
-
-```ts
-import { listOrders } from './client.ts';
-
-const firstPage = await listOrders({ limit: 20 }); // flat one-shot: positional params
-for await (const order of listOrders.items({ params: { limit: 20 } })) {
-  // iterators: grouped args
-}
-```
+The flat free functions keep both iterators, with one asymmetry to note: the flat function itself takes positional arguments, but its `.pages`/`.items` always take the grouped shape (they are the client method's iterators).
 
-**Resume** by passing the advance param in the initial args — iteration starts from there instead of the beginning; **abort** by passing an `AbortSignal`, forwarded to every page request:
+Resume by passing the advance param in the initial args — iteration starts from there instead of the beginning.
+Abort by passing an `AbortSignal`, forwarded to every page request:
 
 ```ts
 const controller = new AbortController();
@@ -375,8 +359,7 @@ for await (const page of client.listOrders.pages(
 }
 ```
 
-Iteration is **error-mode-agnostic**: a failed page always aborts iteration by throwing `ApiError`, even on an `--error-mode result` client — where `.pages()` yields **raw** pages (not `{ data, error, response }` envelopes; only the one-shot call keeps the envelope) and the throw-mode-only `onError` middleware hook is not invoked.
-Both runtimes paginate identically; the `inline` runtime embeds the pagination module only when some operation paginates, and `package` clients receive pagination improvements via `npm update`.
+A failed page always aborts iteration by throwing `ApiError`, even on an `--error-mode result` client — there `.pages()` yields raw pages (not `{ data, error, response }` envelopes; only the one-shot call keeps the envelope) and the throw-mode-only `onError` middleware hook is not invoked.
 
 For shapes the built-in styles don't cover — for example a cursor that travels in the request body or a header — page with a small hand-written helper over the generated call, which stays fully typed end to end (see the [`custom-pagination` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/custom-pagination)).
 
diff --git a/packages/client-generator/README.md b/packages/client-generator/README.md
index 3b1f00d77e..2fc8bdbd0f 100644
--- a/packages/client-generator/README.md
+++ b/packages/client-generator/README.md
@@ -1,390 +1,59 @@
 # @redocly/client-generator
 
-> ⚠️ **Experimental.** This package and the client generator are released as **experimental**: the generated output, options, and the plugin API may change in any minor release until it is declared stable (see [ADR-0013](./docs/adr/0013-experimental-status.md)).
+Generate a typed TypeScript client from an OpenAPI description.
+See https://github.com/Redocly/redocly-cli for the full project.
+
+> [!WARNING]
+> This package is experimental: the generated output, options, and the plugin API may change in any minor release until it is declared stable (see [ADR-0013](./docs/adr/0013-experimental-status.md)).
 > Pin your version if you depend on the output, and expect to regenerate when you upgrade.
 > Feedback is very welcome while we stabilize it.
 
-Generate a typed TypeScript client (inline types + `fetch` runtime) from an OpenAPI description.
-The emitted client has **zero runtime dependencies** by default — it uses only web-standard APIs (`fetch`, `AbortController`, `URLSearchParams`, …), so it runs in browsers, Node ≥ 18, Bun, Deno, and edge runtimes.
-Opt in to `runtime: 'package'` to import the runtime from this package instead, so engine fixes arrive via `npm update` without regenerating.
-Code is produced through the TypeScript compiler AST (not string templates), so output is correct by construction; `typescript` is the only (peer) dependency.
-
-This package is the engine behind the **`redocly generate-client`** command.
-To run it from the command line, install [`@redocly/cli`](https://github.com/Redocly/redocly-cli) and see the [`generate-client` command reference](https://redocly.com/docs/cli/commands/generate-client).
-The rest of this README covers using the package **programmatically**.
-
-## Features
-
-- **Broad input** — OpenAPI **3.0, 3.1, and 3.2.0**, plus **Swagger 2.0** (normalized to 3.x before generation)
-  `api` is a file path or URL.
-- **Zero-dependency client** (the default `inline` runtime) built via the TS AST, with `typescript` as the only peer dep
-- **Output modes** — `single` or `split` (schema types in a sibling `<stem>.schemas.ts`) (`outputMode`)
-- **Runtime distribution** (`runtime`) — `inline` (default, self-contained) or `package`: the client imports its runtime from `@redocly/client-generator` (pure-data operation descriptors + a build-time version-skew guard), so engine fixes arrive via `npm update` — no regeneration
-- **Both call styles, always** — a typed `client` instance (grouped-args methods, **per-instance configuration and credentials** via `createClient(OPERATIONS, { auth, serverUrl, … })`) plus free-function operations bound to it
-- **Argument styles** — `flat` positional args or a `grouped` `vars` object (`argsStyle`)
-- **Rich types** — inline types for every schema:
-  - string enums as unions or runtime `const` objects (`enumStyle`)
-  - **discriminated-union `is<Member>()` type guards** `<Op>Result` / `Error` / `Params` / `Body` / `Headers` / `Variables` aliases (collision-suppressed)
-  - validation keywords surfaced as JSDoc
-  - `dateType: 'Date'`
-  - **typed `multipart/form-data` bodies** (object fields, binary → `Blob`) auto-serialized to `FormData`
-- **Runtime** — a typed `ClientConfig` (`serverUrl`, headers, `fetch` swap, hooks) applied via `configure()`:
-  - **composable middleware** (`onRequest`/`onResponse`/`onError`) whose `ctx.operation.id`/`path`/`tags` are the spec's **literal unions** — a misspelled operation id fails compilation
-  - **opt-in, abort-aware retries** with backoff, jitter, `Retry-After`, and a custom `retryOn`
-  - per-call response decoding (`parseAs`)
-  - OpenAPI **query-serialization styles**
-  - `errorMode: 'result'` for a discriminated `{ data, error, response }`
-  - a minification-safe `OPERATIONS` metadata map
-- **Auth** — Basic / Bearer / apiKey (header, query, cookie) setters from `securitySchemes`, async token providers, and per-instance credentials via `ClientConfig.auth`
-- **Server-Sent Events** — `text/event-stream` operations as typed async iterators with auto-reconnect; payloads typed from OpenAPI 3.2 `itemSchema`
-- **Auto-pagination** — declared via the `pagination` option (a statically verified convention rule + per-operation overrides) or the spec's `x-pagination` extension (`cursor`/`offset`/`page` styles); paginated operations keep their one-shot call and gain `.pages()`/`.items()` async iterators, item types resolved from the response schema at generate time
-- **Generators** (`generators`) — `sdk` (default), `zod`, `tanstack-query` (React/Vue/Svelte/Solid), `swr`, `transformers`, `mock` (MSW handlers + baked or `faker` data), and a [custom-generator plugin API](#custom-generators)
-- **Hardened** — document-derived names coerced to safe unique identifiers, comment text escaped, and a bounded SSE reader
-
-No add-on generator adds a dependency to the emitted client; its peer library is needed only in your app.
-
-## Use programmatically
-
-`generateClient(options)` is the API behind the CLI command — it loads the spec, builds the client, and writes the files:
+The generated client uses only web-standard APIs (`fetch`, `AbortController`, `URLSearchParams`), so by default it is a single self-contained file with zero runtime dependencies that runs in browsers, Node ≥ 18, Bun, Deno, and edge runtimes.
+(Running the generator itself requires the Node version in this package's `engines` field.)
+Code is produced through the TypeScript compiler AST, not string templates; `typescript` is the only peer dependency.
 
-```ts
-import { generateClient } from '@redocly/client-generator';
+This package is the engine behind the [`generate-client` command](https://redocly.com/docs/cli/commands/generate-client) — install [`@redocly/cli`](https://www.npmjs.com/package/@redocly/cli) to run it from the command line or `redocly.yaml`.
+How to use the generated client — auth, middleware, retries, pagination, Server-Sent Events, and the add-on generators (`zod`, `tanstack-query`, `swr`, `mock`, `transformers`) — is documented in [Use the generated client](https://redocly.com/docs/cli/guides/use-generated-client).
+This README covers using the package programmatically.
 
-const result = await generateClient({
-  api: 'openapi.yaml', // file path or URL
-  output: 'src/client.ts', // entry file; the .schemas.ts sibling derives from it in split mode
-  outputMode: 'single', // 'single' | 'split'
-  runtime: 'inline', // 'inline' | 'package' (import the runtime from this package)
-  argsStyle: 'flat', // 'flat' | 'grouped'
-  errorMode: 'throw', // 'throw' | 'result'
-  dateType: 'string', // 'string' | 'Date' (pair 'Date' with the 'transformers' generator)
-  enumStyle: 'const-object', // 'const-object' | 'union'
-  generators: ['sdk'], // see "Generators" below
-  // serverUrl, queryFramework, mockData, mockSeed, pagination, customGenerators are also accepted
-});
+## Basic usage
 
-console.log(`Wrote ${result.files.length} file(s), ${result.bytes} bytes.`);
-```
-
-For type-safe authoring of a standalone options object, annotate it with `satisfies Config`:
+### Generate a client
 
 ```ts
-import { generateClient, type Config } from '@redocly/client-generator';
+import { generateClient } from '@redocly/client-generator';
 
-const options = {
-  api: './openapi.yaml',
+const result = await generateClient({
+  api: './openapi.yaml', // file path or URL; OpenAPI 3.0/3.1/3.2 or Swagger 2.0
   output: './src/api/client.ts',
   generators: ['sdk', 'zod'],
-} satisfies Config;
-
-await generateClient(options);
-```
-
-To inspect the output without writing to disk, the lower-level `collectGeneratedFiles(model, opts)` returns the files in memory (see `src/index.ts`).
-
-## Using the generated client
-
-```ts
-import { configure, use, getOrderById, listMenuItems, setBearer } from './client.ts';
-
-// Optional: global config (base URL, headers, fetch swap, hooks, retry).
-configure({ retry: { retries: 3 } });
-
-// Composable middleware for cross-cutting concerns (logging, tracing, auth refresh).
-use({
-  onRequest: (ctx) => {
-    ctx.headers['X-Request-Id'] = crypto.randomUUID();
-  },
 });
 
-// Auth helpers are generated from the spec's `securitySchemes`.
-setBearer(token);
-
-const menu = await listMenuItems({ limit: 10 });
-const order = await getOrderById('ord_01khr487f7qm7p44xn427m43vb');
-
-// Per-call options (AbortSignal, retry override) go in the trailing `init` arg.
-const live = await listMenuItems({ limit: 10 }, { signal: controller.signal });
-```
-
-Each operation's trailing `init` argument is `RequestOptions` (`RequestInit` plus an optional per-call `retry` override and a `parseAs` reader).
-Retry is opt-in and abort-aware.
-A custom `retryOn(ctx)` predicate can branch on `ctx.error` (transport failure) or `ctx.response` (HTTP status / body) and opt a `POST` in.
-
-By default a response body is decoded by negotiating from its `Content-Type`.
-Pass `parseAs` in `init` to force a reader — `'json'`, `'text'`, `'blob'`, `'arrayBuffer'`, `'formData'`, `'stream'` (the raw `ReadableStream`), or `'auto'` (the default):
-
-```ts
-const stream = await getMenuItemPhoto('prd_…', { parseAs: 'stream' }); // ReadableStream
-```
-
-`parseAs` is a **runtime override only** — it does not change the operation's static return type.
-Forcing a reader that disagrees with the schema is the caller's responsibility.
-
-Query parameters honor their OpenAPI serialization style.
-The default (`form` + `explode: true`) repeats array values.
-Declare `style` / `explode` / `allowReserved` on a parameter to get `form`+`explode:false` (`key=a,b`), `spaceDelimited` (`key=a%20b`), `pipeDelimited` (`key=a|b`), `deepObject`, or reserved-char passthrough.
-
-A setter is generated for each injectable scheme — `setBearer` (HTTP `bearer` / OAuth2), `setBasicAuth(username, password)` (HTTP `basic`), and `setApiKey…` for `apiKey` schemes in header, query, or cookie — and each operation sends the credentials its `security` requires.
-Each setter is instance-bound sugar over the exported client (`export const setBearer = client.auth.bearer;`); credentials are **per instance** (`ClientConfig.auth`), so independent instances built with `createClient(OPERATIONS, { auth })` carry independent credentials — the generated module exports `createClient` in both runtimes (see the [`multi-instance` example](./examples/multi-instance)).
-Bearer/apiKey credentials accept a `TokenProvider` (a string or a possibly-async function resolved per request) for refresh-token flows:
-
-```ts
-import { setBearer, setBasicAuth, setApiKey } from './client.ts';
-
-setBearer(async () => await getFreshAccessToken()); // resolved before each authed call
-setBasicAuth('alice', 's3cr3t'); // `Authorization: Basic <base64>`
-setApiKey('my-api-key'); // header / query / cookie, per the scheme's `in`
-```
-
-With `argsStyle: 'grouped'`, inputs are bundled into a single `vars` object (typed as the operation's `<Op>Variables`) instead of positional arguments, while `init` stays the trailing argument:
-
-```ts
-const order = await getOrderById({ orderId: 'ord_01khr487f7qm7p44xn427m43vb' });
+console.log(`Wrote ${result.files.length} file(s), ${result.bytes} bytes.`);
 ```
 
-With `errorMode: 'result'`, operations don't throw on non-2xx.
-Each operation returns a discriminated `{ data, error, response }` whose `error` is typed from the spec's 4xx/5xx bodies (the `<Op>Error` union).
-On success `error` is `undefined`; the HTTP status is always on `response.status`:
+Every `redocly.yaml` `client` option is accepted with the same name and default — see the [`client` configuration reference](https://redocly.com/docs/cli/configuration/reference/client).
+For type-safe authoring of a standalone options object, annotate it with `satisfies Config`.
 
-```ts
-const { data, error, response } = await getOrderById('ord_01khr487f7qm7p44xn427m43vb');
-if (error)
-  console.error(response.status, error); // `error` is the typed body
-else console.log(data.id); // `data` is the success body
-```
+### Build extra client instances
 
-Transport/abort failures still throw in both modes.
-
-The client also exports an `OPERATIONS` map (operationId → `{ method, path, tags }`) plus the `OperationId` / `OperationPath` / `OperationTag` / `OperationMetadata` types.
-The string-literal keys, path templates, and tags survive minification, so they're the stable handle for cache/query keys, tracing span names, and request logging:
+The generated module exports its operation descriptors, so an app can build additional instances with independent configuration and credentials over the same generated code:
 
 ```ts
-import { OPERATIONS, getOrderById } from './client.ts';
-
-const queryKey = [OPERATIONS.getOrderById.path, orderId]; // "/orders/{orderId}"
-```
-
-### Customizing requests and responses
+import { createClient } from '@redocly/client-generator';
+import { OPERATIONS, type Ops } from './client.ts';
 
-You shape requests and responses from your own code — never by editing the generated client, so changes survive regeneration.
-Middleware (`use(...)` — sugar for `client.use(...)`, so it registers on that instance) hooks the request lifecycle, and each `RequestContext` carries the operation's identity so you can target by operationId or tag instead of brittle URL matching.
-`onRequest` may mutate `ctx.url` / `ctx.method` / `ctx.headers` **and `ctx.body`**; `onResponse` may observe or replace the `Response`:
-
-```ts
-import { configure, use, listMenuItems } from './client.ts';
-
-// A custom transport — proxy, instrument, or (here) swap fetch entirely.
-configure({ fetch: myFetch });
-
-use({
-  onRequest: (ctx) => {
-    // Target specific operations by identity, not URL shape.
-    if (ctx.operation.id === 'createOrder' || ctx.operation.tags.includes('Orders')) {
-      ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
-      (ctx.body as { source?: string }).source = 'web'; // body edits are sent
-    }
-  },
-  onResponse: (response, ctx) => {
-    console.debug(ctx.operation.id, response.status);
-  },
+const internal = createClient<Ops>(OPERATIONS, {
+  serverUrl: 'https://api.example.com',
+  auth: { basic: { username: 'svc', password: 's3cr3t' } },
 });
-
-// A header for one call only goes in the trailing RequestOptions.
-await listMenuItems({}, { headers: { 'X-Request-Id': '42' } });
-```
-
-`ctx.operation` is `{ id, path, tags }` — the operationId, the path template (`{param}` placeholders intact), and the operation's tags. All three are **typed literal unions** (`OperationId` / `OperationPath` / `OperationTag`, exported alongside the `OPERATIONS` map), so `ctx.operation.id === '…'` and `ctx.operation.tags.includes('…')` autocomplete and reject typos at compile time.
-See the [`configure-and-middleware` example](../../tests/e2e/generate-client/examples/configure-and-middleware) for a runnable end-to-end version, and [ADR-0014](./docs/adr/0014-request-response-customization.md) for the rationale.
-
-### Baking defaults into a published SDK
-
-The customization above is composed by the **consumer**. If you instead **publish an SDK** and want those defaults already active for _your_ users, bake them in at generation time with `--setup <file>`. The setup module imports its contract from `@redocly/client-generator` (so it resolves and is unit-testable before the client is generated) and returns a `defineClientSetup({ config, middleware })`:
-
-```ts
-// client-setup.ts
-import { defineClientSetup, type RequestContext } from '@redocly/client-generator';
-
-export default defineClientSetup({
-  config: { serverUrl: 'https://api.acme.com', retry: { retries: 3 } },
-  middleware: [
-    {
-      onRequest: (ctx: RequestContext) => {
-        ctx.headers['X-Acme-SDK'] = '1.4.0';
-        if (ctx.operation.tags.includes('Orders'))
-          ctx.headers['X-Idempotency-Key'] = crypto.randomUUID();
-      },
-    },
-  ],
-});
-```
-
-```sh
-redocly generate-client openapi.yaml --output src/api/client.ts --setup ./client-setup.ts
-```
-
-The generator bakes the `config`/`middleware` into the generated client, so the published package applies them on import — your users call operations with no setup of their own, and can still override (their `configure`/`use` run after the baked ones; config layers spec defaults → baked setup → app `configure()`, middleware composes). Works across both output modes and both runtimes. A setup file may import **only** from `@redocly/client-generator`, so it never adds a dependency to the client.
-
-See the [`baked-setup` example](./examples/baked-setup) and [ADR-0015](./docs/adr/0015-publisher-setup-bake-in.md).
-
-## Testing the generated client
-
-The client is plain `fetch` code, so you test it like any HTTP code — there is no special harness.
-
-**In Node** (scripts, Vitest/Jest) there is **no CORS** — point it at any reachable API and call it:
-
-```ts
-import { configure, listMenuItems } from './client.ts';
-
-configure({ serverUrl: 'https://api.example.com' });
-const items = await listMenuItems(); // resolves or throws ApiError
-```
-
-**In the browser, CORS applies** — and it's the **target API's** policy, not the client's. Two things
-to watch:
-
-- The API must allow your origin (`Access-Control-Allow-Origin`).
-- Any **custom request header** you add (e.g. `X-Request-Id` via `use({ onRequest })` middleware)
-  triggers a **CORS preflight**, so the API must also list that header in `Access-Control-Allow-Headers`
-  — otherwise the browser blocks the request and `fetch` throws `TypeError: Failed to fetch`. If the
-  API doesn't allow it, drop the header, use a dev proxy (e.g. Vite's `server.proxy`), or mock the API.
-
-**Without a backend (recommended for tests and local dev), use MSW mocks.** Add `mock` to
-`generators` to emit an MSW handler module; requests are intercepted in-process, so there's **no real
-network and no CORS** — the same client runs unchanged against the mocks:
-
-```ts
-import { setupServer } from 'msw/node'; // or 'msw/browser' for the browser
-import { handlers } from './client.mocks.ts';
-
-const server = setupServer(...handlers);
-beforeAll(() => server.listen());
-afterAll(() => server.close());
-
-// now calls to the generated client resolve from the mocks
-```
-
-The repo's [`examples/`](./examples) are runnable end-to-end: `npm install && npm run dev` in an
-example directory serves it on `http://localhost:5173` against the live demo API (a CORS-enabled
-`GET`), and `examples/mock` shows the MSW-backed flow.
-
-## Generators
-
-`generators` (default `['sdk']`) selects which files to emit.
-The `sdk` client is dependency-free with the default `inline` runtime; each add-on lands in its own sibling file and needs its peer library only in your app.
-Every generator works with both runtimes and both output modes.
-
-### Runtime validation with Zod
-
-`generators: ['sdk', 'zod']` emits a standalone `<output>.zod.ts` module of [Zod](https://zod.dev) schemas (one `export const <Name>Schema` per schema).
-The generated client never imports Zod; only the `*.zod.ts` module does.
-Install Zod in your app as a peer — any `zod` `^3.23 || ^4`:
-
-```ts
-import { z } from 'zod';
-import type { Pet } from './client.ts';
-import { PetSchema } from './client.zod.ts';
-
-const pet: Pet = PetSchema.parse(await res.json()); // z.infer<typeof PetSchema> === Pet
-```
-
-Schemas carry the validation refinements stable across Zod 3.23 and 4 (`.min`/`.max`, `.gt`/`.lt`, `.int`, `.regex`).
-Refs become `z.lazy(() => …)` so recursive schemas work.
-Format helpers (`.email`/`.uuid`/`.url`) are not emitted, since they diverge between Zod 3 and 4.
-
-The module also emits `operationSchemas` (request/response validators keyed by operationId) and the `zodValidation` middleware:
-
-```ts
-import { use } from './client.ts';
-import { zodValidation } from './client.zod.ts';
-
-use(zodValidation()); // request bodies validated before the wire; JSON responses after it
-```
-
-A mismatch throws `ZodValidationError` (`operationId`, `direction`, zod `issues`); payloads are never mutated.
-
-### TanStack Query
-
-`generators: ['sdk', 'tanstack-query']` emits a standalone `<output>.tanstack.ts` module of [TanStack Query](https://tanstack.com/query) v5 factories wrapping the sdk operations.
-Each query op (`GET`/`HEAD`) gets a `<op>QueryKey`/`<op>Options` factory (returning `queryOptions`).
-Each mutation gets a `<op>Mutation` factory (returning `mutationKey`/`mutationFn`):
-
-```ts
-import { useQuery, useMutation } from '@tanstack/react-query';
-import { getPetOptions, createPetMutation } from './client.tanstack.ts';
-
-const { data } = useQuery(getPetOptions({ id }));
-const { mutate } = useMutation(createPetMutation());
-```
-
-Only the `*.tanstack.ts` module imports TanStack Query; install it as a peer — any `@tanstack/react-query` `^5`.
-The factories wrap the **throw-mode** sdk (the default), since TanStack's `queryFn` is expected to throw on error.
-
-**Framework** — TanStack's `queryOptions`/`mutationOptions` API is identical across adapters, so the emitted module is byte-identical across frameworks; only the import specifier differs.
-Set `queryFramework` to `react` (default), `vue`, `svelte`, or `solid` and install the matching adapter (`@tanstack/<framework>-query`, any `^5`).
-
-### SWR
-
-`generators: ['sdk', 'swr']` emits a standalone `<output>.swr.ts` module of [SWR](https://swr.vercel.app) hooks.
-Each query op (`GET`/`HEAD`) gets a `<op>Key` tuple factory + a `use<Op>(vars, init?)` hook over `useSWR`; each mutation gets a `use<Op>()` hook over `useSWRMutation`:
-
-```ts
-import { useGetPetById, useCreatePet } from './client.swr.ts';
-
-const { data } = useGetPetById({ id });
-const { trigger } = useCreatePet();
-await trigger({ body: { name: 'Rex' } });
-```
-
-Only the `*.swr.ts` module imports SWR (`swr` for queries, `swr/mutation` for mutations); install it as a peer — any `swr` `^2`.
-The hooks wrap the **throw-mode** sdk functions.
-
-### Date transformers
-
-By default `date-time`/`date` fields are typed `string`.
-Set `dateType: 'Date'` to type them as `Date`, and add `'transformers'` to `generators` to emit a `<output>.transformers.ts` module of `transform<Name>` functions that convert wire ISO strings to `Date` at runtime:
-
-```ts
-import { getPet } from './client.ts';
-import { transformPet } from './client.transformers.ts';
-
-const pet = transformPet(await getPet(id)); // pet.createdAt is now a Date
 ```
 
-The transformers import only the schema **types**, so they add no dependency to the client (`Date` is a web standard).
-`int64` → `bigint` is deferred; without `dateType: 'Date'` the date fields stay `string`.
+With `runtime: 'package'` the generated client also imports its whole engine from this package (instead of embedding it), so engine fixes arrive via `npm update` — install this package as a regular dependency of the consuming app.
 
-### MSW mocks
+### Write a custom generator
 
-`generators: ['sdk', 'mock']` emits a standalone `<output>.mocks.ts` module of [MSW](https://mswjs.io) v2 request handlers and `create<Schema>(overrides?)` data factories.
-Each handler intercepts its operation's method + path and responds with a fixture baked from the spec (prefers `example`/`default`; `format: binary` → `new Blob([])`.
-Recursive schemas terminate at the cycle with an empty array/record).
-Each `create<Schema>` factory builds the same default object and merges `overrides`, so factories double as test builders.
-Install MSW as a dev dependency — `msw` `^2`:
-
-```ts
-// test setup (Node)
-import { setupServer } from 'msw/node';
-import { handlers } from './client.mocks';
-
-const server = setupServer(...handlers);
-beforeAll(() => server.listen());
-afterEach(() => server.resetHandlers());
-afterAll(() => server.close());
-
-// override a single factory for one case
-import { createMenuItem } from './client.mocks';
-const special = createMenuItem({ name: 'Cold Brew', price: 499 });
-```
-
-**Realistic data with faker** — mock data is **baked** by default (deterministic literals, no extra dependency).
-Set `mockData: 'faker'` to emit [`@faker-js/faker`](https://fakerjs.dev) calls for realistic data, and `mockSeed: <n>` to pin faker's PRNG so the data is reproducible.
-Factory signatures are identical in both modes; faker mode makes `@faker-js/faker` (`^9`) a dev dependency of your app (the client itself gains no dependency).
-
-## Custom generators
-
-Need an output the built-ins don't ship — validators in another library, a UI permissions map, mocks in your test runner's format, an SDK in your house style?
-Write a **custom generator**: it reads the same OpenAPI-derived model the built-ins do, runs in the same pass, and its output never drifts from the spec.
+A custom generator reads the same spec-derived model the built-ins consume, runs in the same pass, and returns files:
 
 ```ts
 // route-map-generator.ts
@@ -408,89 +77,92 @@ export default defineGenerator({
 });
 ```
 
-Select it in `generators` by import specifier (a path or package), or register it inline and select it by `name`:
+Select it in `generators` by import specifier (a path or a package name), or register it inline via `customGenerators` and select it by `name`.
+A custom generator never adds dependencies to the generated client.
 
-```ts
-import { generateClient } from '@redocly/client-generator';
-import routeMap from './tools/route-map-generator.ts';
+### Bake defaults into a published SDK
 
-await generateClient({
-  api: './openapi.yaml',
-  output: './src/api/client.ts',
-  customGenerators: [routeMap], // register…
-  generators: ['sdk', 'route-map'], // …then select by name (or pass './tools/route-map-generator.ts')
-});
-```
+The `setup` option takes a module that default-exports `defineClientSetup({ config, middleware })`; its defaults are baked into the generated client so a published SDK ships them built in, and consumers can still override.
+See [Publisher defaults](https://redocly.com/docs/cli/guides/use-generated-client#publisher-defaults).
 
-`@redocly/client-generator` also exports the IR types and the codegen toolkit the built-ins use (`ts`, `printStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, …).
-A generator declares the same `requires`/`errorModes`/`dateTypes`/`runtimes` contract, validated up front.
-A custom generator never adds dependencies to the generated client.
-See `examples/custom-generator` for a runnable example.
+## API
 
-## Server-Sent Events (streaming)
+### `generateClient`
 
-An operation whose `2xx` response declares `text/event-stream` is generated — with no option — as a typed **async-generator** client method plus the matching free function.
-Each event's `data` is typed from the OpenAPI 3.2 `itemSchema` (falling back to the media `schema`, then `string`):
+Loads the spec, builds the client, and writes the files.
 
 ```ts
-import { streamMessages } from './client.ts';
+async function generateClient(options: GenerateClientOptions): Promise<GenerateClientResult>;
 
-for await (const ev of streamMessages()) {
-  console.log(ev.id, ev.data.text); // ev: ServerSentEvent<Message>
-}
+type GenerateClientResult = {
+  outputPath: string; // the `output` anchor path (the entry file in multi-file modes)
+  bytes: number; // total bytes written
+  files: Array<{ path: string; bytes: number }>; // every file written to disk
+};
 ```
 
-The stream **auto-reconnects** on a dropped connection, resuming via the `Last-Event-ID` header (backoff: server `retry:` → `reconnectDelay` → 1s, exponential with jitter, capped at 30s).
-Tune or opt out per call (`{ reconnect: false }` / `{ reconnectDelay: 500 }`), and `break` or pass an `AbortSignal` to stop early — both end the iterator cleanly (no throw).
-SSE operations always throw `ApiError` on an initial non-2xx and never return the `result`-mode shape.
+`GenerateClientOptions` is the [`Config` type](./src/config.ts) (`api` and `output` required; `outputMode`, `runtime`, `argsStyle`, `errorMode`, `dateType`, `enumStyle`, `serverUrl`, `queryFramework`, `mockData`, `mockSeed`, `generators`, `customGenerators`, `setup`, `pagination` optional) plus an optional resolved Redocly `config` used for spec loading.
 
-## Auto-pagination
+### `collectGeneratedFiles`
 
-Pagination is **declared, never guessed** — in the `pagination` option (or `redocly.yaml` `client.pagination`; the spec's `x-pagination` operation extension takes the same fields).
-A convention rule applies to every operation it **structurally fits** (the advance param is a declared query parameter of the right type; the JSON pointers resolve in the JSON success-response schema, `items` landing on an array); an explicit rule (an `operations` override or `x-pagination`) that doesn't fit fails generation.
-Precedence per operation: `operations[id]` > `x-pagination` > convention; `exclude` wins over all.
+Runs the configured generators against a built model and returns the files in memory, without writing to disk:
 
 ```ts
-await generateClient({
-  api: './openapi.yaml',
-  output: './src/api/client.ts',
-  pagination: {
-    style: 'cursor', // 'cursor' | 'offset' | 'page'
-    cursorParam: 'cursor', // the query param that receives the cursor
-    nextCursor: '/nextCursor', // JSON pointer to the next cursor in the response
-    items: '/orders', // JSON pointer to the page's item array
-  },
-});
+function collectGeneratedFiles(
+  model: ApiModel,
+  options: {
+    outputPath: string;
+    outputMode: OutputMode;
+    emit: EmitOptions;
+    generators: string[];
+    registry?: Map<string, GeneratorDescriptor>; // defaults to the built-ins
+  }
+): GeneratedFile[];
 ```
 
-Each paginated operation keeps its one-shot call and gains `.pages(args?, init?)` / `.items(args?, init?)` async iterators (the flat function too — note its iterators take the **grouped** args shape while the function itself stays positional).
-Item types are resolved from the response schema at generate time — no runtime reflection:
+### `defineGenerator`
+
+Authors a custom generator (`{ name, run }` plus optional `requires`/`errorModes`/`dateTypes`/`runtimes` compatibility metadata, validated up front):
 
 ```ts
-import { client, listOrders } from './client.ts';
+function defineGenerator(generator: CustomGenerator): CustomGenerator;
+```
 
-for await (const order of client.listOrders.items({ params: { limit: 20 } })) {
-  console.log(order.id); // `order` is typed `Order`
-}
+The package index also exports the codegen toolkit the built-ins use (`ts`, `printStatements`, `parseStatements`, `operationSignature`, `schemaToTypeNode`, `pascalCase`, …) and the IR types, so a custom generator emits TypeScript exactly as the first-party ones do.
 
-await listOrders({ limit: 20 }); // flat one-shot: positional
-for await (const page of listOrders.pages({ params: { cursor: 'c2' } })) {
-  // resume from a saved cursor; pass `{ signal }` as `init` to abort mid-iteration
-}
+### `defineClientSetup`
+
+Authors a publisher setup module for the `setup` option:
+
+```ts
+function defineClientSetup(setup: {
+  config?: ClientConfig;
+  middleware?: Middleware[];
+}): ClientSetup;
 ```
 
-`cursor` style stops when `nextCursor` is absent/`null`/empty (and throws if the cursor doesn't advance); `offset`/`page` styles stop on an empty page.
-Iteration is error-mode-agnostic: a failed page throws `ApiError` even on `errorMode: 'result'` clients, where `.pages()` yields raw pages (not `{ data, error, response }` envelopes).
-Inline output embeds the pagination module only when some operation paginates; `runtime: 'package'` clients receive pagination improvements via `npm update`.
+A setup module may import only from `@redocly/client-generator`, so it never adds a dependency to the client.
+
+### `createClient`
+
+The runtime factory that `runtime: 'package'` clients import, also usable directly to build extra instances over generated descriptors (see [Basic usage](#build-extra-client-instances)):
+
+```ts
+function createClient<Ops>(
+  operations: Record<string, OperationDescriptor>,
+  config?: ClientConfig
+): Client<Ops>;
+```
 
 ## Examples
 
-Runnable examples live in [`examples/`](../../tests/e2e/generate-client/examples): `zero-install-quickstart`, `fetch-functions`, `configure-and-middleware`, `baked-setup`, `sse-streaming`, `zod`, `tanstack-query`, `mock`, `custom-generator`, `programmatic`, `vendored-edge`, `package-runtime` (`runtime: 'package'` — engine fixes via `npm update`), `multi-instance` (per-tenant `createClient` instances over one generated module), `pagination` and `custom-pagination` (the declared convention vs. a hand-written helper), and `nested-facade` (a custom generator grouping operations by tag).
+Runnable examples — from a zero-install quickstart to middleware, baked setup, SSE streaming, pagination, custom generators, and the package runtime — live in [`tests/e2e/generate-client/examples`](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples).
 Each is a standalone Vite app with a checked-in, drift-checked generated client.
 
 ## Documentation
 
-- [`generate-client` command reference](https://redocly.com/docs/cli/commands/generate-client) — CLI usage, every flag, and `redocly.yaml` configuration.
+- [`generate-client` command reference](https://redocly.com/docs/cli/commands/generate-client) — CLI usage, flags, and `redocly.yaml` configuration.
+- [Use the generated client](https://redocly.com/docs/cli/guides/use-generated-client) — the runtime API and the add-on generators.
 - [`ARCHITECTURE.md`](./ARCHITECTURE.md) and the [ADRs](./docs/adr/) — how the package is built and why.
 
 ## Development
@@ -503,4 +175,4 @@ npm run unit                    # unit tests (this package is held at 100% cover
 VITEST_SUITE=e2e npx vitest run tests/e2e/generate-client/   # behavioral e2e
 ```
 
-The client runtime lives in `src/runtime/` (real, unit-testable modules; package mode imports them, inline mode embeds them via the generated `src/emitters/runtime-sources.ts` snapshot and the `src/emitters/inline-runtime.ts` assembler), the structural emitters in `src/emitters/`, the IR in `src/intermediate-representation/`, the generators in `src/generators/`, and the file-layout writers in `src/writers/`.
+The client runtime lives in `src/runtime/` (real, unit-testable modules; package mode imports them, inline mode embeds them), the structural emitters in `src/emitters/`, the IR in `src/intermediate-representation/`, the generators in `src/generators/`, and the file-layout writers in `src/writers/`.
diff --git a/tests/e2e/generate-client/examples/multi-instance/package.json b/tests/e2e/generate-client/examples/multi-instance/package.json
index 9fa8771aca..06c0325f6b 100644
--- a/tests/e2e/generate-client/examples/multi-instance/package.json
+++ b/tests/e2e/generate-client/examples/multi-instance/package.json
@@ -9,7 +9,7 @@
     "build": "vite build"
   },
   "dependencies": {
-    "@redocly/client-generator": "0.0.0-snapshot.manual"
+    "@redocly/client-generator": "latest"
   },
   "devDependencies": {
     "@redocly/cli": "latest",
diff --git a/tests/e2e/generate-client/examples/package-runtime/package.json b/tests/e2e/generate-client/examples/package-runtime/package.json
index 13b91e1ff7..0007c9d199 100644
--- a/tests/e2e/generate-client/examples/package-runtime/package.json
+++ b/tests/e2e/generate-client/examples/package-runtime/package.json
@@ -9,7 +9,7 @@
     "build": "vite build"
   },
   "dependencies": {
-    "@redocly/client-generator": "0.0.0-snapshot.manual"
+    "@redocly/client-generator": "latest"
   },
   "devDependencies": {
     "@redocly/cli": "latest",
diff --git a/tests/e2e/generate-client/examples/programmatic/package.json b/tests/e2e/generate-client/examples/programmatic/package.json
index f284e73bec..6d7561ef41 100644
--- a/tests/e2e/generate-client/examples/programmatic/package.json
+++ b/tests/e2e/generate-client/examples/programmatic/package.json
@@ -7,7 +7,7 @@
     "generate": "tsx generate.ts"
   },
   "devDependencies": {
-    "@redocly/client-generator": "0.0.0-snapshot.manual",
+    "@redocly/client-generator": "latest",
     "tsx": "^4.0.0",
     "typescript": "^5.5.0"
   }

From 0377b77d913c31fe69c71ff5c379001365534527 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 20 Jul 2026 18:19:40 +0300
Subject: [PATCH 131/134] docs(client-generator): use native markdown tables in
 the client configuration reference

---
 docs/@v2/configuration/reference/client.md | 165 ++++-----------------
 1 file changed, 25 insertions(+), 140 deletions(-)

diff --git a/docs/@v2/configuration/reference/client.md b/docs/@v2/configuration/reference/client.md
index 6d83d12b70..572941f13d 100644
--- a/docs/@v2/configuration/reference/client.md
+++ b/docs/@v2/configuration/reference/client.md
@@ -15,152 +15,37 @@ The input and output are not part of the `client` block:
 Each scalar option mirrors the matching CLI flag and shares its default — see the [command options](../../commands/generate-client.md#options) for the full description of each value.
 The `pagination` option is config-only and has no flag.
 
-{% table %}
-
-- Option
-- Type
-- Description
-
----
-
-- generators
-- [string]
-- Generators to run, in order. Each entry is a built-in name (`sdk`, `zod`, `tanstack-query`, `swr`, `mock`, `transformers`) or a custom generator's path or package name.
-
----
-
-- outputMode
-- string
-- File layout: `single` or `split`.
-
----
-
-- runtime
-- string
-- Runtime distribution: `inline` or `package`.
-
----
-
-- argsStyle
-- string
-- How operation inputs are passed: `flat` or `grouped`.
-
----
-
-- enumStyle
-- string
-- How named string enums are emitted: `const-object` or `union`.
-
----
-
-- errorMode
-- string
-- How operations report HTTP errors: `throw` or `result`.
-
----
-
-- dateType
-- string
-- Type of `date`/`date-time` fields: `string` or `Date`.
-
----
-
-- queryFramework
-- string
-- Framework adapter for the `tanstack-query` generator: `react`, `vue`, `svelte`, or `solid`.
-
----
-
-- mockData
-- string
-- Data mode for the `mock` generator: `baked` or `faker`.
-
----
-
-- mockSeed
-- number
-- Seed for `faker`-mode mocks.
-
----
-
-- serverUrl
-- string
-- Server URL baked into the client; defaults to `servers[0].url`.
-
----
-
-- setup
-- string
-- Path to a publisher setup module baked into the client.
-
----
-
-- pagination
-- [Pagination object](#pagination-object)
-- Declares how the API paginates, so paginated operations gain typed `.pages()`/`.items()` async iterators.
-
-{% /table %}
+| Option           | Type                                    | Description                                                                                                                                                              |
+| ---------------- | --------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `generators`     | `[string]`                              | Generators to run, in order. Each entry is a built-in name (`sdk`, `zod`, `tanstack-query`, `swr`, `mock`, `transformers`) or a custom generator's path or package name. |
+| `outputMode`     | `string`                                | File layout: `single` or `split`.                                                                                                                                        |
+| `runtime`        | `string`                                | Runtime distribution: `inline` or `package`.                                                                                                                             |
+| `argsStyle`      | `string`                                | How operation inputs are passed: `flat` or `grouped`.                                                                                                                    |
+| `enumStyle`      | `string`                                | How named string enums are emitted: `const-object` or `union`.                                                                                                           |
+| `errorMode`      | `string`                                | How operations report HTTP errors: `throw` or `result`.                                                                                                                  |
+| `dateType`       | `string`                                | Type of `date`/`date-time` fields: `string` or `Date`.                                                                                                                   |
+| `queryFramework` | `string`                                | Framework adapter for the `tanstack-query` generator: `react`, `vue`, `svelte`, or `solid`.                                                                              |
+| `mockData`       | `string`                                | Data mode for the `mock` generator: `baked` or `faker`.                                                                                                                  |
+| `mockSeed`       | `number`                                | Seed for `faker`-mode mocks.                                                                                                                                             |
+| `serverUrl`      | `string`                                | Server URL baked into the client; defaults to `servers[0].url`.                                                                                                          |
+| `setup`          | `string`                                | Path to a publisher setup module baked into the client.                                                                                                                  |
+| `pagination`     | [Pagination object](#pagination-object) | Declares how the API paginates, so paginated operations gain typed `.pages()`/`.items()` async iterators.                                                                |
 
 ### Pagination object
 
 The `pagination` block is an optional convention rule (the rule fields below, applied to every operation it structurally fits when `style` is set), plus per-operation `operations` overrides and an `exclude` list.
 See [Pagination in the usage guide](../../guides/use-generated-client.md#pagination) for how the generated iterators behave.
 
-{% table %}
-
-- Option
-- Type
-- Description
-
----
-
-- style
-- string
-- How the iterator advances: `cursor` (follow a response cursor), `offset` (advance an offset by each page's item count), or `page` (increment a page number).
-
----
-
-- cursorParam
-- string
-- The query parameter that receives the cursor. **REQUIRED** for the `cursor` style.
-
----
-
-- nextCursor
-- string
-- JSON pointer (RFC 6901, starts with `/`) to the next cursor in the response. **REQUIRED** for the `cursor` style.
-
----
-
-- offsetParam
-- string
-- The query parameter the iterator advances. **REQUIRED** for the `offset` and `page` styles.
-
----
-
-- limitParam
-- string
-- Optional page-size query parameter for any style; recorded for tooling — the iterator never sets it.
-
----
-
-- items
-- string
-- **REQUIRED**. JSON pointer to the page's item array in the response.
-
----
-
-- exclude
-- [string]
-- operationIds that no source may paginate; wins over overrides, extensions, and the convention.
-
----
-
-- operations
-- map of operationId → rule
-- Per-operation rules taking the same fields as the convention; each entry beats the spec's `x-pagination` and the convention.
-
-{% /table %}
+| Option        | Type                      | Description                                                                                                                                                  |
+| ------------- | ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `style`       | `string`                  | How the iterator advances: `cursor` (follow a response cursor), `offset` (advance an offset by each page's item count), or `page` (increment a page number). |
+| `cursorParam` | `string`                  | The query parameter that receives the cursor. **REQUIRED** for the `cursor` style.                                                                           |
+| `nextCursor`  | `string`                  | JSON pointer (RFC 6901, starts with `/`) to the next cursor in the response. **REQUIRED** for the `cursor` style.                                            |
+| `offsetParam` | `string`                  | The query parameter the iterator advances. **REQUIRED** for the `offset` and `page` styles.                                                                  |
+| `limitParam`  | `string`                  | Optional page-size query parameter for any style; recorded for tooling — the iterator never sets it.                                                         |
+| `items`       | `string`                  | **REQUIRED**. JSON pointer to the page's item array in the response.                                                                                         |
+| `exclude`     | `[string]`                | operationIds that no source may paginate; wins over overrides, extensions, and the convention.                                                               |
+| `operations`  | map of operationId → rule | Per-operation rules taking the same fields as the convention; each entry beats the spec's `x-pagination` and the convention.                                 |
 
 The rules are verified at generate time: the advance parameter must be a declared query parameter of the right type (string for `cursor`, numeric for `offset` and `page`), and the JSON pointers must resolve in the operation's JSON success-response schema, with `items` landing on an array.
 A convention that doesn't fit an operation skips it; an explicit rule that doesn't fit fails generation.

From 91a6a0f5dd38ce01a32e6f806ae05664fe09421b Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Mon, 20 Jul 2026 19:08:19 +0300
Subject: [PATCH 132/134] feat(client-generator): --import-ext ts for Node
 native TypeScript execution

---
 docs/@v2/commands/generate-client.md          | 49 ++++++++++------
 docs/@v2/configuration/reference/client.md    |  1 +
 packages/cli/src/commands/generate-client.ts  |  2 +
 packages/cli/src/index.ts                     |  6 ++
 packages/client-generator/src/config.ts       |  4 ++
 .../src/emitters/client-assembly.ts           |  6 +-
 .../src/emitters/emit-options.ts              |  7 +++
 .../src/generators/__tests__/sdk.test.ts      | 14 +++++
 .../__tests__/tanstack-query.test.ts          | 10 ++++
 .../client-generator/src/generators/mock.ts   |  2 +-
 .../client-generator/src/generators/swr.ts    |  2 +-
 .../src/generators/tanstack-query.ts          |  2 +-
 .../src/generators/transformers.ts            |  6 +-
 packages/client-generator/src/index.ts        |  1 +
 packages/client-generator/src/types.ts        |  4 ++
 packages/core/src/types/redocly-yaml.ts       |  1 +
 tests/e2e/generate-client/examples/README.md  |  3 +-
 .../examples/node-native/.gitignore           |  3 +
 .../examples/node-native/README.md            | 16 +++++
 .../examples/node-native/openapi.yaml         | 58 +++++++++++++++++++
 .../examples/node-native/package.json         | 14 +++++
 .../examples/node-native/redocly.yaml         | 10 ++++
 .../examples/node-native/src/main.ts          | 11 ++++
 .../examples/node-native/tsconfig.json        |  7 +++
 tests/e2e/generate-client/split.test.ts       | 23 +++++++-
 25 files changed, 237 insertions(+), 25 deletions(-)
 create mode 100644 tests/e2e/generate-client/examples/node-native/.gitignore
 create mode 100644 tests/e2e/generate-client/examples/node-native/README.md
 create mode 100644 tests/e2e/generate-client/examples/node-native/openapi.yaml
 create mode 100644 tests/e2e/generate-client/examples/node-native/package.json
 create mode 100644 tests/e2e/generate-client/examples/node-native/redocly.yaml
 create mode 100644 tests/e2e/generate-client/examples/node-native/src/main.ts
 create mode 100644 tests/e2e/generate-client/examples/node-native/tsconfig.json

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index 9e4264f60a..badcffc34c 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -31,23 +31,24 @@ redocly generate-client <api> [--config=<path>]
 
 ## Options
 
-| Option              | Type       | Description                                                                                                                                                                                         |
-| ------------------- | ---------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `api`               | `string`   | OpenAPI description file path, URL, or an `apis:` alias. Omit it to generate for every api that has a `client` block or `clientOutput`.                                                             |
-| `--output`, `-o`    | `string`   | Output path (must end in `.ts`); the entry file in multi-file modes. Defaults to the api's `clientOutput`, else `<name>.client.ts` next to the configuration file. Single-API invocations only.     |
-| `--output-mode`     | `string`   | File layout. See [Choose an output mode](#choose-an-output-mode). <br/> **Possible values:** `single`, `split`. Default value is `single`.                                                          |
-| `--runtime`         | `string`   | Where the client's engine lives. See [Choose a runtime](#choose-a-runtime). <br/> **Possible values:** `inline`, `package`. Default value is `inline`.                                              |
-| `--generator`       | `[string]` | Generator to run — a built-in name or a custom generator's path or package; repeat the flag to run several. Default value is `sdk`. See [Generators](../guides/use-generated-client.md#generators). |
-| `--args-style`      | `string`   | How operation inputs are passed. See [Argument style](../guides/use-generated-client.md#argument-style). <br/> **Possible values:** `flat`, `grouped`. Default value is `flat`.                     |
-| `--enum-style`      | `string`   | How named string enums are emitted. <br/> **Possible values:** `const-object` (an `as const` object + union), `union` (union only). Default value is `const-object`.                                |
-| `--error-mode`      | `string`   | How operations report HTTP errors. See [Error handling](../guides/use-generated-client.md#error-handling). <br/> **Possible values:** `throw`, `result`. Default value is `throw`.                  |
-| `--date-type`       | `string`   | Type of `date`/`date-time` fields; pair `Date` with the `transformers` generator. <br/> **Possible values:** `string`, `Date`. Default value is `string`.                                           |
-| `--query-framework` | `string`   | Framework adapter for the `tanstack-query` generator. <br/> **Possible values:** `react`, `vue`, `svelte`, `solid`. Default value is `react`.                                                       |
-| `--mock-data`       | `string`   | Data mode for the `mock` generator. <br/> **Possible values:** `baked` (deterministic literals), `faker` (`@faker-js/faker` calls). Default value is `baked`.                                       |
-| `--mock-seed`       | `number`   | Seed for `faker`-mode mocks, for reproducible data. Ignored in `baked` mode.                                                                                                                        |
-| `--server-url`      | `string`   | Override the server URL baked into the client. Accepts an absolute (`https://api.example.com`) or relative (`/v1`) URL. Defaults to `servers[0].url`.                                               |
-| `--setup`           | `string`   | Path to a publisher setup module baked into the client. See [Publisher defaults](../guides/use-generated-client.md#publisher-defaults).                                                             |
-| `--config`          | `string`   | Specify path to the [configuration file](#generate-from-the-configuration-file).                                                                                                                    |
+| Option              | Type       | Description                                                                                                                                                                                                                     |
+| ------------------- | ---------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `api`               | `string`   | OpenAPI description file path, URL, or an `apis:` alias. Omit it to generate for every api that has a `client` block or `clientOutput`.                                                                                         |
+| `--output`, `-o`    | `string`   | Output path (must end in `.ts`); the entry file in multi-file modes. Defaults to the api's `clientOutput`, else `<name>.client.ts` next to the configuration file. Single-API invocations only.                                 |
+| `--output-mode`     | `string`   | File layout. See [Choose an output mode](#choose-an-output-mode). <br/> **Possible values:** `single`, `split`. Default value is `single`.                                                                                      |
+| `--runtime`         | `string`   | Where the client's engine lives. See [Choose a runtime](#choose-a-runtime). <br/> **Possible values:** `inline`, `package`. Default value is `inline`.                                                                          |
+| `--import-ext`      | `string`   | Extension in generated relative imports. See [Run with Node directly](#run-with-node-directly). <br/> **Possible values:** `js` (the tsc/bundler convention), `ts` (for Node's built-in type stripping). Default value is `js`. |
+| `--generator`       | `[string]` | Generator to run — a built-in name or a custom generator's path or package; repeat the flag to run several. Default value is `sdk`. See [Generators](../guides/use-generated-client.md#generators).                             |
+| `--args-style`      | `string`   | How operation inputs are passed. See [Argument style](../guides/use-generated-client.md#argument-style). <br/> **Possible values:** `flat`, `grouped`. Default value is `flat`.                                                 |
+| `--enum-style`      | `string`   | How named string enums are emitted. <br/> **Possible values:** `const-object` (an `as const` object + union), `union` (union only). Default value is `const-object`.                                                            |
+| `--error-mode`      | `string`   | How operations report HTTP errors. See [Error handling](../guides/use-generated-client.md#error-handling). <br/> **Possible values:** `throw`, `result`. Default value is `throw`.                                              |
+| `--date-type`       | `string`   | Type of `date`/`date-time` fields; pair `Date` with the `transformers` generator. <br/> **Possible values:** `string`, `Date`. Default value is `string`.                                                                       |
+| `--query-framework` | `string`   | Framework adapter for the `tanstack-query` generator. <br/> **Possible values:** `react`, `vue`, `svelte`, `solid`. Default value is `react`.                                                                                   |
+| `--mock-data`       | `string`   | Data mode for the `mock` generator. <br/> **Possible values:** `baked` (deterministic literals), `faker` (`@faker-js/faker` calls). Default value is `baked`.                                                                   |
+| `--mock-seed`       | `number`   | Seed for `faker`-mode mocks, for reproducible data. Ignored in `baked` mode.                                                                                                                                                    |
+| `--server-url`      | `string`   | Override the server URL baked into the client. Accepts an absolute (`https://api.example.com`) or relative (`/v1`) URL. Defaults to `servers[0].url`.                                                                           |
+| `--setup`           | `string`   | Path to a publisher setup module baked into the client. See [Publisher defaults](../guides/use-generated-client.md#publisher-defaults).                                                                                         |
+| `--config`          | `string`   | Specify path to the [configuration file](#generate-from-the-configuration-file).                                                                                                                                                |
 
 ## Examples
 
@@ -104,6 +105,20 @@ Choose `package` when you want engine fixes to arrive via `npm update @redocly/c
 Your application code is identical in both modes.
 See [Package runtime](../guides/use-generated-client.md#package-runtime) in the usage guide and the [`package-runtime` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/package-runtime).
 
+### Run with Node directly
+
+Node 22.7+ runs TypeScript natively (type stripping), but it resolves import specifiers literally — there is no `.js` → `.ts` remap, so the default generated imports don't resolve when only `.ts` files exist on disk.
+Pass `--import-ext ts` to emit real on-disk `.ts` specifiers instead, and use a `.ts` extension when importing the client from your own code:
+
+```bash
+redocly generate-client openapi.yaml -o src/api/client.ts --output-mode split --import-ext ts
+node src/main.ts
+```
+
+Keep the default `js` when the client goes through `tsc` or a bundler — plain `tsc` rejects `.ts` specifiers unless the project enables `allowImportingTsExtensions`.
+Loaders such as `tsx` remap `.js` to `.ts` themselves, so they work with the default.
+See the [`node-native` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/node-native).
+
 ## Resources
 
 - [Use the generated client](../guides/use-generated-client.md) — the runtime API and the add-on generators.
diff --git a/docs/@v2/configuration/reference/client.md b/docs/@v2/configuration/reference/client.md
index 572941f13d..8966a653c4 100644
--- a/docs/@v2/configuration/reference/client.md
+++ b/docs/@v2/configuration/reference/client.md
@@ -20,6 +20,7 @@ The `pagination` option is config-only and has no flag.
 | `generators`     | `[string]`                              | Generators to run, in order. Each entry is a built-in name (`sdk`, `zod`, `tanstack-query`, `swr`, `mock`, `transformers`) or a custom generator's path or package name. |
 | `outputMode`     | `string`                                | File layout: `single` or `split`.                                                                                                                                        |
 | `runtime`        | `string`                                | Runtime distribution: `inline` or `package`.                                                                                                                             |
+| `importExt`      | `string`                                | Extension in generated relative imports: `js` (default, for tsc and bundlers) or `ts` (for Node's built-in type stripping).                                              |
 | `argsStyle`      | `string`                                | How operation inputs are passed: `flat` or `grouped`.                                                                                                                    |
 | `enumStyle`      | `string`                                | How named string enums are emitted: `const-object` or `union`.                                                                                                           |
 | `errorMode`      | `string`                                | How operations report HTTP errors: `throw` or `result`.                                                                                                                  |
diff --git a/packages/cli/src/commands/generate-client.ts b/packages/cli/src/commands/generate-client.ts
index 20fab6a61e..435051bf74 100644
--- a/packages/cli/src/commands/generate-client.ts
+++ b/packages/cli/src/commands/generate-client.ts
@@ -14,6 +14,7 @@ export type GenerateClientCommandArgv = {
   'enum-style'?: 'union' | 'const-object';
   'output-mode'?: 'single' | 'split';
   runtime?: 'inline' | 'package';
+  'import-ext'?: 'js' | 'ts';
   'args-style'?: 'flat' | 'grouped';
   'error-mode'?: 'throw' | 'result';
   'date-type'?: 'string' | 'Date';
@@ -82,6 +83,7 @@ export async function handleGenerateClient({
     enumStyle: argv['enum-style'],
     outputMode: argv['output-mode'],
     runtime: argv.runtime,
+    importExt: argv['import-ext'],
     argsStyle: argv['args-style'],
     errorMode: argv['error-mode'],
     dateType: argv['date-type'],
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index 088aea9bd4..aebaa2b953 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -900,6 +900,12 @@ yargs(hideBin(process.argv))
             choices: ['inline', 'package'] as const,
             requiresArg: true,
           },
+          'import-ext': {
+            describe:
+              "Extension in generated relative imports: 'js' (default) suits tsc and bundlers; 'ts' suits runtimes that resolve specifiers literally, like Node's built-in type stripping (node client.ts).",
+            choices: ['js', 'ts'] as const,
+            requiresArg: true,
+          },
           setup: {
             describe:
               'Path to a publisher setup module (export default defineClientSetup({ config, middleware })) baked into the generated client, so a published SDK ships its request/response defaults built in. Works across all output modes.',
diff --git a/packages/client-generator/src/config.ts b/packages/client-generator/src/config.ts
index d379b6db79..91741c5197 100644
--- a/packages/client-generator/src/config.ts
+++ b/packages/client-generator/src/config.ts
@@ -57,6 +57,10 @@ export type Config = {
   setup?: string;
   /** Runtime distribution: 'inline' (default, self-contained) | 'package' (imports @redocly/client-generator). */
   runtime?: 'inline' | 'package';
+  /** Extension in generated relative imports. `'js'` (default) suits tsc and bundlers;
+   * `'ts'` suits runtimes that resolve specifiers literally, like Node's built-in
+   * type stripping (`node client.ts`). */
+  importExt?: 'js' | 'ts';
   /** Auto-pagination rules (convention + per-operation overrides + `exclude`), resolved
    * together with each operation's `x-pagination` extension. Explicit rules that don't
    * fit their operation fail generation. */
diff --git a/packages/client-generator/src/emitters/client-assembly.ts b/packages/client-generator/src/emitters/client-assembly.ts
index a5b8eb971a..76649ce2a6 100644
--- a/packages/client-generator/src/emitters/client-assembly.ts
+++ b/packages/client-generator/src/emitters/client-assembly.ts
@@ -162,7 +162,11 @@ function emitClient(
       HEADER,
       renderTitleComment(model),
       hasSchemas
-        ? schemaLinks(body + '\n' + sugar, ctx.schemaNames, `./${splitStem}.schemas.js`)
+        ? schemaLinks(
+            body + '\n' + sugar,
+            ctx.schemaNames,
+            `./${splitStem}.schemas.${options.importExt ?? 'js'}`
+          )
         : '',
       ...(embed ? [] : [runtimeSection]),
       body,
diff --git a/packages/client-generator/src/emitters/emit-options.ts b/packages/client-generator/src/emitters/emit-options.ts
index 376ba10b3f..eda07c5d45 100644
--- a/packages/client-generator/src/emitters/emit-options.ts
+++ b/packages/client-generator/src/emitters/emit-options.ts
@@ -61,6 +61,13 @@ export type EmitOptions = {
   setup?: string;
   /** Runtime distribution: 'inline' (default, self-contained) | 'package' (imports @redocly/client-generator). */
   runtime?: 'inline' | 'package';
+  /**
+   * Extension used in generated relative import specifiers (the split entry's schemas
+   * re-export and each satellite's sdk import). `'js'` (default) is the tsc/bundler
+   * convention; `'ts'` targets runtimes that resolve specifiers literally, like Node's
+   * built-in type stripping (`node client.ts`).
+   */
+  importExt?: 'js' | 'ts';
   /**
    * Auto-pagination rules (a convention rule + per-operation overrides + `exclude`),
    * resolved together with each operation's `x-pagination` extension. Verified
diff --git a/packages/client-generator/src/generators/__tests__/sdk.test.ts b/packages/client-generator/src/generators/__tests__/sdk.test.ts
index 2159408689..20f30dfd5f 100644
--- a/packages/client-generator/src/generators/__tests__/sdk.test.ts
+++ b/packages/client-generator/src/generators/__tests__/sdk.test.ts
@@ -55,4 +55,18 @@ describe('sdkGenerator', () => {
     });
     expect(files.map((f) => f.path)).toEqual(['/out/api.schemas.ts', '/out/api.ts']);
   });
+
+  it('emits .ts import extensions when importExt is ts (Node native TS execution)', () => {
+    const model = apiModel();
+    model.schemas = [{ name: 'Thing', schema: { kind: 'object', properties: [] } }];
+    const files = sdkGenerator({
+      model,
+      outputPath: '/out/api.ts',
+      outputMode: 'split',
+      emit: { importExt: 'ts' },
+    });
+    const entry = files.find((file) => file.path === '/out/api.ts')!;
+    expect(entry.content).toContain("from './api.schemas.ts'");
+    expect(entry.content).not.toContain('.schemas.js');
+  });
 });
diff --git a/packages/client-generator/src/generators/__tests__/tanstack-query.test.ts b/packages/client-generator/src/generators/__tests__/tanstack-query.test.ts
index 6300648c26..8f25b7359c 100644
--- a/packages/client-generator/src/generators/__tests__/tanstack-query.test.ts
+++ b/packages/client-generator/src/generators/__tests__/tanstack-query.test.ts
@@ -39,6 +39,16 @@ describe('tanstackQueryGenerator', () => {
     expect(files).toEqual([]);
   });
 
+  it('imports the sdk entry with a .ts extension when importExt is ts', () => {
+    const files = tanstackQueryGenerator({
+      model: apiModel({ services: SERVICES }),
+      outputPath: '/tmp/out/client.ts',
+      outputMode: 'single',
+      emit: { importExt: 'ts' },
+    });
+    expect(files[0].content).toContain('from "./client.ts"');
+  });
+
   it('passes queryFramework through to the import specifier', () => {
     const files = tanstackQueryGenerator({
       model: apiModel({ services: SERVICES }),
diff --git a/packages/client-generator/src/generators/mock.ts b/packages/client-generator/src/generators/mock.ts
index 3d37f6052f..1f358625f7 100644
--- a/packages/client-generator/src/generators/mock.ts
+++ b/packages/client-generator/src/generators/mock.ts
@@ -14,7 +14,7 @@ import type { Generator } from './types.js';
 export const mockGenerator: Generator = ({ model, outputPath, emit }) => {
   const { dir, stem } = anchor(outputPath);
   const content = renderMockModule(model, {
-    sdkModule: `./${stem}.js`,
+    sdkModule: `./${stem}.${emit.importExt ?? 'js'}`,
     dateType: emit.dateType,
     mockData: emit.mockData,
     mockSeed: emit.mockSeed,
diff --git a/packages/client-generator/src/generators/swr.ts b/packages/client-generator/src/generators/swr.ts
index 6f62808867..916a118ca9 100644
--- a/packages/client-generator/src/generators/swr.ts
+++ b/packages/client-generator/src/generators/swr.ts
@@ -21,7 +21,7 @@ export const swrGenerator: Generator = ({ model, outputPath, emit }) => {
   const { dir, stem } = anchor(outputPath);
   const content = renderSwrModule(model, {
     argsStyle: emit.argsStyle ?? 'flat',
-    sdkModule: `./${stem}.js`,
+    sdkModule: `./${stem}.${emit.importExt ?? 'js'}`,
   });
   if (content === '') return [];
   return [{ path: join(dir, `${stem}.swr.ts`), content: `${HEADER}\n\n${content}` }];
diff --git a/packages/client-generator/src/generators/tanstack-query.ts b/packages/client-generator/src/generators/tanstack-query.ts
index f080385c85..adfd3dc5b4 100644
--- a/packages/client-generator/src/generators/tanstack-query.ts
+++ b/packages/client-generator/src/generators/tanstack-query.ts
@@ -23,7 +23,7 @@ export const tanstackQueryGenerator: Generator = ({ model, outputPath, emit }) =
   const { dir, stem } = anchor(outputPath);
   const content = renderTanstackModule(model, {
     argsStyle: emit.argsStyle ?? 'flat',
-    sdkModule: `./${stem}.js`,
+    sdkModule: `./${stem}.${emit.importExt ?? 'js'}`,
     framework: emit.queryFramework ?? 'react',
   });
   if (content === '') return [];
diff --git a/packages/client-generator/src/generators/transformers.ts b/packages/client-generator/src/generators/transformers.ts
index 13044b57c0..cbdb34f786 100644
--- a/packages/client-generator/src/generators/transformers.ts
+++ b/packages/client-generator/src/generators/transformers.ts
@@ -21,9 +21,11 @@ import type { Generator } from './types.js';
  * beside the client regardless of how the sdk partitions its files. Emits
  * nothing when no schema has a date field (nothing to transform).
  */
-export const transformersGenerator: Generator = ({ model, outputPath }) => {
+export const transformersGenerator: Generator = ({ model, outputPath, emit }) => {
   const { dir, stem } = anchor(outputPath);
-  const content = renderTransformersModule(model, { sdkModule: `./${stem}.js` });
+  const content = renderTransformersModule(model, {
+    sdkModule: `./${stem}.${emit.importExt ?? 'js'}`,
+  });
   if (content === '') return [];
   return [{ path: join(dir, `${stem}.transformers.ts`), content: `${HEADER}\n\n${content}` }];
 };
diff --git a/packages/client-generator/src/index.ts b/packages/client-generator/src/index.ts
index c1822480c5..33306371cf 100644
--- a/packages/client-generator/src/index.ts
+++ b/packages/client-generator/src/index.ts
@@ -161,6 +161,7 @@ export async function generateClient(
       mockSeed: options.mockSeed,
       setup: setupBlock,
       runtime: options.runtime,
+      importExt: options.importExt,
       pagination: options.pagination,
     },
     generators: selected,
diff --git a/packages/client-generator/src/types.ts b/packages/client-generator/src/types.ts
index ae1306e162..69768570a6 100644
--- a/packages/client-generator/src/types.ts
+++ b/packages/client-generator/src/types.ts
@@ -91,6 +91,10 @@ export type GenerateClientOptions = {
   setup?: string;
   /** Runtime distribution: 'inline' (default, self-contained) | 'package' (imports @redocly/client-generator). */
   runtime?: 'inline' | 'package';
+  /** Extension in generated relative imports. `'js'` (default) suits tsc and bundlers;
+   * `'ts'` suits runtimes that resolve specifiers literally, like Node's built-in
+   * type stripping (`node client.ts`). */
+  importExt?: 'js' | 'ts';
   /**
    * Auto-pagination rules: a convention rule (applied to every operation it
    * structurally fits), per-operation overrides, and `exclude`d operationIds —
diff --git a/packages/core/src/types/redocly-yaml.ts b/packages/core/src/types/redocly-yaml.ts
index bf2b342d57..6c93ddb375 100644
--- a/packages/core/src/types/redocly-yaml.ts
+++ b/packages/core/src/types/redocly-yaml.ts
@@ -355,6 +355,7 @@ const Client: NodeType = {
     serverUrl: { type: 'string' },
     outputMode: { enum: ['single', 'split'] },
     runtime: { enum: ['inline', 'package'] },
+    importExt: { enum: ['js', 'ts'] },
     enumStyle: { enum: ['union', 'const-object'] },
     errorMode: { enum: ['throw', 'result'] },
     dateType: { enum: ['string', 'Date'] },
diff --git a/tests/e2e/generate-client/examples/README.md b/tests/e2e/generate-client/examples/README.md
index 1d62682660..46d75b842f 100644
--- a/tests/e2e/generate-client/examples/README.md
+++ b/tests/e2e/generate-client/examples/README.md
@@ -16,6 +16,7 @@ The generated client under `src/api/` is gitignored — CI regenerates every cli
 | [programmatic](./programmatic)                         | `generateClient(...)` API      | generating the client from a Node script                                                                                                  |
 | [package-runtime](./package-runtime)                   | CLI · `sdk`, package runtime   | `runtime: package` — types + descriptors only; the versioned runtime is imported from `@redocly/client-generator`, fixes via `npm update` |
 | [zero-install-quickstart](./zero-install-quickstart)   | CLI · `sdk`                    | the first-touch loop: generate → import → call; one self-contained file, zero runtime dependencies                                        |
+| [node-native](./node-native)                           | CLI · `sdk`                    | `importExt: ts` — `.ts` import specifiers so plain `node src/main.ts` runs the client via Node's built-in type stripping                  |
 | [configure-and-middleware](./configure-and-middleware) | CLI · `sdk`                    | `configure({ serverUrl, retry, fetch })`, `use()` targeting `ctx.operation` (literal unions), body mutation, auth setter, `ApiError.body` |
 | [multi-instance](./multi-instance)                     | CLI · `sdk`, package runtime   | per-tenant instances via `createClient(OPERATIONS)` — works in both runtimes; this example uses `runtime: package`                        |
 | [sse-streaming](./sse-streaming)                       | CLI · `sdk`                    | typed `for await` over SSE, auto-reconnect via `Last-Event-ID` (`reconnectDelay`/`reconnect: false`), clean abort                         |
@@ -34,7 +35,7 @@ npm run examples:regen -w @redocly/client-generator
 cd tests/e2e/generate-client/examples/<name>
 npm install
 npm run dev        # the Vite apps; `programmatic` uses `npm run generate`,
-                   # `zero-install-quickstart` `npm start`, `vendored-edge` `npm run typecheck`
+                   # `zero-install-quickstart`/`node-native` `npm start`, `vendored-edge` `npm run typecheck`
 ```
 
 Each example can also regenerate just its own client with `npm run generate` inside its directory.
diff --git a/tests/e2e/generate-client/examples/node-native/.gitignore b/tests/e2e/generate-client/examples/node-native/.gitignore
new file mode 100644
index 0000000000..612acc5cae
--- /dev/null
+++ b/tests/e2e/generate-client/examples/node-native/.gitignore
@@ -0,0 +1,3 @@
+node_modules
+src/api/
+package-lock.json
diff --git a/tests/e2e/generate-client/examples/node-native/README.md b/tests/e2e/generate-client/examples/node-native/README.md
new file mode 100644
index 0000000000..825d7dfc5e
--- /dev/null
+++ b/tests/e2e/generate-client/examples/node-native/README.md
@@ -0,0 +1,16 @@
+# node-native
+
+Run the generated client with plain `node` — no tsx, no loader, no build step.
+
+Node 22.7+ strips TypeScript types natively but resolves import specifiers literally:
+there is no `.js` → `.ts` remap, so the default generated imports (`./client.schemas.js`) don't resolve.
+Setting `importExt: ts` (or passing `--import-ext ts`) makes the generator emit real on-disk `.ts` specifiers instead,
+and your own code imports the client the same way (`./api/client.ts`).
+
+Keep the default `js` extension when the client goes through `tsc` or a bundler — this option targets literal-resolution runtimes only.
+
+```bash
+npm install
+npm run generate
+npm start
+```
diff --git a/tests/e2e/generate-client/examples/node-native/openapi.yaml b/tests/e2e/generate-client/examples/node-native/openapi.yaml
new file mode 100644
index 0000000000..0d3078b028
--- /dev/null
+++ b/tests/e2e/generate-client/examples/node-native/openapi.yaml
@@ -0,0 +1,58 @@
+openapi: 3.2.0
+info:
+  title: Cafe Menu (Node native)
+  description: A tiny slice of the Redocly Cafe demo API — just enough for a first call.
+  version: 1.0.0
+servers:
+  - url: https://api.cafe.redocly.com
+    description: Live demo server.
+paths:
+  /menu:
+    get:
+      summary: List all menu items
+      operationId: listMenuItems
+      security: []
+      parameters:
+        - name: limit
+          in: query
+          required: false
+          description: Number of results per page.
+          schema:
+            type: integer
+            minimum: 1
+            maximum: 100
+            default: 10
+      responses:
+        '200':
+          description: Successful operation.
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/MenuItemList'
+components:
+  schemas:
+    MenuItem:
+      type: object
+      properties:
+        id:
+          description: Menu item ID.
+          type: string
+        name:
+          description: Menu item name.
+          type: string
+        price:
+          description: Price in cents.
+          type: integer
+      required:
+        - id
+        - name
+        - price
+    MenuItemList:
+      type: object
+      properties:
+        items:
+          type: array
+          items:
+            $ref: '#/components/schemas/MenuItem'
+      required:
+        - items
diff --git a/tests/e2e/generate-client/examples/node-native/package.json b/tests/e2e/generate-client/examples/node-native/package.json
new file mode 100644
index 0000000000..f49846de62
--- /dev/null
+++ b/tests/e2e/generate-client/examples/node-native/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "@redocly-examples/node-native",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "generate": "redocly generate-client",
+    "start": "node src/main.ts"
+  },
+  "devDependencies": {
+    "@redocly/cli": "latest",
+    "typescript": "^5.5.0"
+  }
+}
diff --git a/tests/e2e/generate-client/examples/node-native/redocly.yaml b/tests/e2e/generate-client/examples/node-native/redocly.yaml
new file mode 100644
index 0000000000..cab21aa9df
--- /dev/null
+++ b/tests/e2e/generate-client/examples/node-native/redocly.yaml
@@ -0,0 +1,10 @@
+# redocly.yaml — drives `redocly generate-client` for this example.
+apis:
+  node-native:
+    root: ./openapi.yaml
+    clientOutput: ./src/api/client.ts
+    client:
+      generators:
+        - sdk
+      outputMode: split
+      importExt: ts
diff --git a/tests/e2e/generate-client/examples/node-native/src/main.ts b/tests/e2e/generate-client/examples/node-native/src/main.ts
new file mode 100644
index 0000000000..b2de7d1b5d
--- /dev/null
+++ b/tests/e2e/generate-client/examples/node-native/src/main.ts
@@ -0,0 +1,11 @@
+// node-native — run the TypeScript client directly with `node`, no loader, no build step.
+//
+// The client was generated with `importExt: ts`, so its internal imports use real
+// on-disk `.ts` specifiers — what Node's built-in type stripping resolves (Node 22.7+).
+// The import below uses a `.ts` extension for the same reason.
+import { listMenuItems, type MenuItem } from './api/client.ts';
+
+const menu = await listMenuItems({ limit: 3 });
+for (const item of menu.items satisfies MenuItem[]) {
+  console.log(`${item.name} — $${(item.price / 100).toFixed(2)}`);
+}
diff --git a/tests/e2e/generate-client/examples/node-native/tsconfig.json b/tests/e2e/generate-client/examples/node-native/tsconfig.json
new file mode 100644
index 0000000000..0e7c07dacb
--- /dev/null
+++ b/tests/e2e/generate-client/examples/node-native/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../tsconfig.base.json",
+  "compilerOptions": {
+    "allowImportingTsExtensions": true
+  },
+  "include": ["src"]
+}
diff --git a/tests/e2e/generate-client/split.test.ts b/tests/e2e/generate-client/split.test.ts
index fa1480efb3..2ea790e224 100644
--- a/tests/e2e/generate-client/split.test.ts
+++ b/tests/e2e/generate-client/split.test.ts
@@ -7,7 +7,7 @@
  * auth, header params) and the schemas module (named types + discriminated-union guards).
  */
 import { spawnSync } from 'node:child_process';
-import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs';
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -84,4 +84,25 @@ describe('generate-client end-to-end (--output-mode split)', () => {
     );
     expect(tsc.status, `tsc errors:\n${tsc.stdout}\n${tsc.stderr}`).toBe(0);
   }, 90_000);
+
+  // `--import-ext ts` targets runtimes that resolve specifiers literally (no `.js` → `.ts`
+  // remap) — Node's built-in type stripping. Locked by actually executing `node main.ts`.
+  test('--import-ext ts produces a client Node runs natively', () => {
+    const tsEntry = join(workDir, 'client-ts.ts');
+    generate(fixture, tsEntry, ['--output-mode', 'split', '--import-ext', 'ts']);
+
+    const entrySrc = readFileSync(tsEntry, 'utf-8');
+    expect(entrySrc).toContain("export * from './client-ts.schemas.ts';");
+    expect(entrySrc).not.toContain('.schemas.js');
+
+    const mainFile = join(workDir, 'main.ts');
+    writeFileSync(
+      mainFile,
+      "import { isBeverage } from './client-ts.ts';\n" +
+        "console.log('isBeverage:', typeof isBeverage);\n"
+    );
+    const run = spawnSync('node', [mainFile], { encoding: 'utf-8', cwd: workDir });
+    expect(run.status, `node errors:\n${run.stderr}`).toBe(0);
+    expect(run.stdout).toContain('isBeverage: function');
+  }, 90_000);
 });

From dc3a11421bcf8aa2b00e917b30154b340642f97b Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 21 Jul 2026 10:09:49 +0300
Subject: [PATCH 133/134] docs(client-generator): move the Run with Node
 directly section to the usage guide

---
 docs/@v2/commands/generate-client.md    | 50 +++++++++----------------
 docs/@v2/guides/use-generated-client.md | 24 ++++++++++++
 2 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/docs/@v2/commands/generate-client.md b/docs/@v2/commands/generate-client.md
index badcffc34c..48c909bf0a 100644
--- a/docs/@v2/commands/generate-client.md
+++ b/docs/@v2/commands/generate-client.md
@@ -31,24 +31,24 @@ redocly generate-client <api> [--config=<path>]
 
 ## Options
 
-| Option              | Type       | Description                                                                                                                                                                                                                     |
-| ------------------- | ---------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `api`               | `string`   | OpenAPI description file path, URL, or an `apis:` alias. Omit it to generate for every api that has a `client` block or `clientOutput`.                                                                                         |
-| `--output`, `-o`    | `string`   | Output path (must end in `.ts`); the entry file in multi-file modes. Defaults to the api's `clientOutput`, else `<name>.client.ts` next to the configuration file. Single-API invocations only.                                 |
-| `--output-mode`     | `string`   | File layout. See [Choose an output mode](#choose-an-output-mode). <br/> **Possible values:** `single`, `split`. Default value is `single`.                                                                                      |
-| `--runtime`         | `string`   | Where the client's engine lives. See [Choose a runtime](#choose-a-runtime). <br/> **Possible values:** `inline`, `package`. Default value is `inline`.                                                                          |
-| `--import-ext`      | `string`   | Extension in generated relative imports. See [Run with Node directly](#run-with-node-directly). <br/> **Possible values:** `js` (the tsc/bundler convention), `ts` (for Node's built-in type stripping). Default value is `js`. |
-| `--generator`       | `[string]` | Generator to run — a built-in name or a custom generator's path or package; repeat the flag to run several. Default value is `sdk`. See [Generators](../guides/use-generated-client.md#generators).                             |
-| `--args-style`      | `string`   | How operation inputs are passed. See [Argument style](../guides/use-generated-client.md#argument-style). <br/> **Possible values:** `flat`, `grouped`. Default value is `flat`.                                                 |
-| `--enum-style`      | `string`   | How named string enums are emitted. <br/> **Possible values:** `const-object` (an `as const` object + union), `union` (union only). Default value is `const-object`.                                                            |
-| `--error-mode`      | `string`   | How operations report HTTP errors. See [Error handling](../guides/use-generated-client.md#error-handling). <br/> **Possible values:** `throw`, `result`. Default value is `throw`.                                              |
-| `--date-type`       | `string`   | Type of `date`/`date-time` fields; pair `Date` with the `transformers` generator. <br/> **Possible values:** `string`, `Date`. Default value is `string`.                                                                       |
-| `--query-framework` | `string`   | Framework adapter for the `tanstack-query` generator. <br/> **Possible values:** `react`, `vue`, `svelte`, `solid`. Default value is `react`.                                                                                   |
-| `--mock-data`       | `string`   | Data mode for the `mock` generator. <br/> **Possible values:** `baked` (deterministic literals), `faker` (`@faker-js/faker` calls). Default value is `baked`.                                                                   |
-| `--mock-seed`       | `number`   | Seed for `faker`-mode mocks, for reproducible data. Ignored in `baked` mode.                                                                                                                                                    |
-| `--server-url`      | `string`   | Override the server URL baked into the client. Accepts an absolute (`https://api.example.com`) or relative (`/v1`) URL. Defaults to `servers[0].url`.                                                                           |
-| `--setup`           | `string`   | Path to a publisher setup module baked into the client. See [Publisher defaults](../guides/use-generated-client.md#publisher-defaults).                                                                                         |
-| `--config`          | `string`   | Specify path to the [configuration file](#generate-from-the-configuration-file).                                                                                                                                                |
+| Option              | Type       | Description                                                                                                                                                                                                                                                      |
+| ------------------- | ---------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `api`               | `string`   | OpenAPI description file path, URL, or an `apis:` alias. Omit it to generate for every api that has a `client` block or `clientOutput`.                                                                                                                          |
+| `--output`, `-o`    | `string`   | Output path (must end in `.ts`); the entry file in multi-file modes. Defaults to the api's `clientOutput`, else `<name>.client.ts` next to the configuration file. Single-API invocations only.                                                                  |
+| `--output-mode`     | `string`   | File layout. See [Choose an output mode](#choose-an-output-mode). <br/> **Possible values:** `single`, `split`. Default value is `single`.                                                                                                                       |
+| `--runtime`         | `string`   | Where the client's engine lives. See [Choose a runtime](#choose-a-runtime). <br/> **Possible values:** `inline`, `package`. Default value is `inline`.                                                                                                           |
+| `--import-ext`      | `string`   | Extension in generated relative imports. See [Run with Node directly](../guides/use-generated-client.md#run-with-node-directly). <br/> **Possible values:** `js` (the tsc/bundler convention), `ts` (for Node's built-in type stripping). Default value is `js`. |
+| `--generator`       | `[string]` | Generator to run — a built-in name or a custom generator's path or package; repeat the flag to run several. Default value is `sdk`. See [Generators](../guides/use-generated-client.md#generators).                                                              |
+| `--args-style`      | `string`   | How operation inputs are passed. See [Argument style](../guides/use-generated-client.md#argument-style). <br/> **Possible values:** `flat`, `grouped`. Default value is `flat`.                                                                                  |
+| `--enum-style`      | `string`   | How named string enums are emitted. <br/> **Possible values:** `const-object` (an `as const` object + union), `union` (union only). Default value is `const-object`.                                                                                             |
+| `--error-mode`      | `string`   | How operations report HTTP errors. See [Error handling](../guides/use-generated-client.md#error-handling). <br/> **Possible values:** `throw`, `result`. Default value is `throw`.                                                                               |
+| `--date-type`       | `string`   | Type of `date`/`date-time` fields; pair `Date` with the `transformers` generator. <br/> **Possible values:** `string`, `Date`. Default value is `string`.                                                                                                        |
+| `--query-framework` | `string`   | Framework adapter for the `tanstack-query` generator. <br/> **Possible values:** `react`, `vue`, `svelte`, `solid`. Default value is `react`.                                                                                                                    |
+| `--mock-data`       | `string`   | Data mode for the `mock` generator. <br/> **Possible values:** `baked` (deterministic literals), `faker` (`@faker-js/faker` calls). Default value is `baked`.                                                                                                    |
+| `--mock-seed`       | `number`   | Seed for `faker`-mode mocks, for reproducible data. Ignored in `baked` mode.                                                                                                                                                                                     |
+| `--server-url`      | `string`   | Override the server URL baked into the client. Accepts an absolute (`https://api.example.com`) or relative (`/v1`) URL. Defaults to `servers[0].url`.                                                                                                            |
+| `--setup`           | `string`   | Path to a publisher setup module baked into the client. See [Publisher defaults](../guides/use-generated-client.md#publisher-defaults).                                                                                                                          |
+| `--config`          | `string`   | Specify path to the [configuration file](#generate-from-the-configuration-file).                                                                                                                                                                                 |
 
 ## Examples
 
@@ -105,20 +105,6 @@ Choose `package` when you want engine fixes to arrive via `npm update @redocly/c
 Your application code is identical in both modes.
 See [Package runtime](../guides/use-generated-client.md#package-runtime) in the usage guide and the [`package-runtime` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/package-runtime).
 
-### Run with Node directly
-
-Node 22.7+ runs TypeScript natively (type stripping), but it resolves import specifiers literally — there is no `.js` → `.ts` remap, so the default generated imports don't resolve when only `.ts` files exist on disk.
-Pass `--import-ext ts` to emit real on-disk `.ts` specifiers instead, and use a `.ts` extension when importing the client from your own code:
-
-```bash
-redocly generate-client openapi.yaml -o src/api/client.ts --output-mode split --import-ext ts
-node src/main.ts
-```
-
-Keep the default `js` when the client goes through `tsc` or a bundler — plain `tsc` rejects `.ts` specifiers unless the project enables `allowImportingTsExtensions`.
-Loaders such as `tsx` remap `.js` to `.ts` themselves, so they work with the default.
-See the [`node-native` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/node-native).
-
 ## Resources
 
 - [Use the generated client](../guides/use-generated-client.md) — the runtime API and the add-on generators.
diff --git a/docs/@v2/guides/use-generated-client.md b/docs/@v2/guides/use-generated-client.md
index d84ca1b466..799ab88fa6 100644
--- a/docs/@v2/guides/use-generated-client.md
+++ b/docs/@v2/guides/use-generated-client.md
@@ -46,6 +46,30 @@ An incompatible generated-file/runtime pair fails your `tsc` build (the descript
 Package mode works with both output modes and every generator.
 See the [`package-runtime` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/package-runtime).
 
+## Run with Node directly
+
+Node 22.7+ runs TypeScript natively (type stripping), so you can execute a script that uses the generated client with plain `node` — no `tsx`, no build step.
+Node resolves import specifiers literally — there is no `.js` → `.ts` remap — so generate with [`--import-ext ts`](../commands/generate-client.md#options) to get real on-disk `.ts` specifiers, and import the client with a `.ts` extension in your own code:
+
+```bash
+redocly generate-client openapi.yaml -o src/api/client.ts --import-ext ts
+```
+
+```ts
+// src/main.ts
+import { listMenuItems } from './api/client.ts';
+
+const menu = await listMenuItems({ limit: 3 });
+```
+
+```bash
+node src/main.ts
+```
+
+Keep the default `js` when the client goes through `tsc` or a bundler — plain `tsc` rejects `.ts` specifiers unless the project enables `allowImportingTsExtensions`.
+Loaders such as `tsx` remap `.js` to `.ts` themselves, so they work with the default.
+See the [`node-native` example](https://github.com/Redocly/redocly-cli/tree/main/tests/e2e/generate-client/examples/node-native).
+
 ## Authentication
 
 Credentials are **per instance**: they live in the client's config (`ClientConfig.auth`), and each operation automatically sends the credentials its `security` requires.

From 32cadfeabbdfce27bd437c63d4325c22e21339b9 Mon Sep 17 00:00:00 2001
From: Roman Marshevskyi <marshevskyy@gmail.com>
Date: Tue, 21 Jul 2026 10:47:11 +0300
Subject: [PATCH 134/134] feat(client-generator): named operation closures,
 pagination hasMore flag, and cookie parameter support

---
 docs/@v2/configuration/reference/client.md    | 25 +++++-----
 docs/@v2/guides/use-generated-client.md       |  4 +-
 .../src/emitters/__tests__/fixtures.ts        |  1 +
 .../src/emitters/__tests__/pagination.test.ts | 47 +++++++++++++++++++
 .../src/emitters/client-assembly.ts           |  3 ++
 .../src/emitters/descriptor.ts                | 16 ++++---
 .../src/emitters/operation-aliases.ts         | 15 ++++++
 .../src/emitters/operation-signature.ts       |  8 +++-
 .../src/emitters/operations.ts                |  6 ++-
 .../src/emitters/pagination.ts                | 27 ++++++++++-
 .../src/emitters/runtime-sources.ts           |  6 +--
 .../src/emitters/wrapper-support.ts           |  1 +
 .../src/generators/__tests__/sdk.test.ts      |  1 +
 .../__tests__/build.test.ts                   | 43 +++++++----------
 .../__tests__/sanitize-identifiers.test.ts    |  1 +
 .../src/intermediate-representation/build.ts  | 13 ++---
 .../src/intermediate-representation/model.ts  |  7 +--
 .../sanitize-identifiers.ts                   |  1 +
 .../runtime/__tests__/create-client.test.ts   | 32 +++++++++++++
 .../src/runtime/__tests__/paginate.test.ts    | 20 ++++++++
 .../src/runtime/create-client.ts              | 32 ++++++++++---
 .../client-generator/src/runtime/paginate.ts  |  9 +++-
 .../client-generator/src/runtime/types.ts     |  4 +-
 .../__snapshots__/redocly-yaml.test.ts.snap   | 12 +++++
 packages/core/src/types/redocly-yaml.ts       |  1 +
 tests/e2e/generate-client/cafe.snapshot.ts    | 36 +++++++++++---
 .../zero-install-quickstart/src/api/client.ts | 36 +++++++++++---
 27 files changed, 315 insertions(+), 92 deletions(-)

diff --git a/docs/@v2/configuration/reference/client.md b/docs/@v2/configuration/reference/client.md
index 8966a653c4..bd090faffa 100644
--- a/docs/@v2/configuration/reference/client.md
+++ b/docs/@v2/configuration/reference/client.md
@@ -37,18 +37,19 @@ The `pagination` option is config-only and has no flag.
 The `pagination` block is an optional convention rule (the rule fields below, applied to every operation it structurally fits when `style` is set), plus per-operation `operations` overrides and an `exclude` list.
 See [Pagination in the usage guide](../../guides/use-generated-client.md#pagination) for how the generated iterators behave.
 
-| Option        | Type                      | Description                                                                                                                                                  |
-| ------------- | ------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `style`       | `string`                  | How the iterator advances: `cursor` (follow a response cursor), `offset` (advance an offset by each page's item count), or `page` (increment a page number). |
-| `cursorParam` | `string`                  | The query parameter that receives the cursor. **REQUIRED** for the `cursor` style.                                                                           |
-| `nextCursor`  | `string`                  | JSON pointer (RFC 6901, starts with `/`) to the next cursor in the response. **REQUIRED** for the `cursor` style.                                            |
-| `offsetParam` | `string`                  | The query parameter the iterator advances. **REQUIRED** for the `offset` and `page` styles.                                                                  |
-| `limitParam`  | `string`                  | Optional page-size query parameter for any style; recorded for tooling — the iterator never sets it.                                                         |
-| `items`       | `string`                  | **REQUIRED**. JSON pointer to the page's item array in the response.                                                                                         |
-| `exclude`     | `[string]`                | operationIds that no source may paginate; wins over overrides, extensions, and the convention.                                                               |
-| `operations`  | map of operationId → rule | Per-operation rules taking the same fields as the convention; each entry beats the spec's `x-pagination` and the convention.                                 |
-
-The rules are verified at generate time: the advance parameter must be a declared query parameter of the right type (string for `cursor`, numeric for `offset` and `page`), and the JSON pointers must resolve in the operation's JSON success-response schema, with `items` landing on an array.
+| Option        | Type                      | Description                                                                                                                                                                  |
+| ------------- | ------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `style`       | `string`                  | How the iterator advances: `cursor` (follow a response cursor), `offset` (advance an offset by each page's item count), or `page` (increment a page number).                 |
+| `cursorParam` | `string`                  | The query parameter that receives the cursor. **REQUIRED** for the `cursor` style.                                                                                           |
+| `nextCursor`  | `string`                  | JSON pointer (RFC 6901, starts with `/`) to the next cursor in the response. **REQUIRED** for the `cursor` style.                                                            |
+| `hasMore`     | `string`                  | Optional (`cursor` style): JSON pointer to a boolean "more pages" flag — iteration stops when it resolves to `false`, for APIs whose cursor stays non-null on the last page. |
+| `offsetParam` | `string`                  | The query parameter the iterator advances. **REQUIRED** for the `offset` and `page` styles.                                                                                  |
+| `limitParam`  | `string`                  | Optional page-size query parameter for any style; recorded for tooling — the iterator never sets it.                                                                         |
+| `items`       | `string`                  | **REQUIRED**. JSON pointer to the page's item array in the response.                                                                                                         |
+| `exclude`     | `[string]`                | operationIds that no source may paginate; wins over overrides, extensions, and the convention.                                                                               |
+| `operations`  | map of operationId → rule | Per-operation rules taking the same fields as the convention; each entry beats the spec's `x-pagination` and the convention.                                                 |
+
+The rules are verified at generate time: the advance parameter must be a declared query parameter of the right type (string for `cursor`, numeric for `offset` and `page`), and the JSON pointers must resolve in the operation's JSON success-response schema, with `items` landing on an array and `hasMore` on a boolean.
 A convention that doesn't fit an operation skips it; an explicit rule that doesn't fit fails generation.
 The `x-pagination` operation extension in the API description takes the same rule fields.
 Per operation, precedence is `operations[id]`, then `x-pagination`, then the convention.
diff --git a/docs/@v2/guides/use-generated-client.md b/docs/@v2/guides/use-generated-client.md
index 799ab88fa6..6e699a64e0 100644
--- a/docs/@v2/guides/use-generated-client.md
+++ b/docs/@v2/guides/use-generated-client.md
@@ -110,7 +110,8 @@ const publicApi = createClient<Ops>(OPERATIONS, { serverUrl: 'https://api.exampl
 
 ## Argument style
 
-By default (`--args-style flat`) each operation takes positional arguments — path params in URL order, then `params` (query), `body`, and `headers` — with the per-call `init` last.
+By default (`--args-style flat`) each operation takes positional arguments — path params in URL order, then `params` (query), `body`, `headers`, and `cookies` — with the per-call `init` last.
+Cookie parameters are serialized into the `Cookie` request header, which browsers refuse to set — like cookie apiKey auth, they work only in server-side clients.
 With `--args-style grouped`, every input is bundled into one `vars` object typed as the operation's `<Op>Variables`:
 
 ```ts
@@ -353,6 +354,7 @@ Each paginated operation keeps its one-shot call and gains two async iterators 
 
 Three styles are supported:
 `cursor` sends the response's `nextCursor` back in `cursorParam`, stops when it's absent, `null`, or empty, and throws if the server returns the same cursor twice in a row.
+For connection-style APIs whose cursor stays non-null on the last page, add the optional `hasMore` pointer (for example `/pageInfo/hasNextPage`) — iteration stops as soon as it resolves to `false`, skipping the follow-up empty request.
 `offset` advances `offsetParam` by each page's item count, and `page` increments `offsetParam` by 1; both stop on an empty page.
 `limitParam` is optional metadata for any style: the iterator never sets it, so pass your page size in `params` yourself.
 
diff --git a/packages/client-generator/src/emitters/__tests__/fixtures.ts b/packages/client-generator/src/emitters/__tests__/fixtures.ts
index c046ac41a1..6e57e09f58 100644
--- a/packages/client-generator/src/emitters/__tests__/fixtures.ts
+++ b/packages/client-generator/src/emitters/__tests__/fixtures.ts
@@ -41,6 +41,7 @@ export function operation(overrides: Partial<OperationModel> = {}): OperationMod
     pathParams: [],
     queryParams: [],
     headerParams: [],
+    cookieParams: [],
     successResponses: [],
     errorResponses: [],
     security: [],
diff --git a/packages/client-generator/src/emitters/__tests__/pagination.test.ts b/packages/client-generator/src/emitters/__tests__/pagination.test.ts
index f3a5ba74e0..ff72604509 100644
--- a/packages/client-generator/src/emitters/__tests__/pagination.test.ts
+++ b/packages/client-generator/src/emitters/__tests__/pagination.test.ts
@@ -165,6 +165,53 @@ describe('resolveOperationPagination — sources and precedence', () => {
     expect(result.itemSchema).toEqual({ kind: 'ref', name: 'Order' });
   });
 
+  it('verifies an optional hasMore pointer (boolean) and carries it into the spec', () => {
+    const connectionPage: SchemaModel = {
+      kind: 'object',
+      properties: [
+        { name: 'orders', schema: ORDER_LIST, required: true },
+        { name: 'endCursor', schema: SCALAR, required: false },
+        {
+          name: 'pageInfo',
+          schema: {
+            kind: 'object',
+            properties: [
+              {
+                name: 'hasNextPage',
+                schema: { kind: 'scalar', scalar: 'boolean' },
+                required: true,
+              },
+            ],
+          },
+          required: true,
+        },
+      ],
+    };
+    const op = listOrders({ successResponses: [response({ schema: connectionPage })] });
+    const rule: PaginationRule = {
+      style: 'cursor',
+      cursorParam: 'cursor',
+      nextCursor: '/endCursor',
+      hasMore: '/pageInfo/hasNextPage',
+      items: '/orders',
+    };
+    const result = resolveOperationPagination(op, modelWith([op]), {
+      operations: { listOrders: rule },
+    });
+    expect(result.error).toBeUndefined();
+    expect(result.spec?.hasMore).toBe('/pageInfo/hasNextPage');
+
+    const missing = resolveOperationPagination(op, modelWith([op]), {
+      operations: { listOrders: { ...rule, hasMore: '/pageInfo/missing' } },
+    });
+    expect(missing.error).toContain('"hasMore" pointer "/pageInfo/missing" does not resolve');
+
+    const notBoolean = resolveOperationPagination(op, modelWith([op]), {
+      operations: { listOrders: { ...rule, hasMore: '/endCursor' } },
+    });
+    expect(notBoolean.error).toContain('must point at a boolean');
+  });
+
   it('applies the x-pagination extension when no per-op rule exists', () => {
     const op = listOrders({ paginationExtension: OFFSET_RULE });
     const result = resolveOperationPagination(op, modelWith([op]), undefined);
diff --git a/packages/client-generator/src/emitters/client-assembly.ts b/packages/client-generator/src/emitters/client-assembly.ts
index 76649ce2a6..1d5712d591 100644
--- a/packages/client-generator/src/emitters/client-assembly.ts
+++ b/packages/client-generator/src/emitters/client-assembly.ts
@@ -348,6 +348,9 @@ function flatSugarStatement(op: OperationModel, ident: string, ctx: EmitContext)
   if (op.headerParams.length > 0) {
     props.push(factory.createShorthandPropertyAssignment('headers'));
   }
+  if (op.cookieParams.length > 0) {
+    props.push(factory.createShorthandPropertyAssignment('cookies'));
+  }
   const call = factory.createCallExpression(
     factory.createPropertyAccessExpression(factory.createIdentifier('client'), ident),
     undefined,
diff --git a/packages/client-generator/src/emitters/descriptor.ts b/packages/client-generator/src/emitters/descriptor.ts
index 020ff30aa6..f517c6ee69 100644
--- a/packages/client-generator/src/emitters/descriptor.ts
+++ b/packages/client-generator/src/emitters/descriptor.ts
@@ -69,13 +69,15 @@ function descriptorValue(
   dateType: DateType,
   pagination?: ModelPagination
 ) {
-  const params = [...op.pathParams, ...op.queryParams, ...op.headerParams].map((p) => ({
-    name: p.name,
-    in: p.in,
-    ...(p.style !== undefined ? { style: p.style } : {}),
-    ...(p.explode !== undefined ? { explode: p.explode } : {}),
-    ...(p.allowReserved !== undefined ? { allowReserved: p.allowReserved } : {}),
-  }));
+  const params = [...op.pathParams, ...op.queryParams, ...op.headerParams, ...op.cookieParams].map(
+    (p) => ({
+      name: p.name,
+      in: p.in,
+      ...(p.style !== undefined ? { style: p.style } : {}),
+      ...(p.explode !== undefined ? { explode: p.explode } : {}),
+      ...(p.allowReserved !== undefined ? { allowReserved: p.allowReserved } : {}),
+    })
+  );
   const toSpecs = (key: string): SecuritySpec[] => {
     const s = schemes.find((scheme) => scheme.key === key);
     if (!s) return [];
diff --git a/packages/client-generator/src/emitters/operation-aliases.ts b/packages/client-generator/src/emitters/operation-aliases.ts
index 1aeb4c25d9..c8950dff91 100644
--- a/packages/client-generator/src/emitters/operation-aliases.ts
+++ b/packages/client-generator/src/emitters/operation-aliases.ts
@@ -82,6 +82,10 @@ export function renderOperationAliases(
     aliases.push(exportType(`${name}Headers`, paramsTypeLiteral(op.headerParams, dateType)));
   }
 
+  if (op.cookieParams.length > 0 && !schemaNames.has(`${name}Cookies`)) {
+    aliases.push(exportType(`${name}Cookies`, paramsTypeLiteral(op.cookieParams, dateType)));
+  }
+
   if (!schemaNames.has(`${name}Variables`)) {
     const variables = renderVariablesAlias(
       op,
@@ -232,6 +236,17 @@ export function variablesTypeLiteral(
       )
     );
   }
+  if (op.cookieParams.length > 0) {
+    props.push(
+      inputProp(
+        'cookies',
+        `${name}Cookies`,
+        () => paramsTypeLiteral(op.cookieParams, dateType),
+        op.cookieParams.some((p) => p.required),
+        schemaNames
+      )
+    );
+  }
 
   return factory.createTypeLiteralNode(props);
 }
diff --git a/packages/client-generator/src/emitters/operation-signature.ts b/packages/client-generator/src/emitters/operation-signature.ts
index 2aaa7a5d8e..450a5efbf4 100644
--- a/packages/client-generator/src/emitters/operation-signature.ts
+++ b/packages/client-generator/src/emitters/operation-signature.ts
@@ -17,6 +17,7 @@ export type OperationSignature = {
   hasQuery: boolean;
   hasBody: boolean;
   hasHeaders: boolean;
+  hasCookies: boolean;
   /** Any input at all — i.e. a `<Op>Variables` type exists for the operation. */
   hasInputs: boolean;
   /** Grouped mode: whether `vars` is required (else it defaults to `= {}`). */
@@ -39,17 +40,20 @@ export function operationSignature(op: OperationModel): OperationSignature {
   const hasQuery = op.queryParams.length > 0;
   const hasBody = Boolean(op.requestBody);
   const hasHeaders = op.headerParams.length > 0;
+  const hasCookies = op.cookieParams.length > 0;
   return {
     pathParams,
     hasQuery,
     hasBody,
     hasHeaders,
-    hasInputs: pathParams.length > 0 || hasQuery || hasBody || hasHeaders,
+    hasCookies,
+    hasInputs: pathParams.length > 0 || hasQuery || hasBody || hasHeaders || hasCookies,
     varsRequired:
       pathParams.length > 0 ||
       op.queryParams.some((p) => p.required) ||
       (op.requestBody?.required ?? false) ||
-      op.headerParams.some((p) => p.required),
+      op.headerParams.some((p) => p.required) ||
+      op.cookieParams.some((p) => p.required),
     variablesTypeName: `${pascalCase(op.name)}Variables`,
   };
 }
diff --git a/packages/client-generator/src/emitters/operations.ts b/packages/client-generator/src/emitters/operations.ts
index 281fb37d26..69c41cd311 100644
--- a/packages/client-generator/src/emitters/operations.ts
+++ b/packages/client-generator/src/emitters/operations.ts
@@ -39,8 +39,8 @@ export type EmitContext = {
 
 /**
  * The flat sugar's parameter list: path params spread as positional args (in URL
- * template order), then the `params`/`body`/`headers` slots, ending with the
- * trailing `init: RequestOptions` (`SseOptions` for streams). Optional slots
+ * template order), then the `params`/`body`/`headers`/`cookies` slots, ending with
+ * the trailing `init: RequestOptions` (`SseOptions` for streams). Optional slots
  * default to `= {}` so trailing arguments can be omitted.
  */
 export function renderArgList(
@@ -74,6 +74,8 @@ export function renderArgList(
   // are injected by the runtime and live underneath them.
   if (op.headerParams.length > 0)
     args.push(renderParamsObjectArg('headers', op.headerParams, dateType));
+  if (op.cookieParams.length > 0)
+    args.push(renderParamsObjectArg('cookies', op.cookieParams, dateType));
   // SSE ops take per-stream `SseOptions` (reconnect knobs); everyone else the
   // standard per-call `RequestOptions`.
   args.push(
diff --git a/packages/client-generator/src/emitters/pagination.ts b/packages/client-generator/src/emitters/pagination.ts
index 124bd90cf4..56e10a1ab5 100644
--- a/packages/client-generator/src/emitters/pagination.ts
+++ b/packages/client-generator/src/emitters/pagination.ts
@@ -32,6 +32,12 @@ export type PaginationRule = {
   cursorParam?: string;
   /** Cursor style: JSON pointer to the next cursor in the response. */
   nextCursor?: string;
+  /**
+   * Cursor style: optional JSON pointer to a boolean "more pages" flag. When it
+   * resolves to `false`, iteration stops without the follow-up request — for
+   * connection-style APIs whose cursor stays non-null on the last page.
+   */
+  hasMore?: string;
   /** Offset/page styles: the request query param the iterator advances. */
   offsetParam?: string;
   /** Optional page-size query param (any style; recorded for tooling). */
@@ -181,6 +187,19 @@ function applyRule(
         `the "nextCursor" pointer "${valid.nextCursor}" must point at a string (got ${cursorTarget.kind})`
       );
     }
+    if (valid.hasMore !== undefined) {
+      const moreTarget = resolveSchemaPointer(page.schema, valid.hasMore, model);
+      if (moreTarget === undefined) {
+        return misfit(
+          `the "hasMore" pointer "${valid.hasMore}" does not resolve in the success response schema`
+        );
+      }
+      if (moreTarget.kind !== 'scalar' || moreTarget.scalar !== 'boolean') {
+        return misfit(
+          `the "hasMore" pointer "${valid.hasMore}" must point at a boolean (got ${moreTarget.kind})`
+        );
+      }
+    }
   }
   return {
     spec: {
@@ -188,6 +207,9 @@ function applyRule(
       param,
       ...(valid.limitParam !== undefined ? { limitParam: valid.limitParam } : {}),
       ...(valid.style === 'cursor' ? { nextCursor: valid.nextCursor! } : {}),
+      ...(valid.style === 'cursor' && valid.hasMore !== undefined
+        ? { hasMore: valid.hasMore }
+        : {}),
       items: valid.items,
     },
     itemSchema: itemsTarget.items,
@@ -201,7 +223,7 @@ function applyRule(
  */
 function ruleShapeProblem(rule: unknown): string | undefined {
   if (!isPlainObject(rule)) return 'the rule must be an object';
-  const { style, cursorParam, nextCursor, offsetParam, limitParam, items } = rule;
+  const { style, cursorParam, nextCursor, hasMore, offsetParam, limitParam, items } = rule;
   if (style !== 'cursor' && style !== 'offset' && style !== 'page') {
     return `"style" must be one of "cursor" | "offset" | "page" (got ${JSON.stringify(style)})`;
   }
@@ -215,6 +237,9 @@ function ruleShapeProblem(rule: unknown): string | undefined {
     if (typeof nextCursor !== 'string' || !nextCursor.startsWith('/')) {
       return 'cursor style requires a "nextCursor" JSON pointer starting with "/"';
     }
+    if (hasMore !== undefined && (typeof hasMore !== 'string' || !hasMore.startsWith('/'))) {
+      return '"hasMore" must be a JSON pointer starting with "/"';
+    }
   } else if (typeof offsetParam !== 'string' || offsetParam === '') {
     return `${style} style requires an "offsetParam" query parameter name`;
   }
diff --git a/packages/client-generator/src/emitters/runtime-sources.ts b/packages/client-generator/src/emitters/runtime-sources.ts
index 154758f627..5a09ca92b9 100644
--- a/packages/client-generator/src/emitters/runtime-sources.ts
+++ b/packages/client-generator/src/emitters/runtime-sources.ts
@@ -1,7 +1,7 @@
 // GENERATED by scripts/generate-runtime-sources.mjs — do not edit. Regenerated on install (`prepare`); manually: `npm run prepare -w @redocly/client-generator`.
 export const RUNTIME_SOURCES = {
   'types.ts':
-    "/**\n * The public type surface of the client runtime — `@redocly/client-generator`'s\n * app-facing runtime module. Pure types, no runtime code (excluded from coverage).\n * The generator emits `OPERATIONS` literals typed\n * `satisfies Record<string, OperationDescriptor>` against this module, so an\n * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).\n */\n\n/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */\nexport type ParamSpec = {\n  name: string;\n  in: 'path' | 'query' | 'header';\n  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';\n  explode?: boolean;\n  allowReserved?: boolean;\n};\n\n/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */\nexport type SecuritySpec =\n  | { scheme: string; kind: 'bearer' | 'basic' }\n  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };\n\n/**\n * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).\n * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.\n */\nexport type PaginationSpec = {\n  style: 'cursor' | 'offset' | 'page';\n  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */\n  param: string;\n  /** Optional page-size query param (recorded for tooling; never set by the runtime). */\n  limitParam?: string;\n  /** Cursor style only: pointer to the next cursor in the page. */\n  nextCursor?: string;\n  /** Pointer to the page's item array. */\n  items: string;\n};\n\n/** The frozen data contract between generated code and the runtime: one operation's wire shape. */\nexport type OperationDescriptor = {\n  id: string;\n  method: string;\n  path: string;\n  tags?: readonly string[];\n  params?: readonly ParamSpec[];\n  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */\n  body?: { contentType: string; multipart?: boolean };\n  /** Defaults to `'json'` (content-type negotiation on parse). */\n  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';\n  sseDataKind?: 'json' | 'text';\n  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */\n  security?: readonly (readonly SecuritySpec[])[];\n  pagination?: PaginationSpec;\n};\n\n/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */\nexport type QueryValue =\n  | string\n  | number\n  | boolean\n  | null\n  | undefined\n  | Array<string | number | boolean | null | undefined>\n  | Record<string, unknown>;\n\n/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */\nexport type TokenProvider = string | (() => string | Promise<string>);\n\n/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */\nexport type AuthCredentials = {\n  bearer?: TokenProvider;\n  basic?: { username: string; password: string };\n  apiKey?: Record<string, TokenProvider>;\n};\n\n/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */\nexport type RetryStrategy = 'fixed' | 'exponential';\n\n/**\n * The operation's identity, exposed to middleware for targeting (`ctx.operation`).\n * Generated clients instantiate the type parameters with the spec's literal unions\n * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a\n * middleware comparison fails to compile; the string defaults keep every\n * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working\n * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types\n * (byte-locked to generated output) remain assignable through middleware callbacks.\n */\nexport type OperationContext<\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n> = { id: Id; path: Path; tags: Tag[] };\n\n/** The mutable request context threaded through the middleware chain. */\nexport type RequestContext<Op extends OperationContext = OperationContext> = {\n  url: string;\n  method: string;\n  headers: Record<string, string>;\n  body?: unknown;\n  operation: Op;\n};\n\n/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */\nexport type RetryContext<Op extends OperationContext = OperationContext> = {\n  attempt: number;\n  request: RequestContext<Op>;\n  response?: Response;\n  error?: unknown;\n};\n\n/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */\nexport type RetryConfig<Op extends OperationContext = OperationContext> = {\n  retries?: number;\n  retryDelay?: number;\n  retryStrategy?: RetryStrategy;\n  jitter?: boolean;\n  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;\n};\n\n/**\n * Structural stand-in for the runtime's ApiError so this module stays import-free\n * (pure types); the real `ApiError` class is assignable to it.\n */\nexport type ApiErrorLike = globalThis.Error & {\n  url: string;\n  status: number;\n  statusText: string;\n  body: unknown;\n};\n\n/** One interceptor: any subset of the three hooks. */\nexport type Middleware<Op extends OperationContext = OperationContext> = {\n  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;\n  onResponse?: (\n    response: Response,\n    ctx: RequestContext<Op>\n  ) => Response | void | Promise<Response | void>;\n  /** Throw mode only: may map/replace the error. */\n  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.\n  onError?: (\n    error: ApiErrorLike,\n    ctx: RequestContext<Op>\n  ) => globalThis.Error | Promise<globalThis.Error>;\n};\n\n/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */\nexport type ClientConfig<Op extends OperationContext = OperationContext> = {\n  serverUrl?: string;\n  fetch?: typeof fetch;\n  headers?:\n    | Record<string, string>\n    | (() => Record<string, string> | Promise<Record<string, string>>);\n  retry?: RetryConfig<Op>;\n  middleware?: Middleware<Op>[];\n  auth?: AuthCredentials;\n  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */\n  errorMode?: 'throw' | 'result';\n  onRequest?: Middleware<Op>['onRequest'];\n  onResponse?: Middleware<Op>['onResponse'];\n  onError?: Middleware<Op>['onError'];\n};\n\n/** Response readers for the per-call `parseAs` override. */\nexport type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';\n\n/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */\nexport type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };\n\n/** Per-call options for an SSE stream; reconnect defaults to true. */\nexport type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };\n\n/** A single decoded Server-Sent Event with its payload typed from the spec. */\nexport type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };\n\n/** Result-mode return shape: exactly one of `data`/`error` is set. */\nexport type Result<TData, TError> =\n  | { data: TData; error: undefined; response: Response }\n  | { data: undefined; error: TError; response: Response };\n\n/**\n * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for\n * streams and, for paginated operations, `item` (the page's element type) and — on\n * result-mode clients only — `page` (the RAW page type `.pages()` yields, since\n * iteration unwraps the `Result` envelope the one-shot `result` carries).\n */\nexport type OpsShape = Record<\n  string,\n  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }\n>;\n\n/** The always-present client members (assigned after the operation loop — they win collisions). */\nexport type ClientCore<Op extends OperationContext = OperationContext> = {\n  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */\n  configure(config: ClientConfig<Op>): void;\n  /** Append interceptors (composes with baked/publisher middleware). */\n  use(...middleware: Middleware<Op>[]): void;\n  auth: {\n    bearer(token: TokenProvider): void;\n    basic(username: string, password: string): void;\n    apiKey(scheme: string, value: TokenProvider): void;\n  };\n};\n\n/**\n * The standard TypeScript optionality probe: `{}` has no required members, so\n * `{} extends A` is true exactly when every member of `A` is optional.\n */\n// oxlint-disable-next-line typescript/no-empty-object-type\ntype NoRequiredKeys<A> = {} extends A ? true : false;\n\n/**\n * The page type `.pages()` yields: the RAW page declared by `page` (the generator\n * writes it only on result-mode paginated entries, whose `result` is the envelope),\n * or the method's own `result` (throw mode — already the raw page).\n */\ntype PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }\n  ? Entry['page']\n  : Entry['result'];\n\n/**\n * The auto-pagination members intersected onto a paginated method — present exactly when\n * the Ops entry declares `item` (the generator writes it only for paginated operations).\n * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).\n * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a\n * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the\n * `onError` middleware hook (throw-mode-only) is not invoked.\n */\ntype Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry\n  ? NoRequiredKeys<Entry['args']> extends true\n    ? {\n        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;\n        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;\n      }\n    : {\n        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;\n        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;\n      }\n  : unknown;\n\n/** The typed instance client: one bound method per operation plus the core members. */\nexport type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {\n  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }\n    ? NoRequiredKeys<Ops[K]['args']> extends true\n      ? (\n          args?: Ops[K]['args'],\n          init?: SseOptions\n        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>\n      : (\n          args: Ops[K]['args'],\n          init?: SseOptions\n        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>\n    : (NoRequiredKeys<Ops[K]['args']> extends true\n        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>\n        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &\n        Paginated<Ops[K]>;\n} & ClientCore<Op>;\n",
+    "/**\n * The public type surface of the client runtime — `@redocly/client-generator`'s\n * app-facing runtime module. Pure types, no runtime code (excluded from coverage).\n * The generator emits `OPERATIONS` literals typed\n * `satisfies Record<string, OperationDescriptor>` against this module, so an\n * incompatible runtime/generated pair fails the consumer's build (the semver skew guard).\n */\n\n/** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */\nexport type ParamSpec = {\n  name: string;\n  in: 'path' | 'query' | 'header' | 'cookie';\n  style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';\n  explode?: boolean;\n  allowReserved?: boolean;\n};\n\n/** One security scheme, denormalized onto the operation (`scheme` names the spec's scheme). */\nexport type SecuritySpec =\n  | { scheme: string; kind: 'bearer' | 'basic' }\n  | { scheme: string; kind: 'apiKey'; name: string; in: 'header' | 'query' | 'cookie' };\n\n/**\n * How to auto-iterate a paginated operation (drives its `.pages()`/`.items()` members).\n * `nextCursor` and `items` are RFC 6901 JSON pointers into the page (response) value.\n */\nexport type PaginationSpec = {\n  style: 'cursor' | 'offset' | 'page';\n  /** The query param the iterator advances: the cursor (`cursor`) or number (`offset`/`page`). */\n  param: string;\n  /** Optional page-size query param (recorded for tooling; never set by the runtime). */\n  limitParam?: string;\n  /** Cursor style only: pointer to the next cursor in the page. */\n  nextCursor?: string;\n  /** Cursor style only: optional pointer to a boolean \"more pages\" flag — `false` stops iteration. */\n  hasMore?: string;\n  /** Pointer to the page's item array. */\n  items: string;\n};\n\n/** The frozen data contract between generated code and the runtime: one operation's wire shape. */\nexport type OperationDescriptor = {\n  id: string;\n  method: string;\n  path: string;\n  tags?: readonly string[];\n  params?: readonly ParamSpec[];\n  /** `multipart: true` marks a typed object body serialized to FormData by the runtime. */\n  body?: { contentType: string; multipart?: boolean };\n  /** Defaults to `'json'` (content-type negotiation on parse). */\n  responseKind?: 'json' | 'text' | 'blob' | 'void' | 'sse';\n  sseDataKind?: 'json' | 'text';\n  /** OR-alternatives, each an AND-set: the runtime applies the first fully-configured one. */\n  security?: readonly (readonly SecuritySpec[])[];\n  pagination?: PaginationSpec;\n};\n\n/** A query value: scalars, arrays of scalars, or objects (serialized as deepObject brackets). */\nexport type QueryValue =\n  | string\n  | number\n  | boolean\n  | null\n  | undefined\n  | Array<string | number | boolean | null | undefined>\n  | Record<string, unknown>;\n\n/** A credential: a literal, or a (possibly async) function resolved per request (refresh flows). */\nexport type TokenProvider = string | (() => string | Promise<string>);\n\n/** Per-instance credentials, keyed by the scheme kinds the runtime can inject. */\nexport type AuthCredentials = {\n  bearer?: TokenProvider;\n  basic?: { username: string; password: string };\n  apiKey?: Record<string, TokenProvider>;\n};\n\n/** Backoff shape: 'fixed' = constant delay; 'exponential' = doubling per attempt. */\nexport type RetryStrategy = 'fixed' | 'exponential';\n\n/**\n * The operation's identity, exposed to middleware for targeting (`ctx.operation`).\n * Generated clients instantiate the type parameters with the spec's literal unions\n * (`OperationId`/`OperationPath`/`OperationTag`) so a misspelled operation id in a\n * middleware comparison fails to compile; the string defaults keep every\n * spec-independent consumer (`runtime-contract.ts`, the runtime internals) working\n * with the base shape. `tags` stays mutable (`Tag[]`) so setup-contract types\n * (byte-locked to generated output) remain assignable through middleware callbacks.\n */\nexport type OperationContext<\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n> = { id: Id; path: Path; tags: Tag[] };\n\n/** The mutable request context threaded through the middleware chain. */\nexport type RequestContext<Op extends OperationContext = OperationContext> = {\n  url: string;\n  method: string;\n  headers: Record<string, string>;\n  body?: unknown;\n  operation: Op;\n};\n\n/** The failed attempt handed to a custom `retryOn`: exactly one of `response`/`error` is set. */\nexport type RetryContext<Op extends OperationContext = OperationContext> = {\n  attempt: number;\n  request: RequestContext<Op>;\n  response?: Response;\n  error?: unknown;\n};\n\n/** Opt-in retry policy; a per-call override merges field-by-field over the config policy. */\nexport type RetryConfig<Op extends OperationContext = OperationContext> = {\n  retries?: number;\n  retryDelay?: number;\n  retryStrategy?: RetryStrategy;\n  jitter?: boolean;\n  retryOn?: (ctx: RetryContext<Op>) => boolean | Promise<boolean>;\n};\n\n/**\n * Structural stand-in for the runtime's ApiError so this module stays import-free\n * (pure types); the real `ApiError` class is assignable to it.\n */\nexport type ApiErrorLike = globalThis.Error & {\n  url: string;\n  status: number;\n  statusText: string;\n  body: unknown;\n};\n\n/** One interceptor: any subset of the three hooks. */\nexport type Middleware<Op extends OperationContext = OperationContext> = {\n  onRequest?: (ctx: RequestContext<Op>) => void | Promise<void>;\n  onResponse?: (\n    response: Response,\n    ctx: RequestContext<Op>\n  ) => Response | void | Promise<Response | void>;\n  /** Throw mode only: may map/replace the error. */\n  // `globalThis.Error` so a spec schema named `Error` cannot shadow it in inline mode.\n  onError?: (\n    error: ApiErrorLike,\n    ctx: RequestContext<Op>\n  ) => globalThis.Error | Promise<globalThis.Error>;\n};\n\n/** Client configuration: transport, defaults, retry policy, middleware, and credentials. */\nexport type ClientConfig<Op extends OperationContext = OperationContext> = {\n  serverUrl?: string;\n  fetch?: typeof fetch;\n  headers?:\n    | Record<string, string>\n    | (() => Record<string, string> | Promise<Record<string, string>>);\n  retry?: RetryConfig<Op>;\n  middleware?: Middleware<Op>[];\n  auth?: AuthCredentials;\n  /** Fixed at generate time by the generator (`'throw'` when omitted); `configure()` ignores it. */\n  errorMode?: 'throw' | 'result';\n  onRequest?: Middleware<Op>['onRequest'];\n  onResponse?: Middleware<Op>['onResponse'];\n  onError?: Middleware<Op>['onError'];\n};\n\n/** Response readers for the per-call `parseAs` override. */\nexport type ParseAs = 'auto' | 'json' | 'text' | 'blob' | 'arrayBuffer' | 'formData' | 'stream';\n\n/** Per-call options: standard `RequestInit` plus a retry override and a forced reader. */\nexport type RequestOptions = RequestInit & { retry?: RetryConfig; parseAs?: ParseAs };\n\n/** Per-call options for an SSE stream; reconnect defaults to true. */\nexport type SseOptions = RequestInit & { reconnect?: boolean; reconnectDelay?: number };\n\n/** A single decoded Server-Sent Event with its payload typed from the spec. */\nexport type ServerSentEvent<T> = { event?: string; data: T; id?: string; retry?: number };\n\n/** Result-mode return shape: exactly one of `data`/`error` is set. */\nexport type Result<TData, TError> =\n  | { data: TData; error: undefined; response: Response }\n  | { data: undefined; error: TError; response: Response };\n\n/**\n * The generated `Ops` type's shape: per-operation args/result, plus `kind: 'sse'` for\n * streams and, for paginated operations, `item` (the page's element type) and — on\n * result-mode clients only — `page` (the RAW page type `.pages()` yields, since\n * iteration unwraps the `Result` envelope the one-shot `result` carries).\n */\nexport type OpsShape = Record<\n  string,\n  { args: object; result: unknown; kind?: 'sse'; item?: unknown; page?: unknown }\n>;\n\n/** The always-present client members (assigned after the operation loop — they win collisions). */\nexport type ClientCore<Op extends OperationContext = OperationContext> = {\n  /** Merge into the config; note `middleware` REPLACES the chain (use `use()` to compose). */\n  configure(config: ClientConfig<Op>): void;\n  /** Append interceptors (composes with baked/publisher middleware). */\n  use(...middleware: Middleware<Op>[]): void;\n  auth: {\n    bearer(token: TokenProvider): void;\n    basic(username: string, password: string): void;\n    apiKey(scheme: string, value: TokenProvider): void;\n  };\n};\n\n/**\n * The standard TypeScript optionality probe: `{}` has no required members, so\n * `{} extends A` is true exactly when every member of `A` is optional.\n */\n// oxlint-disable-next-line typescript/no-empty-object-type\ntype NoRequiredKeys<A> = {} extends A ? true : false;\n\n/**\n * The page type `.pages()` yields: the RAW page declared by `page` (the generator\n * writes it only on result-mode paginated entries, whose `result` is the envelope),\n * or the method's own `result` (throw mode — already the raw page).\n */\ntype PageOf<Entry extends OpsShape[string]> = Entry extends { page: unknown }\n  ? Entry['page']\n  : Entry['result'];\n\n/**\n * The auto-pagination members intersected onto a paginated method — present exactly when\n * the Ops entry declares `item` (the generator writes it only for paginated operations).\n * Args optionality mirrors the method's own; `unknown` otherwise (identity under `&`).\n * Iteration is error-mode-agnostic: `.pages()`/`.items()` yield raw pages/items, and a\n * failed page aborts iteration by throwing `ApiError`, even on result-mode clients; the\n * `onError` middleware hook (throw-mode-only) is not invoked.\n */\ntype Paginated<Entry extends OpsShape[string]> = 'item' extends keyof Entry\n  ? NoRequiredKeys<Entry['args']> extends true\n    ? {\n        pages(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;\n        items(args?: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;\n      }\n    : {\n        pages(args: Entry['args'], init?: RequestOptions): AsyncGenerator<PageOf<Entry>>;\n        items(args: Entry['args'], init?: RequestOptions): AsyncGenerator<Entry['item']>;\n      }\n  : unknown;\n\n/** The typed instance client: one bound method per operation plus the core members. */\nexport type Client<Ops extends OpsShape, Op extends OperationContext = OperationContext> = {\n  [K in keyof Ops]: Ops[K] extends { kind: 'sse' }\n    ? NoRequiredKeys<Ops[K]['args']> extends true\n      ? (\n          args?: Ops[K]['args'],\n          init?: SseOptions\n        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>\n      : (\n          args: Ops[K]['args'],\n          init?: SseOptions\n        ) => AsyncGenerator<ServerSentEvent<Ops[K]['result']>>\n    : (NoRequiredKeys<Ops[K]['args']> extends true\n        ? (args?: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>\n        : (args: Ops[K]['args'], init?: RequestOptions) => Promise<Ops[K]['result']>) &\n        Paginated<Ops[K]>;\n} & ClientCore<Op>;\n",
   'errors.ts':
     "/** The error thrown (throw mode) for a non-2xx response, carrying the decoded error body. */\nexport class ApiError extends Error {\n  public readonly url: string;\n  public readonly status: number;\n  public readonly statusText: string;\n  public readonly body: unknown;\n  constructor(url: string, status: number, statusText: string, body: unknown) {\n    super(`Request failed with status ${status}`);\n    this.name = 'ApiError';\n    this.url = url;\n    this.status = status;\n    this.statusText = statusText;\n    this.body = body;\n  }\n}\n\n/** The error to throw for an aborted request: the caller's abort reason when it is an Error. */\n// `globalThis.Error` (not bare `Error`) so a spec schema named `Error` cannot shadow it\n// when this module is embedded alongside generated types (inline mode).\nexport function abortError(signal: AbortSignal): globalThis.Error {\n  const reason = (signal as { reason?: unknown }).reason;\n  if (reason instanceof Error) return reason;\n  return new DOMException('The operation was aborted.', 'AbortError');\n}\n",
   'url.ts':
@@ -21,9 +21,9 @@ export const RUNTIME_SOURCES = {
   'sse.ts':
     "import { ApiError } from './errors.js';\nimport { readError } from './parse.js';\nimport { sleep } from './retry.js';\nimport { send, toHeaderRecord } from './send.js';\nimport type { ClientConfig, OperationContext, ServerSentEvent, SseOptions } from './types.js';\n\n/**\n * A frame delimiter: two consecutive line terminators (each CR, LF, or CRLF, per the SSE\n * spec — so mixed endings like `\\n\\r\\n` are valid boundaries, not just matching pairs).\n */\nconst FRAME_DELIMITER = /(?:\\r\\n|\\r|\\n){2}/;\n\n/**\n * A terminally malformed event stream — unparseable JSON `data` or an unbounded frame.\n * A stable bad payload, not a dropped connection, so the stream never reconnects on it.\n */\nexport class SseParseError extends Error {}\n\n/**\n * Consume a `text/event-stream` operation as typed events (capability module — wired\n * into `createClient`). Auto-reconnects on dropped connections, resuming from the last\n * seen event id via `Last-Event-ID` (backoff: the server's `retry:` value, then\n * `reconnectDelay`, then 1s — exponential with jitter, capped at 30s). A clean stream\n * end flushes a trailing frame and finishes; `break`/abort end the iterator cleanly.\n */\nexport async function* sse<T>(\n  config: ClientConfig,\n  op: OperationContext,\n  prepare: () => Promise<{ url: string; init: SseOptions }>,\n  dataKind: 'json' | 'text' = 'text'\n): AsyncGenerator<ServerSentEvent<T>> {\n  let lastEventId: string | undefined;\n  let serverRetry: number | undefined;\n  let failures = 0;\n  while (true) {\n    // Re-prepare each attempt so a refresh-style TokenProvider yields a fresh credential\n    // on reconnect (the auth is baked into `url` query + `init.headers`). `reconnect`,\n    // `reconnectDelay`, and `signal` come from the caller's original options unchanged.\n    const { url, init } = await prepare();\n    const { reconnect = true, reconnectDelay, ...rest } = init;\n    const signal = rest.signal ?? undefined;\n    if (signal?.aborted) return;\n    const headers: Record<string, string> = {\n      Accept: 'text/event-stream',\n      ...toHeaderRecord(rest.headers),\n    };\n    const sendHeaders =\n      lastEventId === undefined ? headers : { ...headers, 'Last-Event-ID': lastEventId };\n    try {\n      const { response } = await send(\n        config,\n        op,\n        url,\n        { ...rest, method: rest.method ?? 'GET', headers: sendHeaders },\n        undefined,\n        false,\n        {}\n      );\n      if (!response.ok) {\n        const errorBody = await readError(response);\n        throw new ApiError(url, response.status, response.statusText, errorBody);\n      }\n      failures = 0;\n      const body = response.body;\n      if (!body) return;\n      const reader = body.getReader();\n      const decoder = new TextDecoder();\n      let buffer = '';\n      try {\n        while (true) {\n          const { done, value } = await reader.read();\n          buffer += done ? decoder.decode() : decoder.decode(value, { stream: true });\n          let match: RegExpMatchArray | null;\n          while ((match = buffer.match(FRAME_DELIMITER)) !== null) {\n            const index = match.index!;\n            const raw = buffer.slice(0, index);\n            buffer = buffer.slice(index + match[0].length);\n            const event = parseSseFrame(raw, dataKind);\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n          }\n          if (done) {\n            // Stream closed cleanly. Flush a final event that arrived without a trailing\n            // delimiter, then finish — a clean end is not a dropped connection, so do not reconnect.\n            const event = buffer.length > 0 ? parseSseFrame(buffer, dataKind) : undefined;\n            if (event) {\n              if (event.id !== undefined) lastEventId = event.id;\n              if (event.retry !== undefined) serverRetry = event.retry;\n              yield event as ServerSentEvent<T>;\n            }\n            return;\n          }\n          // Bound memory: a server that never sends a frame delimiter would otherwise\n          // grow `buffer` without limit. 1 MiB is far above any real SSE frame.\n          if (buffer.length > 1048576) {\n            throw new SseParseError('SSE frame exceeded 1048576 characters without a delimiter');\n          }\n        }\n      } finally {\n        await reader.cancel().catch(() => undefined);\n      }\n    } catch (error) {\n      if (signal?.aborted) return;\n      // A non-OK HTTP response (4xx/5xx) or an unparseable JSON payload is a definitive\n      // error, not a transient drop — surface it instead of reconnecting in a loop (a\n      // stable bad payload would otherwise reconnect forever).\n      if (error instanceof ApiError || error instanceof SseParseError) throw error;\n      // A transport failure (connect/DNS/reset) when opening the request, or a mid-stream\n      // read error, is a dropped connection: fall through to backoff/reconnect when enabled.\n      if (!reconnect) throw error;\n    }\n    // Only the swallowed-drop path reaches here: reconnect is on and the signal not aborted.\n    failures++;\n    const base = serverRetry ?? reconnectDelay ?? 1000;\n    const delay = Math.min(base * Math.pow(2, failures - 1), 30_000);\n    try {\n      await sleep(Math.random() * delay, signal);\n    } catch {\n      return; // sleep rejects only on abort — end the iterator cleanly\n    }\n  }\n}\n\n/** Parse one raw SSE frame (its lines) into an event; returns undefined for comment-only frames. */\nexport function parseSseFrame(\n  raw: string,\n  dataKind: 'json' | 'text'\n): ServerSentEvent<unknown> | undefined {\n  let event: string | undefined;\n  const dataLines: string[] = [];\n  let id: string | undefined;\n  let retry: number | undefined;\n  let sawField = false;\n  for (const line of raw.split(/\\r\\n|\\n|\\r/)) {\n    if (line === '' || line.startsWith(':')) continue;\n    const colon = line.indexOf(':');\n    const field = colon === -1 ? line : line.slice(0, colon);\n    let val = colon === -1 ? '' : line.slice(colon + 1);\n    if (val.startsWith(' ')) val = val.slice(1);\n    sawField = true;\n    if (field === 'event') event = val;\n    else if (field === 'data') dataLines.push(val);\n    else if (field === 'id') id = val;\n    else if (field === 'retry') {\n      const n = Number(val);\n      if (!Number.isNaN(n)) retry = n;\n    }\n  }\n  if (!sawField) return undefined;\n  const dataText = dataLines.join('\\n');\n  let data: unknown = dataText;\n  if (dataKind === 'json' && dataText !== '') {\n    try {\n      data = JSON.parse(dataText);\n    } catch (error) {\n      throw new SseParseError(\n        `Failed to parse SSE event data as JSON: ${error instanceof Error ? error.message : String(error)}`\n      );\n    }\n  }\n  return { event, data, id, retry };\n}\n",
   'create-client.ts':
-    "import { ApiError } from './errors.js';\nimport { parse, readError } from './parse.js';\nimport { middlewareChain, send, toHeaderRecord, type SendCapabilities } from './send.js';\nimport type {\n  ApiErrorLike,\n  Client,\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  OperationDescriptor,\n  OpsShape,\n  PaginationSpec,\n  ParseAs,\n  QueryValue,\n  RequestOptions,\n  SecuritySpec,\n  ServerSentEvent,\n  SseOptions,\n  TokenProvider,\n} from './types.js';\nimport { buildUrl, substitutePath, type QueryStyle } from './url.js';\n\n/**\n * The optional behaviors `createClientCore` can dispatch to but never statically\n * imports. The package's public `createClient` wires the full set; the future\n * inline-mode assembler wires only the capabilities a spec needs.\n */\nexport type Capabilities = SendCapabilities & {\n  resolveAuth?: (\n    security: readonly (readonly SecuritySpec[])[],\n    config: ClientConfig\n  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;\n  sse?: (\n    config: ClientConfig,\n    op: OperationContext,\n    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style\n    // TokenProvider issue a fresh credential after a dropped stream reconnects.\n    prepare: () => Promise<{ url: string; init: SseOptions }>,\n    dataKind: 'json' | 'text'\n  ) => AsyncGenerator<ServerSentEvent<unknown>>;\n  paginate?: {\n    pages: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n    items: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n  };\n};\n\n/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */\nexport type OperationArgs = {\n  params?: Record<string, QueryValue>;\n  body?: unknown;\n  headers?: Record<string, unknown>;\n} & Record<string, unknown>;\n\n/** The response reader implied by the descriptor (before any per-call `parseAs` override). */\nfunction kindFor(op: OperationDescriptor): ParseAs | 'void' {\n  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {\n    return op.responseKind;\n  }\n  return 'auto';\n}\n\n/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */\nfunction splitArgs(op: OperationDescriptor, args: OperationArgs) {\n  const path: Record<string, unknown> = {};\n  for (const param of op.params ?? []) {\n    if (param.in === 'path') path[param.name] = args[param.name];\n  }\n  return { path, query: args.params, body: args.body, headers: args.headers };\n}\n\n/**\n * The query-serialization hints for the descriptor's query params. A spec is built only\n * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),\n * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)\n * are honored, and an omitted `explode` keeps the exploded default.\n */\nfunction queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {\n  let styles: Record<string, QueryStyle> | undefined;\n  for (const param of op.params ?? []) {\n    if (param.in !== 'query') continue;\n    const deviates =\n      (param.style !== undefined && param.style !== 'form') ||\n      param.explode === false ||\n      param.allowReserved === true;\n    if (!deviates) continue;\n    styles ??= {};\n    styles[param.name] = {\n      style: param.style ?? 'form',\n      explode: param.explode ?? true,\n      allowReserved: param.allowReserved,\n    };\n  }\n  return styles;\n}\n\n/** Stringify caller-supplied extra headers, skipping empty entries. */\nfunction stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {\n  const out: Record<string, string> = {};\n  for (const [key, value] of Object.entries(headers ?? {})) {\n    if (value !== undefined && value !== null) out[key] = String(value);\n  }\n  return out;\n}\n\n/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */\nasync function prepareRequest(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions | SseOptions,\n  caps: Capabilities\n): Promise<{ url: string; init: RequestOptions; body: unknown }> {\n  const { path, query, body, headers } = splitArgs(op, args);\n  const authed =\n    op.security?.length && caps.resolveAuth\n      ? await caps.resolveAuth(op.security, config)\n      : { headers: {}, query: {} };\n  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };\n  const url = buildUrl(\n    config.serverUrl ?? '',\n    substitutePath(op.path, path),\n    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,\n    queryStyles(op)\n  );\n  const mergedInit: RequestOptions = {\n    ...init,\n    method: op.method.toUpperCase(),\n    // Precedence, lowest → highest (later spreads win): injected auth → explicit\n    // header params → caller `init.headers` — the caller always overrides both.\n    headers: {\n      ...authed.headers,\n      ...stringHeaders(headers),\n      ...toHeaderRecord(init.headers),\n    },\n  };\n  return { url, init: mergedInit, body };\n}\n\n/** One non-SSE call: send, then branch on the configured error mode. */\nasync function execute(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions,\n  caps: Capabilities\n): Promise<unknown> {\n  const prepared = await prepareRequest(config, op, args, init, caps);\n  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n  const { parseAs, ...sendInit } = prepared.init;\n  const { response, context } = await send(\n    config,\n    opCtx,\n    prepared.url,\n    sendInit,\n    prepared.body,\n    op.body?.multipart === true,\n    caps\n  );\n  const readKind = parseAs ?? kindFor(op);\n  if (config.errorMode === 'result') {\n    if (!response.ok) {\n      return { data: undefined, error: await readError(response), response };\n    }\n    return { data: await parse(response, readKind), error: undefined, response };\n  }\n  if (!response.ok) {\n    let error: globalThis.Error = new ApiError(\n      context.url,\n      response.status,\n      response.statusText,\n      await readError(response)\n    );\n    // Thread the error through each middleware's onError in turn (each may replace it).\n    for (const mw of middlewareChain(config)) {\n      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);\n    }\n    throw error;\n  }\n  return parse(response, readKind);\n}\n\n/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */\nfunction paginateCapability(caps: Capabilities, op: OperationDescriptor) {\n  if (!caps.paginate) {\n    throw new Error(`Pagination capability not wired: cannot iterate operation \"${op.id}\"`);\n  }\n  return caps.paginate;\n}\n\n/**\n * The per-page call the iterators drive: the method itself in throw mode; in result\n * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page\n * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is\n * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).\n */\nfunction pageCall(\n  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  config: ClientConfig\n) {\n  if (config.errorMode !== 'result') return method;\n  return async (args?: OperationArgs, init?: RequestOptions) => {\n    const envelope = (await method(args, init)) as {\n      data: unknown;\n      error: unknown;\n      response: Response;\n    };\n    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page\n    // (204/void) also parses to undefined data, and a failed page's `error` can be\n    // undefined too (unreadable body). The pointers then miss on the undefined data\n    // and iteration stops cleanly, which is the correct semantics for an empty page.\n    if (!envelope.response.ok) {\n      const { response } = envelope;\n      throw new ApiError(response.url, response.status, response.statusText, envelope.error);\n    }\n    return envelope.data;\n  };\n}\n\n/**\n * Build a typed instance client over operation descriptors: one real bound method per\n * operation (attached by a construction-time loop — no Proxy), plus the core members\n * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name\n * collision with an operation. All behavior dispatches through the capability seam.\n */\nexport function createClientCore<\n  Ops extends OpsShape,\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n>(\n  operations: Record<string, OperationDescriptor>,\n  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},\n  caps: Capabilities = {}\n): Client<Ops, OperationContext<Id, Path, Tag>> {\n  // The literal-union narrowing is a compile-time DX contract only; internally the\n  // runtime works with the base (string-typed) context. One cast at this boundary —\n  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx\n  // params are contravariant).\n  const given = initial as ClientConfig;\n  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.\n  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };\n  const client = {} as Record<string, unknown>;\n\n  for (const [name, op] of Object.entries(operations)) {\n    if (op.responseKind === 'sse') {\n      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {\n        if (!caps.sse) {\n          throw new Error(`SSE capability not wired: cannot stream operation \"${op.id}\"`);\n        }\n        const stream = caps.sse;\n        return (async function* () {\n          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`\n          // resolves) is refreshed per attempt rather than frozen at the first connect.\n          const prepare = async () => {\n            const prepared = await prepareRequest(config, op, args, init, caps);\n            return { url: prepared.url, init: prepared.init as SseOptions };\n          };\n          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');\n        })();\n      };\n    } else {\n      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>\n        execute(config, op, args, init, caps);\n      const spec = op.pagination;\n      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching\n      // through the capability seam (like SSE: absent capability throws descriptively).\n      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on\n      // a result-mode client (`errorMode` is fixed at construction — `configure()`\n      // ignores it) each page's envelope is unwrapped before it reaches the capability.\n      // A failed page aborts iteration by throwing ApiError, even on result-mode\n      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.\n      client[name] = spec\n        ? Object.assign(method, {\n            pages: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),\n            items: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),\n          })\n        : method;\n    }\n  }\n\n  // Core members are assigned AFTER the operation loop — they win over colliding op names.\n  client.configure = (next: ClientConfig): void => {\n    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at\n    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.\n    const { errorMode: _fixed, auth, ...rest } = next;\n    Object.assign(config, rest);\n    // `auth` merges into existing credentials (like the `auth.*` setters) rather than\n    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set\n    // basic/apiKey. `apiKey` merges per scheme.\n    if (auth) {\n      config.auth = {\n        ...config.auth,\n        ...auth,\n        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),\n      };\n    }\n  };\n  client.use = (...middleware: Middleware[]): void => {\n    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.\n    config.middleware = [...(config.middleware ?? []), ...middleware];\n  };\n  client.auth = {\n    bearer(token: TokenProvider): void {\n      config.auth = { ...config.auth, bearer: token };\n    },\n    basic(username: string, password: string): void {\n      config.auth = { ...config.auth, basic: { username, password } };\n    },\n    apiKey(scheme: string, value: TokenProvider): void {\n      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };\n    },\n  };\n\n  return client as Client<Ops, OperationContext<Id, Path, Tag>>;\n}\n",
+    "import { ApiError } from './errors.js';\nimport { parse, readError } from './parse.js';\nimport { middlewareChain, send, toHeaderRecord, type SendCapabilities } from './send.js';\nimport type {\n  ApiErrorLike,\n  Client,\n  ClientConfig,\n  Middleware,\n  OperationContext,\n  OperationDescriptor,\n  OpsShape,\n  PaginationSpec,\n  ParseAs,\n  QueryValue,\n  RequestOptions,\n  SecuritySpec,\n  ServerSentEvent,\n  SseOptions,\n  TokenProvider,\n} from './types.js';\nimport { buildUrl, substitutePath, type QueryStyle } from './url.js';\n\n/**\n * The optional behaviors `createClientCore` can dispatch to but never statically\n * imports. The package's public `createClient` wires the full set; the future\n * inline-mode assembler wires only the capabilities a spec needs.\n */\nexport type Capabilities = SendCapabilities & {\n  resolveAuth?: (\n    security: readonly (readonly SecuritySpec[])[],\n    config: ClientConfig\n  ) => Promise<{ headers: Record<string, string>; query: Record<string, string> }>;\n  sse?: (\n    config: ClientConfig,\n    op: OperationContext,\n    // Re-preparing per (re)connect (not a frozen url/init) lets a refresh-style\n    // TokenProvider issue a fresh credential after a dropped stream reconnects.\n    prepare: () => Promise<{ url: string; init: SseOptions }>,\n    dataKind: 'json' | 'text'\n  ) => AsyncGenerator<ServerSentEvent<unknown>>;\n  paginate?: {\n    pages: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n    items: (\n      call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n      spec: PaginationSpec,\n      args?: OperationArgs,\n      init?: RequestOptions\n    ) => AsyncGenerator<unknown>;\n  };\n};\n\n/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers`/`cookies` slots. */\nexport type OperationArgs = {\n  params?: Record<string, QueryValue>;\n  body?: unknown;\n  headers?: Record<string, unknown>;\n  cookies?: Record<string, unknown>;\n} & Record<string, unknown>;\n\n/** The response reader implied by the descriptor (before any per-call `parseAs` override). */\nfunction kindFor(op: OperationDescriptor): ParseAs | 'void' {\n  if (op.responseKind === 'void' || op.responseKind === 'blob' || op.responseKind === 'text') {\n    return op.responseKind;\n  }\n  return 'auto';\n}\n\n/** Route the grouped args by the descriptor: path values, query object, body, extra headers, cookies. */\nfunction splitArgs(op: OperationDescriptor, args: OperationArgs) {\n  const path: Record<string, unknown> = {};\n  for (const param of op.params ?? []) {\n    if (param.in === 'path') path[param.name] = args[param.name];\n  }\n  return {\n    path,\n    query: args.params,\n    body: args.body,\n    headers: args.headers,\n    cookies: args.cookies,\n  };\n}\n\n/**\n * The query-serialization hints for the descriptor's query params. A spec is built only\n * when the param deviates from the OpenAPI defaults (`form` + `explode: true`, encoded),\n * and always fully resolved — so `explode: false` or `allowReserved` alone (no `style`)\n * are honored, and an omitted `explode` keeps the exploded default.\n */\nfunction queryStyles(op: OperationDescriptor): Record<string, QueryStyle> | undefined {\n  let styles: Record<string, QueryStyle> | undefined;\n  for (const param of op.params ?? []) {\n    if (param.in !== 'query') continue;\n    const deviates =\n      (param.style !== undefined && param.style !== 'form') ||\n      param.explode === false ||\n      param.allowReserved === true;\n    if (!deviates) continue;\n    styles ??= {};\n    styles[param.name] = {\n      style: param.style ?? 'form',\n      explode: param.explode ?? true,\n      allowReserved: param.allowReserved,\n    };\n  }\n  return styles;\n}\n\n/** Stringify caller-supplied extra headers, skipping empty entries. */\nfunction stringHeaders(headers: Record<string, unknown> | undefined): Record<string, string> {\n  const out: Record<string, string> = {};\n  for (const [key, value] of Object.entries(headers ?? {})) {\n    if (value !== undefined && value !== null) out[key] = String(value);\n  }\n  return out;\n}\n\n/** Build the request pieces an attempt needs: the final URL and the merged per-call init. */\nasync function prepareRequest(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions | SseOptions,\n  caps: Capabilities\n): Promise<{ url: string; init: RequestOptions; body: unknown }> {\n  const { path, query, body, headers, cookies } = splitArgs(op, args);\n  const authed: { headers: Record<string, string>; query: Record<string, string> } =\n    op.security?.length && caps.resolveAuth\n      ? await caps.resolveAuth(op.security, config)\n      : { headers: {}, query: {} };\n  // Cookie params join the auth-injected cookies in one `Cookie` header (values\n  // percent-encoded, like auth cookies). Server-side only — browsers own the header.\n  const cookiePairs = Object.entries(cookies ?? {})\n    .filter(([, value]) => value !== undefined && value !== null)\n    .map(([cookieName, value]) => `${cookieName}=${encodeURIComponent(String(value))}`);\n  if (cookiePairs.length > 0) {\n    authed.headers.Cookie = [authed.headers.Cookie, ...cookiePairs].filter(Boolean).join('; ');\n  }\n  const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };\n  const url = buildUrl(\n    config.serverUrl ?? '',\n    substitutePath(op.path, path),\n    Object.keys(fullQuery).length > 0 ? fullQuery : undefined,\n    queryStyles(op)\n  );\n  const mergedInit: RequestOptions = {\n    ...init,\n    method: op.method.toUpperCase(),\n    // Precedence, lowest → highest (later spreads win): injected auth → explicit\n    // header params → caller `init.headers` — the caller always overrides both.\n    headers: {\n      ...authed.headers,\n      ...stringHeaders(headers),\n      ...toHeaderRecord(init.headers),\n    },\n  };\n  return { url, init: mergedInit, body };\n}\n\n/** One non-SSE call: send, then branch on the configured error mode. */\nasync function execute(\n  config: ClientConfig,\n  op: OperationDescriptor,\n  args: OperationArgs,\n  init: RequestOptions,\n  caps: Capabilities\n): Promise<unknown> {\n  const prepared = await prepareRequest(config, op, args, init, caps);\n  const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n  const { parseAs, ...sendInit } = prepared.init;\n  const { response, context } = await send(\n    config,\n    opCtx,\n    prepared.url,\n    sendInit,\n    prepared.body,\n    op.body?.multipart === true,\n    caps\n  );\n  const readKind = parseAs ?? kindFor(op);\n  if (config.errorMode === 'result') {\n    if (!response.ok) {\n      return { data: undefined, error: await readError(response), response };\n    }\n    return { data: await parse(response, readKind), error: undefined, response };\n  }\n  if (!response.ok) {\n    let error: globalThis.Error = new ApiError(\n      context.url,\n      response.status,\n      response.statusText,\n      await readError(response)\n    );\n    // Thread the error through each middleware's onError in turn (each may replace it).\n    for (const mw of middlewareChain(config)) {\n      if (mw.onError) error = await mw.onError(error as ApiErrorLike, context);\n    }\n    throw error;\n  }\n  return parse(response, readKind);\n}\n\n/** The paginate capability, or a descriptive throw when a paginated op is iterated unwired. */\nfunction paginateCapability(caps: Capabilities, op: OperationDescriptor) {\n  if (!caps.paginate) {\n    throw new Error(`Pagination capability not wired: cannot iterate operation \"${op.id}\"`);\n  }\n  return caps.paginate;\n}\n\n/**\n * The per-page call the iterators drive: the method itself in throw mode; in result\n * mode a wrapper that unwraps the `{ data, error, response }` envelope — the page\n * pointers are data-rooted — rethrowing a failed page as `ApiError` (iteration is\n * error-mode-agnostic; the throw-mode-only `onError` middleware hook is not invoked).\n */\nfunction pageCall(\n  method: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  config: ClientConfig\n) {\n  if (config.errorMode !== 'result') return method;\n  return async (args?: OperationArgs, init?: RequestOptions) => {\n    const envelope = (await method(args, init)) as {\n      data: unknown;\n      error: unknown;\n      response: Response;\n    };\n    // Failure is `!response.ok` — NOT `data === undefined`: a successful bodyless page\n    // (204/void) also parses to undefined data, and a failed page's `error` can be\n    // undefined too (unreadable body). The pointers then miss on the undefined data\n    // and iteration stops cleanly, which is the correct semantics for an empty page.\n    if (!envelope.response.ok) {\n      const { response } = envelope;\n      throw new ApiError(response.url, response.status, response.statusText, envelope.error);\n    }\n    return envelope.data;\n  };\n}\n\n/**\n * Build a typed instance client over operation descriptors: one real bound method per\n * operation (attached by a construction-time loop — no Proxy), plus the core members\n * (`configure`/`use`/`auth`), which are assigned AFTER the loop so they win any name\n * collision with an operation. All behavior dispatches through the capability seam.\n */\nexport function createClientCore<\n  Ops extends OpsShape,\n  Id extends string = string,\n  Path extends string = string,\n  Tag extends string = string,\n>(\n  operations: Record<string, OperationDescriptor>,\n  initial: ClientConfig<OperationContext<Id, Path, Tag>> = {},\n  caps: Capabilities = {}\n): Client<Ops, OperationContext<Id, Path, Tag>> {\n  // The literal-union narrowing is a compile-time DX contract only; internally the\n  // runtime works with the base (string-typed) context. One cast at this boundary —\n  // `ClientConfig<Narrow>` is not assignable to `ClientConfig` (middleware ctx\n  // params are contravariant).\n  const given = initial as ClientConfig;\n  // Private mutable config; the middleware array is copied so `use()` never mutates the caller's.\n  const config: ClientConfig = { ...given, middleware: [...(given.middleware ?? [])] };\n  const client = {} as Record<string, unknown>;\n\n  for (const [name, op] of Object.entries(operations)) {\n    if (op.responseKind === 'sse') {\n      const method = (args: OperationArgs = {}, init: SseOptions = {}) => {\n        if (!caps.sse) {\n          throw new Error(`SSE capability not wired: cannot stream operation \"${op.id}\"`);\n        }\n        const stream = caps.sse;\n        return (async function* () {\n          const opCtx: OperationContext = { id: op.id, path: op.path, tags: [...(op.tags ?? [])] };\n          // A thunk the stream re-runs on every (re)connect, so auth (which `prepareRequest`\n          // resolves) is refreshed per attempt rather than frozen at the first connect.\n          const prepare = async () => {\n            const prepared = await prepareRequest(config, op, args, init, caps);\n            return { url: prepared.url, init: prepared.init as SseOptions };\n          };\n          yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');\n        })();\n      };\n      // Consumers key off the function reference (cache keys, `OPERATIONS[fn.name]`), so\n      // each closure carries its operationId instead of an inferred binding name.\n      Object.defineProperty(method, 'name', { value: name });\n      client[name] = method;\n    } else {\n      const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>\n        execute(config, op, args, init, caps);\n      Object.defineProperty(method, 'name', { value: name });\n      const spec = op.pagination;\n      // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching\n      // through the capability seam (like SSE: absent capability throws descriptively).\n      // Iteration is error-mode-agnostic: the iterators' pointers are data-rooted, so on\n      // a result-mode client (`errorMode` is fixed at construction — `configure()`\n      // ignores it) each page's envelope is unwrapped before it reaches the capability.\n      // A failed page aborts iteration by throwing ApiError, even on result-mode\n      // clients; the `onError` middleware hook (throw-mode-only) is not invoked.\n      client[name] = spec\n        ? Object.assign(method, {\n            pages: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).pages(pageCall(method, config), spec, args, init),\n            items: (args?: OperationArgs, init?: RequestOptions) =>\n              paginateCapability(caps, op).items(pageCall(method, config), spec, args, init),\n          })\n        : method;\n    }\n  }\n\n  // Core members are assigned AFTER the operation loop — they win over colliding op names.\n  client.configure = (next: ClientConfig): void => {\n    // `errorMode` is fixed at generate time (it shapes the static types); flipping it at\n    // runtime would silently desync return shapes from `Client<Ops>`, so it is ignored.\n    const { errorMode: _fixed, auth, ...rest } = next;\n    Object.assign(config, rest);\n    // `auth` merges into existing credentials (like the `auth.*` setters) rather than\n    // replacing wholesale — so `configure({ auth: { bearer } })` keeps a previously set\n    // basic/apiKey. `apiKey` merges per scheme.\n    if (auth) {\n      config.auth = {\n        ...config.auth,\n        ...auth,\n        ...(auth.apiKey ? { apiKey: { ...config.auth?.apiKey, ...auth.apiKey } } : {}),\n      };\n    }\n  };\n  client.use = (...middleware: Middleware[]): void => {\n    // Reassign (don't push) so a caller-provided `middleware` array isn't mutated.\n    config.middleware = [...(config.middleware ?? []), ...middleware];\n  };\n  client.auth = {\n    bearer(token: TokenProvider): void {\n      config.auth = { ...config.auth, bearer: token };\n    },\n    basic(username: string, password: string): void {\n      config.auth = { ...config.auth, basic: { username, password } };\n    },\n    apiKey(scheme: string, value: TokenProvider): void {\n      config.auth = { ...config.auth, apiKey: { ...config.auth?.apiKey, [scheme]: value } };\n    },\n  };\n\n  return client as Client<Ops, OperationContext<Id, Path, Tag>>;\n}\n",
   'paginate.ts':
-    "import type { OperationArgs } from './create-client.js';\nimport type { PaginationSpec, QueryValue, RequestOptions } from './types.js';\n\n/**\n * Auto-pagination (capability module — wired into `createClient`, dispatched by the\n * method's `.pages()`/`.items()`): walk an operation's pages by advancing the descriptor's\n * `param` query parameter, per its `style`. The caller's args are never mutated — each\n * request gets a fresh `params` clone — and `init` is forwarded to every call.\n *\n * Iteration is error-mode-agnostic: `call` always resolves to the RAW page (on a\n * result-mode client the attachment unwraps the envelope first), so a failed page\n * aborts iteration by throwing `ApiError`, even on result-mode clients; the `onError`\n * middleware hook (throw-mode-only) is not invoked.\n */\n\n/**\n * Resolve an RFC 6901 JSON pointer (`~1` → `/`, `~0` → `~`) against a value.\n * The empty pointer is the whole document; anything else must start with `/`.\n * Returns `undefined` on any miss (bad token, absent key, non-object step) — never throws.\n */\nexport function resolvePointer(value: unknown, pointer: string): unknown {\n  if (pointer === '') return value;\n  if (!pointer.startsWith('/')) return undefined;\n  let current = value;\n  for (const token of pointer.slice(1).split('/')) {\n    const key = token.replaceAll('~1', '/').replaceAll('~0', '~');\n    if (Array.isArray(current)) {\n      if (!/^(0|[1-9]\\d*)$/.test(key)) return undefined;\n      current = current[Number(key)];\n    } else if (Object(current) === current && key in (current as object)) {\n      current = (current as Record<string, unknown>)[key];\n    } else {\n      return undefined;\n    }\n  }\n  return current;\n}\n\n/**\n * Iterate an operation's full page results. Every page is yielded before the stop\n * condition is evaluated, so the last page always arrives. Cursor style resumes from a\n * caller-provided `params[spec.param]`, stops when `nextCursor` resolves to\n * `undefined`/`null`/`''`, and throws if the next cursor is not a string or number, or\n * if the same cursor comes back twice in a row (infinite-loop guards). Offset/page\n * styles advance by item count / by one and stop when\n * the `items` pointer misses or the array is empty.\n */\nexport async function* pages<TPage>(\n  call: (args?: OperationArgs, init?: RequestOptions) => Promise<TPage>,\n  spec: PaginationSpec,\n  args: OperationArgs = {},\n  init?: RequestOptions\n): AsyncGenerator<TPage> {\n  if (spec.style === 'cursor') {\n    let cursor: unknown = args.params?.[spec.param];\n    while (true) {\n      const params = { ...args.params };\n      if (cursor !== undefined) params[spec.param] = cursor as QueryValue;\n      const page = await call({ ...args, params }, init);\n      yield page;\n      const next = resolvePointer(page, spec.nextCursor!);\n      if (next === undefined || next === null || next === '') return;\n      if (typeof next !== 'string' && typeof next !== 'number') {\n        // A fresh non-scalar cursor never compares equal, so without this guard a lying\n        // server would slip past the did-not-advance check into an infinite loop.\n        throw new Error(`Pagination cursor at ${spec.nextCursor} is not a string or number`);\n      }\n      if (next === cursor) {\n        throw new Error('Pagination did not advance: operation returned the same cursor twice');\n      }\n      cursor = next;\n    }\n  } else {\n    // Coerce the starting position to a number: a caller may pass `params[spec.param]` as a\n    // string (common from URL/form input), and `+=` on a string would concatenate.\n    const start = args.params?.[spec.param];\n    const fallback = spec.style === 'page' ? 1 : 0;\n    let position = start === undefined || Number.isNaN(Number(start)) ? fallback : Number(start);\n    while (true) {\n      const page = await call(\n        { ...args, params: { ...args.params, [spec.param]: position } },\n        init\n      );\n      yield page;\n      const pageItems = resolvePointer(page, spec.items);\n      if (!Array.isArray(pageItems) || pageItems.length === 0) return;\n      position += spec.style === 'page' ? 1 : pageItems.length;\n    }\n  }\n}\n\n/**\n * Iterate the operation's individual items: each page's `items` pointer, flattened.\n * A cursor-style page whose pointer misses yields nothing but pagination continues;\n * for offset/page styles a miss has already stopped `pages`.\n */\nexport async function* items<TItem>(\n  call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  spec: PaginationSpec,\n  args?: OperationArgs,\n  init?: RequestOptions\n): AsyncGenerator<TItem> {\n  for await (const page of pages(call, spec, args, init)) {\n    const pageItems = resolvePointer(page, spec.items);\n    if (Array.isArray(pageItems)) yield* pageItems as TItem[];\n  }\n}\n",
+    "import type { OperationArgs } from './create-client.js';\nimport type { PaginationSpec, QueryValue, RequestOptions } from './types.js';\n\n/**\n * Auto-pagination (capability module — wired into `createClient`, dispatched by the\n * method's `.pages()`/`.items()`): walk an operation's pages by advancing the descriptor's\n * `param` query parameter, per its `style`. The caller's args are never mutated — each\n * request gets a fresh `params` clone — and `init` is forwarded to every call.\n *\n * Iteration is error-mode-agnostic: `call` always resolves to the RAW page (on a\n * result-mode client the attachment unwraps the envelope first), so a failed page\n * aborts iteration by throwing `ApiError`, even on result-mode clients; the `onError`\n * middleware hook (throw-mode-only) is not invoked.\n */\n\n/**\n * Resolve an RFC 6901 JSON pointer (`~1` → `/`, `~0` → `~`) against a value.\n * The empty pointer is the whole document; anything else must start with `/`.\n * Returns `undefined` on any miss (bad token, absent key, non-object step) — never throws.\n */\nexport function resolvePointer(value: unknown, pointer: string): unknown {\n  if (pointer === '') return value;\n  if (!pointer.startsWith('/')) return undefined;\n  let current = value;\n  for (const token of pointer.slice(1).split('/')) {\n    const key = token.replaceAll('~1', '/').replaceAll('~0', '~');\n    if (Array.isArray(current)) {\n      if (!/^(0|[1-9]\\d*)$/.test(key)) return undefined;\n      current = current[Number(key)];\n    } else if (Object(current) === current && key in (current as object)) {\n      current = (current as Record<string, unknown>)[key];\n    } else {\n      return undefined;\n    }\n  }\n  return current;\n}\n\n/**\n * Iterate an operation's full page results. Every page is yielded before the stop\n * condition is evaluated, so the last page always arrives. Cursor style resumes from a\n * caller-provided `params[spec.param]`, stops when the optional `hasMore` pointer\n * resolves to `false` or when `nextCursor` resolves to `undefined`/`null`/`''`, and\n * throws if the next cursor is not a string or number, or\n * if the same cursor comes back twice in a row (infinite-loop guards). Offset/page\n * styles advance by item count / by one and stop when\n * the `items` pointer misses or the array is empty.\n */\nexport async function* pages<TPage>(\n  call: (args?: OperationArgs, init?: RequestOptions) => Promise<TPage>,\n  spec: PaginationSpec,\n  args: OperationArgs = {},\n  init?: RequestOptions\n): AsyncGenerator<TPage> {\n  if (spec.style === 'cursor') {\n    let cursor: unknown = args.params?.[spec.param];\n    while (true) {\n      const params = { ...args.params };\n      if (cursor !== undefined) params[spec.param] = cursor as QueryValue;\n      const page = await call({ ...args, params }, init);\n      yield page;\n      // Connection-style APIs keep a non-null cursor on the last page and signal the\n      // end via a boolean flag — honor it before the cursor check to skip the\n      // follow-up empty request. Strictly `false`: a missing pointer falls through.\n      if (spec.hasMore !== undefined && resolvePointer(page, spec.hasMore) === false) return;\n      const next = resolvePointer(page, spec.nextCursor!);\n      if (next === undefined || next === null || next === '') return;\n      if (typeof next !== 'string' && typeof next !== 'number') {\n        // A fresh non-scalar cursor never compares equal, so without this guard a lying\n        // server would slip past the did-not-advance check into an infinite loop.\n        throw new Error(`Pagination cursor at ${spec.nextCursor} is not a string or number`);\n      }\n      if (next === cursor) {\n        throw new Error('Pagination did not advance: operation returned the same cursor twice');\n      }\n      cursor = next;\n    }\n  } else {\n    // Coerce the starting position to a number: a caller may pass `params[spec.param]` as a\n    // string (common from URL/form input), and `+=` on a string would concatenate.\n    const start = args.params?.[spec.param];\n    const fallback = spec.style === 'page' ? 1 : 0;\n    let position = start === undefined || Number.isNaN(Number(start)) ? fallback : Number(start);\n    while (true) {\n      const page = await call(\n        { ...args, params: { ...args.params, [spec.param]: position } },\n        init\n      );\n      yield page;\n      const pageItems = resolvePointer(page, spec.items);\n      if (!Array.isArray(pageItems) || pageItems.length === 0) return;\n      position += spec.style === 'page' ? 1 : pageItems.length;\n    }\n  }\n}\n\n/**\n * Iterate the operation's individual items: each page's `items` pointer, flattened.\n * A cursor-style page whose pointer misses yields nothing but pagination continues;\n * for offset/page styles a miss has already stopped `pages`.\n */\nexport async function* items<TItem>(\n  call: (args?: OperationArgs, init?: RequestOptions) => Promise<unknown>,\n  spec: PaginationSpec,\n  args?: OperationArgs,\n  init?: RequestOptions\n): AsyncGenerator<TItem> {\n  for await (const page of pages(call, spec, args, init)) {\n    const pageItems = resolvePointer(page, spec.items);\n    if (Array.isArray(pageItems)) yield* pageItems as TItem[];\n  }\n}\n",
 } as const;
 
 export type RuntimeModuleName = keyof typeof RUNTIME_SOURCES;
diff --git a/packages/client-generator/src/emitters/wrapper-support.ts b/packages/client-generator/src/emitters/wrapper-support.ts
index 4f5f2644da..f5ba14046b 100644
--- a/packages/client-generator/src/emitters/wrapper-support.ts
+++ b/packages/client-generator/src/emitters/wrapper-support.ts
@@ -117,6 +117,7 @@ export function sdkCall(
     if (sig.hasQuery) args.push(factory.createPropertyAccessExpression(sourceIdent, 'params'));
     if (sig.hasBody) args.push(factory.createPropertyAccessExpression(sourceIdent, 'body'));
     if (sig.hasHeaders) args.push(factory.createPropertyAccessExpression(sourceIdent, 'headers'));
+    if (sig.hasCookies) args.push(factory.createPropertyAccessExpression(sourceIdent, 'cookies'));
   }
   if (withInit) args.push(factory.createIdentifier('init'));
 
diff --git a/packages/client-generator/src/generators/__tests__/sdk.test.ts b/packages/client-generator/src/generators/__tests__/sdk.test.ts
index 20f30dfd5f..3bb65e6970 100644
--- a/packages/client-generator/src/generators/__tests__/sdk.test.ts
+++ b/packages/client-generator/src/generators/__tests__/sdk.test.ts
@@ -18,6 +18,7 @@ function apiModel(): ApiModel {
             pathParams: [],
             queryParams: [],
             headerParams: [],
+            cookieParams: [],
             successResponses: [],
             errorResponses: [],
             security: [],
diff --git a/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts b/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
index cab7453e23..c2e55193e3 100644
--- a/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
+++ b/packages/client-generator/src/intermediate-representation/__tests__/build.test.ts
@@ -308,32 +308,23 @@ describe('buildOperation — param paths', () => {
     expect(op.headerParams.map((p) => p.name)).toEqual(['X-Tok']);
   });
 
-  it('drops cookie parameters with a warning naming the operation and parameter', () => {
-    const warn = vi.spyOn(logger, 'warn').mockImplementation(() => {});
-    try {
-      const op = buildOpOnly({
-        paths: {
-          '/orders/{id}': {
-            get: {
-              operationId: 'getOrder',
-              parameters: [
-                { name: 'id', in: 'path', required: true, schema: { type: 'string' } },
-                { name: 'sid', in: 'cookie', schema: { type: 'string' } },
-              ] as never,
-              responses: {},
-            },
-          } as never,
-        },
-      });
-      expect(op.pathParams.map((p) => p.name)).toEqual(['id']);
-      expect(op.queryParams).toEqual([]);
-      expect(op.headerParams).toEqual([]);
-      expect(warn).toHaveBeenCalledWith(
-        'generate-client: skipped cookie parameter(s) "sid" on operation "getOrder" — cookie parameters are not supported.\n'
-      );
-    } finally {
-      warn.mockRestore();
-    }
+  it('keeps cookie parameters in cookieParams', () => {
+    const op = buildOpOnly({
+      paths: {
+        '/orders/{id}': {
+          get: {
+            operationId: 'getOrder',
+            parameters: [
+              { name: 'id', in: 'path', required: true, schema: { type: 'string' } },
+              { name: 'sid', in: 'cookie', schema: { type: 'string' } },
+            ] as never,
+            responses: {},
+          },
+        } as never,
+      },
+    });
+    expect(op.pathParams.map((p) => p.name)).toEqual(['id']);
+    expect(op.cookieParams.map((p) => p.name)).toEqual(['sid']);
   });
 
   it('resolves a $ref requestBody', () => {
diff --git a/packages/client-generator/src/intermediate-representation/__tests__/sanitize-identifiers.test.ts b/packages/client-generator/src/intermediate-representation/__tests__/sanitize-identifiers.test.ts
index ffa1460e58..19c33d3040 100644
--- a/packages/client-generator/src/intermediate-representation/__tests__/sanitize-identifiers.test.ts
+++ b/packages/client-generator/src/intermediate-representation/__tests__/sanitize-identifiers.test.ts
@@ -20,6 +20,7 @@ function op(partial: Partial<OperationModel>): OperationModel {
     pathParams: [],
     queryParams: [],
     headerParams: [],
+    cookieParams: [],
     successResponses: [],
     errorResponses: [],
     tags: [],
diff --git a/packages/client-generator/src/intermediate-representation/build.ts b/packages/client-generator/src/intermediate-representation/build.ts
index 570f507645..190e880231 100644
--- a/packages/client-generator/src/intermediate-representation/build.ts
+++ b/packages/client-generator/src/intermediate-representation/build.ts
@@ -509,17 +509,9 @@ function buildOperation(
   const pathParams = allParams.filter((p) => p.in === 'path');
   const queryParams = allParams.filter((p) => p.in === 'query');
   const headerParams = allParams.filter((p) => p.in === 'header');
-
-  // Browsers own the Cookie header, so the generated client cannot set cookie
-  // params — drop them, but tell the user instead of vanishing them silently.
+  // Serialized into the `Cookie` header by the runtime — server-side only, since
+  // browsers own that header (same caveat as cookie-borne apiKey auth).
   const cookieParams = allParams.filter((p) => p.in === 'cookie');
-  if (cookieParams.length > 0) {
-    logger.warn(
-      `generate-client: skipped cookie parameter(s) ${cookieParams
-        .map((p) => `"${p.name}"`)
-        .join(', ')} on operation "${name}" — cookie parameters are not supported.\n`
-    );
-  }
 
   const requestBody = operation.requestBody
     ? buildRequestBody(deref(doc, operation.requestBody), `${method} ${path}`, doc)
@@ -541,6 +533,7 @@ function buildOperation(
     pathParams,
     queryParams,
     headerParams,
+    cookieParams,
     requestBody,
     successResponses,
     errorResponses,
diff --git a/packages/client-generator/src/intermediate-representation/model.ts b/packages/client-generator/src/intermediate-representation/model.ts
index 19e3014418..922bfa5153 100644
--- a/packages/client-generator/src/intermediate-representation/model.ts
+++ b/packages/client-generator/src/intermediate-representation/model.ts
@@ -110,11 +110,6 @@ export type PropertyModel = {
 
 export type ParamModel = {
   name: string;
-  /**
-   * `'cookie'` exists only inside the builder: cookie parameters are dropped
-   * (with a warning) before the operation model is assembled, so a built
-   * `ApiModel` never carries one.
-   */
   in: 'path' | 'query' | 'header' | 'cookie';
   schema: SchemaModel;
   required: boolean;
@@ -193,6 +188,8 @@ export type OperationModel = {
   pathParams: ParamModel[];
   queryParams: ParamModel[];
   headerParams: ParamModel[];
+  /** Serialized into the `Cookie` header by the runtime — server-side only (browsers own that header). */
+  cookieParams: ParamModel[];
   requestBody?: RequestBodyModel;
   successResponses: ResponseBodyModel[];
   /**
diff --git a/packages/client-generator/src/intermediate-representation/sanitize-identifiers.ts b/packages/client-generator/src/intermediate-representation/sanitize-identifiers.ts
index cb54524c08..3eccc8788d 100644
--- a/packages/client-generator/src/intermediate-representation/sanitize-identifiers.ts
+++ b/packages/client-generator/src/intermediate-representation/sanitize-identifiers.ts
@@ -148,6 +148,7 @@ function rewriteOperationRefs(op: OperationModel, fixRef: (name: string) => stri
   for (const p of op.pathParams) rewriteRefs(p.schema, fixRef);
   for (const p of op.queryParams) rewriteRefs(p.schema, fixRef);
   for (const p of op.headerParams) rewriteRefs(p.schema, fixRef);
+  for (const p of op.cookieParams) rewriteRefs(p.schema, fixRef);
   if (op.requestBody) rewriteRefs(op.requestBody.schema, fixRef);
   for (const r of [...op.successResponses, ...op.errorResponses]) {
     rewriteRefs(r.schema, fixRef);
diff --git a/packages/client-generator/src/runtime/__tests__/create-client.test.ts b/packages/client-generator/src/runtime/__tests__/create-client.test.ts
index f515ceadc4..af30b52792 100644
--- a/packages/client-generator/src/runtime/__tests__/create-client.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/create-client.test.ts
@@ -106,6 +106,13 @@ function spy(responses: Response[]) {
 }
 
 describe('createClientCore', () => {
+  it('names every operation closure after its operationId (plain, paginated, and sse)', () => {
+    const client = createClientCore<Ops>(OPS, { serverUrl: 'https://x' });
+    expect(client.getOrder.name).toBe('getOrder');
+    expect(client.listOrders.name).toBe('listOrders');
+    expect(client.stream.name).toBe('stream');
+  });
+
   it('routes args: path substitution + query + body + header slot; methods survive destructuring', async () => {
     const { calls, fetchImpl } = spy([jsonOk({ id: 'o1' }), jsonOk({ id: 'p1' })]);
     const client = createClientCore<Ops>(OPS, { serverUrl: 'https://x', fetch: fetchImpl });
@@ -128,6 +135,31 @@ describe('createClientCore', () => {
     expect(JSON.parse(calls[1].init.body as string)).toEqual({ name: 'Rex' });
   });
 
+  it('serializes cookie params into the Cookie header, joined after injected auth cookies', async () => {
+    const ops = {
+      withCookie: {
+        id: 'withCookie',
+        method: 'GET',
+        path: '/ctx',
+        params: [{ name: 'orgContext', in: 'cookie' }],
+        security: [[{ scheme: 'session', kind: 'apiKey', name: 'sid', in: 'cookie' }]],
+      },
+    } satisfies Record<string, OperationDescriptor>;
+    const { calls, fetchImpl } = spy([jsonOk({ ok: true })]);
+    const client = createClientCore<{
+      withCookie: { args: { cookies?: { orgContext?: string } }; result: { ok: boolean } };
+      [k: string]: { args: object; result: unknown };
+    }>(
+      ops,
+      { serverUrl: 'https://x', fetch: fetchImpl },
+      { resolveAuth: async () => ({ headers: { Cookie: 'sid=abc' }, query: {} }) }
+    );
+    await client.withCookie({ cookies: { orgContext: 'org 1;x' } });
+    expect((calls[0].init.headers as Record<string, string>).Cookie).toBe(
+      'sid=abc; orgContext=org%201%3Bx'
+    );
+  });
+
   it('honors descriptor query styles and responseKind (text) + per-call parseAs override', async () => {
     const { calls, fetchImpl } = spy([
       new Response('plain', { headers: { 'content-type': 'text/plain' } }),
diff --git a/packages/client-generator/src/runtime/__tests__/paginate.test.ts b/packages/client-generator/src/runtime/__tests__/paginate.test.ts
index cc06c515a9..00145039ea 100644
--- a/packages/client-generator/src/runtime/__tests__/paginate.test.ts
+++ b/packages/client-generator/src/runtime/__tests__/paginate.test.ts
@@ -85,6 +85,26 @@ describe('pages — cursor style', () => {
     expect(calls).toHaveLength(2);
   });
 
+  it('stops on a false hasMore flag without the extra empty request, ignoring a non-null cursor', async () => {
+    const spec: PaginationSpec = { ...CURSOR, hasMore: '/pageInfo/hasNextPage' };
+    const data = [
+      { orders: [{ id: 'o1' }], nextCursor: 'c2', pageInfo: { hasNextPage: true } },
+      // Connection-style last page: the cursor is still non-null, only the flag says stop.
+      { orders: [{ id: 'o2' }], nextCursor: 'c3', pageInfo: { hasNextPage: false } },
+    ];
+    const { call, calls } = stub(data);
+    expect(await collect(pages(call, spec))).toEqual(data);
+    expect(calls).toHaveLength(2);
+  });
+
+  it('falls back to the cursor stop rule when the hasMore pointer misses', async () => {
+    const spec: PaginationSpec = { ...CURSOR, hasMore: '/pageInfo/hasNextPage' };
+    const data = [{ orders: [{ id: 'o1' }], nextCursor: 'c2' }, { orders: [{ id: 'o2' }] }];
+    const { call, calls } = stub(data);
+    expect(await collect(pages(call, spec))).toEqual(data);
+    expect(calls).toHaveLength(2);
+  });
+
   it('resumes from a caller-provided cursor, preserving other params', async () => {
     const data = [{ orders: [{ id: 'o3' }] }];
     const { call, calls } = stub(data);
diff --git a/packages/client-generator/src/runtime/create-client.ts b/packages/client-generator/src/runtime/create-client.ts
index f0dd54d9d7..d3d7d965b1 100644
--- a/packages/client-generator/src/runtime/create-client.ts
+++ b/packages/client-generator/src/runtime/create-client.ts
@@ -54,11 +54,12 @@ export type Capabilities = SendCapabilities & {
   };
 };
 
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers`/`cookies` slots. */
 export type OperationArgs = {
   params?: Record<string, QueryValue>;
   body?: unknown;
   headers?: Record<string, unknown>;
+  cookies?: Record<string, unknown>;
 } & Record<string, unknown>;
 
 /** The response reader implied by the descriptor (before any per-call `parseAs` override). */
@@ -69,13 +70,19 @@ function kindFor(op: OperationDescriptor): ParseAs | 'void' {
   return 'auto';
 }
 
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers, cookies. */
 function splitArgs(op: OperationDescriptor, args: OperationArgs) {
   const path: Record<string, unknown> = {};
   for (const param of op.params ?? []) {
     if (param.in === 'path') path[param.name] = args[param.name];
   }
-  return { path, query: args.params, body: args.body, headers: args.headers };
+  return {
+    path,
+    query: args.params,
+    body: args.body,
+    headers: args.headers,
+    cookies: args.cookies,
+  };
 }
 
 /**
@@ -120,11 +127,19 @@ async function prepareRequest(
   init: RequestOptions | SseOptions,
   caps: Capabilities
 ): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
+  const { path, query, body, headers, cookies } = splitArgs(op, args);
+  const authed: { headers: Record<string, string>; query: Record<string, string> } =
     op.security?.length && caps.resolveAuth
       ? await caps.resolveAuth(op.security, config)
       : { headers: {}, query: {} };
+  // Cookie params join the auth-injected cookies in one `Cookie` header (values
+  // percent-encoded, like auth cookies). Server-side only — browsers own the header.
+  const cookiePairs = Object.entries(cookies ?? {})
+    .filter(([, value]) => value !== undefined && value !== null)
+    .map(([cookieName, value]) => `${cookieName}=${encodeURIComponent(String(value))}`);
+  if (cookiePairs.length > 0) {
+    authed.headers.Cookie = [authed.headers.Cookie, ...cookiePairs].filter(Boolean).join('; ');
+  }
   const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
   const url = buildUrl(
     config.serverUrl ?? '',
@@ -253,7 +268,7 @@ export function createClientCore<
 
   for (const [name, op] of Object.entries(operations)) {
     if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+      const method = (args: OperationArgs = {}, init: SseOptions = {}) => {
         if (!caps.sse) {
           throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
         }
@@ -269,9 +284,14 @@ export function createClientCore<
           yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
+      // Consumers key off the function reference (cache keys, `OPERATIONS[fn.name]`), so
+      // each closure carries its operationId instead of an inferred binding name.
+      Object.defineProperty(method, 'name', { value: name });
+      client[name] = method;
     } else {
       const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      Object.defineProperty(method, 'name', { value: name });
       const spec = op.pagination;
       // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
       // through the capability seam (like SSE: absent capability throws descriptively).
diff --git a/packages/client-generator/src/runtime/paginate.ts b/packages/client-generator/src/runtime/paginate.ts
index 4a337ab879..2674836fac 100644
--- a/packages/client-generator/src/runtime/paginate.ts
+++ b/packages/client-generator/src/runtime/paginate.ts
@@ -39,8 +39,9 @@ export function resolvePointer(value: unknown, pointer: string): unknown {
 /**
  * Iterate an operation's full page results. Every page is yielded before the stop
  * condition is evaluated, so the last page always arrives. Cursor style resumes from a
- * caller-provided `params[spec.param]`, stops when `nextCursor` resolves to
- * `undefined`/`null`/`''`, and throws if the next cursor is not a string or number, or
+ * caller-provided `params[spec.param]`, stops when the optional `hasMore` pointer
+ * resolves to `false` or when `nextCursor` resolves to `undefined`/`null`/`''`, and
+ * throws if the next cursor is not a string or number, or
  * if the same cursor comes back twice in a row (infinite-loop guards). Offset/page
  * styles advance by item count / by one and stop when
  * the `items` pointer misses or the array is empty.
@@ -58,6 +59,10 @@ export async function* pages<TPage>(
       if (cursor !== undefined) params[spec.param] = cursor as QueryValue;
       const page = await call({ ...args, params }, init);
       yield page;
+      // Connection-style APIs keep a non-null cursor on the last page and signal the
+      // end via a boolean flag — honor it before the cursor check to skip the
+      // follow-up empty request. Strictly `false`: a missing pointer falls through.
+      if (spec.hasMore !== undefined && resolvePointer(page, spec.hasMore) === false) return;
       const next = resolvePointer(page, spec.nextCursor!);
       if (next === undefined || next === null || next === '') return;
       if (typeof next !== 'string' && typeof next !== 'number') {
diff --git a/packages/client-generator/src/runtime/types.ts b/packages/client-generator/src/runtime/types.ts
index 8f539fe2ae..797b3650bb 100644
--- a/packages/client-generator/src/runtime/types.ts
+++ b/packages/client-generator/src/runtime/types.ts
@@ -9,7 +9,7 @@
 /** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
 export type ParamSpec = {
   name: string;
-  in: 'path' | 'query' | 'header';
+  in: 'path' | 'query' | 'header' | 'cookie';
   style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
   explode?: boolean;
   allowReserved?: boolean;
@@ -32,6 +32,8 @@ export type PaginationSpec = {
   limitParam?: string;
   /** Cursor style only: pointer to the next cursor in the page. */
   nextCursor?: string;
+  /** Cursor style only: optional pointer to a boolean "more pages" flag — `false` stops iteration. */
+  hasMore?: string;
   /** Pointer to the page's item array. */
   items: string;
 };
diff --git a/packages/core/src/__tests__/__snapshots__/redocly-yaml.test.ts.snap b/packages/core/src/__tests__/__snapshots__/redocly-yaml.test.ts.snap
index 1bffd2968d..9f6e7038ee 100644
--- a/packages/core/src/__tests__/__snapshots__/redocly-yaml.test.ts.snap
+++ b/packages/core/src/__tests__/__snapshots__/redocly-yaml.test.ts.snap
@@ -243,6 +243,12 @@ exports[`createConfigTypes > matches snapshot for the default config schema 1`]
         },
         "type": "array",
       },
+      "importExt": {
+        "enum": [
+          "js",
+          "ts",
+        ],
+      },
       "mockData": {
         "enum": [
           "baked",
@@ -292,6 +298,9 @@ exports[`createConfigTypes > matches snapshot for the default config schema 1`]
         },
         "type": "array",
       },
+      "hasMore": {
+        "type": "string",
+      },
       "items": {
         "type": "string",
       },
@@ -323,6 +332,9 @@ exports[`createConfigTypes > matches snapshot for the default config schema 1`]
       "cursorParam": {
         "type": "string",
       },
+      "hasMore": {
+        "type": "string",
+      },
       "items": {
         "type": "string",
       },
diff --git a/packages/core/src/types/redocly-yaml.ts b/packages/core/src/types/redocly-yaml.ts
index 6c93ddb375..d8ecb55dff 100644
--- a/packages/core/src/types/redocly-yaml.ts
+++ b/packages/core/src/types/redocly-yaml.ts
@@ -373,6 +373,7 @@ const ClientPaginationRule: NodeType = {
     style: { enum: ['cursor', 'offset', 'page'] },
     cursorParam: { type: 'string' },
     nextCursor: { type: 'string' },
+    hasMore: { type: 'string' },
     offsetParam: { type: 'string' },
     limitParam: { type: 'string' },
     items: { type: 'string' },
diff --git a/tests/e2e/generate-client/cafe.snapshot.ts b/tests/e2e/generate-client/cafe.snapshot.ts
index 550cd946cd..824bddcaee 100644
--- a/tests/e2e/generate-client/cafe.snapshot.ts
+++ b/tests/e2e/generate-client/cafe.snapshot.ts
@@ -813,7 +813,7 @@ export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
 /** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
 export type ParamSpec = {
   name: string;
-  in: 'path' | 'query' | 'header';
+  in: 'path' | 'query' | 'header' | 'cookie';
   style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
   explode?: boolean;
   allowReserved?: boolean;
@@ -836,6 +836,8 @@ export type PaginationSpec = {
   limitParam?: string;
   /** Cursor style only: pointer to the next cursor in the page. */
   nextCursor?: string;
+  /** Cursor style only: optional pointer to a boolean "more pages" flag — `false` stops iteration. */
+  hasMore?: string;
   /** Pointer to the page's item array. */
   items: string;
 };
@@ -1515,11 +1517,12 @@ type Capabilities = SendCapabilities & {
   };
 };
 
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers`/`cookies` slots. */
 type OperationArgs = {
   params?: Record<string, QueryValue>;
   body?: unknown;
   headers?: Record<string, unknown>;
+  cookies?: Record<string, unknown>;
 } & Record<string, unknown>;
 
 /** The response reader implied by the descriptor (before any per-call `parseAs` override). */
@@ -1530,13 +1533,19 @@ function kindFor(op: OperationDescriptor): ParseAs | 'void' {
   return 'auto';
 }
 
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers, cookies. */
 function splitArgs(op: OperationDescriptor, args: OperationArgs) {
   const path: Record<string, unknown> = {};
   for (const param of op.params ?? []) {
     if (param.in === 'path') path[param.name] = args[param.name];
   }
-  return { path, query: args.params, body: args.body, headers: args.headers };
+  return {
+    path,
+    query: args.params,
+    body: args.body,
+    headers: args.headers,
+    cookies: args.cookies,
+  };
 }
 
 /**
@@ -1581,11 +1590,19 @@ async function prepareRequest(
   init: RequestOptions | SseOptions,
   caps: Capabilities
 ): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
+  const { path, query, body, headers, cookies } = splitArgs(op, args);
+  const authed: { headers: Record<string, string>; query: Record<string, string> } =
     op.security?.length && caps.resolveAuth
       ? await caps.resolveAuth(op.security, config)
       : { headers: {}, query: {} };
+  // Cookie params join the auth-injected cookies in one `Cookie` header (values
+  // percent-encoded, like auth cookies). Server-side only — browsers own the header.
+  const cookiePairs = Object.entries(cookies ?? {})
+    .filter(([, value]) => value !== undefined && value !== null)
+    .map(([cookieName, value]) => `${cookieName}=${encodeURIComponent(String(value))}`);
+  if (cookiePairs.length > 0) {
+    authed.headers.Cookie = [authed.headers.Cookie, ...cookiePairs].filter(Boolean).join('; ');
+  }
   const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
   const url = buildUrl(
     config.serverUrl ?? '',
@@ -1714,7 +1731,7 @@ function createClientCore<
 
   for (const [name, op] of Object.entries(operations)) {
     if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+      const method = (args: OperationArgs = {}, init: SseOptions = {}) => {
         if (!caps.sse) {
           throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
         }
@@ -1730,9 +1747,14 @@ function createClientCore<
           yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
+      // Consumers key off the function reference (cache keys, `OPERATIONS[fn.name]`), so
+      // each closure carries its operationId instead of an inferred binding name.
+      Object.defineProperty(method, 'name', { value: name });
+      client[name] = method;
     } else {
       const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      Object.defineProperty(method, 'name', { value: name });
       const spec = op.pagination;
       // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
       // through the capability seam (like SSE: absent capability throws descriptively).
diff --git a/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts b/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
index ec074894fb..d7058ce91f 100644
--- a/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
+++ b/tests/e2e/generate-client/examples/zero-install-quickstart/src/api/client.ts
@@ -148,7 +148,7 @@ export type OperationTag = Extract<(typeof OPERATIONS)[OperationId], {
 /** How one operation parameter is sent: its location plus OpenAPI query-serialization hints. */
 export type ParamSpec = {
   name: string;
-  in: 'path' | 'query' | 'header';
+  in: 'path' | 'query' | 'header' | 'cookie';
   style?: 'form' | 'spaceDelimited' | 'pipeDelimited' | 'deepObject';
   explode?: boolean;
   allowReserved?: boolean;
@@ -171,6 +171,8 @@ export type PaginationSpec = {
   limitParam?: string;
   /** Cursor style only: pointer to the next cursor in the page. */
   nextCursor?: string;
+  /** Cursor style only: optional pointer to a boolean "more pages" flag — `false` stops iteration. */
+  hasMore?: string;
   /** Pointer to the page's item array. */
   items: string;
 };
@@ -787,11 +789,12 @@ type Capabilities = SendCapabilities & {
   };
 };
 
-/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers` slots. */
+/** The grouped args wire shape: path params by name plus the `params`/`body`/`headers`/`cookies` slots. */
 type OperationArgs = {
   params?: Record<string, QueryValue>;
   body?: unknown;
   headers?: Record<string, unknown>;
+  cookies?: Record<string, unknown>;
 } & Record<string, unknown>;
 
 /** The response reader implied by the descriptor (before any per-call `parseAs` override). */
@@ -802,13 +805,19 @@ function kindFor(op: OperationDescriptor): ParseAs | 'void' {
   return 'auto';
 }
 
-/** Route the grouped args by the descriptor: path values, query object, body, extra headers. */
+/** Route the grouped args by the descriptor: path values, query object, body, extra headers, cookies. */
 function splitArgs(op: OperationDescriptor, args: OperationArgs) {
   const path: Record<string, unknown> = {};
   for (const param of op.params ?? []) {
     if (param.in === 'path') path[param.name] = args[param.name];
   }
-  return { path, query: args.params, body: args.body, headers: args.headers };
+  return {
+    path,
+    query: args.params,
+    body: args.body,
+    headers: args.headers,
+    cookies: args.cookies,
+  };
 }
 
 /**
@@ -853,11 +862,19 @@ async function prepareRequest(
   init: RequestOptions | SseOptions,
   caps: Capabilities
 ): Promise<{ url: string; init: RequestOptions; body: unknown }> {
-  const { path, query, body, headers } = splitArgs(op, args);
-  const authed =
+  const { path, query, body, headers, cookies } = splitArgs(op, args);
+  const authed: { headers: Record<string, string>; query: Record<string, string> } =
     op.security?.length && caps.resolveAuth
       ? await caps.resolveAuth(op.security, config)
       : { headers: {}, query: {} };
+  // Cookie params join the auth-injected cookies in one `Cookie` header (values
+  // percent-encoded, like auth cookies). Server-side only — browsers own the header.
+  const cookiePairs = Object.entries(cookies ?? {})
+    .filter(([, value]) => value !== undefined && value !== null)
+    .map(([cookieName, value]) => `${cookieName}=${encodeURIComponent(String(value))}`);
+  if (cookiePairs.length > 0) {
+    authed.headers.Cookie = [authed.headers.Cookie, ...cookiePairs].filter(Boolean).join('; ');
+  }
   const fullQuery: Record<string, QueryValue> = { ...query, ...authed.query };
   const url = buildUrl(
     config.serverUrl ?? '',
@@ -986,7 +1003,7 @@ function createClientCore<
 
   for (const [name, op] of Object.entries(operations)) {
     if (op.responseKind === 'sse') {
-      client[name] = (args: OperationArgs = {}, init: SseOptions = {}) => {
+      const method = (args: OperationArgs = {}, init: SseOptions = {}) => {
         if (!caps.sse) {
           throw new Error(`SSE capability not wired: cannot stream operation "${op.id}"`);
         }
@@ -1002,9 +1019,14 @@ function createClientCore<
           yield* stream(config, opCtx, prepare, op.sseDataKind ?? 'text');
         })();
       };
+      // Consumers key off the function reference (cache keys, `OPERATIONS[fn.name]`), so
+      // each closure carries its operationId instead of an inferred binding name.
+      Object.defineProperty(method, 'name', { value: name });
+      client[name] = method;
     } else {
       const method = (args: OperationArgs = {}, init: RequestOptions = {}) =>
         execute(config, op, args, init, caps);
+      Object.defineProperty(method, 'name', { value: name });
       const spec = op.pagination;
       // Paginated ops keep their one-shot call and gain `.pages`/`.items`, dispatching
       // through the capability seam (like SSE: absent capability throws descriptively).